From 0daf00a9a9e5de984929dfca4cd958ef06d51fc2 Mon Sep 17 00:00:00 2001 From: Juuxel <6596629+Juuxel@users.noreply.github.com> Date: Mon, 9 Mar 2020 16:38:14 +0200 Subject: [PATCH 01/10] ScreenHandler -> Menu --- CONVENTIONS.md | 5 ++--- .../block/AbstractFurnaceBlock.mapping | 2 +- mappings/net/minecraft/block/Block.mapping | 2 +- .../net/minecraft/block/BlockState.mapping | 2 +- .../net/minecraft/block/LecternBlock.mapping | 2 +- .../LockableContainerBlockEntity.mapping | 4 +++- .../LootableContainerBlockEntity.mapping | 1 + .../ingame/AbstractFurnaceScreen.mapping | 2 +- .../gui/screen/ingame/AnvilScreen.mapping | 4 ++-- .../gui/screen/ingame/BeaconScreen.mapping | 4 ++-- .../screen/ingame/BlastFurnaceScreen.mapping | 2 +- .../screen/ingame/BrewingStandScreen.mapping | 4 ++-- .../ingame/CartographyTableScreen.mapping | 2 +- .../screen/ingame/CraftingTableScreen.mapping | 8 +++---- .../ingame/CreativeInventoryScreen.mapping | 6 +++++- .../screen/ingame/EnchantingScreen.mapping | 2 +- .../ingame/ForgingContainerScreen.mapping | 2 ++ .../gui/screen/ingame/ForgingScreen.mapping | 7 ------- ...n.mapping => Generic3x3MenuScreen.mapping} | 4 ++-- ...reen.mapping => GenericMenuScreen.mapping} | 4 ++-- .../screen/ingame/GrindstoneScreen.mapping | 2 +- .../gui/screen/ingame/HopperScreen.mapping | 2 +- .../gui/screen/ingame/HorseScreen.mapping | 2 +- .../gui/screen/ingame/InventoryScreen.mapping | 2 +- .../gui/screen/ingame/LecternScreen.mapping | 4 ++-- .../gui/screen/ingame/LoomScreen.mapping | 2 +- .../gui/screen/ingame/MenuProvider.mapping | 2 ++ ...WithHandler.mapping => MenuScreen.mapping} | 12 +++++------ .../gui/screen/ingame/MerchantScreen.mapping | 2 +- .../ingame/ScreenHandlerProvider.mapping | 2 -- .../screen/ingame/ShulkerBoxScreen.mapping | 2 +- ...apping => SmithingContainerScreen.mapping} | 4 ++-- .../screen/ingame/StonecutterScreen.mapping | 2 +- .../recipebook/AnimatedResultButton.mapping | 2 +- .../recipebook/RecipeBookWidget.mapping | 6 +++--- .../book}/ClientRecipeBook.mapping | 6 +++--- .../book}/RecipeBookGroup.mapping | 2 +- .../data/client/model/ModelIds.mapping | 4 ++-- .../entity/player/PlayerEntity.mapping | 9 ++++---- .../vehicle/StorageMinecartEntity.mapping | 5 ++++- .../inventory/CraftingInventory.mapping | 4 ++-- .../AbstractFurnaceMenu.mapping} | 10 ++++++++- .../AnvilMenu.mapping} | 3 ++- .../BeaconMenu.mapping} | 2 +- .../BlastFurnaceMenu.mapping} | 2 +- .../{screen => menu}/BlockContext.mapping | 2 +- .../BrewingStandMenu.mapping} | 2 +- .../CartographyTableMenu.mapping} | 2 +- .../CraftingMenu.mapping} | 2 +- .../slot => menu}/CraftingResultSlot.mapping | 2 +- .../CraftingTableMenu.mapping} | 2 +- .../EnchantingTableMenu.mapping} | 2 +- .../ForgingMenu.mapping} | 2 +- .../slot => menu}/FurnaceFuelSlot.mapping | 5 ++--- .../FurnaceMenu.mapping} | 2 +- .../slot => menu}/FurnaceOutputSlot.mapping | 3 ++- .../Generic3x3Menu.mapping} | 3 ++- .../GenericMenu.mapping} | 14 ++++++++++++- .../GrindstoneMenu.mapping} | 2 +- .../HopperMenu.mapping} | 2 +- .../HorseMenu.mapping} | 2 +- .../LecternMenu.mapping} | 2 +- .../LoomMenu.mapping} | 2 +- .../Menu.mapping} | 21 ++++++++++++++++++- .../MenuFactory.mapping} | 2 +- .../net/minecraft/menu/MenuListener.mapping | 12 +++++++++++ .../MenuType.mapping} | 5 ++++- .../MerchantMenu.mapping} | 2 +- .../menu/NameableMenuFactory.mapping | 2 ++ .../PlayerMenu.mapping} | 2 +- .../ShulkerBoxMenu.mapping} | 2 +- .../net/minecraft/menu/ShulkerBoxSlot.mapping | 5 +++++ .../SimpleNamedMenuFactory.mapping} | 2 +- .../{screen/slot => menu}/Slot.mapping | 5 ++++- .../net/minecraft/menu/SlotActionType.mapping | 1 + .../SmithingTableMenu.mapping} | 2 +- .../SmokerMenu.mapping} | 2 +- .../StonecutterMenu.mapping} | 2 +- .../slot => menu}/TradeOutputSlot.mapping | 2 +- .../property/ArrayPropertyDelegate.mapping | 8 +++++++ .../property}/Property.mapping | 6 +++--- .../property}/PropertyDelegate.mapping | 6 +++++- .../listener/ClientPlayPacketListener.mapping | 10 ++++----- .../listener/ServerPlayPacketListener.mapping | 4 ++-- ...ket.mapping => ClickSlotC2SPacket.mapping} | 7 ++++++- .../c2s/play/CloseMenuS2CPacket.mapping | 4 ++++ .../play/ConfirmGuiActionC2SPacket.mapping | 6 +++--- .../packet/c2s/play/GuiCloseC2SPacket.mapping | 2 -- ...ket.mapping => CloseMenuS2CPacket.mapping} | 2 +- .../play/ConfirmGuiActionS2CPacket.mapping | 6 +++--- ...ng => MenuPropertyUpdateS2CPacket.mapping} | 2 +- ...apping => MenuSlotUpdateS2CPacket.mapping} | 2 +- ...mapping => OpenHorseMenuS2CPacket.mapping} | 2 +- ...cket.mapping => OpenMenuS2CPacket.mapping} | 6 +++--- .../minecraft/recipe/InputSlotFiller.mapping | 4 +++- .../minecraft/recipe/book/RecipeBook.mapping | 2 +- .../screen/ArrayPropertyDelegate.mapping | 5 ----- .../NameableScreenHandlerFactory.mapping | 2 -- .../screen/ScreenHandlerListener.mapping | 9 -------- .../screen/slot/ShulkerBoxSlot.mapping | 1 - .../screen/slot/SlotActionType.mapping | 1 - .../server/network/ServerPlayerEntity.mapping | 13 +++++++----- .../minecraft/util/registry/Registry.mapping | 1 - 103 files changed, 236 insertions(+), 161 deletions(-) create mode 100644 mappings/net/minecraft/client/gui/screen/ingame/ForgingContainerScreen.mapping delete mode 100644 mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping rename mappings/net/minecraft/client/gui/screen/ingame/{Generic3x3ContainerScreen.mapping => Generic3x3MenuScreen.mapping} (83%) rename mappings/net/minecraft/client/gui/screen/ingame/{GenericContainerScreen.mapping => GenericMenuScreen.mapping} (86%) create mode 100644 mappings/net/minecraft/client/gui/screen/ingame/MenuProvider.mapping rename mappings/net/minecraft/client/gui/screen/ingame/{ScreenWithHandler.mapping => MenuScreen.mapping} (93%) delete mode 100644 mappings/net/minecraft/client/gui/screen/ingame/ScreenHandlerProvider.mapping rename mappings/net/minecraft/client/gui/screen/ingame/{SmithingScreen.mapping => SmithingContainerScreen.mapping} (84%) rename mappings/net/minecraft/client/{recipebook => recipe/book}/ClientRecipeBook.mapping (80%) rename mappings/net/minecraft/client/{recipebook => recipe/book}/RecipeBookGroup.mapping (68%) rename mappings/net/minecraft/{screen/AbstractFurnaceScreenHandler.mapping => menu/AbstractFurnaceMenu.mapping} (78%) rename mappings/net/minecraft/{screen/AnvilScreenHandler.mapping => menu/AnvilMenu.mapping} (82%) rename mappings/net/minecraft/{screen/BeaconScreenHandler.mapping => menu/BeaconMenu.mapping} (91%) rename mappings/net/minecraft/{screen/SmokerScreenHandler.mapping => menu/BlastFurnaceMenu.mapping} (70%) rename mappings/net/minecraft/{screen => menu}/BlockContext.mapping (90%) rename mappings/net/minecraft/{screen/BrewingStandScreenHandler.mapping => menu/BrewingStandMenu.mapping} (86%) rename mappings/net/minecraft/{screen/CartographyTableScreenHandler.mapping => menu/CartographyTableMenu.mapping} (88%) rename mappings/net/minecraft/{screen/CraftingScreenHandler.mapping => menu/CraftingMenu.mapping} (85%) rename mappings/net/minecraft/{screen/slot => menu}/CraftingResultSlot.mapping (81%) rename mappings/net/minecraft/{screen/CraftingTableScreenHandler.mapping => menu/CraftingTableMenu.mapping} (88%) rename mappings/net/minecraft/{screen/EnchantingTableScreenHandler.mapping => menu/EnchantingTableMenu.mapping} (88%) rename mappings/net/minecraft/{screen/ForgingScreenHandler.mapping => menu/ForgingMenu.mapping} (90%) rename mappings/net/minecraft/{screen/slot => menu}/FurnaceFuelSlot.mapping (58%) rename mappings/net/minecraft/{screen/FurnaceScreenHandler.mapping => menu/FurnaceMenu.mapping} (70%) rename mappings/net/minecraft/{screen/slot => menu}/FurnaceOutputSlot.mapping (71%) rename mappings/net/minecraft/{screen/Generic3x3ContainerScreenHandler.mapping => menu/Generic3x3Menu.mapping} (59%) rename mappings/net/minecraft/{screen/GenericContainerScreenHandler.mapping => menu/GenericMenu.mapping} (71%) rename mappings/net/minecraft/{screen/GrindstoneScreenHandler.mapping => menu/GrindstoneMenu.mapping} (91%) rename mappings/net/minecraft/{screen/HopperScreenHandler.mapping => menu/HopperMenu.mapping} (73%) rename mappings/net/minecraft/{screen/HorseScreenHandler.mapping => menu/HorseMenu.mapping} (75%) rename mappings/net/minecraft/{screen/LecternScreenHandler.mapping => menu/LecternMenu.mapping} (82%) rename mappings/net/minecraft/{screen/LoomScreenHandler.mapping => menu/LoomMenu.mapping} (94%) rename mappings/net/minecraft/{screen/ScreenHandler.mapping => menu/Menu.mapping} (79%) rename mappings/net/minecraft/{screen/ScreenHandlerFactory.mapping => menu/MenuFactory.mapping} (66%) create mode 100644 mappings/net/minecraft/menu/MenuListener.mapping rename mappings/net/minecraft/{screen/ScreenHandlerType.mapping => menu/MenuType.mapping} (65%) rename mappings/net/minecraft/{screen/MerchantScreenHandler.mapping => menu/MerchantMenu.mapping} (94%) create mode 100644 mappings/net/minecraft/menu/NameableMenuFactory.mapping rename mappings/net/minecraft/{screen/PlayerScreenHandler.mapping => menu/PlayerMenu.mapping} (92%) rename mappings/net/minecraft/{screen/ShulkerBoxScreenHandler.mapping => menu/ShulkerBoxMenu.mapping} (72%) create mode 100644 mappings/net/minecraft/menu/ShulkerBoxSlot.mapping rename mappings/net/minecraft/{screen/SimpleNamedScreenHandlerFactory.mapping => menu/SimpleNamedMenuFactory.mapping} (71%) rename mappings/net/minecraft/{screen/slot => menu}/Slot.mapping (93%) create mode 100644 mappings/net/minecraft/menu/SlotActionType.mapping rename mappings/net/minecraft/{screen/SmithingScreenHandler.mapping => menu/SmithingTableMenu.mapping} (77%) rename mappings/net/minecraft/{screen/BlastFurnaceScreenHandler.mapping => menu/SmokerMenu.mapping} (69%) rename mappings/net/minecraft/{screen/StonecutterScreenHandler.mapping => menu/StonecutterMenu.mapping} (93%) rename mappings/net/minecraft/{screen/slot => menu}/TradeOutputSlot.mapping (83%) create mode 100644 mappings/net/minecraft/menu/property/ArrayPropertyDelegate.mapping rename mappings/net/minecraft/{screen => menu/property}/Property.mapping (82%) rename mappings/net/minecraft/{screen => menu/property}/PropertyDelegate.mapping (55%) rename mappings/net/minecraft/network/packet/c2s/play/{ClickWindowC2SPacket.mapping => ClickSlotC2SPacket.mapping} (85%) create mode 100644 mappings/net/minecraft/network/packet/c2s/play/CloseMenuS2CPacket.mapping delete mode 100644 mappings/net/minecraft/network/packet/c2s/play/GuiCloseC2SPacket.mapping rename mappings/net/minecraft/network/packet/s2c/play/{CloseScreenS2CPacket.mapping => CloseMenuS2CPacket.mapping} (83%) rename mappings/net/minecraft/network/packet/s2c/play/{ScreenHandlerPropertyUpdateS2CPacket.mapping => MenuPropertyUpdateS2CPacket.mapping} (88%) rename mappings/net/minecraft/network/packet/s2c/play/{ScreenHandlerSlotUpdateS2CPacket.mapping => MenuSlotUpdateS2CPacket.mapping} (91%) rename mappings/net/minecraft/network/packet/s2c/play/{OpenHorseScreenS2CPacket.mapping => OpenHorseMenuS2CPacket.mapping} (91%) rename mappings/net/minecraft/network/packet/s2c/play/{OpenScreenS2CPacket.mapping => OpenMenuS2CPacket.mapping} (72%) delete mode 100644 mappings/net/minecraft/screen/ArrayPropertyDelegate.mapping delete mode 100644 mappings/net/minecraft/screen/NameableScreenHandlerFactory.mapping delete mode 100644 mappings/net/minecraft/screen/ScreenHandlerListener.mapping delete mode 100644 mappings/net/minecraft/screen/slot/ShulkerBoxSlot.mapping delete mode 100644 mappings/net/minecraft/screen/slot/SlotActionType.mapping diff --git a/CONVENTIONS.md b/CONVENTIONS.md index a7db58a81c..7b375fd878 100644 --- a/CONVENTIONS.md +++ b/CONVENTIONS.md @@ -124,10 +124,9 @@ example, don't name a class that Mojang calls `BedrockBlock` `NoSpawningBlock`, spawning, because Mojang may decide to override more methods in that class, breaking mods that were using it in an unexpected way. -There are however three exceptions to this rule: +There are however two exceptions to this rule: - Use "world" for what Mojang calls "level" (see https://github.com/FabricMC/yarn/issues/89) - - Use "screen handler" or "handler" (depending on context; if the screen part is obvious it can be omitted) for what Mojang calls "menu" (see https://github.com/FabricMC/yarn/pull/1106) - - Use "inventory" for what Mojang calls "container" (no issue yet) + - Use "inventory" for what Mojang calls "container" (no issue yet, requires renaming "container" first) ## Things to avoid diff --git a/mappings/net/minecraft/block/AbstractFurnaceBlock.mapping b/mappings/net/minecraft/block/AbstractFurnaceBlock.mapping index 3dc01b44b7..42b9925ca9 100644 --- a/mappings/net/minecraft/block/AbstractFurnaceBlock.mapping +++ b/mappings/net/minecraft/block/AbstractFurnaceBlock.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_2363 net/minecraft/block/AbstractFurnaceBlock FIELD field_11104 FACING Lnet/minecraft/class_2753; FIELD field_11105 LIT Lnet/minecraft/class_2746; - METHOD method_17025 openScreen (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;)V + METHOD method_17025 openMenu (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;)V ARG 1 world ARG 2 pos ARG 3 player diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index e4a8225098..bda0a46988 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -34,7 +34,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 2 world ARG 3 pos METHOD method_16841 getOffsetType ()Lnet/minecraft/class_2248$class_2250; - METHOD method_17454 createScreenHandlerFactory (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3908; + METHOD method_17454 createMenuFactory (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3908; ARG 1 state ARG 2 world ARG 3 pos diff --git a/mappings/net/minecraft/block/BlockState.mapping b/mappings/net/minecraft/block/BlockState.mapping index 8a0fe404f6..9e740f2dec 100644 --- a/mappings/net/minecraft/block/BlockState.mapping +++ b/mappings/net/minecraft/block/BlockState.mapping @@ -180,7 +180,7 @@ CLASS net/minecraft/class_2680 net/minecraft/block/BlockState METHOD method_16550 serialize (Lcom/mojang/datafixers/types/DynamicOps;Lnet/minecraft/class_2680;)Lcom/mojang/datafixers/Dynamic; ARG 0 ops ARG 1 state - METHOD method_17526 createContainerFactory (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3908; + METHOD method_17526 createMenuFactory (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3908; ARG 1 world ARG 2 pos METHOD method_17770 getOutlineShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; diff --git a/mappings/net/minecraft/block/LecternBlock.mapping b/mappings/net/minecraft/block/LecternBlock.mapping index 70249f435c..30b7922119 100644 --- a/mappings/net/minecraft/block/LecternBlock.mapping +++ b/mappings/net/minecraft/block/LecternBlock.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_3715 net/minecraft/block/LecternBlock FIELD field_17370 NORTH_SHAPE Lnet/minecraft/class_265; FIELD field_17371 EAST_SHAPE Lnet/minecraft/class_265; FIELD field_17372 SOUTH_SHAPE Lnet/minecraft/class_265; - METHOD method_17470 openScreen (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;)V + METHOD method_17470 openMenu (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;)V ARG 1 world ARG 2 pos ARG 3 player diff --git a/mappings/net/minecraft/block/entity/LockableContainerBlockEntity.mapping b/mappings/net/minecraft/block/entity/LockableContainerBlockEntity.mapping index 4c6872892e..ae8b110066 100644 --- a/mappings/net/minecraft/block/entity/LockableContainerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/LockableContainerBlockEntity.mapping @@ -10,4 +10,6 @@ CLASS net/minecraft/class_2624 net/minecraft/block/entity/LockableContainerBlock METHOD method_17489 checkUnlocked (Lnet/minecraft/class_1657;)Z ARG 1 player METHOD method_17823 getContainerName ()Lnet/minecraft/class_2561; - METHOD method_5465 createContainer (ILnet/minecraft/class_1661;)Lnet/minecraft/class_1703; + METHOD method_5465 createMenu (ILnet/minecraft/class_1661;)Lnet/minecraft/class_1703; + ARG 1 syncId + ARG 2 inv diff --git a/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping b/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping index 993ff0963e..a538c903ce 100644 --- a/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping @@ -15,3 +15,4 @@ CLASS net/minecraft/class_2621 net/minecraft/block/entity/LootableContainerBlock ARG 2 pos ARG 3 id METHOD method_11289 checkLootInteraction (Lnet/minecraft/class_1657;)V + ARG 1 player diff --git a/mappings/net/minecraft/client/gui/screen/ingame/AbstractFurnaceScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/AbstractFurnaceScreen.mapping index 4f7afe2789..71f3fe14d4 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/AbstractFurnaceScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/AbstractFurnaceScreen.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_489 net/minecraft/client/gui/screen/ingame/AbstractFur FIELD field_2925 narrow Z FIELD field_2926 RECIPE_BUTTON_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_1720;Lnet/minecraft/class_517;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;Lnet/minecraft/class_2960;)V - ARG 1 handler + ARG 1 menu ARG 2 recipeBook ARG 3 inventory ARG 4 title diff --git a/mappings/net/minecraft/client/gui/screen/ingame/AnvilScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/AnvilScreen.mapping index a98922a7bb..ee415dacf8 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/AnvilScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/AnvilScreen.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_471 net/minecraft/client/gui/screen/ingame/AnvilScreen - FIELD field_2819 TEXTURE Lnet/minecraft/class_2960; + FIELD field_2819 BG_TEX Lnet/minecraft/class_2960; FIELD field_2821 nameField Lnet/minecraft/class_342; METHOD (Lnet/minecraft/class_1706;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 handler + ARG 1 menu ARG 2 inventory ARG 3 title METHOD method_2403 onRenamed (Ljava/lang/String;)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping index 7b65fe340a..cbd043609b 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping @@ -3,9 +3,9 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree FIELD field_17413 secondaryEffect Lnet/minecraft/class_1291; FIELD field_2804 doneButton Lnet/minecraft/class_466$class_468; FIELD field_2805 consumeGem Z - FIELD field_2808 TEXTURE Lnet/minecraft/class_2960; + FIELD field_2808 BG_TEX Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_1704;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 handler + ARG 1 menu ARG 2 inventory ARG 3 title CLASS class_467 CancelButtonWidget diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BlastFurnaceScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BlastFurnaceScreen.mapping index 38eb4f56c0..b98c206fdc 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BlastFurnaceScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BlastFurnaceScreen.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3871 net/minecraft/client/gui/screen/ingame/BlastFurnaceScreen FIELD field_17115 BG_TEX Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_3705;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 container + ARG 1 menu ARG 2 inventory ARG 3 title diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BrewingStandScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BrewingStandScreen.mapping index dfef096b57..30fbc047ac 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BrewingStandScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BrewingStandScreen.mapping @@ -2,6 +2,6 @@ CLASS net/minecraft/class_472 net/minecraft/client/gui/screen/ingame/BrewingStan FIELD field_2823 TEXTURE Lnet/minecraft/class_2960; FIELD field_2824 BUBBLE_PROGRESS [I METHOD (Lnet/minecraft/class_1708;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 handler - ARG 2 inventory + ARG 1 container + ARG 2 playerInventory ARG 3 title diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping index c200b48600..dafb0cb572 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_3934 net/minecraft/client/gui/screen/ingame/CartographyTableScreen FIELD field_17421 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_3910;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 handler + ARG 1 container ARG 2 inventory ARG 3 title METHOD method_17566 drawMap (Lnet/minecraft/class_22;IIF)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CraftingTableScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CraftingTableScreen.mapping index 4a698ad944..4ad2ab44f2 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CraftingTableScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CraftingTableScreen.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_479 net/minecraft/client/gui/screen/ingame/CraftingTableScreen FIELD field_2877 isNarrow Z - FIELD field_2878 TEXTURE Lnet/minecraft/class_2960; - FIELD field_2880 recipeBook Lnet/minecraft/class_507; - FIELD field_2881 RECIPE_BUTTON_TEXTURE Lnet/minecraft/class_2960; + FIELD field_2878 BG_TEX Lnet/minecraft/class_2960; + FIELD field_2880 recipeBookGui Lnet/minecraft/class_507; + FIELD field_2881 RECIPE_BUTTON_TEX Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_1714;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 handler + ARG 1 menu ARG 2 inventory ARG 3 title diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping index 6f1e2b4195..01f657bd41 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping @@ -40,7 +40,11 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv ARG 2 mouseX ARG 3 mouseY CLASS class_482 LockableSlot - CLASS class_483 CreativeScreenHandler + METHOD (Lnet/minecraft/class_1263;III)V + ARG 1 invSlot + ARG 2 xPosition + ARG 3 yPosition + CLASS class_483 CreativeMenu FIELD field_2897 itemList Lnet/minecraft/class_2371; METHOD method_2473 scrollItems (F)V ARG 1 position diff --git a/mappings/net/minecraft/client/gui/screen/ingame/EnchantingScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/EnchantingScreen.mapping index 6a15d6eb83..79e9110fca 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/EnchantingScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/EnchantingScreen.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_486 net/minecraft/client/gui/screen/ingame/EnchantingS FIELD field_2914 pageAngle F FIELD field_2915 ticks I METHOD (Lnet/minecraft/class_1718;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 handler + ARG 1 menu ARG 2 inventory ARG 3 title METHOD method_2478 doTick ()V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/ForgingContainerScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/ForgingContainerScreen.mapping new file mode 100644 index 0000000000..eaf937e954 --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/ingame/ForgingContainerScreen.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_4894 net/minecraft/client/gui/screen/ingame/ForgingContainerScreen + FIELD field_22794 texture Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping deleted file mode 100644 index 321b41505b..0000000000 --- a/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/class_4894 net/minecraft/client/gui/screen/ingame/ForgingScreen - FIELD field_22794 texture Lnet/minecraft/class_2960; - METHOD method_25444 renderForeground (IIF)V - ARG 1 mouseX - ARG 2 mouseY - ARG 3 delta - METHOD method_25445 setup ()V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/Generic3x3ContainerScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/Generic3x3MenuScreen.mapping similarity index 83% rename from mappings/net/minecraft/client/gui/screen/ingame/Generic3x3ContainerScreen.mapping rename to mappings/net/minecraft/client/gui/screen/ingame/Generic3x3MenuScreen.mapping index 6286f43ef4..c6feb8f785 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/Generic3x3ContainerScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/Generic3x3MenuScreen.mapping @@ -1,6 +1,6 @@ -CLASS net/minecraft/class_480 net/minecraft/client/gui/screen/ingame/Generic3x3ContainerScreen +CLASS net/minecraft/class_480 net/minecraft/client/gui/screen/ingame/Generic3x3MenuScreen FIELD field_2885 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_1716;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 handler + ARG 1 menu ARG 2 inventory ARG 3 title diff --git a/mappings/net/minecraft/client/gui/screen/ingame/GenericContainerScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/GenericMenuScreen.mapping similarity index 86% rename from mappings/net/minecraft/client/gui/screen/ingame/GenericContainerScreen.mapping rename to mappings/net/minecraft/client/gui/screen/ingame/GenericMenuScreen.mapping index efdac026d6..02dc39cd87 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/GenericContainerScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/GenericMenuScreen.mapping @@ -1,7 +1,7 @@ -CLASS net/minecraft/class_476 net/minecraft/client/gui/screen/ingame/GenericContainerScreen +CLASS net/minecraft/class_476 net/minecraft/client/gui/screen/ingame/GenericMenuScreen FIELD field_2861 TEXTURE Lnet/minecraft/class_2960; FIELD field_2864 rows I METHOD (Lnet/minecraft/class_1707;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 handler + ARG 1 menu ARG 2 inventory ARG 3 title diff --git a/mappings/net/minecraft/client/gui/screen/ingame/GrindstoneScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/GrindstoneScreen.mapping index 2112d7b602..d2e6e0fe3f 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/GrindstoneScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/GrindstoneScreen.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3802 net/minecraft/client/gui/screen/ingame/GrindstoneScreen FIELD field_16769 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_3803;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 handler + ARG 1 container ARG 2 inventory ARG 3 title diff --git a/mappings/net/minecraft/client/gui/screen/ingame/HopperScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/HopperScreen.mapping index 7c47fbbacf..ebf3d5bcf6 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/HopperScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/HopperScreen.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_488 net/minecraft/client/gui/screen/ingame/HopperScreen FIELD field_2919 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_1722;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 handler + ARG 1 container ARG 2 inventory ARG 3 title diff --git a/mappings/net/minecraft/client/gui/screen/ingame/HorseScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/HorseScreen.mapping index 3619f9c050..af01da4eaf 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/HorseScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/HorseScreen.mapping @@ -4,6 +4,6 @@ CLASS net/minecraft/class_491 net/minecraft/client/gui/screen/ingame/HorseScreen FIELD field_2939 mouseX F FIELD field_2941 entity Lnet/minecraft/class_1496; METHOD (Lnet/minecraft/class_1724;Lnet/minecraft/class_1661;Lnet/minecraft/class_1496;)V - ARG 1 handler + ARG 1 container ARG 2 inventory ARG 3 entity diff --git a/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping index 9c9fdae9e7..08ecae1bcf 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_490 net/minecraft/client/gui/screen/ingame/InventorySc FIELD field_2930 isMouseDown Z FIELD field_2931 isNarrow Z FIELD field_2932 isOpen Z - FIELD field_2933 RECIPE_BUTTON_TEXTURE Lnet/minecraft/class_2960; + FIELD field_2933 RECIPE_BUTTON_TEX Lnet/minecraft/class_2960; FIELD field_2934 mouseY F FIELD field_2935 mouseX F METHOD (Lnet/minecraft/class_1657;)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/LecternScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/LecternScreen.mapping index f4b16cc6db..91ef302c7d 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/LecternScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/LecternScreen.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_3935 net/minecraft/client/gui/screen/ingame/LecternScreen - FIELD field_17422 container Lnet/minecraft/class_3916; + FIELD field_17422 menu Lnet/minecraft/class_3916; FIELD field_17423 listener Lnet/minecraft/class_1712; METHOD (Lnet/minecraft/class_3916;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 container + ARG 1 menu ARG 2 inventory ARG 3 title METHOD method_17572 sendButtonPressPacket (I)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping index c936e5d3e6..5545a11481 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_494 net/minecraft/client/gui/screen/ingame/LoomScreen FIELD field_2968 scrollPosition F FIELD field_2970 firstPatternButtonId I METHOD (Lnet/minecraft/class_1726;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 handler + ARG 1 container ARG 2 inventory ARG 3 title METHOD method_17576 onInventoryChanged ()V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/MenuProvider.mapping b/mappings/net/minecraft/client/gui/screen/ingame/MenuProvider.mapping new file mode 100644 index 0000000000..30b9553db9 --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/ingame/MenuProvider.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_3936 net/minecraft/client/gui/screen/ingame/MenuProvider + METHOD method_17577 getMenu ()Lnet/minecraft/class_1703; diff --git a/mappings/net/minecraft/client/gui/screen/ingame/ScreenWithHandler.mapping b/mappings/net/minecraft/client/gui/screen/ingame/MenuScreen.mapping similarity index 93% rename from mappings/net/minecraft/client/gui/screen/ingame/ScreenWithHandler.mapping rename to mappings/net/minecraft/client/gui/screen/ingame/MenuScreen.mapping index e92d45ad5b..baadd111f3 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/ScreenWithHandler.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/MenuScreen.mapping @@ -1,9 +1,9 @@ -CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/ScreenWithHandler +CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/MenuScreen FIELD field_17410 playerInventory Lnet/minecraft/class_1661; FIELD field_2776 x I FIELD field_2777 touchDragSlotStart Lnet/minecraft/class_1735; FIELD field_2778 heldButtonCode I - FIELD field_2779 backgroundHeight I + FIELD field_2779 menuHeight I FIELD field_2780 touchHoveredSlot Lnet/minecraft/class_1735; FIELD field_2781 touchDropTimer J FIELD field_2782 touchDragStack Lnet/minecraft/class_1799; @@ -16,12 +16,12 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/ScreenWithH FIELD field_2789 touchIsRightClickDrag Z FIELD field_2790 heldButtonType I FIELD field_2791 quickMovingStack Lnet/minecraft/class_1799; - FIELD field_2792 backgroundWidth I + FIELD field_2792 menuWidth I FIELD field_2793 cursorDragSlots Ljava/util/Set; FIELD field_2794 isCursorDragging Z FIELD field_2795 touchDropTime J FIELD field_2796 touchDropY I - FIELD field_2797 handler Lnet/minecraft/class_1703; + FIELD field_2797 menu Lnet/minecraft/class_1703; FIELD field_2798 cancelNextRelease Z FIELD field_2799 lastClickedSlot Lnet/minecraft/class_1735; FIELD field_2800 y I @@ -29,8 +29,8 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/ScreenWithH FIELD field_2802 touchDropOriginSlot Lnet/minecraft/class_1735; FIELD field_2803 draggedStackRemainder I METHOD (Lnet/minecraft/class_1703;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 handler - ARG 2 inventory + ARG 1 menu + ARG 2 playerInventory ARG 3 name METHOD method_2378 isPointWithinBounds (IIIIDD)Z ARG 1 xPosition diff --git a/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping index b14b0da23c..e0bf5727e3 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_492 net/minecraft/client/gui/screen/ingame/MerchantScr FIELD field_19164 scrolling Z FIELD field_2950 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_1728;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 handler + ARG 1 container ARG 2 inventory ARG 3 title METHOD method_19413 drawLevelInfo (IILnet/minecraft/class_1914;)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/ScreenHandlerProvider.mapping b/mappings/net/minecraft/client/gui/screen/ingame/ScreenHandlerProvider.mapping deleted file mode 100644 index 70bb3e5213..0000000000 --- a/mappings/net/minecraft/client/gui/screen/ingame/ScreenHandlerProvider.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_3936 net/minecraft/client/gui/screen/ingame/ScreenHandlerProvider - METHOD method_17577 getScreenHandler ()Lnet/minecraft/class_1703; diff --git a/mappings/net/minecraft/client/gui/screen/ingame/ShulkerBoxScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/ShulkerBoxScreen.mapping index a8e9ca37dc..00e6a0ec86 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/ShulkerBoxScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/ShulkerBoxScreen.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_495 net/minecraft/client/gui/screen/ingame/ShulkerBoxScreen FIELD field_2973 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_1733;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 handler + ARG 1 container ARG 2 inventory ARG 3 title diff --git a/mappings/net/minecraft/client/gui/screen/ingame/SmithingScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/SmithingContainerScreen.mapping similarity index 84% rename from mappings/net/minecraft/client/gui/screen/ingame/SmithingScreen.mapping rename to mappings/net/minecraft/client/gui/screen/ingame/SmithingContainerScreen.mapping index d9c7462422..69e17ebeea 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/SmithingScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/SmithingContainerScreen.mapping @@ -1,6 +1,6 @@ -CLASS net/minecraft/class_4895 net/minecraft/client/gui/screen/ingame/SmithingScreen +CLASS net/minecraft/class_4895 net/minecraft/client/gui/screen/ingame/SmithingContainerScreen FIELD field_22795 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_4862;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 handler + ARG 1 container ARG 2 playerInventory ARG 3 title diff --git a/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping index 8783b177b3..62f47331d6 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_3979 net/minecraft/client/gui/screen/ingame/Stonecutte FIELD field_17673 TEXTURE Lnet/minecraft/class_2960; FIELD field_17674 scrollAmount F METHOD (Lnet/minecraft/class_3971;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 handler + ARG 1 container ARG 2 inventory ARG 3 title METHOD method_17951 renderRecipeIcons (III)V diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/AnimatedResultButton.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/AnimatedResultButton.mapping index 99d0690508..18498ac32a 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/AnimatedResultButton.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/AnimatedResultButton.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_514 net/minecraft/client/gui/screen/recipebook/AnimatedResultButton - FIELD field_3137 craftingScreenHandler Lnet/minecraft/class_1729; + FIELD field_3137 craftingMenu Lnet/minecraft/class_1729; FIELD field_3138 recipeBook Lnet/minecraft/class_3439; FIELD field_3139 bounce F FIELD field_3140 time F diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping index 7e014c758b..27b178ae22 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB FIELD field_3092 ghostSlots Lnet/minecraft/class_505; FIELD field_3093 cachedInvChangeCount I FIELD field_3094 tabButtons Ljava/util/List; - FIELD field_3095 craftingScreenHandler Lnet/minecraft/class_1729; + FIELD field_3095 craftingMenu Lnet/minecraft/class_1729; FIELD field_3096 recipeBook Lnet/minecraft/class_299; FIELD field_3097 TEXTURE Lnet/minecraft/class_2960; FIELD field_3098 currentTab Lnet/minecraft/class_512; @@ -37,7 +37,7 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB METHOD method_2595 findLeftEdge (ZII)I ARG 1 narrow ARG 2 width - ARG 3 parentWidth + ARG 3 menuWidth METHOD method_2596 showGhostRecipe (Lnet/minecraft/class_1860;Ljava/util/List;)V ARG 1 recipe ARG 2 slots @@ -46,7 +46,7 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB ARG 2 parentHeight ARG 3 client ARG 4 isNarrow - ARG 5 craftingScreenHandler + ARG 5 craftingMenu METHOD method_2598 isClickOutsideBounds (DDIIIII)Z METHOD method_2599 getCraftableButtonText ()Ljava/lang/String; METHOD method_2600 slotClicked (Lnet/minecraft/class_1735;)V diff --git a/mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping b/mappings/net/minecraft/client/recipe/book/ClientRecipeBook.mapping similarity index 80% rename from mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping rename to mappings/net/minecraft/client/recipe/book/ClientRecipeBook.mapping index 78b11aa71b..635de5d379 100644 --- a/mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping +++ b/mappings/net/minecraft/client/recipe/book/ClientRecipeBook.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_299 net/minecraft/client/recipebook/ClientRecipeBook +CLASS net/minecraft/class_299 net/minecraft/client/recipe/book/ClientRecipeBook FIELD field_1637 orderedResults Ljava/util/List; FIELD field_1638 resultsByGroup Ljava/util/Map; FIELD field_1639 manager Lnet/minecraft/class_1863; @@ -7,8 +7,8 @@ CLASS net/minecraft/class_299 net/minecraft/client/recipebook/ClientRecipeBook METHOD method_1393 getOrderedResults ()Ljava/util/List; METHOD method_1394 addGroup (Lnet/minecraft/class_314;)Lnet/minecraft/class_516; ARG 1 group - METHOD method_1395 getGroups (Lnet/minecraft/class_1729;)Ljava/util/List; - ARG 0 handler + METHOD method_1395 getGroupsForMenu (Lnet/minecraft/class_1729;)Ljava/util/List; + ARG 0 menu METHOD method_1396 getResultsForGroup (Lnet/minecraft/class_314;)Ljava/util/List; ARG 1 category METHOD method_1400 getGroupForRecipe (Lnet/minecraft/class_1860;)Lnet/minecraft/class_314; diff --git a/mappings/net/minecraft/client/recipebook/RecipeBookGroup.mapping b/mappings/net/minecraft/client/recipe/book/RecipeBookGroup.mapping similarity index 68% rename from mappings/net/minecraft/client/recipebook/RecipeBookGroup.mapping rename to mappings/net/minecraft/client/recipe/book/RecipeBookGroup.mapping index c19ee94a08..867861ffe9 100644 --- a/mappings/net/minecraft/client/recipebook/RecipeBookGroup.mapping +++ b/mappings/net/minecraft/client/recipe/book/RecipeBookGroup.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_314 net/minecraft/client/recipebook/RecipeBookGroup +CLASS net/minecraft/class_314 net/minecraft/client/recipe/book/RecipeBookGroup FIELD field_1807 icons Ljava/util/List; METHOD (Ljava/lang/String;I[Lnet/minecraft/class_1799;)V ARG 3 entries diff --git a/mappings/net/minecraft/data/client/model/ModelIds.mapping b/mappings/net/minecraft/data/client/model/ModelIds.mapping index d9026d513b..a7ef6b3bc9 100644 --- a/mappings/net/minecraft/data/client/model/ModelIds.mapping +++ b/mappings/net/minecraft/data/client/model/ModelIds.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_4941 net/minecraft/data/client/model/ModelIds METHOD method_25843 getBlockSubModelId (Lnet/minecraft/class_2248;Ljava/lang/String;)Lnet/minecraft/class_2960; ARG 0 block ARG 1 suffix - METHOD method_25844 getMinecraftNamespacedBlock (Ljava/lang/String;)Lnet/minecraft/class_2960; + METHOD method_25844 getMinecraftBlock (Ljava/lang/String;)Lnet/minecraft/class_2960; ARG 0 name - METHOD method_25845 getMinecraftNamespacedItem (Ljava/lang/String;)Lnet/minecraft/class_2960; + METHOD method_25845 getMinecraftItem (Ljava/lang/String;)Lnet/minecraft/class_2960; ARG 0 name diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 0e6a556ad1..b946374717 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity FIELD field_7494 enchantmentTableSeed I FIELD field_7495 totalExperience I FIELD field_7496 LEFT_SHOULDER_ENTITY Lnet/minecraft/class_2940; - FIELD field_7498 playerScreenHandler Lnet/minecraft/class_1723; + FIELD field_7498 playerMenu Lnet/minecraft/class_1723; FIELD field_7499 capeZ D FIELD field_7500 capeX D FIELD field_7501 spawnPosition Lnet/minecraft/class_2338; @@ -27,7 +27,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity FIELD field_7508 lastPlayedLevelUpSoundTime I FIELD field_7510 experienceProgress F FIELD field_7511 SCORE Lnet/minecraft/class_2940; - FIELD field_7512 currentScreenHandler Lnet/minecraft/class_1703; + FIELD field_7512 menu Lnet/minecraft/class_1703; FIELD field_7513 fishHook Lnet/minecraft/class_1536; FIELD field_7514 inventory Lnet/minecraft/class_1661; FIELD field_7515 spawnForced Z @@ -51,8 +51,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 4 experience ARG 5 leveled ARG 6 refreshable - METHOD method_17355 openHandledScreen (Lnet/minecraft/class_3908;)Ljava/util/OptionalInt; - ARG 1 factory + METHOD method_17355 openMenu (Lnet/minecraft/class_3908;)Ljava/util/OptionalInt; METHOD method_17356 playSound (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FF)V ARG 1 event ARG 2 category @@ -218,7 +217,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity METHOD method_7344 getHungerManager ()Lnet/minecraft/class_1702; METHOD method_7345 setShoulderEntityRight (Lnet/minecraft/class_2487;)V ARG 1 entityTag - METHOD method_7346 closeHandledScreen ()V + METHOD method_7346 closeMenu ()V METHOD method_7348 isPartVisible (Lnet/minecraft/class_1664;)Z ARG 1 modelPart METHOD method_7349 getNextLevelExperience ()I diff --git a/mappings/net/minecraft/entity/vehicle/StorageMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/StorageMinecartEntity.mapping index 121da56554..3a909e564e 100644 --- a/mappings/net/minecraft/entity/vehicle/StorageMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/StorageMinecartEntity.mapping @@ -8,8 +8,11 @@ CLASS net/minecraft/class_1693 net/minecraft/entity/vehicle/StorageMinecartEntit ARG 4 y ARG 6 z ARG 8 world - METHOD method_17357 getScreenHandler (ILnet/minecraft/class_1661;)Lnet/minecraft/class_1703; + METHOD method_17357 createMenu (ILnet/minecraft/class_1661;)Lnet/minecraft/class_1703; ARG 1 syncId ARG 2 playerInventory METHOD method_7562 setLootTable (Lnet/minecraft/class_2960;J)V ARG 1 id + ARG 2 seed + METHOD method_7563 checkLootInteraction (Lnet/minecraft/class_1657;)V + ARG 1 player diff --git a/mappings/net/minecraft/inventory/CraftingInventory.mapping b/mappings/net/minecraft/inventory/CraftingInventory.mapping index 451b2d3ac0..1e47a040df 100644 --- a/mappings/net/minecraft/inventory/CraftingInventory.mapping +++ b/mappings/net/minecraft/inventory/CraftingInventory.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_1715 net/minecraft/inventory/CraftingInventory - FIELD field_7802 handler Lnet/minecraft/class_1703; + FIELD field_7802 menu Lnet/minecraft/class_1703; FIELD field_7803 height I FIELD field_7804 width I FIELD field_7805 stacks Lnet/minecraft/class_2371; METHOD (Lnet/minecraft/class_1703;II)V - ARG 1 handler + ARG 1 menu ARG 2 width ARG 3 height METHOD method_17397 getHeight ()I diff --git a/mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping b/mappings/net/minecraft/menu/AbstractFurnaceMenu.mapping similarity index 78% rename from mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping rename to mappings/net/minecraft/menu/AbstractFurnaceMenu.mapping index f72afa8023..fbcd7a768e 100644 --- a/mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping +++ b/mappings/net/minecraft/menu/AbstractFurnaceMenu.mapping @@ -1,12 +1,20 @@ -CLASS net/minecraft/class_1720 net/minecraft/screen/AbstractFurnaceScreenHandler +CLASS net/minecraft/class_1720 net/minecraft/menu/AbstractFurnaceMenu FIELD field_17286 propertyDelegate Lnet/minecraft/class_3913; FIELD field_17494 recipeType Lnet/minecraft/class_3956; FIELD field_7822 world Lnet/minecraft/class_1937; FIELD field_7824 inventory Lnet/minecraft/class_1263; METHOD (Lnet/minecraft/class_3917;Lnet/minecraft/class_3956;ILnet/minecraft/class_1661;)V + ARG 1 type + ARG 2 recipeType ARG 3 syncId + ARG 4 playerInventory METHOD (Lnet/minecraft/class_3917;Lnet/minecraft/class_3956;ILnet/minecraft/class_1661;Lnet/minecraft/class_1263;Lnet/minecraft/class_3913;)V + ARG 1 type + ARG 2 recipeType ARG 3 syncId + ARG 4 playerInventory + ARG 5 inventory + ARG 6 properties METHOD method_16945 isFuel (Lnet/minecraft/class_1799;)Z ARG 1 itemStack METHOD method_17363 getCookProgress ()I diff --git a/mappings/net/minecraft/screen/AnvilScreenHandler.mapping b/mappings/net/minecraft/menu/AnvilMenu.mapping similarity index 82% rename from mappings/net/minecraft/screen/AnvilScreenHandler.mapping rename to mappings/net/minecraft/menu/AnvilMenu.mapping index be129000f3..fbe15c93d0 100644 --- a/mappings/net/minecraft/screen/AnvilScreenHandler.mapping +++ b/mappings/net/minecraft/menu/AnvilMenu.mapping @@ -1,4 +1,5 @@ -CLASS net/minecraft/class_1706 net/minecraft/screen/AnvilScreenHandler +CLASS net/minecraft/class_1706 net/minecraft/menu/AnvilMenu + FIELD field_7769 result Lnet/minecraft/class_1263; FIELD field_7770 levelCost Lnet/minecraft/class_3915; FIELD field_7771 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_7774 newItemName Ljava/lang/String; diff --git a/mappings/net/minecraft/screen/BeaconScreenHandler.mapping b/mappings/net/minecraft/menu/BeaconMenu.mapping similarity index 91% rename from mappings/net/minecraft/screen/BeaconScreenHandler.mapping rename to mappings/net/minecraft/menu/BeaconMenu.mapping index 808ef1b265..eaf5d79536 100644 --- a/mappings/net/minecraft/screen/BeaconScreenHandler.mapping +++ b/mappings/net/minecraft/menu/BeaconMenu.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1704 net/minecraft/screen/BeaconScreenHandler +CLASS net/minecraft/class_1704 net/minecraft/menu/BeaconMenu FIELD field_17287 paymentInv Lnet/minecraft/class_1263; FIELD field_17288 paymentSlot Lnet/minecraft/class_1704$class_1705; FIELD field_17289 context Lnet/minecraft/class_3914; diff --git a/mappings/net/minecraft/screen/SmokerScreenHandler.mapping b/mappings/net/minecraft/menu/BlastFurnaceMenu.mapping similarity index 70% rename from mappings/net/minecraft/screen/SmokerScreenHandler.mapping rename to mappings/net/minecraft/menu/BlastFurnaceMenu.mapping index f3492407bb..805562bae2 100644 --- a/mappings/net/minecraft/screen/SmokerScreenHandler.mapping +++ b/mappings/net/minecraft/menu/BlastFurnaceMenu.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3706 net/minecraft/screen/SmokerScreenHandler +CLASS net/minecraft/class_3705 net/minecraft/menu/BlastFurnaceMenu METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId METHOD (ILnet/minecraft/class_1661;Lnet/minecraft/class_1263;Lnet/minecraft/class_3913;)V diff --git a/mappings/net/minecraft/screen/BlockContext.mapping b/mappings/net/minecraft/menu/BlockContext.mapping similarity index 90% rename from mappings/net/minecraft/screen/BlockContext.mapping rename to mappings/net/minecraft/menu/BlockContext.mapping index 3a2985aafe..53619858d6 100644 --- a/mappings/net/minecraft/screen/BlockContext.mapping +++ b/mappings/net/minecraft/menu/BlockContext.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3914 net/minecraft/screen/BlockContext +CLASS net/minecraft/class_3914 net/minecraft/menu/BlockContext COMMENT Block contexts allow to get a value using an optionally present {@link World} and {@link BlockPos}. FIELD field_17304 EMPTY Lnet/minecraft/class_3914; METHOD method_17392 create (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3914; diff --git a/mappings/net/minecraft/screen/BrewingStandScreenHandler.mapping b/mappings/net/minecraft/menu/BrewingStandMenu.mapping similarity index 86% rename from mappings/net/minecraft/screen/BrewingStandScreenHandler.mapping rename to mappings/net/minecraft/menu/BrewingStandMenu.mapping index 29cca0e361..adff2e8832 100644 --- a/mappings/net/minecraft/screen/BrewingStandScreenHandler.mapping +++ b/mappings/net/minecraft/menu/BrewingStandMenu.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1708 net/minecraft/screen/BrewingStandScreenHandler +CLASS net/minecraft/class_1708 net/minecraft/menu/BrewingStandMenu FIELD field_17292 propertyDelegate Lnet/minecraft/class_3913; FIELD field_7787 ingredientSlot Lnet/minecraft/class_1735; FIELD field_7788 inventory Lnet/minecraft/class_1263; diff --git a/mappings/net/minecraft/screen/CartographyTableScreenHandler.mapping b/mappings/net/minecraft/menu/CartographyTableMenu.mapping similarity index 88% rename from mappings/net/minecraft/screen/CartographyTableScreenHandler.mapping rename to mappings/net/minecraft/menu/CartographyTableMenu.mapping index c0b9346dfa..e86370d46f 100644 --- a/mappings/net/minecraft/screen/CartographyTableScreenHandler.mapping +++ b/mappings/net/minecraft/menu/CartographyTableMenu.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3910 net/minecraft/screen/CartographyTableScreenHandler +CLASS net/minecraft/class_3910 net/minecraft/menu/CartographyTableMenu FIELD field_17293 inventory Lnet/minecraft/class_1263; FIELD field_17294 context Lnet/minecraft/class_3914; FIELD field_17295 currentlyTakingItem Z diff --git a/mappings/net/minecraft/screen/CraftingScreenHandler.mapping b/mappings/net/minecraft/menu/CraftingMenu.mapping similarity index 85% rename from mappings/net/minecraft/screen/CraftingScreenHandler.mapping rename to mappings/net/minecraft/menu/CraftingMenu.mapping index 54d705267d..677953bd64 100644 --- a/mappings/net/minecraft/screen/CraftingScreenHandler.mapping +++ b/mappings/net/minecraft/menu/CraftingMenu.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1729 net/minecraft/screen/CraftingScreenHandler +CLASS net/minecraft/class_1729 net/minecraft/menu/CraftingMenu METHOD method_17697 fillInputSlots (ZLnet/minecraft/class_1860;Lnet/minecraft/class_3222;)V METHOD method_7652 matches (Lnet/minecraft/class_1860;)Z METHOD method_7653 getCraftingWidth ()I diff --git a/mappings/net/minecraft/screen/slot/CraftingResultSlot.mapping b/mappings/net/minecraft/menu/CraftingResultSlot.mapping similarity index 81% rename from mappings/net/minecraft/screen/slot/CraftingResultSlot.mapping rename to mappings/net/minecraft/menu/CraftingResultSlot.mapping index 1fd43af7a7..e095138445 100644 --- a/mappings/net/minecraft/screen/slot/CraftingResultSlot.mapping +++ b/mappings/net/minecraft/menu/CraftingResultSlot.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1734 net/minecraft/screen/slot/CraftingResultSlot +CLASS net/minecraft/class_1734 net/minecraft/menu/CraftingResultSlot FIELD field_7868 player Lnet/minecraft/class_1657; FIELD field_7869 amount I FIELD field_7870 craftingInv Lnet/minecraft/class_1715; diff --git a/mappings/net/minecraft/screen/CraftingTableScreenHandler.mapping b/mappings/net/minecraft/menu/CraftingTableMenu.mapping similarity index 88% rename from mappings/net/minecraft/screen/CraftingTableScreenHandler.mapping rename to mappings/net/minecraft/menu/CraftingTableMenu.mapping index 3549c8bea0..864db85dc2 100644 --- a/mappings/net/minecraft/screen/CraftingTableScreenHandler.mapping +++ b/mappings/net/minecraft/menu/CraftingTableMenu.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1714 net/minecraft/screen/CraftingTableScreenHandler +CLASS net/minecraft/class_1714 net/minecraft/menu/CraftingTableMenu FIELD field_7797 player Lnet/minecraft/class_1657; FIELD field_7799 context Lnet/minecraft/class_3914; FIELD field_7800 resultInv Lnet/minecraft/class_1731; diff --git a/mappings/net/minecraft/screen/EnchantingTableScreenHandler.mapping b/mappings/net/minecraft/menu/EnchantingTableMenu.mapping similarity index 88% rename from mappings/net/minecraft/screen/EnchantingTableScreenHandler.mapping rename to mappings/net/minecraft/menu/EnchantingTableMenu.mapping index ee65e64da7..fbae7ab238 100644 --- a/mappings/net/minecraft/screen/EnchantingTableScreenHandler.mapping +++ b/mappings/net/minecraft/menu/EnchantingTableMenu.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1718 net/minecraft/screen/EnchantingTableScreenHandler +CLASS net/minecraft/class_1718 net/minecraft/menu/EnchantingTableMenu FIELD field_7808 enchantmentPower [I FIELD field_7809 inventory Lnet/minecraft/class_1263; FIELD field_7810 enchantmentLevel [I diff --git a/mappings/net/minecraft/screen/ForgingScreenHandler.mapping b/mappings/net/minecraft/menu/ForgingMenu.mapping similarity index 90% rename from mappings/net/minecraft/screen/ForgingScreenHandler.mapping rename to mappings/net/minecraft/menu/ForgingMenu.mapping index afd97482d5..102159b4f5 100644 --- a/mappings/net/minecraft/screen/ForgingScreenHandler.mapping +++ b/mappings/net/minecraft/menu/ForgingMenu.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4861 net/minecraft/screen/ForgingScreenHandler +CLASS net/minecraft/class_4861 net/minecraft/menu/ForgingMenu FIELD field_22479 output Lnet/minecraft/class_1263; FIELD field_22480 input Lnet/minecraft/class_1263; FIELD field_22481 context Lnet/minecraft/class_3914; diff --git a/mappings/net/minecraft/screen/slot/FurnaceFuelSlot.mapping b/mappings/net/minecraft/menu/FurnaceFuelSlot.mapping similarity index 58% rename from mappings/net/minecraft/screen/slot/FurnaceFuelSlot.mapping rename to mappings/net/minecraft/menu/FurnaceFuelSlot.mapping index 73752cd362..9d24ae6d05 100644 --- a/mappings/net/minecraft/screen/slot/FurnaceFuelSlot.mapping +++ b/mappings/net/minecraft/menu/FurnaceFuelSlot.mapping @@ -1,7 +1,6 @@ -CLASS net/minecraft/class_1717 net/minecraft/screen/slot/FurnaceFuelSlot - FIELD field_17083 handler Lnet/minecraft/class_1720; +CLASS net/minecraft/class_1717 net/minecraft/menu/FurnaceFuelSlot + FIELD field_17083 menu Lnet/minecraft/class_1720; METHOD (Lnet/minecraft/class_1720;Lnet/minecraft/class_1263;III)V - ARG 1 handler ARG 3 invSlot ARG 4 xPosition ARG 5 yPosition diff --git a/mappings/net/minecraft/screen/FurnaceScreenHandler.mapping b/mappings/net/minecraft/menu/FurnaceMenu.mapping similarity index 70% rename from mappings/net/minecraft/screen/FurnaceScreenHandler.mapping rename to mappings/net/minecraft/menu/FurnaceMenu.mapping index 42ac3b7559..6187f0686a 100644 --- a/mappings/net/minecraft/screen/FurnaceScreenHandler.mapping +++ b/mappings/net/minecraft/menu/FurnaceMenu.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3858 net/minecraft/screen/FurnaceScreenHandler +CLASS net/minecraft/class_3858 net/minecraft/menu/FurnaceMenu METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId METHOD (ILnet/minecraft/class_1661;Lnet/minecraft/class_1263;Lnet/minecraft/class_3913;)V diff --git a/mappings/net/minecraft/screen/slot/FurnaceOutputSlot.mapping b/mappings/net/minecraft/menu/FurnaceOutputSlot.mapping similarity index 71% rename from mappings/net/minecraft/screen/slot/FurnaceOutputSlot.mapping rename to mappings/net/minecraft/menu/FurnaceOutputSlot.mapping index e2a66f95bc..45b23bce26 100644 --- a/mappings/net/minecraft/screen/slot/FurnaceOutputSlot.mapping +++ b/mappings/net/minecraft/menu/FurnaceOutputSlot.mapping @@ -1,8 +1,9 @@ -CLASS net/minecraft/class_1719 net/minecraft/screen/slot/FurnaceOutputSlot +CLASS net/minecraft/class_1719 net/minecraft/menu/FurnaceOutputSlot FIELD field_7818 player Lnet/minecraft/class_1657; FIELD field_7819 amount I METHOD (Lnet/minecraft/class_1657;Lnet/minecraft/class_1263;III)V ARG 1 player + ARG 2 inventory ARG 3 invSlot ARG 4 xPosition ARG 5 yPosition diff --git a/mappings/net/minecraft/screen/Generic3x3ContainerScreenHandler.mapping b/mappings/net/minecraft/menu/Generic3x3Menu.mapping similarity index 59% rename from mappings/net/minecraft/screen/Generic3x3ContainerScreenHandler.mapping rename to mappings/net/minecraft/menu/Generic3x3Menu.mapping index 8d140a1cf7..bc889c4285 100644 --- a/mappings/net/minecraft/screen/Generic3x3ContainerScreenHandler.mapping +++ b/mappings/net/minecraft/menu/Generic3x3Menu.mapping @@ -1,4 +1,5 @@ -CLASS net/minecraft/class_1716 net/minecraft/screen/Generic3x3ContainerScreenHandler +CLASS net/minecraft/class_1716 net/minecraft/menu/Generic3x3Menu + COMMENT A generic 3x3 menu, used by blocks like dispensers and droppers. FIELD field_7806 inventory Lnet/minecraft/class_1263; METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId diff --git a/mappings/net/minecraft/screen/GenericContainerScreenHandler.mapping b/mappings/net/minecraft/menu/GenericMenu.mapping similarity index 71% rename from mappings/net/minecraft/screen/GenericContainerScreenHandler.mapping rename to mappings/net/minecraft/menu/GenericMenu.mapping index 0e17b7bb9b..6cfd827dbc 100644 --- a/mappings/net/minecraft/screen/GenericContainerScreenHandler.mapping +++ b/mappings/net/minecraft/menu/GenericMenu.mapping @@ -1,8 +1,20 @@ -CLASS net/minecraft/class_1707 net/minecraft/screen/GenericContainerScreenHandler +CLASS net/minecraft/class_1707 net/minecraft/menu/GenericMenu + COMMENT A generic menu with 9 columns and a customizable amount of rows. + COMMENT + COMMENT

