From 4ba9fc2573b58b0c4c75ebda31aabf230f14f74d Mon Sep 17 00:00:00 2001 From: supersaiyansubtlety Date: Fri, 31 May 2024 23:31:30 -0700 Subject: [PATCH] completed recipe and inventory --- .../entity/BrewingStandBlockEntity.mapping | 1 + .../inventory/RecipeInputInventory.mapping | 4 +- .../inventory/StackReference.mapping | 3 ++ .../recipe/AbstractCookingRecipe.mapping | 2 +- .../recipe/BrewingRecipeRegistry.mapping | 42 +++++++++++++++--- .../recipe/CookingRecipeSerializer.mapping | 12 +++++ .../recipe/CraftingRecipeInput.mapping | 22 ++++++++++ .../minecraft/recipe/CuttingRecipe.mapping | 8 ++++ .../minecraft/recipe/InputSlotFiller.mapping | 4 ++ .../recipe/MapExtendingRecipe.mapping | 2 + mappings/net/minecraft/recipe/Recipe.mapping | 7 +++ .../net/minecraft/recipe/RecipeCache.mapping | 12 +++++ .../recipe/RecipeGridAligner.mapping | 6 +++ .../net/minecraft/recipe/RecipeInput.mapping | 5 +++ .../minecraft/recipe/RecipeManager.mapping | 35 +++++++++++++-- .../minecraft/recipe/RepairItemRecipe.mapping | 9 ++++ .../net/minecraft/recipe/ShapedRecipe.mapping | 12 +++++ .../recipe/ShapedRecipePattern.mapping | 44 +++++++++++++++++++ .../minecraft/recipe/ShapelessRecipe.mapping | 12 +++++ .../recipe/SingleRecipeInput.mapping | 1 + .../recipe/SmithingRecipeInput.mapping | 1 + .../recipe/TransformSmithingRecipe.mapping | 8 ++++ .../recipe/TrimSmithingRecipe.mapping | 6 +++ mappings/net/minecraft/util/Util.mapping | 3 ++ 24 files changed, 250 insertions(+), 11 deletions(-) create mode 100644 mappings/net/minecraft/recipe/CraftingRecipeInput.mapping create mode 100644 mappings/net/minecraft/recipe/RecipeInput.mapping create mode 100644 mappings/net/minecraft/recipe/ShapedRecipePattern.mapping create mode 100644 mappings/net/minecraft/recipe/SingleRecipeInput.mapping create mode 100644 mappings/net/minecraft/recipe/SmithingRecipeInput.mapping diff --git a/mappings/net/minecraft/block/entity/BrewingStandBlockEntity.mapping b/mappings/net/minecraft/block/entity/BrewingStandBlockEntity.mapping index 5a26e25d8a..de065f1743 100644 --- a/mappings/net/minecraft/block/entity/BrewingStandBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BrewingStandBlockEntity.mapping @@ -28,4 +28,5 @@ CLASS net/minecraft/unmapped/C_sqxxaglx net/minecraft/block/entity/BrewingStandB ARG 2 state ARG 3 blockEntity METHOD m_zxndtyxk canCraft (Lnet/minecraft/unmapped/C_ilssplzn;Lnet/minecraft/unmapped/C_rnrfftze;)Z + ARG 0 registry ARG 1 slots diff --git a/mappings/net/minecraft/inventory/RecipeInputInventory.mapping b/mappings/net/minecraft/inventory/RecipeInputInventory.mapping index d0017ce40a..923eec6c2c 100644 --- a/mappings/net/minecraft/inventory/RecipeInputInventory.mapping +++ b/mappings/net/minecraft/inventory/RecipeInputInventory.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/unmapped/C_fcvwjvlq net/minecraft/inventory/RecipeInputInventory METHOD m_dvbyvcly getHeight ()I - METHOD m_mmnfalel getInvStack ()Ljava/util/List; + METHOD m_mjhyecbx toPositionedInput ()Lnet/minecraft/unmapped/C_euomljmv$C_yjgdhrsl; + METHOD m_mmnfalel getStacks ()Ljava/util/List; METHOD m_rkeovwln getWidth ()I + METHOD m_tegcmbjp toInput ()Lnet/minecraft/unmapped/C_euomljmv; diff --git a/mappings/net/minecraft/inventory/StackReference.mapping b/mappings/net/minecraft/inventory/StackReference.mapping index 44fb28d409..013083c3a4 100644 --- a/mappings/net/minecraft/inventory/StackReference.mapping +++ b/mappings/net/minecraft/inventory/StackReference.mapping @@ -30,6 +30,9 @@ CLASS net/minecraft/unmapped/C_xkkpnyvk net/minecraft/inventory/StackReference COMMENT no filter, allowing direct manipulation of the equipment slot. ARG 0 entity ARG 1 slot + METHOD m_tyujkhps of (Ljava/util/function/Supplier;Ljava/util/function/Consumer;)Lnet/minecraft/unmapped/C_xkkpnyvk; + ARG 0 getter + ARG 1 setter METHOD m_xhhfnfpi of (Lnet/minecraft/unmapped/C_pjtstjoq;I)Lnet/minecraft/unmapped/C_xkkpnyvk; COMMENT Creates a stack reference backed by an index within an inventory. ARG 0 inventory diff --git a/mappings/net/minecraft/recipe/AbstractCookingRecipe.mapping b/mappings/net/minecraft/recipe/AbstractCookingRecipe.mapping index f7b4d4fb02..58a32bc5bc 100644 --- a/mappings/net/minecraft/recipe/AbstractCookingRecipe.mapping +++ b/mappings/net/minecraft/recipe/AbstractCookingRecipe.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/unmapped/C_hpjdwiwu net/minecraft/recipe/AbstractCookingReci METHOD m_colblqee getCategory ()Lnet/minecraft/unmapped/C_gtxamkec; METHOD m_iphifltu getExperience ()F METHOD m_pnrjaplr getCookTime ()I - CLASS C_fpdfhqvq + CLASS C_fpdfhqvq Factory METHOD create 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 diff --git a/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping b/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping index 26160517cf..444b4f6e58 100644 --- a/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping +++ b/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping @@ -1,18 +1,50 @@ CLASS net/minecraft/unmapped/C_ilssplzn net/minecraft/recipe/BrewingRecipeRegistry + FIELD f_aruotgdf potionRecipes Ljava/util/List; + FIELD f_dhquiuxe itemRecipes Ljava/util/List; FIELD f_ltwfhqjw BREWING_TIME_SECONDS I + FIELD f_mxpxplfe bottomIngredients Ljava/util/List; + FIELD f_rhvjiasu EMPTY Lnet/minecraft/unmapped/C_ilssplzn; + METHOD m_bwccxzca create (Lnet/minecraft/unmapped/C_czxxrbcp;)Lnet/minecraft/unmapped/C_ilssplzn; + METHOD m_cugqmywj addVanillaRecipes (Lnet/minecraft/unmapped/C_ilssplzn$C_anvszzom;)V + ARG 0 builder METHOD m_cwnwpxhs craft (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk; - ARG 1 input + ARG 1 topInput + ARG 2 bottomInput METHOD m_fdkgeuuc hasItemRecipe (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Z - ARG 1 ingredient - METHOD m_ldkmprrc isValidIngredient (Lnet/minecraft/unmapped/C_sddaxwyk;)Z + ARG 1 bottomInput + ARG 2 topInput + METHOD m_kdcuqyob isBottomIngredient (Lnet/minecraft/unmapped/C_sddaxwyk;)Z + METHOD m_ldkmprrc isTopIngredient (Lnet/minecraft/unmapped/C_sddaxwyk;)Z METHOD m_lronsnat isPotionRecipeIngredient (Lnet/minecraft/unmapped/C_sddaxwyk;)Z METHOD m_ngonaytv hasPotionRecipe (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Z - ARG 1 ingredient + ARG 1 bottomInput + ARG 2 topInput METHOD m_ngyngnto isBrewable (Lnet/minecraft/unmapped/C_cjzoxshv;)Z + ARG 1 potion METHOD m_wrviwmkr hasRecipe (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Z - ARG 1 ingredient + ARG 1 bottomInput + ARG 2 topInput METHOD m_zqdnpuap isItemRecipeIngredient (Lnet/minecraft/unmapped/C_sddaxwyk;)Z + CLASS C_anvszzom Builder + FIELD f_cumxoxtw bottomIngredients Ljava/util/List; + FIELD f_exnloijq itemRecipes Ljava/util/List; + FIELD f_qqsssiby potionRecipes Ljava/util/List; + FIELD f_szfgeigs features Lnet/minecraft/unmapped/C_czxxrbcp; + METHOD m_ilqhdtus build ()Lnet/minecraft/unmapped/C_ilssplzn; + METHOD m_kjbtjqbn addItemRecipe (Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_vorddnax;)V + ARG 1 bottomInput + ARG 2 topInput + ARG 3 output + METHOD m_omxvxkhk addStarterRecipes (Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_cjzoxshv;)V + METHOD m_pdipybln addBottomIngredient (Lnet/minecraft/unmapped/C_vorddnax;)V + METHOD m_sieojnmp addPotionRecipe (Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_cjzoxshv;)V + ARG 1 bottomInput + ARG 2 topInput + METHOD m_uovaqaoc requirePotion (Lnet/minecraft/unmapped/C_vorddnax;)V + ARG 0 item CLASS C_uuqlcqac Recipe FIELD f_fszziriy ingredient Lnet/minecraft/unmapped/C_tcpsydrv; FIELD f_qoekordr input Lnet/minecraft/unmapped/C_cjzoxshv; FIELD f_srxxptri output Lnet/minecraft/unmapped/C_cjzoxshv; + METHOD m_udixioab input ()Lnet/minecraft/unmapped/C_cjzoxshv; + METHOD m_yrmcoeqb output ()Lnet/minecraft/unmapped/C_cjzoxshv; diff --git a/mappings/net/minecraft/recipe/CookingRecipeSerializer.mapping b/mappings/net/minecraft/recipe/CookingRecipeSerializer.mapping index d7e0531c07..22245f20be 100644 --- a/mappings/net/minecraft/recipe/CookingRecipeSerializer.mapping +++ b/mappings/net/minecraft/recipe/CookingRecipeSerializer.mapping @@ -4,11 +4,23 @@ CLASS net/minecraft/unmapped/C_nuvmhgvy net/minecraft/recipe/CookingRecipeSerial FIELD f_wqsghihj packetCodec Lnet/minecraft/unmapped/C_qsrmwluu; METHOD (Lnet/minecraft/unmapped/C_hpjdwiwu$C_fpdfhqvq;I)V ARG 2 defaultCookingTime + METHOD m_bmonsixt (Lnet/minecraft/unmapped/C_hpjdwiwu;)Ljava/lang/Integer; + ARG 0 recipe + METHOD m_effbipxl (Lnet/minecraft/unmapped/C_hpjdwiwu;)Lnet/minecraft/unmapped/C_tcpsydrv; + ARG 0 recipe METHOD m_iklislsa write (Lnet/minecraft/unmapped/C_bngyzsts;Lnet/minecraft/unmapped/C_hpjdwiwu;)V ARG 1 buf ARG 2 recipe + METHOD m_nepmthol (Lnet/minecraft/unmapped/C_hpjdwiwu;)Lnet/minecraft/unmapped/C_sddaxwyk; + ARG 0 recipe METHOD m_pmzwogut 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; METHOD m_resmgrzl read (Lnet/minecraft/unmapped/C_bngyzsts;)Lnet/minecraft/unmapped/C_hpjdwiwu; ARG 1 buf + METHOD m_sthivras (Lnet/minecraft/unmapped/C_hpjdwiwu;)Lnet/minecraft/unmapped/C_gtxamkec; + ARG 0 recipe METHOD m_vdhhiinh (ILnet/minecraft/unmapped/C_hpjdwiwu$C_fpdfhqvq;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 2 instance + METHOD m_vlrdbrcg (Lnet/minecraft/unmapped/C_hpjdwiwu;)Ljava/lang/Float; + ARG 0 recipe + METHOD m_zsfoyray (Lnet/minecraft/unmapped/C_hpjdwiwu;)Ljava/lang/String; + ARG 0 recipe diff --git a/mappings/net/minecraft/recipe/CraftingRecipeInput.mapping b/mappings/net/minecraft/recipe/CraftingRecipeInput.mapping new file mode 100644 index 0000000000..279c2a8400 --- /dev/null +++ b/mappings/net/minecraft/recipe/CraftingRecipeInput.mapping @@ -0,0 +1,22 @@ +CLASS net/minecraft/unmapped/C_euomljmv net/minecraft/recipe/CraftingRecipeInput + FIELD f_ebgyevua stacks Ljava/util/List; + FIELD f_gempqgqe inputCount I + FIELD f_hxkvnbdm matcher Lnet/minecraft/unmapped/C_nyagoaau; + FIELD f_qapubcmu EMPTY Lnet/minecraft/unmapped/C_euomljmv; + FIELD f_tlhfbbvl width I + FIELD f_uucvrzzn height I + METHOD m_dhcnljxm getWidth ()I + METHOD m_dyulubbb of (IILjava/util/List;)Lnet/minecraft/unmapped/C_euomljmv; + METHOD m_oajnzqrl get (II)Lnet/minecraft/unmapped/C_sddaxwyk; + ARG 1 x + ARG 2 y + METHOD m_ogdredzm getStacks ()Ljava/util/List; + METHOD m_plfjjrel getHeight ()I + METHOD m_stcmggrk getInputCount ()I + METHOD m_uywbpkmo createPositioned (IILjava/util/List;)Lnet/minecraft/unmapped/C_euomljmv$C_yjgdhrsl; + ARG 0 width + ARG 1 height + ARG 2 stacks + METHOD m_xankaukl getMatcher ()Lnet/minecraft/unmapped/C_nyagoaau; + CLASS C_yjgdhrsl Positioned + FIELD f_azxqobux EMPTY Lnet/minecraft/unmapped/C_euomljmv$C_yjgdhrsl; diff --git a/mappings/net/minecraft/recipe/CuttingRecipe.mapping b/mappings/net/minecraft/recipe/CuttingRecipe.mapping index 7cb6d6d116..7c628fa572 100644 --- a/mappings/net/minecraft/recipe/CuttingRecipe.mapping +++ b/mappings/net/minecraft/recipe/CuttingRecipe.mapping @@ -10,6 +10,14 @@ CLASS net/minecraft/unmapped/C_ziizojwa net/minecraft/recipe/CuttingRecipe FIELD f_cvxfcxtq recipeFactory Lnet/minecraft/unmapped/C_ziizojwa$C_yunnfuov; FIELD f_oganfshl packetCodec Lnet/minecraft/unmapped/C_qsrmwluu; FIELD f_uewnlcpg codec Lcom/mojang/serialization/MapCodec; + METHOD m_ojkkvpce (Lnet/minecraft/unmapped/C_ziizojwa;)Lnet/minecraft/unmapped/C_sddaxwyk; + ARG 0 recipe + METHOD m_rpznfnko (Lnet/minecraft/unmapped/C_ziizojwa;)Ljava/lang/String; + ARG 0 recipe + METHOD m_sidsyhkb (Lnet/minecraft/unmapped/C_ziizojwa;)Ljava/lang/String; + ARG 0 recipe + METHOD m_xpchnssw (Lnet/minecraft/unmapped/C_ziizojwa;)Lnet/minecraft/unmapped/C_tcpsydrv; + ARG 0 recipe METHOD m_ylxrzgkw (Lnet/minecraft/unmapped/C_ziizojwa;)Lnet/minecraft/unmapped/C_sddaxwyk; ARG 0 recipe METHOD m_yxvmdgbx (Lnet/minecraft/unmapped/C_ziizojwa;)Lnet/minecraft/unmapped/C_tcpsydrv; diff --git a/mappings/net/minecraft/recipe/InputSlotFiller.mapping b/mappings/net/minecraft/recipe/InputSlotFiller.mapping index 55d78503b7..fb2863b386 100644 --- a/mappings/net/minecraft/recipe/InputSlotFiller.mapping +++ b/mappings/net/minecraft/recipe/InputSlotFiller.mapping @@ -2,9 +2,13 @@ CLASS net/minecraft/unmapped/C_rqdekljo net/minecraft/recipe/InputSlotFiller FIELD f_mmlmkitf inventory Lnet/minecraft/unmapped/C_sxzqocrm; FIELD f_mykbaanb handler Lnet/minecraft/unmapped/C_mugvwvfp; FIELD f_qrfjlbyk matcher Lnet/minecraft/unmapped/C_nyagoaau; + FIELD f_tqmjruaz MISSING_INDEX I METHOD (Lnet/minecraft/unmapped/C_mugvwvfp;)V ARG 1 handler METHOD m_eludjpso returnInputs ()V + METHOD m_mnhwpoca moveToSlot (Lnet/minecraft/unmapped/C_nhvqfffd;Lnet/minecraft/unmapped/C_sddaxwyk;I)I + ARG 1 slot + ARG 3 amount METHOD m_ohlssgdj getFreeInventorySlots ()I METHOD m_qwrqexeh getAmountToFill (ZIZ)I ARG 1 craftAll diff --git a/mappings/net/minecraft/recipe/MapExtendingRecipe.mapping b/mappings/net/minecraft/recipe/MapExtendingRecipe.mapping index f7392459b8..4a3983a7d3 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 findFilledMap (Lnet/minecraft/unmapped/C_euomljmv;)Lnet/minecraft/unmapped/C_sddaxwyk; + ARG 0 input diff --git a/mappings/net/minecraft/recipe/Recipe.mapping b/mappings/net/minecraft/recipe/Recipe.mapping index 3ba6f79151..7310baa5f9 100644 --- a/mappings/net/minecraft/recipe/Recipe.mapping +++ b/mappings/net/minecraft/recipe/Recipe.mapping @@ -20,6 +20,9 @@ CLASS net/minecraft/unmapped/C_awrmdwqd net/minecraft/recipe/Recipe COMMENT

COMMENT The returned stack should not be modified. To obtain the actual output, COMMENT call {@link #craft(Inventory, DynamicRegistryManager)}. + ARG 1 provider + METHOD m_jjsxdttb matches (Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_cdctfzbn;)Z + ARG 1 input METHOD m_njccjhdt getIngredients ()Lnet/minecraft/unmapped/C_rnrfftze; COMMENT {@return the ingredients accepted as inputs for this recipe} Used by the recipe book COMMENT when displaying a ghost form of this recipe on the crafting grid as well as for @@ -37,12 +40,16 @@ CLASS net/minecraft/unmapped/C_awrmdwqd net/minecraft/recipe/Recipe COMMENT the width of the input inventory ARG 2 height COMMENT the height of the input inventory + METHOD m_pyffiody getRemainder (Lnet/minecraft/unmapped/C_cxmcihwl;)Lnet/minecraft/unmapped/C_rnrfftze; + ARG 1 input METHOD m_qqucltqj showNotification ()Z COMMENT {@return whenever this recipe should show a toast notification on being unlocked or not} METHOD m_qzlhmcik isEmpty ()Z COMMENT {@return whether this recipe has no ingredient or has any empty ingredient} COMMENT The recipe book uses this to ignore recipes for display. METHOD m_tikgmnde craft (Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_sddaxwyk; + ARG 1 input + ARG 2 provider METHOD m_ttbvwfef getType ()Lnet/minecraft/unmapped/C_rhnqznys; COMMENT {@return the type of this recipe} COMMENT diff --git a/mappings/net/minecraft/recipe/RecipeCache.mapping b/mappings/net/minecraft/recipe/RecipeCache.mapping index b24ac3a676..c4d7a47eb0 100644 --- a/mappings/net/minecraft/recipe/RecipeCache.mapping +++ b/mappings/net/minecraft/recipe/RecipeCache.mapping @@ -3,6 +3,18 @@ CLASS net/minecraft/unmapped/C_edmnjlch net/minecraft/recipe/RecipeCache FIELD f_ziakvpmc recipeManager Ljava/lang/ref/WeakReference; METHOD (I)V ARG 1 size + METHOD m_cwdmboht getFirstMatch (Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_cdctfzbn;)Ljava/util/Optional; + ARG 1 input + METHOD m_gsxudlwe cache (Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_dscbrwbj;)V + ARG 1 input + ARG 2 recipe + METHOD m_lxnjadgw updateRecipeManager (Lnet/minecraft/unmapped/C_cdctfzbn;)V + METHOD m_qifbizlb moveToFront (I)V + ARG 1 i + METHOD m_tipfbwpi getFirstMatch (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_euomljmv;)Ljava/util/Optional; + ARG 2 input CLASS C_raahqxfc CachedRecipe FIELD f_sdhpultj recipe Lnet/minecraft/unmapped/C_dscbrwbj; METHOD m_nnriquoq recipe ()Lnet/minecraft/unmapped/C_dscbrwbj; + METHOD m_ocoodxth matches (Lnet/minecraft/unmapped/C_euomljmv;)Z + ARG 1 input diff --git a/mappings/net/minecraft/recipe/RecipeGridAligner.mapping b/mappings/net/minecraft/recipe/RecipeGridAligner.mapping index 5a60e69b49..84e74d0fc6 100644 --- a/mappings/net/minecraft/recipe/RecipeGridAligner.mapping +++ b/mappings/net/minecraft/recipe/RecipeGridAligner.mapping @@ -6,3 +6,9 @@ CLASS net/minecraft/unmapped/C_wuyfqgmj net/minecraft/recipe/RecipeGridAligner ARG 4 recipe ARG 5 inputs ARG 6 amount + METHOD m_vnshednj collectToInput (Ljava/lang/Object;IIII)V + ARG 1 itemId + ARG 2 iSlot + ARG 3 amount + ARG 4 x + ARG 5 y diff --git a/mappings/net/minecraft/recipe/RecipeInput.mapping b/mappings/net/minecraft/recipe/RecipeInput.mapping new file mode 100644 index 0000000000..1b1c0f4505 --- /dev/null +++ b/mappings/net/minecraft/recipe/RecipeInput.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/unmapped/C_cxmcihwl net/minecraft/recipe/RecipeInput + METHOD m_gptaeput getSize ()I + METHOD m_hhjzrppb get (I)Lnet/minecraft/unmapped/C_sddaxwyk; + ARG 1 i + METHOD m_wuqjkela isEmpty ()Z diff --git a/mappings/net/minecraft/recipe/RecipeManager.mapping b/mappings/net/minecraft/recipe/RecipeManager.mapping index de1466c1d4..0a0e717e85 100644 --- a/mappings/net/minecraft/recipe/RecipeManager.mapping +++ b/mappings/net/minecraft/recipe/RecipeManager.mapping @@ -2,9 +2,11 @@ CLASS net/minecraft/unmapped/C_hjseusrb net/minecraft/recipe/RecipeManager COMMENT A recipe manager allows easier use of recipes, such as finding matches and COMMENT remainders. It is also integrated with a recipe loader, which loads recipes COMMENT from data packs' JSON files. + FIELD f_cfijlewf lookupProvider Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig; FIELD f_hqaaykcp LOGGER Lorg/slf4j/Logger; - FIELD f_jrpzcqji recipeFlatMap Ljava/util/Map; + FIELD f_jrpzcqji recipes Ljava/util/Map; FIELD f_kwbdpvdv GSON Lcom/google/gson/Gson; + FIELD f_nkouqikk recipesByType Lcom/google/common/collect/Multimap; FIELD f_yehcypye errored Z COMMENT This isn't quite indicating an errored state; its value is only set to COMMENT {@code false} and is never {@code true}, and isn't used anywhere. @@ -18,6 +20,8 @@ CLASS net/minecraft/unmapped/C_hjseusrb net/minecraft/recipe/RecipeManager COMMENT @return the created list of recipes of the given {@code type} ARG 1 type COMMENT the desired recipe type + METHOD m_dqmahbpp (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_dscbrwbj;)Ljava/lang/String; + ARG 1 recipe METHOD m_dsxpcpxk get (Lnet/minecraft/unmapped/C_ncpywfca;)Ljava/util/Optional; COMMENT {@return a recipe with the given {@code id}, or empty if there is no such recipe} ARG 1 id @@ -36,9 +40,30 @@ CLASS net/minecraft/unmapped/C_hjseusrb net/minecraft/recipe/RecipeManager COMMENT the recipe's ID ARG 1 json COMMENT the recipe JSON + ARG 2 lookupProvider + METHOD m_hrukhdkd fetAllMatches (Lnet/minecraft/unmapped/C_rhnqznys;Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_cdctfzbn;)Ljava/util/List; + ARG 2 input + METHOD m_igyegyvq getFirstMatch (Lnet/minecraft/unmapped/C_rhnqznys;Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_dscbrwbj;)Ljava/util/Optional; + ARG 1 type + METHOD m_jgeojtch get (Lnet/minecraft/unmapped/C_rhnqznys;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_dscbrwbj; + ARG 1 type + ARG 2 id + METHOD m_jhsqhnru (Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_dscbrwbj;)Z + ARG 2 recipe + METHOD m_msetooyk (Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_dscbrwbj;)Z + ARG 2 recipe + METHOD m_mubfpsqe getSortedRecieps ()Ljava/util/Collection; + METHOD m_oegdnaun getFirstMatch (Lnet/minecraft/unmapped/C_rhnqznys;Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_ncpywfca;)Ljava/util/Optional; + ARG 1 type + ARG 2 input + ARG 4 id + METHOD m_omtmmszf getFirstMatch (Lnet/minecraft/unmapped/C_rhnqznys;Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_cdctfzbn;)Ljava/util/Optional; + ARG 1 type METHOD m_oqvxqpcm createCheck (Lnet/minecraft/unmapped/C_rhnqznys;)Lnet/minecraft/unmapped/C_hjseusrb$C_bvtkxdyi; ARG 0 type - METHOD m_tfsmuhjx keys ()Ljava/util/stream/Stream; + METHOD m_pgjmabyy getRemainder (Lnet/minecraft/unmapped/C_rhnqznys;Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_cdctfzbn;)Lnet/minecraft/unmapped/C_rnrfftze; + ARG 2 input + METHOD m_tfsmuhjx streamIds ()Ljava/util/stream/Stream; COMMENT {@return a stream of IDs of recipes in this manager} COMMENT

COMMENT The returned stream does not update after {@link #setRecipes(Iterable)} @@ -51,16 +76,18 @@ CLASS net/minecraft/unmapped/C_hjseusrb net/minecraft/recipe/RecipeManager COMMENT side recipes. ARG 1 recipes COMMENT the recipes to set - METHOD m_vrjdrstk values ()Ljava/util/Collection; + METHOD m_vrjdrstk getRecipes ()Ljava/util/Collection; COMMENT {@return all recipes in this manager} COMMENT COMMENT

The returned set does not update with the manager. Modifications to the - COMMENT returned set does not affect this manager. + COMMENT returned set do not affect this manager. METHOD m_xkivhqgi getAllOfType (Lnet/minecraft/unmapped/C_rhnqznys;)Ljava/util/Collection; ARG 1 type METHOD m_xyhfuata isErrored ()Z COMMENT {@return the {@link #errored} field} COMMENT This is unused in vanilla and will only return {@code false} without mods. CLASS C_bvtkxdyi CachedCheck + METHOD m_ltqsvwgf getFirstMatch (Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_cdctfzbn;)Ljava/util/Optional; + ARG 1 input CLASS C_ioxglbpe FIELD f_kspyemsz lastRecipe Lnet/minecraft/unmapped/C_ncpywfca; diff --git a/mappings/net/minecraft/recipe/RepairItemRecipe.mapping b/mappings/net/minecraft/recipe/RepairItemRecipe.mapping index 97f8896064..a2391eb500 100644 --- a/mappings/net/minecraft/recipe/RepairItemRecipe.mapping +++ b/mappings/net/minecraft/recipe/RepairItemRecipe.mapping @@ -1 +1,10 @@ CLASS net/minecraft/unmapped/C_oeuthbtr net/minecraft/recipe/RepairItemRecipe + METHOD m_qssibaeg (Lnet/minecraft/unmapped/C_qlclfxvn;Lnet/minecraft/unmapped/C_qlclfxvn;Lnet/minecraft/unmapped/C_qlclfxvn$C_vbojeisc;Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)V + ARG 3 enchantment + METHOD m_sywqdcal canCombine (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Z + ARG 0 left + ARG 1 right + 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 1 input diff --git a/mappings/net/minecraft/recipe/ShapedRecipe.mapping b/mappings/net/minecraft/recipe/ShapedRecipe.mapping index 88c6783993..0531ca593a 100644 --- a/mappings/net/minecraft/recipe/ShapedRecipe.mapping +++ b/mappings/net/minecraft/recipe/ShapedRecipe.mapping @@ -2,10 +2,12 @@ CLASS net/minecraft/unmapped/C_svdvbdmc net/minecraft/recipe/ShapedRecipe FIELD f_kluqlqus group Ljava/lang/String; FIELD f_lmfiwnld showNotification Z FIELD f_lvnwosug category Lnet/minecraft/unmapped/C_aodytokc; + FIELD f_ojflzowa pattern Lnet/minecraft/unmapped/C_vhpbjodz; FIELD f_vgraaxco result Lnet/minecraft/unmapped/C_sddaxwyk; METHOD (Ljava/lang/String;Lnet/minecraft/unmapped/C_aodytokc;Lnet/minecraft/unmapped/C_vhpbjodz;Lnet/minecraft/unmapped/C_sddaxwyk;)V ARG 1 group ARG 2 category + ARG 3 pattern ARG 4 result METHOD (Ljava/lang/String;Lnet/minecraft/unmapped/C_aodytokc;Lnet/minecraft/unmapped/C_vhpbjodz;Lnet/minecraft/unmapped/C_sddaxwyk;Z)V ARG 1 group @@ -22,6 +24,16 @@ CLASS net/minecraft/unmapped/C_svdvbdmc net/minecraft/recipe/ShapedRecipe FIELD f_ejfycfvl PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu; METHOD m_dasqedjj read (Lnet/minecraft/unmapped/C_bngyzsts;)Lnet/minecraft/unmapped/C_svdvbdmc; ARG 0 buf + METHOD m_jbkydnfi (Lnet/minecraft/unmapped/C_svdvbdmc;)Ljava/lang/String; + ARG 0 recipe METHOD m_mlmeipth write (Lnet/minecraft/unmapped/C_bngyzsts;Lnet/minecraft/unmapped/C_svdvbdmc;)V ARG 0 buf ARG 1 recipe + METHOD m_ncfcuvdc (Lnet/minecraft/unmapped/C_svdvbdmc;)Lnet/minecraft/unmapped/C_vhpbjodz; + ARG 0 recipe + METHOD m_sqpfeame (Lnet/minecraft/unmapped/C_svdvbdmc;)Lnet/minecraft/unmapped/C_sddaxwyk; + ARG 0 recipe + METHOD m_wgmkbqrn (Lnet/minecraft/unmapped/C_svdvbdmc;)Ljava/lang/Boolean; + ARG 0 recipe + METHOD m_yqnxzhlg (Lnet/minecraft/unmapped/C_svdvbdmc;)Lnet/minecraft/unmapped/C_aodytokc; + ARG 0 recipe diff --git a/mappings/net/minecraft/recipe/ShapedRecipePattern.mapping b/mappings/net/minecraft/recipe/ShapedRecipePattern.mapping new file mode 100644 index 0000000000..53dcd0c7f5 --- /dev/null +++ b/mappings/net/minecraft/recipe/ShapedRecipePattern.mapping @@ -0,0 +1,44 @@ +CLASS net/minecraft/unmapped/C_vhpbjodz net/minecraft/recipe/ShapedRecipePattern + FIELD f_apzcmivo data Ljava/util/Optional; + FIELD f_cgwpfjoc horizontallySymmetric Z + FIELD f_gmsboqxc height I + FIELD f_gxvszphf width I + FIELD f_mdscvoeu MAX_WIDTH_AND_HEIGHT I + FIELD f_tzzecmbw ingredientCount I + FIELD f_ywkjtxyf ingredients Lnet/minecraft/unmapped/C_rnrfftze; + METHOD m_anyzteha findLastSymbol (Ljava/lang/String;)I + ARG 0 row + METHOD m_eniuwjkw fromBuf (Lnet/minecraft/unmapped/C_bngyzsts;)Lnet/minecraft/unmapped/C_vhpbjodz; + ARG 0 buf + METHOD m_hlzmysnz toBuf (Lnet/minecraft/unmapped/C_bngyzsts;)V + ARG 1 buf + METHOD m_jlmohzhk getWidth ()I + METHOD m_jsmcdcdm (Lnet/minecraft/unmapped/C_bngyzsts;Lnet/minecraft/unmapped/C_tcpsydrv;)Lnet/minecraft/unmapped/C_tcpsydrv; + ARG 1 ingredient + METHOD m_jwyaufas getIngredients ()Lnet/minecraft/unmapped/C_rnrfftze; + METHOD m_mxwtbrsc matches (Lnet/minecraft/unmapped/C_euomljmv;)Z + METHOD m_ndnsmflz trim (Ljava/util/List;)[Ljava/lang/String; + ARG 0 pattern + METHOD m_nuggimzn findFirstSymbol (Ljava/lang/String;)I + ARG 0 row + METHOD m_pkvzapnv fromData (Lnet/minecraft/unmapped/C_vhpbjodz$C_gmjqzgur;)Lcom/mojang/serialization/DataResult; + ARG 0 data + METHOD m_rskvpukr matches (Lnet/minecraft/unmapped/C_euomljmv;Z)Z + ARG 1 input + ARG 2 hMirror + METHOD m_sdpqfess of (Ljava/util/Map;Ljava/util/List;)Lnet/minecraft/unmapped/C_vhpbjodz; + METHOD m_stiknasv of (Ljava/util/Map;[Ljava/lang/String;)Lnet/minecraft/unmapped/C_vhpbjodz; + ARG 1 pattern + METHOD m_tgsmprvg getHeight ()I + CLASS C_gmjqzgur Data + FIELD f_dhklrcof PATTERN_CODEC Lcom/mojang/serialization/Codec; + FIELD f_hxnkvfyf CODEC Lcom/mojang/serialization/MapCodec; + FIELD f_xbcyhauz KEY_SYMBOL_CODEC Lcom/mojang/serialization/Codec; + METHOD m_evegiiqi (Lnet/minecraft/unmapped/C_vhpbjodz$C_gmjqzgur;)Ljava/util/List; + ARG 0 data + METHOD m_fzwyaddf (Lnet/minecraft/unmapped/C_vhpbjodz$C_gmjqzgur;)Ljava/util/Map; + ARG 0 data + METHOD m_iyoobuws (Ljava/util/List;)Lcom/mojang/serialization/DataResult; + ARG 0 pattern + METHOD m_xgpnxrer (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 0 symbol diff --git a/mappings/net/minecraft/recipe/ShapelessRecipe.mapping b/mappings/net/minecraft/recipe/ShapelessRecipe.mapping index a787493d82..37844d9750 100644 --- a/mappings/net/minecraft/recipe/ShapelessRecipe.mapping +++ b/mappings/net/minecraft/recipe/ShapelessRecipe.mapping @@ -5,10 +5,22 @@ CLASS net/minecraft/unmapped/C_puwbbocg net/minecraft/recipe/ShapelessRecipe FIELD f_txygptwe ingredients Lnet/minecraft/unmapped/C_rnrfftze; CLASS C_hqmwzcuc Serializer FIELD f_hwkdivgf PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu; + METHOD m_agbsrbwc (Lnet/minecraft/unmapped/C_puwbbocg;)Lnet/minecraft/unmapped/C_aodytokc; + ARG 0 recipe + METHOD m_bejekvdx (Lnet/minecraft/unmapped/C_puwbbocg;)Lnet/minecraft/unmapped/C_rnrfftze; + ARG 0 recipe + METHOD m_dtpkswit (Ljava/util/List;)Lcom/mojang/serialization/DataResult; + ARG 0 ingredients METHOD m_fldqxxkq write (Lnet/minecraft/unmapped/C_bngyzsts;Lnet/minecraft/unmapped/C_puwbbocg;)V ARG 0 buf ARG 1 recipe METHOD m_hkjmusrb (Lnet/minecraft/unmapped/C_bngyzsts;Lnet/minecraft/unmapped/C_tcpsydrv;)Lnet/minecraft/unmapped/C_tcpsydrv; ARG 1 ingredient + METHOD m_igcxkhxu (Lnet/minecraft/unmapped/C_puwbbocg;)Ljava/lang/String; + ARG 0 recipe + METHOD m_tpozhphy (Lnet/minecraft/unmapped/C_puwbbocg;)Lnet/minecraft/unmapped/C_sddaxwyk; + ARG 0 recipe + METHOD m_xilhxmjt (Lnet/minecraft/unmapped/C_tcpsydrv;)Z + ARG 0 ingredient METHOD m_xreeioiz read (Lnet/minecraft/unmapped/C_bngyzsts;)Lnet/minecraft/unmapped/C_puwbbocg; ARG 0 buf diff --git a/mappings/net/minecraft/recipe/SingleRecipeInput.mapping b/mappings/net/minecraft/recipe/SingleRecipeInput.mapping new file mode 100644 index 0000000000..13062f9a77 --- /dev/null +++ b/mappings/net/minecraft/recipe/SingleRecipeInput.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/unmapped/C_hsoxiypb net/minecraft/recipe/SingleRecipeInput diff --git a/mappings/net/minecraft/recipe/SmithingRecipeInput.mapping b/mappings/net/minecraft/recipe/SmithingRecipeInput.mapping new file mode 100644 index 0000000000..78eab20eed --- /dev/null +++ b/mappings/net/minecraft/recipe/SmithingRecipeInput.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/unmapped/C_lirxnobg net/minecraft/recipe/SmithingRecipeInput diff --git a/mappings/net/minecraft/recipe/TransformSmithingRecipe.mapping b/mappings/net/minecraft/recipe/TransformSmithingRecipe.mapping index 6642391b97..38f7890f85 100644 --- a/mappings/net/minecraft/recipe/TransformSmithingRecipe.mapping +++ b/mappings/net/minecraft/recipe/TransformSmithingRecipe.mapping @@ -5,8 +5,16 @@ CLASS net/minecraft/unmapped/C_lsbkbfik net/minecraft/recipe/TransformSmithingRe FIELD f_ulhhviya result Lnet/minecraft/unmapped/C_sddaxwyk; CLASS C_nuqohuov Serializer FIELD f_tgnukpxe PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu; + METHOD m_lmgonrfg (Lnet/minecraft/unmapped/C_lsbkbfik;)Lnet/minecraft/unmapped/C_tcpsydrv; + ARG 0 recipe + METHOD m_lpcqnxjd (Lnet/minecraft/unmapped/C_lsbkbfik;)Lnet/minecraft/unmapped/C_tcpsydrv; + ARG 0 recipe METHOD m_neiqldgq write (Lnet/minecraft/unmapped/C_bngyzsts;Lnet/minecraft/unmapped/C_lsbkbfik;)V ARG 0 buf ARG 1 recipe + METHOD m_nkdenjpy (Lnet/minecraft/unmapped/C_lsbkbfik;)Lnet/minecraft/unmapped/C_tcpsydrv; + ARG 0 recipe METHOD m_oodtpafz read (Lnet/minecraft/unmapped/C_bngyzsts;)Lnet/minecraft/unmapped/C_lsbkbfik; ARG 0 buf + METHOD m_ysdknpkv (Lnet/minecraft/unmapped/C_lsbkbfik;)Lnet/minecraft/unmapped/C_sddaxwyk; + ARG 0 recipe diff --git a/mappings/net/minecraft/recipe/TrimSmithingRecipe.mapping b/mappings/net/minecraft/recipe/TrimSmithingRecipe.mapping index 79808df4d7..f5eb149bff 100644 --- a/mappings/net/minecraft/recipe/TrimSmithingRecipe.mapping +++ b/mappings/net/minecraft/recipe/TrimSmithingRecipe.mapping @@ -4,6 +4,12 @@ CLASS net/minecraft/unmapped/C_ngeyonui net/minecraft/recipe/TrimSmithingRecipe FIELD f_wnvjvqod base Lnet/minecraft/unmapped/C_tcpsydrv; CLASS C_whzzarxp Serializer FIELD f_xkkrzbdj PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu; + METHOD m_bzlovpfk (Lnet/minecraft/unmapped/C_ngeyonui;)Lnet/minecraft/unmapped/C_tcpsydrv; + ARG 0 recipe + METHOD m_ctuwmdqn (Lnet/minecraft/unmapped/C_ngeyonui;)Lnet/minecraft/unmapped/C_tcpsydrv; + ARG 0 recipe + METHOD m_iiwuohip (Lnet/minecraft/unmapped/C_ngeyonui;)Lnet/minecraft/unmapped/C_tcpsydrv; + ARG 0 recipe METHOD m_jllyhyrz write (Lnet/minecraft/unmapped/C_bngyzsts;Lnet/minecraft/unmapped/C_ngeyonui;)V ARG 0 buf ARG 1 recipe diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index 12119d3ca6..b4cf2a2559 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -57,6 +57,9 @@ CLASS net/minecraft/unmapped/C_lvarvugc net/minecraft/util/Util METHOD m_ewfqjfze make (Ljava/lang/Object;Ljava/util/function/Consumer;)Ljava/lang/Object; ARG 0 object ARG 1 initializer + METHOD m_eyzgphxu isHorizontallySymmetric (IILjava/util/List;)Z + ARG 0 width + ARG 1 height METHOD m_ffmggoki setBreakpointPauser (Ljava/util/function/Consumer;)V ARG 0 breakpointPauser METHOD m_fppetslt getJVMFlags ()Ljava/util/stream/Stream;