From 553595343399fe4103eefc39e78fdccd530e228f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=ADSollace?= Date: Mon, 12 Apr 2021 14:28:55 +0200 Subject: [PATCH] Data Package Mappings (#2301) * Data package mappings * Fix a whoops * Update mappings/net/minecraft/data/server/RecipesProvider.mapping Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com> * Update mappings/net/minecraft/data/server/RecipesProvider.mapping Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com> * WORKING_DIRECTORY -> DEBUG_OUTPUT_DIRECTORY * eh * Update mappings/net/minecraft/tag/Tag.mapping Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com> * Update mappings/net/minecraft/data/SnbtProvider.mapping * Missed a few things * inputItem -> input + outputItem -> output * Update mappings/net/minecraft/data/SnbtProvider.mapping Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com> Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com> Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com> --- mappings/net/minecraft/data/DataCache.mapping | 8 + .../net/minecraft/data/DataProvider.mapping | 1 + mappings/net/minecraft/data/Main.mapping | 2 + .../net/minecraft/data/SnbtProvider.mapping | 13 +- .../model/BlockStateModelGenerator.mapping | 4 + .../client/model/BlockStateVariantMap.mapping | 161 +++++++++++++++ .../model/MultipartBlockStateSupplier.mapping | 8 + .../data/client/model/Texture.mapping | 11 + .../data/client/model/TexturedModel.mapping | 2 + .../data/client/model/VariantSetting.mapping | 1 + .../model/VariantsBlockStateSupplier.mapping | 2 + .../minecraft/data/client/model/When.mapping | 2 + .../minecraft/data/dev/NbtProvider.mapping | 2 + .../data/report/BiomeListProvider.mapping | 6 +- .../data/report/BlockListProvider.mapping | 4 +- .../data/report/CommandSyntaxProvider.mapping | 4 +- .../data/report/ItemListProvider.mapping | 4 - .../data/report/RegistryDumpProvider.mapping | 6 + .../data/server/AbstractTagProvider.mapping | 4 + .../AdventureTabAdvancementGenerator.mapping | 5 + .../server/BarterLootTableGenerator.mapping | 2 + .../server/BlockLootTableGenerator.mapping | 12 ++ .../server/ChestLootTableGenerator.mapping | 2 + .../server/EndTabAdvancementGenerator.mapping | 2 + .../server/EntityLootTableGenerator.mapping | 6 + .../server/FishingLootTableGenerator.mapping | 2 + .../server/GiftLootTableGenerator.mapping | 2 + .../HusbandryTabAdvancementGenerator.mapping | 7 + .../NetherTabAdvancementGenerator.mapping | 3 + .../data/server/RecipesProvider.mapping | 191 +++++++++++------- .../StoryTabAdvancementGenerator.mapping | 2 + .../recipe/CookingRecipeJsonFactory.mapping | 24 ++- .../recipe/ShapelessRecipeJsonFactory.mapping | 2 +- .../SingleItemRecipeJsonFactory.mapping | 8 +- mappings/net/minecraft/tag/Tag.mapping | 10 + 35 files changed, 437 insertions(+), 88 deletions(-) delete mode 100644 mappings/net/minecraft/data/report/ItemListProvider.mapping create mode 100644 mappings/net/minecraft/data/report/RegistryDumpProvider.mapping diff --git a/mappings/net/minecraft/data/DataCache.mapping b/mappings/net/minecraft/data/DataCache.mapping index 8f5e86bcc7..571b031097 100644 --- a/mappings/net/minecraft/data/DataCache.mapping +++ b/mappings/net/minecraft/data/DataCache.mapping @@ -6,10 +6,18 @@ CLASS net/minecraft/class_2408 net/minecraft/data/DataCache FIELD field_11286 recordFile Ljava/nio/file/Path; FIELD field_11287 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_16743 ignores Ljava/util/Set; + METHOD (Ljava/nio/file/Path;Ljava/lang/String;)V + ARG 1 root + ARG 2 name METHOD method_10323 getOldSha1 (Ljava/nio/file/Path;)Ljava/lang/String; + ARG 1 path METHOD method_10325 updateSha1 (Ljava/nio/file/Path;Ljava/lang/String;)V + ARG 1 path + ARG 2 sha1 METHOD method_10326 write ()V METHOD method_10328 files ()Ljava/util/stream/Stream; METHOD method_10330 contains (Ljava/nio/file/Path;)Z + ARG 1 path METHOD method_10331 deleteAll ()V METHOD method_16674 ignore (Ljava/nio/file/Path;)V + ARG 1 path diff --git a/mappings/net/minecraft/data/DataProvider.mapping b/mappings/net/minecraft/data/DataProvider.mapping index 71a5bdd285..4ae0fe3df9 100644 --- a/mappings/net/minecraft/data/DataProvider.mapping +++ b/mappings/net/minecraft/data/DataProvider.mapping @@ -6,4 +6,5 @@ CLASS net/minecraft/class_2405 net/minecraft/data/DataProvider ARG 0 gson ARG 1 cache ARG 2 output + ARG 3 path METHOD method_10321 getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/data/Main.mapping b/mappings/net/minecraft/data/Main.mapping index 352f6db4d0..16ecd52ce2 100644 --- a/mappings/net/minecraft/data/Main.mapping +++ b/mappings/net/minecraft/data/Main.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/data/Main + METHOD main ([Ljava/lang/String;)V + ARG 0 args METHOD method_4968 create (Ljava/nio/file/Path;Ljava/util/Collection;ZZZZZ)Lnet/minecraft/class_2403; ARG 0 output ARG 1 inputs diff --git a/mappings/net/minecraft/data/SnbtProvider.mapping b/mappings/net/minecraft/data/SnbtProvider.mapping index 8032f523a4..7daf1791b1 100644 --- a/mappings/net/minecraft/data/SnbtProvider.mapping +++ b/mappings/net/minecraft/data/SnbtProvider.mapping @@ -2,12 +2,21 @@ CLASS net/minecraft/class_2463 net/minecraft/data/SnbtProvider FIELD field_11453 root Lnet/minecraft/class_2403; FIELD field_11454 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_20309 write Ljava/util/List; + FIELD field_24615 DEBUG_OUTPUT_DIRECTORY Ljava/nio/file/Path; + METHOD (Lnet/minecraft/class_2403;)V + ARG 1 generator METHOD method_10497 write (Lnet/minecraft/class_2408;Lnet/minecraft/class_2463$class_4511;Ljava/nio/file/Path;)V + ARG 1 cache + ARG 2 data + ARG 3 root METHOD method_10500 getFileName (Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/lang/String; ARG 1 root ARG 2 file METHOD method_21672 addWriter (Lnet/minecraft/class_2463$class_4460;)Lnet/minecraft/class_2463; + ARG 1 tweaker METHOD method_21673 write (Ljava/lang/String;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 1 key + ARG 2 compound METHOD method_22144 toCompressedNbt (Ljava/nio/file/Path;Ljava/lang/String;)Lnet/minecraft/class_2463$class_4511; ARG 1 path ARG 2 name @@ -19,10 +28,12 @@ CLASS net/minecraft/class_2463 net/minecraft/data/SnbtProvider FIELD field_20538 name Ljava/lang/String; FIELD field_20539 bytes [B FIELD field_20540 sha1 Ljava/lang/String; + FIELD field_24616 snbtContent Ljava/lang/String; METHOD (Ljava/lang/String;[BLjava/lang/String;Ljava/lang/String;)V ARG 1 name ARG 2 bytes - ARG 3 sha1 + ARG 3 snbtContent + ARG 4 sha1 CLASS class_5621 CompressionException METHOD (Ljava/nio/file/Path;Ljava/lang/Throwable;)V ARG 1 path diff --git a/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping b/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping index a1f98fd460..34c61feab9 100644 --- a/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping +++ b/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping @@ -398,6 +398,10 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/model/BlockStateModelGe ARG 1 modelId ARG 2 texture ARG 3 modelCollector + METHOD method_35868 registerSingleton (Lnet/minecraft/class_2248;Lnet/minecraft/class_4944;Lnet/minecraft/class_4942;)V + ARG 1 block + ARG 2 texture + ARG 3 model METHOD method_35869 registerLightModel ()V CLASS class_4911 BuiltinModelPool FIELD field_22835 modelId Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/data/client/model/BlockStateVariantMap.mapping b/mappings/net/minecraft/data/client/model/BlockStateVariantMap.mapping index 6c5263380b..c09acee2ae 100644 --- a/mappings/net/minecraft/data/client/model/BlockStateVariantMap.mapping +++ b/mappings/net/minecraft/data/client/model/BlockStateVariantMap.mapping @@ -4,10 +4,25 @@ CLASS net/minecraft/class_4926 net/minecraft/data/client/model/BlockStateVariant 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; + ARG 0 property METHOD method_25784 create (Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;)Lnet/minecraft/class_4926$class_4928; + ARG 0 first + ARG 1 second METHOD method_25785 create (Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;)Lnet/minecraft/class_4926$class_4929; + ARG 0 first + ARG 1 second + ARG 2 third 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; + ARG 0 first + ARG 1 second + ARG 2 third + ARG 3 fourth 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; + ARG 0 first + ARG 1 second + ARG 2 third + ARG 3 fourth + ARG 4 fifth METHOD method_25790 register (Lnet/minecraft/class_4934;Ljava/util/List;)V ARG 1 condition ARG 2 possibleVariants @@ -15,6 +30,8 @@ CLASS net/minecraft/class_4926 net/minecraft/data/client/model/BlockStateVariant METHOD method_25792 checkAllPropertyDefinitions ()V CLASS class_4927 SingleProperty FIELD field_22864 property Lnet/minecraft/class_2769; + METHOD (Lnet/minecraft/class_2769;)V + ARG 1 property METHOD method_25793 register (Ljava/lang/Comparable;Lnet/minecraft/class_4935;)Lnet/minecraft/class_4926$class_4927; ARG 1 value ARG 2 variant @@ -23,35 +40,179 @@ CLASS net/minecraft/class_4926 net/minecraft/data/client/model/BlockStateVariant ARG 2 variants METHOD method_25795 register (Ljava/util/function/Function;)Lnet/minecraft/class_4926; ARG 1 variantFactory + METHOD method_25796 (Ljava/util/function/Function;Ljava/lang/Comparable;)V + ARG 2 value + METHOD method_35877 (Ljava/util/function/Function;Ljava/lang/Comparable;)V + ARG 2 value + METHOD method_35878 registerVariants (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 (Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;)V + ARG 1 first + ARG 2 second METHOD method_25797 register (Ljava/lang/Comparable;Ljava/lang/Comparable;Lnet/minecraft/class_4935;)Lnet/minecraft/class_4926$class_4928; + ARG 1 firstValue + ARG 2 secondValue + ARG 3 variant METHOD method_25798 register (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/util/List;)Lnet/minecraft/class_4926$class_4928; + ARG 1 firstValue + ARG 2 secondValue + ARG 3 variants + METHOD method_25799 (Ljava/lang/Comparable;Ljava/util/function/BiFunction;Ljava/lang/Comparable;)V + ARG 3 secondValue METHOD method_25800 register (Ljava/util/function/BiFunction;)Lnet/minecraft/class_4926; ARG 1 variantFactory + METHOD method_25801 (Ljava/util/function/BiFunction;Ljava/lang/Comparable;)V + ARG 2 firstValue + METHOD method_25802 (Ljava/lang/Comparable;Ljava/util/function/BiFunction;Ljava/lang/Comparable;)V + ARG 3 secondValue METHOD method_25803 registerVariants (Ljava/util/function/BiFunction;)Lnet/minecraft/class_4926; ARG 1 variantsFactory + METHOD method_25804 (Ljava/util/function/BiFunction;Ljava/lang/Comparable;)V + ARG 2 firstValue 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 (Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;)V + ARG 1 first + ARG 2 second + ARG 3 third METHOD method_25805 register (Lnet/minecraft/class_4926$class_4932;)Lnet/minecraft/class_4926; + ARG 1 variantFactory METHOD method_25806 register (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Lnet/minecraft/class_4935;)Lnet/minecraft/class_4926$class_4929; + ARG 1 firstValue + ARG 2 secondValue + ARG 3 thirdValue + ARG 4 variant METHOD method_25807 register (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/util/List;)Lnet/minecraft/class_4926$class_4929; + ARG 1 firstValue + ARG 2 secondValue + ARG 3 thirdValue + ARG 4 variants + METHOD method_25808 (Lnet/minecraft/class_4926$class_4932;Ljava/lang/Comparable;)V + ARG 2 firstValue + METHOD method_25809 (Ljava/lang/Comparable;Lnet/minecraft/class_4926$class_4932;Ljava/lang/Comparable;)V + ARG 3 secondValue + METHOD method_25810 (Ljava/lang/Comparable;Ljava/lang/Comparable;Lnet/minecraft/class_4926$class_4932;Ljava/lang/Comparable;)V + ARG 4 thirdValue + METHOD method_35879 (Ljava/lang/Comparable;Ljava/lang/Comparable;Lnet/minecraft/class_4926$class_4932;Ljava/lang/Comparable;)V + ARG 4 thirdValue + METHOD method_35880 (Ljava/lang/Comparable;Lnet/minecraft/class_4926$class_4932;Ljava/lang/Comparable;)V + ARG 3 secondValue + METHOD method_35881 (Lnet/minecraft/class_4926$class_4932;Ljava/lang/Comparable;)V + ARG 2 firstValue + METHOD method_35882 registerVariants (Lnet/minecraft/class_4926$class_4932;)Lnet/minecraft/class_4926; + ARG 1 variantFactory 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 (Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;)V + ARG 1 first + ARG 2 second + ARG 3 third + ARG 4 fourth 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; + ARG 1 firstValue + ARG 2 secondValue + ARG 3 thirdValue + ARG 4 fourthValue + ARG 5 variant 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; + ARG 1 firstValue + ARG 2 secondValue + ARG 3 thirdValue + ARG 4 fourthValue + ARG 5 variants + METHOD method_35883 (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Lnet/minecraft/class_4926$class_6291;Ljava/lang/Comparable;)V + ARG 5 fourthValue + METHOD method_35884 (Ljava/lang/Comparable;Ljava/lang/Comparable;Lnet/minecraft/class_4926$class_6291;Ljava/lang/Comparable;)V + ARG 4 thirdValue + METHOD method_35885 (Ljava/lang/Comparable;Lnet/minecraft/class_4926$class_6291;Ljava/lang/Comparable;)V + ARG 3 secondValue + METHOD method_35886 register (Lnet/minecraft/class_4926$class_6291;)Lnet/minecraft/class_4926; + ARG 1 variantFactory + METHOD method_35887 (Lnet/minecraft/class_4926$class_6291;Ljava/lang/Comparable;)V + ARG 2 firstValue + METHOD method_35888 (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Lnet/minecraft/class_4926$class_6291;Ljava/lang/Comparable;)V + ARG 5 fourthValue + METHOD method_35889 (Ljava/lang/Comparable;Ljava/lang/Comparable;Lnet/minecraft/class_4926$class_6291;Ljava/lang/Comparable;)V + ARG 4 thirdValue + METHOD method_35890 (Ljava/lang/Comparable;Lnet/minecraft/class_4926$class_6291;Ljava/lang/Comparable;)V + ARG 3 secondValue + METHOD method_35891 registerVariants (Lnet/minecraft/class_4926$class_6291;)Lnet/minecraft/class_4926; + ARG 1 variantFactory + METHOD method_35892 (Lnet/minecraft/class_4926$class_6291;Ljava/lang/Comparable;)V + ARG 2 firstValue 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 (Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;)V + ARG 1 first + ARG 2 second + ARG 3 third + ARG 4 fourth + ARG 5 fifth 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; + ARG 1 firstValue + ARG 2 secondValue + ARG 3 thirdValue + ARG 4 fourthValue + ARG 5 fifthValue + ARG 6 variant 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; + ARG 1 firstValue + ARG 2 secondValue + ARG 3 thirdValue + ARG 4 fourthValue + ARG 5 fifthValue + ARG 6 variants + METHOD method_35893 (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Lnet/minecraft/class_4926$class_6290;Ljava/lang/Comparable;)V + ARG 6 fifthValue + METHOD method_35894 (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Lnet/minecraft/class_4926$class_6290;Ljava/lang/Comparable;)V + ARG 5 fourthValue + METHOD method_35895 (Ljava/lang/Comparable;Ljava/lang/Comparable;Lnet/minecraft/class_4926$class_6290;Ljava/lang/Comparable;)V + ARG 4 thirdValue + METHOD method_35896 (Ljava/lang/Comparable;Lnet/minecraft/class_4926$class_6290;Ljava/lang/Comparable;)V + ARG 3 secondValue + METHOD method_35897 register (Lnet/minecraft/class_4926$class_6290;)Lnet/minecraft/class_4926; + ARG 1 variantFactory + METHOD method_35898 (Lnet/minecraft/class_4926$class_6290;Ljava/lang/Comparable;)V + ARG 2 firstValue + METHOD method_35899 (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Lnet/minecraft/class_4926$class_6290;Ljava/lang/Comparable;)V + ARG 6 fifthValue + METHOD method_35900 (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Lnet/minecraft/class_4926$class_6290;Ljava/lang/Comparable;)V + ARG 5 fourthValue + METHOD method_35901 (Ljava/lang/Comparable;Ljava/lang/Comparable;Lnet/minecraft/class_4926$class_6290;Ljava/lang/Comparable;)V + ARG 4 thirdValue + METHOD method_35902 (Ljava/lang/Comparable;Lnet/minecraft/class_4926$class_6290;Ljava/lang/Comparable;)V + ARG 3 secondValue + METHOD method_35903 registerVariants (Lnet/minecraft/class_4926$class_6290;)Lnet/minecraft/class_4926; + ARG 1 variantFactory + METHOD method_35904 (Lnet/minecraft/class_4926$class_6290;Ljava/lang/Comparable;)V + ARG 2 firstValue CLASS class_4932 TriFunction + METHOD apply (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 one + ARG 2 two + ARG 3 three + CLASS class_6290 QuintFunction + METHOD method_35905 apply (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 one + ARG 2 two + ARG 3 three + ARG 4 four + ARG 5 five + CLASS class_6291 QuadFunction + METHOD method_35906 apply (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 one + ARG 2 two + ARG 3 three + ARG 4 four diff --git a/mappings/net/minecraft/data/client/model/MultipartBlockStateSupplier.mapping b/mappings/net/minecraft/data/client/model/MultipartBlockStateSupplier.mapping index 717df0d88e..a6fc2793af 100644 --- a/mappings/net/minecraft/data/client/model/MultipartBlockStateSupplier.mapping +++ b/mappings/net/minecraft/data/client/model/MultipartBlockStateSupplier.mapping @@ -6,10 +6,18 @@ CLASS net/minecraft/class_4922 net/minecraft/data/client/model/MultipartBlockSta 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; + ARG 1 condition + ARG 2 variant METHOD method_25761 with (Lnet/minecraft/class_4918;Ljava/util/List;)Lnet/minecraft/class_4922; + ARG 1 condition + ARG 2 variants METHOD method_25762 with (Lnet/minecraft/class_4918;[Lnet/minecraft/class_4935;)Lnet/minecraft/class_4922; + ARG 1 condition + ARG 2 variants METHOD method_25763 with (Lnet/minecraft/class_4935;)Lnet/minecraft/class_4922; + ARG 1 variant METHOD method_25764 with (Ljava/util/List;)Lnet/minecraft/class_4922; + ARG 1 variants CLASS class_4923 ConditionalMultipart FIELD field_22857 when Lnet/minecraft/class_4918; METHOD (Lnet/minecraft/class_4918;Ljava/util/List;)V diff --git a/mappings/net/minecraft/data/client/model/Texture.mapping b/mappings/net/minecraft/data/client/model/Texture.mapping index fa7723f5ee..a00845890c 100644 --- a/mappings/net/minecraft/data/client/model/Texture.mapping +++ b/mappings/net/minecraft/data/client/model/Texture.mapping @@ -119,3 +119,14 @@ CLASS net/minecraft/class_4944 net/minecraft/data/client/model/Texture ARG 0 block METHOD method_27168 wallSideEnd (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; ARG 0 block + METHOD method_35908 copy (Lnet/minecraft/class_4945;Lnet/minecraft/class_4945;)Lnet/minecraft/class_4944; + ARG 1 parent + ARG 2 child + METHOD method_35909 register (Lnet/minecraft/class_4945;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944; + ARG 1 key + ARG 2 id + METHOD method_35910 (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944; + ARG 0 top + ARG 1 bottom + METHOD method_35911 wool (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944; + ARG 0 id diff --git a/mappings/net/minecraft/data/client/model/TexturedModel.mapping b/mappings/net/minecraft/data/client/model/TexturedModel.mapping index e333fc6a68..ed67f531b6 100644 --- a/mappings/net/minecraft/data/client/model/TexturedModel.mapping +++ b/mappings/net/minecraft/data/client/model/TexturedModel.mapping @@ -52,3 +52,5 @@ CLASS net/minecraft/class_4946 net/minecraft/data/client/model/TexturedModel METHOD method_25923 upload (Lnet/minecraft/class_2248;Ljava/util/function/BiConsumer;)Lnet/minecraft/class_2960; ARG 1 block ARG 2 writer + METHOD method_35912 andThen (Ljava/util/function/Consumer;)Lnet/minecraft/class_4946$class_4947; + ARG 1 consumer diff --git a/mappings/net/minecraft/data/client/model/VariantSetting.mapping b/mappings/net/minecraft/data/client/model/VariantSetting.mapping index 4a4963b213..644eb87537 100644 --- a/mappings/net/minecraft/data/client/model/VariantSetting.mapping +++ b/mappings/net/minecraft/data/client/model/VariantSetting.mapping @@ -12,3 +12,4 @@ CLASS net/minecraft/class_4938 net/minecraft/data/client/model/VariantSetting ARG 2 value METHOD method_25838 writeTo (Lcom/google/gson/JsonObject;)V ARG 1 json + METHOD method_35907 getParent ()Lnet/minecraft/class_4938; diff --git a/mappings/net/minecraft/data/client/model/VariantsBlockStateSupplier.mapping b/mappings/net/minecraft/data/client/model/VariantsBlockStateSupplier.mapping index 5763a658e1..33878a4b79 100644 --- a/mappings/net/minecraft/data/client/model/VariantsBlockStateSupplier.mapping +++ b/mappings/net/minecraft/data/client/model/VariantsBlockStateSupplier.mapping @@ -28,3 +28,5 @@ CLASS net/minecraft/class_4925 net/minecraft/data/client/model/VariantsBlockStat COMMENT the variant map to contribute property to variant settings COMMENT mappings to the block state file METHOD method_25777 intersect (Ljava/util/List;Ljava/util/List;)Ljava/util/List; + ARG 0 left + ARG 1 right diff --git a/mappings/net/minecraft/data/client/model/When.mapping b/mappings/net/minecraft/data/client/model/When.mapping index 57f984c858..8dd20ca953 100644 --- a/mappings/net/minecraft/data/client/model/When.mapping +++ b/mappings/net/minecraft/data/client/model/When.mapping @@ -4,6 +4,8 @@ CLASS net/minecraft/class_4918 net/minecraft/data/client/model/When ARG 1 stateManager METHOD method_25746 anyOf ([Lnet/minecraft/class_4918;)Lnet/minecraft/class_4918; ARG 0 conditions + METHOD method_35870 allOf ([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; diff --git a/mappings/net/minecraft/data/dev/NbtProvider.mapping b/mappings/net/minecraft/data/dev/NbtProvider.mapping index 8e4f23e7f2..6a6a2adaa7 100644 --- a/mappings/net/minecraft/data/dev/NbtProvider.mapping +++ b/mappings/net/minecraft/data/dev/NbtProvider.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_2461 net/minecraft/data/dev/NbtProvider FIELD field_11449 root Lnet/minecraft/class_2403; FIELD field_11450 LOGGER Lorg/apache/logging/log4j/Logger; + METHOD (Lnet/minecraft/class_2403;)V + ARG 1 root METHOD method_10493 convertNbtToSnbt (Ljava/nio/file/Path;Ljava/lang/String;Ljava/nio/file/Path;)Ljava/nio/file/Path; ARG 0 inputPath ARG 1 location diff --git a/mappings/net/minecraft/data/report/BiomeListProvider.mapping b/mappings/net/minecraft/data/report/BiomeListProvider.mapping index c7124d57e3..55cd429c66 100644 --- a/mappings/net/minecraft/data/report/BiomeListProvider.mapping +++ b/mappings/net/minecraft/data/report/BiomeListProvider.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_5475 net/minecraft/data/report/BiomeListProvider FIELD field_26377 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_26378 GSON Lcom/google/gson/Gson; - FIELD field_26379 dataGenerator Lnet/minecraft/class_2403; + FIELD field_26379 generator Lnet/minecraft/class_2403; METHOD (Lnet/minecraft/class_2403;)V - ARG 1 dataGenerator + ARG 1 generator METHOD method_30682 getPath (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/report/BlockListProvider.mapping b/mappings/net/minecraft/data/report/BlockListProvider.mapping index 41f02d92fd..57358fb9b8 100644 --- a/mappings/net/minecraft/data/report/BlockListProvider.mapping +++ b/mappings/net/minecraft/data/report/BlockListProvider.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_2422 net/minecraft/data/report/BlockListProvider - FIELD field_11307 root Lnet/minecraft/class_2403; + FIELD field_11307 generator Lnet/minecraft/class_2403; FIELD field_17168 GSON Lcom/google/gson/Gson; + METHOD (Lnet/minecraft/class_2403;)V + ARG 1 generator diff --git a/mappings/net/minecraft/data/report/CommandSyntaxProvider.mapping b/mappings/net/minecraft/data/report/CommandSyntaxProvider.mapping index c698be2e37..bd3ab6e3e6 100644 --- a/mappings/net/minecraft/data/report/CommandSyntaxProvider.mapping +++ b/mappings/net/minecraft/data/report/CommandSyntaxProvider.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_2425 net/minecraft/data/report/CommandSyntaxProvider - FIELD field_11321 root Lnet/minecraft/class_2403; + FIELD field_11321 generator Lnet/minecraft/class_2403; FIELD field_17169 GSON Lcom/google/gson/Gson; + METHOD (Lnet/minecraft/class_2403;)V + ARG 1 generator diff --git a/mappings/net/minecraft/data/report/ItemListProvider.mapping b/mappings/net/minecraft/data/report/ItemListProvider.mapping deleted file mode 100644 index 3c6ec5afad..0000000000 --- a/mappings/net/minecraft/data/report/ItemListProvider.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_2427 net/minecraft/data/report/ItemListProvider - FIELD field_11323 root Lnet/minecraft/class_2403; - FIELD field_17170 GSON Lcom/google/gson/Gson; - METHOD method_17175 toJson (Lnet/minecraft/class_2378;)Lcom/google/gson/JsonElement; diff --git a/mappings/net/minecraft/data/report/RegistryDumpProvider.mapping b/mappings/net/minecraft/data/report/RegistryDumpProvider.mapping new file mode 100644 index 0000000000..f658936eda --- /dev/null +++ b/mappings/net/minecraft/data/report/RegistryDumpProvider.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_2427 net/minecraft/data/report/RegistryDumpProvider + FIELD field_11323 generator Lnet/minecraft/class_2403; + FIELD field_17170 GSON Lcom/google/gson/Gson; + METHOD (Lnet/minecraft/class_2403;)V + ARG 1 generator + METHOD method_17175 toJson (Lnet/minecraft/class_2378;)Lcom/google/gson/JsonElement; diff --git a/mappings/net/minecraft/data/server/AbstractTagProvider.mapping b/mappings/net/minecraft/data/server/AbstractTagProvider.mapping index f6c4eaa5ae..31131206a4 100644 --- a/mappings/net/minecraft/data/server/AbstractTagProvider.mapping +++ b/mappings/net/minecraft/data/server/AbstractTagProvider.mapping @@ -35,3 +35,7 @@ CLASS net/minecraft/class_2474 net/minecraft/data/server/AbstractTagProvider ARG 1 elements METHOD method_27171 (Lnet/minecraft/class_2960;)V ARG 1 id + METHOD method_35922 add (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2474$class_5124; + ARG 1 id + METHOD method_35923 addTag (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2474$class_5124; + ARG 1 id diff --git a/mappings/net/minecraft/data/server/AdventureTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/AdventureTabAdvancementGenerator.mapping index 4824098583..2e2562a2d9 100644 --- a/mappings/net/minecraft/data/server/AdventureTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/server/AdventureTabAdvancementGenerator.mapping @@ -1,5 +1,10 @@ CLASS net/minecraft/class_2412 net/minecraft/data/server/AdventureTabAdvancementGenerator FIELD field_11293 BIOMES Ljava/util/List; FIELD field_11294 MONSTERS [Lnet/minecraft/class_1299; + METHOD accept (Ljava/lang/Object;)V + ARG 1 exporter METHOD method_10336 requireListedMobsKilled (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; + ARG 1 task METHOD method_10337 requireListedBiomesVisited (Lnet/minecraft/class_161$class_162;Ljava/util/List;)Lnet/minecraft/class_161$class_162; + ARG 0 task + ARG 1 biomes diff --git a/mappings/net/minecraft/data/server/BarterLootTableGenerator.mapping b/mappings/net/minecraft/data/server/BarterLootTableGenerator.mapping index be021c05ea..d293585e6f 100644 --- a/mappings/net/minecraft/data/server/BarterLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/BarterLootTableGenerator.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_4845 net/minecraft/data/server/BarterLootTableGenerator + METHOD accept (Ljava/lang/Object;)V + ARG 1 exporter diff --git a/mappings/net/minecraft/data/server/BlockLootTableGenerator.mapping b/mappings/net/minecraft/data/server/BlockLootTableGenerator.mapping index 39c8980f4e..fee6e8433d 100644 --- a/mappings/net/minecraft/data/server/BlockLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/BlockLootTableGenerator.mapping @@ -8,6 +8,8 @@ CLASS net/minecraft/class_2430 net/minecraft/data/server/BlockLootTableGenerator FIELD field_11342 WITH_SILK_TOUCH_OR_SHEARS Lnet/minecraft/class_5341$class_210; FIELD field_11343 WITH_SHEARS Lnet/minecraft/class_5341$class_210; FIELD field_16493 lootTables Ljava/util/Map; + METHOD accept (Ljava/lang/Object;)V + ARG 1 exporter METHOD method_10371 grassDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; ARG 0 dropWithShears METHOD method_10372 dropsWithShears (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53; @@ -80,13 +82,20 @@ CLASS net/minecraft/class_2430 net/minecraft/data/server/BlockLootTableGenerator ARG 1 block ARG 2 drop METHOD method_16256 addDrop (Lnet/minecraft/class_2248;Lnet/minecraft/class_1935;)V + ARG 1 block ARG 2 drop METHOD method_16258 addDrop (Lnet/minecraft/class_2248;Lnet/minecraft/class_52$class_53;)V + ARG 1 block ARG 2 lootTable METHOD method_16262 addDropWithSilkTouch (Lnet/minecraft/class_2248;)V + ARG 1 block METHOD method_16285 addPottedPlantDrop (Lnet/minecraft/class_2248;)V + ARG 1 block METHOD method_16293 addDrop (Lnet/minecraft/class_2248;Ljava/util/function/Function;)V + ARG 1 block + ARG 2 lootTableFunction METHOD method_16329 addDrop (Lnet/minecraft/class_2248;)V + ARG 1 block METHOD method_16876 shulkerBoxDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; ARG 0 drop METHOD method_16877 bannerDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; @@ -99,6 +108,7 @@ CLASS net/minecraft/class_2430 net/minecraft/data/server/BlockLootTableGenerator ARG 0 stem ARG 1 drop METHOD method_24817 addDoorDrop (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 0 block METHOD method_26000 addVinePlantDrop (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V ARG 1 block ARG 2 drop @@ -111,3 +121,5 @@ CLASS net/minecraft/class_2430 net/minecraft/data/server/BlockLootTableGenerator ARG 0 candle METHOD method_32225 candleCakeDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; ARG 0 candle + METHOD method_33709 glowBerryDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 0 drop diff --git a/mappings/net/minecraft/data/server/ChestLootTableGenerator.mapping b/mappings/net/minecraft/data/server/ChestLootTableGenerator.mapping index a254f70319..f5212fba11 100644 --- a/mappings/net/minecraft/data/server/ChestLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/ChestLootTableGenerator.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_2432 net/minecraft/data/server/ChestLootTableGenerator + METHOD accept (Ljava/lang/Object;)V + ARG 1 exporter diff --git a/mappings/net/minecraft/data/server/EndTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/EndTabAdvancementGenerator.mapping index 92fe0e7d98..33e017007f 100644 --- a/mappings/net/minecraft/data/server/EndTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/server/EndTabAdvancementGenerator.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_2419 net/minecraft/data/server/EndTabAdvancementGenerator + METHOD accept (Ljava/lang/Object;)V + ARG 1 exporter diff --git a/mappings/net/minecraft/data/server/EntityLootTableGenerator.mapping b/mappings/net/minecraft/data/server/EntityLootTableGenerator.mapping index 0da28efbaa..420f6c9699 100644 --- a/mappings/net/minecraft/data/server/EntityLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/EntityLootTableGenerator.mapping @@ -2,7 +2,13 @@ CLASS net/minecraft/class_2434 net/minecraft/data/server/EntityLootTableGenerato FIELD field_11344 NEEDS_ENTITY_ON_FIRE Lnet/minecraft/class_2048$class_2049; FIELD field_16543 lootTables Ljava/util/Map; FIELD field_19339 ENTITY_TYPES_IN_MISC_GROUP_TO_CHECK Ljava/util/Set; + METHOD accept (Ljava/lang/Object;)V + ARG 1 exporter METHOD method_10401 createForSheep (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53; ARG 0 item METHOD method_16368 register (Lnet/minecraft/class_1299;Lnet/minecraft/class_52$class_53;)V + ARG 1 entityType + ARG 2 lootTable METHOD method_16369 register (Lnet/minecraft/class_2960;Lnet/minecraft/class_52$class_53;)V + ARG 1 entityId + ARG 2 lootTable diff --git a/mappings/net/minecraft/data/server/FishingLootTableGenerator.mapping b/mappings/net/minecraft/data/server/FishingLootTableGenerator.mapping index 39b3e726bd..9d37831480 100644 --- a/mappings/net/minecraft/data/server/FishingLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/FishingLootTableGenerator.mapping @@ -6,3 +6,5 @@ CLASS net/minecraft/class_2437 net/minecraft/data/server/FishingLootTableGenerat FIELD field_11350 NEEDS_JUNGLE_EDGE_BIOME Lnet/minecraft/class_5341$class_210; FIELD field_11351 NEEDS_MODIFIED_JUNGLE_EDGE_BIOME Lnet/minecraft/class_5341$class_210; FIELD field_11352 NEEDS_BAMBOO_JUNGLE_HILLS_BIOME Lnet/minecraft/class_5341$class_210; + METHOD accept (Ljava/lang/Object;)V + ARG 1 exporter diff --git a/mappings/net/minecraft/data/server/GiftLootTableGenerator.mapping b/mappings/net/minecraft/data/server/GiftLootTableGenerator.mapping index 519e620fc9..445e02cd5e 100644 --- a/mappings/net/minecraft/data/server/GiftLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/GiftLootTableGenerator.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_3714 net/minecraft/data/server/GiftLootTableGenerator + METHOD accept (Ljava/lang/Object;)V + ARG 1 exporter diff --git a/mappings/net/minecraft/data/server/HusbandryTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/HusbandryTabAdvancementGenerator.mapping index 4f4abd1548..f10da8605c 100644 --- a/mappings/net/minecraft/data/server/HusbandryTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/server/HusbandryTabAdvancementGenerator.mapping @@ -3,8 +3,15 @@ CLASS net/minecraft/class_2414 net/minecraft/data/server/HusbandryTabAdvancement FIELD field_11296 BREEDABLE_ANIMALS [Lnet/minecraft/class_1299; FIELD field_11297 FISH_BUCKET_ITEMS [Lnet/minecraft/class_1792; FIELD field_11298 FOOD_ITEMS [Lnet/minecraft/class_1792; + METHOD accept (Ljava/lang/Object;)V + ARG 1 exporter METHOD method_10339 requireListedFishCaught (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; + ARG 1 task METHOD method_10340 requireListedFishBucketsFilled (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; + ARG 1 task METHOD method_10341 requireFoodItemsEaten (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; + ARG 1 task METHOD method_10342 requireListedAnimalsBred (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; + ARG 1 task METHOD method_16118 requireAllCatsTamed (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; + ARG 1 task diff --git a/mappings/net/minecraft/data/server/NetherTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/NetherTabAdvancementGenerator.mapping index 6630b1f6ad..8c0db39886 100644 --- a/mappings/net/minecraft/data/server/NetherTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/server/NetherTabAdvancementGenerator.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_2416 net/minecraft/data/server/NetherTabAdvancementGenerator FIELD field_24614 NETHER_BIOMES Ljava/util/List; + FIELD field_25712 PIGLIN_DISTRACTION_PREDICATE Lnet/minecraft/class_2048$class_5258; + METHOD accept (Ljava/lang/Object;)V + ARG 1 exporter diff --git a/mappings/net/minecraft/data/server/RecipesProvider.mapping b/mappings/net/minecraft/data/server/RecipesProvider.mapping index a0cce33880..597e9b6083 100644 --- a/mappings/net/minecraft/data/server/RecipesProvider.mapping +++ b/mappings/net/minecraft/data/server/RecipesProvider.mapping @@ -3,6 +3,14 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipesProvider FIELD field_11374 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_11375 GSON Lcom/google/gson/Gson; FIELD field_28555 VARIANT_FACTORIES Ljava/util/Map; + FIELD field_33420 COAL_ORES Lcom/google/common/collect/ImmutableList; + FIELD field_33421 IRON_ORES Lcom/google/common/collect/ImmutableList; + FIELD field_33422 COPPER_ORES Lcom/google/common/collect/ImmutableList; + FIELD field_33423 GOLD_ORES Lcom/google/common/collect/ImmutableList; + FIELD field_33424 DIAMOND_ORES Lcom/google/common/collect/ImmutableList; + FIELD field_33425 LAPIS_ORES Lcom/google/common/collect/ImmutableList; + FIELD field_33426 REDSTONE_ORES Lcom/google/common/collect/ImmutableList; + FIELD field_33427 EMERALD_ORES Lcom/google/common/collect/ImmutableList; METHOD (Lnet/minecraft/class_2403;)V ARG 1 root METHOD method_10419 generate (Ljava/util/function/Consumer;)V @@ -12,6 +20,7 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipesProvider METHOD method_10422 requireEnteringFluid (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2037$class_2039; ARG 0 block METHOD method_10423 conditionsFromItemPredicates ([Lnet/minecraft/class_2073;)Lnet/minecraft/class_2066$class_2068; + ARG 0 items METHOD method_10425 saveRecipe (Lnet/minecraft/class_2408;Lcom/google/gson/JsonObject;Ljava/nio/file/Path;)V ARG 0 cache ARG 1 json @@ -29,111 +38,113 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipesProvider ARG 3 cookingTime METHOD method_24475 offerPlanksRecipe2 (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_3494;)V ARG 0 exporter - ARG 1 outputItem - ARG 2 inputItem + ARG 1 output + ARG 2 input METHOD method_24476 offerBarkBlockRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V ARG 0 exporter - ARG 1 outputItem - ARG 2 inputItem + ARG 1 output + ARG 2 input METHOD method_24477 offerPlanksRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_3494;)V ARG 0 exporter - ARG 1 outputItem - ARG 2 inputItem + ARG 1 output + ARG 2 input METHOD method_24478 offerBoatRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V ARG 0 exporter - ARG 1 outputItem - ARG 2 inputItem + ARG 1 output + ARG 2 input METHOD method_24884 offerWoolDyeingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V ARG 0 exporter - ARG 1 outputItem - ARG 2 inputItem + ARG 1 output + ARG 2 input METHOD method_24885 offerCarpetRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V ARG 0 exporter - ARG 1 outputItem - ARG 2 inputItem + ARG 1 output + ARG 2 input METHOD method_24886 offerCarpetDyeingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V ARG 0 exporter - ARG 1 outputItem + ARG 1 output + ARG 2 input METHOD method_24887 offerBedRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V ARG 0 exporter - ARG 1 outputItem + ARG 1 output + ARG 2 input METHOD method_24888 offerBedDyeingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V ARG 0 exporter - ARG 1 outputItem - ARG 2 inputItem + ARG 1 output + ARG 2 input METHOD method_24889 offerBannerRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V ARG 0 exporter - ARG 1 outputItem - ARG 2 inputItem + ARG 1 output + ARG 2 input METHOD method_24890 offerStainedGlassDyeingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V ARG 0 exporter - ARG 1 outputItem - ARG 2 inputItem + ARG 1 output + ARG 2 input METHOD method_24891 offerStainedGlassPaneRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V ARG 0 exporter - ARG 1 outputItem - ARG 2 inputItem + ARG 1 output + ARG 2 input METHOD method_24892 offerStainedGlassPaneDyeingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V ARG 0 exporter - ARG 1 outputItem - ARG 2 inputItem + ARG 1 output + ARG 2 input METHOD method_24893 offerTerracottaDyeingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V ARG 0 exporter - ARG 1 outputItem - ARG 2 inputItem + ARG 1 output + ARG 2 input METHOD method_24894 offerConcretePowderDyeingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V ARG 0 exporter - ARG 1 outputItem - ARG 2 inputItem + ARG 1 output + ARG 2 input METHOD method_29728 offerNetheriteUpgradeRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1792;Lnet/minecraft/class_1792;)V ARG 0 exporter - ARG 1 outputItem - ARG 2 inputItem + ARG 1 output + ARG 2 input METHOD method_32233 offerCandleDyeingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V ARG 0 exporter - ARG 1 outputItem - ARG 2 inputItem + ARG 1 output + ARG 2 input METHOD method_32804 createSlabRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; - ARG 0 outputItem - ARG 1 inputItem + ARG 0 output + ARG 1 input METHOD method_32805 createChiseledBlockRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_2447; - ARG 0 outputItem - ARG 1 inputItem + ARG 0 output + ARG 1 input METHOD method_32806 createPressurePlateRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; - ARG 0 outputItem - ARG 1 inputItem + ARG 0 output + ARG 1 input METHOD method_32807 hasItem (Lnet/minecraft/class_1935;)Ljava/lang/String; ARG 0 item METHOD method_32808 createStairsRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; - ARG 0 outputItem - ARG 1 inputItem + ARG 0 output + ARG 1 input METHOD method_32809 offerWallRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V ARG 0 exporter - ARG 1 outputItem - ARG 2 inputItem + ARG 1 output + ARG 2 input METHOD method_32810 offerPolishedStoneRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V ARG 0 exporter - ARG 1 outputItem - ARG 2 inputItem + ARG 1 output + ARG 2 input METHOD method_32811 offerCutCopperRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V ARG 0 exporter - ARG 1 outputItem - ARG 2 inputItem + ARG 1 output + ARG 2 input METHOD method_32812 offerChiseledBlockRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V ARG 0 exporter - ARG 1 outputItem - ARG 2 inputItem + ARG 1 output + ARG 2 input METHOD method_32813 createPressurePlateRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V ARG 0 exporter - ARG 1 outputItem - ARG 2 inputItem + ARG 1 output + ARG 2 input METHOD method_32814 offerSlabRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V ARG 0 exporter - ARG 1 outputItem - ARG 2 inputItem + ARG 1 output + ARG 2 input METHOD method_33531 getWallRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; - ARG 0 outputItem - ARG 1 inputItem + ARG 0 output + ARG 1 input METHOD method_33533 getVariantRecipeInput (Lnet/minecraft/class_5794;Lnet/minecraft/class_5794$class_5796;)Lnet/minecraft/class_2248; COMMENT Gets the block used to craft a certain {@linkplain net.minecraft.data.family.BlockFamily.Variant variant} of a base block. COMMENT @@ -152,30 +163,72 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipesProvider METHOD method_33536 (Lnet/minecraft/class_5797;Lnet/minecraft/class_5794$class_5796;Ljava/lang/String;)V ARG 2 group METHOD method_33537 createCondensingRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; - ARG 0 outputItem - ARG 1 inputItem + ARG 0 output + ARG 1 input METHOD method_33539 (Ljava/util/function/Consumer;Lnet/minecraft/class_5794;)V ARG 1 family METHOD method_33542 createTransmutationRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; - ARG 0 outputItem - ARG 1 inputItem + ARG 0 output + ARG 1 input METHOD method_33544 createDoorRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; - ARG 0 outputItem - ARG 1 inputItem + ARG 0 output + ARG 1 input METHOD method_33546 createFenceRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; - ARG 0 outputItem - ARG 1 inputItem + ARG 0 output + ARG 1 input METHOD method_33548 createFenceGateRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; - ARG 0 outputItem - ARG 1 inputItem + ARG 0 output + ARG 1 input METHOD method_33553 createTrapdoorRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; - ARG 0 outputItem - ARG 1 inputItem + ARG 0 output + ARG 1 input METHOD method_33555 createSignRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; - ARG 0 outputItem - ARG 1 inputItem + ARG 0 output + ARG 1 input + METHOD method_33714 convertBetween (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Ljava/lang/String; + ARG 0 from + ARG 1 to + METHOD method_33715 offerRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;I)V + ARG 0 exporter + ARG 1 output + ARG 2 input + ARG 3 count + METHOD method_33716 getItemPath (Lnet/minecraft/class_1935;)Ljava/lang/String; + ARG 0 item + METHOD method_33717 offerRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V + ARG 0 exporter + ARG 1 output + ARG 2 input METHOD method_34662 offerCrackingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V COMMENT Offers a smelting recipe to the exporter that is used to convert the main block of a block family to its cracked variant. ARG 0 exporter - ARG 1 result + ARG 1 output ARG 2 input + METHOD method_34853 (Ljava/util/function/Consumer;Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V + ARG 1 input + ARG 2 output + METHOD method_34854 offerWaxingRecipes (Ljava/util/function/Consumer;)V + ARG 0 exporter + METHOD method_35914 conditionsFromItem (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_1935;)Lnet/minecraft/class_2066$class_2068; + ARG 0 count + ARG 1 item + METHOD method_36232 offerMultipleOptions (Ljava/util/function/Consumer;Lnet/minecraft/class_3957;Ljava/util/List;Lnet/minecraft/class_1935;FILjava/lang/String;)V + ARG 0 exporter + ARG 1 serializer + ARG 2 inputs + ARG 3 output + ARG 4 experience + ARG 5 cookingTime + ARG 6 baseIdString + METHOD method_36233 offerSmelting (Ljava/util/function/Consumer;Ljava/util/List;Lnet/minecraft/class_1935;FI)V + ARG 0 exporter + ARG 1 inputs + ARG 2 output + ARG 3 experience + ARG 4 cookingTime + METHOD method_36234 offerBlasting (Ljava/util/function/Consumer;Ljava/util/List;Lnet/minecraft/class_1935;FI)V + ARG 0 exporter + ARG 1 inputs + ARG 2 output + ARG 3 experience + ARG 4 cookingTime diff --git a/mappings/net/minecraft/data/server/StoryTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/StoryTabAdvancementGenerator.mapping index 5e149b983d..0bd16b9c2c 100644 --- a/mappings/net/minecraft/data/server/StoryTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/server/StoryTabAdvancementGenerator.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_2417 net/minecraft/data/server/StoryTabAdvancementGenerator + METHOD accept (Ljava/lang/Object;)V + ARG 1 exporter diff --git a/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.mapping index 2681d55623..638059b65d 100644 --- a/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.mapping @@ -2,13 +2,13 @@ CLASS net/minecraft/class_2454 net/minecraft/data/server/recipe/CookingRecipeJso FIELD field_11414 experience F FIELD field_11415 cookingTime I FIELD field_11416 builder Lnet/minecraft/class_161$class_162; - FIELD field_11417 result Lnet/minecraft/class_1792; - FIELD field_11418 ingredient Lnet/minecraft/class_1856; + FIELD field_11417 output Lnet/minecraft/class_1792; + FIELD field_11418 input Lnet/minecraft/class_1856; FIELD field_11419 group Ljava/lang/String; FIELD field_17599 serializer Lnet/minecraft/class_3957; METHOD (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;FILnet/minecraft/class_3957;)V - ARG 1 result - ARG 2 ingredient + ARG 1 output + ARG 2 input ARG 3 experience ARG 4 cookingTime ARG 5 serializer @@ -41,12 +41,24 @@ CLASS net/minecraft/class_2454 net/minecraft/data/server/recipe/CookingRecipeJso ARG 1 result ARG 2 experience ARG 3 cookingTime + METHOD method_35916 create (Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;FI)Lnet/minecraft/class_2454; + ARG 0 result + ARG 1 ingredient + ARG 2 experience + ARG 3 cookingTime + METHOD method_35917 group (Ljava/lang/String;)Lnet/minecraft/class_2454; + ARG 1 group + METHOD method_35918 createSmoking (Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;FI)Lnet/minecraft/class_2454; + ARG 0 result + ARG 1 ingredient + ARG 2 experience + ARG 3 cookingTime CLASS class_2455 CookingRecipeJsonProvider FIELD field_11421 experience F FIELD field_11422 cookingTime I FIELD field_11423 builder Lnet/minecraft/class_161$class_162; FIELD field_11424 recipeId Lnet/minecraft/class_2960; - FIELD field_11425 ingredient Lnet/minecraft/class_1856; + FIELD field_11425 input Lnet/minecraft/class_1856; FIELD field_11426 group Ljava/lang/String; FIELD field_11427 advancementId Lnet/minecraft/class_2960; FIELD field_11428 result Lnet/minecraft/class_1792; @@ -54,7 +66,7 @@ CLASS net/minecraft/class_2454 net/minecraft/data/server/recipe/CookingRecipeJso METHOD (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1792;FILnet/minecraft/class_161$class_162;Lnet/minecraft/class_2960;Lnet/minecraft/class_1865;)V ARG 1 recipeId ARG 2 group - ARG 3 ingredient + ARG 3 input ARG 4 result ARG 5 experience ARG 6 cookingTime diff --git a/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping index bf2d122500..fe69afa9da 100644 --- a/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_2450 net/minecraft/data/server/recipe/ShapelessRecipeJ FIELD field_11397 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_11398 group Ljava/lang/String; METHOD (Lnet/minecraft/class_1935;I)V - ARG 1 itemProvider + ARG 1 output ARG 2 outputCount METHOD method_10443 offerTo (Ljava/util/function/Consumer;Lnet/minecraft/class_2960;)V ARG 1 exporter diff --git a/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.mapping index 9275feacaf..be6f141382 100644 --- a/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.mapping @@ -10,14 +10,14 @@ CLASS net/minecraft/class_3981 net/minecraft/data/server/recipe/SingleItemRecipe ARG 2 input ARG 3 output ARG 4 outputCount - METHOD method_17968 create (Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;)Lnet/minecraft/class_3981; + METHOD method_17968 createStonecutting (Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;)Lnet/minecraft/class_3981; ARG 0 input ARG 1 output - METHOD method_17969 create (Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;I)Lnet/minecraft/class_3981; + METHOD method_17969 createStonecutting (Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;I)Lnet/minecraft/class_3981; ARG 0 input ARG 1 output ARG 2 outputCount - METHOD method_17970 create (Ljava/lang/String;Lnet/minecraft/class_184;)Lnet/minecraft/class_3981; + METHOD method_17970 createStonecutting (Ljava/lang/String;Lnet/minecraft/class_184;)Lnet/minecraft/class_3981; ARG 1 criterionName ARG 2 conditions METHOD method_17971 offerTo (Ljava/util/function/Consumer;Ljava/lang/String;)V @@ -28,6 +28,8 @@ CLASS net/minecraft/class_3981 net/minecraft/data/server/recipe/SingleItemRecipe ARG 2 recipeId METHOD method_17973 validate (Lnet/minecraft/class_2960;)V ARG 1 recipeId + METHOD method_35919 group (Ljava/lang/String;)Lnet/minecraft/class_3981; + ARG 1 group CLASS class_3982 SingleItemRecipeJsonProvider FIELD field_17696 recipeId Lnet/minecraft/class_2960; FIELD field_17697 group Ljava/lang/String; diff --git a/mappings/net/minecraft/tag/Tag.mapping b/mappings/net/minecraft/tag/Tag.mapping index 87b6894cb2..d213b718ca 100644 --- a/mappings/net/minecraft/tag/Tag.mapping +++ b/mappings/net/minecraft/tag/Tag.mapping @@ -48,6 +48,9 @@ CLASS net/minecraft/class_3494 net/minecraft/tag/Tag ARG 2 entry METHOD method_30740 resolveEntry (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_3494$class_3496; ARG 0 json + METHOD method_32826 forEachTagId (Ljava/util/function/Consumer;)V + ARG 1 consumer + METHOD method_32828 forEachGroupId (Ljava/util/function/Consumer;)V METHOD method_34891 addOptional (Lnet/minecraft/class_2960;Ljava/lang/String;)Lnet/minecraft/class_3494$class_3495; ARG 1 id ARG 2 source @@ -61,6 +64,13 @@ CLASS net/minecraft/class_3494 net/minecraft/tag/Tag ARG 1 tagGetter ARG 2 objectGetter ARG 3 collector + METHOD method_32831 forEachTagId (Ljava/util/function/Consumer;)V + ARG 1 consumer + METHOD method_32832 canAdd (Ljava/util/function/Predicate;Ljava/util/function/Predicate;)Z + ARG 1 existenceTest + ARG 2 duplicationTest + METHOD method_32833 forEachGroupId (Ljava/util/function/Consumer;)V + ARG 1 consumer CLASS class_3497 TagEntry FIELD field_15584 id Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2960;)V