The {@code createGeneric9xN} methods should usually be used only on the client, + COMMENT as they have an empty inventory by default. FIELD field_17495 inventory Lnet/minecraft/class_1263; FIELD field_17496 rows I + METHOD (Lnet/minecraft/class_3917;ILnet/minecraft/class_1661;I)V + ARG 1 type + ARG 2 syncId + ARG 3 playerInventory + ARG 4 rows METHOD (Lnet/minecraft/class_3917;ILnet/minecraft/class_1661;Lnet/minecraft/class_1263;I)V + ARG 1 type ARG 2 syncId + ARG 3 playerInventory + ARG 4 inventory ARG 5 rows METHOD method_17388 getRows ()I METHOD method_19244 createGeneric9x1 (ILnet/minecraft/class_1661;)Lnet/minecraft/class_1707; diff --git a/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping b/mappings/net/minecraft/menu/GrindstoneMenu.mapping similarity index 91% rename from mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping rename to mappings/net/minecraft/menu/GrindstoneMenu.mapping index 8ebde1f0e5..e6433b4aca 100644 --- a/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping +++ b/mappings/net/minecraft/menu/GrindstoneMenu.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3803 net/minecraft/screen/GrindstoneScreenHandler +CLASS net/minecraft/class_3803 net/minecraft/menu/GrindstoneMenu FIELD field_16772 craftingInventory Lnet/minecraft/class_1263; FIELD field_16773 resultInventory Lnet/minecraft/class_1263; FIELD field_16775 context Lnet/minecraft/class_3914; diff --git a/mappings/net/minecraft/screen/HopperScreenHandler.mapping b/mappings/net/minecraft/menu/HopperMenu.mapping similarity index 73% rename from mappings/net/minecraft/screen/HopperScreenHandler.mapping rename to mappings/net/minecraft/menu/HopperMenu.mapping index a3cfac4537..48d98b47b0 100644 --- a/mappings/net/minecraft/screen/HopperScreenHandler.mapping +++ b/mappings/net/minecraft/menu/HopperMenu.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1722 net/minecraft/screen/HopperScreenHandler +CLASS net/minecraft/class_1722 net/minecraft/menu/HopperMenu FIELD field_7826 inventory Lnet/minecraft/class_1263; METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId diff --git a/mappings/net/minecraft/screen/HorseScreenHandler.mapping b/mappings/net/minecraft/menu/HorseMenu.mapping similarity index 75% rename from mappings/net/minecraft/screen/HorseScreenHandler.mapping rename to mappings/net/minecraft/menu/HorseMenu.mapping index 4399790447..727ac8390c 100644 --- a/mappings/net/minecraft/screen/HorseScreenHandler.mapping +++ b/mappings/net/minecraft/menu/HorseMenu.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1724 net/minecraft/screen/HorseScreenHandler +CLASS net/minecraft/class_1724 net/minecraft/menu/HorseMenu FIELD field_7836 playerInv Lnet/minecraft/class_1263; FIELD field_7837 entity Lnet/minecraft/class_1496; METHOD (ILnet/minecraft/class_1661;Lnet/minecraft/class_1263;Lnet/minecraft/class_1496;)V diff --git a/mappings/net/minecraft/screen/LecternScreenHandler.mapping b/mappings/net/minecraft/menu/LecternMenu.mapping similarity index 82% rename from mappings/net/minecraft/screen/LecternScreenHandler.mapping rename to mappings/net/minecraft/menu/LecternMenu.mapping index f4ba6d5840..8dd8001dcd 100644 --- a/mappings/net/minecraft/screen/LecternScreenHandler.mapping +++ b/mappings/net/minecraft/menu/LecternMenu.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3916 net/minecraft/screen/LecternScreenHandler +CLASS net/minecraft/class_3916 net/minecraft/menu/LecternMenu FIELD field_17313 inventory Lnet/minecraft/class_1263; FIELD field_17314 propertyDelegate Lnet/minecraft/class_3913; METHOD (I)V diff --git a/mappings/net/minecraft/screen/LoomScreenHandler.mapping b/mappings/net/minecraft/menu/LoomMenu.mapping similarity index 94% rename from mappings/net/minecraft/screen/LoomScreenHandler.mapping rename to mappings/net/minecraft/menu/LoomMenu.mapping index 2e32653e71..2b91ce9c69 100644 --- a/mappings/net/minecraft/screen/LoomScreenHandler.mapping +++ b/mappings/net/minecraft/menu/LoomMenu.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1726 net/minecraft/screen/LoomScreenHandler +CLASS net/minecraft/class_1726 net/minecraft/menu/LoomMenu FIELD field_17316 context Lnet/minecraft/class_3914; FIELD field_17317 selectedPattern Lnet/minecraft/class_3915; FIELD field_17318 inventoryChangeListener Ljava/lang/Runnable; diff --git a/mappings/net/minecraft/screen/ScreenHandler.mapping b/mappings/net/minecraft/menu/Menu.mapping similarity index 79% rename from mappings/net/minecraft/screen/ScreenHandler.mapping rename to mappings/net/minecraft/menu/Menu.mapping index cde09f44f3..75eeb24489 100644 --- a/mappings/net/minecraft/screen/ScreenHandler.mapping +++ b/mappings/net/minecraft/menu/Menu.mapping @@ -1,4 +1,19 @@ -CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler +CLASS net/minecraft/class_1703 net/minecraft/menu/Menu + COMMENT A menu is a list of items and properties, synchronized between the server and the client. + COMMENT + COMMENT

