diff --git a/mappings/net/minecraft/block/impl/BlockFlower.mapping b/mappings/net/minecraft/block/impl/BlockFlower.mapping index b72152e5c5..e8eb530dcf 100644 --- a/mappings/net/minecraft/block/impl/BlockFlower.mapping +++ b/mappings/net/minecraft/block/impl/BlockFlower.mapping @@ -32,3 +32,4 @@ CLASS none/amq net/minecraft/block/impl/BlockFlower ARG 0 state METHOD e serializeState (Lnone/asj;)I ARG 0 state + METHOD g ()Lnone/asz; diff --git a/mappings/net/minecraft/block/impl/BlockSlabStone2Base.mapping b/mappings/net/minecraft/block/impl/BlockSlabStone2Base.mapping index 4f3668c2c7..5dac021f0b 100644 --- a/mappings/net/minecraft/block/impl/BlockSlabStone2Base.mapping +++ b/mappings/net/minecraft/block/impl/BlockSlabStone2Base.mapping @@ -1,6 +1,22 @@ CLASS none/aog net/minecraft/block/impl/BlockSlabStone2Base - CLASS none/aog$a + CLASS none/aog$a Variant + FIELD a RED_SANDSTONE Lnone/aog$a; + FIELD b VALUES [Lnone/aog$a; + FIELD c id I + FIELD d name Ljava/lang/String; + FIELD e mapColor Lnone/ayp; + METHOD (Ljava/lang/String;IILjava/lang/String;Lnone/ayp;)V + ARG 0 id + ARG 1 name + ARG 2 mapColor + METHOD a getId ()I + METHOD a byId (I)Lnone/aog$a; + ARG 0 id + METHOD c getMapColor ()Lnone/ayp; + METHOD d getName ()Ljava/lang/String; METHOD m asString ()Ljava/lang/String; + FIELD d SEAMLESS Lnone/asv; + FIELD e VARIANT Lnone/asx; METHOD a deserializeState (I)Lnone/asj; METHOD a addStacksForDisplay (Lnone/aeo;Lnone/adq;Lnone/dc;)V METHOD a getDropStack (Lnone/aiu;Lnone/cn;Lnone/asj;)Lnone/aeq; diff --git a/mappings/net/minecraft/client/render/block/BlockStateMap.mapping b/mappings/net/minecraft/client/render/block/BlockStateMap.mapping index 8cdc0e1b33..bb9f717c17 100644 --- a/mappings/net/minecraft/client/render/block/BlockStateMap.mapping +++ b/mappings/net/minecraft/client/render/block/BlockStateMap.mapping @@ -1,8 +1,11 @@ CLASS none/bqp net/minecraft/client/render/block/BlockStateMap FIELD a stateMap Ljava/util/Map; FIELD b builtinBlocks Ljava/util/Set; + METHOD a getAll ()Ljava/util/Map; METHOD a mapState (Lnone/akw;Lnone/bqs;)V ARG 0 block ARG 1 map METHOD a mapBuiltinStates ([Lnone/akw;)V ARG 0 blocks + METHOD b get (Lnone/akw;)Ljava/util/Map; + ARG 0 block diff --git a/mappings/net/minecraft/client/render/block/BlockStateMaps.mapping b/mappings/net/minecraft/client/render/block/BlockStateMaps.mapping index 10567fae45..5473cddc24 100644 --- a/mappings/net/minecraft/client/render/block/BlockStateMaps.mapping +++ b/mappings/net/minecraft/client/render/block/BlockStateMaps.mapping @@ -1,4 +1,25 @@ CLASS none/bpl net/minecraft/client/render/block/BlockStateMaps + CLASS none/bpl$1 + METHOD a getModelName (Lnone/asj;)Lnone/bzo; + ARG 0 state + CLASS none/bpl$2 + METHOD a getModelName (Lnone/asj;)Lnone/bzo; + ARG 0 state + CLASS none/bpl$3 + METHOD a getModelName (Lnone/asj;)Lnone/bzo; + ARG 0 state + CLASS none/bpl$4 + METHOD a getModelName (Lnone/asj;)Lnone/bzo; + ARG 0 state + CLASS none/bpl$5 + METHOD a getModelName (Lnone/asj;)Lnone/bzo; + ARG 0 state + CLASS none/bpl$6 + METHOD a getModelName (Lnone/asj;)Lnone/bzo; + ARG 0 state + CLASS none/bpl$7 + METHOD a getModelName (Lnone/asj;)Lnone/bzo; + ARG 0 state FIELD a modelCache Ljava/util/Map; FIELD b stateMap Lnone/bqp; FIELD c modelManager Lnone/bzn; diff --git a/mappings/net/minecraft/client/render/block/IStateMapper.mapping b/mappings/net/minecraft/client/render/block/IStateMapper.mapping deleted file mode 100644 index c9a29354d5..0000000000 --- a/mappings/net/minecraft/client/render/block/IStateMapper.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/bqs net/minecraft/client/render/block/IStateMapper - METHOD a getStateMap (Lnone/akw;)Ljava/util/Map; - ARG 0 block diff --git a/mappings/net/minecraft/client/render/block/state/IStateModelMapper.mapping b/mappings/net/minecraft/client/render/block/state/IStateModelMapper.mapping new file mode 100644 index 0000000000..a8599dc8ce --- /dev/null +++ b/mappings/net/minecraft/client/render/block/state/IStateModelMapper.mapping @@ -0,0 +1,3 @@ +CLASS none/bqs net/minecraft/client/render/block/state/IStateModelMapper + METHOD a getStateMap (Lnone/akw;)Ljava/util/Map; + ARG 0 block diff --git a/mappings/net/minecraft/client/render/block/state/StateModelMapperAdvanced.mapping b/mappings/net/minecraft/client/render/block/state/StateModelMapperAdvanced.mapping new file mode 100644 index 0000000000..c1d5d55604 --- /dev/null +++ b/mappings/net/minecraft/client/render/block/state/StateModelMapperAdvanced.mapping @@ -0,0 +1,20 @@ +CLASS none/bqr net/minecraft/client/render/block/state/StateModelMapperAdvanced + CLASS none/bqr$a Builder + FIELD a nameSrc Lnone/asz; + FIELD b suffix Ljava/lang/String; + FIELD c blacklist Ljava/util/List; + METHOD a build ()Lnone/bqr; + METHOD a withSuffix (Ljava/lang/String;)Lnone/bqr$a; + ARG 0 suffix + METHOD a withNameFrom (Lnone/asz;)Lnone/bqr$a; + ARG 0 property + METHOD a withoutProperties ([Lnone/asz;)Lnone/bqr$a; + ARG 0 property + FIELD a nameSrc Lnone/asz; + FIELD c suffix Ljava/lang/String; + FIELD d blacklist Ljava/util/List; + METHOD a getModelName (Lnone/asj;)Lnone/bzo; + ARG 0 state + METHOD a getValueStringAndRemove (Lnone/asz;Ljava/util/Map;)Ljava/lang/String; + ARG 0 property + ARG 1 propertyMap diff --git a/mappings/net/minecraft/client/render/block/state/StateModelMapperBase.mapping b/mappings/net/minecraft/client/render/block/state/StateModelMapperBase.mapping new file mode 100644 index 0000000000..866baa3f82 --- /dev/null +++ b/mappings/net/minecraft/client/render/block/state/StateModelMapperBase.mapping @@ -0,0 +1,11 @@ +CLASS none/bqo net/minecraft/client/render/block/state/StateModelMapperBase + FIELD b stateMap Ljava/util/Map; + METHOD a getVariantName (Ljava/util/Map;)Ljava/lang/String; + ARG 0 propertyMap + METHOD a getStateMap (Lnone/akw;)Ljava/util/Map; + ARG 0 block + METHOD a getModelName (Lnone/asj;)Lnone/bzo; + ARG 0 state + METHOD a getValueString (Lnone/asz;Ljava/lang/Comparable;)Ljava/lang/String; + ARG 0 property + ARG 1 value diff --git a/mappings/net/minecraft/client/render/block/state/StateModelMapperSimple.mapping b/mappings/net/minecraft/client/render/block/state/StateModelMapperSimple.mapping new file mode 100644 index 0000000000..c77a36dfbb --- /dev/null +++ b/mappings/net/minecraft/client/render/block/state/StateModelMapperSimple.mapping @@ -0,0 +1,3 @@ +CLASS none/bqq net/minecraft/client/render/block/state/StateModelMapperSimple + METHOD a getModelName (Lnone/asj;)Lnone/bzo; + ARG 0 state diff --git a/mappings/net/minecraft/client/render/model/ModelManager.mapping b/mappings/net/minecraft/client/render/model/ModelManager.mapping index 315a7ee386..f549a3c332 100644 --- a/mappings/net/minecraft/client/render/model/ModelManager.mapping +++ b/mappings/net/minecraft/client/render/model/ModelManager.mapping @@ -4,9 +4,11 @@ CLASS none/bzm net/minecraft/client/render/model/ModelManager FIELD c LOGGER Lorg/apache/logging/log4j/Logger; FIELD d MISSING_MODEL Ljava/lang/String; FIELD e BUILTIN_MODEL_DEFS Ljava/util/Map; + FIELD f ARROW_JOINER Lcom/google/common/base/Joiner; FIELD g resourceContainer Lnone/bya; FIELD i models Ljava/util/Map; FIELD l spriteAtlas Lnone/bxa; + FIELD m blockStateMaps Lnone/bpl; FIELD p modelRegistry Lnone/di; FIELD q EMPTY_MODEL Ljava/lang/String; FIELD r BUILTIN_GENERATED Lnone/bpu; diff --git a/mappings/net/minecraft/client/sortme/BlockVariantContainer.mapping b/mappings/net/minecraft/client/sortme/BlockVariantContainer.mapping new file mode 100644 index 0000000000..b9054c0ed2 --- /dev/null +++ b/mappings/net/minecraft/client/sortme/BlockVariantContainer.mapping @@ -0,0 +1,2 @@ +CLASS none/bpv net/minecraft/client/sortme/BlockVariantContainer + FIELD a GSON Lcom/google/gson/Gson; diff --git a/mappings/none/bqo.mapping b/mappings/none/bqo.mapping deleted file mode 100644 index cb34ba8dd0..0000000000 --- a/mappings/none/bqo.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/bqo - METHOD a getStateMap (Lnone/akw;)Ljava/util/Map; - ARG 0 block