From d24dec94fb07ecd75b71706fd110a6ab00ff2d87 Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Sun, 8 Mar 2020 17:23:40 -0500 Subject: [PATCH] =?UTF-8?q?Plant=20block,=20smithing=20table=20container,?= =?UTF-8?q?=20data=20gen,=20dfu,=20dynamic=20seriali=E2=80=A6=20(#1148)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Plant block, smithing table container, data gen, dfu, dynamic serializable boolean Signed-off-by: liach * updateresult Signed-off-by: liach * Some biome sound and container screen etc Signed-off-by: liach * More stuff block state model generator is too big, maybe need cloak (enigma too slow) Signed-off-by: liach * Update mappings/net/minecraft/container/ForgingContainer.mapping * conatiner name -> screen title Signed-off-by: liach * Document the 3 types of sounds; biome ambient sound player -> effect sound player Signed-off-by: liach * Update ModelIds.mapping * container -> screen handler Signed-off-by: liach * Update mappings/net/minecraft/client/gui/screen/ingame/SmithingScreen.mapping Missed this boi Co-authored-by: liach --- .../block/AbstractPlantBlock.mapping | 1 + .../block/AbstractPlantPartBlock.mapping | 11 ++ .../block/AbstractPlantStemBlock.mapping | 12 ++ .../block/SmithingTableBlock.mapping | 1 + .../gui/screen/ingame/ForgingScreen.mapping | 7 ++ .../gui/screen/ingame/SmithingScreen.mapping | 6 + .../entity/model/CrossbowPosing.mapping | 11 ++ .../sound/BiomeEffectSoundPlayer.mapping | 24 ++++ .../client/sound/MovingSoundInstance.mapping | 1 + .../sound/PositionedSoundInstance.mapping | 12 ++ .../BlockStateDefinitionProvider.mapping | 17 +++ .../data/client/ItemModelGenerator.mapping | 16 +++ .../model/BlockStateModelGenerator.mapping | 3 + .../client/model/BlockStateSupplier.mapping | 2 + .../client/model/BlockStateVariant.mapping | 10 ++ .../model/BlockStateVariantManager.mapping | 53 ++++++++ .../minecraft/data/client/model/Model.mapping | 18 +++ .../data/client/model/ModelIds.mapping | 15 +++ .../data/client/model/Models.mapping | 15 +++ .../model/MultipartBlockStateSupplier.mapping | 25 ++++ .../data/client/model/Properties.mapping | 9 ++ .../data/client/model/PropertiesEntry.mapping | 8 ++ .../client/model/SimpleModelSupplier.mapping | 4 + .../data/client/model/Texture.mapping | 117 ++++++++++++++++++ .../data/client/model/TextureKey.mapping | 10 ++ .../data/client/model/TexturedModel.mapping | 54 ++++++++ .../data/client/model/VariantSetting.mapping | 14 +++ .../data/client/model/VariantSettings.mapping | 10 ++ .../model/VariantsBlockStateSupplier.mapping | 14 +++ .../minecraft/data/client/model/When.mapping | 35 ++++++ .../fix/EntityProjectileOwnerFix.mapping | 14 +++ .../resource/ResourceReloadListener.mapping | 2 +- .../screen/ForgingScreenHandler.mapping | 19 +++ .../screen/SmithingScreenHandler.mapping | 9 ++ .../net/minecraft/sound/SoundCategory.mapping | 1 - .../util/DynamicSerializableBoolean.mapping | 8 ++ .../net/minecraft/world/biome/Biome.mapping | 3 + .../world/biome/BiomeEffects.mapping | 39 ++++++ .../world/biome/source/BiomeAccess.mapping | 4 + 39 files changed, 632 insertions(+), 2 deletions(-) create mode 100644 mappings/net/minecraft/block/AbstractPlantBlock.mapping create mode 100644 mappings/net/minecraft/block/AbstractPlantPartBlock.mapping create mode 100644 mappings/net/minecraft/block/AbstractPlantStemBlock.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/ingame/SmithingScreen.mapping create mode 100644 mappings/net/minecraft/client/render/entity/model/CrossbowPosing.mapping create mode 100644 mappings/net/minecraft/client/sound/BiomeEffectSoundPlayer.mapping create mode 100644 mappings/net/minecraft/data/client/BlockStateDefinitionProvider.mapping create mode 100644 mappings/net/minecraft/data/client/ItemModelGenerator.mapping create mode 100644 mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping create mode 100644 mappings/net/minecraft/data/client/model/BlockStateSupplier.mapping create mode 100644 mappings/net/minecraft/data/client/model/BlockStateVariant.mapping create mode 100644 mappings/net/minecraft/data/client/model/BlockStateVariantManager.mapping create mode 100644 mappings/net/minecraft/data/client/model/Model.mapping create mode 100644 mappings/net/minecraft/data/client/model/ModelIds.mapping create mode 100644 mappings/net/minecraft/data/client/model/Models.mapping create mode 100644 mappings/net/minecraft/data/client/model/MultipartBlockStateSupplier.mapping create mode 100644 mappings/net/minecraft/data/client/model/Properties.mapping create mode 100644 mappings/net/minecraft/data/client/model/PropertiesEntry.mapping create mode 100644 mappings/net/minecraft/data/client/model/SimpleModelSupplier.mapping create mode 100644 mappings/net/minecraft/data/client/model/Texture.mapping create mode 100644 mappings/net/minecraft/data/client/model/TextureKey.mapping create mode 100644 mappings/net/minecraft/data/client/model/TexturedModel.mapping create mode 100644 mappings/net/minecraft/data/client/model/VariantSetting.mapping create mode 100644 mappings/net/minecraft/data/client/model/VariantSettings.mapping create mode 100644 mappings/net/minecraft/data/client/model/VariantsBlockStateSupplier.mapping create mode 100644 mappings/net/minecraft/data/client/model/When.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/EntityProjectileOwnerFix.mapping create mode 100644 mappings/net/minecraft/screen/ForgingScreenHandler.mapping create mode 100644 mappings/net/minecraft/screen/SmithingScreenHandler.mapping create mode 100644 mappings/net/minecraft/util/DynamicSerializableBoolean.mapping diff --git a/mappings/net/minecraft/block/AbstractPlantBlock.mapping b/mappings/net/minecraft/block/AbstractPlantBlock.mapping new file mode 100644 index 0000000000..c40340a380 --- /dev/null +++ b/mappings/net/minecraft/block/AbstractPlantBlock.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_4864 net/minecraft/block/AbstractPlantBlock diff --git a/mappings/net/minecraft/block/AbstractPlantPartBlock.mapping b/mappings/net/minecraft/block/AbstractPlantPartBlock.mapping new file mode 100644 index 0000000000..a71e0406ae --- /dev/null +++ b/mappings/net/minecraft/block/AbstractPlantPartBlock.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_4863 net/minecraft/block/AbstractPlantPartBlock + FIELD field_22507 growthDirection Lnet/minecraft/class_2350; + FIELD field_22508 tickWater Z + METHOD (Lnet/minecraft/class_2248$class_2251;Lnet/minecraft/class_2350;Z)V + ARG 1 settings + ARG 2 growthDirection + ARG 3 tickWater + METHOD method_24945 getStem ()Lnet/minecraft/class_4865; + METHOD method_24946 getPlant ()Lnet/minecraft/class_2248; + METHOD method_24947 canAttachTo (Lnet/minecraft/class_2248;)Z + ARG 1 block diff --git a/mappings/net/minecraft/block/AbstractPlantStemBlock.mapping b/mappings/net/minecraft/block/AbstractPlantStemBlock.mapping new file mode 100644 index 0000000000..4efc8761d1 --- /dev/null +++ b/mappings/net/minecraft/block/AbstractPlantStemBlock.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_4865 net/minecraft/block/AbstractPlantStemBlock + FIELD field_22509 AGE Lnet/minecraft/class_2758; + FIELD field_22510 growthChance D + METHOD (Lnet/minecraft/class_2248$class_2251;Lnet/minecraft/class_2350;ZD)V + ARG 1 settings + ARG 2 growthDirection + ARG 3 tickWater + ARG 4 growthChance + METHOD method_24948 getRandomGrowthState (Lnet/minecraft/class_1936;)Lnet/minecraft/class_2680; + ARG 1 world + METHOD method_24949 chooseStemState (Lnet/minecraft/class_2680;)Z + ARG 1 state diff --git a/mappings/net/minecraft/block/SmithingTableBlock.mapping b/mappings/net/minecraft/block/SmithingTableBlock.mapping index 30eb99d786..bd1f919f40 100644 --- a/mappings/net/minecraft/block/SmithingTableBlock.mapping +++ b/mappings/net/minecraft/block/SmithingTableBlock.mapping @@ -1 +1,2 @@ CLASS net/minecraft/class_3717 net/minecraft/block/SmithingTableBlock + FIELD field_22511 SCREEN_TITLE Lnet/minecraft/class_2588; diff --git a/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping new file mode 100644 index 0000000000..321b41505b --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_4894 net/minecraft/client/gui/screen/ingame/ForgingScreen + FIELD field_22794 texture Lnet/minecraft/class_2960; + METHOD method_25444 renderForeground (IIF)V + ARG 1 mouseX + ARG 2 mouseY + ARG 3 delta + METHOD method_25445 setup ()V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/SmithingScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/SmithingScreen.mapping new file mode 100644 index 0000000000..d9c7462422 --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/ingame/SmithingScreen.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_4895 net/minecraft/client/gui/screen/ingame/SmithingScreen + FIELD field_22795 TEXTURE Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_4862;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V + ARG 1 handler + ARG 2 playerInventory + ARG 3 title diff --git a/mappings/net/minecraft/client/render/entity/model/CrossbowPosing.mapping b/mappings/net/minecraft/client/render/entity/model/CrossbowPosing.mapping new file mode 100644 index 0000000000..01d414ddba --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/model/CrossbowPosing.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_4896 net/minecraft/client/render/entity/model/CrossbowPosing + METHOD method_25446 charge (Lnet/minecraft/class_630;Lnet/minecraft/class_630;Lnet/minecraft/class_1309;Z)V + ARG 0 holdingArm + ARG 1 pullingArm + ARG 2 actor + ARG 3 rightArmed + METHOD method_25447 hold (Lnet/minecraft/class_630;Lnet/minecraft/class_630;Lnet/minecraft/class_630;Z)V + ARG 0 holdingArm + ARG 1 otherArm + ARG 2 head + ARG 3 rightArmed diff --git a/mappings/net/minecraft/client/sound/BiomeEffectSoundPlayer.mapping b/mappings/net/minecraft/client/sound/BiomeEffectSoundPlayer.mapping new file mode 100644 index 0000000000..cd92408590 --- /dev/null +++ b/mappings/net/minecraft/client/sound/BiomeEffectSoundPlayer.mapping @@ -0,0 +1,24 @@ +CLASS net/minecraft/class_4897 net/minecraft/client/sound/BiomeEffectSoundPlayer + FIELD field_22796 player Lnet/minecraft/class_746; + FIELD field_22797 soundManager Lnet/minecraft/class_1144; + FIELD field_22798 biomeAccess Lnet/minecraft/class_4543; + FIELD field_22799 random Ljava/util/Random; + FIELD field_22800 soundLoops Lit/unimi/dsi/fastutil/objects/Object2ObjectArrayMap; + FIELD field_22801 moodSound Ljava/util/Optional; + FIELD field_22802 additionsSound Ljava/util/Optional; + FIELD field_22803 remainingTicks I + FIELD field_22804 activeBiome Lnet/minecraft/class_1959; + METHOD (Lnet/minecraft/class_746;Lnet/minecraft/class_1144;Lnet/minecraft/class_4543;)V + ARG 1 player + ARG 2 soundManager + ARG 3 biomeAccess + METHOD method_25461 chooseDuration (Ljava/util/Random;)I + ARG 0 random + METHOD method_25462 findDarkCoveredPosition ()Lnet/minecraft/class_2338; + CLASS class_4898 MusicLoop + FIELD field_22805 delta I + FIELD field_22806 strength I + METHOD (Lnet/minecraft/class_3414;)V + ARG 1 sound + METHOD method_25464 fadeOut ()V + METHOD method_25465 fadeIn ()V diff --git a/mappings/net/minecraft/client/sound/MovingSoundInstance.mapping b/mappings/net/minecraft/client/sound/MovingSoundInstance.mapping index 9404b1972a..53df5c85a9 100644 --- a/mappings/net/minecraft/client/sound/MovingSoundInstance.mapping +++ b/mappings/net/minecraft/client/sound/MovingSoundInstance.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_1101 net/minecraft/client/sound/MovingSoundInstance FIELD field_5438 done Z + METHOD method_24876 setDone ()V diff --git a/mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping b/mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping index ebf2327cae..78f7c1c176 100644 --- a/mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping +++ b/mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping @@ -24,6 +24,7 @@ CLASS net/minecraft/class_1109 net/minecraft/client/sound/PositionedSoundInstanc ARG 2 category ARG 3 volume ARG 4 pitch + ARG 5 pos METHOD (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFZILnet/minecraft/class_1113$class_1114;FFF)V ARG 1 sound ARG 2 category @@ -35,6 +36,17 @@ CLASS net/minecraft/class_1109 net/minecraft/client/sound/PositionedSoundInstanc ARG 8 x ARG 9 y ARG 10 z + METHOD method_24877 ambient (Lnet/minecraft/class_3414;FF)Lnet/minecraft/class_1109; + ARG 0 sound + ARG 1 volume + ARG 2 pitch + METHOD method_25466 ambient (Lnet/minecraft/class_3414;)Lnet/minecraft/class_1109; + ARG 0 sound + METHOD method_25467 ambient (Lnet/minecraft/class_3414;FFF)Lnet/minecraft/class_1109; + ARG 0 sound + ARG 1 x + ARG 2 y + ARG 3 z METHOD method_4757 master (Lnet/minecraft/class_3414;FF)Lnet/minecraft/class_1109; ARG 0 sound ARG 1 volume diff --git a/mappings/net/minecraft/data/client/BlockStateDefinitionProvider.mapping b/mappings/net/minecraft/data/client/BlockStateDefinitionProvider.mapping new file mode 100644 index 0000000000..614c471b78 --- /dev/null +++ b/mappings/net/minecraft/data/client/BlockStateDefinitionProvider.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/class_4916 net/minecraft/data/client/BlockStateDefinitionProvider + FIELD field_22845 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_22846 GSON Lcom/google/gson/Gson; + FIELD field_22847 generator Lnet/minecraft/class_2403; + METHOD (Lnet/minecraft/class_2403;)V + ARG 1 generator + METHOD method_25735 writeJsons (Lnet/minecraft/class_2408;Ljava/nio/file/Path;Ljava/util/Map;Ljava/util/function/BiFunction;)V + ARG 1 cache + ARG 2 root + ARG 3 jsons + ARG 4 locator + METHOD method_25736 getBlockStateJsonPath (Ljava/nio/file/Path;Lnet/minecraft/class_2248;)Ljava/nio/file/Path; + ARG 0 root + ARG 1 block + METHOD method_25737 getModelJsonPath (Ljava/nio/file/Path;Lnet/minecraft/class_2960;)Ljava/nio/file/Path; + ARG 0 root + ARG 1 id diff --git a/mappings/net/minecraft/data/client/ItemModelGenerator.mapping b/mappings/net/minecraft/data/client/ItemModelGenerator.mapping new file mode 100644 index 0000000000..d10713dae1 --- /dev/null +++ b/mappings/net/minecraft/data/client/ItemModelGenerator.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_4915 net/minecraft/data/client/ItemModelGenerator + FIELD field_22844 writer Ljava/util/function/BiConsumer; + METHOD (Ljava/util/function/BiConsumer;)V + ARG 1 writer + METHOD method_25731 register ()V + METHOD method_25732 register (Lnet/minecraft/class_1792;Lnet/minecraft/class_1792;Lnet/minecraft/class_4942;)V + ARG 1 item + ARG 2 texture + ARG 3 model + METHOD method_25733 register (Lnet/minecraft/class_1792;Lnet/minecraft/class_4942;)V + ARG 1 item + ARG 2 model + METHOD method_25734 register (Lnet/minecraft/class_1792;Ljava/lang/String;Lnet/minecraft/class_4942;)V + ARG 1 item + ARG 2 suffix + ARG 3 model diff --git a/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping b/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping new file mode 100644 index 0000000000..8867dcfab6 --- /dev/null +++ b/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_4910 net/minecraft/data/client/model/BlockStateModelGenerator + FIELD field_22830 blockStateWriter Ljava/util/function/Consumer; + FIELD field_22831 modelWriter Ljava/util/function/BiConsumer; diff --git a/mappings/net/minecraft/data/client/model/BlockStateSupplier.mapping b/mappings/net/minecraft/data/client/model/BlockStateSupplier.mapping new file mode 100644 index 0000000000..713c338784 --- /dev/null +++ b/mappings/net/minecraft/data/client/model/BlockStateSupplier.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_4917 net/minecraft/data/client/model/BlockStateSupplier + METHOD method_25743 getBlock ()Lnet/minecraft/class_2248; diff --git a/mappings/net/minecraft/data/client/model/BlockStateVariant.mapping b/mappings/net/minecraft/data/client/model/BlockStateVariant.mapping new file mode 100644 index 0000000000..93848c7846 --- /dev/null +++ b/mappings/net/minecraft/data/client/model/BlockStateVariant.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_4935 net/minecraft/data/client/model/BlockStateVariant + FIELD field_22884 properties Ljava/util/Map; + METHOD method_25824 create ()Lnet/minecraft/class_4935; + METHOD method_25827 union (Lnet/minecraft/class_4935;Lnet/minecraft/class_4935;)Lnet/minecraft/class_4935; + ARG 0 first + ARG 1 second + METHOD method_25828 put (Lnet/minecraft/class_4938;Ljava/lang/Object;)Lnet/minecraft/class_4935; + ARG 1 key + ARG 2 value + METHOD method_25829 toJson (Ljava/util/List;)Lcom/google/gson/JsonElement; diff --git a/mappings/net/minecraft/data/client/model/BlockStateVariantManager.mapping b/mappings/net/minecraft/data/client/model/BlockStateVariantManager.mapping new file mode 100644 index 0000000000..5a71c888c1 --- /dev/null +++ b/mappings/net/minecraft/data/client/model/BlockStateVariantManager.mapping @@ -0,0 +1,53 @@ +CLASS net/minecraft/class_4926 net/minecraft/data/client/model/BlockStateVariantManager + FIELD field_22863 variants Ljava/util/Map; + METHOD method_25782 getVariants ()Ljava/util/Map; + METHOD method_25783 create (Lnet/minecraft/class_2769;)Lnet/minecraft/class_4926$class_4927; + METHOD method_25784 create (Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;)Lnet/minecraft/class_4926$class_4928; + METHOD method_25785 create (Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;)Lnet/minecraft/class_4926$class_4929; + METHOD method_25786 create (Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;)Lnet/minecraft/class_4926$class_4930; + METHOD method_25787 create (Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;)Lnet/minecraft/class_4926$class_4931; + METHOD method_25790 register (Lnet/minecraft/class_4934;Ljava/util/List;)V + METHOD method_25791 getProperties ()Ljava/util/List; + METHOD method_25792 checkAllPropertyDefinitions ()V + CLASS class_4927 SingleProperty + FIELD field_22864 property Lnet/minecraft/class_2769; + METHOD method_25793 register (Ljava/lang/Comparable;Lnet/minecraft/class_4935;)Lnet/minecraft/class_4926$class_4927; + ARG 1 value + ARG 2 variant + METHOD method_25794 register (Ljava/lang/Comparable;Ljava/util/List;)Lnet/minecraft/class_4926$class_4927; + ARG 1 value + ARG 2 variants + METHOD method_25795 register (Ljava/util/function/Function;)Lnet/minecraft/class_4926; + ARG 1 variantFactory + CLASS class_4928 DoubleProperty + FIELD field_22865 first Lnet/minecraft/class_2769; + FIELD field_22866 second Lnet/minecraft/class_2769; + METHOD method_25797 register (Ljava/lang/Comparable;Ljava/lang/Comparable;Lnet/minecraft/class_4935;)Lnet/minecraft/class_4926$class_4928; + METHOD method_25798 register (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/util/List;)Lnet/minecraft/class_4926$class_4928; + METHOD method_25800 register (Ljava/util/function/BiFunction;)Lnet/minecraft/class_4926; + ARG 1 variantFactory + METHOD method_25803 registerVariants (Ljava/util/function/BiFunction;)Lnet/minecraft/class_4926; + ARG 1 variantsFactory + CLASS class_4929 TripleProperty + FIELD field_22867 first Lnet/minecraft/class_2769; + FIELD field_22868 second Lnet/minecraft/class_2769; + FIELD field_22869 third Lnet/minecraft/class_2769; + METHOD method_25805 register (Lnet/minecraft/class_4926$class_4932;)Lnet/minecraft/class_4926; + METHOD method_25806 register (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Lnet/minecraft/class_4935;)Lnet/minecraft/class_4926$class_4929; + METHOD method_25807 register (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/util/List;)Lnet/minecraft/class_4926$class_4929; + CLASS class_4930 QuadrupleProperty + FIELD field_22870 first Lnet/minecraft/class_2769; + FIELD field_22871 second Lnet/minecraft/class_2769; + FIELD field_22872 third Lnet/minecraft/class_2769; + FIELD field_22873 fourth Lnet/minecraft/class_2769; + METHOD method_25811 register (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Lnet/minecraft/class_4935;)Lnet/minecraft/class_4926$class_4930; + METHOD method_25812 register (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/util/List;)Lnet/minecraft/class_4926$class_4930; + CLASS class_4931 QuintupleProperty + FIELD field_22874 first Lnet/minecraft/class_2769; + FIELD field_22875 second Lnet/minecraft/class_2769; + FIELD field_22876 third Lnet/minecraft/class_2769; + FIELD field_22877 fourth Lnet/minecraft/class_2769; + FIELD field_22878 fifth Lnet/minecraft/class_2769; + METHOD method_25813 register (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Lnet/minecraft/class_4935;)Lnet/minecraft/class_4926$class_4931; + METHOD method_25814 register (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/util/List;)Lnet/minecraft/class_4926$class_4931; + CLASS class_4932 TriFunction diff --git a/mappings/net/minecraft/data/client/model/Model.mapping b/mappings/net/minecraft/data/client/model/Model.mapping new file mode 100644 index 0000000000..d621e187e5 --- /dev/null +++ b/mappings/net/minecraft/data/client/model/Model.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/class_4942 net/minecraft/data/client/model/Model + FIELD field_22901 parent Ljava/util/Optional; + FIELD field_22902 requiredTextures Ljava/util/Set; + FIELD field_22903 variant Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;[Lnet/minecraft/class_4945;)V + ARG 1 parent + ARG 2 variant + ARG 3 requiredTextures + METHOD method_25846 upload (Lnet/minecraft/class_2248;Lnet/minecraft/class_4944;Ljava/util/function/BiConsumer;)Lnet/minecraft/class_2960; + METHOD method_25847 upload (Lnet/minecraft/class_2248;Ljava/lang/String;Lnet/minecraft/class_4944;Ljava/util/function/BiConsumer;)Lnet/minecraft/class_2960; + ARG 2 suffix + METHOD method_25850 createTextureMap (Lnet/minecraft/class_4944;)Ljava/util/Map; + METHOD method_25852 upload (Lnet/minecraft/class_2960;Lnet/minecraft/class_4944;Ljava/util/function/BiConsumer;)Lnet/minecraft/class_2960; + ARG 1 id + ARG 2 texture + ARG 3 writer + METHOD method_25853 uploadWithoutVariant (Lnet/minecraft/class_2248;Ljava/lang/String;Lnet/minecraft/class_4944;Ljava/util/function/BiConsumer;)Lnet/minecraft/class_2960; + ARG 2 suffix diff --git a/mappings/net/minecraft/data/client/model/ModelIds.mapping b/mappings/net/minecraft/data/client/model/ModelIds.mapping new file mode 100644 index 0000000000..d9026d513b --- /dev/null +++ b/mappings/net/minecraft/data/client/model/ModelIds.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_4941 net/minecraft/data/client/model/ModelIds + METHOD method_25840 getItemModelId (Lnet/minecraft/class_1792;)Lnet/minecraft/class_2960; + ARG 0 item + METHOD method_25841 getItemSubModelId (Lnet/minecraft/class_1792;Ljava/lang/String;)Lnet/minecraft/class_2960; + ARG 0 item + ARG 1 suffix + METHOD method_25842 getBlockModelId (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2960; + ARG 0 block + METHOD method_25843 getBlockSubModelId (Lnet/minecraft/class_2248;Ljava/lang/String;)Lnet/minecraft/class_2960; + ARG 0 block + ARG 1 suffix + METHOD method_25844 getMinecraftNamespacedBlock (Ljava/lang/String;)Lnet/minecraft/class_2960; + ARG 0 name + METHOD method_25845 getMinecraftNamespacedItem (Ljava/lang/String;)Lnet/minecraft/class_2960; + ARG 0 name diff --git a/mappings/net/minecraft/data/client/model/Models.mapping b/mappings/net/minecraft/data/client/model/Models.mapping new file mode 100644 index 0000000000..7d5665f25e --- /dev/null +++ b/mappings/net/minecraft/data/client/model/Models.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_4943 net/minecraft/data/client/model/Models + FIELD field_22908 PARTICLE Lnet/minecraft/class_4942; + FIELD field_22958 STEM_GROWTH_STAGES [Lnet/minecraft/class_4942; + METHOD method_25855 block (Ljava/lang/String;Ljava/lang/String;[Lnet/minecraft/class_4945;)Lnet/minecraft/class_4942; + ARG 0 parent + ARG 1 variant + ARG 2 requiredTextures + METHOD method_25856 block (Ljava/lang/String;[Lnet/minecraft/class_4945;)Lnet/minecraft/class_4942; + ARG 0 parent + ARG 1 requiredTextures + METHOD method_25857 make ([Lnet/minecraft/class_4945;)Lnet/minecraft/class_4942; + ARG 0 requiredTextures + METHOD method_25859 item (Ljava/lang/String;[Lnet/minecraft/class_4945;)Lnet/minecraft/class_4942; + ARG 0 parent + ARG 1 requiredTextures diff --git a/mappings/net/minecraft/data/client/model/MultipartBlockStateSupplier.mapping b/mappings/net/minecraft/data/client/model/MultipartBlockStateSupplier.mapping new file mode 100644 index 0000000000..717df0d88e --- /dev/null +++ b/mappings/net/minecraft/data/client/model/MultipartBlockStateSupplier.mapping @@ -0,0 +1,25 @@ +CLASS net/minecraft/class_4922 net/minecraft/data/client/model/MultipartBlockStateSupplier + FIELD field_22855 block Lnet/minecraft/class_2248; + FIELD field_22856 multiparts Ljava/util/List; + METHOD (Lnet/minecraft/class_2248;)V + ARG 1 block + METHOD method_25758 create (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4922; + ARG 0 block + METHOD method_25760 with (Lnet/minecraft/class_4918;Lnet/minecraft/class_4935;)Lnet/minecraft/class_4922; + METHOD method_25761 with (Lnet/minecraft/class_4918;Ljava/util/List;)Lnet/minecraft/class_4922; + METHOD method_25762 with (Lnet/minecraft/class_4918;[Lnet/minecraft/class_4935;)Lnet/minecraft/class_4922; + METHOD method_25763 with (Lnet/minecraft/class_4935;)Lnet/minecraft/class_4922; + METHOD method_25764 with (Ljava/util/List;)Lnet/minecraft/class_4922; + CLASS class_4923 ConditionalMultipart + FIELD field_22857 when Lnet/minecraft/class_4918; + METHOD (Lnet/minecraft/class_4918;Ljava/util/List;)V + ARG 1 when + ARG 2 variants + CLASS class_4924 Multipart + FIELD field_22858 variants Ljava/util/List; + METHOD (Ljava/util/List;)V + ARG 1 variants + METHOD method_25767 validate (Lnet/minecraft/class_2689;)V + ARG 1 stateManager + METHOD method_25768 extraToJson (Lcom/google/gson/JsonObject;)V + ARG 1 json diff --git a/mappings/net/minecraft/data/client/model/Properties.mapping b/mappings/net/minecraft/data/client/model/Properties.mapping new file mode 100644 index 0000000000..c8ed292d2d --- /dev/null +++ b/mappings/net/minecraft/data/client/model/Properties.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_4934 net/minecraft/data/client/model/Properties + FIELD field_22881 EMPTY Lnet/minecraft/class_4934; + FIELD field_22882 COMPARATOR Ljava/util/Comparator; + FIELD field_22883 propertyValues Ljava/util/List; + METHOD method_25818 empty ()Lnet/minecraft/class_4934; + METHOD method_25819 with (Lnet/minecraft/class_4933;)Lnet/minecraft/class_4934; + METHOD method_25820 with (Lnet/minecraft/class_4934;)Lnet/minecraft/class_4934; + METHOD method_25821 create ([Lnet/minecraft/class_4933;)Lnet/minecraft/class_4934; + METHOD method_25822 asString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/data/client/model/PropertiesEntry.mapping b/mappings/net/minecraft/data/client/model/PropertiesEntry.mapping new file mode 100644 index 0000000000..448f597b79 --- /dev/null +++ b/mappings/net/minecraft/data/client/model/PropertiesEntry.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_4933 net/minecraft/data/client/model/PropertiesEntry + FIELD field_22879 property Lnet/minecraft/class_2769; + FIELD field_22880 value Ljava/lang/Comparable; + METHOD (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)V + ARG 1 property + ARG 2 value + METHOD method_25815 getProperty ()Lnet/minecraft/class_2769; + METHOD method_25816 streamAllFor (Lnet/minecraft/class_2769;)Ljava/util/stream/Stream; diff --git a/mappings/net/minecraft/data/client/model/SimpleModelSupplier.mapping b/mappings/net/minecraft/data/client/model/SimpleModelSupplier.mapping new file mode 100644 index 0000000000..6f4811ec58 --- /dev/null +++ b/mappings/net/minecraft/data/client/model/SimpleModelSupplier.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_4940 net/minecraft/data/client/model/SimpleModelSupplier + FIELD field_22900 parent Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2960;)V + ARG 1 parent diff --git a/mappings/net/minecraft/data/client/model/Texture.mapping b/mappings/net/minecraft/data/client/model/Texture.mapping new file mode 100644 index 0000000000..17faeffb55 --- /dev/null +++ b/mappings/net/minecraft/data/client/model/Texture.mapping @@ -0,0 +1,117 @@ +CLASS net/minecraft/class_4944 net/minecraft/data/client/model/Texture + FIELD field_22997 entries Ljava/util/Map; + FIELD field_22998 inherited Ljava/util/Set; + METHOD method_25860 getModelId (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2960; + ARG 0 block + METHOD method_25861 getInherited ()Ljava/util/stream/Stream; + METHOD method_25862 particle (Lnet/minecraft/class_1792;)Lnet/minecraft/class_4944; + ARG 0 item + METHOD method_25863 getSubModelId (Lnet/minecraft/class_1792;Ljava/lang/String;)Lnet/minecraft/class_2960; + ARG 0 item + ARG 1 suffix + METHOD method_25864 all (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block + METHOD method_25865 stemAndUpper (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 stem + ARG 1 upper + METHOD method_25866 getSubModelId (Lnet/minecraft/class_2248;Ljava/lang/String;)Lnet/minecraft/class_2960; + ARG 0 block + ARG 1 suffix + METHOD method_25867 getTexture (Lnet/minecraft/class_4945;)Lnet/minecraft/class_2960; + ARG 1 key + METHOD method_25868 put (Lnet/minecraft/class_4945;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944; + ARG 1 key + ARG 2 id + METHOD method_25869 texture (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944; + ARG 0 id + METHOD method_25870 sideEnd (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944; + ARG 0 side + ARG 1 end + METHOD method_25871 layer0 (Lnet/minecraft/class_1792;)Lnet/minecraft/class_4944; + ARG 0 item + METHOD method_25872 texture (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block + METHOD method_25873 paneAndTopForEdge (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block + ARG 1 top + METHOD method_25874 inherit (Lnet/minecraft/class_4945;Lnet/minecraft/class_4945;)Lnet/minecraft/class_4944; + ARG 1 parent + ARG 2 child + METHOD method_25875 all (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944; + ARG 0 id + METHOD method_25876 getModelId (Lnet/minecraft/class_1792;)Lnet/minecraft/class_2960; + ARG 0 item + METHOD method_25877 cross (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block + METHOD method_25878 frontSideWithCustomBottom (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block + ARG 1 bottom + METHOD method_25879 copyAndAnd (Lnet/minecraft/class_4945;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944; + ARG 1 key + ARG 2 id + METHOD method_25880 cross (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944; + ARG 0 id + METHOD method_25881 plant (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block + METHOD method_25882 frontTopSide (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 frontTopSideBlock + ARG 1 downBlock + METHOD method_25883 of (Lnet/minecraft/class_4945;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944; + ARG 0 key + ARG 1 id + METHOD method_25884 plant (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944; + ARG 0 id + METHOD method_25885 rail (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block + METHOD method_25886 rail (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944; + ARG 0 id + METHOD method_25887 wool (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block + METHOD method_25888 stem (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block + METHOD method_25889 crop (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944; + ARG 0 id + METHOD method_25890 pattern (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block + METHOD method_25891 particle (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944; + ARG 0 id + METHOD method_25892 fan (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block + METHOD method_25893 torch (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944; + ARG 0 id + METHOD method_25894 sideEnd (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block + METHOD method_25895 layer0 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944; + ARG 0 id + METHOD method_25896 sideAndTop (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block + METHOD method_25897 sideAndEndForTop (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block + METHOD method_25898 sideTopBottom (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block + METHOD method_25899 wallSideTopBottom (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block + METHOD method_25900 topBottom (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block + METHOD method_25901 particle (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block + METHOD method_25902 fire0 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block + METHOD method_25903 fire1 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block + METHOD method_25904 lantern (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block + METHOD method_25905 torch (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block + METHOD method_25906 sideFrontBack (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block + METHOD method_25907 sideFrontTopBottom (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block + METHOD method_25908 sideFrontTop (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block + METHOD method_25909 sideFrontEnd (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block + METHOD method_25910 top (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 top + METHOD method_25911 layer0 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + ARG 0 block diff --git a/mappings/net/minecraft/data/client/model/TextureKey.mapping b/mappings/net/minecraft/data/client/model/TextureKey.mapping new file mode 100644 index 0000000000..fde919cfcd --- /dev/null +++ b/mappings/net/minecraft/data/client/model/TextureKey.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_4945 net/minecraft/data/client/model/TextureKey + FIELD field_23007 name Ljava/lang/String; + FIELD field_23008 parent Lnet/minecraft/class_4945; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 name + METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_4945;)V + ARG 3 name + ARG 4 parent + METHOD method_25912 getName ()Ljava/lang/String; + METHOD method_25913 getParent ()Lnet/minecraft/class_4945; diff --git a/mappings/net/minecraft/data/client/model/TexturedModel.mapping b/mappings/net/minecraft/data/client/model/TexturedModel.mapping new file mode 100644 index 0000000000..a6e375564c --- /dev/null +++ b/mappings/net/minecraft/data/client/model/TexturedModel.mapping @@ -0,0 +1,54 @@ +CLASS net/minecraft/class_4946 net/minecraft/data/client/model/TexturedModel + FIELD field_23036 CUBE_ALL Lnet/minecraft/class_4946$class_4947; + FIELD field_23037 CUBE_MIRRORED_ALL Lnet/minecraft/class_4946$class_4947; + FIELD field_23038 CUBE_COLUMN Lnet/minecraft/class_4946$class_4947; + FIELD field_23039 CUBE_COLUMN_HORIZONTAL Lnet/minecraft/class_4946$class_4947; + FIELD field_23040 CUBE_BOTTOM_TOP Lnet/minecraft/class_4946$class_4947; + FIELD field_23041 CUBE_TOP Lnet/minecraft/class_4946$class_4947; + FIELD field_23042 ORIENTABLE Lnet/minecraft/class_4946$class_4947; + FIELD field_23043 ORIENTABLE_WITH_BOTTOM Lnet/minecraft/class_4946$class_4947; + FIELD field_23044 CARPET Lnet/minecraft/class_4946$class_4947; + FIELD field_23045 TEMPLATE_GLAZED_TERRACOTTA Lnet/minecraft/class_4946$class_4947; + FIELD field_23046 CORAL_FAN Lnet/minecraft/class_4946$class_4947; + FIELD field_23047 PARTICLE Lnet/minecraft/class_4946$class_4947; + FIELD field_23048 TEMPLATE_ANVIL Lnet/minecraft/class_4946$class_4947; + FIELD field_23049 LEAVES Lnet/minecraft/class_4946$class_4947; + FIELD field_23050 TEMPLATE_LANTERN Lnet/minecraft/class_4946$class_4947; + FIELD field_23051 TEMPLATE_HANGING_LANTERN Lnet/minecraft/class_4946$class_4947; + FIELD field_23052 TEMPLATE_TORCH Lnet/minecraft/class_4946$class_4947; + FIELD field_23053 TEMPLATE_TORCH_WALL Lnet/minecraft/class_4946$class_4947; + FIELD field_23054 TEMPLATE_SEAGRASS Lnet/minecraft/class_4946$class_4947; + FIELD field_23055 END_FOR_TOP_CUBE_COLUMN Lnet/minecraft/class_4946$class_4947; + FIELD field_23056 END_FOR_TOP_CUBE_COLUMN_HORIZONTAL Lnet/minecraft/class_4946$class_4947; + FIELD field_23057 WALL_CUBE_BUTTOM_TOP Lnet/minecraft/class_4946$class_4947; + FIELD field_23058 texture Lnet/minecraft/class_4944; + FIELD field_23059 model Lnet/minecraft/class_4942; + METHOD (Lnet/minecraft/class_4944;Lnet/minecraft/class_4942;)V + ARG 1 texture + ARG 2 model + METHOD method_25914 getModel ()Lnet/minecraft/class_4942; + METHOD method_25915 upload (Lnet/minecraft/class_2248;Ljava/lang/String;Ljava/util/function/BiConsumer;)Lnet/minecraft/class_2960; + ARG 1 block + ARG 2 suffix + ARG 3 writer + METHOD method_25916 upload (Lnet/minecraft/class_2248;Ljava/util/function/BiConsumer;)Lnet/minecraft/class_2960; + ARG 1 block + ARG 2 writer + METHOD method_25917 texture (Ljava/util/function/Consumer;)Lnet/minecraft/class_4946; + ARG 1 textureConsumer + METHOD method_25918 makeFactory (Ljava/util/function/Function;Lnet/minecraft/class_4942;)Lnet/minecraft/class_4946$class_4947; + ARG 0 textureGetter + ARG 1 model + METHOD method_25920 getCubeAll (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4946; + ARG 0 id + METHOD method_25921 getTexture ()Lnet/minecraft/class_4944; + CLASS class_4947 Factory + METHOD method_25922 upload (Lnet/minecraft/class_2248;Ljava/lang/String;Ljava/util/function/BiConsumer;)Lnet/minecraft/class_2960; + ARG 1 block + ARG 2 suffix + ARG 3 writer + METHOD method_25923 upload (Lnet/minecraft/class_2248;Ljava/util/function/BiConsumer;)Lnet/minecraft/class_2960; + ARG 1 block + ARG 2 writer + METHOD method_25924 withTexture (Ljava/util/function/Consumer;)Lnet/minecraft/class_4946$class_4947; + ARG 1 textureConsumer diff --git a/mappings/net/minecraft/data/client/model/VariantSetting.mapping b/mappings/net/minecraft/data/client/model/VariantSetting.mapping new file mode 100644 index 0000000000..4a4963b213 --- /dev/null +++ b/mappings/net/minecraft/data/client/model/VariantSetting.mapping @@ -0,0 +1,14 @@ +CLASS net/minecraft/class_4938 net/minecraft/data/client/model/VariantSetting + FIELD field_22896 key Ljava/lang/String; + FIELD field_22897 writer Ljava/util/function/Function; + METHOD (Ljava/lang/String;Ljava/util/function/Function;)V + ARG 1 key + ARG 2 writer + METHOD method_25836 evaluate (Ljava/lang/Object;)Lnet/minecraft/class_4938$class_4939; + ARG 1 value + CLASS class_4939 Value + FIELD field_22899 value Ljava/lang/Object; + METHOD (Lnet/minecraft/class_4938;Ljava/lang/Object;)V + ARG 2 value + METHOD method_25838 writeTo (Lcom/google/gson/JsonObject;)V + ARG 1 json diff --git a/mappings/net/minecraft/data/client/model/VariantSettings.mapping b/mappings/net/minecraft/data/client/model/VariantSettings.mapping new file mode 100644 index 0000000000..947f748df2 --- /dev/null +++ b/mappings/net/minecraft/data/client/model/VariantSettings.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_4936 net/minecraft/data/client/model/VariantSettings + FIELD field_22885 X Lnet/minecraft/class_4938; + FIELD field_22886 Y Lnet/minecraft/class_4938; + FIELD field_22887 MODEL Lnet/minecraft/class_4938; + FIELD field_22888 UVLOCK Lnet/minecraft/class_4938; + FIELD field_22889 WEIGHT Lnet/minecraft/class_4938; + CLASS class_4937 Rotation + FIELD field_22894 degree I + METHOD (Ljava/lang/String;II)V + ARG 3 degree diff --git a/mappings/net/minecraft/data/client/model/VariantsBlockStateSupplier.mapping b/mappings/net/minecraft/data/client/model/VariantsBlockStateSupplier.mapping new file mode 100644 index 0000000000..e3889986a9 --- /dev/null +++ b/mappings/net/minecraft/data/client/model/VariantsBlockStateSupplier.mapping @@ -0,0 +1,14 @@ +CLASS net/minecraft/class_4925 net/minecraft/data/client/model/VariantsBlockStateSupplier + FIELD field_22859 block Lnet/minecraft/class_2248; + FIELD field_22860 variants Ljava/util/List; + METHOD (Lnet/minecraft/class_2248;Ljava/util/List;)V + ARG 1 block + METHOD method_25769 create (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4925; + ARG 0 block + METHOD method_25770 create (Lnet/minecraft/class_2248;Lnet/minecraft/class_4935;)Lnet/minecraft/class_4925; + ARG 0 block + ARG 1 variant + METHOD method_25771 create (Lnet/minecraft/class_2248;[Lnet/minecraft/class_4935;)Lnet/minecraft/class_4925; + ARG 0 block + ARG 1 variants + METHOD method_25777 intersect (Ljava/util/List;Ljava/util/List;)Ljava/util/List; diff --git a/mappings/net/minecraft/data/client/model/When.mapping b/mappings/net/minecraft/data/client/model/When.mapping new file mode 100644 index 0000000000..57f984c858 --- /dev/null +++ b/mappings/net/minecraft/data/client/model/When.mapping @@ -0,0 +1,35 @@ +CLASS net/minecraft/class_4918 net/minecraft/data/client/model/When + METHOD method_25744 create ()Lnet/minecraft/class_4918$class_4921; + METHOD method_25745 validate (Lnet/minecraft/class_2689;)V + ARG 1 stateManager + METHOD method_25746 anyOf ([Lnet/minecraft/class_4918;)Lnet/minecraft/class_4918; + ARG 0 conditions + CLASS class_4919 LogicalCondition + FIELD field_22848 operator Lnet/minecraft/class_4918$class_4920; + FIELD field_22849 components Ljava/util/List; + METHOD (Lnet/minecraft/class_4918$class_4920;Ljava/util/List;)V + ARG 1 operator + ARG 2 components + CLASS class_4920 LogicalOperator + FIELD field_22852 name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 name + CLASS class_4921 PropertyCondition + FIELD field_22854 properties Ljava/util/Map; + METHOD method_25751 set (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Lnet/minecraft/class_4918$class_4921; + ARG 1 property + ARG 2 value + METHOD method_25752 set (Lnet/minecraft/class_2769;Ljava/lang/Comparable;[Ljava/lang/Comparable;)Lnet/minecraft/class_4918$class_4921; + ARG 1 property + ARG 2 value + ARG 3 otherValues + METHOD method_25753 set (Lnet/minecraft/class_2769;Ljava/lang/String;)V + ARG 1 property + ARG 2 value + METHOD method_25754 name (Lnet/minecraft/class_2769;Ljava/util/stream/Stream;)Ljava/lang/String; + ARG 0 property + ARG 1 valueStream + METHOD method_25757 name (Lnet/minecraft/class_2769;Ljava/lang/Comparable;[Ljava/lang/Comparable;)Ljava/lang/String; + ARG 0 property + ARG 1 value + ARG 2 otherValues diff --git a/mappings/net/minecraft/datafixer/fix/EntityProjectileOwnerFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityProjectileOwnerFix.mapping new file mode 100644 index 0000000000..8d951e70df --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/EntityProjectileOwnerFix.mapping @@ -0,0 +1,14 @@ +CLASS net/minecraft/class_4860 net/minecraft/datafixer/fix/EntityProjectileOwnerFix + METHOD method_24898 makeUuidArray (JJ)[I + ARG 0 most + ARG 2 least + METHOD method_24899 moveFlatOwnerMostLeastToArray (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + METHOD method_24900 insertOwnerUuidArray (Lcom/mojang/datafixers/Dynamic;JJ)Lcom/mojang/datafixers/Dynamic; + ARG 1 dynamic + ARG 2 most + ARG 4 least + METHOD method_24901 fixEntities (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; + METHOD method_24902 update (Lcom/mojang/datafixers/Typed;Ljava/lang/String;Ljava/util/function/Function;)Lcom/mojang/datafixers/Typed; + METHOD method_24904 moveNestedOwnerMostLeastToArray (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + METHOD method_24905 renamePotionToItem (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + METHOD method_24906 moveOwnerToArray (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; diff --git a/mappings/net/minecraft/resource/ResourceReloadListener.mapping b/mappings/net/minecraft/resource/ResourceReloadListener.mapping index 090a491d4d..ed81219cf8 100644 --- a/mappings/net/minecraft/resource/ResourceReloadListener.mapping +++ b/mappings/net/minecraft/resource/ResourceReloadListener.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3302 net/minecraft/resource/ResourceReloadListener METHOD method_22322 getName ()Ljava/lang/String; - METHOD method_25931 (Lnet/minecraft/class_3302$class_4045;Lnet/minecraft/class_3300;Lnet/minecraft/class_3695;Lnet/minecraft/class_3695;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + METHOD method_25931 reload (Lnet/minecraft/class_3302$class_4045;Lnet/minecraft/class_3300;Lnet/minecraft/class_3695;Lnet/minecraft/class_3695;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; ARG 1 synchronizer ARG 2 manager ARG 3 prepareProfiler diff --git a/mappings/net/minecraft/screen/ForgingScreenHandler.mapping b/mappings/net/minecraft/screen/ForgingScreenHandler.mapping new file mode 100644 index 0000000000..afd97482d5 --- /dev/null +++ b/mappings/net/minecraft/screen/ForgingScreenHandler.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/class_4861 net/minecraft/screen/ForgingScreenHandler + FIELD field_22479 output Lnet/minecraft/class_1263; + FIELD field_22480 input Lnet/minecraft/class_1263; + FIELD field_22481 context Lnet/minecraft/class_3914; + FIELD field_22482 player Lnet/minecraft/class_1657; + METHOD (Lnet/minecraft/class_3917;ILnet/minecraft/class_1661;Lnet/minecraft/class_3914;)V + ARG 1 type + ARG 2 syncId + ARG 3 playerInventory + ARG 4 context + METHOD method_24923 onTakeOutput (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; + ARG 1 player + ARG 2 stack + METHOD method_24925 canUse (Lnet/minecraft/class_2680;)Z + ARG 1 state + METHOD method_24927 canTakeOutput (Lnet/minecraft/class_1657;Z)Z + ARG 1 player + ARG 2 present + METHOD method_24928 updateResult ()V diff --git a/mappings/net/minecraft/screen/SmithingScreenHandler.mapping b/mappings/net/minecraft/screen/SmithingScreenHandler.mapping new file mode 100644 index 0000000000..418dd051ac --- /dev/null +++ b/mappings/net/minecraft/screen/SmithingScreenHandler.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_4862 net/minecraft/screen/SmithingScreenHandler + FIELD field_22485 RECIPES Ljava/util/Map; + METHOD (ILnet/minecraft/class_1661;)V + ARG 1 syncId + ARG 2 playerInventory + METHOD (ILnet/minecraft/class_1661;Lnet/minecraft/class_3914;)V + ARG 1 syncId + ARG 2 playerInventory + ARG 3 context diff --git a/mappings/net/minecraft/sound/SoundCategory.mapping b/mappings/net/minecraft/sound/SoundCategory.mapping index a25c181199..2a7f909bf0 100644 --- a/mappings/net/minecraft/sound/SoundCategory.mapping +++ b/mappings/net/minecraft/sound/SoundCategory.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_3419 net/minecraft/sound/SoundCategory - FIELD field_15248 PLAYERS Lnet/minecraft/class_3419; FIELD field_15249 name Ljava/lang/String; FIELD field_15257 NAME_MAP Ljava/util/Map; METHOD (Ljava/lang/String;ILjava/lang/String;)V diff --git a/mappings/net/minecraft/util/DynamicSerializableBoolean.mapping b/mappings/net/minecraft/util/DynamicSerializableBoolean.mapping new file mode 100644 index 0000000000..b24aa27bc1 --- /dev/null +++ b/mappings/net/minecraft/util/DynamicSerializableBoolean.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_4909 net/minecraft/util/DynamicSerializableBoolean + FIELD field_22829 value Z + METHOD (Z)V + ARG 1 value + METHOD method_25506 of (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4909; + ARG 0 dynamic + METHOD method_25507 of (Z)Lnet/minecraft/class_4909; + ARG 0 value diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping index a2976ba2ff..16619688b1 100644 --- a/mappings/net/minecraft/world/biome/Biome.mapping +++ b/mappings/net/minecraft/world/biome/Biome.mapping @@ -32,6 +32,9 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome METHOD method_24376 getFogColor ()I METHOD method_24377 getEffects ()Lnet/minecraft/class_4763; METHOD method_24378 getParticleConfig ()Ljava/util/Optional; + METHOD method_24935 getLoopSound ()Ljava/util/Optional; + METHOD method_24936 getMoodSound ()Ljava/util/Optional; + METHOD method_24937 getAdditionsSound ()Ljava/util/Optional; METHOD method_8684 hasStructureFeature (Lnet/minecraft/class_3195;)Z METHOD method_8685 canSetIce (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Z)Z ARG 1 world diff --git a/mappings/net/minecraft/world/biome/BiomeEffects.mapping b/mappings/net/minecraft/world/biome/BiomeEffects.mapping index fba0d9c226..3afeddb293 100644 --- a/mappings/net/minecraft/world/biome/BiomeEffects.mapping +++ b/mappings/net/minecraft/world/biome/BiomeEffects.mapping @@ -3,15 +3,48 @@ CLASS net/minecraft/class_4763 net/minecraft/world/biome/BiomeEffects FIELD field_22068 waterColor I FIELD field_22069 waterFogColor I FIELD field_22070 particleConfig Ljava/util/Optional; + FIELD field_22491 loopSound Ljava/util/Optional; + FIELD field_22492 moodSound Ljava/util/Optional; + FIELD field_22493 additionsSound Ljava/util/Optional; + METHOD (IIILjava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 fogColor + ARG 2 waterColor + ARG 3 waterFogCOlor + ARG 4 particleConfig + ARG 5 loopSound + ARG 6 moodSound + ARG 7 additionsSound METHOD method_24387 getFogColor ()I METHOD method_24388 getWaterColor ()I METHOD method_24389 getWaterFogColor ()I METHOD method_24390 getParticleConfig ()Ljava/util/Optional; + METHOD method_24939 getLoopSound ()Ljava/util/Optional; + COMMENT Returns the loop sound. + COMMENT + COMMENT

A loop sound is played continuously as an ambient sound whenever the + COMMENT player is in the biome with this effect. + METHOD method_24940 getMoodSound ()Ljava/util/Optional; + COMMENT Returns the mood sound. + COMMENT + COMMENT

A mood sound is played once every 6000 to 17999 ticks as an ambient + COMMENT sound whenever the player is in the biome with this effect and near a + COMMENT position that has 0 sky light and less than 7 combined light. + COMMENT + COMMENT

Overworld biomes have the regular cave sound as their mood sound, + COMMENT while three nether biomes in 20w10a have their dedicated mood sounds. + METHOD method_24941 getAdditionsSound ()Ljava/util/Optional; + COMMENT Returns the additions sound. + COMMENT + COMMENT

An additions sound is played at 1.1% chance every tick as an ambient + COMMENT sound whenever the player is in the biome with this effect. CLASS class_4764 Builder FIELD field_22071 fogColor Ljava/util/OptionalInt; FIELD field_22072 waterColor Ljava/util/OptionalInt; FIELD field_22073 waterFogColor Ljava/util/OptionalInt; FIELD field_22074 particleConfig Ljava/util/Optional; + FIELD field_22494 loopSound Ljava/util/Optional; + FIELD field_22495 moodSound Ljava/util/Optional; + FIELD field_22496 additionsSound Ljava/util/Optional; METHOD method_24391 build ()Lnet/minecraft/class_4763; METHOD method_24392 fogColor (I)Lnet/minecraft/class_4763$class_4764; ARG 1 fogColor @@ -21,3 +54,9 @@ CLASS net/minecraft/class_4763 net/minecraft/world/biome/BiomeEffects ARG 1 waterColor METHOD method_24397 waterFogColor (I)Lnet/minecraft/class_4763$class_4764; ARG 1 waterFogColor + METHOD method_24942 loopSound (Lnet/minecraft/class_3414;)Lnet/minecraft/class_4763$class_4764; + ARG 1 sound + METHOD method_24943 moodSound (Lnet/minecraft/class_3414;)Lnet/minecraft/class_4763$class_4764; + ARG 1 sound + METHOD method_24944 additionsSound (Lnet/minecraft/class_3414;)Lnet/minecraft/class_4763$class_4764; + ARG 1 sound diff --git a/mappings/net/minecraft/world/biome/source/BiomeAccess.mapping b/mappings/net/minecraft/world/biome/source/BiomeAccess.mapping index 1a72b897c7..3710cd7b35 100644 --- a/mappings/net/minecraft/world/biome/source/BiomeAccess.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeAccess.mapping @@ -14,6 +14,10 @@ CLASS net/minecraft/class_4543 net/minecraft/world/biome/source/BiomeAccess ARG 1 biomeX ARG 2 biomeY ARG 3 biomeZ + METHOD method_24938 getBiome (DDD)Lnet/minecraft/class_1959; + ARG 1 x + ARG 3 y + ARG 5 z CLASS class_4544 Storage METHOD method_16359 getBiomeForNoiseGen (III)Lnet/minecraft/class_1959; ARG 1 biomeX