Menus are usually used for syncing the GUIs of container blocks, + COMMENT and they have a list of {@linkplain Slot slots} that store items. + COMMENT The slots are usually controlled by the server. + COMMENT + COMMENT

Menus also contain a list of {@linkplain net.minecraft.menu.property.Property properties} + COMMENT that are used for syncing integers (e.g. progress bars) from the server to the client. + COMMENT + COMMENT

The {@link #syncId} is shared between the two sides. It is used to verify that a player + COMMENT has a menu open so that they can move items, for example. + COMMENT + COMMENT

On the client, menus are visualized by a {@link net.minecraft.client.gui.screen.ingame.MenuScreen}. + COMMENT Menu screens have a reference to a client-sided menu that is exposed through the + COMMENT {@link net.minecraft.client.gui.screen.ingame.MenuProvider} interface. FIELD field_17285 properties Ljava/util/List; FIELD field_17493 type Lnet/minecraft/class_3917; FIELD field_7757 quickCraftSlots Ljava/util/Set; @@ -21,6 +36,8 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler COMMENT @throws IllegalArgumentException if the inventory size is smaller than {@code exceptedSize} ARG 1 expectedSize METHOD method_17360 addProperties (Lnet/minecraft/class_3913;)V + COMMENT Adds all properties in the {@code data} to this menu. + ARG 1 data METHOD method_17361 checkContainerDataCount (Lnet/minecraft/class_3913;I)V COMMENT Checks that the size of the {@code data} is at least as large as the {@code exceptedCount}. COMMENT @@ -28,6 +45,7 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler ARG 0 data ARG 1 expectedCount METHOD method_17362 addProperty (Lnet/minecraft/class_3915;)Lnet/minecraft/class_3915; + ARG 1 property METHOD method_17695 canUse (Lnet/minecraft/class_3914;Lnet/minecraft/class_1657;Lnet/minecraft/class_2248;)Z ARG 0 context ARG 1 player @@ -58,6 +76,7 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler ARG 1 player ARG 2 invSlot METHOD method_7602 getStacks ()Lnet/minecraft/class_2371; + COMMENT Gets a list of item stacks stored in this menu's slots. METHOD method_7603 removeListener (Lnet/minecraft/class_1712;)V ARG 1 listener METHOD method_7604 onButtonClick (Lnet/minecraft/class_1657;I)Z diff --git a/mappings/net/minecraft/screen/ScreenHandlerFactory.mapping b/mappings/net/minecraft/menu/MenuFactory.mapping similarity index 66% rename from mappings/net/minecraft/screen/ScreenHandlerFactory.mapping rename to mappings/net/minecraft/menu/MenuFactory.mapping index 8b07bf1192..aa262e033e 100644 --- a/mappings/net/minecraft/screen/ScreenHandlerFactory.mapping +++ b/mappings/net/minecraft/menu/MenuFactory.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1270 net/minecraft/screen/ScreenHandlerFactory +CLASS net/minecraft/class_1270 net/minecraft/menu/MenuFactory METHOD createMenu (ILnet/minecraft/class_1661;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1703; ARG 1 syncId ARG 2 inv diff --git a/mappings/net/minecraft/menu/MenuListener.mapping b/mappings/net/minecraft/menu/MenuListener.mapping new file mode 100644 index 0000000000..caac51f216 --- /dev/null +++ b/mappings/net/minecraft/menu/MenuListener.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_1712 net/minecraft/menu/MenuListener + METHOD method_7633 onMenuPropertyUpdate (Lnet/minecraft/class_1703;II)V + ARG 1 menu + ARG 2 propertyId + ARG 3 value + METHOD method_7634 onMenuRegistered (Lnet/minecraft/class_1703;Lnet/minecraft/class_2371;)V + ARG 1 menu + ARG 2 stacks + METHOD method_7635 onMenuSlotUpdate (Lnet/minecraft/class_1703;ILnet/minecraft/class_1799;)V + ARG 1 menu + ARG 2 slotId + ARG 3 stack diff --git a/mappings/net/minecraft/screen/ScreenHandlerType.mapping b/mappings/net/minecraft/menu/MenuType.mapping similarity index 65% rename from mappings/net/minecraft/screen/ScreenHandlerType.mapping rename to mappings/net/minecraft/menu/MenuType.mapping index 7c68bc17ed..c8565d565b 100644 --- a/mappings/net/minecraft/screen/ScreenHandlerType.mapping +++ b/mappings/net/minecraft/menu/MenuType.mapping @@ -1,14 +1,17 @@ -CLASS net/minecraft/class_3917 net/minecraft/screen/ScreenHandlerType +CLASS net/minecraft/class_3917 net/minecraft/menu/MenuType + COMMENT Menu types are used to register and sync menus, and to create them on the client. FIELD field_17344 factory Lnet/minecraft/class_3917$class_3918; METHOD (Lnet/minecraft/class_3917$class_3918;)V ARG 1 factory METHOD method_17434 create (ILnet/minecraft/class_1661;)Lnet/minecraft/class_1703; + COMMENT Creates a menu using the {@link Factory} of this menu type. ARG 1 syncId ARG 2 playerInventory METHOD method_17435 register (Ljava/lang/String;Lnet/minecraft/class_3917$class_3918;)Lnet/minecraft/class_3917; ARG 0 id ARG 1 factory CLASS class_3918 Factory + COMMENT Used to create {@link Menu} instances on the client. METHOD create (ILnet/minecraft/class_1661;)Lnet/minecraft/class_1703; ARG 1 syncId ARG 2 playerInventory diff --git a/mappings/net/minecraft/screen/MerchantScreenHandler.mapping b/mappings/net/minecraft/menu/MerchantMenu.mapping similarity index 94% rename from mappings/net/minecraft/screen/MerchantScreenHandler.mapping rename to mappings/net/minecraft/menu/MerchantMenu.mapping index 67efd17fe6..97b3ae746e 100644 --- a/mappings/net/minecraft/screen/MerchantScreenHandler.mapping +++ b/mappings/net/minecraft/menu/MerchantMenu.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1728 net/minecraft/screen/MerchantScreenHandler +CLASS net/minecraft/class_1728 net/minecraft/menu/MerchantMenu FIELD field_18669 levelProgress I FIELD field_18670 levelled Z FIELD field_19358 canRefreshTrades Z diff --git a/mappings/net/minecraft/menu/NameableMenuFactory.mapping b/mappings/net/minecraft/menu/NameableMenuFactory.mapping new file mode 100644 index 0000000000..3237ba08f0 --- /dev/null +++ b/mappings/net/minecraft/menu/NameableMenuFactory.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_3908 net/minecraft/menu/NameableMenuFactory + METHOD method_5476 getDisplayName ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/screen/PlayerScreenHandler.mapping b/mappings/net/minecraft/menu/PlayerMenu.mapping similarity index 92% rename from mappings/net/minecraft/screen/PlayerScreenHandler.mapping rename to mappings/net/minecraft/menu/PlayerMenu.mapping index 5d5c66f926..57ed2118db 100644 --- a/mappings/net/minecraft/screen/PlayerScreenHandler.mapping +++ b/mappings/net/minecraft/menu/PlayerMenu.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1723 net/minecraft/screen/PlayerScreenHandler +CLASS net/minecraft/class_1723 net/minecraft/menu/PlayerMenu FIELD field_21668 BLOCK_ATLAS_TEXTURE Lnet/minecraft/class_2960; FIELD field_21669 EMPTY_HELMET_SLOT_TEXTURE Lnet/minecraft/class_2960; FIELD field_21670 EMPTY_CHESTPLATE_SLOT_TEXTURE Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/screen/ShulkerBoxScreenHandler.mapping b/mappings/net/minecraft/menu/ShulkerBoxMenu.mapping similarity index 72% rename from mappings/net/minecraft/screen/ShulkerBoxScreenHandler.mapping rename to mappings/net/minecraft/menu/ShulkerBoxMenu.mapping index 6c624508fb..693020aa4f 100644 --- a/mappings/net/minecraft/screen/ShulkerBoxScreenHandler.mapping +++ b/mappings/net/minecraft/menu/ShulkerBoxMenu.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1733 net/minecraft/screen/ShulkerBoxScreenHandler +CLASS net/minecraft/class_1733 net/minecraft/menu/ShulkerBoxMenu FIELD field_7867 inventory Lnet/minecraft/class_1263; METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId diff --git a/mappings/net/minecraft/menu/ShulkerBoxSlot.mapping b/mappings/net/minecraft/menu/ShulkerBoxSlot.mapping new file mode 100644 index 0000000000..e9da310064 --- /dev/null +++ b/mappings/net/minecraft/menu/ShulkerBoxSlot.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_1736 net/minecraft/menu/ShulkerBoxSlot + METHOD (Lnet/minecraft/class_1263;III)V + ARG 1 inventory + ARG 2 invSlot + ARG 3 xPosition diff --git a/mappings/net/minecraft/screen/SimpleNamedScreenHandlerFactory.mapping b/mappings/net/minecraft/menu/SimpleNamedMenuFactory.mapping similarity index 71% rename from mappings/net/minecraft/screen/SimpleNamedScreenHandlerFactory.mapping rename to mappings/net/minecraft/menu/SimpleNamedMenuFactory.mapping index 50308e1bb1..281f7c752c 100644 --- a/mappings/net/minecraft/screen/SimpleNamedScreenHandlerFactory.mapping +++ b/mappings/net/minecraft/menu/SimpleNamedMenuFactory.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_747 net/minecraft/screen/SimpleNamedScreenHandlerFactory +CLASS net/minecraft/class_747 net/minecraft/menu/SimpleNamedMenuFactory FIELD field_17280 baseFactory Lnet/minecraft/class_1270; FIELD field_3947 name Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_1270;Lnet/minecraft/class_2561;)V diff --git a/mappings/net/minecraft/screen/slot/Slot.mapping b/mappings/net/minecraft/menu/Slot.mapping similarity index 93% rename from mappings/net/minecraft/screen/slot/Slot.mapping rename to mappings/net/minecraft/menu/Slot.mapping index e13389da4e..b803038757 100644 --- a/mappings/net/minecraft/screen/slot/Slot.mapping +++ b/mappings/net/minecraft/menu/Slot.mapping @@ -1,10 +1,11 @@ -CLASS net/minecraft/class_1735 net/minecraft/screen/slot/Slot +CLASS net/minecraft/class_1735 net/minecraft/menu/Slot FIELD field_7871 inventory Lnet/minecraft/class_1263; FIELD field_7872 yPosition I FIELD field_7873 xPosition I FIELD field_7874 id I FIELD field_7875 invSlot I METHOD (Lnet/minecraft/class_1263;III)V + ARG 1 inventory ARG 2 invSlot ARG 3 xPosition ARG 4 yPosition @@ -21,10 +22,12 @@ CLASS net/minecraft/class_1735 net/minecraft/screen/slot/Slot METHOD method_7672 onTake (I)V ARG 1 amount METHOD method_7673 setStack (Lnet/minecraft/class_1799;)V + ARG 1 stack METHOD method_7674 canTakeItems (Lnet/minecraft/class_1657;)Z ARG 1 playerEntity METHOD method_7675 getMaxStackAmount ()I METHOD method_7676 getMaxStackAmount (Lnet/minecraft/class_1799;)I + ARG 1 stack METHOD method_7677 getStack ()Lnet/minecraft/class_1799; METHOD method_7678 onCrafted (Lnet/minecraft/class_1799;I)V ARG 1 stack diff --git a/mappings/net/minecraft/menu/SlotActionType.mapping b/mappings/net/minecraft/menu/SlotActionType.mapping new file mode 100644 index 0000000000..b62bbc58eb --- /dev/null +++ b/mappings/net/minecraft/menu/SlotActionType.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1713 net/minecraft/menu/SlotActionType diff --git a/mappings/net/minecraft/screen/SmithingScreenHandler.mapping b/mappings/net/minecraft/menu/SmithingTableMenu.mapping similarity index 77% rename from mappings/net/minecraft/screen/SmithingScreenHandler.mapping rename to mappings/net/minecraft/menu/SmithingTableMenu.mapping index 418dd051ac..ff8fa2e858 100644 --- a/mappings/net/minecraft/screen/SmithingScreenHandler.mapping +++ b/mappings/net/minecraft/menu/SmithingTableMenu.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4862 net/minecraft/screen/SmithingScreenHandler +CLASS net/minecraft/class_4862 net/minecraft/menu/SmithingTableMenu FIELD field_22485 RECIPES Ljava/util/Map; METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId diff --git a/mappings/net/minecraft/screen/BlastFurnaceScreenHandler.mapping b/mappings/net/minecraft/menu/SmokerMenu.mapping similarity index 69% rename from mappings/net/minecraft/screen/BlastFurnaceScreenHandler.mapping rename to mappings/net/minecraft/menu/SmokerMenu.mapping index 6a85f687db..eb829ae063 100644 --- a/mappings/net/minecraft/screen/BlastFurnaceScreenHandler.mapping +++ b/mappings/net/minecraft/menu/SmokerMenu.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3705 net/minecraft/screen/BlastFurnaceScreenHandler +CLASS net/minecraft/class_3706 net/minecraft/menu/SmokerMenu METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId METHOD (ILnet/minecraft/class_1661;Lnet/minecraft/class_1263;Lnet/minecraft/class_3913;)V diff --git a/mappings/net/minecraft/screen/StonecutterScreenHandler.mapping b/mappings/net/minecraft/menu/StonecutterMenu.mapping similarity index 93% rename from mappings/net/minecraft/screen/StonecutterScreenHandler.mapping rename to mappings/net/minecraft/menu/StonecutterMenu.mapping index 6cbe00a14f..be70c99adb 100644 --- a/mappings/net/minecraft/screen/StonecutterScreenHandler.mapping +++ b/mappings/net/minecraft/menu/StonecutterMenu.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3971 net/minecraft/screen/StonecutterScreenHandler +CLASS net/minecraft/class_3971 net/minecraft/menu/StonecutterMenu FIELD field_17627 inputSlot Lnet/minecraft/class_1735; FIELD field_17628 outputSlot Lnet/minecraft/class_1735; FIELD field_17629 inventory Lnet/minecraft/class_1263; diff --git a/mappings/net/minecraft/screen/slot/TradeOutputSlot.mapping b/mappings/net/minecraft/menu/TradeOutputSlot.mapping similarity index 83% rename from mappings/net/minecraft/screen/slot/TradeOutputSlot.mapping rename to mappings/net/minecraft/menu/TradeOutputSlot.mapping index 1e7b0c9e2a..f481203628 100644 --- a/mappings/net/minecraft/screen/slot/TradeOutputSlot.mapping +++ b/mappings/net/minecraft/menu/TradeOutputSlot.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1727 net/minecraft/screen/slot/TradeOutputSlot +CLASS net/minecraft/class_1727 net/minecraft/menu/TradeOutputSlot FIELD field_7857 player Lnet/minecraft/class_1657; FIELD field_7858 trader Lnet/minecraft/class_1915; FIELD field_7859 amount I diff --git a/mappings/net/minecraft/menu/property/ArrayPropertyDelegate.mapping b/mappings/net/minecraft/menu/property/ArrayPropertyDelegate.mapping new file mode 100644 index 0000000000..f20b45fa76 --- /dev/null +++ b/mappings/net/minecraft/menu/property/ArrayPropertyDelegate.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_3919 net/minecraft/menu/property/ArrayPropertyDelegate + COMMENT A {@link PropertyDelegate} that is implemented using an int array. + COMMENT + COMMENT

{@code ArrayPropertyDelegate}s are usually used on the client-sided menu, + COMMENT where they are updated using synchronization packets. + FIELD field_17345 data [I + METHOD (I)V + ARG 1 size diff --git a/mappings/net/minecraft/screen/Property.mapping b/mappings/net/minecraft/menu/property/Property.mapping similarity index 82% rename from mappings/net/minecraft/screen/Property.mapping rename to mappings/net/minecraft/menu/property/Property.mapping index f5ce402806..e9aa8a2262 100644 --- a/mappings/net/minecraft/screen/Property.mapping +++ b/mappings/net/minecraft/menu/property/Property.mapping @@ -1,10 +1,10 @@ -CLASS net/minecraft/class_3915 net/minecraft/screen/Property - COMMENT An integer property that is stored in a {@link Container}. +CLASS net/minecraft/class_3915 net/minecraft/menu/property/Property + COMMENT An integer property that is stored in a {@linkplain net.minecraft.menu.Menu menu}. COMMENT COMMENT

{@code Property} instances are used for tracking integer properties in property delegates COMMENT and other sources of integer properties, and sending needed content updates to listeners. COMMENT - COMMENT @see Container#addProperty + COMMENT @see net.minecraft.menu.Menu#addProperty FIELD field_17307 oldValue I METHOD method_17403 create ()Lnet/minecraft/class_3915; COMMENT Creates a new property that is not attached to any other objects. diff --git a/mappings/net/minecraft/screen/PropertyDelegate.mapping b/mappings/net/minecraft/menu/property/PropertyDelegate.mapping similarity index 55% rename from mappings/net/minecraft/screen/PropertyDelegate.mapping rename to mappings/net/minecraft/menu/property/PropertyDelegate.mapping index 1bedef8edc..fc06bbb0de 100644 --- a/mappings/net/minecraft/screen/PropertyDelegate.mapping +++ b/mappings/net/minecraft/menu/property/PropertyDelegate.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3913 net/minecraft/screen/PropertyDelegate +CLASS net/minecraft/class_3913 net/minecraft/menu/property/PropertyDelegate COMMENT A property delegate represents an indexed list of integer properties. COMMENT COMMENT

Property delegates are used for displaying integer values in screens, @@ -7,5 +7,9 @@ CLASS net/minecraft/class_3913 net/minecraft/screen/PropertyDelegate METHOD method_17390 get (I)I ARG 1 index METHOD method_17391 set (II)V + COMMENT Sets the property value at the index. + COMMENT + COMMENT

This method should have a proper implementation as it is used on the client + COMMENT to update values using packets from the server. ARG 1 index ARG 2 value diff --git a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping index 4769c5382f..de0cf7b0c7 100644 --- a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping @@ -23,7 +23,7 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_11088 onMapUpdate (Lnet/minecraft/class_2683;)V ARG 1 packet - METHOD method_11089 onOpenHorseScreen (Lnet/minecraft/class_2648;)V + METHOD method_11089 onOpenHorseMenu (Lnet/minecraft/class_2648;)V ARG 1 packet METHOD method_11090 onCraftFailedResponse (Lnet/minecraft/class_2695;)V ARG 1 packet @@ -49,7 +49,7 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_11101 onExperienceBarUpdate (Lnet/minecraft/class_2748;)V ARG 1 packet - METHOD method_11102 onCloseScreen (Lnet/minecraft/class_2645;)V + METHOD method_11102 onCloseMenu (Lnet/minecraft/class_2645;)V ARG 1 packet METHOD method_11103 onTitle (Lnet/minecraft/class_2762;)V ARG 1 packet @@ -63,7 +63,7 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_11108 onSignEditorOpen (Lnet/minecraft/class_2693;)V ARG 1 packet - METHOD method_11109 onScreenHandlerSlotUpdate (Lnet/minecraft/class_2653;)V + METHOD method_11109 onMenuSlotUpdate (Lnet/minecraft/class_2653;)V ARG 1 packet METHOD method_11110 onEntityAttach (Lnet/minecraft/class_2740;)V ARG 1 packet @@ -107,7 +107,7 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_11130 onAdvancements (Lnet/minecraft/class_2779;)V ARG 1 packet - METHOD method_11131 onScreenHandlerPropertyUpdate (Lnet/minecraft/class_2651;)V + METHOD method_11131 onMenuPropertyUpdate (Lnet/minecraft/class_2651;)V ARG 1 packet METHOD method_11132 onVelocityUpdate (Lnet/minecraft/class_2743;)V ARG 1 packet @@ -171,7 +171,7 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_17586 onSetTradeOffers (Lnet/minecraft/class_3943;)V ARG 1 packet - METHOD method_17587 onOpenScreen (Lnet/minecraft/class_3944;)V + METHOD method_17587 onOpenMenu (Lnet/minecraft/class_3944;)V ARG 1 packet METHOD method_20203 onChunkLoadDistance (Lnet/minecraft/class_4273;)V ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping index f60e98f064..9be6c834c9 100644 --- a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping @@ -17,7 +17,7 @@ CLASS net/minecraft/class_2792 net/minecraft/network/listener/ServerPlayPacketLi ARG 1 packet METHOD method_12053 onBookUpdate (Lnet/minecraft/class_2820;)V ARG 1 packet - METHOD method_12054 onGuiClose (Lnet/minecraft/class_2815;)V + METHOD method_12054 onMenuClose (Lnet/minecraft/class_2815;)V ARG 1 packet METHOD method_12055 onButtonClick (Lnet/minecraft/class_2811;)V ARG 1 packet @@ -61,7 +61,7 @@ CLASS net/minecraft/class_2792 net/minecraft/network/listener/ServerPlayPacketLi ARG 1 packet METHOD method_12075 onCustomPayload (Lnet/minecraft/class_2817;)V ARG 1 packet - METHOD method_12076 onClickWindow (Lnet/minecraft/class_2813;)V + METHOD method_12076 onClickSlot (Lnet/minecraft/class_2813;)V ARG 1 packet METHOD method_12077 onUpdateCommandBlock (Lnet/minecraft/class_2870;)V ARG 1 packet diff --git a/mappings/net/minecraft/network/packet/c2s/play/ClickWindowC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping similarity index 85% rename from mappings/net/minecraft/network/packet/c2s/play/ClickWindowC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping index accf365816..42bae60272 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ClickWindowC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2813 net/minecraft/network/packet/c2s/play/ClickWindowC2SPacket +CLASS net/minecraft/class_2813 net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket FIELD field_12815 actionType Lnet/minecraft/class_1713; FIELD field_12816 stack Lnet/minecraft/class_1799; FIELD field_12817 button I @@ -6,7 +6,12 @@ CLASS net/minecraft/class_2813 net/minecraft/network/packet/c2s/play/ClickWindow FIELD field_12819 syncId I FIELD field_12820 transactionId S METHOD (IIILnet/minecraft/class_1713;Lnet/minecraft/class_1799;S)V + ARG 1 syncId + ARG 2 slot + ARG 3 button + ARG 4 actionType ARG 5 stack + ARG 6 transactionId METHOD method_12189 getTransactionId ()S METHOD method_12190 getStack ()Lnet/minecraft/class_1799; METHOD method_12192 getSlot ()I diff --git a/mappings/net/minecraft/network/packet/c2s/play/CloseMenuS2CPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/CloseMenuS2CPacket.mapping new file mode 100644 index 0000000000..c29a22c02b --- /dev/null +++ b/mappings/net/minecraft/network/packet/c2s/play/CloseMenuS2CPacket.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_2815 net/minecraft/network/packet/c2s/play/CloseMenuS2CPacket + FIELD field_12827 syncId I + METHOD (I)V + ARG 1 syncId diff --git a/mappings/net/minecraft/network/packet/c2s/play/ConfirmGuiActionC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ConfirmGuiActionC2SPacket.mapping index 5a17102da7..c6b132ceed 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ConfirmGuiActionC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ConfirmGuiActionC2SPacket.mapping @@ -3,8 +3,8 @@ CLASS net/minecraft/class_2809 net/minecraft/network/packet/c2s/play/ConfirmGuiA FIELD field_12810 accepted Z FIELD field_12811 windowId I METHOD (ISZ)V - ARG 1 windowId + ARG 1 syncId ARG 2 actionId ARG 3 accepted - METHOD method_12176 getSyncId ()S - METHOD method_12178 getWindowId ()I + METHOD method_12176 getActionId ()S + METHOD method_12178 getSyncId ()I diff --git a/mappings/net/minecraft/network/packet/c2s/play/GuiCloseC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/GuiCloseC2SPacket.mapping deleted file mode 100644 index c95e0493a7..0000000000 --- a/mappings/net/minecraft/network/packet/c2s/play/GuiCloseC2SPacket.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_2815 net/minecraft/network/packet/c2s/play/GuiCloseC2SPacket - FIELD field_12827 id I diff --git a/mappings/net/minecraft/network/packet/s2c/play/CloseScreenS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CloseMenuS2CPacket.mapping similarity index 83% rename from mappings/net/minecraft/network/packet/s2c/play/CloseScreenS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/CloseMenuS2CPacket.mapping index 32d8ac7375..d23955b684 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/CloseScreenS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/CloseMenuS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2645 net/minecraft/network/packet/s2c/play/CloseScreenS2CPacket +CLASS net/minecraft/class_2645 net/minecraft/network/packet/s2c/play/CloseMenuS2CPacket FIELD field_12137 syncId I METHOD (I)V ARG 1 syncId diff --git a/mappings/net/minecraft/network/packet/s2c/play/ConfirmGuiActionS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ConfirmGuiActionS2CPacket.mapping index 7dd5257cb1..534e1ef0d0 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ConfirmGuiActionS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ConfirmGuiActionS2CPacket.mapping @@ -1,11 +1,11 @@ CLASS net/minecraft/class_2644 net/minecraft/network/packet/s2c/play/ConfirmGuiActionS2CPacket FIELD field_12134 actionId S FIELD field_12135 accepted Z - FIELD field_12136 id I + FIELD field_12136 syncId I METHOD (ISZ)V - ARG 1 id + ARG 1 syncId ARG 2 actionId ARG 3 accepted METHOD method_11423 getActionId ()S - METHOD method_11425 getId ()I + METHOD method_11425 getSyncId ()I METHOD method_11426 wasAccepted ()Z diff --git a/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerPropertyUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/MenuPropertyUpdateS2CPacket.mapping similarity index 88% rename from mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerPropertyUpdateS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/MenuPropertyUpdateS2CPacket.mapping index 6ba7b3f26d..df25076a92 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerPropertyUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/MenuPropertyUpdateS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2651 net/minecraft/network/packet/s2c/play/ScreenHandlerPropertyUpdateS2CPacket +CLASS net/minecraft/class_2651 net/minecraft/network/packet/s2c/play/MenuPropertyUpdateS2CPacket FIELD field_12148 value I FIELD field_12149 propertyId I FIELD field_12150 syncId I diff --git a/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/MenuSlotUpdateS2CPacket.mapping similarity index 91% rename from mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/MenuSlotUpdateS2CPacket.mapping index 873ae4294f..c8dd85a6e4 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/MenuSlotUpdateS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2653 net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket +CLASS net/minecraft/class_2653 net/minecraft/network/packet/s2c/play/MenuSlotUpdateS2CPacket FIELD field_12151 slot I FIELD field_12152 syncId I FIELD field_12153 stack Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/network/packet/s2c/play/OpenHorseScreenS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/OpenHorseMenuS2CPacket.mapping similarity index 91% rename from mappings/net/minecraft/network/packet/s2c/play/OpenHorseScreenS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/OpenHorseMenuS2CPacket.mapping index f569d4c9b6..d6d0485819 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/OpenHorseScreenS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/OpenHorseMenuS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2648 net/minecraft/network/packet/s2c/play/OpenHorseScreenS2CPacket +CLASS net/minecraft/class_2648 net/minecraft/network/packet/s2c/play/OpenHorseMenuS2CPacket FIELD field_12142 horseId I FIELD field_12143 slotCount I FIELD field_12144 syncId I diff --git a/mappings/net/minecraft/network/packet/s2c/play/OpenScreenS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/OpenMenuS2CPacket.mapping similarity index 72% rename from mappings/net/minecraft/network/packet/s2c/play/OpenScreenS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/OpenMenuS2CPacket.mapping index 391439bfc4..8936603d23 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/OpenScreenS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/OpenMenuS2CPacket.mapping @@ -1,11 +1,11 @@ -CLASS net/minecraft/class_3944 net/minecraft/network/packet/s2c/play/OpenScreenS2CPacket +CLASS net/minecraft/class_3944 net/minecraft/network/packet/s2c/play/OpenMenuS2CPacket FIELD field_17436 syncId I - FIELD field_17437 screenHandlerId I + FIELD field_17437 menuId I FIELD field_17438 name Lnet/minecraft/class_2561; METHOD (ILnet/minecraft/class_3917;Lnet/minecraft/class_2561;)V ARG 1 syncId ARG 2 type ARG 3 name METHOD method_17592 getSyncId ()I - METHOD method_17593 getScreenHandlerType ()Lnet/minecraft/class_3917; + METHOD method_17593 getMenuType ()Lnet/minecraft/class_3917; METHOD method_17594 getName ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/recipe/InputSlotFiller.mapping b/mappings/net/minecraft/recipe/InputSlotFiller.mapping index c36c3ac277..95f2a0d664 100644 --- a/mappings/net/minecraft/recipe/InputSlotFiller.mapping +++ b/mappings/net/minecraft/recipe/InputSlotFiller.mapping @@ -1,8 +1,10 @@ CLASS net/minecraft/class_2955 net/minecraft/recipe/InputSlotFiller FIELD field_13347 recipeFinder Lnet/minecraft/class_1662; - FIELD field_13348 craftingScreenHandler Lnet/minecraft/class_1729; + FIELD field_13348 craftingMenu Lnet/minecraft/class_1729; FIELD field_13349 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_13350 inventory Lnet/minecraft/class_1661; + METHOD (Lnet/minecraft/class_1729;)V + ARG 1 craftingMenu METHOD method_12819 getAmountToFill (ZIZ)I ARG 1 craftAll ARG 2 limit diff --git a/mappings/net/minecraft/recipe/book/RecipeBook.mapping b/mappings/net/minecraft/recipe/book/RecipeBook.mapping index 72fec579e2..e67a7f933d 100644 --- a/mappings/net/minecraft/recipe/book/RecipeBook.mapping +++ b/mappings/net/minecraft/recipe/book/RecipeBook.mapping @@ -20,7 +20,7 @@ CLASS net/minecraft/class_3439 net/minecraft/recipe/book/RecipeBook METHOD method_14879 remove (Lnet/minecraft/class_2960;)V ARG 1 id METHOD method_14880 isFilteringCraftable (Lnet/minecraft/class_1729;)Z - ARG 1 handler + ARG 1 container METHOD method_14881 add (Lnet/minecraft/class_2960;)V ARG 1 id METHOD method_14882 setFurnaceGuiOpen (Z)V diff --git a/mappings/net/minecraft/screen/ArrayPropertyDelegate.mapping b/mappings/net/minecraft/screen/ArrayPropertyDelegate.mapping deleted file mode 100644 index c51f29dfe3..0000000000 --- a/mappings/net/minecraft/screen/ArrayPropertyDelegate.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_3919 net/minecraft/screen/ArrayPropertyDelegate - COMMENT A {@link PropertyDelegate} that is implemented using an int array. - FIELD field_17345 data [I - METHOD (I)V - ARG 1 size diff --git a/mappings/net/minecraft/screen/NameableScreenHandlerFactory.mapping b/mappings/net/minecraft/screen/NameableScreenHandlerFactory.mapping deleted file mode 100644 index 2f711d2aa3..0000000000 --- a/mappings/net/minecraft/screen/NameableScreenHandlerFactory.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_3908 net/minecraft/screen/NameableScreenHandlerFactory - METHOD method_5476 getDisplayName ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/screen/ScreenHandlerListener.mapping b/mappings/net/minecraft/screen/ScreenHandlerListener.mapping deleted file mode 100644 index 696ebdef10..0000000000 --- a/mappings/net/minecraft/screen/ScreenHandlerListener.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS net/minecraft/class_1712 net/minecraft/screen/ScreenHandlerListener - METHOD method_7633 onPropertyUpdate (Lnet/minecraft/class_1703;II)V - ARG 1 handler - ARG 2 propertyId - METHOD method_7634 onHandlerRegistered (Lnet/minecraft/class_1703;Lnet/minecraft/class_2371;)V - ARG 1 handler - METHOD method_7635 onSlotUpdate (Lnet/minecraft/class_1703;ILnet/minecraft/class_1799;)V - ARG 1 handler - ARG 2 slotId diff --git a/mappings/net/minecraft/screen/slot/ShulkerBoxSlot.mapping b/mappings/net/minecraft/screen/slot/ShulkerBoxSlot.mapping deleted file mode 100644 index 27b9409f8a..0000000000 --- a/mappings/net/minecraft/screen/slot/ShulkerBoxSlot.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1736 net/minecraft/screen/slot/ShulkerBoxSlot diff --git a/mappings/net/minecraft/screen/slot/SlotActionType.mapping b/mappings/net/minecraft/screen/slot/SlotActionType.mapping deleted file mode 100644 index 49f76e4fb4..0000000000 --- a/mappings/net/minecraft/screen/slot/SlotActionType.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1713 net/minecraft/screen/slot/SlotActionType diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 3d96a67a5c..fbcb3cfb64 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -19,7 +19,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity FIELD field_13983 lastFoodScore I FIELD field_13984 cameraEntity Lnet/minecraft/class_1297; FIELD field_13985 inTeleportationState Z - FIELD field_13986 screenHandlerSyncId I + FIELD field_13986 menuSyncId I FIELD field_13987 networkHandler Lnet/minecraft/class_3244; FIELD field_13988 removedEntities Ljava/util/List; FIELD field_13989 notInAnyWorld Z @@ -38,8 +38,8 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_14203 copyFrom (Lnet/minecraft/class_3222;Z)V ARG 1 oldPlayer ARG 2 alive - METHOD method_14204 openHandledScreen (Lnet/minecraft/class_1703;)V - ARG 1 handler + METHOD method_14204 openMenu (Lnet/minecraft/class_1703;)V + ARG 1 menu METHOD method_14205 sendInitialChunkPackets (Lnet/minecraft/class_1923;Lnet/minecraft/class_2596;Lnet/minecraft/class_2596;)V METHOD method_14207 handleFall (DZ)V ARG 1 heightDifference @@ -66,14 +66,17 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_14232 getCameraPosition ()Lnet/minecraft/class_4076; METHOD method_14234 updateLastActionTime ()V METHOD method_14236 getAdvancementTracker ()Lnet/minecraft/class_2985; - METHOD method_14237 incrementScreenHandlerSyncId ()V + METHOD method_14237 incrementMenuSyncId ()V METHOD method_14238 getClientChatVisibility ()Lnet/minecraft/class_1659; METHOD method_14240 onTeleportationDone ()V METHOD method_14242 getCameraEntity ()Lnet/minecraft/class_1297; METHOD method_14245 moveToSpawn (Lnet/minecraft/class_3218;)V ARG 1 world METHOD method_14246 sendUnloadChunkPacket (Lnet/minecraft/class_1923;)V - METHOD method_14247 closeCurrentScreen ()V + METHOD method_14247 onMenuClosed ()V + COMMENT Finishes closing the current menu and resets the field to the {@link #playerMenu}. + COMMENT + COMMENT

This method gets called by {@link #closeMenu()} and when the client closes a menu. METHOD method_14248 getStatHandler ()Lnet/minecraft/class_3442; METHOD method_14249 onStoppedTracking (Lnet/minecraft/class_1297;)V METHOD method_14251 teleport (Lnet/minecraft/class_3218;DDDFF)V diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping index 4db06c95c7..aa762d1cb0 100644 --- a/mappings/net/minecraft/util/registry/Registry.mapping +++ b/mappings/net/minecraft/util/registry/Registry.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry FIELD field_11150 PAINTING_MOTIVE Lnet/minecraft/class_2348; COMMENT The painting motive (theme, motif) registry FIELD field_11159 STATUS_EFFECT Lnet/minecraft/class_2378; - FIELD field_17429 SCREEN_HANDLER Lnet/minecraft/class_2378; METHOD method_10220 stream ()Ljava/util/stream/Stream; METHOD method_10221 getId (Ljava/lang/Object;)Lnet/minecraft/class_2960; ARG 1 entry From 8682daf62b9534ddd174365a0a3488bd7e4d6823 Mon Sep 17 00:00:00 2001 From: Juuxel <6596629+Juuxel@users.noreply.github.com> Date: Mon, 9 Mar 2020 17:16:42 +0200 Subject: [PATCH 02/10] Remove pointless/incorrect changes, slot cleanup --- .../client/gui/screen/ingame/AnvilScreen.mapping | 2 +- .../client/gui/screen/ingame/BeaconScreen.mapping | 2 +- .../gui/screen/ingame/BrewingStandScreen.mapping | 2 +- .../gui/screen/ingame/CartographyTableScreen.mapping | 2 +- .../gui/screen/ingame/CraftingTableScreen.mapping | 6 +++--- .../screen/ingame/CreativeInventoryScreen.mapping | 2 +- .../gui/screen/ingame/ForgingContainerScreen.mapping | 2 -- .../client/gui/screen/ingame/ForgingScreen.mapping | 12 ++++++++++++ .../gui/screen/ingame/GrindstoneScreen.mapping | 2 +- .../client/gui/screen/ingame/HopperScreen.mapping | 2 +- .../client/gui/screen/ingame/HorseScreen.mapping | 2 +- .../client/gui/screen/ingame/InventoryScreen.mapping | 2 +- .../client/gui/screen/ingame/LoomScreen.mapping | 2 +- .../client/gui/screen/ingame/MerchantScreen.mapping | 2 +- .../gui/screen/ingame/ShulkerBoxScreen.mapping | 2 +- ...ontainerScreen.mapping => SmithingScreen.mapping} | 4 ++-- .../gui/screen/ingame/StonecutterScreen.mapping | 2 +- .../book => recipebook}/ClientRecipeBook.mapping | 2 +- .../book => recipebook}/RecipeBookGroup.mapping | 2 +- .../net/minecraft/data/client/model/ModelIds.mapping | 4 ++-- mappings/net/minecraft/menu/BeaconMenu.mapping | 7 ++++++- mappings/net/minecraft/menu/BrewingStandMenu.mapping | 6 +++--- .../net/minecraft/menu/CraftingResultSlot.mapping | 6 +++--- mappings/net/minecraft/menu/FurnaceFuelSlot.mapping | 8 +++++--- .../net/minecraft/menu/FurnaceOutputSlot.mapping | 6 +++--- mappings/net/minecraft/menu/Slot.mapping | 12 ++++++------ 26 files changed, 60 insertions(+), 43 deletions(-) delete mode 100644 mappings/net/minecraft/client/gui/screen/ingame/ForgingContainerScreen.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping rename mappings/net/minecraft/client/gui/screen/ingame/{SmithingContainerScreen.mapping => SmithingScreen.mapping} (84%) rename mappings/net/minecraft/client/{recipe/book => recipebook}/ClientRecipeBook.mapping (90%) rename mappings/net/minecraft/client/{recipe/book => recipebook}/RecipeBookGroup.mapping (68%) diff --git a/mappings/net/minecraft/client/gui/screen/ingame/AnvilScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/AnvilScreen.mapping index ee415dacf8..b449397714 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/AnvilScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/AnvilScreen.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_471 net/minecraft/client/gui/screen/ingame/AnvilScreen - FIELD field_2819 BG_TEX Lnet/minecraft/class_2960; + FIELD field_2819 TEXTURE Lnet/minecraft/class_2960; FIELD field_2821 nameField Lnet/minecraft/class_342; METHOD (Lnet/minecraft/class_1706;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V ARG 1 menu diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping index cbd043609b..bb23de84a4 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree FIELD field_17413 secondaryEffect Lnet/minecraft/class_1291; FIELD field_2804 doneButton Lnet/minecraft/class_466$class_468; FIELD field_2805 consumeGem Z - FIELD field_2808 BG_TEX Lnet/minecraft/class_2960; + FIELD field_2808 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_1704;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V ARG 1 menu ARG 2 inventory diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BrewingStandScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BrewingStandScreen.mapping index 30fbc047ac..2ad95c50ed 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BrewingStandScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BrewingStandScreen.mapping @@ -2,6 +2,6 @@ CLASS net/minecraft/class_472 net/minecraft/client/gui/screen/ingame/BrewingStan FIELD field_2823 TEXTURE Lnet/minecraft/class_2960; FIELD field_2824 BUBBLE_PROGRESS [I METHOD (Lnet/minecraft/class_1708;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 container + ARG 1 menu ARG 2 playerInventory ARG 3 title diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping index dafb0cb572..341daefc8c 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_3934 net/minecraft/client/gui/screen/ingame/CartographyTableScreen FIELD field_17421 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_3910;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 container + ARG 1 menu ARG 2 inventory ARG 3 title METHOD method_17566 drawMap (Lnet/minecraft/class_22;IIF)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CraftingTableScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CraftingTableScreen.mapping index 4ad2ab44f2..a101951da1 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CraftingTableScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CraftingTableScreen.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_479 net/minecraft/client/gui/screen/ingame/CraftingTableScreen FIELD field_2877 isNarrow Z - FIELD field_2878 BG_TEX Lnet/minecraft/class_2960; - FIELD field_2880 recipeBookGui Lnet/minecraft/class_507; - FIELD field_2881 RECIPE_BUTTON_TEX Lnet/minecraft/class_2960; + FIELD field_2878 TEXTURE Lnet/minecraft/class_2960; + FIELD field_2880 recipeBook Lnet/minecraft/class_507; + FIELD field_2881 RECIPE_BUTTON_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_1714;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V ARG 1 menu ARG 2 inventory diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping index 01f657bd41..9c115e4456 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping @@ -53,6 +53,6 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv FIELD field_2898 slot Lnet/minecraft/class_1735; METHOD (Lnet/minecraft/class_1735;III)V ARG 1 slot - ARG 2 invSlot + ARG 2 index ARG 3 x ARG 4 y diff --git a/mappings/net/minecraft/client/gui/screen/ingame/ForgingContainerScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/ForgingContainerScreen.mapping deleted file mode 100644 index eaf937e954..0000000000 --- a/mappings/net/minecraft/client/gui/screen/ingame/ForgingContainerScreen.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_4894 net/minecraft/client/gui/screen/ingame/ForgingContainerScreen - FIELD field_22794 texture Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping new file mode 100644 index 0000000000..c9a8e8fffd --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_4894 net/minecraft/client/gui/screen/ingame/ForgingScreen + FIELD field_22794 texture Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_4861;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;Lnet/minecraft/class_2960;)V + ARG 1 menu + ARG 2 playerInventory + ARG 3 title + ARG 4 texture + METHOD method_25444 renderForeground (IIF)V + ARG 1 mouseX + ARG 2 mouseY + ARG 3 delta + METHOD method_25445 setup ()V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/GrindstoneScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/GrindstoneScreen.mapping index d2e6e0fe3f..32d5893b62 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/GrindstoneScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/GrindstoneScreen.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3802 net/minecraft/client/gui/screen/ingame/GrindstoneScreen FIELD field_16769 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_3803;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 container + ARG 1 menu ARG 2 inventory ARG 3 title diff --git a/mappings/net/minecraft/client/gui/screen/ingame/HopperScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/HopperScreen.mapping index ebf3d5bcf6..91e5ca81d8 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/HopperScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/HopperScreen.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_488 net/minecraft/client/gui/screen/ingame/HopperScreen FIELD field_2919 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_1722;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 container + ARG 1 menu ARG 2 inventory ARG 3 title diff --git a/mappings/net/minecraft/client/gui/screen/ingame/HorseScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/HorseScreen.mapping index af01da4eaf..b29c4fae78 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/HorseScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/HorseScreen.mapping @@ -4,6 +4,6 @@ CLASS net/minecraft/class_491 net/minecraft/client/gui/screen/ingame/HorseScreen FIELD field_2939 mouseX F FIELD field_2941 entity Lnet/minecraft/class_1496; METHOD (Lnet/minecraft/class_1724;Lnet/minecraft/class_1661;Lnet/minecraft/class_1496;)V - ARG 1 container + ARG 1 menu ARG 2 inventory ARG 3 entity diff --git a/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping index 08ecae1bcf..9c9fdae9e7 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_490 net/minecraft/client/gui/screen/ingame/InventorySc FIELD field_2930 isMouseDown Z FIELD field_2931 isNarrow Z FIELD field_2932 isOpen Z - FIELD field_2933 RECIPE_BUTTON_TEX Lnet/minecraft/class_2960; + FIELD field_2933 RECIPE_BUTTON_TEXTURE Lnet/minecraft/class_2960; FIELD field_2934 mouseY F FIELD field_2935 mouseX F METHOD (Lnet/minecraft/class_1657;)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping index 5545a11481..0cd7d892ca 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_494 net/minecraft/client/gui/screen/ingame/LoomScreen FIELD field_2968 scrollPosition F FIELD field_2970 firstPatternButtonId I METHOD (Lnet/minecraft/class_1726;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 container + ARG 1 menu ARG 2 inventory ARG 3 title METHOD method_17576 onInventoryChanged ()V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping index e0bf5727e3..f485cb5546 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_492 net/minecraft/client/gui/screen/ingame/MerchantScr FIELD field_19164 scrolling Z FIELD field_2950 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_1728;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 container + ARG 1 menu ARG 2 inventory ARG 3 title METHOD method_19413 drawLevelInfo (IILnet/minecraft/class_1914;)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/ShulkerBoxScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/ShulkerBoxScreen.mapping index 00e6a0ec86..408d5f255e 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/ShulkerBoxScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/ShulkerBoxScreen.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_495 net/minecraft/client/gui/screen/ingame/ShulkerBoxScreen FIELD field_2973 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_1733;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 container + ARG 1 menu ARG 2 inventory ARG 3 title diff --git a/mappings/net/minecraft/client/gui/screen/ingame/SmithingContainerScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/SmithingScreen.mapping similarity index 84% rename from mappings/net/minecraft/client/gui/screen/ingame/SmithingContainerScreen.mapping rename to mappings/net/minecraft/client/gui/screen/ingame/SmithingScreen.mapping index 69e17ebeea..9d104d1722 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/SmithingContainerScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/SmithingScreen.mapping @@ -1,6 +1,6 @@ -CLASS net/minecraft/class_4895 net/minecraft/client/gui/screen/ingame/SmithingContainerScreen +CLASS net/minecraft/class_4895 net/minecraft/client/gui/screen/ingame/SmithingScreen FIELD field_22795 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_4862;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 container + ARG 1 menu ARG 2 playerInventory ARG 3 title diff --git a/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping index 62f47331d6..e52b3cc8d6 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_3979 net/minecraft/client/gui/screen/ingame/Stonecutte FIELD field_17673 TEXTURE Lnet/minecraft/class_2960; FIELD field_17674 scrollAmount F METHOD (Lnet/minecraft/class_3971;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 container + ARG 1 menu ARG 2 inventory ARG 3 title METHOD method_17951 renderRecipeIcons (III)V diff --git a/mappings/net/minecraft/client/recipe/book/ClientRecipeBook.mapping b/mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping similarity index 90% rename from mappings/net/minecraft/client/recipe/book/ClientRecipeBook.mapping rename to mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping index 635de5d379..aeede6632a 100644 --- a/mappings/net/minecraft/client/recipe/book/ClientRecipeBook.mapping +++ b/mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_299 net/minecraft/client/recipe/book/ClientRecipeBook +CLASS net/minecraft/class_299 net/minecraft/client/recipebook/ClientRecipeBook FIELD field_1637 orderedResults Ljava/util/List; FIELD field_1638 resultsByGroup Ljava/util/Map; FIELD field_1639 manager Lnet/minecraft/class_1863; diff --git a/mappings/net/minecraft/client/recipe/book/RecipeBookGroup.mapping b/mappings/net/minecraft/client/recipebook/RecipeBookGroup.mapping similarity index 68% rename from mappings/net/minecraft/client/recipe/book/RecipeBookGroup.mapping rename to mappings/net/minecraft/client/recipebook/RecipeBookGroup.mapping index 867861ffe9..c19ee94a08 100644 --- a/mappings/net/minecraft/client/recipe/book/RecipeBookGroup.mapping +++ b/mappings/net/minecraft/client/recipebook/RecipeBookGroup.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_314 net/minecraft/client/recipe/book/RecipeBookGroup +CLASS net/minecraft/class_314 net/minecraft/client/recipebook/RecipeBookGroup FIELD field_1807 icons Ljava/util/List; METHOD (Ljava/lang/String;I[Lnet/minecraft/class_1799;)V ARG 3 entries diff --git a/mappings/net/minecraft/data/client/model/ModelIds.mapping b/mappings/net/minecraft/data/client/model/ModelIds.mapping index a7ef6b3bc9..d9026d513b 100644 --- a/mappings/net/minecraft/data/client/model/ModelIds.mapping +++ b/mappings/net/minecraft/data/client/model/ModelIds.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_4941 net/minecraft/data/client/model/ModelIds METHOD method_25843 getBlockSubModelId (Lnet/minecraft/class_2248;Ljava/lang/String;)Lnet/minecraft/class_2960; ARG 0 block ARG 1 suffix - METHOD method_25844 getMinecraftBlock (Ljava/lang/String;)Lnet/minecraft/class_2960; + METHOD method_25844 getMinecraftNamespacedBlock (Ljava/lang/String;)Lnet/minecraft/class_2960; ARG 0 name - METHOD method_25845 getMinecraftItem (Ljava/lang/String;)Lnet/minecraft/class_2960; + METHOD method_25845 getMinecraftNamespacedItem (Ljava/lang/String;)Lnet/minecraft/class_2960; ARG 0 name diff --git a/mappings/net/minecraft/menu/BeaconMenu.mapping b/mappings/net/minecraft/menu/BeaconMenu.mapping index eaf5d79536..c4f98b9eca 100644 --- a/mappings/net/minecraft/menu/BeaconMenu.mapping +++ b/mappings/net/minecraft/menu/BeaconMenu.mapping @@ -14,4 +14,9 @@ CLASS net/minecraft/class_1704 net/minecraft/menu/BeaconMenu METHOD method_17374 getPrimaryEffect ()Lnet/minecraft/class_1291; METHOD method_17375 getSecondaryEffect ()Lnet/minecraft/class_1291; METHOD method_17376 hasPayment ()Z - CLASS class_1705 SlotPayment + CLASS class_1705 PaymentSlot + METHOD (Lnet/minecraft/class_1704;Lnet/minecraft/class_1263;III)V + ARG 2 inventory + ARG 3 index + ARG 4 x + ARG 5 y diff --git a/mappings/net/minecraft/menu/BrewingStandMenu.mapping b/mappings/net/minecraft/menu/BrewingStandMenu.mapping index adff2e8832..e5f4736818 100644 --- a/mappings/net/minecraft/menu/BrewingStandMenu.mapping +++ b/mappings/net/minecraft/menu/BrewingStandMenu.mapping @@ -6,8 +6,8 @@ CLASS net/minecraft/class_1708 net/minecraft/menu/BrewingStandMenu ARG 1 syncId METHOD method_17377 getFuel ()I METHOD method_17378 getBrewTime ()I - CLASS class_1709 SlotFuel + CLASS class_1709 FuelSlot METHOD method_7630 matches (Lnet/minecraft/class_1799;)Z - CLASS class_1710 SlotIngredient - CLASS class_1711 SlotPotion + CLASS class_1710 IngredientSlot + CLASS class_1711 PotionSlot METHOD method_7631 matches (Lnet/minecraft/class_1799;)Z diff --git a/mappings/net/minecraft/menu/CraftingResultSlot.mapping b/mappings/net/minecraft/menu/CraftingResultSlot.mapping index e095138445..ac49f1a0b0 100644 --- a/mappings/net/minecraft/menu/CraftingResultSlot.mapping +++ b/mappings/net/minecraft/menu/CraftingResultSlot.mapping @@ -6,6 +6,6 @@ CLASS net/minecraft/class_1734 net/minecraft/menu/CraftingResultSlot ARG 1 player ARG 2 craftingInv ARG 3 inventory - ARG 4 invSlot - ARG 5 xPosition - ARG 6 yPosition + ARG 4 index + ARG 5 x + ARG 6 y diff --git a/mappings/net/minecraft/menu/FurnaceFuelSlot.mapping b/mappings/net/minecraft/menu/FurnaceFuelSlot.mapping index 9d24ae6d05..58ec827a5f 100644 --- a/mappings/net/minecraft/menu/FurnaceFuelSlot.mapping +++ b/mappings/net/minecraft/menu/FurnaceFuelSlot.mapping @@ -1,8 +1,10 @@ CLASS net/minecraft/class_1717 net/minecraft/menu/FurnaceFuelSlot FIELD field_17083 menu Lnet/minecraft/class_1720; METHOD (Lnet/minecraft/class_1720;Lnet/minecraft/class_1263;III)V - ARG 3 invSlot - ARG 4 xPosition - ARG 5 yPosition + ARG 1 menu + ARG 2 inventory + ARG 3 index + ARG 4 x + ARG 5 y METHOD method_7636 isBucket (Lnet/minecraft/class_1799;)Z ARG 0 stack diff --git a/mappings/net/minecraft/menu/FurnaceOutputSlot.mapping b/mappings/net/minecraft/menu/FurnaceOutputSlot.mapping index 45b23bce26..558a163b35 100644 --- a/mappings/net/minecraft/menu/FurnaceOutputSlot.mapping +++ b/mappings/net/minecraft/menu/FurnaceOutputSlot.mapping @@ -4,6 +4,6 @@ CLASS net/minecraft/class_1719 net/minecraft/menu/FurnaceOutputSlot METHOD (Lnet/minecraft/class_1657;Lnet/minecraft/class_1263;III)V ARG 1 player ARG 2 inventory - ARG 3 invSlot - ARG 4 xPosition - ARG 5 yPosition + ARG 3 index + ARG 4 x + ARG 5 y diff --git a/mappings/net/minecraft/menu/Slot.mapping b/mappings/net/minecraft/menu/Slot.mapping index b803038757..bc06399741 100644 --- a/mappings/net/minecraft/menu/Slot.mapping +++ b/mappings/net/minecraft/menu/Slot.mapping @@ -1,14 +1,14 @@ CLASS net/minecraft/class_1735 net/minecraft/menu/Slot FIELD field_7871 inventory Lnet/minecraft/class_1263; - FIELD field_7872 yPosition I - FIELD field_7873 xPosition I + FIELD field_7872 y I + FIELD field_7873 x I FIELD field_7874 id I - FIELD field_7875 invSlot I + FIELD field_7875 index I METHOD (Lnet/minecraft/class_1263;III)V ARG 1 inventory - ARG 2 invSlot - ARG 3 xPosition - ARG 4 yPosition + ARG 2 index + ARG 3 x + ARG 4 y METHOD method_7667 onTakeItem (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; ARG 1 player ARG 2 stack From a1fb6d73d49b98d3ef6ebb091c546a6a00186e71 Mon Sep 17 00:00:00 2001 From: Juuxel <6596629+Juuxel@users.noreply.github.com> Date: Mon, 9 Mar 2020 17:21:20 +0200 Subject: [PATCH 03/10] Apply suggestions from code review Co-Authored-By: liach <7806504+liach@users.noreply.github.com> --- mappings/net/minecraft/entity/player/PlayerEntity.mapping | 1 + mappings/net/minecraft/menu/AnvilMenu.mapping | 1 - mappings/net/minecraft/recipe/book/RecipeBook.mapping | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index b946374717..ce69fc3b3c 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -52,6 +52,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 5 leveled ARG 6 refreshable METHOD method_17355 openMenu (Lnet/minecraft/class_3908;)Ljava/util/OptionalInt; + ARG 1 factory METHOD method_17356 playSound (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FF)V ARG 1 event ARG 2 category diff --git a/mappings/net/minecraft/menu/AnvilMenu.mapping b/mappings/net/minecraft/menu/AnvilMenu.mapping index fbe15c93d0..bf576e8a94 100644 --- a/mappings/net/minecraft/menu/AnvilMenu.mapping +++ b/mappings/net/minecraft/menu/AnvilMenu.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_1706 net/minecraft/menu/AnvilMenu - FIELD field_7769 result Lnet/minecraft/class_1263; FIELD field_7770 levelCost Lnet/minecraft/class_3915; FIELD field_7771 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_7774 newItemName Ljava/lang/String; diff --git a/mappings/net/minecraft/recipe/book/RecipeBook.mapping b/mappings/net/minecraft/recipe/book/RecipeBook.mapping index e67a7f933d..e2fa1974a2 100644 --- a/mappings/net/minecraft/recipe/book/RecipeBook.mapping +++ b/mappings/net/minecraft/recipe/book/RecipeBook.mapping @@ -20,7 +20,7 @@ CLASS net/minecraft/class_3439 net/minecraft/recipe/book/RecipeBook METHOD method_14879 remove (Lnet/minecraft/class_2960;)V ARG 1 id METHOD method_14880 isFilteringCraftable (Lnet/minecraft/class_1729;)Z - ARG 1 container + ARG 1 menu METHOD method_14881 add (Lnet/minecraft/class_2960;)V ARG 1 id METHOD method_14882 setFurnaceGuiOpen (Z)V From e30939d59a72806af87faee4b01f3d6f36865819 Mon Sep 17 00:00:00 2001 From: Juuxel <6596629+Juuxel@users.noreply.github.com> Date: Mon, 9 Mar 2020 17:36:48 +0200 Subject: [PATCH 04/10] Some refactoring --- mappings/net/minecraft/menu/NameableMenuFactory.mapping | 2 +- .../menu/{SmithingTableMenu.mapping => SmithingMenu.mapping} | 2 +- .../network/listener/ClientPlayPacketListener.mapping | 2 +- .../network/listener/ServerPlayPacketListener.mapping | 2 +- ...onC2SPacket.mapping => ConfirmMenuActionC2SPacket.mapping} | 4 ++-- ...onS2CPacket.mapping => ConfirmMenuActionS2CPacket.mapping} | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename mappings/net/minecraft/menu/{SmithingTableMenu.mapping => SmithingMenu.mapping} (78%) rename mappings/net/minecraft/network/packet/c2s/play/{ConfirmGuiActionC2SPacket.mapping => ConfirmMenuActionC2SPacket.mapping} (81%) rename mappings/net/minecraft/network/packet/s2c/play/{ConfirmGuiActionS2CPacket.mapping => ConfirmMenuActionS2CPacket.mapping} (91%) diff --git a/mappings/net/minecraft/menu/NameableMenuFactory.mapping b/mappings/net/minecraft/menu/NameableMenuFactory.mapping index 3237ba08f0..baac7e0f4a 100644 --- a/mappings/net/minecraft/menu/NameableMenuFactory.mapping +++ b/mappings/net/minecraft/menu/NameableMenuFactory.mapping @@ -1,2 +1,2 @@ CLASS net/minecraft/class_3908 net/minecraft/menu/NameableMenuFactory - METHOD method_5476 getDisplayName ()Lnet/minecraft/class_2561; + METHOD method_5476 getTitle ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/menu/SmithingTableMenu.mapping b/mappings/net/minecraft/menu/SmithingMenu.mapping similarity index 78% rename from mappings/net/minecraft/menu/SmithingTableMenu.mapping rename to mappings/net/minecraft/menu/SmithingMenu.mapping index ff8fa2e858..b0fef10337 100644 --- a/mappings/net/minecraft/menu/SmithingTableMenu.mapping +++ b/mappings/net/minecraft/menu/SmithingMenu.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4862 net/minecraft/menu/SmithingTableMenu +CLASS net/minecraft/class_4862 net/minecraft/menu/SmithingMenu FIELD field_22485 RECIPES Ljava/util/Map; METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId diff --git a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping index de0cf7b0c7..af0370260a 100644 --- a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping @@ -91,7 +91,7 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_11122 onHealthUpdate (Lnet/minecraft/class_2749;)V ARG 1 packet - METHOD method_11123 onGuiActionConfirm (Lnet/minecraft/class_2644;)V + METHOD method_11123 onConfirmMenuAction (Lnet/minecraft/class_2644;)V ARG 1 packet METHOD method_11124 onExplosion (Lnet/minecraft/class_2664;)V ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping index 9be6c834c9..d324434166 100644 --- a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping @@ -67,7 +67,7 @@ CLASS net/minecraft/class_2792 net/minecraft/network/listener/ServerPlayPacketLi ARG 1 packet METHOD method_12078 onVehicleMove (Lnet/minecraft/class_2833;)V ARG 1 packet - METHOD method_12079 onConfirmTransaction (Lnet/minecraft/class_2809;)V + METHOD method_12079 onConfirmMenuAction (Lnet/minecraft/class_2809;)V ARG 1 packet METHOD method_12080 onVillagerTradeSelect (Lnet/minecraft/class_2863;)V ARG 1 packet diff --git a/mappings/net/minecraft/network/packet/c2s/play/ConfirmGuiActionC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ConfirmMenuActionC2SPacket.mapping similarity index 81% rename from mappings/net/minecraft/network/packet/c2s/play/ConfirmGuiActionC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/ConfirmMenuActionC2SPacket.mapping index c6b132ceed..3ddc9e6528 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ConfirmGuiActionC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ConfirmMenuActionC2SPacket.mapping @@ -1,7 +1,7 @@ -CLASS net/minecraft/class_2809 net/minecraft/network/packet/c2s/play/ConfirmGuiActionC2SPacket +CLASS net/minecraft/class_2809 net/minecraft/network/packet/c2s/play/ConfirmMenuActionC2SPacket FIELD field_12809 actionId S FIELD field_12810 accepted Z - FIELD field_12811 windowId I + FIELD field_12811 syncId I METHOD (ISZ)V ARG 1 syncId ARG 2 actionId diff --git a/mappings/net/minecraft/network/packet/s2c/play/ConfirmGuiActionS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ConfirmMenuActionS2CPacket.mapping similarity index 91% rename from mappings/net/minecraft/network/packet/s2c/play/ConfirmGuiActionS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/ConfirmMenuActionS2CPacket.mapping index 534e1ef0d0..ced32f49b6 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ConfirmGuiActionS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ConfirmMenuActionS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2644 net/minecraft/network/packet/s2c/play/ConfirmGuiActionS2CPacket +CLASS net/minecraft/class_2644 net/minecraft/network/packet/s2c/play/ConfirmMenuActionS2CPacket FIELD field_12134 actionId S FIELD field_12135 accepted Z FIELD field_12136 syncId I From b570c252a17614c3937d9c1370f739d22bb7be9b Mon Sep 17 00:00:00 2001 From: Juuxel <6596629+Juuxel@users.noreply.github.com> Date: Mon, 9 Mar 2020 17:37:05 +0200 Subject: [PATCH 05/10] Update CONVENTIONS.md --- CONVENTIONS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONVENTIONS.md b/CONVENTIONS.md index 7b375fd878..079d6ce95b 100644 --- a/CONVENTIONS.md +++ b/CONVENTIONS.md @@ -126,7 +126,7 @@ way. There are however two exceptions to this rule: - Use "world" for what Mojang calls "level" (see https://github.com/FabricMC/yarn/issues/89) - - Use "inventory" for what Mojang calls "container" (no issue yet, requires renaming "container" first) + - Use "inventory" for what Mojang calls "container" (no issue yet) ## Things to avoid From e8003c7d8ce823bf7857f7af0dcda0a92bf09887 Mon Sep 17 00:00:00 2001 From: Juuxel <6596629+Juuxel@users.noreply.github.com> Date: Mon, 9 Mar 2020 19:04:37 +0200 Subject: [PATCH 06/10] NameableMenuFactory.getTitle() -> getDisplayName() It's the same method as Nameable.getDisplayName() which is also used by entities such as players. (I don't think players have a title? :P) --- mappings/net/minecraft/menu/NameableMenuFactory.mapping | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mappings/net/minecraft/menu/NameableMenuFactory.mapping b/mappings/net/minecraft/menu/NameableMenuFactory.mapping index baac7e0f4a..3237ba08f0 100644 --- a/mappings/net/minecraft/menu/NameableMenuFactory.mapping +++ b/mappings/net/minecraft/menu/NameableMenuFactory.mapping @@ -1,2 +1,2 @@ CLASS net/minecraft/class_3908 net/minecraft/menu/NameableMenuFactory - METHOD method_5476 getTitle ()Lnet/minecraft/class_2561; + METHOD method_5476 getDisplayName ()Lnet/minecraft/class_2561; From 350cde9175e931a94b913cf4179381ff1cc7db68 Mon Sep 17 00:00:00 2001 From: Juuxel <6596629+Juuxel@users.noreply.github.com> Date: Mon, 9 Mar 2020 19:40:32 +0200 Subject: [PATCH 07/10] Port some changes from #1166 Co-authored-by: liach --- .../screen/ingame/EnchantingPhrases.mapping | 2 +- ...reen.mapping => EnchantmentScreen.mapping} | 4 +-- .../gui/screen/ingame/MenuScreen.mapping | 2 +- .../MenuScreens.mapping} | 9 +++++-- .../menu/AbstractCraftingMenu.mapping | 9 +++++++ .../net/minecraft/menu/BeaconMenu.mapping | 2 +- .../net/minecraft/menu/CraftingMenu.mapping | 27 ++++++++++++------- .../minecraft/menu/CraftingTableMenu.mapping | 15 ----------- ...leMenu.mapping => EnchantmentMenu.mapping} | 2 +- .../net/minecraft/menu/GrindstoneMenu.mapping | 4 +-- mappings/net/minecraft/menu/HorseMenu.mapping | 5 +++- mappings/net/minecraft/menu/LoomMenu.mapping | 7 +++-- mappings/net/minecraft/menu/Menu.mapping | 19 ++++++------- ...ockContext.mapping => MenuContext.mapping} | 4 +-- .../net/minecraft/menu/MerchantMenu.mapping | 1 + .../menu/NameableMenuFactory.mapping | 2 -- .../minecraft/menu/NamedMenuFactory.mapping | 3 +++ .../net/minecraft/menu/PlayerMenu.mapping | 4 +-- 18 files changed, 69 insertions(+), 52 deletions(-) rename mappings/net/minecraft/client/gui/screen/ingame/{EnchantingScreen.mapping => EnchantmentScreen.mapping} (89%) rename mappings/net/minecraft/client/gui/screen/{Screens.mapping => ingame/MenuScreens.mapping} (70%) create mode 100644 mappings/net/minecraft/menu/AbstractCraftingMenu.mapping delete mode 100644 mappings/net/minecraft/menu/CraftingTableMenu.mapping rename mappings/net/minecraft/menu/{EnchantingTableMenu.mapping => EnchantmentMenu.mapping} (90%) rename mappings/net/minecraft/menu/{BlockContext.mapping => MenuContext.mapping} (74%) delete mode 100644 mappings/net/minecraft/menu/NameableMenuFactory.mapping create mode 100644 mappings/net/minecraft/menu/NamedMenuFactory.mapping diff --git a/mappings/net/minecraft/client/gui/screen/ingame/EnchantingPhrases.mapping b/mappings/net/minecraft/client/gui/screen/ingame/EnchantingPhrases.mapping index edc23ceadd..24bf612fb2 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/EnchantingPhrases.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/EnchantingPhrases.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_487 net/minecraft/client/gui/screen/ingame/EnchantingP FIELD field_2917 INSTANCE Lnet/minecraft/class_487; FIELD field_2918 random Ljava/util/Random; METHOD method_2479 generatePhrase (Lnet/minecraft/class_327;I)Ljava/lang/String; - ARG 1 fontRenderer + ARG 1 textRenderer ARG 2 width METHOD method_2480 setSeed (J)V ARG 1 seed diff --git a/mappings/net/minecraft/client/gui/screen/ingame/EnchantingScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.mapping similarity index 89% rename from mappings/net/minecraft/client/gui/screen/ingame/EnchantingScreen.mapping rename to mappings/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.mapping index 79e9110fca..66acb6ea46 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/EnchantingScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.mapping @@ -1,9 +1,9 @@ -CLASS net/minecraft/class_486 net/minecraft/client/gui/screen/ingame/EnchantingScreen +CLASS net/minecraft/class_486 net/minecraft/client/gui/screen/ingame/EnchantmentScreen FIELD field_2901 BOOK_TEXURE Lnet/minecraft/class_2960; FIELD field_2904 pageTurningSpeed F FIELD field_2905 nextPageTurningSpeed F FIELD field_2906 pageRotationSpeed F - FIELD field_2908 bookModel Lnet/minecraft/class_557; + FIELD field_2908 BOOK_MODEL Lnet/minecraft/class_557; FIELD field_2909 approximatePageAngle F FIELD field_2910 TEXTURE Lnet/minecraft/class_2960; FIELD field_2911 random Ljava/util/Random; diff --git a/mappings/net/minecraft/client/gui/screen/ingame/MenuScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/MenuScreen.mapping index baadd111f3..72658474d5 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/MenuScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/MenuScreen.mapping @@ -31,7 +31,7 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/MenuScreen METHOD (Lnet/minecraft/class_1703;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V ARG 1 menu ARG 2 playerInventory - ARG 3 name + ARG 3 title METHOD method_2378 isPointWithinBounds (IIIIDD)Z ARG 1 xPosition ARG 2 yPosition diff --git a/mappings/net/minecraft/client/gui/screen/Screens.mapping b/mappings/net/minecraft/client/gui/screen/ingame/MenuScreens.mapping similarity index 70% rename from mappings/net/minecraft/client/gui/screen/Screens.mapping rename to mappings/net/minecraft/client/gui/screen/ingame/MenuScreens.mapping index 6f7eec13a9..abf3cbf230 100644 --- a/mappings/net/minecraft/client/gui/screen/Screens.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/MenuScreens.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3929 net/minecraft/client/gui/screen/Screens +CLASS net/minecraft/class_3929 net/minecraft/client/gui/screen/ingame/MenuScreens FIELD field_17408 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_17409 PROVIDERS Ljava/util/Map; METHOD method_17539 validateScreens ()Z @@ -8,10 +8,15 @@ CLASS net/minecraft/class_3929 net/minecraft/client/gui/screen/Screens ARG 0 type ARG 1 client ARG 2 id - ARG 3 name + ARG 3 title METHOD method_17542 register (Lnet/minecraft/class_3917;Lnet/minecraft/class_3929$class_3930;)V ARG 0 type + ARG 1 provider CLASS class_3930 Provider + METHOD create (Lnet/minecraft/class_1703;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)Lnet/minecraft/class_437; + ARG 1 menu + ARG 2 playerInventory + ARG 3 title METHOD method_17543 open (Lnet/minecraft/class_2561;Lnet/minecraft/class_3917;Lnet/minecraft/class_310;I)V ARG 1 name ARG 2 type diff --git a/mappings/net/minecraft/menu/AbstractCraftingMenu.mapping b/mappings/net/minecraft/menu/AbstractCraftingMenu.mapping new file mode 100644 index 0000000000..14dc17eec6 --- /dev/null +++ b/mappings/net/minecraft/menu/AbstractCraftingMenu.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_1729 net/minecraft/menu/AbstractCraftingMenu + METHOD method_17697 fillInputSlots (ZLnet/minecraft/class_1860;Lnet/minecraft/class_3222;)V + METHOD method_7652 matches (Lnet/minecraft/class_1860;)Z + METHOD method_7653 getCraftingWidth ()I + METHOD method_7654 populateRecipeFinder (Lnet/minecraft/class_1662;)V + METHOD method_7655 getCraftingResultSlotIndex ()I + METHOD method_7656 getCraftingHeight ()I + METHOD method_7657 clearCraftingSlots ()V + METHOD method_7658 getCraftingSlotCount ()I diff --git a/mappings/net/minecraft/menu/BeaconMenu.mapping b/mappings/net/minecraft/menu/BeaconMenu.mapping index c4f98b9eca..a35c696b16 100644 --- a/mappings/net/minecraft/menu/BeaconMenu.mapping +++ b/mappings/net/minecraft/menu/BeaconMenu.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_1704 net/minecraft/menu/BeaconMenu - FIELD field_17287 paymentInv Lnet/minecraft/class_1263; + FIELD field_17287 payment Lnet/minecraft/class_1263; FIELD field_17288 paymentSlot Lnet/minecraft/class_1704$class_1705; FIELD field_17289 context Lnet/minecraft/class_3914; FIELD field_17290 propertyDelegate Lnet/minecraft/class_3913; diff --git a/mappings/net/minecraft/menu/CraftingMenu.mapping b/mappings/net/minecraft/menu/CraftingMenu.mapping index 677953bd64..5745d07bb4 100644 --- a/mappings/net/minecraft/menu/CraftingMenu.mapping +++ b/mappings/net/minecraft/menu/CraftingMenu.mapping @@ -1,9 +1,18 @@ -CLASS net/minecraft/class_1729 net/minecraft/menu/CraftingMenu - METHOD method_17697 fillInputSlots (ZLnet/minecraft/class_1860;Lnet/minecraft/class_3222;)V - METHOD method_7652 matches (Lnet/minecraft/class_1860;)Z - METHOD method_7653 getCraftingWidth ()I - METHOD method_7654 populateRecipeFinder (Lnet/minecraft/class_1662;)V - METHOD method_7655 getCraftingResultSlotIndex ()I - METHOD method_7656 getCraftingHeight ()I - METHOD method_7657 clearCraftingSlots ()V - METHOD method_7658 getCraftingSlotCount ()I +CLASS net/minecraft/class_1714 net/minecraft/menu/CraftingMenu + FIELD field_7797 player Lnet/minecraft/class_1657; + FIELD field_7799 context Lnet/minecraft/class_3914; + FIELD field_7800 result Lnet/minecraft/class_1731; + FIELD field_7801 input Lnet/minecraft/class_1715; + METHOD (ILnet/minecraft/class_1661;)V + ARG 1 syncId + ARG 2 playerInventory + METHOD (ILnet/minecraft/class_1661;Lnet/minecraft/class_3914;)V + ARG 1 syncId + ARG 2 playerInventory + ARG 3 context + METHOD method_17399 updateResult (ILnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1715;Lnet/minecraft/class_1731;)V + ARG 0 syncId + ARG 1 world + ARG 2 player + ARG 3 craftingInventory + ARG 4 resultInventory diff --git a/mappings/net/minecraft/menu/CraftingTableMenu.mapping b/mappings/net/minecraft/menu/CraftingTableMenu.mapping deleted file mode 100644 index 864db85dc2..0000000000 --- a/mappings/net/minecraft/menu/CraftingTableMenu.mapping +++ /dev/null @@ -1,15 +0,0 @@ -CLASS net/minecraft/class_1714 net/minecraft/menu/CraftingTableMenu - FIELD field_7797 player Lnet/minecraft/class_1657; - FIELD field_7799 context Lnet/minecraft/class_3914; - FIELD field_7800 resultInv Lnet/minecraft/class_1731; - FIELD field_7801 craftingInv Lnet/minecraft/class_1715; - METHOD (ILnet/minecraft/class_1661;)V - ARG 1 syncId - METHOD (ILnet/minecraft/class_1661;Lnet/minecraft/class_3914;)V - ARG 1 syncId - METHOD method_17399 updateResult (ILnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1715;Lnet/minecraft/class_1731;)V - ARG 0 syncId - ARG 1 world - ARG 2 player - ARG 3 craftingInventory - ARG 4 resultInventory diff --git a/mappings/net/minecraft/menu/EnchantingTableMenu.mapping b/mappings/net/minecraft/menu/EnchantmentMenu.mapping similarity index 90% rename from mappings/net/minecraft/menu/EnchantingTableMenu.mapping rename to mappings/net/minecraft/menu/EnchantmentMenu.mapping index fbae7ab238..8f4449122c 100644 --- a/mappings/net/minecraft/menu/EnchantingTableMenu.mapping +++ b/mappings/net/minecraft/menu/EnchantmentMenu.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1718 net/minecraft/menu/EnchantingTableMenu +CLASS net/minecraft/class_1718 net/minecraft/menu/EnchantmentMenu FIELD field_7808 enchantmentPower [I FIELD field_7809 inventory Lnet/minecraft/class_1263; FIELD field_7810 enchantmentLevel [I diff --git a/mappings/net/minecraft/menu/GrindstoneMenu.mapping b/mappings/net/minecraft/menu/GrindstoneMenu.mapping index e6433b4aca..b19857089f 100644 --- a/mappings/net/minecraft/menu/GrindstoneMenu.mapping +++ b/mappings/net/minecraft/menu/GrindstoneMenu.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3803 net/minecraft/menu/GrindstoneMenu - FIELD field_16772 craftingInventory Lnet/minecraft/class_1263; - FIELD field_16773 resultInventory Lnet/minecraft/class_1263; + FIELD field_16772 input Lnet/minecraft/class_1263; + FIELD field_16773 result Lnet/minecraft/class_1263; FIELD field_16775 context Lnet/minecraft/class_3914; METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId diff --git a/mappings/net/minecraft/menu/HorseMenu.mapping b/mappings/net/minecraft/menu/HorseMenu.mapping index 727ac8390c..f9c8a20576 100644 --- a/mappings/net/minecraft/menu/HorseMenu.mapping +++ b/mappings/net/minecraft/menu/HorseMenu.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_1724 net/minecraft/menu/HorseMenu - FIELD field_7836 playerInv Lnet/minecraft/class_1263; + FIELD field_7836 inventory Lnet/minecraft/class_1263; FIELD field_7837 entity Lnet/minecraft/class_1496; METHOD (ILnet/minecraft/class_1661;Lnet/minecraft/class_1263;Lnet/minecraft/class_1496;)V ARG 1 syncId + ARG 2 playerInventory + ARG 3 inventory + ARG 4 horse diff --git a/mappings/net/minecraft/menu/LoomMenu.mapping b/mappings/net/minecraft/menu/LoomMenu.mapping index 2b91ce9c69..ba33a346e3 100644 --- a/mappings/net/minecraft/menu/LoomMenu.mapping +++ b/mappings/net/minecraft/menu/LoomMenu.mapping @@ -6,13 +6,16 @@ CLASS net/minecraft/class_1726 net/minecraft/menu/LoomMenu FIELD field_17320 dyeSlot Lnet/minecraft/class_1735; FIELD field_17321 patternSlot Lnet/minecraft/class_1735; FIELD field_17322 outputSlot Lnet/minecraft/class_1735; - FIELD field_17323 outputInventory Lnet/minecraft/class_1263; + FIELD field_17323 output Lnet/minecraft/class_1263; FIELD field_20383 lastTakeResultTime J - FIELD field_7850 inputInventory Lnet/minecraft/class_1263; + FIELD field_7850 input Lnet/minecraft/class_1263; METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId + ARG 2 playerInventory METHOD (ILnet/minecraft/class_1661;Lnet/minecraft/class_3914;)V ARG 1 syncId + ARG 2 playerInventory + ARG 3 context METHOD method_17423 setInventoryChangeListener (Ljava/lang/Runnable;)V ARG 1 inventoryChangeListener METHOD method_17428 getBannerSlot ()Lnet/minecraft/class_1735; diff --git a/mappings/net/minecraft/menu/Menu.mapping b/mappings/net/minecraft/menu/Menu.mapping index 75eeb24489..816ba33090 100644 --- a/mappings/net/minecraft/menu/Menu.mapping +++ b/mappings/net/minecraft/menu/Menu.mapping @@ -30,18 +30,13 @@ CLASS net/minecraft/class_1703 net/minecraft/menu/Menu ARG 1 type ARG 2 syncId METHOD method_17358 getType ()Lnet/minecraft/class_3917; - METHOD method_17359 checkContainerSize (Lnet/minecraft/class_1263;I)V - COMMENT Checks that the size of the provided inventory is at least as large as the {@code expectedSize}. - COMMENT - COMMENT @throws IllegalArgumentException if the inventory size is smaller than {@code exceptedSize} + METHOD method_17359 checkSize (Lnet/minecraft/class_1263;I)V + ARG 0 inventory ARG 1 expectedSize METHOD method_17360 addProperties (Lnet/minecraft/class_3913;)V COMMENT Adds all properties in the {@code data} to this menu. ARG 1 data - METHOD method_17361 checkContainerDataCount (Lnet/minecraft/class_3913;I)V - COMMENT Checks that the size of the {@code data} is at least as large as the {@code exceptedCount}. - COMMENT - COMMENT @throws IllegalArgumentException if the {@code data} has a smaller size than {@code exceptedCount} + METHOD method_17361 checkDataCount (Lnet/minecraft/class_3913;I)V ARG 0 data ARG 1 expectedCount METHOD method_17362 addProperty (Lnet/minecraft/class_3915;)Lnet/minecraft/class_3915; @@ -59,10 +54,12 @@ CLASS net/minecraft/class_1703 net/minecraft/menu/Menu METHOD method_7592 canInsertItemIntoSlot (Lnet/minecraft/class_1735;Lnet/minecraft/class_1799;Z)Z ARG 0 slot ARG 1 stack + ARG 2 allowOverflow METHOD method_7593 onSlotClick (IILnet/minecraft/class_1713;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1799; ARG 1 slotId ARG 2 clickData ARG 3 actionType + ARG 4 player METHOD method_7594 unpackButtonId (I)I ARG 0 clickData METHOD method_7595 close (Lnet/minecraft/class_1657;)V @@ -72,9 +69,11 @@ CLASS net/minecraft/class_1703 net/minecraft/menu/Menu METHOD method_7597 canUse (Lnet/minecraft/class_1657;)Z ARG 1 player METHOD method_7600 shouldQuickCraftContinue (ILnet/minecraft/class_1657;)Z + ARG 0 stage + ARG 1 player METHOD method_7601 transferSlot (Lnet/minecraft/class_1657;I)Lnet/minecraft/class_1799; ARG 1 player - ARG 2 invSlot + ARG 2 index METHOD method_7602 getStacks ()Lnet/minecraft/class_2371; COMMENT Gets a list of item stacks stored in this menu's slots. METHOD method_7603 removeListener (Lnet/minecraft/class_1712;)V @@ -105,7 +104,9 @@ CLASS net/minecraft/class_1703 net/minecraft/menu/Menu ARG 1 stack ARG 2 slot METHOD method_7614 getNextActionId (Lnet/minecraft/class_1661;)S + ARG 1 playerInventory METHOD method_7615 canInsertIntoSlot (Lnet/minecraft/class_1735;)Z + ARG 1 slot METHOD method_7616 insertItem (Lnet/minecraft/class_1799;IIZ)Z ARG 1 stack ARG 2 startIndex diff --git a/mappings/net/minecraft/menu/BlockContext.mapping b/mappings/net/minecraft/menu/MenuContext.mapping similarity index 74% rename from mappings/net/minecraft/menu/BlockContext.mapping rename to mappings/net/minecraft/menu/MenuContext.mapping index 53619858d6..b4adbd2c30 100644 --- a/mappings/net/minecraft/menu/BlockContext.mapping +++ b/mappings/net/minecraft/menu/MenuContext.mapping @@ -1,5 +1,5 @@ -CLASS net/minecraft/class_3914 net/minecraft/menu/BlockContext - COMMENT Block contexts allow to get a value using an optionally present {@link World} and {@link BlockPos}. +CLASS net/minecraft/class_3914 net/minecraft/menu/MenuContext + COMMENT Menu contexts allow menus to interact with the logical server's world safely. FIELD field_17304 EMPTY Lnet/minecraft/class_3914; METHOD method_17392 create (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3914; ARG 0 world diff --git a/mappings/net/minecraft/menu/MerchantMenu.mapping b/mappings/net/minecraft/menu/MerchantMenu.mapping index 97b3ae746e..38d0a93eb6 100644 --- a/mappings/net/minecraft/menu/MerchantMenu.mapping +++ b/mappings/net/minecraft/menu/MerchantMenu.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_1728 net/minecraft/menu/MerchantMenu ARG 2 playerInventory ARG 3 trader METHOD method_17437 setOffers (Lnet/minecraft/class_1916;)V + ARG 1 offers METHOD method_17438 getRecipes ()Lnet/minecraft/class_1916; METHOD method_19253 setCanLevel (Z)V ARG 1 canLevel diff --git a/mappings/net/minecraft/menu/NameableMenuFactory.mapping b/mappings/net/minecraft/menu/NameableMenuFactory.mapping deleted file mode 100644 index 3237ba08f0..0000000000 --- a/mappings/net/minecraft/menu/NameableMenuFactory.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_3908 net/minecraft/menu/NameableMenuFactory - METHOD method_5476 getDisplayName ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/menu/NamedMenuFactory.mapping b/mappings/net/minecraft/menu/NamedMenuFactory.mapping new file mode 100644 index 0000000000..197067b0b6 --- /dev/null +++ b/mappings/net/minecraft/menu/NamedMenuFactory.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_3908 net/minecraft/menu/NamedMenuFactory + METHOD method_5476 getDisplayName ()Lnet/minecraft/class_2561; + COMMENT Returns the title of the menu. It will also be sent to the client in the open menu packet. diff --git a/mappings/net/minecraft/menu/PlayerMenu.mapping b/mappings/net/minecraft/menu/PlayerMenu.mapping index 57ed2118db..c6a9a3fe4f 100644 --- a/mappings/net/minecraft/menu/PlayerMenu.mapping +++ b/mappings/net/minecraft/menu/PlayerMenu.mapping @@ -8,8 +8,8 @@ CLASS net/minecraft/class_1723 net/minecraft/menu/PlayerMenu FIELD field_7827 onServer Z FIELD field_7828 owner Lnet/minecraft/class_1657; FIELD field_7829 EMPTY_ARMOR_SLOT_TEXTURES [Lnet/minecraft/class_2960; - FIELD field_7830 craftingResultInventory Lnet/minecraft/class_1731; - FIELD field_7831 craftingInventory Lnet/minecraft/class_1715; + FIELD field_7830 craftingResult Lnet/minecraft/class_1731; + FIELD field_7831 craftingInput Lnet/minecraft/class_1715; FIELD field_7832 EQUIPMENT_SLOT_ORDER [Lnet/minecraft/class_1304; METHOD (Lnet/minecraft/class_1661;ZLnet/minecraft/class_1657;)V ARG 1 inventory From 3bf1dc1eb2734c0b449a4e646bfafb7bdb937ce0 Mon Sep 17 00:00:00 2001 From: Juuxel <6596629+Juuxel@users.noreply.github.com> Date: Mon, 9 Mar 2020 19:44:08 +0200 Subject: [PATCH 08/10] Restore comments --- mappings/net/minecraft/menu/Menu.mapping | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mappings/net/minecraft/menu/Menu.mapping b/mappings/net/minecraft/menu/Menu.mapping index 816ba33090..b2c28d1ea8 100644 --- a/mappings/net/minecraft/menu/Menu.mapping +++ b/mappings/net/minecraft/menu/Menu.mapping @@ -31,12 +31,18 @@ CLASS net/minecraft/class_1703 net/minecraft/menu/Menu ARG 2 syncId METHOD method_17358 getType ()Lnet/minecraft/class_3917; METHOD method_17359 checkSize (Lnet/minecraft/class_1263;I)V + COMMENT Checks that the size of the provided inventory is at least as large as the {@code expectedSize}. + COMMENT + COMMENT @throws IllegalArgumentException if the inventory size is smaller than {@code exceptedSize} ARG 0 inventory ARG 1 expectedSize METHOD method_17360 addProperties (Lnet/minecraft/class_3913;)V COMMENT Adds all properties in the {@code data} to this menu. ARG 1 data METHOD method_17361 checkDataCount (Lnet/minecraft/class_3913;I)V + COMMENT Checks that the size of the {@code data} is at least as large as the {@code exceptedCount}. + COMMENT + COMMENT @throws IllegalArgumentException if the {@code data} has a smaller size than {@code exceptedCount} ARG 0 data ARG 1 expectedCount METHOD method_17362 addProperty (Lnet/minecraft/class_3915;)Lnet/minecraft/class_3915; From 6f92f2c30372632d1617ad4b710eb894386309ba Mon Sep 17 00:00:00 2001 From: Juuxel <6596629+Juuxel@users.noreply.github.com> Date: Mon, 9 Mar 2020 19:47:44 +0200 Subject: [PATCH 09/10] Remove some menu prefixes from MenuListener methods --- mappings/net/minecraft/menu/MenuListener.mapping | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/menu/MenuListener.mapping b/mappings/net/minecraft/menu/MenuListener.mapping index caac51f216..eab794b34d 100644 --- a/mappings/net/minecraft/menu/MenuListener.mapping +++ b/mappings/net/minecraft/menu/MenuListener.mapping @@ -1,12 +1,12 @@ CLASS net/minecraft/class_1712 net/minecraft/menu/MenuListener - METHOD method_7633 onMenuPropertyUpdate (Lnet/minecraft/class_1703;II)V + METHOD method_7633 onPropertyUpdate (Lnet/minecraft/class_1703;II)V ARG 1 menu ARG 2 propertyId ARG 3 value METHOD method_7634 onMenuRegistered (Lnet/minecraft/class_1703;Lnet/minecraft/class_2371;)V ARG 1 menu ARG 2 stacks - METHOD method_7635 onMenuSlotUpdate (Lnet/minecraft/class_1703;ILnet/minecraft/class_1799;)V + METHOD method_7635 onSlotUpdate (Lnet/minecraft/class_1703;ILnet/minecraft/class_1799;)V ARG 1 menu ARG 2 slotId ARG 3 stack From 897cfe4376e133a625f810aabc041049e7b74d61 Mon Sep 17 00:00:00 2001 From: Juuxel <6596629+Juuxel@users.noreply.github.com> Date: Sun, 22 Mar 2020 18:54:19 +0200 Subject: [PATCH 10/10] Some renames to be more consistent with upstream --- .../net/minecraft/client/gui/screen/ingame/MenuScreen.mapping | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/client/gui/screen/ingame/MenuScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/MenuScreen.mapping index 3ced236ae3..ff8a0758d9 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/MenuScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/MenuScreen.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/MenuScreen FIELD field_2776 x I FIELD field_2777 touchDragSlotStart Lnet/minecraft/class_1735; FIELD field_2778 heldButtonCode I - FIELD field_2779 menuHeight I + FIELD field_2779 backgroundHeight I FIELD field_2780 touchHoveredSlot Lnet/minecraft/class_1735; FIELD field_2781 touchDropTimer J FIELD field_2782 touchDragStack Lnet/minecraft/class_1799; @@ -16,7 +16,7 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/MenuScreen FIELD field_2789 touchIsRightClickDrag Z FIELD field_2790 heldButtonType I FIELD field_2791 quickMovingStack Lnet/minecraft/class_1799; - FIELD field_2792 menuWidth I + FIELD field_2792 backgroundWidth I FIELD field_2793 cursorDragSlots Ljava/util/Set; FIELD field_2794 isCursorDragging Z FIELD field_2795 touchDropTime J