From 153da9b9d0f86a3ea47908eaa60b3cfbb74fba7c Mon Sep 17 00:00:00 2001 From: ix0rai Date: Thu, 19 Oct 2023 23:28:00 -0500 Subject: [PATCH 1/9] start updating recipes --- mappings/net/minecraft/recipe/BlastingRecipe.mapping | 6 ++++++ .../net/minecraft/recipe/CampfireCookingRecipe.mapping | 6 ++++++ .../net/minecraft/recipe/CookingRecipeSerializer.mapping | 8 ++++++++ mappings/net/minecraft/recipe/CuttingRecipe.mapping | 3 +++ mappings/net/minecraft/recipe/MapExtendingRecipe.mapping | 2 ++ mappings/net/minecraft/recipe/RecipeGridAligner.mapping | 1 + mappings/net/minecraft/recipe/RecipeSerializer.mapping | 1 + mappings/net/minecraft/recipe/ShapedRecipe.mapping | 6 ++++++ mappings/net/minecraft/recipe/SmeltingRecipe.mapping | 6 ++++++ 9 files changed, 39 insertions(+) diff --git a/mappings/net/minecraft/recipe/BlastingRecipe.mapping b/mappings/net/minecraft/recipe/BlastingRecipe.mapping index aa95ec6bf5..3832549725 100644 --- a/mappings/net/minecraft/recipe/BlastingRecipe.mapping +++ b/mappings/net/minecraft/recipe/BlastingRecipe.mapping @@ -1 +1,7 @@ CLASS net/minecraft/unmapped/C_ywbgonlm net/minecraft/recipe/BlastingRecipe + METHOD (Ljava/lang/String;Lnet/minecraft/unmapped/C_gtxamkec;Lnet/minecraft/unmapped/C_tcpsydrv;Lnet/minecraft/unmapped/C_sddaxwyk;FI)V + ARG 1 group + ARG 2 category + ARG 3 ingredient + ARG 5 experience + ARG 6 cookTime diff --git a/mappings/net/minecraft/recipe/CampfireCookingRecipe.mapping b/mappings/net/minecraft/recipe/CampfireCookingRecipe.mapping index 9f67eb6adc..99b3d4646b 100644 --- a/mappings/net/minecraft/recipe/CampfireCookingRecipe.mapping +++ b/mappings/net/minecraft/recipe/CampfireCookingRecipe.mapping @@ -1 +1,7 @@ CLASS net/minecraft/unmapped/C_alixkcla net/minecraft/recipe/CampfireCookingRecipe + METHOD (Ljava/lang/String;Lnet/minecraft/unmapped/C_gtxamkec;Lnet/minecraft/unmapped/C_tcpsydrv;Lnet/minecraft/unmapped/C_sddaxwyk;FI)V + ARG 1 group + ARG 2 category + ARG 3 ingredient + ARG 5 experience + ARG 6 cookTime diff --git a/mappings/net/minecraft/recipe/CookingRecipeSerializer.mapping b/mappings/net/minecraft/recipe/CookingRecipeSerializer.mapping index dfbd786286..3394d0264d 100644 --- a/mappings/net/minecraft/recipe/CookingRecipeSerializer.mapping +++ b/mappings/net/minecraft/recipe/CookingRecipeSerializer.mapping @@ -3,4 +3,12 @@ CLASS net/minecraft/unmapped/C_nuvmhgvy net/minecraft/recipe/CookingRecipeSerial METHOD (Lnet/minecraft/unmapped/C_nuvmhgvy$C_askfjrsu;I)V ARG 1 recipeFactory ARG 2 defaultCookingTime + METHOD m_vdhhiinh (ILnet/minecraft/unmapped/C_nuvmhgvy$C_askfjrsu;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 2 instance CLASS C_askfjrsu RecipeFactory + METHOD create (Ljava/lang/String;Lnet/minecraft/unmapped/C_gtxamkec;Lnet/minecraft/unmapped/C_tcpsydrv;Lnet/minecraft/unmapped/C_sddaxwyk;FI)Lnet/minecraft/unmapped/C_hpjdwiwu; + ARG 1 group + ARG 2 category + ARG 3 ingredient + ARG 5 experience + ARG 6 cookTime diff --git a/mappings/net/minecraft/recipe/CuttingRecipe.mapping b/mappings/net/minecraft/recipe/CuttingRecipe.mapping index 23bce3742e..7fadb69c2e 100644 --- a/mappings/net/minecraft/recipe/CuttingRecipe.mapping +++ b/mappings/net/minecraft/recipe/CuttingRecipe.mapping @@ -11,3 +11,6 @@ CLASS net/minecraft/unmapped/C_ziizojwa net/minecraft/recipe/CuttingRecipe METHOD (Lnet/minecraft/unmapped/C_ziizojwa$C_jqwnrmvy$C_ysvqdtqh;)V ARG 1 recipeFactory CLASS C_ysvqdtqh RecipeFactory + METHOD create (Ljava/lang/String;Lnet/minecraft/unmapped/C_tcpsydrv;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ziizojwa; + ARG 1 group + ARG 2 ingredient diff --git a/mappings/net/minecraft/recipe/MapExtendingRecipe.mapping b/mappings/net/minecraft/recipe/MapExtendingRecipe.mapping index 6404715320..0cdf5d48fd 100644 --- a/mappings/net/minecraft/recipe/MapExtendingRecipe.mapping +++ b/mappings/net/minecraft/recipe/MapExtendingRecipe.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/unmapped/C_cdhgeyop net/minecraft/recipe/MapExtendingRecipe + METHOD (Lnet/minecraft/unmapped/C_aodytokc;)V + ARG 1 category METHOD m_gfiwlaty getMapStack (Lnet/minecraft/unmapped/C_fcvwjvlq;)Lnet/minecraft/unmapped/C_sddaxwyk; ARG 0 inventory diff --git a/mappings/net/minecraft/recipe/RecipeGridAligner.mapping b/mappings/net/minecraft/recipe/RecipeGridAligner.mapping index f5de5f1a06..0e3c72a927 100644 --- a/mappings/net/minecraft/recipe/RecipeGridAligner.mapping +++ b/mappings/net/minecraft/recipe/RecipeGridAligner.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/unmapped/C_wuyfqgmj net/minecraft/recipe/RecipeGridAligner ARG 1 gridWidth ARG 2 gridHeight ARG 3 gridOutputSlot + ARG 4 recipe ARG 5 inputs ARG 6 amount METHOD m_vnshednj acceptAlignedInput (Ljava/util/Iterator;IIII)V diff --git a/mappings/net/minecraft/recipe/RecipeSerializer.mapping b/mappings/net/minecraft/recipe/RecipeSerializer.mapping index 975d423a23..94130685b2 100644 --- a/mappings/net/minecraft/recipe/RecipeSerializer.mapping +++ b/mappings/net/minecraft/recipe/RecipeSerializer.mapping @@ -55,3 +55,4 @@ CLASS net/minecraft/unmapped/C_xfxrkzjt net/minecraft/recipe/RecipeSerializer METHOD m_bmlvpapu register (Ljava/lang/String;Lnet/minecraft/unmapped/C_xfxrkzjt;)Lnet/minecraft/unmapped/C_xfxrkzjt; ARG 0 id ARG 1 serializer + METHOD m_ypbzaepi getCodec ()Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/recipe/ShapedRecipe.mapping b/mappings/net/minecraft/recipe/ShapedRecipe.mapping index ad3f5f97e1..e71f773491 100644 --- a/mappings/net/minecraft/recipe/ShapedRecipe.mapping +++ b/mappings/net/minecraft/recipe/ShapedRecipe.mapping @@ -6,6 +6,12 @@ CLASS net/minecraft/unmapped/C_svdvbdmc net/minecraft/recipe/ShapedRecipe FIELD f_otoldace ingredients Lnet/minecraft/unmapped/C_rnrfftze; FIELD f_rduplmjr height I FIELD f_vgraaxco result Lnet/minecraft/unmapped/C_sddaxwyk; + METHOD (Ljava/lang/String;Lnet/minecraft/unmapped/C_aodytokc;IILnet/minecraft/unmapped/C_rnrfftze;Lnet/minecraft/unmapped/C_sddaxwyk;)V + ARG 1 group + ARG 2 category + ARG 3 width + ARG 4 height + ARG 5 ingredients METHOD m_cfypxnrq findLastSymbol (Ljava/lang/String;)I ARG 0 pattern METHOD m_chdnybyn (Lnet/minecraft/unmapped/C_tcpsydrv;)Z diff --git a/mappings/net/minecraft/recipe/SmeltingRecipe.mapping b/mappings/net/minecraft/recipe/SmeltingRecipe.mapping index c7048ef0fb..1cde5dfb36 100644 --- a/mappings/net/minecraft/recipe/SmeltingRecipe.mapping +++ b/mappings/net/minecraft/recipe/SmeltingRecipe.mapping @@ -1 +1,7 @@ CLASS net/minecraft/unmapped/C_nfrxrwyq net/minecraft/recipe/SmeltingRecipe + METHOD (Ljava/lang/String;Lnet/minecraft/unmapped/C_gtxamkec;Lnet/minecraft/unmapped/C_tcpsydrv;Lnet/minecraft/unmapped/C_sddaxwyk;FI)V + ARG 1 group + ARG 2 category + ARG 3 ingredient + ARG 5 experience + ARG 6 cookTime From df889608a7abaf3c08ed7826acb55cfd1e1afe3a Mon Sep 17 00:00:00 2001 From: ix0rai Date: Sat, 21 Oct 2023 10:58:29 -0500 Subject: [PATCH 2/9] work on recipes --- .../net/minecraft/recipe/CuttingRecipe.mapping | 11 +++++++++++ .../net/minecraft/recipe/Ingredient.mapping | 18 ++++++++++++++++++ .../minecraft/recipe/InputSlotFiller.mapping | 2 ++ .../recipe/RecipeCodecThingTODO.mapping | 1 + .../net/minecraft/recipe/ShapedRecipe.mapping | 1 + .../net/minecraft/recipe/SmokingRecipe.mapping | 6 ++++++ .../recipe/SpecialRecipeSerializer.mapping | 4 ++++ .../recipe/StonecuttingRecipe.mapping | 3 +++ .../minecraft/recipe/book/RecipeBook.mapping | 10 ++++++++++ 9 files changed, 56 insertions(+) create mode 100644 mappings/net/minecraft/recipe/RecipeCodecThingTODO.mapping diff --git a/mappings/net/minecraft/recipe/CuttingRecipe.mapping b/mappings/net/minecraft/recipe/CuttingRecipe.mapping index 7fadb69c2e..705e4a6848 100644 --- a/mappings/net/minecraft/recipe/CuttingRecipe.mapping +++ b/mappings/net/minecraft/recipe/CuttingRecipe.mapping @@ -8,8 +8,19 @@ CLASS net/minecraft/unmapped/C_ziizojwa net/minecraft/recipe/CuttingRecipe FIELD f_yiyeyscc result Lnet/minecraft/unmapped/C_sddaxwyk; CLASS C_jqwnrmvy Serializer FIELD f_cvxfcxtq recipeFactory Lnet/minecraft/unmapped/C_ziizojwa$C_jqwnrmvy$C_ysvqdtqh; + FIELD f_ksqoieom RESULT_CODEC Lcom/mojang/serialization/MapCodec; METHOD (Lnet/minecraft/unmapped/C_ziizojwa$C_jqwnrmvy$C_ysvqdtqh;)V ARG 1 recipeFactory + METHOD m_bcnczhaj (Lnet/minecraft/unmapped/C_ziizojwa;)Lnet/minecraft/unmapped/C_sddaxwyk; + ARG 0 recipe + METHOD m_ncfpjayr (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD m_sidsyhkb (Lnet/minecraft/unmapped/C_ziizojwa$C_jqwnrmvy$C_ysvqdtqh;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 1 instance + METHOD m_ylxrzgkw (Lnet/minecraft/unmapped/C_ziizojwa;)Lnet/minecraft/unmapped/C_tcpsydrv; + ARG 0 recipe + METHOD m_yxvmdgbx (Lnet/minecraft/unmapped/C_ziizojwa;)Ljava/lang/String; + ARG 0 recipe CLASS C_ysvqdtqh RecipeFactory METHOD create (Ljava/lang/String;Lnet/minecraft/unmapped/C_tcpsydrv;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ziizojwa; ARG 1 group diff --git a/mappings/net/minecraft/recipe/Ingredient.mapping b/mappings/net/minecraft/recipe/Ingredient.mapping index b0aae6c4ad..1370e2f77d 100644 --- a/mappings/net/minecraft/recipe/Ingredient.mapping +++ b/mappings/net/minecraft/recipe/Ingredient.mapping @@ -10,16 +10,24 @@ CLASS net/minecraft/unmapped/C_tcpsydrv net/minecraft/recipe/Ingredient ARG 0 entry METHOD m_duacuvnu ofEntries (Ljava/util/stream/Stream;)Lnet/minecraft/unmapped/C_tcpsydrv; ARG 0 entries + METHOD m_ezvlhrug (Lnet/minecraft/unmapped/C_tcpsydrv$C_rnuwbmsd;)Lnet/minecraft/unmapped/C_tcpsydrv; + ARG 0 entry METHOD m_fckgmcfy write (Lnet/minecraft/unmapped/C_idfydwco;)V ARG 1 buf METHOD m_funzdryl (Lnet/minecraft/unmapped/C_sddaxwyk;)Z ARG 0 stack + METHOD m_hufuubpp (ZLjava/util/List;)Lcom/mojang/serialization/DataResult; + ARG 1 list METHOD m_hujuazoq toJson (Z)Lcom/google/gson/JsonElement; METHOD m_iekihikd getMatchingItemIds ()Lit/unimi/dsi/fastutil/ints/IntList; METHOD m_imjytiop fromPacket (Lnet/minecraft/unmapped/C_idfydwco;)Lnet/minecraft/unmapped/C_tcpsydrv; ARG 0 buf + METHOD m_jezunzgz (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/unmapped/C_tcpsydrv; + ARG 0 either METHOD m_klpyzden (I)[Lnet/minecraft/unmapped/C_sddaxwyk; ARG 0 i + METHOD m_lhlpdsji createCodec (Z)Lcom/mojang/serialization/Codec; + ARG 0 allowEmpty METHOD m_lybytlkf empty ()Lnet/minecraft/unmapped/C_tcpsydrv; METHOD m_lzozmzmr ofStacks ([Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_tcpsydrv; ARG 0 stacks @@ -33,6 +41,8 @@ CLASS net/minecraft/unmapped/C_tcpsydrv net/minecraft/recipe/Ingredient COMMENT the tag key METHOD m_ssxtwbyt ofStacks (Ljava/util/stream/Stream;)Lnet/minecraft/unmapped/C_tcpsydrv; ARG 0 stacks + METHOD m_xpomotfv (ZLnet/minecraft/unmapped/C_tcpsydrv;)Lcom/mojang/serialization/DataResult; + ARG 1 ingredient METHOD m_zboalywg getMatchingStacks ()[Lnet/minecraft/unmapped/C_sddaxwyk; METHOD test (Ljava/lang/Object;)Z ARG 1 stack @@ -40,9 +50,17 @@ CLASS net/minecraft/unmapped/C_tcpsydrv net/minecraft/recipe/Ingredient FIELD f_tdgwbwco tag Lnet/minecraft/unmapped/C_ednuhnnn; METHOD (Lnet/minecraft/unmapped/C_ednuhnnn;)V ARG 1 tag + METHOD m_dusfjwnk (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD m_unmgcrdr (Lnet/minecraft/unmapped/C_tcpsydrv$C_gwrfktmw;)Lnet/minecraft/unmapped/C_ednuhnnn; + ARG 0 entry CLASS C_rnuwbmsd Entry METHOD m_uoalrrgg getStacks ()Ljava/util/Collection; + METHOD m_zsrgyhis (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/unmapped/C_tcpsydrv$C_rnuwbmsd; + ARG 0 either CLASS C_ybydqgqv StackEntry FIELD f_fnttuopd stack Lnet/minecraft/unmapped/C_sddaxwyk; METHOD (Lnet/minecraft/unmapped/C_sddaxwyk;)V ARG 1 stack + METHOD m_mjtrwddj (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/recipe/InputSlotFiller.mapping b/mappings/net/minecraft/recipe/InputSlotFiller.mapping index b0b1f3ffb8..551c24593c 100644 --- a/mappings/net/minecraft/recipe/InputSlotFiller.mapping +++ b/mappings/net/minecraft/recipe/InputSlotFiller.mapping @@ -16,7 +16,9 @@ CLASS net/minecraft/unmapped/C_rqdekljo net/minecraft/recipe/InputSlotFiller ARG 3 recipeInCraftingSlots METHOD m_rckfcnpr fillInputSlots (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_dscbrwbj;Z)V ARG 1 entity + ARG 2 recipe ARG 3 craftAll METHOD m_zhvisrop fillInputSlots (Lnet/minecraft/unmapped/C_dscbrwbj;Z)V + ARG 1 recipe ARG 2 craftAll METHOD m_zwgzfhws canReturnInputs ()Z diff --git a/mappings/net/minecraft/recipe/RecipeCodecThingTODO.mapping b/mappings/net/minecraft/recipe/RecipeCodecThingTODO.mapping new file mode 100644 index 0000000000..4a7b1663d4 --- /dev/null +++ b/mappings/net/minecraft/recipe/RecipeCodecThingTODO.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/unmapped/C_fvoqrgef net/minecraft/recipe/RecipeCodecThingTODO diff --git a/mappings/net/minecraft/recipe/ShapedRecipe.mapping b/mappings/net/minecraft/recipe/ShapedRecipe.mapping index e71f773491..e2a58bbc0b 100644 --- a/mappings/net/minecraft/recipe/ShapedRecipe.mapping +++ b/mappings/net/minecraft/recipe/ShapedRecipe.mapping @@ -36,6 +36,7 @@ CLASS net/minecraft/unmapped/C_svdvbdmc net/minecraft/recipe/ShapedRecipe COMMENT COMMENT COMMENT @return a new recipe pattern with all leading and trailing empty rows/columns removed + ARG 0 pattern METHOD m_kxjqjjwh getHeight ()I METHOD m_nicctogl matchesPattern (Lnet/minecraft/unmapped/C_fcvwjvlq;IIZ)Z ARG 1 inv diff --git a/mappings/net/minecraft/recipe/SmokingRecipe.mapping b/mappings/net/minecraft/recipe/SmokingRecipe.mapping index 54f44b1998..0efcaf9244 100644 --- a/mappings/net/minecraft/recipe/SmokingRecipe.mapping +++ b/mappings/net/minecraft/recipe/SmokingRecipe.mapping @@ -1 +1,7 @@ CLASS net/minecraft/unmapped/C_aqixgqub net/minecraft/recipe/SmokingRecipe + METHOD (Ljava/lang/String;Lnet/minecraft/unmapped/C_gtxamkec;Lnet/minecraft/unmapped/C_tcpsydrv;Lnet/minecraft/unmapped/C_sddaxwyk;FI)V + ARG 1 group + ARG 2 category + ARG 3 ingredient + ARG 5 experience + ARG 6 cookTime diff --git a/mappings/net/minecraft/recipe/SpecialRecipeSerializer.mapping b/mappings/net/minecraft/recipe/SpecialRecipeSerializer.mapping index ccdb89899f..3aa8611a8a 100644 --- a/mappings/net/minecraft/recipe/SpecialRecipeSerializer.mapping +++ b/mappings/net/minecraft/recipe/SpecialRecipeSerializer.mapping @@ -2,4 +2,8 @@ CLASS net/minecraft/unmapped/C_lylrgdrx net/minecraft/recipe/SpecialRecipeSerial FIELD f_hoccfujk factory Lnet/minecraft/unmapped/C_lylrgdrx$C_dzytufka; METHOD (Lnet/minecraft/unmapped/C_lylrgdrx$C_dzytufka;)V ARG 1 factory + METHOD m_uctxyauf (Lnet/minecraft/unmapped/C_lylrgdrx$C_dzytufka;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 1 instance CLASS C_dzytufka Factory + METHOD create (Lnet/minecraft/unmapped/C_aodytokc;)Lnet/minecraft/unmapped/C_pvphvxig; + ARG 1 category diff --git a/mappings/net/minecraft/recipe/StonecuttingRecipe.mapping b/mappings/net/minecraft/recipe/StonecuttingRecipe.mapping index cb25b6e4d9..02bb650086 100644 --- a/mappings/net/minecraft/recipe/StonecuttingRecipe.mapping +++ b/mappings/net/minecraft/recipe/StonecuttingRecipe.mapping @@ -1 +1,4 @@ CLASS net/minecraft/unmapped/C_nqhkwtnf net/minecraft/recipe/StonecuttingRecipe + METHOD (Ljava/lang/String;Lnet/minecraft/unmapped/C_tcpsydrv;Lnet/minecraft/unmapped/C_sddaxwyk;)V + ARG 1 group + ARG 2 ingredient diff --git a/mappings/net/minecraft/recipe/book/RecipeBook.mapping b/mappings/net/minecraft/recipe/book/RecipeBook.mapping index 9bb1118df7..156b9459d6 100644 --- a/mappings/net/minecraft/recipe/book/RecipeBook.mapping +++ b/mappings/net/minecraft/recipe/book/RecipeBook.mapping @@ -3,8 +3,15 @@ CLASS net/minecraft/unmapped/C_bluodrzq net/minecraft/recipe/book/RecipeBook FIELD f_osoagsos options Lnet/minecraft/unmapped/C_krpwsfph; FIELD f_uxxsaatt recipes Ljava/util/Set; METHOD m_aqitkiku shouldHighlight (Lnet/minecraft/unmapped/C_dscbrwbj;)Z + ARG 1 recipe + METHOD m_dcnyuasn contains (Lnet/minecraft/unmapped/C_dscbrwbj;)Z + ARG 1 recipe METHOD m_dkodlkvz queueForHighlight (Lnet/minecraft/unmapped/C_ncpywfca;)V ARG 1 id + METHOD m_dllnexer remove (Lnet/minecraft/unmapped/C_dscbrwbj;)V + ARG 1 recipe + METHOD m_drzdihac queueForHighlight (Lnet/minecraft/unmapped/C_dscbrwbj;)V + ARG 1 recipe METHOD m_fhjstdra isFilteringCraftable (Lnet/minecraft/unmapped/C_mrybqpjh;)Z ARG 1 category METHOD m_firfvotx isFilteringCraftable (Lnet/minecraft/unmapped/C_mugvwvfp;)Z @@ -18,7 +25,10 @@ CLASS net/minecraft/unmapped/C_bluodrzq net/minecraft/recipe/book/RecipeBook ARG 1 id METHOD m_ichoxvie remove (Lnet/minecraft/unmapped/C_ncpywfca;)V ARG 1 id + METHOD m_ijxqozuf add (Lnet/minecraft/unmapped/C_dscbrwbj;)V + ARG 1 recipe METHOD m_laevpnyc finishHighlight (Lnet/minecraft/unmapped/C_dscbrwbj;)V + ARG 1 recipe METHOD m_ndyxwuyo setOptions (Lnet/minecraft/unmapped/C_krpwsfph;)V ARG 1 options METHOD m_oemftwbg setGuiOpen (Lnet/minecraft/unmapped/C_mrybqpjh;Z)V From f43775f7cf4e92e365134f9715e320457a2ceed4 Mon Sep 17 00:00:00 2001 From: ix0rai Date: Thu, 26 Oct 2023 21:00:23 -0500 Subject: [PATCH 3/9] texture nonsense --- mappings/net/minecraft/block/Crafter.mapping | 1 + .../model/BlockStateModelGenerator.mapping | 187 +++++++++++++++++- .../minecraft/data/client/model/Model.mapping | 18 ++ .../data/client/model/Models.mapping | 5 + .../data/client/model/Texture.mapping | 12 ++ .../data/client/model/TexturedModel.mapping | 4 + 6 files changed, 225 insertions(+), 2 deletions(-) create mode 100644 mappings/net/minecraft/block/Crafter.mapping diff --git a/mappings/net/minecraft/block/Crafter.mapping b/mappings/net/minecraft/block/Crafter.mapping new file mode 100644 index 0000000000..14d3ee93be --- /dev/null +++ b/mappings/net/minecraft/block/Crafter.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/unmapped/C_dmnruvyr net/minecraft/block/Crafter diff --git a/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping b/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping index 7497541d3a..3c81e414cc 100644 --- a/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping +++ b/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/unmapped/C_ysvjbfkt net/minecraft/data/client/model/BlockStateModelGenerator FIELD f_alaeubcy simpleItemModelExemptionCollector Ljava/util/function/Consumer; + FIELD f_brxmxele CHISELED_BOOKSHELF_SLOT_MODEL_CACHE Ljava/util/Map; FIELD f_ecvtijhk sandstoneModels Ljava/util/Map; FIELD f_nivtbhfd nonOrientableTrapdoors Ljava/util/List; FIELD f_pcbcdgpp modelCollector Ljava/util/function/BiConsumer; @@ -17,11 +18,22 @@ CLASS net/minecraft/unmapped/C_ysvjbfkt net/minecraft/data/client/model/BlockSta METHOD m_aatbebfe registerCake ()V METHOD m_aaykitdm registerRod (Lnet/minecraft/unmapped/C_mmxmpdoq;)V ARG 1 block + METHOD m_abajmoto (Ljava/lang/String;I)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 1 i + METHOD m_aetvdwdb (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_pgmmajlq;)V + ARG 1 texture METHOD m_aezxlsub createSingletonBlockState (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_ufuguevl; ARG 0 block ARG 1 modelId METHOD m_ajuijexh registerJigsaw ()V METHOD m_anojqlaf registerTripwire ()V + METHOD m_anzxptee createCustomFenceBlockState (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_wqokohwr; + ARG 0 fenceBlock + ARG 1 postModelId + ARG 2 northModelId + ARG 3 eastModelId + ARG 4 southModelId + ARG 5 westModelId METHOD m_avlsmemt registerCauldron ()V METHOD m_awycgmsg registerItemModel (Lnet/minecraft/unmapped/C_vorddnax;)V ARG 1 item @@ -32,6 +44,7 @@ CLASS net/minecraft/unmapped/C_ysvjbfkt net/minecraft/data/client/model/BlockSta ARG 2 closedModelId ARG 3 openWallModelId ARG 4 closedWallModelId + ARG 5 uvLock METHOD m_bbhtncaa registerBuiltinWithParticle (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_vorddnax;)V ARG 1 block ARG 2 particleSource @@ -49,11 +62,23 @@ CLASS net/minecraft/unmapped/C_ysvjbfkt net/minecraft/data/client/model/BlockSta METHOD m_bpfiayub registerStateWithModelReference (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;)V ARG 1 block ARG 2 modelReference + METHOD m_buizvtas (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_waerxzys;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 2 phase METHOD m_bxfenbel registerGourd (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;)V ARG 1 stemBlock ARG 2 attachedStemBlock METHOD m_bxsxmfvd createModelVariantWithRandomHorizontalRotations (Lnet/minecraft/unmapped/C_ncpywfca;)[Lnet/minecraft/unmapped/C_yigsfouo; ARG 0 modelId + METHOD m_cbfhoczw createDoorBlockState (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_wqokohwr; + ARG 0 doorBlock + ARG 1 bottomLeftHingeClosedModelId + ARG 2 bottomLeftHingeOpenModelId + ARG 3 bottomRightHingeClosedModelId + ARG 4 bottomRightHingeOpenModelId + ARG 5 topLeftHingeClosedModelId + ARG 6 topLeftHingeOpenModelId + ARG 7 topRightHingeClosedModelId + ARG 8 topRightHingeOpenModelId METHOD m_cerawgvb getTurtleEggModel (ILjava/lang/String;Lnet/minecraft/unmapped/C_pgmmajlq;)Lnet/minecraft/unmapped/C_ncpywfca; ARG 1 eggs ARG 2 prefix @@ -67,23 +92,33 @@ CLASS net/minecraft/unmapped/C_ysvjbfkt net/minecraft/data/client/model/BlockSta ARG 2 modelId METHOD m_cmuqqsjg createEastDefaultHorizontalRotationStates ()Lnet/minecraft/unmapped/C_ujotlecn; METHOD m_cocrvdsm registerBamboo ()V + METHOD m_cpvnkpqc (Lnet/minecraft/unmapped/C_yigsfouo;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 0 variant METHOD m_crabhdxy excludeFromSimpleItemModelGeneration (Lnet/minecraft/unmapped/C_mmxmpdoq;)V ARG 1 block METHOD m_cvtztikf registerTintableCross (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ysvjbfkt$C_mqnwzrnb;)V ARG 1 block ARG 2 tintType + METHOD m_dashwcmx (Lnet/minecraft/unmapped/C_yigsfouo;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 0 variant METHOD m_dfxtgqon registerDoubleBlock (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;)V ARG 1 block ARG 2 upperHalfModelId ARG 3 lowerHalfModelId METHOD m_dkqexyeo registerCubeAllModelTexturePool (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_ysvjbfkt$C_jphnvadg; ARG 1 block + METHOD m_dnjqhzou registerCopperBulb (Lnet/minecraft/unmapped/C_mmxmpdoq;)V + ARG 1 bulb METHOD m_dqokmjdp createBooleanModelMap (Lnet/minecraft/unmapped/C_xhwijdsd;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_ujotlecn; ARG 0 property ARG 1 trueModel ARG 2 falseModel METHOD m_dqusahgt registerBigDripleaf ()V + METHOD m_dxntchvt (Lnet/minecraft/unmapped/C_pgmmajlq;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_pgmmajlq; + ARG 1 id METHOD m_ecublzrd registerSeaPickle ()V + METHOD m_eevbglbu (Lnet/minecraft/unmapped/C_yigsfouo;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 0 variant METHOD m_ekqfyyof registerFurnaceLikeOrientable (Lnet/minecraft/unmapped/C_mmxmpdoq;)V ARG 1 block METHOD m_eteaimiq createAxisRotatedBlockState (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_wqokohwr; @@ -91,14 +126,25 @@ CLASS net/minecraft/unmapped/C_ysvjbfkt net/minecraft/data/client/model/BlockSta ARG 1 verticalModelId ARG 2 horizontalModelId METHOD m_ettyrbkd register ()V + METHOD m_ewobmawf registerCopperDoor (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;)V + ARG 1 doorBlock + ARG 2 parent METHOD m_exnmtdvm registerNetherPortal ()V METHOD m_fasxgfba getFireSideModels (Lnet/minecraft/unmapped/C_mmxmpdoq;)Ljava/util/List; ARG 1 texture + METHOD m_fceewwpj (Lnet/minecraft/unmapped/C_mmxmpdoq;II)Lnet/minecraft/unmapped/C_ncpywfca; + ARG 3 key METHOD m_ffgjqufk registerSimpleCubeAll (Lnet/minecraft/unmapped/C_mmxmpdoq;)V ARG 1 block METHOD m_flhsnkoj (Lnet/minecraft/unmapped/C_pgmmajlq;)V ARG 0 texture + METHOD m_fmgtdkrj (Lnet/minecraft/unmapped/C_yigsfouo;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 0 variant METHOD m_frnyhswu registerScaffolding ()V + METHOD m_geshbqqh (Lnet/minecraft/unmapped/C_yigsfouo;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 0 variant + METHOD m_ggfwpfhb (Lnet/minecraft/unmapped/C_eonlnchv;)V + ARG 1 block METHOD m_ggklywtr registerTintableCrossBlockState (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ysvjbfkt$C_mqnwzrnb;Lnet/minecraft/unmapped/C_pgmmajlq;)V ARG 1 block ARG 2 tintType @@ -106,17 +152,37 @@ CLASS net/minecraft/unmapped/C_ysvjbfkt net/minecraft/data/client/model/BlockSta METHOD m_gignkpum registerSoulFire ()V METHOD m_glezpwwc registerCartographyTable ()V METHOD m_glngxdiu registerSmithingTable ()V + METHOD m_gsesufti (Lnet/minecraft/unmapped/C_yigsfouo;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 0 variant METHOD m_guxcvxip registerRedstoneTorch ()V + METHOD m_gvxnftep (Ljava/lang/Integer;)Lnet/minecraft/unmapped/C_ncpywfca; + ARG 1 hatch + METHOD m_gzmuclcb (Lnet/minecraft/unmapped/C_yigsfouo;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 0 variant + METHOD m_hbkpmnyx (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_pgmmajlq;)V + ARG 1 texture + METHOD m_hcupecjt addBookSlotModel (Lnet/minecraft/unmapped/C_xsihzhnp;Lnet/minecraft/unmapped/C_javqjqhm$C_gdifjgob;Lnet/minecraft/unmapped/C_nhjtezea$C_gkuxgtdu;Lnet/minecraft/unmapped/C_xhwijdsd;Lnet/minecraft/unmapped/C_zppcsbsk;Z)V + ARG 1 stateSupplier + ARG 2 facingCondition + ARG 3 rotation + ARG 4 occupiedProperty + ARG 5 model + ARG 6 occupied METHOD m_hdcntxdm registerInfestedStone ()V METHOD m_hdjwrzzm registerBuiltinWithParticle (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ncpywfca;)V ARG 1 block ARG 2 particleSource METHOD m_hdnhlbri registerSweetBerryBush ()V METHOD m_hgpbwlgc registerInfestedDeepslate ()V + METHOD m_hjdevwtp registerWaxedCopperBulb (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;)V + ARG 1 bulb + ARG 2 waxedBulb METHOD m_hkwihedq registerPiston (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_pgmmajlq;)V ARG 1 piston ARG 2 extendedModelId ARG 3 texture + METHOD m_hmoszmra (Lnet/minecraft/unmapped/C_yigsfouo;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 0 variant METHOD m_htcpxxln createBlockStateWithTwoModelAndRandomInversion (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_ufuguevl; ARG 0 block ARG 1 firstModelId @@ -133,16 +199,27 @@ CLASS net/minecraft/unmapped/C_ysvjbfkt net/minecraft/data/client/model/BlockSta METHOD m_hyrygyep getDripstoneVariant (Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_kfpkaqag;)Lnet/minecraft/unmapped/C_yigsfouo; ARG 1 direction ARG 2 thickness + METHOD m_ibtoybri createCopperBulbBlockState (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_wqokohwr; + ARG 2 base + ARG 3 lit + ARG 4 powered + ARG 5 litAndPowered + METHOD m_ifpfhtmc (Lnet/minecraft/unmapped/C_vukkmxtr;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 1 orientation METHOD m_itgfivoo registerSculkSensor ()V METHOD m_itofvnvc registerSunflower ()V METHOD m_itvgmpcn registerAzalea (Lnet/minecraft/unmapped/C_mmxmpdoq;)V ARG 1 block + METHOD m_iulyvwat (Lnet/minecraft/unmapped/C_pgmmajlq;)V + ARG 0 texture METHOD m_ixrbrmbo registerCocoa ()V METHOD m_jfasnsqr registerMushroomBlock (Lnet/minecraft/unmapped/C_mmxmpdoq;)V ARG 1 mushroomBlock METHOD m_jmkanmjf getTurtleEggModel (Ljava/lang/Integer;Ljava/lang/Integer;)Lnet/minecraft/unmapped/C_ncpywfca; ARG 1 eggs ARG 2 hatch + METHOD m_jmommkea (Lnet/minecraft/unmapped/C_vukkmxtr;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 1 orientation METHOD m_jneeecjt registerAxisRotated (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx;Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx;)V ARG 1 block ARG 2 verticalModelFactory @@ -160,7 +237,15 @@ CLASS net/minecraft/unmapped/C_ysvjbfkt net/minecraft/data/client/model/BlockSta ARG 1 plantBlock ARG 2 flowerPotBlock ARG 3 tintType + METHOD m_jsniiwol (Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 0 delay + ARG 1 locked + ARG 2 powered METHOD m_jspccrtm registerCaveVines ()V + METHOD m_juiovgan registerFrogspawn ()V + METHOD m_jziawvut (Lnet/minecraft/unmapped/C_pgmmajlq;)V + ARG 0 texture + METHOD m_jzrspkqa registerCube (Lnet/minecraft/unmapped/C_mmxmpdoq;)V METHOD m_kazkxzjv registerBeehive (Lnet/minecraft/unmapped/C_mmxmpdoq;Ljava/util/function/Function;)V ARG 1 beehive ARG 2 textureGetter @@ -172,21 +257,46 @@ CLASS net/minecraft/unmapped/C_ysvjbfkt net/minecraft/data/client/model/BlockSta METHOD m_kmakwxvc registerParentedItemModel (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ncpywfca;)V ARG 1 block ARG 2 parentModelId + METHOD m_kocajcau ([ILit/unimi/dsi/fastutil/ints/Int2ObjectMap;Lnet/minecraft/unmapped/C_mmxmpdoq;Ljava/lang/Integer;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 4 age + METHOD m_koplgjdn (Lnet/minecraft/unmapped/C_yigsfouo;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 0 variant + METHOD m_kpithqqh (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_waerxzys;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 2 phase METHOD m_ksvcvhvs registerWallPlant (Lnet/minecraft/unmapped/C_mmxmpdoq;)V ARG 1 block + METHOD m_kugbqgue (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Ljava/lang/Boolean;Lnet/minecraft/unmapped/C_wqmdpcsg;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 6 powered + ARG 7 straightShape + METHOD m_lbggpcmw (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Ljava/lang/Boolean;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 2 bloom + METHOD m_ldjkenju ([ILnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ysvjbfkt$C_mqnwzrnb;Ljava/lang/Integer;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 4 stage METHOD m_lhjyqfue registerPressurePlate (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;)V ARG 1 pressurePlate ARG 2 textureSource + METHOD m_lhwwsxgs registerDustable (Lnet/minecraft/unmapped/C_mmxmpdoq;)V METHOD m_ljmsqwrd registerSmoothStone ()V + METHOD m_lkdppgnq (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 4 lit + ARG 5 powered METHOD m_lrwtqevx registerRespawnAnchor ()V + METHOD m_ltydbgkq (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_pgmmajlq;)V + ARG 1 texture METHOD m_luasfpcl getBambooBlockStateVariants (I)Ljava/util/List; ARG 1 age METHOD m_luencdhd registerBuiltin (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_ysvjbfkt$C_ieiptmbq; ARG 1 block ARG 2 particleBlock + METHOD m_lupfabar (Ljava/lang/Boolean;Ljava/lang/Boolean;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 0 attached + ARG 1 powered METHOD m_luvphzzj registerLantern (Lnet/minecraft/unmapped/C_mmxmpdoq;)V ARG 1 lantern METHOD m_lxgnwpnn registerChorusPlant ()V + METHOD m_lxmcyawv (Ljava/lang/Integer;Ljava/lang/Integer;)Ljava/util/List; + ARG 1 eggs + ARG 2 hatch METHOD m_lxxxuewp registerObserver ()V METHOD m_maybkyfu registerBell ()V METHOD m_mghkbdnj createMudBrickState (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_pgmmajlq;Ljava/util/function/BiConsumer;)Lnet/minecraft/unmapped/C_wqokohwr; @@ -194,7 +304,13 @@ CLASS net/minecraft/unmapped/C_ysvjbfkt net/minecraft/data/client/model/BlockSta ARG 1 modelId ARG 2 texture ARG 3 modelCollector + METHOD m_mkszkjye registerMuddyMangroveRoots ()V + METHOD m_mlxfymcq (Lnet/minecraft/unmapped/C_mmxmpdoq;Ljava/lang/Integer;Lnet/minecraft/unmapped/C_ajkibnbh;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 1 age + ARG 2 half METHOD m_mofryije registerComparator ()V + METHOD m_mpxslqqz (Lnet/minecraft/unmapped/C_pgmmajlq;)V + ARG 0 texture METHOD m_mqvibvqy createStoneState (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_pgmmajlq;Ljava/util/function/BiConsumer;)Lnet/minecraft/unmapped/C_wqokohwr; ARG 0 block ARG 1 modelId @@ -206,6 +322,7 @@ CLASS net/minecraft/unmapped/C_ysvjbfkt net/minecraft/data/client/model/BlockSta ARG 3 model METHOD m_mupvqcdv createUpDefaultFacingVariantMap ()Lnet/minecraft/unmapped/C_ujotlecn; METHOD m_mvqqgxvm createNorthDefaultRotationStates ()Lnet/minecraft/unmapped/C_ujotlecn; + METHOD m_mwtfkfoc registerPitcherPlant ()V METHOD m_mwuwtaow registerTurtleEgg ()V METHOD m_myqwiymo registerSingleton (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx;)V ARG 1 block @@ -216,22 +333,36 @@ CLASS net/minecraft/unmapped/C_ysvjbfkt net/minecraft/data/client/model/BlockSta METHOD m_ncxhwjbj registerAxisRotated (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx;)V ARG 1 block ARG 2 modelFactory + METHOD m_ndkdbens (Ljava/lang/Comparable;Lnet/minecraft/unmapped/C_yigsfouo;Lnet/minecraft/unmapped/C_yigsfouo;Ljava/lang/Comparable;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 3 value + METHOD m_ngiuljtx registerSnifferEgg ()V METHOD m_nhkbvphl registerPistonHead ()V METHOD m_nlfouokk createBlockStateWithRandomHorizontalRotations (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_ufuguevl; ARG 0 block ARG 1 modelId + METHOD m_nmhkzxpj (Lnet/minecraft/unmapped/C_xsihzhnp;Lnet/minecraft/unmapped/C_javqjqhm$C_gdifjgob;Lnet/minecraft/unmapped/C_nhjtezea$C_gkuxgtdu;Lcom/mojang/datafixers/util/Pair;)V + ARG 4 pair METHOD m_nngvqjdk fillDoorVariantMap (Lnet/minecraft/unmapped/C_ujotlecn$C_lufmsfds;Lnet/minecraft/unmapped/C_ajkibnbh;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_ujotlecn$C_lufmsfds; ARG 0 variantMap ARG 1 targetHalf - ARG 2 regularModel - ARG 3 hingeModel + ARG 2 leftHingeClosedModel + ARG 3 leftHingeOpenModel + ARG 4 rightHingeClosedModel + ARG 5 rightHingeOpenModel + METHOD m_nnronpcz (Lnet/minecraft/unmapped/C_yigsfouo;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 0 variant + METHOD m_nqcykqsh (Lnet/minecraft/unmapped/C_ncpywfca;Ljava/lang/Integer;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 1 layers METHOD m_nvamqtbi registerGrassPath ()V METHOD m_nwusmhrm registerBarrel ()V + METHOD m_odanwlbt registerCalibratedSculkSensor ()V METHOD m_oekselca createFenceBlockState (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_wqokohwr; ARG 0 fenceBlock ARG 1 postModelId ARG 2 sideModelId METHOD m_oeuloqol registerFrostedIce ()V + METHOD m_oevigvxh (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_pgmmajlq;Ljava/lang/Integer;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 3 age METHOD m_oububbdh registerCandle (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;)V ARG 1 candle ARG 2 cake @@ -239,10 +370,16 @@ CLASS net/minecraft/unmapped/C_ysvjbfkt net/minecraft/data/client/model/BlockSta ARG 1 block ARG 2 textureSuffix METHOD m_ovirwzwn registerGrindstone ()V + METHOD m_oxrdxyqg registerPitcherCrop ()V + METHOD m_oxulsacv createUvLockedPillarBlockState (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_pgmmajlq;Ljava/util/function/BiConsumer;)Lnet/minecraft/unmapped/C_wqokohwr; + ARG 1 texture + ARG 2 modelCollector METHOD m_oyptuzye registerStonecutter ()V METHOD m_paheasaf registerNetherrack ()V METHOD m_parvmmyo registerItemModel (Lnet/minecraft/unmapped/C_mmxmpdoq;)V ARG 1 block + METHOD m_pckimosn (Lnet/minecraft/unmapped/C_pgmmajlq;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_pgmmajlq; + ARG 1 id METHOD m_pgdoxvrl registerCommandBlock (Lnet/minecraft/unmapped/C_mmxmpdoq;)V ARG 1 commandBlock METHOD m_phiipjec addJigsawOrientationToVariant (Lnet/minecraft/unmapped/C_vukkmxtr;Lnet/minecraft/unmapped/C_yigsfouo;)Lnet/minecraft/unmapped/C_yigsfouo; @@ -259,12 +396,18 @@ CLASS net/minecraft/unmapped/C_ysvjbfkt net/minecraft/data/client/model/BlockSta METHOD m_prwetmeb registerRoots (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;)V ARG 1 root ARG 2 pottedRoot + METHOD m_pufbzbcu registerChiseledBookshelf ()V METHOD m_puuuxowi registerNorthDefaultHorizontalRotation (Lnet/minecraft/unmapped/C_mmxmpdoq;)V ARG 1 block METHOD m_pwefsqmp registerGlassPane (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;)V ARG 1 glass ARG 2 glassPane METHOD m_pxwpoapy registerLever ()V + METHOD m_pxydxvus registerCopperTrapdoor (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;)V + ARG 1 trapdoorBlock + ARG 2 parent + METHOD m_qbvjqmkr (Ljava/util/function/Function;Ljava/lang/Integer;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 1 hatch METHOD m_qezzmiep registerCubeWithCustomTexture (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;Ljava/util/function/BiFunction;)V ARG 1 block ARG 2 otherTextureSource @@ -300,6 +443,7 @@ CLASS net/minecraft/unmapped/C_ysvjbfkt net/minecraft/data/client/model/BlockSta ARG 2 carpet METHOD m_rtnuknml registerRedstoneLamp ()V METHOD m_rzbkadfv registerHopper ()V + METHOD m_rzwirmpw registerFlowerbed (Lnet/minecraft/unmapped/C_mmxmpdoq;)V METHOD m_sahttoul registerTopSoils ()V METHOD m_sdvqthec registerEndPortalFrame ()V METHOD m_sgdxdcop registerCampfire ([Lnet/minecraft/unmapped/C_mmxmpdoq;)V @@ -313,7 +457,11 @@ CLASS net/minecraft/unmapped/C_ysvjbfkt net/minecraft/data/client/model/BlockSta METHOD m_slkmsppy registerLightningRod ()V METHOD m_slvvqxcz registerDaylightDetector ()V METHOD m_smqitsxk createAxisRotatedVariantMap ()Lnet/minecraft/unmapped/C_ujotlecn; + METHOD m_sunnause (Lnet/minecraft/unmapped/C_mmxmpdoq;Ljava/lang/Integer;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 2 dusted METHOD m_taixyhkk registerBrewingStand ()V + METHOD m_taqcexfm ([Lnet/minecraft/unmapped/C_ncpywfca;Ljava/lang/Integer;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 1 charges METHOD m_tegxqjie registerNorthDefaultHorizontalRotatable (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_pgmmajlq;)V ARG 1 block ARG 2 texture @@ -324,6 +472,8 @@ CLASS net/minecraft/unmapped/C_ysvjbfkt net/minecraft/data/client/model/BlockSta METHOD m_tnshpgmk createAxisRotatedBlockState (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_wqokohwr; ARG 0 block ARG 1 modelId + METHOD m_twiqwgku (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_pgmmajlq;)V + ARG 1 texture METHOD m_udzkaxjj registerOrientableTrapdoor (Lnet/minecraft/unmapped/C_mmxmpdoq;)V ARG 1 trapdoorBlock METHOD m_uklrzqns registerCooker (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx;)V @@ -334,8 +484,20 @@ CLASS net/minecraft/unmapped/C_ysvjbfkt net/minecraft/data/client/model/BlockSta ARG 2 tintType ARG 3 texture METHOD m_ussuonnk registerAmethysts ()V + METHOD m_uyjdjczk (Lnet/minecraft/unmapped/C_uihldlpc;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 1 mode + METHOD m_vgjywrmr registerCrafter ()V + METHOD m_vgpbeidr (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 0 id METHOD m_vqpcrebn (Lnet/minecraft/unmapped/C_pgmmajlq;)V ARG 0 texture + METHOD m_vvrdgvwj registerTintableStagedCrossBlockState (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ysvjbfkt$C_mqnwzrnb;Lnet/minecraft/unmapped/C_vzlztuyw;[I)V + ARG 2 tintType + ARG 3 stageProperty + ARG 4 stages + METHOD m_vxaizyos registerSculkCatalyst ()V + METHOD m_weietdrh (Lnet/minecraft/unmapped/C_yigsfouo;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 0 variant METHOD m_wenfkmji registerMagmaBlock ()V METHOD m_wjsytetv registerPistons ()V METHOD m_wnmondte registerAmethyst (Lnet/minecraft/unmapped/C_mmxmpdoq;)V @@ -347,15 +509,20 @@ CLASS net/minecraft/unmapped/C_ysvjbfkt net/minecraft/data/client/model/BlockSta ARG 3 ageTextureIndices METHOD m_xapzqrnp registerLog (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_ysvjbfkt$C_tpmbjwqh; ARG 1 logBlock + METHOD m_xerymucr (Lnet/minecraft/unmapped/C_xsihzhnp;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_nhjtezea$C_gkuxgtdu;)V + ARG 4 rotation METHOD m_xetrrkfn registerBed (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;)V ARG 1 bed ARG 2 particleSource + METHOD m_xghzmykj registerSculkShrieker ()V METHOD m_xgimwbyd registerParentedItemModel (Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_ncpywfca;)V ARG 1 item ARG 2 parentModelId METHOD m_xjbbguzb createSouthDefaultHorizontalRotationStates ()Lnet/minecraft/unmapped/C_ujotlecn; METHOD m_xkekfvxk registerRotatable (Lnet/minecraft/unmapped/C_mmxmpdoq;)V ARG 1 block + METHOD m_xlpwtwzk (Ljava/lang/Integer;)Lnet/minecraft/unmapped/C_yigsfouo; + ARG 1 age METHOD m_xmchdlvl getFireFloorModels (Lnet/minecraft/unmapped/C_mmxmpdoq;)Ljava/util/List; ARG 1 texture METHOD m_xrawdmen registerFarmland ()V @@ -398,12 +565,21 @@ CLASS net/minecraft/unmapped/C_ysvjbfkt net/minecraft/data/client/model/BlockSta ARG 2 tintType METHOD m_zebqtail registerLilyPad ()V METHOD m_zestimlc registerChorusFlower ()V + METHOD m_zffcuixd registerHangingSign (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;)V + ARG 1 log + ARG 2 hangingSign + ARG 3 wallSign METHOD m_zivxhyxe registerTopSoil (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_yigsfouo;)V ARG 1 topSoil ARG 2 modelId ARG 3 snowyVariant METHOD m_zkwrcwzq registerShulkerBox (Lnet/minecraft/unmapped/C_mmxmpdoq;)V ARG 1 shulkerBox + METHOD m_zoxlycaq addSlotStateAndRotationVariants (Lnet/minecraft/unmapped/C_xsihzhnp;Lnet/minecraft/unmapped/C_javqjqhm$C_gdifjgob;Lnet/minecraft/unmapped/C_nhjtezea$C_gkuxgtdu;)V + ARG 1 stateSupplier + ARG 2 facingCondition + ARG 3 rotation + METHOD m_zutsvuwn registerMangrovePropagule ()V METHOD m_zvzvirsj registerComposter ()V METHOD m_zxkyyqmx registerAnvil (Lnet/minecraft/unmapped/C_mmxmpdoq;)V ARG 1 anvil @@ -419,15 +595,18 @@ CLASS net/minecraft/unmapped/C_ysvjbfkt net/minecraft/data/client/model/BlockSta METHOD m_ttgqmsdi includeWithItem (Lnet/minecraft/unmapped/C_zppcsbsk;[Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_ysvjbfkt$C_ieiptmbq; ARG 1 model ARG 2 blocks + CLASS C_jhuevbcm BookSlotModelCacheKey CLASS C_jphnvadg BlockTexturePool FIELD f_cearzyke texture Lnet/minecraft/unmapped/C_pgmmajlq; FIELD f_icadalep baseModelId Lnet/minecraft/unmapped/C_ncpywfca; FIELD f_ihzuktky knownModels Ljava/util/Map; + FIELD f_narscpoc skippedModels Ljava/util/Set; FIELD f_ouzoxrif family Lnet/minecraft/unmapped/C_eonlnchv; METHOD (Lnet/minecraft/unmapped/C_ysvjbfkt;Lnet/minecraft/unmapped/C_pgmmajlq;)V ARG 2 texture METHOD m_bbbbnxkt stairs (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_ysvjbfkt$C_jphnvadg; ARG 1 block + METHOD m_bcruuyxo customFenceGate (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_ysvjbfkt$C_jphnvadg; METHOD m_eqavecux base (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_zppcsbsk;)Lnet/minecraft/unmapped/C_ysvjbfkt$C_jphnvadg; ARG 1 block ARG 2 model @@ -456,6 +635,9 @@ CLASS net/minecraft/unmapped/C_ysvjbfkt net/minecraft/data/client/model/BlockSta METHOD m_lsnbsyaq ensureModel (Lnet/minecraft/unmapped/C_zppcsbsk;Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_ncpywfca; ARG 1 model ARG 2 block + METHOD m_mmtayaup parented (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_ysvjbfkt$C_jphnvadg; + ARG 1 parent + ARG 2 block METHOD m_ngfqfdml pressurePlate (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_ysvjbfkt$C_jphnvadg; ARG 1 pressurePlateBlock METHOD m_vragukvh (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_zppcsbsk;)Lnet/minecraft/unmapped/C_ncpywfca; @@ -477,6 +659,7 @@ CLASS net/minecraft/unmapped/C_ysvjbfkt net/minecraft/data/client/model/BlockSta ARG 2 texture METHOD m_dvxxaazg log (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_ysvjbfkt$C_tpmbjwqh; ARG 1 logBlock + METHOD m_jgmzdamz uvLockedLog (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_ysvjbfkt$C_tpmbjwqh; METHOD m_wrvrbfhc wood (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_ysvjbfkt$C_tpmbjwqh; ARG 1 woodBlock METHOD m_yqsxsrke stem (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_ysvjbfkt$C_tpmbjwqh; diff --git a/mappings/net/minecraft/data/client/model/Model.mapping b/mappings/net/minecraft/data/client/model/Model.mapping index 3eeb962d8e..a7e2f4bc54 100644 --- a/mappings/net/minecraft/data/client/model/Model.mapping +++ b/mappings/net/minecraft/data/client/model/Model.mapping @@ -16,6 +16,18 @@ CLASS net/minecraft/unmapped/C_zppcsbsk net/minecraft/data/client/model/Model ARG 2 suffix ARG 3 texture ARG 4 modelCollector + METHOD m_ijcfulih (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_pixosdqo;Lnet/minecraft/unmapped/C_ncpywfca;)V + ARG 1 key + ARG 2 textureId + METHOD m_izvaynaq getDefaultModelId (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_ncpywfca; + METHOD m_mjmunmmv createJson (Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/Map;)Lcom/google/gson/JsonObject; + ARG 1 id + ARG 2 textureMap + METHOD m_oyjlnybm upload (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_pgmmajlq;Ljava/util/function/BiConsumer;Lnet/minecraft/unmapped/C_zppcsbsk$C_sbdlbkmi;)Lnet/minecraft/unmapped/C_ncpywfca; + ARG 1 id + ARG 2 texture + ARG 3 modelCollector + ARG 4 jsonFactory METHOD m_qvwwtehp createTextureMap (Lnet/minecraft/unmapped/C_pgmmajlq;)Ljava/util/Map; ARG 1 texture METHOD m_rhrakaxu (Lnet/minecraft/unmapped/C_zppcsbsk$C_sbdlbkmi;Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/Map;)Lcom/google/gson/JsonElement; @@ -28,3 +40,9 @@ CLASS net/minecraft/unmapped/C_zppcsbsk net/minecraft/data/client/model/Model ARG 1 block ARG 2 texture ARG 3 modelCollector + METHOD m_uyappnlr (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_ncpywfca;)V + ARG 1 parent + CLASS C_sbdlbkmi JsonFactory + METHOD create (Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/Map;)Lcom/google/gson/JsonObject; + ARG 1 id + ARG 2 textureMap diff --git a/mappings/net/minecraft/data/client/model/Models.mapping b/mappings/net/minecraft/data/client/model/Models.mapping index 1ec8ffb9d4..a4b5502401 100644 --- a/mappings/net/minecraft/data/client/model/Models.mapping +++ b/mappings/net/minecraft/data/client/model/Models.mapping @@ -1,9 +1,12 @@ CLASS net/minecraft/unmapped/C_vcuykfgc net/minecraft/data/client/model/Models + FIELD f_cvgdtrqx TEMPLATE_POTTED_FLOWERING_AZALEA_BUSH Lnet/minecraft/unmapped/C_zppcsbsk; FIELD f_jnhwdvre SINGLE_LAYER_ITEM Lnet/minecraft/unmapped/C_zppcsbsk; FIELD f_mjgpepuz TRIPLE_LAYER_ITEM Lnet/minecraft/unmapped/C_zppcsbsk; FIELD f_sfgphltd PARTICLE Lnet/minecraft/unmapped/C_zppcsbsk; FIELD f_tbelvgcf STEM_GROWTH_STAGES [Lnet/minecraft/unmapped/C_zppcsbsk; FIELD f_xyfoirmr DOUBLE_LAYER_ITEM Lnet/minecraft/unmapped/C_zppcsbsk; + METHOD m_faubrqhn (I)[Lnet/minecraft/unmapped/C_zppcsbsk; + ARG 0 length METHOD m_gipgtqqj item (Ljava/lang/String;[Lnet/minecraft/unmapped/C_pixosdqo;)Lnet/minecraft/unmapped/C_zppcsbsk; ARG 0 parent ARG 1 requiredTextures @@ -16,3 +19,5 @@ CLASS net/minecraft/unmapped/C_vcuykfgc net/minecraft/data/client/model/Models METHOD m_vwekgahp block (Ljava/lang/String;[Lnet/minecraft/unmapped/C_pixosdqo;)Lnet/minecraft/unmapped/C_zppcsbsk; ARG 0 parent ARG 1 requiredTextures + METHOD m_xdeesekp (I)Lnet/minecraft/unmapped/C_zppcsbsk; + ARG 0 stage diff --git a/mappings/net/minecraft/data/client/model/Texture.mapping b/mappings/net/minecraft/data/client/model/Texture.mapping index 3bc5f54237..0afa950c89 100644 --- a/mappings/net/minecraft/data/client/model/Texture.mapping +++ b/mappings/net/minecraft/data/client/model/Texture.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/unmapped/C_pgmmajlq net/minecraft/data/client/model/Texture FIELD f_ecvpqhia inherited Ljava/util/Set; FIELD f_usjeywzw entries Ljava/util/Map; + METHOD m_amvqbqnh customParticle (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_pgmmajlq; METHOD m_arkhwwuh crop (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_pgmmajlq; ARG 0 id METHOD m_aunduefd sideFrontTopBottom (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_pgmmajlq; @@ -15,6 +16,8 @@ CLASS net/minecraft/unmapped/C_pgmmajlq net/minecraft/data/client/model/Texture ARG 0 block METHOD m_cjnfpwwn cauldron (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_pgmmajlq; ARG 0 content + METHOD m_cmvcqyye (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + ARG 1 path METHOD m_cqmdvtff plant (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_pgmmajlq; ARG 0 id METHOD m_czrngiaz stem (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_pgmmajlq; @@ -37,16 +40,21 @@ CLASS net/minecraft/unmapped/C_pgmmajlq net/minecraft/data/client/model/Texture ARG 0 block METHOD m_eiubtszo sideAndTop (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_pgmmajlq; ARG 0 block + METHOD m_esmayivc sculkShrieker (Z)Lnet/minecraft/unmapped/C_pgmmajlq; + ARG 0 canSummon METHOD m_fhaielou pattern (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_pgmmajlq; ARG 0 block METHOD m_fmlhtlxq put (Lnet/minecraft/unmapped/C_pixosdqo;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_pgmmajlq; ARG 1 key ARG 2 id + METHOD m_fyonuiyk (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + ARG 1 path METHOD m_gfwoxucf getInherited ()Ljava/util/stream/Stream; METHOD m_ghhvhutp rail (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_pgmmajlq; ARG 0 block METHOD m_ghqwlvpx all (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_pgmmajlq; ARG 0 id + METHOD m_gnvgpjsu flowerbed (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_pgmmajlq; METHOD m_hsolgsih getSubId (Lnet/minecraft/unmapped/C_vorddnax;Ljava/lang/String;)Lnet/minecraft/unmapped/C_ncpywfca; ARG 0 item ARG 1 suffix @@ -73,6 +81,7 @@ CLASS net/minecraft/unmapped/C_pgmmajlq net/minecraft/data/client/model/Texture ARG 1 end METHOD m_nmpkoera wallSideEnd (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_pgmmajlq; ARG 0 block + METHOD m_nzbyyqjx pottedAzalea (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_pgmmajlq; METHOD m_ovvossma of (Lnet/minecraft/unmapped/C_pixosdqo;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_pgmmajlq; ARG 0 key ARG 1 id @@ -118,6 +127,9 @@ CLASS net/minecraft/unmapped/C_pgmmajlq net/minecraft/data/client/model/Texture ARG 2 layer2 METHOD m_wkqhkdip top (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_pgmmajlq; ARG 0 top + METHOD m_wmodlmje snifferEgg (Ljava/lang/String;)Lnet/minecraft/unmapped/C_pgmmajlq; + ARG 0 type + METHOD m_wnenptud fence (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_pgmmajlq; METHOD m_xfveurtl topBottom (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_pgmmajlq; ARG 0 top ARG 1 bottom diff --git a/mappings/net/minecraft/data/client/model/TexturedModel.mapping b/mappings/net/minecraft/data/client/model/TexturedModel.mapping index 3a3cb6a2df..8955eb3b93 100644 --- a/mappings/net/minecraft/data/client/model/TexturedModel.mapping +++ b/mappings/net/minecraft/data/client/model/TexturedModel.mapping @@ -1,9 +1,11 @@ CLASS net/minecraft/unmapped/C_tkkixdtc net/minecraft/data/client/model/TexturedModel COMMENT Represents a model with texture variables defined. + FIELD f_blaugkpd FLOWERBED_2 Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx; FIELD f_boubovoo ORIENTABLE Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx; FIELD f_bppfnamf TEMPLATE_HANGING_LANTERN Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx; FIELD f_cmqnydiq TEMPLATE_SEAGRASS Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx; FIELD f_eivnenam CUBE_COLUMN_HORIZONTAL Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx; + FIELD f_fjiipfwk FLOWERBED_3 Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx; FIELD f_gaatijqr CUBE_ALL Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx; FIELD f_gixfznvg TEMPLATE_ANVIL Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx; FIELD f_gpasebzp CUBE_TOP Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx; @@ -19,7 +21,9 @@ CLASS net/minecraft/unmapped/C_tkkixdtc net/minecraft/data/client/model/Textured FIELD f_smumziqg END_FOR_TOP_CUBE_COLUMN Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx; FIELD f_srvqqeoc CUBE_COLUMN Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx; FIELD f_svomqred PARTICLE Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx; + FIELD f_ulvknsfo FLOWERBED_4 Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx; FIELD f_uotyduaa CUBE_BOTTOM_TOP Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx; + FIELD f_wkllyois FLOWERBED_1 Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx; FIELD f_wnbaisnc LEAVES Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx; FIELD f_xdqlljao TEMPLATE_GLAZED_TERRACOTTA Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx; FIELD f_zyqjsxcw SIDE_END_WALL Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx; From e0ae0c385bd498adda85cbb87394a39933b601aa Mon Sep 17 00:00:00 2001 From: ix0rai Date: Mon, 30 Oct 2023 21:40:24 -0500 Subject: [PATCH 4/9] work --- .../net/minecraft/data/C_arcabcvu.mapping | 1 + .../net/minecraft/data/C_rrnzlzth.mapping | 1 + .../net/minecraft/data/C_wqumfxay.mapping | 1 + .../{unmapped => data}/C_wwetinhi.mapping | 2 +- .../net/minecraft/data/C_xjgowndt.mapping | 1 + .../net/minecraft/data/DataProvider.mapping | 10 ++++++++ mappings/net/minecraft/data/Main.mapping | 23 +++++++++++++++++++ mappings/net/minecraft/data/TODO3.mapping | 1 + mappings/net/minecraft/data/TODO4.mapping | 1 + .../data/report/CommandSyntaxProvider.mapping | 2 ++ .../report/RegistriesDatapackProvider.mapping | 13 +++++++++++ .../data/report/RegistryDumpProvider.mapping | 1 + .../data/server/LootTablesProvider.mapping | 15 ++++++++++++ ...deRebalanceChestLootTableGenerator.mapping | 5 ++++ .../TradeRebalanceLootTableProviders.mapping | 3 +++ .../data/server/recipe/RecipeExporter.mapping | 4 ++++ .../feature_flags/FeatureFlags.mapping | 2 ++ .../net/minecraft/unmapped/C_qlsuqzcn.mapping | 6 ----- simple_type_field_names.json5 | 4 ++++ 19 files changed, 89 insertions(+), 7 deletions(-) create mode 100644 mappings/net/minecraft/data/C_arcabcvu.mapping create mode 100644 mappings/net/minecraft/data/C_rrnzlzth.mapping create mode 100644 mappings/net/minecraft/data/C_wqumfxay.mapping rename mappings/net/minecraft/{unmapped => data}/C_wwetinhi.mapping (74%) create mode 100644 mappings/net/minecraft/data/C_xjgowndt.mapping create mode 100644 mappings/net/minecraft/data/TODO3.mapping create mode 100644 mappings/net/minecraft/data/TODO4.mapping create mode 100644 mappings/net/minecraft/data/report/RegistriesDatapackProvider.mapping create mode 100644 mappings/net/minecraft/data/server/loot_table/rebalance/TradeRebalanceChestLootTableGenerator.mapping create mode 100644 mappings/net/minecraft/data/server/loot_table/rebalance/TradeRebalanceLootTableProviders.mapping create mode 100644 mappings/net/minecraft/data/server/recipe/RecipeExporter.mapping delete mode 100644 mappings/net/minecraft/unmapped/C_qlsuqzcn.mapping diff --git a/mappings/net/minecraft/data/C_arcabcvu.mapping b/mappings/net/minecraft/data/C_arcabcvu.mapping new file mode 100644 index 0000000000..a10bc06e6c --- /dev/null +++ b/mappings/net/minecraft/data/C_arcabcvu.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/unmapped/C_arcabcvu net/minecraft/data/C_arcabcvu diff --git a/mappings/net/minecraft/data/C_rrnzlzth.mapping b/mappings/net/minecraft/data/C_rrnzlzth.mapping new file mode 100644 index 0000000000..9a042a23ec --- /dev/null +++ b/mappings/net/minecraft/data/C_rrnzlzth.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/unmapped/C_rrnzlzth net/minecraft/data/C_rrnzlzth diff --git a/mappings/net/minecraft/data/C_wqumfxay.mapping b/mappings/net/minecraft/data/C_wqumfxay.mapping new file mode 100644 index 0000000000..f611998299 --- /dev/null +++ b/mappings/net/minecraft/data/C_wqumfxay.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/unmapped/C_wqumfxay net/minecraft/data/C_wqumfxay diff --git a/mappings/net/minecraft/unmapped/C_wwetinhi.mapping b/mappings/net/minecraft/data/C_wwetinhi.mapping similarity index 74% rename from mappings/net/minecraft/unmapped/C_wwetinhi.mapping rename to mappings/net/minecraft/data/C_wwetinhi.mapping index e93450afca..5a40c7e49e 100644 --- a/mappings/net/minecraft/unmapped/C_wwetinhi.mapping +++ b/mappings/net/minecraft/data/C_wwetinhi.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_wwetinhi +CLASS net/minecraft/unmapped/C_wwetinhi net/minecraft/data/C_wwetinhi FIELD f_zrxygubc lookupProvider Ljava/util/concurrent/CompletableFuture; METHOD (Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output diff --git a/mappings/net/minecraft/data/C_xjgowndt.mapping b/mappings/net/minecraft/data/C_xjgowndt.mapping new file mode 100644 index 0000000000..de4950bf9c --- /dev/null +++ b/mappings/net/minecraft/data/C_xjgowndt.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/unmapped/C_xjgowndt net/minecraft/data/C_xjgowndt diff --git a/mappings/net/minecraft/data/DataProvider.mapping b/mappings/net/minecraft/data/DataProvider.mapping index 2e2595bf12..481b00bb70 100644 --- a/mappings/net/minecraft/data/DataProvider.mapping +++ b/mappings/net/minecraft/data/DataProvider.mapping @@ -2,11 +2,21 @@ CLASS net/minecraft/unmapped/C_nyiqvxcn net/minecraft/data/DataProvider FIELD f_mkydivae FIXED_ORDER_FIELDS Ljava/util/function/ToIntFunction; FIELD f_opmypmak LOGGER Lorg/slf4j/Logger; FIELD f_rftlymvj JSON_KEY_SORTER Ljava/util/Comparator; + METHOD m_erzxphou writeToPath (Lnet/minecraft/unmapped/C_temnquoh;Lcom/google/gson/JsonElement;Ljava/nio/file/Path;)Ljava/util/concurrent/CompletableFuture; + ARG 0 writer + ARG 1 json + ARG 2 path METHOD m_fafjrzdp getName ()Ljava/lang/String; METHOD m_gpszpvej run (Lnet/minecraft/unmapped/C_temnquoh;)Ljava/util/concurrent/CompletableFuture; ARG 1 writer METHOD m_pgghgory (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;)V ARG 0 map + METHOD m_wetvrfbf writeToPath (Lnet/minecraft/unmapped/C_temnquoh;Lcom/mojang/serialization/Codec;Ljava/lang/Object;Ljava/nio/file/Path;)Ljava/util/concurrent/CompletableFuture; + ARG 0 writer + ARG 2 object + ARG 3 path + METHOD m_wydopbbv (Ljava/lang/String;)Ljava/lang/String; + ARG 0 string CLASS C_oersiawb Factory METHOD create create (Lnet/minecraft/unmapped/C_ugkmwocs;)Lnet/minecraft/unmapped/C_nyiqvxcn; ARG 1 output diff --git a/mappings/net/minecraft/data/Main.mapping b/mappings/net/minecraft/data/Main.mapping index c39b2dfc39..ba381a6aed 100644 --- a/mappings/net/minecraft/data/Main.mapping +++ b/mappings/net/minecraft/data/Main.mapping @@ -1,6 +1,21 @@ CLASS net/minecraft/data/Main net/minecraft/data/Main METHOD m_aswtcewy (Ljava/lang/String;)Ljava/nio/file/Path; ARG 0 file + METHOD m_hcncdfng (Lnet/minecraft/unmapped/C_ugkmwocs;)Lnet/minecraft/unmapped/C_pukwuixp; + ARG 0 output + METHOD m_ibkkeufr (Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/unmapped/C_zqlavbep;Lnet/minecraft/unmapped/C_ugkmwocs;)Lnet/minecraft/unmapped/C_rrnzlzth; + ARG 2 output + METHOD m_jzkkjpsw createFactory (Ljava/util/function/BiFunction;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/unmapped/C_nyiqvxcn$C_oersiawb; + ARG 0 creator + ARG 1 lookupFuture + METHOD m_ldyuhhwg (Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/unmapped/C_zqlavbep;Lnet/minecraft/unmapped/C_ugkmwocs;)Lnet/minecraft/unmapped/C_nhqtnrtm; + ARG 2 output + METHOD m_nnflwwtx (Lnet/minecraft/unmapped/C_ugkmwocs;)Lnet/minecraft/unmapped/C_pukwuixp; + ARG 0 output + METHOD m_qgeuxgqf (Ljava/util/Collection;Lnet/minecraft/unmapped/C_ugkmwocs;)Lnet/minecraft/unmapped/C_eqresdzy; + ARG 1 output + METHOD m_rhhsytus (Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/unmapped/C_zqlavbep;Lnet/minecraft/unmapped/C_zqlavbep;Lnet/minecraft/unmapped/C_ugkmwocs;)Lnet/minecraft/unmapped/C_arcabcvu; + ARG 3 output METHOD m_rszkkyyi create (Ljava/nio/file/Path;Ljava/util/Collection;ZZZZZLnet/minecraft/unmapped/C_xyxorzsk;Z)Lnet/minecraft/unmapped/C_nditonqu; ARG 0 output ARG 1 inputs @@ -9,5 +24,13 @@ CLASS net/minecraft/data/Main net/minecraft/data/Main ARG 4 includeDev ARG 5 includeReports ARG 6 validate + ARG 7 version + ARG 8 ignoreCache + METHOD m_tddgfuuk (Ljava/util/Collection;Lnet/minecraft/unmapped/C_ugkmwocs;)Lnet/minecraft/unmapped/C_mbkhigvd; + ARG 1 output + METHOD m_werkiqwz (Ljava/util/function/BiFunction;Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/unmapped/C_ugkmwocs;)Lnet/minecraft/unmapped/C_nyiqvxcn; + ARG 2 output + METHOD m_xphvpsdq (Lnet/minecraft/unmapped/C_ugkmwocs;)Lnet/minecraft/unmapped/C_pukwuixp; + ARG 0 output METHOD main main ([Ljava/lang/String;)V ARG 0 args diff --git a/mappings/net/minecraft/data/TODO3.mapping b/mappings/net/minecraft/data/TODO3.mapping new file mode 100644 index 0000000000..642cbef570 --- /dev/null +++ b/mappings/net/minecraft/data/TODO3.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/unmapped/C_vyiqseao net/minecraft/data/TODO3 diff --git a/mappings/net/minecraft/data/TODO4.mapping b/mappings/net/minecraft/data/TODO4.mapping new file mode 100644 index 0000000000..50226921dc --- /dev/null +++ b/mappings/net/minecraft/data/TODO4.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/unmapped/C_omgzuwzx net/minecraft/data/TODO4 diff --git a/mappings/net/minecraft/data/report/CommandSyntaxProvider.mapping b/mappings/net/minecraft/data/report/CommandSyntaxProvider.mapping index b5ec37462c..766ae014b7 100644 --- a/mappings/net/minecraft/data/report/CommandSyntaxProvider.mapping +++ b/mappings/net/minecraft/data/report/CommandSyntaxProvider.mapping @@ -4,3 +4,5 @@ CLASS net/minecraft/unmapped/C_kbkyskqj net/minecraft/data/report/CommandSyntaxP METHOD (Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output ARG 2 registryLookup + METHOD m_ivvxcotl (Lnet/minecraft/unmapped/C_temnquoh;Ljava/nio/file/Path;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Ljava/util/concurrent/CompletionStage; + ARG 2 provider diff --git a/mappings/net/minecraft/data/report/RegistriesDatapackProvider.mapping b/mappings/net/minecraft/data/report/RegistriesDatapackProvider.mapping new file mode 100644 index 0000000000..9c6aa1b765 --- /dev/null +++ b/mappings/net/minecraft/data/report/RegistriesDatapackProvider.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/unmapped/C_qlsuqzcn net/minecraft/data/report/RegistriesDatapackProvider + FIELD f_tldbnsmr lookupProvider Ljava/util/concurrent/CompletableFuture; + FIELD f_zcjolsve output Lnet/minecraft/unmapped/C_ugkmwocs; + METHOD (Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 lookupProvider + METHOD m_qjzaafhz (Lnet/minecraft/unmapped/C_temnquoh;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/unmapped/C_ratuauki$C_qpshoosu;)Ljava/util/stream/Stream; + ARG 4 data + METHOD m_zeouzauj (Lnet/minecraft/unmapped/C_temnquoh;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Ljava/util/concurrent/CompletionStage; + ARG 2 provider + METHOD m_zuladejj (Lnet/minecraft/unmapped/C_temnquoh;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/unmapped/C_ratuauki$C_qpshoosu;)Ljava/util/Optional; + ARG 2 provider + ARG 4 data diff --git a/mappings/net/minecraft/data/report/RegistryDumpProvider.mapping b/mappings/net/minecraft/data/report/RegistryDumpProvider.mapping index dcc309c5d8..0c63d079b2 100644 --- a/mappings/net/minecraft/data/report/RegistryDumpProvider.mapping +++ b/mappings/net/minecraft/data/report/RegistryDumpProvider.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/unmapped/C_tvadbyzu net/minecraft/data/report/RegistryDumpProvider + FIELD f_ycqecdux output Lnet/minecraft/unmapped/C_ugkmwocs; METHOD m_cunrxqwl (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)V ARG 1 holder METHOD m_lcbsydlp toJson (Lnet/minecraft/unmapped/C_tqxyjqsk;)Lcom/google/gson/JsonElement; diff --git a/mappings/net/minecraft/data/server/LootTablesProvider.mapping b/mappings/net/minecraft/data/server/LootTablesProvider.mapping index 9f598770be..eb008810ab 100644 --- a/mappings/net/minecraft/data/server/LootTablesProvider.mapping +++ b/mappings/net/minecraft/data/server/LootTablesProvider.mapping @@ -1,8 +1,23 @@ CLASS net/minecraft/unmapped/C_rriyyrek net/minecraft/data/server/LootTablesProvider FIELD f_khsnzwsn lootTypeGenerators Ljava/util/List; FIELD f_umgzdmcg LOGGER Lorg/slf4j/Logger; + FIELD f_xcjyrvon lootTableIds Ljava/util/Set; + FIELD f_xiwpsgvz pathResolver Lnet/minecraft/unmapped/C_ugkmwocs$C_ehniswvc; + METHOD (Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/Set;Ljava/util/List;)V + ARG 1 output + METHOD m_czjhdvga (Ljava/lang/String;Ljava/lang/String;)V + ARG 0 name + ARG 1 message METHOD m_iccnzkqh (Ljava/util/Map;Ljava/util/Map;Lnet/minecraft/unmapped/C_rriyyrek$C_ujsjtlmo;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_inwsuliy$C_daaljsfu;)V ARG 3 id ARG 4 builder + METHOD m_jparztau (Lnet/minecraft/unmapped/C_temnquoh;Ljava/util/Map$Entry;)Ljava/util/concurrent/CompletableFuture; + ARG 2 entry METHOD m_pkqhglxx (Lnet/minecraft/unmapped/C_eumtgsbp;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_inwsuliy;)V ARG 1 id + ARG 2 table + METHOD m_wtovnwug (Ljava/util/Map;Ljava/util/Map;Lnet/minecraft/unmapped/C_rriyyrek$C_ujsjtlmo;)V + ARG 2 entry + METHOD m_xwqkynvq (I)[Ljava/util/concurrent/CompletableFuture; + ARG 0 size + CLASS C_ujsjtlmo GeneratorEntry diff --git a/mappings/net/minecraft/data/server/loot_table/rebalance/TradeRebalanceChestLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loot_table/rebalance/TradeRebalanceChestLootTableGenerator.mapping new file mode 100644 index 0000000000..ea3cce394f --- /dev/null +++ b/mappings/net/minecraft/data/server/loot_table/rebalance/TradeRebalanceChestLootTableGenerator.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/unmapped/C_xwiovefs net/minecraft/data/server/loot_table/rebalance/TradeRebalanceChestLootTableGenerator + METHOD m_eyckzqwa createAncientCityChestTableBuilder ()Lnet/minecraft/unmapped/C_inwsuliy$C_daaljsfu; + METHOD m_ggpnuaee createPillagerOutpostChestTableBuilder ()Lnet/minecraft/unmapped/C_inwsuliy$C_daaljsfu; + METHOD m_petrhyzy createJungleTempleChestTableBuilder ()Lnet/minecraft/unmapped/C_inwsuliy$C_daaljsfu; + METHOD m_svlaxvnm createDesertPyramidChestTableBuilder ()Lnet/minecraft/unmapped/C_inwsuliy$C_daaljsfu; diff --git a/mappings/net/minecraft/data/server/loot_table/rebalance/TradeRebalanceLootTableProviders.mapping b/mappings/net/minecraft/data/server/loot_table/rebalance/TradeRebalanceLootTableProviders.mapping new file mode 100644 index 0000000000..d2f5b4437e --- /dev/null +++ b/mappings/net/minecraft/data/server/loot_table/rebalance/TradeRebalanceLootTableProviders.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/unmapped/C_rkickfza net/minecraft/data/server/loot_table/rebalance/TradeRebalanceLootTableProviders + METHOD m_pjdqpikk createTradeRebalanceProvider (Lnet/minecraft/unmapped/C_ugkmwocs;)Lnet/minecraft/unmapped/C_rriyyrek; + ARG 0 output diff --git a/mappings/net/minecraft/data/server/recipe/RecipeExporter.mapping b/mappings/net/minecraft/data/server/recipe/RecipeExporter.mapping new file mode 100644 index 0000000000..1b6bec39e7 --- /dev/null +++ b/mappings/net/minecraft/data/server/recipe/RecipeExporter.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/unmapped/C_nykrdyol net/minecraft/data/server/recipe/RecipeExporter + METHOD m_ssoavaun accept (Lnet/minecraft/unmapped/C_qoyuyccf;)V + ARG 1 jsonProvider + METHOD m_wutnhfky accept ()Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; diff --git a/mappings/net/minecraft/feature_flags/FeatureFlags.mapping b/mappings/net/minecraft/feature_flags/FeatureFlags.mapping index 282e0c7599..b403fa6594 100644 --- a/mappings/net/minecraft/feature_flags/FeatureFlags.mapping +++ b/mappings/net/minecraft/feature_flags/FeatureFlags.mapping @@ -1,9 +1,11 @@ CLASS net/minecraft/unmapped/C_ozbmlrmw net/minecraft/feature_flags/FeatureFlags + FIELD f_dmxgtmcy UPDATE_1_21 Lnet/minecraft/unmapped/C_kksdgidr; FIELD f_frgxzoxk BUNDLE Lnet/minecraft/unmapped/C_kksdgidr; FIELD f_gouzolrt DEFAULT_SET Lnet/minecraft/unmapped/C_czxxrbcp; FIELD f_lwmwbyqg VANILLA_SET Lnet/minecraft/unmapped/C_czxxrbcp; FIELD f_vgooiicl VANILLA Lnet/minecraft/unmapped/C_kksdgidr; FIELD f_xstdghyj MAIN_REGISTRY Lnet/minecraft/unmapped/C_asecsefi; + FIELD f_xtedwgza TRADE_REBALANCE Lnet/minecraft/unmapped/C_kksdgidr; METHOD m_iacybqqj containsDefault (Lnet/minecraft/unmapped/C_czxxrbcp;)Z ARG 0 set METHOD m_jfpmedjk showMissing (Lnet/minecraft/unmapped/C_asecsefi;Lnet/minecraft/unmapped/C_czxxrbcp;Lnet/minecraft/unmapped/C_czxxrbcp;)Ljava/lang/String; diff --git a/mappings/net/minecraft/unmapped/C_qlsuqzcn.mapping b/mappings/net/minecraft/unmapped/C_qlsuqzcn.mapping deleted file mode 100644 index 033ac9178c..0000000000 --- a/mappings/net/minecraft/unmapped/C_qlsuqzcn.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/unmapped/C_qlsuqzcn - FIELD f_tldbnsmr lookupProvider Ljava/util/concurrent/CompletableFuture; - FIELD f_zcjolsve output Lnet/minecraft/unmapped/C_ugkmwocs; - METHOD (Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/concurrent/CompletableFuture;)V - ARG 1 output - ARG 2 lookupProvider diff --git a/simple_type_field_names.json5 b/simple_type_field_names.json5 index 3f72e43206..1bba89ef4f 100644 --- a/simple_type_field_names.json5 +++ b/simple_type_field_names.json5 @@ -8,6 +8,10 @@ "dynOps" ] }, + + // Data + "net/minecraft/unmapped/C_temnquoh": "writer", // DataWriter + // DFU "com/mojang/datafixers/schemas/Schema": "schema", "com/mojang/datafixers/DataFixer": "dataFixer", From 1f8674b7b50fdf63c7c8c4d52b13e6ff2e972993 Mon Sep 17 00:00:00 2001 From: ix0rai Date: Sat, 4 Nov 2023 00:05:38 -0500 Subject: [PATCH 5/9] progress --- gradle/libs.versions.toml | 2 +- .../advancement/criterion/Criterion.mapping | 2 + .../net/minecraft/data/C_arcabcvu.mapping | 1 - .../net/minecraft/data/C_rrnzlzth.mapping | 1 - .../net/minecraft/data/C_wqumfxay.mapping | 1 - .../net/minecraft/data/C_wwetinhi.mapping | 5 -- .../net/minecraft/data/C_xjgowndt.mapping | 1 - mappings/net/minecraft/data/TODO3.mapping | 1 - mappings/net/minecraft/data/TODO4.mapping | 1 - .../minecraft/data/family/BlockFamily.mapping | 2 + .../report/BiomeParametersProvider.mapping | 12 ++++ .../data/server/AdvancementsProvider.mapping | 2 + .../data/server/RecipesProvider.mapping | 56 +++++++++++++++++++ ...OneTwentyOneBlockLootTableProvider.mapping | 1 + .../OneTwentyOneLootTableProviders.mapping | 3 + .../recipe/OneTwentyOneRecipeProvider.mapping | 1 + .../server/recipe/RecipeJsonFactory.mapping | 6 ++ .../server/tag/AbstractTagProvider.mapping | 17 ++++++ .../data/server/tag/ItemTagsProvider.mapping | 12 ++++ .../data/server/tag/MapTagsProvider.mapping | 4 ++ .../server/tag/PaintingTagProvider.mapping | 3 + .../data/server/tag/PoiTagProvider.mapping | 3 + .../data/server/tag/TagsProvider.mapping | 6 ++ .../OneTwentyOneBlockTagProvider.mapping | 5 ++ .../OneTwentyOneItemTagProvider.mapping | 1 + .../OneTwentyOneBuiltinRegistries.mapping | 4 ++ .../registry/RegistryPatchGenerator.mapping | 6 ++ ...MultiNoiseBiomeSourceParameterList.mapping | 1 + simple_type_field_names.json5 | 3 +- 29 files changed, 150 insertions(+), 13 deletions(-) delete mode 100644 mappings/net/minecraft/data/C_arcabcvu.mapping delete mode 100644 mappings/net/minecraft/data/C_rrnzlzth.mapping delete mode 100644 mappings/net/minecraft/data/C_wqumfxay.mapping delete mode 100644 mappings/net/minecraft/data/C_wwetinhi.mapping delete mode 100644 mappings/net/minecraft/data/C_xjgowndt.mapping delete mode 100644 mappings/net/minecraft/data/TODO3.mapping delete mode 100644 mappings/net/minecraft/data/TODO4.mapping create mode 100644 mappings/net/minecraft/data/report/BiomeParametersProvider.mapping create mode 100644 mappings/net/minecraft/data/server/loot/one_twenty_one/OneTwentyOneBlockLootTableProvider.mapping create mode 100644 mappings/net/minecraft/data/server/loot/one_twenty_one/OneTwentyOneLootTableProviders.mapping create mode 100644 mappings/net/minecraft/data/server/recipe/OneTwentyOneRecipeProvider.mapping create mode 100644 mappings/net/minecraft/data/server/tag/MapTagsProvider.mapping create mode 100644 mappings/net/minecraft/data/server/tag/one_twenty_one/OneTwentyOneBlockTagProvider.mapping create mode 100644 mappings/net/minecraft/data/server/tag/one_twenty_one/OneTwentyOneItemTagProvider.mapping create mode 100644 mappings/net/minecraft/registry/OneTwentyOneBuiltinRegistries.mapping create mode 100644 mappings/net/minecraft/registry/RegistryPatchGenerator.mapping diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2f922d29f2..5a6fbcda9c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ guava = "31.1-jre" jackson_xml = "2.14.1" launchermeta_parser = "1.0.0" enigma = "1.9.0" -enigma_plugin = "1.3.2" +enigma_plugin = "1.4.0" tiny_remapper = "0.7.2" stitch = "0.6.1" unpick = "3.0.6" diff --git a/mappings/net/minecraft/advancement/criterion/Criterion.mapping b/mappings/net/minecraft/advancement/criterion/Criterion.mapping index 31d17c20ce..01d71c41ae 100644 --- a/mappings/net/minecraft/advancement/criterion/Criterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/Criterion.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/unmapped/C_mysyaxfs net/minecraft/advancement/criterion/Criterion + METHOD m_eenzxdpn create (Lnet/minecraft/unmapped/C_zkhebbek;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 1 conditions METHOD m_ejusorzh conditionsFromJson (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_gzewtdot;)Lnet/minecraft/unmapped/C_zkhebbek; ARG 1 obj ARG 2 predicateDeserializer diff --git a/mappings/net/minecraft/data/C_arcabcvu.mapping b/mappings/net/minecraft/data/C_arcabcvu.mapping deleted file mode 100644 index a10bc06e6c..0000000000 --- a/mappings/net/minecraft/data/C_arcabcvu.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/unmapped/C_arcabcvu net/minecraft/data/C_arcabcvu diff --git a/mappings/net/minecraft/data/C_rrnzlzth.mapping b/mappings/net/minecraft/data/C_rrnzlzth.mapping deleted file mode 100644 index 9a042a23ec..0000000000 --- a/mappings/net/minecraft/data/C_rrnzlzth.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/unmapped/C_rrnzlzth net/minecraft/data/C_rrnzlzth diff --git a/mappings/net/minecraft/data/C_wqumfxay.mapping b/mappings/net/minecraft/data/C_wqumfxay.mapping deleted file mode 100644 index f611998299..0000000000 --- a/mappings/net/minecraft/data/C_wqumfxay.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/unmapped/C_wqumfxay net/minecraft/data/C_wqumfxay diff --git a/mappings/net/minecraft/data/C_wwetinhi.mapping b/mappings/net/minecraft/data/C_wwetinhi.mapping deleted file mode 100644 index 5a40c7e49e..0000000000 --- a/mappings/net/minecraft/data/C_wwetinhi.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/unmapped/C_wwetinhi net/minecraft/data/C_wwetinhi - FIELD f_zrxygubc lookupProvider Ljava/util/concurrent/CompletableFuture; - METHOD (Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/concurrent/CompletableFuture;)V - ARG 1 output - ARG 2 lookupProvider diff --git a/mappings/net/minecraft/data/C_xjgowndt.mapping b/mappings/net/minecraft/data/C_xjgowndt.mapping deleted file mode 100644 index de4950bf9c..0000000000 --- a/mappings/net/minecraft/data/C_xjgowndt.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/unmapped/C_xjgowndt net/minecraft/data/C_xjgowndt diff --git a/mappings/net/minecraft/data/TODO3.mapping b/mappings/net/minecraft/data/TODO3.mapping deleted file mode 100644 index 642cbef570..0000000000 --- a/mappings/net/minecraft/data/TODO3.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/unmapped/C_vyiqseao net/minecraft/data/TODO3 diff --git a/mappings/net/minecraft/data/TODO4.mapping b/mappings/net/minecraft/data/TODO4.mapping deleted file mode 100644 index 50226921dc..0000000000 --- a/mappings/net/minecraft/data/TODO4.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/unmapped/C_omgzuwzx net/minecraft/data/TODO4 diff --git a/mappings/net/minecraft/data/family/BlockFamily.mapping b/mappings/net/minecraft/data/family/BlockFamily.mapping index aeb89002a4..712160e34a 100644 --- a/mappings/net/minecraft/data/family/BlockFamily.mapping +++ b/mappings/net/minecraft/data/family/BlockFamily.mapping @@ -63,5 +63,7 @@ CLASS net/minecraft/unmapped/C_eonlnchv net/minecraft/data/family/BlockFamily ARG 1 block METHOD m_zfazbpjw customFenceGate (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_eonlnchv$C_bgfxtocb; CLASS C_gtxnbiam Variant + FIELD f_zrcdybsh name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name + METHOD m_xxathjaz getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/data/report/BiomeParametersProvider.mapping b/mappings/net/minecraft/data/report/BiomeParametersProvider.mapping new file mode 100644 index 0000000000..0f6e2ed7e0 --- /dev/null +++ b/mappings/net/minecraft/data/report/BiomeParametersProvider.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/unmapped/C_wwetinhi net/minecraft/data/report/BiomeParametersProvider + FIELD f_bemjvqoj path Ljava/nio/file/Path; + FIELD f_zrxygubc lookupProvider Ljava/util/concurrent/CompletableFuture; + METHOD (Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 lookupProvider + METHOD m_dbdhbfat write (Ljava/nio/file/Path;Lnet/minecraft/unmapped/C_temnquoh;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Encoder;Ljava/lang/Object;)Ljava/util/concurrent/CompletableFuture; + ARG 0 path + ARG 3 encoder + ARG 4 object + METHOD m_lfeplmtj resolveFile (Lnet/minecraft/unmapped/C_ncpywfca;)Ljava/nio/file/Path; + ARG 1 id diff --git a/mappings/net/minecraft/data/server/AdvancementsProvider.mapping b/mappings/net/minecraft/data/server/AdvancementsProvider.mapping index 36f1e45d21..99735c01dc 100644 --- a/mappings/net/minecraft/data/server/AdvancementsProvider.mapping +++ b/mappings/net/minecraft/data/server/AdvancementsProvider.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/unmapped/C_ncoihxbl net/minecraft/data/server/AdvancementsProvider FIELD f_kppcvhnq lookupProvider Ljava/util/concurrent/CompletableFuture; + FIELD f_sqmkoixj tabGenerators Ljava/util/List; + FIELD f_zdlrtzkq pathResolver Lnet/minecraft/unmapped/C_ugkmwocs$C_ehniswvc; METHOD (Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/concurrent/CompletableFuture;Ljava/util/List;)V ARG 1 output ARG 2 lookupProvider diff --git a/mappings/net/minecraft/data/server/RecipesProvider.mapping b/mappings/net/minecraft/data/server/RecipesProvider.mapping index 2765a3c220..9f141a19b6 100644 --- a/mappings/net/minecraft/data/server/RecipesProvider.mapping +++ b/mappings/net/minecraft/data/server/RecipesProvider.mapping @@ -6,10 +6,15 @@ CLASS net/minecraft/unmapped/C_hwlnmobw net/minecraft/data/server/RecipesProvide ARG 1 output METHOD m_acjyothp generateFamily (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_eonlnchv;)V ARG 1 family + METHOD m_akocgbdq offerBulbRecipe (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;)V + ARG 1 result + ARG 2 ingredient METHOD m_asmngric offerChiseledBlockRecipe (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_ehjomvtz;Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_gmbqjnle;)V ARG 1 category ARG 2 output ARG 3 input + METHOD m_aykqvtku (Lnet/minecraft/unmapped/C_eonlnchv;Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_eonlnchv$C_gtxnbiam;Lnet/minecraft/unmapped/C_mmxmpdoq;)V + ARG 2 variant METHOD m_benkunxz createChiseledBlockRecipe (Lnet/minecraft/unmapped/C_ehjomvtz;Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_tcpsydrv;)Lnet/minecraft/unmapped/C_gfkvrxou; ARG 0 category ARG 1 output @@ -22,6 +27,8 @@ CLASS net/minecraft/unmapped/C_hwlnmobw net/minecraft/data/server/RecipesProvide ARG 2 input METHOD m_bwychucx getItemPath (Lnet/minecraft/unmapped/C_gmbqjnle;)Ljava/lang/String; ARG 0 item + METHOD m_bxsjpgzi (Lnet/minecraft/unmapped/C_czxxrbcp;Lnet/minecraft/unmapped/C_eonlnchv;)Z + ARG 1 family METHOD m_bzlprwaa offerTerracottaDyeingRecipe (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_gmbqjnle;)V ARG 1 output ARG 2 input @@ -43,6 +50,10 @@ CLASS net/minecraft/unmapped/C_hwlnmobw net/minecraft/data/server/RecipesProvide ARG 1 output ARG 2 category ARG 3 input + METHOD m_dcvcfyhn conditionsFromItemPredicates ([Lnet/minecraft/unmapped/C_afravpde$C_qwujnjpk;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 builders + METHOD m_dyvenyat conditionsFromItem (Lnet/minecraft/unmapped/C_gmbqjnle;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 item METHOD m_eombplgf offerBannerRecipe (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_gmbqjnle;)V ARG 1 output ARG 2 input @@ -57,6 +68,10 @@ CLASS net/minecraft/unmapped/C_hwlnmobw net/minecraft/data/server/RecipesProvide ARG 0 output ARG 1 input METHOD m_gdnqvign generateRecipes (Lnet/minecraft/unmapped/C_nykrdyol;)V + ARG 1 exporter + METHOD m_gseugmvz offerGrateRecipe (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;)V + ARG 1 result + ARG 2 ingredient METHOD m_gxdbdkxh getRecipeName (Lnet/minecraft/unmapped/C_gmbqjnle;)Ljava/lang/String; ARG 0 item METHOD m_gxdqyakv createSignRecipe (Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_tcpsydrv;)Lnet/minecraft/unmapped/C_ybcoihxg; @@ -71,6 +86,8 @@ CLASS net/minecraft/unmapped/C_hwlnmobw net/minecraft/data/server/RecipesProvide ARG 6 experience METHOD m_gzugajwu hasItem (Lnet/minecraft/unmapped/C_gmbqjnle;)Ljava/lang/String; ARG 0 item + METHOD m_hgqabtqe conditionsFromTag (Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 tag METHOD m_hhxbgczj (Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_gmbqjnle;)Lnet/minecraft/unmapped/C_ybcoihxg; ARG 0 output ARG 1 input @@ -117,6 +134,8 @@ CLASS net/minecraft/unmapped/C_hwlnmobw net/minecraft/data/server/RecipesProvide ARG 2 input METHOD m_jknpelyf getSmeltingItemPath (Lnet/minecraft/unmapped/C_gmbqjnle;)Ljava/lang/String; ARG 0 item + METHOD m_kcadvvlk conditionsFromItemPredicates ([Lnet/minecraft/unmapped/C_afravpde;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 predicates METHOD m_kekvugqk getVariantRecipeInput (Lnet/minecraft/unmapped/C_eonlnchv;Lnet/minecraft/unmapped/C_eonlnchv$C_gtxnbiam;)Lnet/minecraft/unmapped/C_mmxmpdoq; COMMENT Gets the block used to craft a certain {@linkplain net.minecraft.data.family.BlockFamily.Variant variant} of a base block. COMMENT @@ -139,6 +158,7 @@ CLASS net/minecraft/unmapped/C_hwlnmobw net/minecraft/data/server/RecipesProvide ARG 0 output ARG 1 input METHOD m_mbxwigak offerBlasting (Lnet/minecraft/unmapped/C_nykrdyol;Ljava/util/List;Lnet/minecraft/unmapped/C_ehjomvtz;Lnet/minecraft/unmapped/C_gmbqjnle;FILjava/lang/String;)V + ARG 0 exporter ARG 1 inputs ARG 2 category ARG 3 output @@ -155,6 +175,11 @@ CLASS net/minecraft/unmapped/C_hwlnmobw net/minecraft/data/server/RecipesProvide ARG 1 output ARG 2 ingredientTag ARG 3 outputCount + METHOD m_oaxthzyf createStonecuttingRecipe (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_ehjomvtz;Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_gmbqjnle;I)V + ARG 1 category + ARG 2 ingredient + ARG 3 result + ARG 4 count METHOD m_oazscnar offerWallRecipe (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_ehjomvtz;Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_gmbqjnle;)V ARG 1 category ARG 2 output @@ -178,10 +203,18 @@ CLASS net/minecraft/unmapped/C_hwlnmobw net/minecraft/data/server/RecipesProvide ARG 2 input METHOD m_qbpsfien (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_eonlnchv;)V ARG 1 family + METHOD m_qgcuptpd (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_ehjomvtz;Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_ehjomvtz;Lnet/minecraft/unmapped/C_gmbqjnle;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V + ARG 2 result + ARG 4 ingredient + METHOD m_qhnsxugw offerShapelessRecipe (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_gmbqjnle;Ljava/lang/String;)V + ARG 1 result + ARG 2 ingredient + ARG 3 group METHOD m_qievuhum offerStainedGlassPaneDyeingRecipe (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_gmbqjnle;)V ARG 1 output ARG 2 input METHOD m_qvyohqjn offerSmelting (Lnet/minecraft/unmapped/C_nykrdyol;Ljava/util/List;Lnet/minecraft/unmapped/C_ehjomvtz;Lnet/minecraft/unmapped/C_gmbqjnle;FILjava/lang/String;)V + ARG 0 exporter ARG 1 inputs ARG 2 category ARG 3 output @@ -194,13 +227,23 @@ CLASS net/minecraft/unmapped/C_hwlnmobw net/minecraft/data/server/RecipesProvide METHOD m_rtgvxiag (Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_gmbqjnle;)Lnet/minecraft/unmapped/C_ybcoihxg; ARG 0 output ARG 1 input + METHOD m_sohsqjcq conditionsFromItem (Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;Lnet/minecraft/unmapped/C_gmbqjnle;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 count + ARG 1 item METHOD m_swubibgw generateFamilies (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_czxxrbcp;)V ARG 1 featureFlags METHOD m_sxoobkcl (Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_gmbqjnle;)Lnet/minecraft/unmapped/C_ybcoihxg; ARG 0 output ARG 1 input + METHOD m_syyejima (Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_gmbqjnle;)Lnet/minecraft/unmapped/C_ybcoihxg; + ARG 0 output + ARG 1 input + METHOD m_tcpyokty (I)[Lnet/minecraft/unmapped/C_afravpde; + ARG 0 size METHOD m_trknohlj getBlastingItemPath (Lnet/minecraft/unmapped/C_gmbqjnle;)Ljava/lang/String; ARG 0 item + METHOD m_ttdawbvi (Lnet/minecraft/unmapped/C_ybcoihxg;Lnet/minecraft/unmapped/C_eonlnchv$C_gtxnbiam;Ljava/lang/String;)V + ARG 2 group METHOD m_tuwjtbzv offerStainedGlassDyeingRecipe (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_gmbqjnle;)V ARG 1 output ARG 2 input @@ -224,6 +267,12 @@ CLASS net/minecraft/unmapped/C_hwlnmobw net/minecraft/data/server/RecipesProvide METHOD m_waugninb (Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_gmbqjnle;)Lnet/minecraft/unmapped/C_ybcoihxg; ARG 0 output ARG 1 input + METHOD m_wbhgeowa offerShapelessRecipe (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_gmbqjnle;Ljava/lang/String;I)V + ARG 0 exporter + ARG 1 result + ARG 2 ingredient + ARG 3 group + ARG 4 resultCount METHOD m_wdnyqqas offerTrimSmithingRecipe (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_ncpywfca;)V ARG 1 template ARG 2 recipeId @@ -243,6 +292,10 @@ CLASS net/minecraft/unmapped/C_hwlnmobw net/minecraft/data/server/RecipesProvide ARG 1 category ARG 2 output ARG 3 input + METHOD m_wwenbrjj createStonecuttingRecipe (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_ehjomvtz;Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_gmbqjnle;)V + ARG 1 category + ARG 2 ingredient + ARG 3 result METHOD m_wwtytbho (Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_gmbqjnle;)Lnet/minecraft/unmapped/C_ybcoihxg; ARG 0 output ARG 1 input @@ -266,3 +319,6 @@ CLASS net/minecraft/unmapped/C_hwlnmobw net/minecraft/data/server/RecipesProvide ARG 1 category ARG 2 output ARG 3 input + METHOD m_ystdpfcp (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;)V + ARG 1 unwaxed + ARG 2 waxed diff --git a/mappings/net/minecraft/data/server/loot/one_twenty_one/OneTwentyOneBlockLootTableProvider.mapping b/mappings/net/minecraft/data/server/loot/one_twenty_one/OneTwentyOneBlockLootTableProvider.mapping new file mode 100644 index 0000000000..7f2bdd72ac --- /dev/null +++ b/mappings/net/minecraft/data/server/loot/one_twenty_one/OneTwentyOneBlockLootTableProvider.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/unmapped/C_drypjaci net/minecraft/data/server/loot/one_twenty_one/OneTwentyOneBlockLootTableProvider diff --git a/mappings/net/minecraft/data/server/loot/one_twenty_one/OneTwentyOneLootTableProviders.mapping b/mappings/net/minecraft/data/server/loot/one_twenty_one/OneTwentyOneLootTableProviders.mapping new file mode 100644 index 0000000000..a896790444 --- /dev/null +++ b/mappings/net/minecraft/data/server/loot/one_twenty_one/OneTwentyOneLootTableProviders.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/unmapped/C_omgzuwzx net/minecraft/data/server/loot/one_twenty_one/OneTwentyOneLootTableProviders + METHOD m_vmbfztbm createProvider (Lnet/minecraft/unmapped/C_ugkmwocs;)Lnet/minecraft/unmapped/C_rriyyrek; + ARG 0 output diff --git a/mappings/net/minecraft/data/server/recipe/OneTwentyOneRecipeProvider.mapping b/mappings/net/minecraft/data/server/recipe/OneTwentyOneRecipeProvider.mapping new file mode 100644 index 0000000000..f0ff67bc3a --- /dev/null +++ b/mappings/net/minecraft/data/server/recipe/OneTwentyOneRecipeProvider.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/unmapped/C_vyiqseao net/minecraft/data/server/recipe/OneTwentyOneRecipeProvider diff --git a/mappings/net/minecraft/data/server/recipe/RecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/RecipeJsonFactory.mapping index 9947eaa6e7..dfc6eb97dc 100644 --- a/mappings/net/minecraft/data/server/recipe/RecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/RecipeJsonFactory.mapping @@ -1,9 +1,15 @@ CLASS net/minecraft/unmapped/C_ybcoihxg net/minecraft/data/server/recipe/RecipeJsonFactory FIELD f_rbjlzbic ROOT_ID Lnet/minecraft/unmapped/C_ncpywfca; + METHOD m_erxlmqiz offerTo (Lnet/minecraft/unmapped/C_nykrdyol;)V METHOD m_iyrkrudc getResult ()Lnet/minecraft/unmapped/C_vorddnax; METHOD m_lezqbqfu getItemId (Lnet/minecraft/unmapped/C_gmbqjnle;)Lnet/minecraft/unmapped/C_ncpywfca; ARG 0 item METHOD m_ofpkcsdz criterion (Ljava/lang/String;Lnet/minecraft/unmapped/C_rzypsigz;)Lnet/minecraft/unmapped/C_ybcoihxg; ARG 1 name + ARG 2 criterion + METHOD m_sempvwgb offerTo (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_ncpywfca;)V + ARG 2 recipeId METHOD m_wdtlxvsj group (Ljava/lang/String;)Lnet/minecraft/unmapped/C_ybcoihxg; ARG 1 group + METHOD m_wglmdrsg offerTo (Lnet/minecraft/unmapped/C_nykrdyol;Ljava/lang/String;)V + ARG 2 recipeId diff --git a/mappings/net/minecraft/data/server/tag/AbstractTagProvider.mapping b/mappings/net/minecraft/data/server/tag/AbstractTagProvider.mapping index 3288417eed..e64d46bc90 100644 --- a/mappings/net/minecraft/data/server/tag/AbstractTagProvider.mapping +++ b/mappings/net/minecraft/data/server/tag/AbstractTagProvider.mapping @@ -1,18 +1,29 @@ CLASS net/minecraft/unmapped/C_zqlavbep net/minecraft/data/server/tag/AbstractTagProvider + FIELD f_bjnzkozm registryLoadFuture Ljava/util/concurrent/CompletableFuture; FIELD f_dkneixhd pathResolver Lnet/minecraft/unmapped/C_ugkmwocs$C_ehniswvc; FIELD f_geosnnbu key Lnet/minecraft/unmapped/C_xhhleach; FIELD f_lubzhdwr tagBuilders Ljava/util/Map; + FIELD f_oiajybif tagLookupFuture Ljava/util/concurrent/CompletableFuture; + FIELD f_ppduqpro registryLookupFuture Ljava/util/concurrent/CompletableFuture; FIELD f_tooatpkd LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/unmapped/C_ugkmwocs;Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output ARG 2 key ARG 3 lookupProvider + METHOD (Lnet/minecraft/unmapped/C_ugkmwocs;Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output METHOD m_bitbfodv configure (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V ARG 1 lookup METHOD m_dvcyjzus getOrCreateTagBuilder (Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_zqlavbep$C_gojihseq; ARG 1 key + METHOD m_hwoaobva getTagLookupFuture ()Ljava/util/concurrent/CompletableFuture; METHOD m_kjuqqirx getTagBuilder (Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_dgpijqhe; ARG 1 key + METHOD m_rhgctddo getRegistryLookupFuture ()Ljava/util/concurrent/CompletableFuture; + METHOD m_tvmevvwf (Lnet/minecraft/unmapped/C_ednuhnnn;)Ljava/util/Optional; + ARG 1 tagKey + METHOD m_zoqfcozb (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig; + ARG 1 lookupProvider CLASS C_gojihseq ObjectBuilder FIELD f_iepclmzl builder Lnet/minecraft/unmapped/C_dgpijqhe; METHOD (Lnet/minecraft/unmapped/C_dgpijqhe;)V @@ -27,3 +38,9 @@ CLASS net/minecraft/unmapped/C_zqlavbep net/minecraft/data/server/tag/AbstractTa ARG 1 id METHOD m_qserlndq add ([Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_zqlavbep$C_gojihseq; ARG 1 keys + CLASS C_wyxvvqqq TagLookup + METHOD contains contains (Lnet/minecraft/unmapped/C_ednuhnnn;)Z + ARG 1 key + METHOD empty empty ()Lnet/minecraft/unmapped/C_zqlavbep$C_wyxvvqqq; + METHOD m_cpyzdrnx (Lnet/minecraft/unmapped/C_ednuhnnn;)Ljava/util/Optional; + ARG 0 object diff --git a/mappings/net/minecraft/data/server/tag/ItemTagsProvider.mapping b/mappings/net/minecraft/data/server/tag/ItemTagsProvider.mapping index 1861299644..e5032628e1 100644 --- a/mappings/net/minecraft/data/server/tag/ItemTagsProvider.mapping +++ b/mappings/net/minecraft/data/server/tag/ItemTagsProvider.mapping @@ -1,5 +1,17 @@ CLASS net/minecraft/unmapped/C_zhjvrfwx net/minecraft/data/server/tag/ItemTagsProvider + FIELD f_hqsktqzf blockTagsToCopy Ljava/util/Map; FIELD f_sfbqjfia blockTags Ljava/util/concurrent/CompletableFuture; + METHOD (Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 registryLookupFuture + METHOD (Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 registryLookupFuture + ARG 3 itemTagLookupFuture + METHOD m_catcjwdk (Lnet/minecraft/unmapped/C_vorddnax;)Lnet/minecraft/unmapped/C_xhhleach; + ARG 0 item METHOD m_ljgmashd copy (Lnet/minecraft/unmapped/C_ednuhnnn;Lnet/minecraft/unmapped/C_ednuhnnn;)V ARG 1 blockTag ARG 2 itemTag + METHOD m_owpwuppt (Lnet/minecraft/unmapped/C_vorddnax;)Lnet/minecraft/unmapped/C_xhhleach; + ARG 0 item diff --git a/mappings/net/minecraft/data/server/tag/MapTagsProvider.mapping b/mappings/net/minecraft/data/server/tag/MapTagsProvider.mapping new file mode 100644 index 0000000000..7c7403ce0f --- /dev/null +++ b/mappings/net/minecraft/data/server/tag/MapTagsProvider.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/unmapped/C_wqumfxay net/minecraft/data/server/tag/MapTagsProvider + METHOD (Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 lookupProvider diff --git a/mappings/net/minecraft/data/server/tag/PaintingTagProvider.mapping b/mappings/net/minecraft/data/server/tag/PaintingTagProvider.mapping index d2564d5e58..c9aa8ab37e 100644 --- a/mappings/net/minecraft/data/server/tag/PaintingTagProvider.mapping +++ b/mappings/net/minecraft/data/server/tag/PaintingTagProvider.mapping @@ -1 +1,4 @@ CLASS net/minecraft/unmapped/C_hfdfyxle net/minecraft/data/server/tag/PaintingTagProvider + METHOD (Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/tag/PoiTagProvider.mapping b/mappings/net/minecraft/data/server/tag/PoiTagProvider.mapping index 6081951fbf..6ef5366fae 100644 --- a/mappings/net/minecraft/data/server/tag/PoiTagProvider.mapping +++ b/mappings/net/minecraft/data/server/tag/PoiTagProvider.mapping @@ -1 +1,4 @@ CLASS net/minecraft/unmapped/C_vzuzypmq net/minecraft/data/server/tag/PoiTagProvider + METHOD (Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/tag/TagsProvider.mapping b/mappings/net/minecraft/data/server/tag/TagsProvider.mapping index 92b025be2b..a19ef2bac8 100644 --- a/mappings/net/minecraft/data/server/tag/TagsProvider.mapping +++ b/mappings/net/minecraft/data/server/tag/TagsProvider.mapping @@ -1,5 +1,9 @@ CLASS net/minecraft/unmapped/C_hzdskvsx net/minecraft/data/server/tag/TagsProvider FIELD f_qpdypszd valueToKey Ljava/util/function/Function; + METHOD (Lnet/minecraft/unmapped/C_ugkmwocs;Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Ljava/util/function/Function;)V + ARG 1 output + ARG 3 registryLookupFuture + ARG 4 tagLookupFuture METHOD (Lnet/minecraft/unmapped/C_ugkmwocs;Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/concurrent/CompletableFuture;Ljava/util/function/Function;)V ARG 1 output ARG 2 key @@ -11,4 +15,6 @@ CLASS net/minecraft/unmapped/C_hzdskvsx net/minecraft/data/server/tag/TagsProvid ARG 1 builder ARG 2 valueToKey METHOD m_agatuolp add ([Ljava/lang/Object;)Lnet/minecraft/unmapped/C_hzdskvsx$C_wosjfhof; + ARG 1 objects METHOD m_bwfwpsfu add (Ljava/lang/Object;)Lnet/minecraft/unmapped/C_hzdskvsx$C_wosjfhof; + ARG 1 object diff --git a/mappings/net/minecraft/data/server/tag/one_twenty_one/OneTwentyOneBlockTagProvider.mapping b/mappings/net/minecraft/data/server/tag/one_twenty_one/OneTwentyOneBlockTagProvider.mapping new file mode 100644 index 0000000000..97f86563d4 --- /dev/null +++ b/mappings/net/minecraft/data/server/tag/one_twenty_one/OneTwentyOneBlockTagProvider.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/unmapped/C_rrnzlzth net/minecraft/data/server/tag/one_twenty_one/OneTwentyOneBlockTagProvider + METHOD (Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 registryLookupFuture + ARG 3 blockTagLookupFuture diff --git a/mappings/net/minecraft/data/server/tag/one_twenty_one/OneTwentyOneItemTagProvider.mapping b/mappings/net/minecraft/data/server/tag/one_twenty_one/OneTwentyOneItemTagProvider.mapping new file mode 100644 index 0000000000..137a843a1c --- /dev/null +++ b/mappings/net/minecraft/data/server/tag/one_twenty_one/OneTwentyOneItemTagProvider.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/unmapped/C_arcabcvu net/minecraft/data/server/tag/one_twenty_one/OneTwentyOneItemTagProvider diff --git a/mappings/net/minecraft/registry/OneTwentyOneBuiltinRegistries.mapping b/mappings/net/minecraft/registry/OneTwentyOneBuiltinRegistries.mapping new file mode 100644 index 0000000000..310efc90f9 --- /dev/null +++ b/mappings/net/minecraft/registry/OneTwentyOneBuiltinRegistries.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/unmapped/C_xjgowndt net/minecraft/registry/OneTwentyOneBuiltinRegistries + FIELD f_qcpzfnta REGISTRY_BUILDER Lnet/minecraft/unmapped/C_tncydixy; + METHOD m_tbyxecnl createLookup (Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletableFuture; + ARG 0 registryLookupProvider diff --git a/mappings/net/minecraft/registry/RegistryPatchGenerator.mapping b/mappings/net/minecraft/registry/RegistryPatchGenerator.mapping new file mode 100644 index 0000000000..3e1987b047 --- /dev/null +++ b/mappings/net/minecraft/registry/RegistryPatchGenerator.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/unmapped/C_ewsubajw net/minecraft/registry/RegistryPatchGenerator + METHOD m_phdlhbsn validate (Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/unmapped/C_tncydixy;)Ljava/util/concurrent/CompletableFuture; + ARG 0 registryLookupFuture + ARG 1 registrySetBuilder + METHOD m_wkvvsrvp (Lnet/minecraft/unmapped/C_tncydixy;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig; + ARG 1 provider diff --git a/mappings/net/minecraft/world/biome/util/MultiNoiseBiomeSourceParameterList.mapping b/mappings/net/minecraft/world/biome/util/MultiNoiseBiomeSourceParameterList.mapping index 996f18a3fc..972c9f87a5 100644 --- a/mappings/net/minecraft/world/biome/util/MultiNoiseBiomeSourceParameterList.mapping +++ b/mappings/net/minecraft/world/biome/util/MultiNoiseBiomeSourceParameterList.mapping @@ -15,3 +15,4 @@ CLASS net/minecraft/unmapped/C_xmtsvelx net/minecraft/world/biome/util/MultiNois FIELD f_kknfghtv NETHER Lnet/minecraft/unmapped/C_xmtsvelx$C_jgklgqjr; FIELD f_rugrjshd OVERWORLD Lnet/minecraft/unmapped/C_xmtsvelx$C_jgklgqjr; FIELD f_soykajof id Lnet/minecraft/unmapped/C_ncpywfca; + CLASS C_pttrytil SourceProvider diff --git a/simple_type_field_names.json5 b/simple_type_field_names.json5 index 1bba89ef4f..de9ededbb3 100644 --- a/simple_type_field_names.json5 +++ b/simple_type_field_names.json5 @@ -10,11 +10,12 @@ }, // Data - "net/minecraft/unmapped/C_temnquoh": "writer", // DataWriter + "net/minecraft/unmapped/C_nykrdyol": "exporter", // RecipeExporter // DFU "com/mojang/datafixers/schemas/Schema": "schema", "com/mojang/datafixers/DataFixer": "dataFixer", + // Brigadier "com/mojang/brigadier/StringReader": "reader", From 7009f6c4a934eb7a01943496fed4c78844914e9d Mon Sep 17 00:00:00 2001 From: ix0rai Date: Sun, 5 Nov 2023 21:08:07 -0600 Subject: [PATCH 6/9] 100% baybee --- mappings/net/minecraft/data/DataCache.mapping | 59 +++++++++++++++++++ .../data/client/ItemModelGenerator.mapping | 26 ++++++++ .../data/family/BlockFamilies.mapping | 5 ++ .../report/BiomeParametersProvider.mapping | 2 + .../report/RegistriesDatapackProvider.mapping | 16 ++++- .../data/server/RecipesProvider.mapping | 55 ++++++++++++----- .../server/VanillaRecipesProvider.mapping | 1 + .../AdventureAdvancementTabGenerator.mapping | 18 ++++++ .../HusbandryAdvancementTabGenerator.mapping | 10 ++++ .../BlockLootTableGenerator.mapping | 2 + .../EntityLootTableGenerator.mapping | 2 + .../FishingLootTableGenerator.mapping | 4 ++ .../VanillaBlockLootTableGenerator.mapping | 3 + .../VanillaEntityLootTableGenerator.mapping | 1 + .../recipe/ComplexRecipeJsonFactory.mapping | 4 ++ .../recipe/CookingRecipeJsonFactory.mapping | 3 +- .../server/recipe/RecipeJsonProvider.mapping | 3 + .../recipe/ShapedRecipeJsonFactory.mapping | 5 +- .../recipe/ShapelessRecipeJsonFactory.mapping | 5 +- .../SingleItemRecipeJsonFactory.mapping | 1 + ...TransformSmithingRecipeJsonFactory.mapping | 8 ++- .../TrimSmithingRecipeJsonFactory.mapping | 4 +- 22 files changed, 217 insertions(+), 20 deletions(-) diff --git a/mappings/net/minecraft/data/DataCache.mapping b/mappings/net/minecraft/data/DataCache.mapping index 15eaff4348..0a4bf6cac3 100644 --- a/mappings/net/minecraft/data/DataCache.mapping +++ b/mappings/net/minecraft/data/DataCache.mapping @@ -1,5 +1,64 @@ CLASS net/minecraft/unmapped/C_sdjwtmhs net/minecraft/data/DataCache FIELD f_gnoxxssr LOGGER Lorg/slf4j/Logger; + FIELD f_jejdjrrn caches Ljava/util/Map; + FIELD f_jxwsfhus HEADER Ljava/lang/String; + FIELD f_mkwvlfbp totalSize I + FIELD f_mlfymuuy versionName Ljava/lang/String; + FIELD f_oramlaqo totalCacheMisses I + FIELD f_qwpafooa root Ljava/nio/file/Path; + FIELD f_rwicrgun paths Ljava/util/Set; + FIELD f_tfqmckwf cachePath Ljava/nio/file/Path; + FIELD f_ztlwkesb dataWriters Ljava/util/Set; METHOD (Ljava/nio/file/Path;Ljava/util/Collection;Lnet/minecraft/unmapped/C_xyxorzsk;)V + ARG 2 providerNames ARG 3 version + METHOD m_agtpfcyr getPath (Ljava/lang/String;)Ljava/nio/file/Path; + ARG 1 providerName + METHOD m_lnghmvmn run (Ljava/lang/String;Lnet/minecraft/unmapped/C_sdjwtmhs$C_hkhplcrf;)Ljava/util/concurrent/CompletableFuture; + ARG 1 providerName + ARG 2 updater + METHOD m_raxfugkg applyUpdate (Lnet/minecraft/unmapped/C_sdjwtmhs$C_dleuahtm;)V + ARG 1 result METHOD m_rwurkkna write ()V + METHOD m_seibnvlg hasVersionMismatch (Ljava/lang/String;)Z + ARG 1 providerName + METHOD m_varvkyie readCache (Ljava/nio/file/Path;Ljava/nio/file/Path;)Lnet/minecraft/unmapped/C_sdjwtmhs$C_hysgzlgb; + ARG 0 root + ARG 1 providerPath + CLASS C_brknvdua CachedDataWriter + FIELD f_auqbziix cacheMisses Ljava/util/concurrent/atomic/AtomicInteger; + FIELD f_fuqlgxhu oldCache Lnet/minecraft/unmapped/C_sdjwtmhs$C_hysgzlgb; + FIELD f_myhheiqf providerName Ljava/lang/String; + FIELD f_scfokgou closed Z + FIELD f_ydecndng newCache Lnet/minecraft/unmapped/C_sdjwtmhs$C_wqjscgeb; + METHOD (Lnet/minecraft/unmapped/C_sdjwtmhs;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/unmapped/C_sdjwtmhs$C_hysgzlgb;)V + ARG 2 providerName + ARG 3 version + METHOD m_otgwyuxc isInvalid (Ljava/nio/file/Path;Lcom/google/common/hash/HashCode;)Z + ARG 1 path + ARG 2 hashCode + METHOD m_tvcboxdy finish ()Lnet/minecraft/unmapped/C_sdjwtmhs$C_dleuahtm; + CLASS C_dleuahtm UpdateResult + CLASS C_hkhplcrf CacheUpdater + METHOD update update (Lnet/minecraft/unmapped/C_temnquoh;)Ljava/util/concurrent/CompletableFuture; + ARG 1 writer + CLASS C_hysgzlgb ProviderCache + METHOD m_ekcmvbmk get (Ljava/nio/file/Path;)Lcom/google/common/hash/HashCode; + ARG 1 path + METHOD m_ezptbtio (Lcom/google/common/collect/ImmutableMap$Builder;Ljava/nio/file/Path;Ljava/lang/String;)V + ARG 2 line + METHOD m_pziraizs write (Ljava/nio/file/Path;Ljava/nio/file/Path;Ljava/lang/String;)V + ARG 1 root + ARG 2 providerPath + ARG 3 description + METHOD m_yhviwyuz readCache (Ljava/nio/file/Path;Ljava/nio/file/Path;)Lnet/minecraft/unmapped/C_sdjwtmhs$C_hysgzlgb; + ARG 0 root + ARG 1 providerPath + METHOD m_yrqjkfbo getSize ()I + CLASS C_wqjscgeb ProviderCacheBuilder + METHOD (Ljava/lang/String;)V + ARG 1 version + METHOD m_mxhqozdg build ()Lnet/minecraft/unmapped/C_sdjwtmhs$C_hysgzlgb; + METHOD m_xlginnei put (Ljava/nio/file/Path;Lcom/google/common/hash/HashCode;)V + ARG 1 path + ARG 2 hashCode diff --git a/mappings/net/minecraft/data/client/ItemModelGenerator.mapping b/mappings/net/minecraft/data/client/ItemModelGenerator.mapping index d9eb74636a..790442ecb2 100644 --- a/mappings/net/minecraft/data/client/ItemModelGenerator.mapping +++ b/mappings/net/minecraft/data/client/ItemModelGenerator.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/unmapped/C_cfvrpkog net/minecraft/data/client/ItemModelGenerator + FIELD f_ccmpywsi TRIM_MATERIALS Ljava/util/List; FIELD f_siogckud writer Ljava/util/function/BiConsumer; FIELD f_vdzuaouk TRIM_TYPE Lnet/minecraft/unmapped/C_ncpywfca; METHOD (Ljava/util/function/BiConsumer;)V @@ -6,12 +7,37 @@ CLASS net/minecraft/unmapped/C_cfvrpkog net/minecraft/data/client/ItemModelGener METHOD m_bfdcsywm register (Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_zppcsbsk;)V ARG 1 item ARG 2 model + METHOD m_bnmdefop uploadLayeredItem (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;)V + ARG 1 id + ARG 2 layer0 + ARG 3 layer1 + ARG 4 layer2 + METHOD m_chmkiimy registerCompass (Lnet/minecraft/unmapped/C_vorddnax;)V + ARG 1 compass METHOD m_kighpdfm register (Lnet/minecraft/unmapped/C_vorddnax;Ljava/lang/String;Lnet/minecraft/unmapped/C_zppcsbsk;)V ARG 1 item ARG 2 suffix ARG 3 model + METHOD m_llpeiyoc createArmorJson (Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/Map;Lnet/minecraft/unmapped/C_fwzogbap;)Lcom/google/gson/JsonObject; + ARG 1 id + ARG 2 textures + ARG 3 material + METHOD m_mppeudhx registerArmor (Lnet/minecraft/unmapped/C_fxxorins;)V + ARG 1 armor + METHOD m_pmffjxfg registerClock (Lnet/minecraft/unmapped/C_vorddnax;)V + ARG 1 clock + METHOD m_uirjkeyq uploadLayeredItem (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;)V + ARG 1 id + ARG 2 layer0 + ARG 3 layer1 + METHOD m_vlmfwosx suffixTrim (Lnet/minecraft/unmapped/C_ncpywfca;Ljava/lang/String;)Lnet/minecraft/unmapped/C_ncpywfca; + ARG 1 id + ARG 2 materialName METHOD m_ybnrnznt register (Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_zppcsbsk;)V ARG 1 item ARG 2 texture ARG 3 model METHOD m_zkttuqam register ()V + CLASS C_cutcputf TrimModelData + METHOD m_wmqpuvqn getAppliedName (Lnet/minecraft/unmapped/C_fwzogbap;)Ljava/lang/String; + ARG 1 material diff --git a/mappings/net/minecraft/data/family/BlockFamilies.mapping b/mappings/net/minecraft/data/family/BlockFamilies.mapping index 7e0629edbe..59a21886a0 100644 --- a/mappings/net/minecraft/data/family/BlockFamilies.mapping +++ b/mappings/net/minecraft/data/family/BlockFamilies.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/unmapped/C_xvtcmllw net/minecraft/data/family/BlockFamilies FIELD f_cmvatzdn BRICK Lnet/minecraft/unmapped/C_eonlnchv; FIELD f_cuyfharb POLISHED_ANDESITE Lnet/minecraft/unmapped/C_eonlnchv; FIELD f_cwcdypjk CUT_RED_SANDSTONE Lnet/minecraft/unmapped/C_eonlnchv; + FIELD f_cwltdwgj TUFF Lnet/minecraft/unmapped/C_eonlnchv; FIELD f_cycxxsbn WEATHERED_COPPER Lnet/minecraft/unmapped/C_eonlnchv; FIELD f_demycdxb DEEPSLATE_TILE Lnet/minecraft/unmapped/C_eonlnchv; FIELD f_drpilwiq PRISMARINE Lnet/minecraft/unmapped/C_eonlnchv; @@ -14,6 +15,7 @@ CLASS net/minecraft/unmapped/C_xvtcmllw net/minecraft/data/family/BlockFamilies FIELD f_fhkkgyro WOODEN_UNLOCK_CRITERION_NAME Ljava/lang/String; COMMENT The name of the criterion used for the recipe unlock advancements of wooden block families. FIELD f_flpvycxq BAMBOO Lnet/minecraft/unmapped/C_eonlnchv; + FIELD f_gagavkri CHERRY Lnet/minecraft/unmapped/C_eonlnchv; FIELD f_gjurakbg ANDESITE Lnet/minecraft/unmapped/C_eonlnchv; FIELD f_hnzgpawk GRANITE Lnet/minecraft/unmapped/C_eonlnchv; FIELD f_icafuvtv CUT_SANDSTONE Lnet/minecraft/unmapped/C_eonlnchv; @@ -54,6 +56,8 @@ CLASS net/minecraft/unmapped/C_xvtcmllw net/minecraft/data/family/BlockFamilies FIELD f_wehrvlri EXPOSED_CUT_COPPER Lnet/minecraft/unmapped/C_eonlnchv; FIELD f_wlioqnin SMOOTH_RED_SANDSTONE Lnet/minecraft/unmapped/C_eonlnchv; FIELD f_wsfmpahv WAXED_OXIDIZED_CUT_COPPER Lnet/minecraft/unmapped/C_eonlnchv; + FIELD f_wunvfckj POLISHED_TUFF Lnet/minecraft/unmapped/C_eonlnchv; + FIELD f_wuvamkrm MANGROVE Lnet/minecraft/unmapped/C_eonlnchv; FIELD f_wvuxnaxn POLISHED_BLACKSTONE Lnet/minecraft/unmapped/C_eonlnchv; FIELD f_xbrgbany BASE_BLOCKS_TO_FAMILIES Ljava/util/Map; FIELD f_xcpajqcu OXIDIZED_CUT_COPPER Lnet/minecraft/unmapped/C_eonlnchv; @@ -64,6 +68,7 @@ CLASS net/minecraft/unmapped/C_xvtcmllw net/minecraft/data/family/BlockFamilies FIELD f_ywcdlrhx DARK_OAK Lnet/minecraft/unmapped/C_eonlnchv; FIELD f_yyvnnfrt POLISHED_DIORITE Lnet/minecraft/unmapped/C_eonlnchv; FIELD f_yzidvpxm MOSSY_STONE_BRICK Lnet/minecraft/unmapped/C_eonlnchv; + FIELD f_zhqbrglh TUFF_BRICKS Lnet/minecraft/unmapped/C_eonlnchv; FIELD f_zsamvelp EXPOSED_COPPER Lnet/minecraft/unmapped/C_eonlnchv; FIELD f_zyugjczx WAXED_COPPER_BLOCK Lnet/minecraft/unmapped/C_eonlnchv; METHOD m_tlkesvsp getFamilies ()Ljava/util/stream/Stream; diff --git a/mappings/net/minecraft/data/report/BiomeParametersProvider.mapping b/mappings/net/minecraft/data/report/BiomeParametersProvider.mapping index 0f6e2ed7e0..19bdca962a 100644 --- a/mappings/net/minecraft/data/report/BiomeParametersProvider.mapping +++ b/mappings/net/minecraft/data/report/BiomeParametersProvider.mapping @@ -1,11 +1,13 @@ CLASS net/minecraft/unmapped/C_wwetinhi net/minecraft/data/report/BiomeParametersProvider FIELD f_bemjvqoj path Ljava/nio/file/Path; + FIELD f_iubheypa ENTRY_CODEC Lcom/mojang/serialization/MapCodec; FIELD f_zrxygubc lookupProvider Ljava/util/concurrent/CompletableFuture; METHOD (Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output ARG 2 lookupProvider METHOD m_dbdhbfat write (Ljava/nio/file/Path;Lnet/minecraft/unmapped/C_temnquoh;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Encoder;Ljava/lang/Object;)Ljava/util/concurrent/CompletableFuture; ARG 0 path + ARG 1 writer ARG 3 encoder ARG 4 object METHOD m_lfeplmtj resolveFile (Lnet/minecraft/unmapped/C_ncpywfca;)Ljava/nio/file/Path; diff --git a/mappings/net/minecraft/data/report/RegistriesDatapackProvider.mapping b/mappings/net/minecraft/data/report/RegistriesDatapackProvider.mapping index 9c6aa1b765..a88ff92a23 100644 --- a/mappings/net/minecraft/data/report/RegistriesDatapackProvider.mapping +++ b/mappings/net/minecraft/data/report/RegistriesDatapackProvider.mapping @@ -4,10 +4,24 @@ CLASS net/minecraft/unmapped/C_qlsuqzcn net/minecraft/data/report/RegistriesData METHOD (Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output ARG 2 lookupProvider + METHOD m_fqnadcln (Lnet/minecraft/unmapped/C_ugkmwocs$C_ehniswvc;Lnet/minecraft/unmapped/C_temnquoh;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/unmapped/C_ratuauki$C_qpshoosu;Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)Ljava/util/concurrent/CompletableFuture; + ARG 4 reference + METHOD m_fxcgnzfs (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_temnquoh;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/unmapped/C_ratuauki$C_qpshoosu;Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl;)Ljava/util/concurrent/CompletableFuture; + ARG 5 lookup + METHOD m_igtmiekv writeToPath (Ljava/nio/file/Path;Lnet/minecraft/unmapped/C_temnquoh;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Encoder;Ljava/lang/Object;)Ljava/util/concurrent/CompletableFuture; + ARG 0 path + ARG 1 writer + ARG 3 encoder + ARG 4 object METHOD m_qjzaafhz (Lnet/minecraft/unmapped/C_temnquoh;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/unmapped/C_ratuauki$C_qpshoosu;)Ljava/util/stream/Stream; ARG 4 data + METHOD m_ryfbupza (Ljava/nio/file/Path;Ljava/lang/String;)V + ARG 1 error METHOD m_zeouzauj (Lnet/minecraft/unmapped/C_temnquoh;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Ljava/util/concurrent/CompletionStage; ARG 2 provider - METHOD m_zuladejj (Lnet/minecraft/unmapped/C_temnquoh;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/unmapped/C_ratuauki$C_qpshoosu;)Ljava/util/Optional; + METHOD m_zualstxb (I)[Ljava/util/concurrent/CompletableFuture; + ARG 0 size + METHOD m_zuladejj writeRegistryEntries (Lnet/minecraft/unmapped/C_temnquoh;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/unmapped/C_ratuauki$C_qpshoosu;)Ljava/util/Optional; + ARG 1 writer ARG 2 provider ARG 4 data diff --git a/mappings/net/minecraft/data/server/RecipesProvider.mapping b/mappings/net/minecraft/data/server/RecipesProvider.mapping index 9f141a19b6..f0fc8b7f72 100644 --- a/mappings/net/minecraft/data/server/RecipesProvider.mapping +++ b/mappings/net/minecraft/data/server/RecipesProvider.mapping @@ -52,6 +52,9 @@ CLASS net/minecraft/unmapped/C_hwlnmobw net/minecraft/data/server/RecipesProvide ARG 3 input METHOD m_dcvcfyhn conditionsFromItemPredicates ([Lnet/minecraft/unmapped/C_afravpde$C_qwujnjpk;)Lnet/minecraft/unmapped/C_rzypsigz; ARG 0 builders + METHOD m_dqtpfhfx offerSmithingTemplateCopyingRecipe (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_gmbqjnle;)V + ARG 1 template + ARG 2 resource METHOD m_dyvenyat conditionsFromItem (Lnet/minecraft/unmapped/C_gmbqjnle;)Lnet/minecraft/unmapped/C_rzypsigz; ARG 0 item METHOD m_eombplgf offerBannerRecipe (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_gmbqjnle;)V @@ -109,11 +112,11 @@ CLASS net/minecraft/unmapped/C_hwlnmobw net/minecraft/data/server/RecipesProvide ARG 0 output ARG 1 input METHOD m_idfqbypq offerReversibleCompactingRecipesWithCompactedItemGroup (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_ehjomvtz;Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_ehjomvtz;Lnet/minecraft/unmapped/C_gmbqjnle;Ljava/lang/String;Ljava/lang/String;)V - ARG 1 baseCategory - ARG 2 compacted - ARG 3 compactCategory - ARG 4 input - ARG 5 compactedItemId + ARG 1 reverseCategory + ARG 2 baseItem + ARG 3 compactingCategory + ARG 4 compactedItem + ARG 5 compactingId ARG 6 compactedItemGroup METHOD m_imrtvocr createDoorRecipe (Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_tcpsydrv;)Lnet/minecraft/unmapped/C_ybcoihxg; ARG 0 output @@ -122,13 +125,18 @@ CLASS net/minecraft/unmapped/C_hwlnmobw net/minecraft/data/server/RecipesProvide ARG 1 dyes ARG 2 items ARG 3 group + METHOD m_ivaykuun offerThreeByThreeCompactingRecipe (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_ehjomvtz;Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_gmbqjnle;Ljava/lang/String;)V + ARG 1 category + ARG 2 result + ARG 3 input + ARG 4 criterionName METHOD m_jgwzllup offerReversibleCompactingRecipesWithInputItemGroup (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_ehjomvtz;Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_ehjomvtz;Lnet/minecraft/unmapped/C_gmbqjnle;Ljava/lang/String;Ljava/lang/String;)V - ARG 1 baseCategory - ARG 2 input - ARG 3 compactCategory - ARG 4 compacted - ARG 5 inputItemId - ARG 6 inputItemGroup + ARG 1 reverseCategory + ARG 2 baseItem + ARG 3 compactingCategory + ARG 4 compactedItem + ARG 5 reverseId + ARG 6 reverseGroup METHOD m_jjtsumiq offerBoatRecipe (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_gmbqjnle;)V ARG 1 output ARG 2 input @@ -165,6 +173,9 @@ CLASS net/minecraft/unmapped/C_hwlnmobw net/minecraft/data/server/RecipesProvide ARG 4 experience ARG 5 cookingTime ARG 6 group + METHOD m_mpigxzco offerSmithingTemplateCopyingRecipe (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_ednuhnnn;)V + ARG 1 template + ARG 2 resource METHOD m_msxlvezk offerCarpetRecipe (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_gmbqjnle;)V ARG 1 output ARG 2 input @@ -175,6 +186,10 @@ CLASS net/minecraft/unmapped/C_hwlnmobw net/minecraft/data/server/RecipesProvide ARG 1 output ARG 2 ingredientTag ARG 3 outputCount + METHOD m_nzezdjmx offerThreeByThreeCompactingRecipe (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_ehjomvtz;Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_gmbqjnle;)V + ARG 1 category + ARG 2 result + ARG 3 input METHOD m_oaxthzyf createStonecuttingRecipe (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_ehjomvtz;Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_gmbqjnle;I)V ARG 1 category ARG 2 ingredient @@ -203,9 +218,15 @@ CLASS net/minecraft/unmapped/C_hwlnmobw net/minecraft/data/server/RecipesProvide ARG 2 input METHOD m_qbpsfien (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_eonlnchv;)V ARG 1 family - METHOD m_qgcuptpd (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_ehjomvtz;Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_ehjomvtz;Lnet/minecraft/unmapped/C_gmbqjnle;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V - ARG 2 result - ARG 4 ingredient + METHOD m_qgcuptpd offerReversibleCompactingRecipes (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_ehjomvtz;Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_ehjomvtz;Lnet/minecraft/unmapped/C_gmbqjnle;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V + ARG 1 reverseCategory + ARG 2 baseItem + ARG 3 compactingCategory + ARG 4 compactedItem + ARG 5 compactingId + ARG 6 compactingGroup + ARG 7 reverseId + ARG 8 reverseGroup METHOD m_qhnsxugw offerShapelessRecipe (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_gmbqjnle;Ljava/lang/String;)V ARG 1 result ARG 2 ingredient @@ -242,6 +263,11 @@ CLASS net/minecraft/unmapped/C_hwlnmobw net/minecraft/data/server/RecipesProvide ARG 0 size METHOD m_trknohlj getBlastingItemPath (Lnet/minecraft/unmapped/C_gmbqjnle;)Ljava/lang/String; ARG 0 item + METHOD m_tszkfmvj offerReversibleCompactingRecipes (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_ehjomvtz;Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_ehjomvtz;Lnet/minecraft/unmapped/C_gmbqjnle;)V + ARG 1 reverseCategory + ARG 2 baseItem + ARG 3 compactingCategory + ARG 4 compactedItem METHOD m_ttdawbvi (Lnet/minecraft/unmapped/C_ybcoihxg;Lnet/minecraft/unmapped/C_eonlnchv$C_gtxnbiam;Ljava/lang/String;)V ARG 2 group METHOD m_tuwjtbzv offerStainedGlassDyeingRecipe (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_gmbqjnle;)V @@ -282,6 +308,7 @@ CLASS net/minecraft/unmapped/C_hwlnmobw net/minecraft/data/server/RecipesProvide ARG 2 input METHOD m_whnryawf saveAdvancement (Lnet/minecraft/unmapped/C_temnquoh;Lnet/minecraft/unmapped/C_unoypvme;)Ljava/util/concurrent/CompletableFuture; ARG 1 writer + ARG 2 advancement METHOD m_wjjrsouu createFenceRecipe (Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_tcpsydrv;)Lnet/minecraft/unmapped/C_ybcoihxg; ARG 0 output ARG 1 input diff --git a/mappings/net/minecraft/data/server/VanillaRecipesProvider.mapping b/mappings/net/minecraft/data/server/VanillaRecipesProvider.mapping index e1f7898152..59f7c46379 100644 --- a/mappings/net/minecraft/data/server/VanillaRecipesProvider.mapping +++ b/mappings/net/minecraft/data/server/VanillaRecipesProvider.mapping @@ -10,3 +10,4 @@ CLASS net/minecraft/unmapped/C_pnjbhirj net/minecraft/data/server/VanillaRecipes METHOD m_aoixzjwg getArmorTrimSmithingTemplates ()Ljava/util/stream/Stream; METHOD m_vdumabgh (Lnet/minecraft/unmapped/C_vorddnax;)Lnet/minecraft/unmapped/C_pnjbhirj$C_urfqysdj; ARG 0 item + CLASS C_urfqysdj SmithingTemplate diff --git a/mappings/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.mapping b/mappings/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.mapping index 038fe5c27b..0eaadb3344 100644 --- a/mappings/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.mapping +++ b/mappings/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.mapping @@ -1,12 +1,30 @@ CLASS net/minecraft/unmapped/C_unbelsbg net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator + FIELD f_aqlhjrbz OVERWORLD_HEIGHT I + FIELD f_bnsjkewh OVERWORLD_BEDROCK_TOP_Y I + FIELD f_odnmebkp OVERWORLD_MIN_Y I + FIELD f_qzqtaacj OVERWORLD_MAX_Y I FIELD f_rqtgaigz ENEMY_MOBS [Lnet/minecraft/unmapped/C_ogavsvbr; + METHOD m_ctjmjeuy requireSalvagedSherd (Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; + ARG 0 task + METHOD m_cwszvfic requireAllExclusiveTrimmedArmor (Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; + ARG 0 task METHOD m_fdomsedq usingItemAndLookingAtEntityCondition (Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_vorddnax;)Lnet/minecraft/unmapped/C_rzypsigz; ARG 0 type ARG 1 item + METHOD m_iaxhxbmm requirePlacedComparatorReadingBlock (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_rzypsigz; + METHOD m_ibaruuym requireTrimmedArmor (Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; + ARG 0 task METHOD m_kpzuqmoa lightningStruckWithingRange (Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_rzypsigz; ARG 0 range + ARG 1 entityPredicate METHOD m_mgvgqwrb appendEnterAllBiomesCriterion (Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;Ljava/util/List;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; ARG 0 task ARG 1 biomes + METHOD m_pyldeoxx buildAdventuringTime (Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_unoypvme;Lnet/minecraft/unmapped/C_xmtsvelx$C_jgklgqjr;)V + ARG 0 exporter + ARG 1 parent + ARG 2 preset + METHOD m_wculmwvf requirePlacedBlockReadByComparator (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_rzypsigz; METHOD m_wvlvqnhd appendKillAllEnemyMobsCriterion (Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; + ARG 0 task ARG 1 task diff --git a/mappings/net/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator.mapping b/mappings/net/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator.mapping index 4ee692ae4e..2c44526e99 100644 --- a/mappings/net/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator.mapping +++ b/mappings/net/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator.mapping @@ -7,15 +7,25 @@ CLASS net/minecraft/unmapped/C_vfenxpjt net/minecraft/data/server/advancement/Hu FIELD f_zngbqyui FISH_BUCKETS [Lnet/minecraft/unmapped/C_vorddnax; METHOD m_bkajmxpf appendBreedAllEntitiesCriterion (Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;Ljava/util/stream/Stream;Ljava/util/stream/Stream;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; ARG 0 task + ARG 1 instantBreedingAnimals + ARG 2 eggLayingAnimals METHOD m_fehmbxhu appendEatAllFoodCriterion (Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; + ARG 0 task ARG 1 task METHOD m_fqhhoyxq appendTameAllCatVariantsCriterion (Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; + ARG 0 task ARG 1 task METHOD m_mjrojbaf appendBucketAllFishCriterion (Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; + ARG 0 task ARG 1 task METHOD m_msnwtfou appendLeashAllFrogTypesCriterion (Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; + ARG 0 task ARG 1 task METHOD m_ropwgspa appendCatchAllFishCriterion (Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; + ARG 0 task ARG 1 task METHOD m_skwozvuj createBreedAllAnimalsAdvancement (Lnet/minecraft/unmapped/C_unoypvme;Ljava/util/function/Consumer;Ljava/util/stream/Stream;Ljava/util/stream/Stream;)Lnet/minecraft/unmapped/C_unoypvme; + ARG 0 advancement ARG 1 consumer + ARG 2 instantBreedingAnimals + ARG 3 eggLayingAnimals diff --git a/mappings/net/minecraft/data/server/loot_table/BlockLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loot_table/BlockLootTableGenerator.mapping index b15acb7dcc..70167f172d 100644 --- a/mappings/net/minecraft/data/server/loot_table/BlockLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/loot_table/BlockLootTableGenerator.mapping @@ -31,6 +31,8 @@ CLASS net/minecraft/unmapped/C_qvbzxacb net/minecraft/data/server/loot_table/Blo METHOD m_icjzesrx stemDrops (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_vorddnax;)Lnet/minecraft/unmapped/C_inwsuliy$C_daaljsfu; ARG 1 stem ARG 2 drop + METHOD m_igkkhmzt flowerbedDrops (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_inwsuliy$C_daaljsfu; + ARG 1 drop METHOD m_imzrkxfh oreDrops (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_vorddnax;)Lnet/minecraft/unmapped/C_inwsuliy$C_daaljsfu; ARG 1 dropWithSilkTouch ARG 2 drop diff --git a/mappings/net/minecraft/data/server/loot_table/EntityLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loot_table/EntityLootTableGenerator.mapping index 916819a694..78034eab9f 100644 --- a/mappings/net/minecraft/data/server/loot_table/EntityLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/loot_table/EntityLootTableGenerator.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/unmapped/C_egeqzyvk net/minecraft/data/server/loot_table/EntityLootTableGenerator FIELD f_lyzsfsde lootTables Ljava/util/Map; + FIELD f_pordewqu allowedFeatures Lnet/minecraft/unmapped/C_czxxrbcp; FIELD f_vvtnxifd SPECIAL_LOOT_TABLE_ENTITIES Ljava/util/Set; FIELD f_wrddyhkx ENTITY_ON_FIRE Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; + FIELD f_xwhijief requiredFeatures Lnet/minecraft/unmapped/C_czxxrbcp; METHOD (Lnet/minecraft/unmapped/C_czxxrbcp;)V ARG 1 featureFlags METHOD m_dmtatuce frogDamageSource ()Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn; diff --git a/mappings/net/minecraft/data/server/loot_table/FishingLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loot_table/FishingLootTableGenerator.mapping index 40f7297343..616d50dfcd 100644 --- a/mappings/net/minecraft/data/server/loot_table/FishingLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/loot_table/FishingLootTableGenerator.mapping @@ -1 +1,5 @@ CLASS net/minecraft/unmapped/C_hcpoclvd net/minecraft/data/server/loot_table/FishingLootTableGenerator + FIELD f_cxckattg IN_BAMBOO_JUNGLE Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn; + FIELD f_eulstugi IN_SPARSE_JUNGLE Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn; + FIELD f_qzyhqpvj IN_JUNGLE Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn; + METHOD m_ewgtmwvx fishingTable ()Lnet/minecraft/unmapped/C_inwsuliy$C_daaljsfu; diff --git a/mappings/net/minecraft/data/server/loot_table/VanillaBlockLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loot_table/VanillaBlockLootTableGenerator.mapping index 32deb23e56..2044073324 100644 --- a/mappings/net/minecraft/data/server/loot_table/VanillaBlockLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/loot_table/VanillaBlockLootTableGenerator.mapping @@ -1,3 +1,6 @@ CLASS net/minecraft/unmapped/C_nmrxwpfa net/minecraft/data/server/loot_table/VanillaBlockLootTableGenerator FIELD f_grkujmer JUNGLE_SAPLING_DROP_CHANCES [F FIELD f_toutzgio EXPLOSION_RESISTANT Ljava/util/Set; + METHOD m_qplpaxdm pitcherCropDrops ()Lnet/minecraft/unmapped/C_inwsuliy$C_daaljsfu; + METHOD m_yrbdfiww decoratedPotDrops (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_inwsuliy$C_daaljsfu; + ARG 1 pot diff --git a/mappings/net/minecraft/data/server/loot_table/VanillaEntityLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loot_table/VanillaEntityLootTableGenerator.mapping index a9abe038e7..c14095a880 100644 --- a/mappings/net/minecraft/data/server/loot_table/VanillaEntityLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/loot_table/VanillaEntityLootTableGenerator.mapping @@ -1 +1,2 @@ CLASS net/minecraft/unmapped/C_oftxhywd net/minecraft/data/server/loot_table/VanillaEntityLootTableGenerator + METHOD m_xpisxnia createElderGuardianTable ()Lnet/minecraft/unmapped/C_inwsuliy$C_daaljsfu; diff --git a/mappings/net/minecraft/data/server/recipe/ComplexRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/ComplexRecipeJsonFactory.mapping index 83e4828e39..eb5857dbcb 100644 --- a/mappings/net/minecraft/data/server/recipe/ComplexRecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/ComplexRecipeJsonFactory.mapping @@ -4,3 +4,7 @@ CLASS net/minecraft/unmapped/C_yroyfbmb net/minecraft/data/server/recipe/Complex ARG 1 serializer METHOD m_njqwgtbm create (Lnet/minecraft/unmapped/C_xfxrkzjt;)Lnet/minecraft/unmapped/C_yroyfbmb; ARG 0 serializer + METHOD m_olephlpe offerTo (Lnet/minecraft/unmapped/C_nykrdyol;Ljava/lang/String;)V + ARG 2 id + METHOD m_wxjnjmqg offerTo (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_ncpywfca;)V + ARG 2 id diff --git a/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.mapping index 341def3b56..b3f55b7291 100644 --- a/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/unmapped/C_ffzmwtoh net/minecraft/data/server/recipe/Cooking FIELD f_hfjhvlyq result Lnet/minecraft/unmapped/C_vorddnax; FIELD f_hiljpsyi ingredient Lnet/minecraft/unmapped/C_tcpsydrv; FIELD f_iawdijht cookingCategory Lnet/minecraft/unmapped/C_gtxamkec; + FIELD f_lvitidzk criteria Ljava/util/Map; FIELD f_vfhkylcl cookingTime I FIELD f_zcwzkcge serializer Lnet/minecraft/unmapped/C_xfxrkzjt; METHOD (Lnet/minecraft/unmapped/C_ehjomvtz;Lnet/minecraft/unmapped/C_gtxamkec;Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_tcpsydrv;FILnet/minecraft/unmapped/C_xfxrkzjt;)V @@ -60,7 +61,7 @@ CLASS net/minecraft/unmapped/C_ffzmwtoh net/minecraft/data/server/recipe/Cooking FIELD f_hcvjmszq experience F FIELD f_nfvqrxei recipeId Lnet/minecraft/unmapped/C_ncpywfca; FIELD f_omzgeqdr group Ljava/lang/String; - FIELD f_phdwlhul builder Lnet/minecraft/unmapped/C_unoypvme; + FIELD f_phdwlhul advancement Lnet/minecraft/unmapped/C_unoypvme; FIELD f_smfqltae ingredient Lnet/minecraft/unmapped/C_tcpsydrv; FIELD f_sxmbsvrp cookingCategory Lnet/minecraft/unmapped/C_gtxamkec; FIELD f_zsevemad cookingTime I diff --git a/mappings/net/minecraft/data/server/recipe/RecipeJsonProvider.mapping b/mappings/net/minecraft/data/server/recipe/RecipeJsonProvider.mapping index 7bfe37a19f..8a24ba4667 100644 --- a/mappings/net/minecraft/data/server/recipe/RecipeJsonProvider.mapping +++ b/mappings/net/minecraft/data/server/recipe/RecipeJsonProvider.mapping @@ -2,3 +2,6 @@ CLASS net/minecraft/unmapped/C_qoyuyccf net/minecraft/data/server/recipe/RecipeJ METHOD m_cfncyfws toJson ()Lcom/google/gson/JsonObject; METHOD m_elockimq serialize (Lcom/google/gson/JsonObject;)V ARG 1 json + METHOD m_fvnojmoq getId ()Lnet/minecraft/unmapped/C_ncpywfca; + METHOD m_hvtxasvr getSerializer ()Lnet/minecraft/unmapped/C_xfxrkzjt; + METHOD m_qrsfuvgm getAdvancement ()Lnet/minecraft/unmapped/C_unoypvme; diff --git a/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.mapping index 40d593ddb5..f7b0c36923 100644 --- a/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/unmapped/C_gfkvrxou net/minecraft/data/server/recipe/ShapedR FIELD f_bnvdxogk ingredients Ljava/util/Map; FIELD f_ezdpefxm result Lnet/minecraft/unmapped/C_vorddnax; FIELD f_gagybuip category Lnet/minecraft/unmapped/C_ehjomvtz; + FIELD f_kjrdsybc criteria Ljava/util/Map; FIELD f_kxfnyzxp pattern Ljava/util/List; FIELD f_ogramfqh group Ljava/lang/String; FIELD f_pylfbbun resultCount I @@ -38,6 +39,8 @@ CLASS net/minecraft/unmapped/C_gfkvrxou net/minecraft/data/server/recipe/ShapedR FIELD f_gedwkaav result Lnet/minecraft/unmapped/C_vorddnax; FIELD f_lyamkrsw ingredients Ljava/util/Map; FIELD f_njgxqptg recipeId Lnet/minecraft/unmapped/C_ncpywfca; - FIELD f_qghggzii builder Lnet/minecraft/unmapped/C_unoypvme; + FIELD f_qghggzii advancement Lnet/minecraft/unmapped/C_unoypvme; FIELD f_upzboour resultCount I FIELD f_wfyuqncm pattern Ljava/util/List; + METHOD (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_vorddnax;ILjava/lang/String;Lnet/minecraft/unmapped/C_aodytokc;Ljava/util/List;Ljava/util/Map;Lnet/minecraft/unmapped/C_unoypvme;Z)V + ARG 5 category diff --git a/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping index 9afa059c3d..41e8254912 100644 --- a/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/unmapped/C_bddxvulm net/minecraft/data/server/recipe/Shapele FIELD f_dbfnhazj result Lnet/minecraft/unmapped/C_vorddnax; FIELD f_oihqvjgx ingredients Ljava/util/List; FIELD f_tizgdxlv resultCount I + FIELD f_ujpijrlk criteria Ljava/util/Map; METHOD (Lnet/minecraft/unmapped/C_ehjomvtz;Lnet/minecraft/unmapped/C_gmbqjnle;I)V ARG 1 category ARG 2 result @@ -32,7 +33,9 @@ CLASS net/minecraft/unmapped/C_bddxvulm net/minecraft/data/server/recipe/Shapele CLASS C_ghedqajh ShapelessRecipeJsonProvider FIELD f_duqmuxof count I FIELD f_hqgrxrfe group Ljava/lang/String; - FIELD f_hytrabda builder Lnet/minecraft/unmapped/C_unoypvme; + FIELD f_hytrabda advancement Lnet/minecraft/unmapped/C_unoypvme; FIELD f_rxdzwtag ingredients Ljava/util/List; FIELD f_sqdeupsl recipeId Lnet/minecraft/unmapped/C_ncpywfca; FIELD f_xcofqguo result Lnet/minecraft/unmapped/C_vorddnax; + METHOD (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_vorddnax;ILjava/lang/String;Lnet/minecraft/unmapped/C_aodytokc;Ljava/util/List;Lnet/minecraft/unmapped/C_unoypvme;)V + ARG 5 category diff --git a/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.mapping index 9438a5de94..bd4fc6b7db 100644 --- a/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/unmapped/C_nuvqrpet net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory FIELD f_hqpzyjpj category Lnet/minecraft/unmapped/C_ehjomvtz; FIELD f_nehwgdlx count I + FIELD f_qrfbsqja criteria Ljava/util/Map; FIELD f_rvmsorxp group Ljava/lang/String; FIELD f_sqqbvjnc serializer Lnet/minecraft/unmapped/C_xfxrkzjt; FIELD f_wsiczagw ingredient Lnet/minecraft/unmapped/C_tcpsydrv; diff --git a/mappings/net/minecraft/data/server/recipe/TransformSmithingRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/TransformSmithingRecipeJsonFactory.mapping index c781c4e8f9..929d8afa0d 100644 --- a/mappings/net/minecraft/data/server/recipe/TransformSmithingRecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/TransformSmithingRecipeJsonFactory.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/unmapped/C_vcelfxlx net/minecraft/data/server/recipe/Transfo FIELD f_gsukwtch category Lnet/minecraft/unmapped/C_ehjomvtz; FIELD f_jgttliek template Lnet/minecraft/unmapped/C_tcpsydrv; FIELD f_lfwiouau addition Lnet/minecraft/unmapped/C_tcpsydrv; + FIELD f_lngpyoac criteria Ljava/util/Map; FIELD f_qxdfcqdf base Lnet/minecraft/unmapped/C_tcpsydrv; METHOD (Lnet/minecraft/unmapped/C_xfxrkzjt;Lnet/minecraft/unmapped/C_tcpsydrv;Lnet/minecraft/unmapped/C_tcpsydrv;Lnet/minecraft/unmapped/C_tcpsydrv;Lnet/minecraft/unmapped/C_ehjomvtz;Lnet/minecraft/unmapped/C_vorddnax;)V ARG 1 serializer @@ -12,21 +13,26 @@ CLASS net/minecraft/unmapped/C_vcelfxlx net/minecraft/data/server/recipe/Transfo ARG 4 addition ARG 5 category ARG 6 result + METHOD m_elyuxkle offerTo (Lnet/minecraft/unmapped/C_nykrdyol;Ljava/lang/String;)V + ARG 2 id METHOD m_lfbftglb validate (Lnet/minecraft/unmapped/C_ncpywfca;)V ARG 1 recipeId METHOD m_ppjudvxk criterion (Ljava/lang/String;Lnet/minecraft/unmapped/C_rzypsigz;)Lnet/minecraft/unmapped/C_vcelfxlx; ARG 1 name + ARG 2 criterion METHOD m_qxjwnmkj create (Lnet/minecraft/unmapped/C_tcpsydrv;Lnet/minecraft/unmapped/C_tcpsydrv;Lnet/minecraft/unmapped/C_tcpsydrv;Lnet/minecraft/unmapped/C_ehjomvtz;Lnet/minecraft/unmapped/C_vorddnax;)Lnet/minecraft/unmapped/C_vcelfxlx; ARG 0 template ARG 1 base ARG 2 addition ARG 3 category ARG 4 result + METHOD m_yufbseyu offerTo (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_ncpywfca;)V + ARG 2 id CLASS C_bdbxjrda TransformSmithingRecipeJsonProvider FIELD f_byzsrhgu id Lnet/minecraft/unmapped/C_ncpywfca; FIELD f_fhjtztsg result Lnet/minecraft/unmapped/C_vorddnax; FIELD f_kusfmixn serializer Lnet/minecraft/unmapped/C_xfxrkzjt; - FIELD f_ldybiftb builder Lnet/minecraft/unmapped/C_unoypvme; + FIELD f_ldybiftb advancement Lnet/minecraft/unmapped/C_unoypvme; FIELD f_paorztxy addition Lnet/minecraft/unmapped/C_tcpsydrv; FIELD f_tqdaafbk template Lnet/minecraft/unmapped/C_tcpsydrv; FIELD f_vlaofaap base Lnet/minecraft/unmapped/C_tcpsydrv; diff --git a/mappings/net/minecraft/data/server/recipe/TrimSmithingRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/TrimSmithingRecipeJsonFactory.mapping index 423ff426c7..a4c2b0954b 100644 --- a/mappings/net/minecraft/data/server/recipe/TrimSmithingRecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/TrimSmithingRecipeJsonFactory.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/unmapped/C_ywfnzhyw net/minecraft/data/server/recipe/TrimSmi FIELD f_ksvhrcow template Lnet/minecraft/unmapped/C_tcpsydrv; FIELD f_nasdeshp category Lnet/minecraft/unmapped/C_ehjomvtz; FIELD f_rggexevw addition Lnet/minecraft/unmapped/C_tcpsydrv; + FIELD f_wesxjxaz criteria Ljava/util/Map; METHOD (Lnet/minecraft/unmapped/C_xfxrkzjt;Lnet/minecraft/unmapped/C_ehjomvtz;Lnet/minecraft/unmapped/C_tcpsydrv;Lnet/minecraft/unmapped/C_tcpsydrv;Lnet/minecraft/unmapped/C_tcpsydrv;)V ARG 1 serializer ARG 2 category @@ -12,6 +13,7 @@ CLASS net/minecraft/unmapped/C_ywfnzhyw net/minecraft/data/server/recipe/TrimSmi ARG 5 addition METHOD m_dfezvhwq criterion (Ljava/lang/String;Lnet/minecraft/unmapped/C_rzypsigz;)Lnet/minecraft/unmapped/C_ywfnzhyw; ARG 1 name + ARG 2 criterion METHOD m_ruldxbfe offerTo (Lnet/minecraft/unmapped/C_nykrdyol;Lnet/minecraft/unmapped/C_ncpywfca;)V ARG 2 recipeId METHOD m_vojhabxa validate (Lnet/minecraft/unmapped/C_ncpywfca;)V @@ -24,7 +26,7 @@ CLASS net/minecraft/unmapped/C_ywfnzhyw net/minecraft/data/server/recipe/TrimSmi CLASS C_esuzwjjm TrimSmithingRecipeJsonProvider FIELD f_excayetg id Lnet/minecraft/unmapped/C_ncpywfca; FIELD f_iudkydma template Lnet/minecraft/unmapped/C_tcpsydrv; - FIELD f_izxysdbu builder Lnet/minecraft/unmapped/C_unoypvme; + FIELD f_izxysdbu advancement Lnet/minecraft/unmapped/C_unoypvme; FIELD f_qrjuubil addition Lnet/minecraft/unmapped/C_tcpsydrv; FIELD f_yteignkv base Lnet/minecraft/unmapped/C_tcpsydrv; FIELD f_zspdmjzh serializer Lnet/minecraft/unmapped/C_xfxrkzjt; From 14916c950700ef6de38a93ab9f5e7bce78a840ec Mon Sep 17 00:00:00 2001 From: ix0rai Date: Sun, 5 Nov 2023 21:30:04 -0600 Subject: [PATCH 7/9] fix spellcheck --- .../main/java/quilt/internal/tasks/lint/SpellingChecker.java | 2 +- buildSrc/src/main/resources/minecraft_specific_words.txt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/quilt/internal/tasks/lint/SpellingChecker.java b/buildSrc/src/main/java/quilt/internal/tasks/lint/SpellingChecker.java index 5169b74b03..b56ba5f1f9 100644 --- a/buildSrc/src/main/java/quilt/internal/tasks/lint/SpellingChecker.java +++ b/buildSrc/src/main/java/quilt/internal/tasks/lint/SpellingChecker.java @@ -96,7 +96,7 @@ private static void checkMapping(Entry entry, String name, ErrorReporter erro String[] packageNames = name.substring(0, name.lastIndexOf(PACKAGE_SEPARATOR)).split(String.valueOf(PACKAGE_SEPARATOR)); for (String packageName : packageNames) { String[] split = packageName.split("_"); - namesToSplit.addAll(Set.of(split)); + namesToSplit.addAll(List.of(split)); } } else { // handle underscores diff --git a/buildSrc/src/main/resources/minecraft_specific_words.txt b/buildSrc/src/main/resources/minecraft_specific_words.txt index 50185a3619..ddea552b17 100644 --- a/buildSrc/src/main/resources/minecraft_specific_words.txt +++ b/buildSrc/src/main/resources/minecraft_specific_words.txt @@ -6,6 +6,7 @@ gameplay griefing minceraft minecraft +datapack modded moj mojang @@ -419,6 +420,7 @@ collidable compostable craftable dumpable +dustable enchantable equippable loggable From ce0bae1260c9f171fc6288946e73b9fd6a11c4dc Mon Sep 17 00:00:00 2001 From: ix0rai Date: Sun, 5 Nov 2023 21:37:11 -0600 Subject: [PATCH 8/9] address comments --- buildSrc/src/main/resources/minecraft_specific_words.txt | 1 - ...ckProvider.mapping => RegistriesDataPackProvider.mapping} | 2 +- .../advancement/HusbandryAdvancementTabGenerator.mapping | 5 ----- 3 files changed, 1 insertion(+), 7 deletions(-) rename mappings/net/minecraft/data/report/{RegistriesDatapackProvider.mapping => RegistriesDataPackProvider.mapping} (98%) diff --git a/buildSrc/src/main/resources/minecraft_specific_words.txt b/buildSrc/src/main/resources/minecraft_specific_words.txt index ddea552b17..1c4404fc8f 100644 --- a/buildSrc/src/main/resources/minecraft_specific_words.txt +++ b/buildSrc/src/main/resources/minecraft_specific_words.txt @@ -6,7 +6,6 @@ gameplay griefing minceraft minecraft -datapack modded moj mojang diff --git a/mappings/net/minecraft/data/report/RegistriesDatapackProvider.mapping b/mappings/net/minecraft/data/report/RegistriesDataPackProvider.mapping similarity index 98% rename from mappings/net/minecraft/data/report/RegistriesDatapackProvider.mapping rename to mappings/net/minecraft/data/report/RegistriesDataPackProvider.mapping index a88ff92a23..c5b381c648 100644 --- a/mappings/net/minecraft/data/report/RegistriesDatapackProvider.mapping +++ b/mappings/net/minecraft/data/report/RegistriesDataPackProvider.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_qlsuqzcn net/minecraft/data/report/RegistriesDatapackProvider +CLASS net/minecraft/unmapped/C_qlsuqzcn net/minecraft/data/report/RegistriesDataPackProvider FIELD f_tldbnsmr lookupProvider Ljava/util/concurrent/CompletableFuture; FIELD f_zcjolsve output Lnet/minecraft/unmapped/C_ugkmwocs; METHOD (Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/concurrent/CompletableFuture;)V diff --git a/mappings/net/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator.mapping b/mappings/net/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator.mapping index 2c44526e99..6d742955d4 100644 --- a/mappings/net/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator.mapping +++ b/mappings/net/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator.mapping @@ -11,19 +11,14 @@ CLASS net/minecraft/unmapped/C_vfenxpjt net/minecraft/data/server/advancement/Hu ARG 2 eggLayingAnimals METHOD m_fehmbxhu appendEatAllFoodCriterion (Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; ARG 0 task - ARG 1 task METHOD m_fqhhoyxq appendTameAllCatVariantsCriterion (Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; ARG 0 task - ARG 1 task METHOD m_mjrojbaf appendBucketAllFishCriterion (Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; ARG 0 task - ARG 1 task METHOD m_msnwtfou appendLeashAllFrogTypesCriterion (Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; ARG 0 task - ARG 1 task METHOD m_ropwgspa appendCatchAllFishCriterion (Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; ARG 0 task - ARG 1 task METHOD m_skwozvuj createBreedAllAnimalsAdvancement (Lnet/minecraft/unmapped/C_unoypvme;Ljava/util/function/Consumer;Ljava/util/stream/Stream;Ljava/util/stream/Stream;)Lnet/minecraft/unmapped/C_unoypvme; ARG 0 advancement ARG 1 consumer From ddda380b046f0838daebe2ec6d418e7dec5c6d7d Mon Sep 17 00:00:00 2001 From: ix0rai Date: Sun, 5 Nov 2023 21:52:14 -0600 Subject: [PATCH 9/9] address comments 2! --- mappings/net/minecraft/data/server/tag/TagsProvider.mapping | 2 +- mappings/net/minecraft/recipe/RecipeCodecThingTODO.mapping | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 mappings/net/minecraft/recipe/RecipeCodecThingTODO.mapping diff --git a/mappings/net/minecraft/data/server/tag/TagsProvider.mapping b/mappings/net/minecraft/data/server/tag/TagsProvider.mapping index a19ef2bac8..410d00677d 100644 --- a/mappings/net/minecraft/data/server/tag/TagsProvider.mapping +++ b/mappings/net/minecraft/data/server/tag/TagsProvider.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/unmapped/C_hzdskvsx net/minecraft/data/server/tag/TagsProvid METHOD (Lnet/minecraft/unmapped/C_dgpijqhe;Ljava/util/function/Function;)V ARG 1 builder ARG 2 valueToKey - METHOD m_agatuolp add ([Ljava/lang/Object;)Lnet/minecraft/unmapped/C_hzdskvsx$C_wosjfhof; + METHOD m_agatuolp addAll ([Ljava/lang/Object;)Lnet/minecraft/unmapped/C_hzdskvsx$C_wosjfhof; ARG 1 objects METHOD m_bwfwpsfu add (Ljava/lang/Object;)Lnet/minecraft/unmapped/C_hzdskvsx$C_wosjfhof; ARG 1 object diff --git a/mappings/net/minecraft/recipe/RecipeCodecThingTODO.mapping b/mappings/net/minecraft/recipe/RecipeCodecThingTODO.mapping deleted file mode 100644 index 4a7b1663d4..0000000000 --- a/mappings/net/minecraft/recipe/RecipeCodecThingTODO.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/unmapped/C_fvoqrgef net/minecraft/recipe/RecipeCodecThingTODO