From a76c452f2b0fdc3f8a9cf88c4d548dc078904bad Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Fri, 27 Jan 2023 21:16:31 +1100 Subject: [PATCH] 23w04a stuff (#3464) * 23w04a stuff mostly smithing related * fix conflict * Add PalettedPermutationsAtlasSource * Update RecipeProvider.mapping * a few more missing things * Update mappings/net/minecraft/client/gui/screen/recipebook/RecipeResultCollection.mapping * Apply suggestions from code review * damnit * more --- .../gui/screen/ingame/CyclingSlotIcon.mapping | 24 ++++++++ .../gui/screen/ingame/ForgingScreen.mapping | 2 +- .../gui/screen/ingame/InventoryScreen.mapping | 5 ++ .../gui/screen/ingame/SmithingScreen.mapping | 18 ++++++ .../recipebook/RecipeResultCollection.mapping | 7 +++ .../ModelPredicateProviderRegistry.mapping | 10 ++++ .../recipebook/ClientRecipeBook.mapping | 5 ++ .../render/TexturedRenderLayers.mapping | 3 + .../entity/EntityRendererFactory.mapping | 1 + .../feature/ArmorFeatureRenderer.mapping | 15 +++++ .../client/render/item/ItemRenderer.mapping | 24 ++++++++ .../client/texture/atlas/AtlasSource.mapping | 3 +- .../PalettedPermutationsAtlasSource.mapping | 11 ++++ .../data/client/ItemModelGenerator.mapping | 23 ++++++++ .../net/minecraft/data/client/Model.mapping | 17 ++++++ .../net/minecraft/data/client/Models.mapping | 1 + .../minecraft/data/client/TextureMap.mapping | 3 + .../AdvancementTabGenerator.mapping | 2 + ...tyHusbandryTabAdvancementGenerator.mapping | 1 + ...aHusbandryTabAdvancementGenerator.mapping} | 13 ++++- .../loottable/ChestLootTableGenerator.mapping | 1 - .../EntityLootTableGenerator.mapping | 5 ++ .../OneTwentyChestLootTableGenerator.mapping | 1 + .../OneTwentyEntityLootTableGenerator.mapping | 1 + ...OneTwentyFishingLootTableGenerator.mapping | 1 + .../VanillaChestLootTableGenerator.mapping | 17 ++++++ .../VanillaEntityLootTableGenerator.mapping | 1 + ... VanillaFishingLootTableGenerator.mapping} | 3 +- ...> LegacySmithingRecipeJsonBuilder.mapping} | 2 +- .../data/server/recipe/RecipeProvider.mapping | 16 +++++ ...SmithingTransformRecipeJsonBuilder.mapping | 6 +- .../SmithingTrimRecipeJsonBuilder.mapping | 6 +- .../entity/AreaEffectCloudEntity.mapping | 1 - .../net/minecraft/entity/TntEntity.mapping | 1 - .../entity/mob/EvokerFangsEntity.mapping | 1 - .../minecraft/entity/mob/VexEntity.mapping | 1 - mappings/net/minecraft/item/ArmorItem.mapping | 16 ++--- .../net/minecraft/item/ArmorMaterial.mapping | 6 +- .../item/SmithingTemplateItem.mapping | 58 +++++++++++++++++++ .../net/minecraft/item/trim/ArmorTrim.mapping | 6 +- .../item/trim/ArmorTrimMaterial.mapping | 2 +- .../item/trim/ArmorTrimMaterials.mapping | 8 +-- .../item/trim/ArmorTrimPattern.mapping | 2 +- .../item/trim/ArmorTrimPatterns.mapping | 8 +-- .../minecraft/recipe/RecipeManager.mapping | 2 + .../recipe/SmithingTrimRecipe.mapping | 4 +- .../screen/ForgingScreenHandler.mapping | 22 +++---- .../LegacySmithingScreenHandler.mapping | 14 ++++- .../screen/ScreenHandlerType.mapping | 6 ++ .../ForgingSlotsManager.mapping} | 20 ++++--- .../command/SpawnArmorTrimsCommand.mapping | 12 +++- 51 files changed, 371 insertions(+), 67 deletions(-) create mode 100644 mappings/net/minecraft/client/gui/screen/ingame/CyclingSlotIcon.mapping create mode 100644 mappings/net/minecraft/client/texture/atlas/PalettedPermutationsAtlasSource.mapping create mode 100644 mappings/net/minecraft/data/server/advancement/OneTwentyHusbandryTabAdvancementGenerator.mapping rename mappings/net/minecraft/data/server/advancement/{HusbandryTabAdvancementGenerator.mapping => VanillaHusbandryTabAdvancementGenerator.mapping} (79%) delete mode 100644 mappings/net/minecraft/data/server/loottable/ChestLootTableGenerator.mapping create mode 100644 mappings/net/minecraft/data/server/loottable/OneTwentyChestLootTableGenerator.mapping create mode 100644 mappings/net/minecraft/data/server/loottable/OneTwentyEntityLootTableGenerator.mapping create mode 100644 mappings/net/minecraft/data/server/loottable/OneTwentyFishingLootTableGenerator.mapping create mode 100644 mappings/net/minecraft/data/server/loottable/VanillaChestLootTableGenerator.mapping rename mappings/net/minecraft/data/server/loottable/{FishingLootTableGenerator.mapping => VanillaFishingLootTableGenerator.mapping} (72%) rename mappings/net/minecraft/data/server/recipe/{SmithingRecipeJsonBuilder.mapping => LegacySmithingRecipeJsonBuilder.mapping} (98%) create mode 100644 mappings/net/minecraft/item/SmithingTemplateItem.mapping rename mappings/net/minecraft/screen/{ForgingScreenSlots.mapping => slot/ForgingSlotsManager.mapping} (67%) diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CyclingSlotIcon.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CyclingSlotIcon.mapping new file mode 100644 index 0000000000..16334f2c87 --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/ingame/CyclingSlotIcon.mapping @@ -0,0 +1,24 @@ +CLASS net/minecraft/class_8064 net/minecraft/client/gui/screen/ingame/CyclingSlotIcon + FIELD field_42042 slotId I + FIELD field_42043 textures Ljava/util/List; + FIELD field_42044 timer I + FIELD field_42045 currentIndex I + METHOD (I)V + ARG 1 slotId + METHOD method_48468 computeAlpha (F)F + ARG 1 delta + METHOD method_48469 render (Lnet/minecraft/class_1703;Lnet/minecraft/class_4587;FII)V + ARG 1 screenHandler + ARG 2 matrices + ARG 3 delta + ARG 4 x + ARG 5 y + METHOD method_48470 drawIcon (Lnet/minecraft/class_1735;Lnet/minecraft/class_2960;FLnet/minecraft/class_4587;II)V + ARG 1 slot + ARG 2 texture + ARG 3 alpha + ARG 4 matrices + ARG 5 x + ARG 6 y + METHOD method_48471 updateTexture (Ljava/util/List;)V + ARG 1 textures diff --git a/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping index 2df8e2e0e6..9e48ea9f5e 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_4894 net/minecraft/client/gui/screen/ingame/ForgingScr ARG 3 mouseY ARG 4 delta METHOD method_25445 setup ()V - METHOD method_48467 drawCrossedArrow (Lnet/minecraft/class_4587;II)V + METHOD method_48467 drawInvalidRecipeArrow (Lnet/minecraft/class_4587;II)V ARG 1 matrices ARG 2 x ARG 3 y diff --git a/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping index f88ee20689..bec02cb5d5 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping @@ -17,3 +17,8 @@ CLASS net/minecraft/class_490 net/minecraft/client/gui/screen/ingame/InventorySc ARG 3 mouseX ARG 4 mouseY ARG 5 entity + METHOD method_48472 drawEntity (IIILorg/joml/Quaternionf;Lorg/joml/Quaternionf;Lnet/minecraft/class_1309;)V + ARG 0 x + ARG 1 y + ARG 2 size + ARG 5 entity diff --git a/mappings/net/minecraft/client/gui/screen/ingame/SmithingScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/SmithingScreen.mapping index d9c7462422..7cae90a737 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/SmithingScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/SmithingScreen.mapping @@ -1,6 +1,24 @@ CLASS net/minecraft/class_4895 net/minecraft/client/gui/screen/ingame/SmithingScreen FIELD field_22795 TEXTURE Lnet/minecraft/class_2960; + FIELD field_42048 ARMOR_STAND_ROTATION Lorg/joml/Quaternionf; + FIELD field_42052 EMPTY_SLOT_SMITHING_TEMPLATE_ARMOR_TRIM_TEXTURE Lnet/minecraft/class_2960; + FIELD field_42053 EMPTY_SLOT_SMITHING_TEMPLATE_NETHERITE_UPGRADE_TEXTURE Lnet/minecraft/class_2960; + FIELD field_42054 MISSING_TEMPLATE_TOOLTIP Lnet/minecraft/class_2561; + FIELD field_42055 ERROR_TOOLTIP Lnet/minecraft/class_2561; + FIELD field_42056 EMPTY_SLOT_TEXTURES Ljava/util/List; + FIELD field_42064 templateSlotIcon Lnet/minecraft/class_8064; + FIELD field_42065 baseSlotIcon Lnet/minecraft/class_8064; + FIELD field_42066 additionsSlotIcon Lnet/minecraft/class_8064; + FIELD field_42067 armorStand Lnet/minecraft/class_1531; METHOD (Lnet/minecraft/class_4862;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V ARG 1 handler ARG 2 playerInventory ARG 3 title + METHOD method_48473 getSmithingTemplate ()Ljava/util/Optional; + METHOD method_48474 hasInvalidRecipe ()Z + METHOD method_48475 (Lnet/minecraft/class_4587;IILnet/minecraft/class_2561;)V + ARG 4 text + METHOD method_48476 renderSlotTooltip (Lnet/minecraft/class_4587;II)V + ARG 1 matrices + ARG 2 mouseX + ARG 3 mouseY diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeResultCollection.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeResultCollection.mapping index db571a4655..f2e27c6453 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeResultCollection.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeResultCollection.mapping @@ -4,6 +4,10 @@ CLASS net/minecraft/class_516 net/minecraft/client/gui/screen/recipebook/RecipeR FIELD field_3146 craftableRecipes Ljava/util/Set; FIELD field_3147 unlockedRecipes Ljava/util/Set; FIELD field_3148 singleOutput Z + FIELD field_42069 registryManager Lnet/minecraft/class_5455; + METHOD (Lnet/minecraft/class_5455;Ljava/util/List;)V + ARG 1 registryManager + ARG 2 recipes METHOD method_2647 initialize (Lnet/minecraft/class_3439;)V ARG 1 recipeBook METHOD method_2648 getRecipes (Z)Ljava/util/List; @@ -23,3 +27,6 @@ CLASS net/minecraft/class_516 net/minecraft/client/gui/screen/recipebook/RecipeR METHOD method_2656 hasSingleOutput ()Z METHOD method_2657 hasFittingRecipes ()Z METHOD method_30295 shouldHaveSingleOutput (Lnet/minecraft/class_5455;Ljava/util/List;)Z + ARG 0 registryManager + ARG 1 recipes + METHOD method_48479 getRegistryManager ()Lnet/minecraft/class_5455; diff --git a/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping b/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping index 3377d1ba1b..708d38ce18 100644 --- a/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping +++ b/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping @@ -113,6 +113,16 @@ CLASS net/minecraft/class_5272 net/minecraft/client/item/ModelPredicateProviderR ARG 0 world ARG 1 stack ARG 2 entity + METHOD method_43611 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F + ARG 0 stack + ARG 1 world + ARG 2 entity + ARG 3 seed + METHOD method_48484 (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;I)F + ARG 0 stack + ARG 1 world + ARG 2 entity + ARG 3 seed CLASS 1 FIELD field_7910 step D FIELD field_7911 time D diff --git a/mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping b/mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping index cba1046a4f..6f497e8bf9 100644 --- a/mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping +++ b/mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping @@ -9,6 +9,9 @@ CLASS net/minecraft/class_299 net/minecraft/client/recipebook/ClientRecipeBook ARG 0 recipe METHOD method_1401 reload (Ljava/lang/Iterable;Lnet/minecraft/class_5455;)V ARG 1 recipes + ARG 2 registryManager + METHOD method_30279 (Ljava/util/Map;Lnet/minecraft/class_5455;Lcom/google/common/collect/ImmutableList$Builder;Lnet/minecraft/class_314;Ljava/util/List;)V + ARG 3 recipeBookGroup METHOD method_30280 (Ljava/util/Map;Lnet/minecraft/class_314;)Ljava/util/stream/Stream; ARG 1 searchGroup METHOD method_30281 (Ljava/util/Map;Lnet/minecraft/class_314;Ljava/util/List;)V @@ -20,3 +23,5 @@ CLASS net/minecraft/class_299 net/minecraft/client/recipebook/ClientRecipeBook ARG 0 recipes METHOD method_30284 (Lnet/minecraft/class_314;)Ljava/util/List; ARG 0 group + METHOD method_48464 (Lnet/minecraft/class_5455;Ljava/util/List;)Lnet/minecraft/class_516; + ARG 1 recipes diff --git a/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping b/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping index a414470504..91a487e723 100644 --- a/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping +++ b/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping @@ -22,6 +22,8 @@ CLASS net/minecraft/class_4722 net/minecraft/client/render/TexturedRenderLayers FIELD field_28252 BANNER_PATTERN_TEXTURES Ljava/util/Map; FIELD field_28253 SHIELD_PATTERN_TEXTURES Ljava/util/Map; FIELD field_40515 HANGING_SIGN_TYPE_TEXTURES Ljava/util/Map; + FIELD field_42070 ARMOR_TRIMS_RENDER_LAYER Lnet/minecraft/class_1921; + FIELD field_42071 ARMOR_TRIMS_ATLAS_TEXTURE Lnet/minecraft/class_2960; METHOD method_24059 getBannerPatterns ()Lnet/minecraft/class_1921; METHOD method_24061 (Lnet/minecraft/class_1767;)Lnet/minecraft/class_4730; ARG 0 color @@ -66,3 +68,4 @@ CLASS net/minecraft/class_4722 net/minecraft/client/render/TexturedRenderLayers METHOD method_45782 createHangingSignTextureId (Lnet/minecraft/class_4719;)Lnet/minecraft/class_4730; ARG 0 type METHOD method_45783 getHangingSign ()Lnet/minecraft/class_1921; + METHOD method_48480 getArmorTrims ()Lnet/minecraft/class_1921; diff --git a/mappings/net/minecraft/client/render/entity/EntityRendererFactory.mapping b/mappings/net/minecraft/client/render/entity/EntityRendererFactory.mapping index dac270b1bd..169519206a 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRendererFactory.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRendererFactory.mapping @@ -26,3 +26,4 @@ CLASS net/minecraft/class_5617 net/minecraft/client/render/entity/EntityRenderer METHOD method_32171 getTextRenderer ()Lnet/minecraft/class_327; METHOD method_43337 getBlockRenderManager ()Lnet/minecraft/class_776; METHOD method_43338 getHeldItemRenderer ()Lnet/minecraft/class_759; + METHOD method_48481 getModelManager ()Lnet/minecraft/class_1092; diff --git a/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping index fe954549f0..6827085e63 100644 --- a/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_970 net/minecraft/client/render/entity/feature/ArmorFeatureRenderer + FIELD field_42074 armorTrimsAtlas Lnet/minecraft/class_1059; FIELD field_4829 ARMOR_TEXTURE_CACHE Ljava/util/Map; FIELD field_4830 innerModel Lnet/minecraft/class_572; FIELD field_4831 outerModel Lnet/minecraft/class_572; @@ -6,6 +7,7 @@ CLASS net/minecraft/class_970 net/minecraft/client/render/entity/feature/ArmorFe ARG 1 context ARG 2 innerModel ARG 3 outerModel + ARG 4 bakery METHOD method_23192 renderArmorParts (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1738;ZLnet/minecraft/class_572;ZFFFLjava/lang/String;)V ARG 1 matrices ARG 2 vertexConsumers @@ -36,3 +38,16 @@ CLASS net/minecraft/class_970 net/minecraft/client/render/entity/feature/ArmorFe ARG 1 item ARG 2 secondLayer ARG 3 overlay + METHOD method_48482 renderTrim (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_8053;ZLnet/minecraft/class_572;ZFFF)V + ARG 1 matrices + ARG 2 vertexConsumers + ARG 3 light + ARG 4 trim + ARG 5 glint + ARG 6 model + ARG 7 secondTextureLayer + ARG 8 red + ARG 9 green + ARG 10 blue + METHOD method_48483 (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IZLnet/minecraft/class_572;ZLnet/minecraft/class_8053;)V + ARG 7 trim diff --git a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping index 19f7ebf2e3..b34fba75bf 100644 --- a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping @@ -7,11 +7,18 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer FIELD field_40531 SPYGLASS_IN_HAND Lnet/minecraft/class_1091; FIELD field_40532 TRIDENT Lnet/minecraft/class_1091; FIELD field_40533 SPYGLASS Lnet/minecraft/class_1091; + FIELD field_42073 client Lnet/minecraft/class_310; FIELD field_4728 WITHOUT_MODELS Ljava/util/Set; FIELD field_4729 textureManager Lnet/minecraft/class_1060; FIELD field_4730 zOffset F FIELD field_4732 models Lnet/minecraft/class_763; FIELD field_4733 colors Lnet/minecraft/class_325; + METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_1060;Lnet/minecraft/class_1092;Lnet/minecraft/class_325;Lnet/minecraft/class_756;)V + ARG 1 client + ARG 2 manager + ARG 3 bakery + ARG 4 colors + ARG 5 builtinModelItemRenderer METHOD method_23177 renderItem (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;Lnet/minecraft/class_809$class_811;ZLnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1937;III)V ARG 1 entity ARG 2 item @@ -30,6 +37,8 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer ARG 4 overlay ARG 5 matrices ARG 6 vertexConsumers + ARG 7 world + ARG 8 seed METHOD method_23179 renderItem (Lnet/minecraft/class_1799;Lnet/minecraft/class_809$class_811;ZLnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_1087;)V ARG 1 stack ARG 2 renderMode @@ -74,6 +83,7 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer ARG 3 glint METHOD method_27953 renderInGui (Lnet/minecraft/class_1799;II)V COMMENT Renders an item in a GUI without an attached entity. + ARG 1 stack ARG 2 x ARG 3 y METHOD method_29711 getDirectItemGlintConsumer (Lnet/minecraft/class_4597;Lnet/minecraft/class_1921;ZZ)Lnet/minecraft/class_4588; @@ -90,16 +100,23 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer ARG 1 layer ARG 2 entry METHOD method_32797 renderInGuiWithOverrides (Lnet/minecraft/class_1799;III)V + ARG 1 stack ARG 2 x ARG 3 y ARG 4 seed METHOD method_36542 renderInGuiWithOverrides (Lnet/minecraft/class_1799;IIII)V + ARG 1 stack ARG 2 x ARG 3 y ARG 4 seed ARG 5 depth METHOD method_36543 innerRenderInGui (Lnet/minecraft/class_1309;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;III)V ARG 1 entity + ARG 2 world + ARG 3 stack + ARG 4 x + ARG 5 y + ARG 6 seed METHOD method_4010 renderGuiItemIcon (Lnet/minecraft/class_1799;II)V ARG 1 stack ARG 2 x @@ -126,6 +143,7 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer METHOD method_4023 renderInGuiWithOverrides (Lnet/minecraft/class_1799;II)V COMMENT Renders an item in a GUI with the player as the attached entity COMMENT for calculating model overrides. + ARG 1 stack ARG 2 x ARG 3 y METHOD method_4025 renderGuiItemOverlay (Lnet/minecraft/class_327;Lnet/minecraft/class_1799;II)V @@ -136,3 +154,9 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer ARG 4 y METHOD method_4026 innerRenderInGui (Lnet/minecraft/class_1309;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;IIII)V ARG 1 entity + ARG 2 world + ARG 3 stack + ARG 4 x + ARG 5 y + ARG 6 seed + ARG 7 depth diff --git a/mappings/net/minecraft/client/texture/atlas/AtlasSource.mapping b/mappings/net/minecraft/client/texture/atlas/AtlasSource.mapping index 43a75b405f..c4f1ad2570 100644 --- a/mappings/net/minecraft/client/texture/atlas/AtlasSource.mapping +++ b/mappings/net/minecraft/client/texture/atlas/AtlasSource.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_7948 net/minecraft/client/texture/atlas/AtlasSource + FIELD field_42075 RESOURCE_FINDER Lnet/minecraft/class_7654; METHOD method_47672 getType ()Lnet/minecraft/class_7951; METHOD method_47673 load (Lnet/minecraft/class_3300;Lnet/minecraft/class_7948$class_7949;)V ARG 1 resourceManager @@ -7,7 +8,7 @@ CLASS net/minecraft/class_7948 net/minecraft/client/texture/atlas/AtlasSource METHOD method_47670 add (Lnet/minecraft/class_2960;Lnet/minecraft/class_7948$class_7950;)V ARG 1 arg ARG 2 region - METHOD method_47671 (Ljava/util/function/Predicate;)V + METHOD method_47671 removeIf (Ljava/util/function/Predicate;)V ARG 1 predicate METHOD method_47674 add (Lnet/minecraft/class_2960;Lnet/minecraft/class_3298;)V ARG 1 id diff --git a/mappings/net/minecraft/client/texture/atlas/PalettedPermutationsAtlasSource.mapping b/mappings/net/minecraft/client/texture/atlas/PalettedPermutationsAtlasSource.mapping new file mode 100644 index 0000000000..dcccd35f93 --- /dev/null +++ b/mappings/net/minecraft/client/texture/atlas/PalettedPermutationsAtlasSource.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_8066 net/minecraft/client/texture/atlas/PalettedPermutationsAtlasSource + FIELD field_42077 CODEC Lcom/mojang/serialization/Codec; + FIELD field_42078 LOGGER Lorg/slf4j/Logger; + FIELD field_42079 textures Ljava/util/List; + FIELD field_42080 permutations Ljava/util/Map; + FIELD field_42081 paletteKey Lnet/minecraft/class_2960; + METHOD (Ljava/util/List;Lnet/minecraft/class_2960;Ljava/util/Map;)V + ARG 1 textures + ARG 2 paletteKey + ARG 3 permutations + CLASS class_8067 PalettedSpriteRegion diff --git a/mappings/net/minecraft/data/client/ItemModelGenerator.mapping b/mappings/net/minecraft/data/client/ItemModelGenerator.mapping index 8817b9db4a..4b1cdb6543 100644 --- a/mappings/net/minecraft/data/client/ItemModelGenerator.mapping +++ b/mappings/net/minecraft/data/client/ItemModelGenerator.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_4915 net/minecraft/data/client/ItemModelGenerator FIELD field_22844 writer Ljava/util/function/BiConsumer; + FIELD field_42086 TRIM_TYPE Lnet/minecraft/class_2960; + FIELD field_42087 TRIM_MATERIALS Ljava/util/List; METHOD (Ljava/util/function/BiConsumer;)V ARG 1 writer METHOD method_25731 register ()V @@ -18,3 +20,24 @@ CLASS net/minecraft/class_4915 net/minecraft/data/client/ItemModelGenerator ARG 1 compass METHOD method_43229 registerClock (Lnet/minecraft/class_1792;)V ARG 1 clock + METHOD method_48517 uploadArmor (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)V + ARG 1 id + ARG 2 layer0 + ARG 3 layer1 + METHOD method_48518 suffixTrim (Lnet/minecraft/class_2960;Ljava/lang/String;)Lnet/minecraft/class_2960; + ARG 1 id + ARG 2 trimMaterialName + METHOD method_48519 createArmorJson (Lnet/minecraft/class_2960;Ljava/util/Map;Ljava/util/List;)Lcom/google/gson/JsonObject; + ARG 1 id + ARG 2 textures + ARG 3 trimMaterials + METHOD method_48520 getCompatibleTrimMaterials (Lnet/minecraft/class_1738;)Ljava/util/List; + ARG 1 armor + METHOD method_48521 (Lnet/minecraft/class_1738;Lnet/minecraft/class_4915$class_8072;)Z + ARG 1 material + METHOD method_48522 (Ljava/util/List;Lnet/minecraft/class_2960;Ljava/util/Map;)Lcom/google/gson/JsonObject; + ARG 2 id + ARG 3 textures + METHOD method_48523 registerArmor (Lnet/minecraft/class_1738;)V + ARG 1 armor + CLASS class_8072 TrimMaterial diff --git a/mappings/net/minecraft/data/client/Model.mapping b/mappings/net/minecraft/data/client/Model.mapping index 86e9a742cc..97a0162c66 100644 --- a/mappings/net/minecraft/data/client/Model.mapping +++ b/mappings/net/minecraft/data/client/Model.mapping @@ -18,9 +18,26 @@ CLASS net/minecraft/class_4942 net/minecraft/data/client/Model METHOD method_25850 createTextureMap (Lnet/minecraft/class_4944;)Ljava/util/Map; ARG 1 textures METHOD method_25852 upload (Lnet/minecraft/class_2960;Lnet/minecraft/class_4944;Ljava/util/function/BiConsumer;)Lnet/minecraft/class_2960; + ARG 1 id + ARG 2 textures ARG 3 modelCollector METHOD method_25853 uploadWithoutVariant (Lnet/minecraft/class_2248;Ljava/lang/String;Lnet/minecraft/class_4944;Ljava/util/function/BiConsumer;)Lnet/minecraft/class_2960; ARG 1 block ARG 2 suffix ARG 3 textures ARG 4 modelCollector + METHOD method_48524 createJson (Lnet/minecraft/class_2960;Ljava/util/Map;)Lcom/google/gson/JsonObject; + ARG 1 id + ARG 2 textures + METHOD method_48525 upload (Lnet/minecraft/class_2960;Lnet/minecraft/class_4944;Ljava/util/function/BiConsumer;Lnet/minecraft/class_4942$class_8073;)Lnet/minecraft/class_2960; + ARG 1 id + ARG 2 textures + ARG 3 modelCollector + ARG 4 jsonFactory + METHOD method_48527 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_4945;Lnet/minecraft/class_2960;)V + ARG 1 textureKey + ARG 2 texture + CLASS class_8073 JsonFactory + METHOD create (Lnet/minecraft/class_2960;Ljava/util/Map;)Lcom/google/gson/JsonObject; + ARG 1 id + ARG 2 textures diff --git a/mappings/net/minecraft/data/client/Models.mapping b/mappings/net/minecraft/data/client/Models.mapping index 15d878b479..bbc34ad4f0 100644 --- a/mappings/net/minecraft/data/client/Models.mapping +++ b/mappings/net/minecraft/data/client/Models.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_4943 net/minecraft/data/client/Models FIELD field_22908 PARTICLE Lnet/minecraft/class_4942; FIELD field_22958 STEM_GROWTH_STAGES [Lnet/minecraft/class_4942; + FIELD field_42088 ARMOR Lnet/minecraft/class_4942; METHOD method_25855 block (Ljava/lang/String;Ljava/lang/String;[Lnet/minecraft/class_4945;)Lnet/minecraft/class_4942; ARG 0 parent ARG 1 variant diff --git a/mappings/net/minecraft/data/client/TextureMap.mapping b/mappings/net/minecraft/data/client/TextureMap.mapping index 6260432fad..713a337b11 100644 --- a/mappings/net/minecraft/data/client/TextureMap.mapping +++ b/mappings/net/minecraft/data/client/TextureMap.mapping @@ -145,3 +145,6 @@ CLASS net/minecraft/class_4944 net/minecraft/data/client/TextureMap ARG 0 block METHOD method_46201 textureParticle (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; ARG 0 block + METHOD method_48529 layered (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944; + ARG 0 layer0 + ARG 1 layer1 diff --git a/mappings/net/minecraft/data/server/advancement/AdvancementTabGenerator.mapping b/mappings/net/minecraft/data/server/advancement/AdvancementTabGenerator.mapping index e233a5b3bf..77d33f6504 100644 --- a/mappings/net/minecraft/data/server/advancement/AdvancementTabGenerator.mapping +++ b/mappings/net/minecraft/data/server/advancement/AdvancementTabGenerator.mapping @@ -2,3 +2,5 @@ CLASS net/minecraft/class_7785 net/minecraft/data/server/advancement/Advancement METHOD method_10335 accept (Lnet/minecraft/class_7225$class_7874;Ljava/util/function/Consumer;)V ARG 1 lookup ARG 2 exporter + METHOD method_48496 createEmptyAdvancement (Ljava/lang/String;)Lnet/minecraft/class_161; + ARG 0 id diff --git a/mappings/net/minecraft/data/server/advancement/OneTwentyHusbandryTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/advancement/OneTwentyHusbandryTabAdvancementGenerator.mapping new file mode 100644 index 0000000000..e599a8e7dc --- /dev/null +++ b/mappings/net/minecraft/data/server/advancement/OneTwentyHusbandryTabAdvancementGenerator.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8068 net/minecraft/data/server/advancement/OneTwentyHusbandryTabAdvancementGenerator diff --git a/mappings/net/minecraft/data/server/advancement/HusbandryTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/advancement/VanillaHusbandryTabAdvancementGenerator.mapping similarity index 79% rename from mappings/net/minecraft/data/server/advancement/HusbandryTabAdvancementGenerator.mapping rename to mappings/net/minecraft/data/server/advancement/VanillaHusbandryTabAdvancementGenerator.mapping index 9745c3b011..7564fdc0e3 100644 --- a/mappings/net/minecraft/data/server/advancement/HusbandryTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/server/advancement/VanillaHusbandryTabAdvancementGenerator.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2414 net/minecraft/data/server/advancement/HusbandryTabAdvancementGenerator +CLASS net/minecraft/class_2414 net/minecraft/data/server/advancement/VanillaHusbandryTabAdvancementGenerator FIELD field_11295 FISH_ITEMS [Lnet/minecraft/class_1792; FIELD field_11296 BREEDABLE_ANIMALS Ljava/util/List; FIELD field_11297 FISH_BUCKET_ITEMS [Lnet/minecraft/class_1792; @@ -12,6 +12,9 @@ CLASS net/minecraft/class_2414 net/minecraft/data/server/advancement/HusbandryTa METHOD method_10341 requireFoodItemsEaten (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; ARG 1 builder METHOD method_10342 requireListedAnimalsBred (Lnet/minecraft/class_161$class_162;Ljava/util/stream/Stream;Ljava/util/stream/Stream;)Lnet/minecraft/class_161$class_162; + ARG 0 advancementBuilder + ARG 1 breedableAnimals + ARG 2 eggLayingAnimals METHOD method_16118 requireAllCatsTamed (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; ARG 1 builder METHOD method_43362 requireAllFrogsOnLeads (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; @@ -19,3 +22,11 @@ CLASS net/minecraft/class_2414 net/minecraft/data/server/advancement/HusbandryTa METHOD method_43363 (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_6880$class_6883;)V ARG 1 variant METHOD method_47810 createBreedAllAnimalsAdvancement (Lnet/minecraft/class_161;Ljava/util/function/Consumer;Ljava/util/stream/Stream;Ljava/util/stream/Stream;)Lnet/minecraft/class_161; + ARG 0 parent + ARG 1 exporter + ARG 2 breedableAnimals + ARG 3 eggLayingAnimals + METHOD method_48497 (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_1299;)V + ARG 1 type + METHOD method_48498 (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_1299;)V + ARG 1 type diff --git a/mappings/net/minecraft/data/server/loottable/ChestLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/ChestLootTableGenerator.mapping deleted file mode 100644 index df5d8457ba..0000000000 --- a/mappings/net/minecraft/data/server/loottable/ChestLootTableGenerator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_2432 net/minecraft/data/server/loottable/ChestLootTableGenerator diff --git a/mappings/net/minecraft/data/server/loottable/EntityLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/EntityLootTableGenerator.mapping index e62f02b92b..9ea5c25ef7 100644 --- a/mappings/net/minecraft/data/server/loottable/EntityLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/loottable/EntityLootTableGenerator.mapping @@ -2,8 +2,13 @@ CLASS net/minecraft/class_7789 net/minecraft/data/server/loottable/EntityLootTab FIELD field_40612 NEEDS_ENTITY_ON_FIRE Lnet/minecraft/class_2048$class_2049; FIELD field_40613 ENTITY_TYPES_IN_MISC_GROUP_TO_CHECK Ljava/util/Set; FIELD field_40615 lootTables Ljava/util/Map; + FIELD field_42084 requiredFeatures Lnet/minecraft/class_7699; + FIELD field_42085 featureSet Lnet/minecraft/class_7699; METHOD (Lnet/minecraft/class_7699;)V ARG 1 requiredFeatures + METHOD (Lnet/minecraft/class_7699;Lnet/minecraft/class_7699;)V + ARG 1 requiredFeatures + ARG 2 featureSet METHOD method_10400 generate ()V METHOD method_46027 shouldCheck (Lnet/minecraft/class_1299;)Z ARG 0 entityType diff --git a/mappings/net/minecraft/data/server/loottable/OneTwentyChestLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/OneTwentyChestLootTableGenerator.mapping new file mode 100644 index 0000000000..1c7e96529a --- /dev/null +++ b/mappings/net/minecraft/data/server/loottable/OneTwentyChestLootTableGenerator.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8069 net/minecraft/data/server/loottable/OneTwentyChestLootTableGenerator diff --git a/mappings/net/minecraft/data/server/loottable/OneTwentyEntityLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/OneTwentyEntityLootTableGenerator.mapping new file mode 100644 index 0000000000..f8bc7e2854 --- /dev/null +++ b/mappings/net/minecraft/data/server/loottable/OneTwentyEntityLootTableGenerator.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8070 net/minecraft/data/server/loottable/OneTwentyEntityLootTableGenerator diff --git a/mappings/net/minecraft/data/server/loottable/OneTwentyFishingLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/OneTwentyFishingLootTableGenerator.mapping new file mode 100644 index 0000000000..bf812c414d --- /dev/null +++ b/mappings/net/minecraft/data/server/loottable/OneTwentyFishingLootTableGenerator.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8071 net/minecraft/data/server/loottable/OneTwentyFishingLootTableGenerator diff --git a/mappings/net/minecraft/data/server/loottable/VanillaChestLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/VanillaChestLootTableGenerator.mapping new file mode 100644 index 0000000000..60575e8213 --- /dev/null +++ b/mappings/net/minecraft/data/server/loottable/VanillaChestLootTableGenerator.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/class_2432 net/minecraft/data/server/loottable/VanillaChestLootTableGenerator + METHOD method_48499 createShipwreckSupplyChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_48500 createShipwreckMapChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_48501 createBastionHoglinStableChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_48502 createBastionBridgeChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_48503 createEndCityTreasureChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_48504 createNetherBridgeChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_48505 createBastionTreasureChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_48506 createBastionOtherChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_48507 createWoodlandMansionChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_48508 createStrongholdLibraryChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_48509 createStrongholdCorridorChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_48510 createAncientCityChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_48511 createJungleTempleChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_48512 createShipwreckTreasureChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_48513 createPillagerOutpostChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_48514 createDesertPyramidChestTableBuilder ()Lnet/minecraft/class_52$class_53; diff --git a/mappings/net/minecraft/data/server/loottable/VanillaEntityLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/VanillaEntityLootTableGenerator.mapping index e2a2913504..e56ced3f41 100644 --- a/mappings/net/minecraft/data/server/loottable/VanillaEntityLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/loottable/VanillaEntityLootTableGenerator.mapping @@ -1 +1,2 @@ CLASS net/minecraft/class_2434 net/minecraft/data/server/loottable/VanillaEntityLootTableGenerator + METHOD method_48515 createElderGuardianTableBuilder ()Lnet/minecraft/class_52$class_53; diff --git a/mappings/net/minecraft/data/server/loottable/FishingLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/VanillaFishingLootTableGenerator.mapping similarity index 72% rename from mappings/net/minecraft/data/server/loottable/FishingLootTableGenerator.mapping rename to mappings/net/minecraft/data/server/loottable/VanillaFishingLootTableGenerator.mapping index ba590e8816..9eef65f70f 100644 --- a/mappings/net/minecraft/data/server/loottable/FishingLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/loottable/VanillaFishingLootTableGenerator.mapping @@ -1,4 +1,5 @@ -CLASS net/minecraft/class_2437 net/minecraft/data/server/loottable/FishingLootTableGenerator +CLASS net/minecraft/class_2437 net/minecraft/data/server/loottable/VanillaFishingLootTableGenerator FIELD field_11346 NEEDS_JUNGLE_BIOME Lnet/minecraft/class_5341$class_210; FIELD field_11349 NEEDS_BAMBOO_JUNGLE_BIOME Lnet/minecraft/class_5341$class_210; FIELD field_35165 NEEDS_SPARSE_JUNGLE_BIOME Lnet/minecraft/class_5341$class_210; + METHOD method_48516 createFishTableBuilder ()Lnet/minecraft/class_52$class_53; diff --git a/mappings/net/minecraft/data/server/recipe/SmithingRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/LegacySmithingRecipeJsonBuilder.mapping similarity index 98% rename from mappings/net/minecraft/data/server/recipe/SmithingRecipeJsonBuilder.mapping rename to mappings/net/minecraft/data/server/recipe/LegacySmithingRecipeJsonBuilder.mapping index 9523a3744a..854ca02fe4 100644 --- a/mappings/net/minecraft/data/server/recipe/SmithingRecipeJsonBuilder.mapping +++ b/mappings/net/minecraft/data/server/recipe/LegacySmithingRecipeJsonBuilder.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5377 net/minecraft/data/server/recipe/SmithingRecipeJsonBuilder +CLASS net/minecraft/class_5377 net/minecraft/data/server/recipe/LegacySmithingRecipeJsonBuilder FIELD field_25491 base Lnet/minecraft/class_1856; FIELD field_25492 addition Lnet/minecraft/class_1856; FIELD field_25493 result Lnet/minecraft/class_1792; diff --git a/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping b/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping index fe766c9579..fac0c141d3 100644 --- a/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping +++ b/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping @@ -380,3 +380,19 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/recipe/RecipeProvider ARG 1 category ARG 2 output ARG 3 input + METHOD method_48530 offerSmithingTrimRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1792;)V + ARG 0 exporter + ARG 1 template + METHOD method_48531 offerLegacyNetheriteUpgradeRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1792;Lnet/minecraft/class_7800;Lnet/minecraft/class_1792;)V + ARG 0 exporter + ARG 1 input + ARG 2 category + ARG 3 result + METHOD method_48532 offerSmithingTemplateCopyingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_6862;)V + ARG 0 exporter + ARG 1 template + ARG 2 resource + METHOD method_48533 offerSmithingTemplateCopyingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V + ARG 0 exporter + ARG 1 template + ARG 2 resource diff --git a/mappings/net/minecraft/data/server/recipe/SmithingTransformRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/SmithingTransformRecipeJsonBuilder.mapping index 06212574e0..85aa37bb76 100644 --- a/mappings/net/minecraft/data/server/recipe/SmithingTransformRecipeJsonBuilder.mapping +++ b/mappings/net/minecraft/data/server/recipe/SmithingTransformRecipeJsonBuilder.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_8074 net/minecraft/data/server/recipe/SmithingTransfor ARG 5 category ARG 6 result METHOD method_48534 validate (Lnet/minecraft/class_2960;)V - ARG 1 id + ARG 1 recipeId METHOD method_48535 create (Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;Lnet/minecraft/class_1792;)Lnet/minecraft/class_8074; ARG 0 template ARG 1 base @@ -26,8 +26,8 @@ CLASS net/minecraft/class_8074 net/minecraft/data/server/recipe/SmithingTransfor ARG 2 conditions METHOD method_48537 offerTo (Ljava/util/function/Consumer;Lnet/minecraft/class_2960;)V ARG 1 exporter - ARG 2 id + ARG 2 recipeId METHOD method_48538 offerTo (Ljava/util/function/Consumer;Ljava/lang/String;)V ARG 1 exporter - ARG 2 id + ARG 2 recipeId CLASS class_8075 SmithingTransformRecipeJsonProvider diff --git a/mappings/net/minecraft/data/server/recipe/SmithingTrimRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/SmithingTrimRecipeJsonBuilder.mapping index 1763277e71..e3d4b3b052 100644 --- a/mappings/net/minecraft/data/server/recipe/SmithingTrimRecipeJsonBuilder.mapping +++ b/mappings/net/minecraft/data/server/recipe/SmithingTrimRecipeJsonBuilder.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_8076 net/minecraft/data/server/recipe/SmithingTrimReci ARG 4 base ARG 5 addition METHOD method_48539 validate (Lnet/minecraft/class_2960;)V - ARG 1 id + ARG 1 recipeId METHOD method_48540 create (Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;)Lnet/minecraft/class_8076; ARG 0 template ARG 1 base @@ -23,8 +23,8 @@ CLASS net/minecraft/class_8076 net/minecraft/data/server/recipe/SmithingTrimReci ARG 2 conditions METHOD method_48542 offerTo (Ljava/util/function/Consumer;Lnet/minecraft/class_2960;)V ARG 1 exporter - ARG 2 id + ARG 2 recipeId METHOD method_48543 offerTo (Ljava/util/function/Consumer;Ljava/lang/String;)V ARG 1 exporter - ARG 2 id + ARG 2 recipeId CLASS class_8077 SmithingTrimRecipeJsonProvider diff --git a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping index 1fe92167e7..90d1d8d45b 100644 --- a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping +++ b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping @@ -40,7 +40,6 @@ CLASS net/minecraft/class_1295 net/minecraft/entity/AreaEffectCloudEntity ARG 1 waiting METHOD method_5599 getRadius ()F METHOD method_5600 getParticleType ()Lnet/minecraft/class_2394; - METHOD method_5601 getOwner ()Lnet/minecraft/class_1309; METHOD method_5602 setColor (I)V ARG 1 rgb METHOD method_5603 setRadius (F)V diff --git a/mappings/net/minecraft/entity/TntEntity.mapping b/mappings/net/minecraft/entity/TntEntity.mapping index c593c8c31e..3601cd8cd9 100644 --- a/mappings/net/minecraft/entity/TntEntity.mapping +++ b/mappings/net/minecraft/entity/TntEntity.mapping @@ -11,5 +11,4 @@ CLASS net/minecraft/class_1541 net/minecraft/entity/TntEntity METHOD method_6967 setFuse (I)V ARG 1 fuse METHOD method_6969 getFuse ()I - METHOD method_6970 getCausingEntity ()Lnet/minecraft/class_1309; METHOD method_6971 explode ()V diff --git a/mappings/net/minecraft/entity/mob/EvokerFangsEntity.mapping b/mappings/net/minecraft/entity/mob/EvokerFangsEntity.mapping index 31e7dc6c78..8d5d18cb63 100644 --- a/mappings/net/minecraft/entity/mob/EvokerFangsEntity.mapping +++ b/mappings/net/minecraft/entity/mob/EvokerFangsEntity.mapping @@ -13,7 +13,6 @@ CLASS net/minecraft/class_1669 net/minecraft/entity/mob/EvokerFangsEntity ARG 8 yaw ARG 9 warmup ARG 10 owner - METHOD method_7470 getOwner ()Lnet/minecraft/class_1309; METHOD method_7471 damage (Lnet/minecraft/class_1309;)V ARG 1 target METHOD method_7472 getAnimationProgress (F)F diff --git a/mappings/net/minecraft/entity/mob/VexEntity.mapping b/mappings/net/minecraft/entity/mob/VexEntity.mapping index d1a908fda0..f941e2302c 100644 --- a/mappings/net/minecraft/entity/mob/VexEntity.mapping +++ b/mappings/net/minecraft/entity/mob/VexEntity.mapping @@ -13,7 +13,6 @@ CLASS net/minecraft/class_1634 net/minecraft/entity/mob/VexEntity ARG 1 owner METHOD method_7181 setLifeTicks (I)V ARG 1 lifeTicks - METHOD method_7182 getOwner ()Lnet/minecraft/class_1308; METHOD method_7184 areFlagsSet (I)Z ARG 1 mask METHOD method_7186 getBounds ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/item/ArmorItem.mapping b/mappings/net/minecraft/item/ArmorItem.mapping index d9f1dfee86..c6bff418ac 100644 --- a/mappings/net/minecraft/item/ArmorItem.mapping +++ b/mappings/net/minecraft/item/ArmorItem.mapping @@ -1,20 +1,20 @@ CLASS net/minecraft/class_1738 net/minecraft/item/ArmorItem FIELD field_21976 knockbackResistance F FIELD field_23741 attributeModifiers Lcom/google/common/collect/Multimap; - FIELD field_41933 slot Lnet/minecraft/class_1738$class_8051; + FIELD field_41933 type Lnet/minecraft/class_1738$class_8051; FIELD field_7876 MODIFIERS Ljava/util/EnumMap; FIELD field_7877 toughness F FIELD field_7878 protection I FIELD field_7879 DISPENSER_BEHAVIOR Lnet/minecraft/class_2357; - FIELD field_7881 type Lnet/minecraft/class_1741; + FIELD field_7881 material Lnet/minecraft/class_1741; METHOD (Lnet/minecraft/class_1741;Lnet/minecraft/class_1738$class_8051;Lnet/minecraft/class_1792$class_1793;)V ARG 1 material - ARG 2 slot + ARG 2 type ARG 3 settings METHOD method_26353 getToughness ()F METHOD method_48397 (Ljava/util/EnumMap;)V - ARG 0 map - METHOD method_48398 getSlot ()Lnet/minecraft/class_1738$class_8051; + ARG 0 uuidMap + METHOD method_48398 getType ()Lnet/minecraft/class_1738$class_8051; METHOD method_7684 dispenseArmor (Lnet/minecraft/class_2342;Lnet/minecraft/class_1799;)Z ARG 0 pointer ARG 1 armor @@ -23,9 +23,9 @@ CLASS net/minecraft/class_1738 net/minecraft/item/ArmorItem METHOD method_7687 getProtection ()I CLASS class_8051 Type FIELD field_41938 equipmentSlot Lnet/minecraft/class_1304; - FIELD field_41939 id Ljava/lang/String; + FIELD field_41939 name Ljava/lang/String; METHOD (Ljava/lang/String;ILnet/minecraft/class_1304;Ljava/lang/String;)V ARG 3 equipmentSlot - ARG 4 id + ARG 4 name METHOD method_48399 getEquipmentSlot ()Lnet/minecraft/class_1304; - METHOD method_48400 getId ()Ljava/lang/String; + METHOD method_48400 getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/item/ArmorMaterial.mapping b/mappings/net/minecraft/item/ArmorMaterial.mapping index e7cd260867..fef3f8983e 100644 --- a/mappings/net/minecraft/item/ArmorMaterial.mapping +++ b/mappings/net/minecraft/item/ArmorMaterial.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_1741 net/minecraft/item/ArmorMaterial METHOD method_24355 getKnockbackResistance ()F METHOD method_48402 getDurability (Lnet/minecraft/class_1738$class_8051;)I - ARG 1 slot - METHOD method_48403 getProtectionAmount (Lnet/minecraft/class_1738$class_8051;)I - ARG 1 slot + ARG 1 type + METHOD method_48403 getProtection (Lnet/minecraft/class_1738$class_8051;)I + ARG 1 type METHOD method_48404 isTrimmable ()Z METHOD method_7694 getName ()Ljava/lang/String; METHOD method_7695 getRepairIngredient ()Lnet/minecraft/class_1856; diff --git a/mappings/net/minecraft/item/SmithingTemplateItem.mapping b/mappings/net/minecraft/item/SmithingTemplateItem.mapping new file mode 100644 index 0000000000..e23bfbc3ba --- /dev/null +++ b/mappings/net/minecraft/item/SmithingTemplateItem.mapping @@ -0,0 +1,58 @@ +CLASS net/minecraft/class_8052 net/minecraft/item/SmithingTemplateItem + FIELD field_41958 EMPTY_SLOT_SWORD_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41959 EMPTY_SLOT_SHOVEL_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41960 EMPTY_SLOT_PICKAXE_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41961 EMPTY_SLOT_INGOT_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41962 EMPTY_SLOT_REDSTONE_DUST_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41963 EMPTY_SLOT_QUARTZ_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41964 EMPTY_SLOT_EMERALD_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41965 EMPTY_SLOT_DIAMOND_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41966 EMPTY_SLOT_LAPIS_LAZULI_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41967 appliesToText Lnet/minecraft/class_2561; + FIELD field_41968 ingredientsText Lnet/minecraft/class_2561; + FIELD field_41969 titleText Lnet/minecraft/class_2561; + FIELD field_41970 baseSlotDescriptionText Lnet/minecraft/class_2561; + FIELD field_41971 additionsSlotDescriptionText Lnet/minecraft/class_2561; + FIELD field_41972 emptyBaseSlotTextures Ljava/util/List; + FIELD field_41973 emptyAdditionsSlotTextures Ljava/util/List; + FIELD field_41974 TITLE_FORMATTING Lnet/minecraft/class_124; + FIELD field_41975 DESCRIPTION_FORMATTING Lnet/minecraft/class_124; + FIELD field_41976 TRANSLATION_KEY Ljava/lang/String; + FIELD field_41977 INGREDIENTS_TEXT Lnet/minecraft/class_2561; + FIELD field_41978 APPLIES_TO_TEXT Lnet/minecraft/class_2561; + FIELD field_41979 NETHERITE_UPGRADE_TEXT Lnet/minecraft/class_2561; + FIELD field_41980 ARMOR_TRIM_APPLIES_TO_TEXT Lnet/minecraft/class_2561; + FIELD field_41981 ARMOR_TRIM_INGREDIENTS_TEXT Lnet/minecraft/class_2561; + FIELD field_41982 ARMOR_TRIM_BASE_SLOT_DESCRIPTION_TEXT Lnet/minecraft/class_2561; + FIELD field_41983 ARMOR_TRIM_ADDITIONS_SLOT_DESCRIPTION_TEXT Lnet/minecraft/class_2561; + FIELD field_41984 NETHERITE_UPGRADE_APPLIES_TO_TEXT Lnet/minecraft/class_2561; + FIELD field_41985 NETHERITE_UPGRADE_INGREDIENTS_TEXT Lnet/minecraft/class_2561; + FIELD field_41986 NETHERITE_UPGRADE_BASE_SLOT_DESCRIPTION_TEXT Lnet/minecraft/class_2561; + FIELD field_41987 NETHERITE_UPGRADE_ADDITIONS_SLOT_DESCRIPTION_TEXT Lnet/minecraft/class_2561; + FIELD field_41988 EMPTY_ARMOR_SLOT_HELMET_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41989 EMPTY_ARMOR_SLOT_CHESTPLATE_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41990 EMPTY_ARMOR_SLOT_LEGGINGS_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41991 EMPTY_ARMOR_SLOT_BOOTS_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41992 EMPTY_SLOT_HOE_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41993 EMPTY_SLOT_AXE_TEXTURE Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Ljava/util/List;Ljava/util/List;)V + ARG 1 appliesToText + ARG 2 ingredientsText + ARG 3 titleText + ARG 4 baseSlotDescriptionText + ARG 5 additionsSlotDescriptionText + ARG 6 emptyBaseSlotTextures + ARG 7 emptyAdditionsSlotTextures + METHOD method_48413 getEmptyAdditionsSlotTextures ()Ljava/util/List; + METHOD method_48414 getArmorTrimEmptyBaseSlotTextures ()Ljava/util/List; + METHOD method_48415 getArmorTrimEmptyAdditionsSlotTextures ()Ljava/util/List; + METHOD method_48416 getNetheriteUpgradeEmptyBaseSlotTextures ()Ljava/util/List; + METHOD method_48417 getNetheriteUpgradeEmptyAdditionsSlotTextures ()Ljava/util/List; + METHOD method_48418 of (Lnet/minecraft/class_5321;)Lnet/minecraft/class_8052; + ARG 0 trimPattern + METHOD method_48419 of (Lnet/minecraft/class_2960;)Lnet/minecraft/class_8052; + ARG 0 trimPatternIn + METHOD method_48420 createNetheriteUpgrade ()Lnet/minecraft/class_8052; + METHOD method_48421 getBaseSlotDescription ()Lnet/minecraft/class_2561; + METHOD method_48422 getAdditionsSlotDescription ()Lnet/minecraft/class_2561; + METHOD method_48423 getEmptyBaseSlotTextures ()Ljava/util/List; diff --git a/mappings/net/minecraft/item/trim/ArmorTrim.mapping b/mappings/net/minecraft/item/trim/ArmorTrim.mapping index 48a4ff62c4..4582cfbc9d 100644 --- a/mappings/net/minecraft/item/trim/ArmorTrim.mapping +++ b/mappings/net/minecraft/item/trim/ArmorTrim.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_8053 net/minecraft/item/trim/ArmorTrim FIELD field_41994 CODEC Lcom/mojang/serialization/Codec; FIELD field_41995 NBT_KEY Ljava/lang/String; FIELD field_41996 LOGGER Lorg/slf4j/Logger; - FIELD field_41997 TRIM_SECTION_TEXT Lnet/minecraft/class_2561; + FIELD field_41997 UPGRADE_TEXT Lnet/minecraft/class_2561; FIELD field_41998 material Lnet/minecraft/class_6880; FIELD field_41999 pattern Lnet/minecraft/class_6880; FIELD field_42000 leggingsModelIdGetter Ljava/util/function/Supplier; @@ -11,12 +11,12 @@ CLASS net/minecraft/class_8053 net/minecraft/item/trim/ArmorTrim ARG 1 material ARG 2 pattern METHOD equals (Ljava/lang/Object;)Z - ARG 1 other + ARG 1 o METHOD method_48424 getPattern ()Lnet/minecraft/class_6880; METHOD method_48425 appendTooltip (Lnet/minecraft/class_1799;Lnet/minecraft/class_5455;Ljava/util/List;)V ARG 0 stack ARG 1 registryManager - ARG 2 list + ARG 2 tooltip METHOD method_48427 equals (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;)Z ARG 1 pattern ARG 2 material diff --git a/mappings/net/minecraft/item/trim/ArmorTrimMaterial.mapping b/mappings/net/minecraft/item/trim/ArmorTrimMaterial.mapping index 335439d99f..3a1d1f365c 100644 --- a/mappings/net/minecraft/item/trim/ArmorTrimMaterial.mapping +++ b/mappings/net/minecraft/item/trim/ArmorTrimMaterial.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_8054 net/minecraft/item/trim/ArmorTrimMaterial FIELD field_42002 CODEC Lcom/mojang/serialization/Codec; - FIELD field_42003 REGISTRY_CODEC Lcom/mojang/serialization/Codec; + FIELD field_42003 ENTRY_CODEC Lcom/mojang/serialization/Codec; METHOD method_48438 of (Ljava/lang/String;Lnet/minecraft/class_1792;FLjava/util/Optional;Lnet/minecraft/class_2561;)Lnet/minecraft/class_8054; ARG 0 assetName ARG 1 ingredient diff --git a/mappings/net/minecraft/item/trim/ArmorTrimMaterials.mapping b/mappings/net/minecraft/item/trim/ArmorTrimMaterials.mapping index 18be3ff95c..be1d624c22 100644 --- a/mappings/net/minecraft/item/trim/ArmorTrimMaterials.mapping +++ b/mappings/net/minecraft/item/trim/ArmorTrimMaterials.mapping @@ -7,13 +7,13 @@ CLASS net/minecraft/class_8055 net/minecraft/item/trim/ArmorTrimMaterials METHOD method_48441 of (Ljava/lang/String;)Lnet/minecraft/class_5321; ARG 0 id METHOD method_48442 bootstrap (Lnet/minecraft/class_7891;)V - ARG 0 registerable + ARG 0 registry METHOD method_48443 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;Lnet/minecraft/class_1792;Lnet/minecraft/class_2583;FLjava/util/Optional;)V - ARG 0 registerable + ARG 0 registry ARG 1 key ARG 2 ingredient ARG 3 style ARG 4 itemModelIndex ARG 5 incompatibleArmorMaterial - METHOD method_48444 register (Lnet/minecraft/class_7891;)V - ARG 0 registerable + METHOD method_48444 oneTwentyBootstrap (Lnet/minecraft/class_7891;)V + ARG 0 registry diff --git a/mappings/net/minecraft/item/trim/ArmorTrimPattern.mapping b/mappings/net/minecraft/item/trim/ArmorTrimPattern.mapping index fe0ab2a72a..88b77cbd8d 100644 --- a/mappings/net/minecraft/item/trim/ArmorTrimPattern.mapping +++ b/mappings/net/minecraft/item/trim/ArmorTrimPattern.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_8056 net/minecraft/item/trim/ArmorTrimPattern FIELD field_42014 CODEC Lcom/mojang/serialization/Codec; - FIELD field_42015 REGISTRY_CODEC Lcom/mojang/serialization/Codec; + FIELD field_42015 ENTRY_CODEC Lcom/mojang/serialization/Codec; METHOD method_48446 getDescription (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2561; ARG 1 material diff --git a/mappings/net/minecraft/item/trim/ArmorTrimPatterns.mapping b/mappings/net/minecraft/item/trim/ArmorTrimPatterns.mapping index e16493d21b..0dadf613dd 100644 --- a/mappings/net/minecraft/item/trim/ArmorTrimPatterns.mapping +++ b/mappings/net/minecraft/item/trim/ArmorTrimPatterns.mapping @@ -7,10 +7,10 @@ CLASS net/minecraft/class_8057 net/minecraft/item/trim/ArmorTrimPatterns METHOD method_48449 of (Ljava/lang/String;)Lnet/minecraft/class_5321; ARG 0 id METHOD method_48450 bootstrap (Lnet/minecraft/class_7891;)V - ARG 0 registerable + ARG 0 registry METHOD method_48451 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_1792;Lnet/minecraft/class_5321;)V - ARG 0 registerable + ARG 0 registry ARG 1 template ARG 2 key - METHOD method_48452 register (Lnet/minecraft/class_7891;)V - ARG 0 registerable + METHOD method_48452 oneTwentyBootstrap (Lnet/minecraft/class_7891;)V + ARG 0 registry diff --git a/mappings/net/minecraft/recipe/RecipeManager.mapping b/mappings/net/minecraft/recipe/RecipeManager.mapping index a51c023d38..c4c161a465 100644 --- a/mappings/net/minecraft/recipe/RecipeManager.mapping +++ b/mappings/net/minecraft/recipe/RecipeManager.mapping @@ -30,6 +30,8 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager ARG 0 map METHOD method_17723 (Ljava/util/Map;)Ljava/util/stream/Stream; ARG 0 map + METHOD method_17876 (Lnet/minecraft/class_1937;Lnet/minecraft/class_1860;)Ljava/lang/String; + ARG 1 recipe METHOD method_17877 getAllMatches (Lnet/minecraft/class_3956;Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;)Ljava/util/List; COMMENT Creates a list of all recipes of the given {@code type} that match the COMMENT given {@code inventory} and {@code world}. The list is ordered by the diff --git a/mappings/net/minecraft/recipe/SmithingTrimRecipe.mapping b/mappings/net/minecraft/recipe/SmithingTrimRecipe.mapping index 45edd2d7d4..6f1d4b3d71 100644 --- a/mappings/net/minecraft/recipe/SmithingTrimRecipe.mapping +++ b/mappings/net/minecraft/recipe/SmithingTrimRecipe.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_8062 net/minecraft/recipe/SmithingTrimRecipe ARG 2 template ARG 3 base ARG 4 addition - METHOD method_48458 isIncompatibleMatrerial (Lnet/minecraft/class_1799;Lnet/minecraft/class_8054;)Z + METHOD method_48458 hasIncompatibleArmorMaterial (Lnet/minecraft/class_1799;Lnet/minecraft/class_8054;)Z ARG 1 stack - ARG 2 material + ARG 2 trimMaterial CLASS class_8063 Serializer diff --git a/mappings/net/minecraft/screen/ForgingScreenHandler.mapping b/mappings/net/minecraft/screen/ForgingScreenHandler.mapping index 8553ba67e4..8d6b85941b 100644 --- a/mappings/net/minecraft/screen/ForgingScreenHandler.mapping +++ b/mappings/net/minecraft/screen/ForgingScreenHandler.mapping @@ -25,21 +25,21 @@ CLASS net/minecraft/class_4861 net/minecraft/screen/ForgingScreenHandler ARG 1 player ARG 2 present METHOD method_24928 updateResult ()V - METHOD method_48352 buildSlots ()Lnet/minecraft/class_8047; - METHOD method_48353 addPlayerSlots (Lnet/minecraft/class_1661;)V - ARG 1 inventory + METHOD method_48352 getForgingSlotsManager ()Lnet/minecraft/class_8047; + METHOD method_48353 addPlayerInventorySlots (Lnet/minecraft/class_1661;)V + ARG 1 playerInventory METHOD method_48354 addInputSlots (Lnet/minecraft/class_8047;)V - ARG 1 slots + ARG 1 forgingSlotsManager METHOD method_48355 addResultSlot (Lnet/minecraft/class_8047;)V - ARG 1 slots - METHOD method_48356 canQuickMove (Lnet/minecraft/class_1799;)Z + ARG 1 forgingSlotsManager + METHOD method_48356 isValidIngredient (Lnet/minecraft/class_1799;)Z ARG 1 stack - METHOD method_48357 getQuickMoveSlot (Lnet/minecraft/class_1799;)I + METHOD method_48357 getSlotFor (Lnet/minecraft/class_1799;)I ARG 1 stack METHOD method_48358 createInputInventory (I)Lnet/minecraft/class_1277; ARG 1 size - METHOD method_48359 getPlayerInventoryStartSlot ()I + METHOD method_48359 getPlayerInventoryStartIndex ()I METHOD method_48360 getResultSlotIndex ()I - METHOD method_48361 getPlayerInventoryEndSlot ()I - METHOD method_48362 getHotbarStartSlot ()I - METHOD method_48363 getHotbarEndSlot ()I + METHOD method_48361 getPlayerInventoryEndIndex ()I + METHOD method_48362 getPlayerHotbarStartIndex ()I + METHOD method_48363 getPlayerHotbarEndIndex ()I diff --git a/mappings/net/minecraft/screen/LegacySmithingScreenHandler.mapping b/mappings/net/minecraft/screen/LegacySmithingScreenHandler.mapping index dd3315e4a5..015d7661d3 100644 --- a/mappings/net/minecraft/screen/LegacySmithingScreenHandler.mapping +++ b/mappings/net/minecraft/screen/LegacySmithingScreenHandler.mapping @@ -4,20 +4,28 @@ CLASS net/minecraft/class_8050 net/minecraft/screen/LegacySmithingScreenHandler FIELD field_41921 recipes Ljava/util/List; METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId - ARG 2 inventory + ARG 2 playerInventory METHOD (ILnet/minecraft/class_1661;Lnet/minecraft/class_3914;)V ARG 1 syncId - ARG 2 inventory + ARG 2 playerInventory ARG 3 context + METHOD method_48377 (Lnet/minecraft/class_1799;Lnet/minecraft/class_5357;)Z + ARG 1 recipe + METHOD method_48378 (Lnet/minecraft/class_8059;)Lnet/minecraft/class_5357; + ARG 0 recipe METHOD method_48379 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 0 world ARG 1 pos + METHOD method_48380 (Lnet/minecraft/class_8059;)Z + ARG 0 recipe METHOD method_48381 (Lnet/minecraft/class_8059;)Lnet/minecraft/class_5357; ARG 0 recipe METHOD method_48382 (Lnet/minecraft/class_8059;)Z ARG 0 recipe - METHOD method_48383 decrementSlot (I)V + METHOD method_48383 decrementStack (I)V ARG 1 slot + METHOD method_48384 testAddition (Lnet/minecraft/class_1799;)Z + ARG 1 stack METHOD method_48385 (Lnet/minecraft/class_1799;)Z ARG 0 stack METHOD method_48386 (Lnet/minecraft/class_1799;)Z diff --git a/mappings/net/minecraft/screen/ScreenHandlerType.mapping b/mappings/net/minecraft/screen/ScreenHandlerType.mapping index d610f42afe..77e6849501 100644 --- a/mappings/net/minecraft/screen/ScreenHandlerType.mapping +++ b/mappings/net/minecraft/screen/ScreenHandlerType.mapping @@ -13,8 +13,10 @@ CLASS net/minecraft/class_3917 net/minecraft/screen/ScreenHandlerType COMMENT COMMENT @see ScreenHandler FIELD field_17344 factory Lnet/minecraft/class_3917$class_3918; + FIELD field_41923 requiredFeatures Lnet/minecraft/class_7699; METHOD (Lnet/minecraft/class_3917$class_3918;Lnet/minecraft/class_7699;)V ARG 1 factory + ARG 2 requiredFeatures METHOD method_17434 create (ILnet/minecraft/class_1661;)Lnet/minecraft/class_1703; ARG 1 syncId ARG 2 playerInventory @@ -24,6 +26,10 @@ CLASS net/minecraft/class_3917 net/minecraft/screen/ScreenHandlerType METHOD method_17436 (ILnet/minecraft/class_1661;)Lnet/minecraft/class_3916; ARG 0 syncId ARG 1 playerInventory + METHOD method_48387 register (Ljava/lang/String;Lnet/minecraft/class_3917$class_3918;[Lnet/minecraft/class_7696;)Lnet/minecraft/class_3917; + ARG 0 id + ARG 1 factory + ARG 2 requiredFeatures CLASS class_3918 Factory COMMENT A functional interface that creates a screen handler instance on the client. COMMENT diff --git a/mappings/net/minecraft/screen/ForgingScreenSlots.mapping b/mappings/net/minecraft/screen/slot/ForgingSlotsManager.mapping similarity index 67% rename from mappings/net/minecraft/screen/ForgingScreenSlots.mapping rename to mappings/net/minecraft/screen/slot/ForgingSlotsManager.mapping index ca691c6f0c..23d85691ae 100644 --- a/mappings/net/minecraft/screen/ForgingScreenSlots.mapping +++ b/mappings/net/minecraft/screen/slot/ForgingSlotsManager.mapping @@ -1,16 +1,16 @@ -CLASS net/minecraft/class_8047 net/minecraft/screen/ForgingScreenSlots +CLASS net/minecraft/class_8047 net/minecraft/screen/slot/ForgingSlotsManager FIELD field_41907 inputSlots Ljava/util/List; FIELD field_41908 resultSlot Lnet/minecraft/class_8047$class_8049; METHOD (Ljava/util/List;Lnet/minecraft/class_8047$class_8049;)V ARG 1 inputSlots ARG 2 resultSlot - METHOD method_48364 builder ()Lnet/minecraft/class_8047$class_8048; - METHOD method_48365 has (I)Z + METHOD method_48364 create ()Lnet/minecraft/class_8047$class_8048; + METHOD method_48365 hasSlotIndex (I)Z ARG 1 index - METHOD method_48366 getResult ()Lnet/minecraft/class_8047$class_8049; - METHOD method_48367 get (I)Lnet/minecraft/class_8047$class_8049; + METHOD method_48366 getResultSlot ()Lnet/minecraft/class_8047$class_8049; + METHOD method_48367 getInputSlot (I)Lnet/minecraft/class_8047$class_8049; ARG 1 index - METHOD method_48368 getInputs ()Ljava/util/List; + METHOD method_48368 getInputSlots ()Ljava/util/List; METHOD method_48369 getInputSlotCount ()I METHOD method_48370 getResultSlotIndex ()I METHOD method_48371 getInputSlotIndices ()Ljava/util/List; @@ -19,17 +19,19 @@ CLASS net/minecraft/class_8047 net/minecraft/screen/ForgingScreenSlots FIELD field_41910 resultSlot Lnet/minecraft/class_8047$class_8049; METHOD method_48372 build ()Lnet/minecraft/class_8047; METHOD method_48373 output (III)Lnet/minecraft/class_8047$class_8048; - ARG 1 index + ARG 1 slotId ARG 2 x ARG 3 y METHOD method_48374 input (IIILjava/util/function/Predicate;)Lnet/minecraft/class_8047$class_8048; - ARG 1 index + ARG 1 slotId ARG 2 x ARG 3 y ARG 4 mayPlace METHOD method_48375 (Lnet/minecraft/class_1799;)Z ARG 0 stack - CLASS class_8049 Slot + CLASS class_8049 ForgingSlot + FIELD comp_1204 slotId I FIELD field_41911 DEFAULT Lnet/minecraft/class_8047$class_8049; + METHOD comp_1204 slotId ()I METHOD method_48376 (Lnet/minecraft/class_1799;)Z ARG 0 stack diff --git a/mappings/net/minecraft/server/command/SpawnArmorTrimsCommand.mapping b/mappings/net/minecraft/server/command/SpawnArmorTrimsCommand.mapping index 464438039f..2563a347a6 100644 --- a/mappings/net/minecraft/server/command/SpawnArmorTrimsCommand.mapping +++ b/mappings/net/minecraft/server/command/SpawnArmorTrimsCommand.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_8044 net/minecraft/server/command/SpawnArmorTrimsCommand - FIELD field_41885 ITEMS Ljava/util/Map; + FIELD field_41885 ARMOR_PIECES Ljava/util/Map; FIELD field_41886 PATTERNS Ljava/util/List; FIELD field_41887 MATERIALS Ljava/util/List; FIELD field_41888 PATTERN_INDEX_GETTER Ljava/util/function/ToIntFunction; - FIELD field_41889 TRIM_INDEX_GETTER Ljava/util/function/ToIntFunction; + FIELD field_41889 MATERIAL_INDEX_GETTER Ljava/util/function/ToIntFunction; METHOD method_48333 register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher METHOD method_48334 (Lcom/mojang/brigadier/context/CommandContext;)I @@ -13,5 +13,13 @@ CLASS net/minecraft/class_8044 net/minecraft/server/command/SpawnArmorTrimsComma METHOD method_48336 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_1657;)I ARG 0 source ARG 1 player + METHOD method_48337 (Lnet/minecraft/class_2371;Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;Lnet/minecraft/class_8056;Lnet/minecraft/class_8054;)V + ARG 4 material + METHOD method_48338 (Lnet/minecraft/class_2378;Lnet/minecraft/class_8054;)Ljava/lang/Integer; + ARG 1 material + METHOD method_48339 (Lnet/minecraft/class_2378;Lnet/minecraft/class_8056;)Ljava/lang/Integer; + ARG 1 pattern + METHOD method_48340 (Lnet/minecraft/class_2378;Lnet/minecraft/class_2371;Lnet/minecraft/class_2378;Lnet/minecraft/class_8056;)V + ARG 3 pattern METHOD method_48341 (Ljava/util/HashMap;)V ARG 0 map