diff --git a/mappings/net/minecraft/recipe/DecoratedPotRecipe.mapping b/mappings/net/minecraft/recipe/DecoratedPotRecipe.mapping index 831f850993..c78b7de36a 100644 --- a/mappings/net/minecraft/recipe/DecoratedPotRecipe.mapping +++ b/mappings/net/minecraft/recipe/DecoratedPotRecipe.mapping @@ -1 +1,9 @@ CLASS net/minecraft/unmapped/C_wcabtfez net/minecraft/recipe/DecoratedPotRecipe + METHOD m_gdtyamof getLeftItem (Lnet/minecraft/unmapped/C_euomljmv;)Lnet/minecraft/unmapped/C_sddaxwyk; + ARG 0 input + METHOD m_ivnypkcv getBackItem (Lnet/minecraft/unmapped/C_euomljmv;)Lnet/minecraft/unmapped/C_sddaxwyk; + ARG 0 input + METHOD m_mlzetyuf getRightItem (Lnet/minecraft/unmapped/C_euomljmv;)Lnet/minecraft/unmapped/C_sddaxwyk; + ARG 0 input + METHOD m_ywanumts getFrontItem (Lnet/minecraft/unmapped/C_euomljmv;)Lnet/minecraft/unmapped/C_sddaxwyk; + ARG 0 input diff --git a/mappings/net/minecraft/recipe/Ingredient.mapping b/mappings/net/minecraft/recipe/Ingredient.mapping index 04907d6791..8a404e4e4b 100644 --- a/mappings/net/minecraft/recipe/Ingredient.mapping +++ b/mappings/net/minecraft/recipe/Ingredient.mapping @@ -6,6 +6,8 @@ CLASS net/minecraft/unmapped/C_tcpsydrv net/minecraft/recipe/Ingredient FIELD f_qqfxxlfb ENTRIES_CODEC Lcom/mojang/serialization/Codec; FIELD f_wpamqjgv items Ljava/util/List; METHOD m_hiksyixf getItems ()Ljava/util/List; + METHOD m_kkrsbepq createOptionalSlotDisplay (Ljava/util/Optional;)Lnet/minecraft/unmapped/C_lahbbtfn; + ARG 0 ingredient METHOD m_lqlwthyg getSlotDisplay ()Lnet/minecraft/unmapped/C_lahbbtfn; METHOD m_mpihdccy ofItems ([Lnet/minecraft/unmapped/C_gmbqjnle;)Lnet/minecraft/unmapped/C_tcpsydrv; ARG 0 items @@ -14,6 +16,7 @@ CLASS net/minecraft/unmapped/C_tcpsydrv net/minecraft/recipe/Ingredient METHOD m_owdzpelq ofItems (Lnet/minecraft/unmapped/C_odfnijdo;)Lnet/minecraft/unmapped/C_tcpsydrv; METHOD m_ssxtwbyt ofStacks (Ljava/util/stream/Stream;)Lnet/minecraft/unmapped/C_tcpsydrv; ARG 0 stacks + METHOD m_tmzbacdg createSingleItemDisplay (Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_lahbbtfn; METHOD m_xqanmytq ofItem (Lnet/minecraft/unmapped/C_gmbqjnle;)Lnet/minecraft/unmapped/C_tcpsydrv; ARG 0 item METHOD test (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/recipe/ItemMapper.mapping b/mappings/net/minecraft/recipe/ItemMapper.mapping new file mode 100644 index 0000000000..0649a73223 --- /dev/null +++ b/mappings/net/minecraft/recipe/ItemMapper.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/unmapped/C_fmiamsvu net/minecraft/recipe/ItemMapper + CLASS C_euugwrmj RemainderMapper + METHOD m_rxmsomtp addRemainder (Ljava/lang/Object;Ljava/util/List;)Ljava/lang/Object; + ARG 1 input + ARG 2 items + CLASS C_uuovlzkm StackMapper + METHOD m_ewvxfery addItem (Lnet/minecraft/unmapped/C_cjzoxshv;)Ljava/lang/Object; + METHOD m_fuwtppcc addStack (Lnet/minecraft/unmapped/C_sddaxwyk;)Ljava/lang/Object; + METHOD m_vuyqdfmh addItem (Lnet/minecraft/unmapped/C_vorddnax;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/recipe/Recipe.mapping b/mappings/net/minecraft/recipe/Recipe.mapping index 335e2a1589..351e933f23 100644 --- a/mappings/net/minecraft/recipe/Recipe.mapping +++ b/mappings/net/minecraft/recipe/Recipe.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/unmapped/C_awrmdwqd net/minecraft/recipe/Recipe COMMENT or recipe books. Users can have stub implementations if they do not use COMMENT those functionalities. FIELD f_mwhtvqku PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu; + METHOD m_acqxyxru getRecipeBookCategory ()Lnet/minecraft/unmapped/C_loximogs; METHOD m_acqxyxru getRecipeBookCategory ()Lnet/minecraft/unmapped/C_sxzvngst; METHOD m_aphdsjxe getSerializer ()Lnet/minecraft/unmapped/C_xfxrkzjt; COMMENT {@return the serializer associated with this recipe} diff --git a/mappings/net/minecraft/recipe/RecipeDisplayEntry.mapping b/mappings/net/minecraft/recipe/RecipeDisplayEntry.mapping index 2a46b91ec7..df4a4b4375 100644 --- a/mappings/net/minecraft/recipe/RecipeDisplayEntry.mapping +++ b/mappings/net/minecraft/recipe/RecipeDisplayEntry.mapping @@ -2,3 +2,5 @@ CLASS net/minecraft/unmapped/C_dsptsoym net/minecraft/recipe/RecipeDisplayEntry METHOD m_dnksqbuz isCraftable (Lnet/minecraft/unmapped/C_fcquvjby;)Z ARG 1 finder METHOD m_gcmdljav resultItems (Lnet/minecraft/unmapped/C_lahbbtfn$C_ozrotgvv;)Ljava/util/List; + METHOD m_gcmdljav getResults (Lnet/minecraft/unmapped/C_zcrtzabd;)Ljava/util/List; + ARG 1 context diff --git a/mappings/net/minecraft/recipe/RecipeFinder.mapping b/mappings/net/minecraft/recipe/RecipeFinder.mapping index 4cabb7d2c2..f58434b1fb 100644 --- a/mappings/net/minecraft/recipe/RecipeFinder.mapping +++ b/mappings/net/minecraft/recipe/RecipeFinder.mapping @@ -3,13 +3,13 @@ CLASS net/minecraft/unmapped/C_fcquvjby net/minecraft/recipe/RecipeFinder METHOD m_bhcaqfpt clear ()V METHOD m_cidhvqrf createIngredientInfo (Ljava/util/stream/Stream;)Lnet/minecraft/unmapped/C_nyagoaau$C_yxyoqnti; ARG 0 items - METHOD m_hwvldlvh accountStack (Lnet/minecraft/unmapped/C_sddaxwyk;)V + METHOD m_hwvldlvh addInput (Lnet/minecraft/unmapped/C_sddaxwyk;)V METHOD m_maorrpzg countCrafts (Lnet/minecraft/unmapped/C_awrmdwqd;Lnet/minecraft/unmapped/C_nyagoaau$C_xftfxaqa;)I - METHOD m_mgmvzctj accountStackIfUsable (Lnet/minecraft/unmapped/C_sddaxwyk;)V + METHOD m_mgmvzctj addInputIfUsable (Lnet/minecraft/unmapped/C_sddaxwyk;)V METHOD m_ocfwpwhp countCrafts (Lnet/minecraft/unmapped/C_awrmdwqd;ILnet/minecraft/unmapped/C_nyagoaau$C_xftfxaqa;)I ARG 1 recipe METHOD m_olpqguay isCraftable (Ljava/util/List;Lnet/minecraft/unmapped/C_nyagoaau$C_xftfxaqa;)Z - METHOD m_ovblcbcp accountStack (Lnet/minecraft/unmapped/C_sddaxwyk;I)V + METHOD m_ovblcbcp addInput (Lnet/minecraft/unmapped/C_sddaxwyk;I)V ARG 2 maxCount METHOD m_syqmxkya isCraftable (Lnet/minecraft/unmapped/C_awrmdwqd;ILnet/minecraft/unmapped/C_nyagoaau$C_xftfxaqa;)Z ARG 1 recipe diff --git a/mappings/net/minecraft/recipe/RecipeManager.mapping b/mappings/net/minecraft/recipe/RecipeManager.mapping index 004a389ca1..aaff6b0483 100644 --- a/mappings/net/minecraft/recipe/RecipeManager.mapping +++ b/mappings/net/minecraft/recipe/RecipeManager.mapping @@ -5,10 +5,13 @@ CLASS net/minecraft/unmapped/C_hjseusrb net/minecraft/recipe/RecipeManager FIELD f_avfppxeg displays Ljava/util/List; FIELD f_cfijlewf registries Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig; FIELD f_hqaaykcp LOGGER Lorg/slf4j/Logger; + FIELD f_kczkpctf RECIPE_PROPERTY_SETS Ljava/util/Map; FIELD f_lwdpgeem propertySets Ljava/util/Map; FIELD f_qlhewmmf recipes Lnet/minecraft/unmapped/C_rrkbzyqf; FIELD f_sbxhtycx stonecuttingRecipes Lnet/minecraft/unmapped/C_qzkacgwi$C_kvadugef; FIELD f_yzfonsti displayByRecipe Ljava/util/Map; + METHOD m_cuobwmoj createExtractorForSingleItemRecipe (Lnet/minecraft/unmapped/C_rhnqznys;)Lnet/minecraft/unmapped/C_hjseusrb$C_dpqqvooy; + ARG 0 type METHOD m_dsxpcpxk get (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional; COMMENT {@return a recipe with the given {@code id}, or empty if there is no such recipe} METHOD m_enpjndth filterDisabled (Lnet/minecraft/unmapped/C_czxxrbcp;Ljava/util/List;)Ljava/util/List; @@ -60,6 +63,16 @@ CLASS net/minecraft/unmapped/C_hjseusrb net/minecraft/recipe/RecipeManager CLASS C_bvtkxdyi CachedCheck METHOD m_ltqsvwgf getFirstMatch (Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_bdwnwhiu;)Ljava/util/Optional; ARG 1 input + CLASS C_dpqqvooy IngredientExtractor + METHOD apply (Lnet/minecraft/unmapped/C_awrmdwqd;)Ljava/util/Optional; + ARG 1 recipe CLASS C_ioxglbpe FIELD f_kspyemsz key Lnet/minecraft/unmapped/C_xhhleach; CLASS C_oqjlukte ServerDisplayInfo + CLASS C_xmfwsmdh IngredientCollector + FIELD f_cicntgdd finder Lnet/minecraft/unmapped/C_hjseusrb$C_dpqqvooy; + FIELD f_revcxqtv ingredients Ljava/util/List; + FIELD f_ylmrfukx key Lnet/minecraft/unmapped/C_xhhleach; + METHOD accept (Ljava/lang/Object;)V + ARG 1 recipe + METHOD m_jebcbuxt asPropertySet (Lnet/minecraft/unmapped/C_czxxrbcp;)Lnet/minecraft/unmapped/C_jgqrwysz; diff --git a/mappings/net/minecraft/recipe/RecipeMatcher.mapping b/mappings/net/minecraft/recipe/RecipeMatcher.mapping index 49748bcadc..1a4fe3a5d1 100644 --- a/mappings/net/minecraft/recipe/RecipeMatcher.mapping +++ b/mappings/net/minecraft/recipe/RecipeMatcher.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/unmapped/C_nyagoaau net/minecraft/recipe/RecipeMatcher ARG 2 amount METHOD m_qzcfdjbc hasAny (Ljava/lang/Object;)Z ARG 1 input - METHOD m_sbpnsepr account (Ljava/lang/Object;I)V + METHOD m_sbpnsepr addInput (Ljava/lang/Object;I)V METHOD m_uachwhuy hasAtLeast (Ljava/lang/Object;I)Z ARG 1 input ARG 2 amount diff --git a/mappings/net/minecraft/recipe/RepairItemRecipe.mapping b/mappings/net/minecraft/recipe/RepairItemRecipe.mapping index a2391eb500..256108dd30 100644 --- a/mappings/net/minecraft/recipe/RepairItemRecipe.mapping +++ b/mappings/net/minecraft/recipe/RepairItemRecipe.mapping @@ -7,4 +7,5 @@ CLASS net/minecraft/unmapped/C_oeuthbtr net/minecraft/recipe/RepairItemRecipe METHOD m_tplyzfou (Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)Z ARG 0 enchantment METHOD m_tsxbkugn findItemsToCombine (Lnet/minecraft/unmapped/C_euomljmv;)Lcom/mojang/datafixers/util/Pair; + ARG 0 input ARG 1 input diff --git a/mappings/net/minecraft/recipe/TrimSmithingRecipe.mapping b/mappings/net/minecraft/recipe/TrimSmithingRecipe.mapping index cf71241867..fe9f4c3c6b 100644 --- a/mappings/net/minecraft/recipe/TrimSmithingRecipe.mapping +++ b/mappings/net/minecraft/recipe/TrimSmithingRecipe.mapping @@ -3,6 +3,11 @@ CLASS net/minecraft/unmapped/C_ngeyonui net/minecraft/recipe/TrimSmithingRecipe FIELD f_ibbkkedr addition Ljava/util/Optional; FIELD f_nflteanq template Ljava/util/Optional; FIELD f_wnvjvqod base Ljava/util/Optional; + METHOD m_kfjljnfn applyTrim (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk; + ARG 0 lookup + ARG 1 base + ARG 2 addition + ARG 3 template CLASS C_whzzarxp Serializer FIELD f_xkkrzbdj PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu; METHOD m_bzlovpfk (Lnet/minecraft/unmapped/C_ngeyonui;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/recipe/display/SlotDisplay.mapping b/mappings/net/minecraft/recipe/display/SlotDisplay.mapping index f8232723dc..fd21077ff8 100644 --- a/mappings/net/minecraft/recipe/display/SlotDisplay.mapping +++ b/mappings/net/minecraft/recipe/display/SlotDisplay.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/unmapped/C_lahbbtfn net/minecraft/recipe/display/SlotDisplay METHOD m_etiiiuiq resolve (Lnet/minecraft/unmapped/C_lahbbtfn$C_ozrotgvv;Ljava/util/function/Consumer;)V ARG 2 consumer METHOD m_hzkpthfi resolveFirstStack (Lnet/minecraft/unmapped/C_lahbbtfn$C_ozrotgvv;)Lnet/minecraft/unmapped/C_sddaxwyk; + METHOD m_hzkpthfi resolveFirstStack (Lnet/minecraft/unmapped/C_zcrtzabd;)Lnet/minecraft/unmapped/C_sddaxwyk; + ARG 1 context METHOD m_lvfostcp isEnabled (Lnet/minecraft/unmapped/C_czxxrbcp;)Z ARG 1 features METHOD m_moncddlm resolveStacks (Lnet/minecraft/unmapped/C_lahbbtfn$C_ozrotgvv;)Ljava/util/List; @@ -9,6 +11,11 @@ CLASS net/minecraft/unmapped/C_lahbbtfn net/minecraft/recipe/display/SlotDisplay METHOD m_uxrfsltr resolve (Lnet/minecraft/unmapped/C_lahbbtfn$C_ozrotgvv;Lnet/minecraft/unmapped/C_lahbbtfn$C_hcvhdsdg;)V ARG 1 context ARG 2 consumer + METHOD m_uxrfsltr resolveItems (Lnet/minecraft/unmapped/C_zcrtzabd;Lnet/minecraft/unmapped/C_fmiamsvu;)Ljava/util/stream/Stream; + ARG 1 context + ARG 2 mapper + METHOD m_whqywntk resolveStacks (Lnet/minecraft/unmapped/C_zcrtzabd;)Ljava/util/List; + ARG 1 context CLASS C_asnhtjgh FuelSlotDisplay FIELD f_kvfeugrf INSTANCE Lnet/minecraft/unmapped/C_lahbbtfn$C_asnhtjgh; CLASS C_bhpspplm Type @@ -21,6 +28,7 @@ CLASS net/minecraft/unmapped/C_lahbbtfn net/minecraft/recipe/display/SlotDisplay METHOD m_gyxiixtl accept (Lnet/minecraft/unmapped/C_vorddnax;)V ARG 1 item METHOD m_muzkpdkq accept (Lnet/minecraft/unmapped/C_sddaxwyk;)V + CLASS C_hlornmej RemainderSlotDisplay CLASS C_ozrotgvv ResolutionContext METHOD m_dkuuvoci fuelTimes ()Lnet/minecraft/unmapped/C_smdnyqwx; METHOD m_tooywucm create (Lnet/minecraft/unmapped/C_cdctfzbn;)Lnet/minecraft/unmapped/C_lahbbtfn$C_ozrotgvv; @@ -30,5 +38,7 @@ CLASS net/minecraft/unmapped/C_lahbbtfn net/minecraft/recipe/display/SlotDisplay METHOD (Lnet/minecraft/unmapped/C_vorddnax;)V ARG 1 item CLASS C_twdqwrvw StackSlotDisplay + CLASS C_vwvdmimr ItemStackMapper + FIELD f_uavwlgel INSTANCE Lnet/minecraft/unmapped/C_lahbbtfn$C_vwvdmimr; CLASS C_wilvedch SmithingTrimSlotDisplay FIELD f_uzmpeglf INSTANCE Lnet/minecraft/unmapped/C_lahbbtfn$C_wilvedch; diff --git a/mappings/net/minecraft/recipe/display/SlotDisplayContext.mapping b/mappings/net/minecraft/recipe/display/SlotDisplayContext.mapping new file mode 100644 index 0000000000..d8be1341fe --- /dev/null +++ b/mappings/net/minecraft/recipe/display/SlotDisplayContext.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/unmapped/C_kuhmkefg net/minecraft/recipe/display/SlotDisplayContext + FIELD f_aoyfqrsq REGISTRIES Lnet/minecraft/unmapped/C_fwhrecir; + FIELD f_ehjdieew CONTEXT Lnet/minecraft/unmapped/C_ykthnceq; + FIELD f_mapwfaid FUEL_TIMES Lnet/minecraft/unmapped/C_fwhrecir; + METHOD m_wzcjjviu fromWorld (Lnet/minecraft/unmapped/C_cdctfzbn;)Lnet/minecraft/unmapped/C_zcrtzabd; diff --git a/mappings/net/minecraft/util/context/ContextKey.mapping b/mappings/net/minecraft/util/context/ContextKey.mapping new file mode 100644 index 0000000000..db40a805cf --- /dev/null +++ b/mappings/net/minecraft/util/context/ContextKey.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/unmapped/C_fwhrecir net/minecraft/util/context/ContextKey + METHOD m_gwhuraiv getId ()Lnet/minecraft/unmapped/C_ncpywfca; + METHOD m_rginltte createDefault (Ljava/lang/String;)Lnet/minecraft/unmapped/C_fwhrecir; diff --git a/mappings/net/minecraft/util/context/ContextKeySet.mapping b/mappings/net/minecraft/util/context/ContextKeySet.mapping new file mode 100644 index 0000000000..8907d65663 --- /dev/null +++ b/mappings/net/minecraft/util/context/ContextKeySet.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/unmapped/C_ykthnceq net/minecraft/util/context/ContextKeySet + FIELD f_bqqxiayl required Ljava/util/Set; + FIELD f_iawmnflz allowed Ljava/util/Set; + METHOD (Ljava/util/Set;Ljava/util/Set;)V + ARG 1 required + ARG 2 allowed + METHOD m_drjhihxt getAllowed ()Ljava/util/Set; + METHOD m_rdrvykhr getRequired ()Ljava/util/Set; + CLASS C_frcifljd Builder + FIELD f_dzzvctzu allowed Ljava/util/Set; + FIELD f_ugtotskb required Ljava/util/Set; + METHOD m_frfpwkut require (Lnet/minecraft/unmapped/C_fwhrecir;)Lnet/minecraft/unmapped/C_ykthnceq$C_frcifljd; + ARG 1 key + METHOD m_phwovvlh build ()Lnet/minecraft/unmapped/C_ykthnceq; + METHOD m_vzniwaxq allow (Lnet/minecraft/unmapped/C_fwhrecir;)Lnet/minecraft/unmapped/C_ykthnceq$C_frcifljd; + ARG 1 key diff --git a/mappings/net/minecraft/util/context/ContextMap.mapping b/mappings/net/minecraft/util/context/ContextMap.mapping new file mode 100644 index 0000000000..7615e1e3ac --- /dev/null +++ b/mappings/net/minecraft/util/context/ContextMap.mapping @@ -0,0 +1,24 @@ +CLASS net/minecraft/unmapped/C_zcrtzabd net/minecraft/util/context/ContextMap + FIELD f_htsneqql params Ljava/util/Map; + METHOD m_nlwivfes getOrDefault (Lnet/minecraft/unmapped/C_fwhrecir;Ljava/lang/Object;)Ljava/lang/Object; + METHOD m_yhqbolpt get (Lnet/minecraft/unmapped/C_fwhrecir;)Ljava/lang/Object; + ARG 1 key + METHOD m_yqtpycln getOrThrow (Lnet/minecraft/unmapped/C_fwhrecir;)Ljava/lang/Object; + ARG 1 key + METHOD m_zjtjxnih contains (Lnet/minecraft/unmapped/C_fwhrecir;)Z + ARG 1 key + CLASS C_dyefrfxn Builder + FIELD f_pizccflk params Ljava/util/Map; + METHOD m_ebrmhhhg build (Lnet/minecraft/unmapped/C_ykthnceq;)Lnet/minecraft/unmapped/C_zcrtzabd; + ARG 1 keySet + COMMENT a key set to validate that all required parameters are present and all parameters are allowed + METHOD m_qfvzikfa withOptionalParameter (Lnet/minecraft/unmapped/C_fwhrecir;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_zcrtzabd$C_dyefrfxn; + ARG 1 key + ARG 2 param + METHOD m_quncxtks getParameter (Lnet/minecraft/unmapped/C_fwhrecir;)Ljava/lang/Object; + ARG 1 key + METHOD m_upgpfdhs withParameter (Lnet/minecraft/unmapped/C_fwhrecir;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_zcrtzabd$C_dyefrfxn; + ARG 1 key + ARG 2 param + METHOD m_yzhkjsze getParameterOrThrow (Lnet/minecraft/unmapped/C_fwhrecir;)Ljava/lang/Object; + ARG 1 key diff --git a/simple_type_field_names.json5 b/simple_type_field_names.json5 index 7d9b452d9e..0fa1cad76a 100644 --- a/simple_type_field_names.json5 +++ b/simple_type_field_names.json5 @@ -133,6 +133,14 @@ ] }, + // Util + "net/minecraft/unmapped/C_fwhrecir": { + local_name: "key", + fallback: [ + "contextKey" + ] + }, + // Village "net/minecraft/unmapped/C_argwryfu": { // TradeOffer local_name: "offer",