From 06626433384a013a9338d2a49fa396eb8a2e2aef Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Thu, 12 Mar 2020 16:05:02 -0500 Subject: [PATCH] Followup cleanups around screen handler change (#1166) * Followup cleanups around screen handler change Closes #1153 Signed-off-by: liach * Lol i missed this Co-Authored-By: Juuxel <6596629+Juuxel@users.noreply.github.com> * SCREEN_TITLE -> TITLE Co-authored-by: liach Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com> --- .../net/minecraft/block/AnvilBlock.mapping | 2 +- .../net/minecraft/block/BlockState.mapping | 2 +- .../block/CartographyTableBlock.mapping | 2 +- .../block/CraftingTableBlock.mapping | 2 +- .../minecraft/block/GrindstoneBlock.mapping | 2 +- .../net/minecraft/block/LoomBlock.mapping | 2 +- .../minecraft/block/StonecutterBlock.mapping | 2 +- .../ingame/AbstractInventoryScreen.mapping | 2 +- .../screen/ingame/BlastFurnaceScreen.mapping | 2 +- ...eScreen.mapping => CraftingScreen.mapping} | 2 +- ...reen.mapping => EnchantmentScreen.mapping} | 4 +-- .../gui/screen/ingame/ForgingScreen.mapping | 5 ++++ .../gui/screen/ingame/FurnaceScreen.mapping | 2 +- ...hHandler.mapping => HandledScreen.mapping} | 4 +-- .../HandledScreens.mapping} | 9 +++++-- .../gui/screen/ingame/LoomScreen.mapping | 1 + .../gui/screen/ingame/SmokerScreen.mapping | 2 +- .../AbstractFurnaceScreenHandler.mapping | 8 ++++++ .../AbstractRecipeScreenHandler.mapping | 14 ++++++++++ .../screen/AnvilScreenHandler.mapping | 1 + .../screen/BeaconScreenHandler.mapping | 13 +++++++-- .../screen/BlastFurnaceScreenHandler.mapping | 4 +++ .../screen/BrewingStandScreenHandler.mapping | 14 +++++++--- .../screen/CraftingScreenHandler.mapping | 27 ++++++++++++------- .../screen/CraftingTableScreenHandler.mapping | 15 ----------- ...pping => EnchantmentScreenHandler.mapping} | 5 +++- .../screen/FurnaceScreenHandler.mapping | 4 +++ .../Generic3x3ContainerScreenHandler.mapping | 3 +++ .../GenericContainerScreenHandler.mapping | 20 +++++++++++++- .../screen/GrindstoneScreenHandler.mapping | 7 +++-- .../screen/HopperScreenHandler.mapping | 3 +++ .../screen/HorseScreenHandler.mapping | 5 +++- .../screen/LecternScreenHandler.mapping | 2 ++ .../screen/LoomScreenHandler.mapping | 7 +++-- .../screen/MerchantScreenHandler.mapping | 1 + .../NameableScreenHandlerFactory.mapping | 2 -- .../screen/NamedScreenHandlerFactory.mapping | 4 +++ .../screen/PlayerScreenHandler.mapping | 4 +-- .../net/minecraft/screen/Property.mapping | 4 +-- .../minecraft/screen/ScreenHandler.mapping | 13 ++++++--- ...t.mapping => ScreenHandlerContext.mapping} | 7 +++-- .../screen/ScreenHandlerListener.mapping | 3 +++ .../screen/ShulkerBoxScreenHandler.mapping | 3 +++ .../screen/SmokerScreenHandler.mapping | 4 +++ .../screen/StonecutterScreenHandler.mapping | 8 +++++- .../screen/slot/CraftingResultSlot.mapping | 10 +++---- .../screen/slot/FurnaceFuelSlot.mapping | 7 ++--- .../screen/slot/FurnaceOutputSlot.mapping | 7 ++--- .../net/minecraft/screen/slot/Slot.mapping | 15 ++++++----- 49 files changed, 208 insertions(+), 83 deletions(-) rename mappings/net/minecraft/client/gui/screen/ingame/{CraftingTableScreen.mapping => CraftingScreen.mapping} (94%) rename mappings/net/minecraft/client/gui/screen/ingame/{EnchantingScreen.mapping => EnchantmentScreen.mapping} (89%) rename mappings/net/minecraft/client/gui/screen/ingame/{ScreenWithHandler.mapping => HandledScreen.mapping} (98%) rename mappings/net/minecraft/client/gui/screen/{Screens.mapping => ingame/HandledScreens.mapping} (70%) create mode 100644 mappings/net/minecraft/screen/AbstractRecipeScreenHandler.mapping delete mode 100644 mappings/net/minecraft/screen/CraftingTableScreenHandler.mapping rename mappings/net/minecraft/screen/{EnchantingTableScreenHandler.mapping => EnchantmentScreenHandler.mapping} (81%) delete mode 100644 mappings/net/minecraft/screen/NameableScreenHandlerFactory.mapping create mode 100644 mappings/net/minecraft/screen/NamedScreenHandlerFactory.mapping rename mappings/net/minecraft/screen/{BlockContext.mapping => ScreenHandlerContext.mapping} (58%) diff --git a/mappings/net/minecraft/block/AnvilBlock.mapping b/mappings/net/minecraft/block/AnvilBlock.mapping index 65f53e2031..3b0fb6412d 100644 --- a/mappings/net/minecraft/block/AnvilBlock.mapping +++ b/mappings/net/minecraft/block/AnvilBlock.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_2199 net/minecraft/block/AnvilBlock - FIELD field_17349 CONTAINER_NAME Lnet/minecraft/class_2588; + FIELD field_17349 TITLE Lnet/minecraft/class_2588; FIELD field_9882 BASE_SHAPE Lnet/minecraft/class_265; FIELD field_9883 FACING Lnet/minecraft/class_2753; FIELD field_9884 X_FACE_SHAPE Lnet/minecraft/class_265; diff --git a/mappings/net/minecraft/block/BlockState.mapping b/mappings/net/minecraft/block/BlockState.mapping index 3bd688b272..2701dfac90 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 createScreenHandlerFactory (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/CartographyTableBlock.mapping b/mappings/net/minecraft/block/CartographyTableBlock.mapping index d4a2eea237..8a167cdc97 100644 --- a/mappings/net/minecraft/block/CartographyTableBlock.mapping +++ b/mappings/net/minecraft/block/CartographyTableBlock.mapping @@ -1,2 +1,2 @@ CLASS net/minecraft/class_3711 net/minecraft/block/CartographyTableBlock - FIELD field_17355 CONTAINER_NAME Lnet/minecraft/class_2588; + FIELD field_17355 TITLE Lnet/minecraft/class_2588; diff --git a/mappings/net/minecraft/block/CraftingTableBlock.mapping b/mappings/net/minecraft/block/CraftingTableBlock.mapping index 554038935b..d597bcd695 100644 --- a/mappings/net/minecraft/block/CraftingTableBlock.mapping +++ b/mappings/net/minecraft/block/CraftingTableBlock.mapping @@ -1,2 +1,2 @@ CLASS net/minecraft/class_2304 net/minecraft/block/CraftingTableBlock - FIELD field_17362 CONTAINER_NAME Lnet/minecraft/class_2561; + FIELD field_17362 TITLE Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/block/GrindstoneBlock.mapping b/mappings/net/minecraft/block/GrindstoneBlock.mapping index 2b234154f1..f2b2255471 100644 --- a/mappings/net/minecraft/block/GrindstoneBlock.mapping +++ b/mappings/net/minecraft/block/GrindstoneBlock.mapping @@ -7,6 +7,6 @@ CLASS net/minecraft/class_3713 net/minecraft/block/GrindstoneBlock FIELD field_16380 NORTH_SOUTH_SHAPE Lnet/minecraft/class_265; FIELD field_16383 EAST_WEST_HANGING_SHAPE Lnet/minecraft/class_265; FIELD field_16399 SOUTH_WALL_SHAPE Lnet/minecraft/class_265; - FIELD field_17364 CONTAINER_NAME Lnet/minecraft/class_2588; + FIELD field_17364 TITLE Lnet/minecraft/class_2588; METHOD method_16119 getShape (Lnet/minecraft/class_2680;)Lnet/minecraft/class_265; ARG 1 state diff --git a/mappings/net/minecraft/block/LoomBlock.mapping b/mappings/net/minecraft/block/LoomBlock.mapping index b990d4793f..9cf26f2af4 100644 --- a/mappings/net/minecraft/block/LoomBlock.mapping +++ b/mappings/net/minecraft/block/LoomBlock.mapping @@ -1,2 +1,2 @@ CLASS net/minecraft/class_2406 net/minecraft/block/LoomBlock - FIELD field_17373 CONTAINER_NAME Lnet/minecraft/class_2588; + FIELD field_17373 TITLE Lnet/minecraft/class_2588; diff --git a/mappings/net/minecraft/block/StonecutterBlock.mapping b/mappings/net/minecraft/block/StonecutterBlock.mapping index e09ec26a0f..9fa532a9b3 100644 --- a/mappings/net/minecraft/block/StonecutterBlock.mapping +++ b/mappings/net/minecraft/block/StonecutterBlock.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/class_3718 net/minecraft/block/StonecutterBlock FIELD field_16407 SHAPE Lnet/minecraft/class_265; FIELD field_17649 FACING Lnet/minecraft/class_2753; - FIELD field_17650 CONTAINER_NAME Lnet/minecraft/class_2588; + FIELD field_17650 TITLE Lnet/minecraft/class_2588; diff --git a/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping index 628858f755..12d2a16af1 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_485 net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen - FIELD field_2900 offsetGuiForEffects Z + FIELD field_2900 drawStatusEffects Z METHOD method_18642 drawStatusEffectBackgrounds (IILjava/lang/Iterable;)V ARG 1 x ARG 2 yIncrement diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BlastFurnaceScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BlastFurnaceScreen.mapping index 38eb4f56c0..ec8a3772e9 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BlastFurnaceScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BlastFurnaceScreen.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_3871 net/minecraft/client/gui/screen/ingame/BlastFurnaceScreen - FIELD field_17115 BG_TEX Lnet/minecraft/class_2960; + FIELD field_17115 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_3705;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V ARG 1 container ARG 2 inventory diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CraftingTableScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CraftingScreen.mapping similarity index 94% rename from mappings/net/minecraft/client/gui/screen/ingame/CraftingTableScreen.mapping rename to mappings/net/minecraft/client/gui/screen/ingame/CraftingScreen.mapping index 4a698ad944..a268727407 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CraftingTableScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CraftingScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_479 net/minecraft/client/gui/screen/ingame/CraftingTableScreen +CLASS net/minecraft/class_479 net/minecraft/client/gui/screen/ingame/CraftingScreen FIELD field_2877 isNarrow Z FIELD field_2878 TEXTURE Lnet/minecraft/class_2960; FIELD field_2880 recipeBook Lnet/minecraft/class_507; 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 6a15d6eb83..e371c69f18 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/ForgingScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping index 321b41505b..1635c5b198 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping @@ -1,5 +1,10 @@ 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 handler + ARG 2 playerInventory + ARG 3 title + ARG 4 texture METHOD method_25444 renderForeground (IIF)V ARG 1 mouseX ARG 2 mouseY diff --git a/mappings/net/minecraft/client/gui/screen/ingame/FurnaceScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/FurnaceScreen.mapping index 4b703655fa..2ef47d7a6b 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/FurnaceScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/FurnaceScreen.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_3873 net/minecraft/client/gui/screen/ingame/FurnaceScreen - FIELD field_17127 BG_TEX Lnet/minecraft/class_2960; + FIELD field_17127 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_3858;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V ARG 1 container ARG 2 inventory diff --git a/mappings/net/minecraft/client/gui/screen/ingame/ScreenWithHandler.mapping b/mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping similarity index 98% rename from mappings/net/minecraft/client/gui/screen/ingame/ScreenWithHandler.mapping rename to mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping index e92d45ad5b..87747a1716 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/ScreenWithHandler.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/ScreenWithHandler +CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/HandledScreen FIELD field_17410 playerInventory Lnet/minecraft/class_1661; FIELD field_2776 x I FIELD field_2777 touchDragSlotStart Lnet/minecraft/class_1735; @@ -31,7 +31,7 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/ScreenWithH METHOD (Lnet/minecraft/class_1703;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V ARG 1 handler ARG 2 inventory - 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/HandledScreens.mapping similarity index 70% rename from mappings/net/minecraft/client/gui/screen/Screens.mapping rename to mappings/net/minecraft/client/gui/screen/ingame/HandledScreens.mapping index 6f7eec13a9..6698d24139 100644 --- a/mappings/net/minecraft/client/gui/screen/Screens.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/HandledScreens.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/HandledScreens 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 handler + 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/client/gui/screen/ingame/LoomScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping index c936e5d3e6..83284de353 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_494 net/minecraft/client/gui/screen/ingame/LoomScreen + FIELD field_21694 bannerField Lnet/minecraft/class_630; FIELD field_2954 dye Lnet/minecraft/class_1799; FIELD field_2955 banner Lnet/minecraft/class_1799; FIELD field_2958 scrollbarClicked Z diff --git a/mappings/net/minecraft/client/gui/screen/ingame/SmokerScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/SmokerScreen.mapping index 4fde294f61..88de42e268 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/SmokerScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/SmokerScreen.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_3874 net/minecraft/client/gui/screen/ingame/SmokerScreen - FIELD field_17128 BG_TEX Lnet/minecraft/class_2960; + FIELD field_17128 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_3706;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V ARG 1 container ARG 2 inventory diff --git a/mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping b/mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping index f72afa8023..87c7f7802e 100644 --- a/mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping +++ b/mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping @@ -4,9 +4,17 @@ CLASS net/minecraft/class_1720 net/minecraft/screen/AbstractFurnaceScreenHandler 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 propertyDelegate METHOD method_16945 isFuel (Lnet/minecraft/class_1799;)Z ARG 1 itemStack METHOD method_17363 getCookProgress ()I diff --git a/mappings/net/minecraft/screen/AbstractRecipeScreenHandler.mapping b/mappings/net/minecraft/screen/AbstractRecipeScreenHandler.mapping new file mode 100644 index 0000000000..c6102cdb06 --- /dev/null +++ b/mappings/net/minecraft/screen/AbstractRecipeScreenHandler.mapping @@ -0,0 +1,14 @@ +CLASS net/minecraft/class_1729 net/minecraft/screen/AbstractRecipeScreenHandler + METHOD method_17697 fillInputSlots (ZLnet/minecraft/class_1860;Lnet/minecraft/class_3222;)V + ARG 1 craftAll + ARG 2 recipe + ARG 3 player + METHOD method_7652 matches (Lnet/minecraft/class_1860;)Z + ARG 1 recipe + METHOD method_7653 getCraftingWidth ()I + METHOD method_7654 populateRecipeFinder (Lnet/minecraft/class_1662;)V + ARG 1 finder + 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/screen/AnvilScreenHandler.mapping b/mappings/net/minecraft/screen/AnvilScreenHandler.mapping index be129000f3..e04627d3ea 100644 --- a/mappings/net/minecraft/screen/AnvilScreenHandler.mapping +++ b/mappings/net/minecraft/screen/AnvilScreenHandler.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_1706 net/minecraft/screen/AnvilScreenHandler METHOD (ILnet/minecraft/class_1661;Lnet/minecraft/class_3914;)V ARG 1 syncId ARG 2 inventory + ARG 3 context METHOD method_17369 getLevelCost ()I METHOD method_20398 getNextCost (I)I ARG 0 cost diff --git a/mappings/net/minecraft/screen/BeaconScreenHandler.mapping b/mappings/net/minecraft/screen/BeaconScreenHandler.mapping index 808ef1b265..5ebfa6d615 100644 --- a/mappings/net/minecraft/screen/BeaconScreenHandler.mapping +++ b/mappings/net/minecraft/screen/BeaconScreenHandler.mapping @@ -1,12 +1,16 @@ CLASS net/minecraft/class_1704 net/minecraft/screen/BeaconScreenHandler - 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; METHOD (ILnet/minecraft/class_1263;)V ARG 1 syncId + ARG 2 inventory METHOD (ILnet/minecraft/class_1263;Lnet/minecraft/class_3913;Lnet/minecraft/class_3914;)V ARG 1 syncId + ARG 2 inventory + ARG 3 propertyDelegate + ARG 4 context METHOD method_17372 setEffects (II)V ARG 1 primaryEffectId ARG 2 secondaryEffectId @@ -14,4 +18,9 @@ CLASS net/minecraft/class_1704 net/minecraft/screen/BeaconScreenHandler 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/screen/BlastFurnaceScreenHandler.mapping b/mappings/net/minecraft/screen/BlastFurnaceScreenHandler.mapping index 6a85f687db..2723ba89d3 100644 --- a/mappings/net/minecraft/screen/BlastFurnaceScreenHandler.mapping +++ b/mappings/net/minecraft/screen/BlastFurnaceScreenHandler.mapping @@ -1,5 +1,9 @@ CLASS net/minecraft/class_3705 net/minecraft/screen/BlastFurnaceScreenHandler METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId + ARG 2 playerInventory METHOD (ILnet/minecraft/class_1661;Lnet/minecraft/class_1263;Lnet/minecraft/class_3913;)V ARG 1 syncId + ARG 2 playerInventory + ARG 3 inventory + ARG 4 propertyDelegate diff --git a/mappings/net/minecraft/screen/BrewingStandScreenHandler.mapping b/mappings/net/minecraft/screen/BrewingStandScreenHandler.mapping index 29cca0e361..ca727e8b88 100644 --- a/mappings/net/minecraft/screen/BrewingStandScreenHandler.mapping +++ b/mappings/net/minecraft/screen/BrewingStandScreenHandler.mapping @@ -4,10 +4,18 @@ CLASS net/minecraft/class_1708 net/minecraft/screen/BrewingStandScreenHandler FIELD field_7788 inventory Lnet/minecraft/class_1263; METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId + ARG 2 playerInventory + METHOD (ILnet/minecraft/class_1661;Lnet/minecraft/class_1263;Lnet/minecraft/class_3913;)V + ARG 1 syncId + ARG 2 playerInventory + ARG 3 inventory + ARG 4 propertyDelegate 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 + ARG 0 stack + CLASS class_1710 IngredientSlot + CLASS class_1711 PotionSlot METHOD method_7631 matches (Lnet/minecraft/class_1799;)Z + ARG 0 stack diff --git a/mappings/net/minecraft/screen/CraftingScreenHandler.mapping b/mappings/net/minecraft/screen/CraftingScreenHandler.mapping index 54d705267d..b008d19748 100644 --- a/mappings/net/minecraft/screen/CraftingScreenHandler.mapping +++ b/mappings/net/minecraft/screen/CraftingScreenHandler.mapping @@ -1,9 +1,18 @@ -CLASS net/minecraft/class_1729 net/minecraft/screen/CraftingScreenHandler - 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/screen/CraftingScreenHandler + 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/screen/CraftingTableScreenHandler.mapping b/mappings/net/minecraft/screen/CraftingTableScreenHandler.mapping deleted file mode 100644 index 3549c8bea0..0000000000 --- a/mappings/net/minecraft/screen/CraftingTableScreenHandler.mapping +++ /dev/null @@ -1,15 +0,0 @@ -CLASS net/minecraft/class_1714 net/minecraft/screen/CraftingTableScreenHandler - 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/screen/EnchantingTableScreenHandler.mapping b/mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping similarity index 81% rename from mappings/net/minecraft/screen/EnchantingTableScreenHandler.mapping rename to mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping index ee65e64da7..c1d0e81b89 100644 --- a/mappings/net/minecraft/screen/EnchantingTableScreenHandler.mapping +++ b/mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1718 net/minecraft/screen/EnchantingTableScreenHandler +CLASS net/minecraft/class_1718 net/minecraft/screen/EnchantmentScreenHandler FIELD field_7808 enchantmentPower [I FIELD field_7809 inventory Lnet/minecraft/class_1263; FIELD field_7810 enchantmentLevel [I @@ -8,8 +8,11 @@ CLASS net/minecraft/class_1718 net/minecraft/screen/EnchantingTableScreenHandler FIELD field_7814 seed Lnet/minecraft/class_3915; 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_17413 getSeed ()I METHOD method_7637 getRandomEnchantments (Lnet/minecraft/class_1799;II)Ljava/util/List; ARG 1 stack diff --git a/mappings/net/minecraft/screen/FurnaceScreenHandler.mapping b/mappings/net/minecraft/screen/FurnaceScreenHandler.mapping index 42ac3b7559..2bd0f8637a 100644 --- a/mappings/net/minecraft/screen/FurnaceScreenHandler.mapping +++ b/mappings/net/minecraft/screen/FurnaceScreenHandler.mapping @@ -1,5 +1,9 @@ CLASS net/minecraft/class_3858 net/minecraft/screen/FurnaceScreenHandler METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId + ARG 2 playerInventory METHOD (ILnet/minecraft/class_1661;Lnet/minecraft/class_1263;Lnet/minecraft/class_3913;)V ARG 1 syncId + ARG 2 playerInventory + ARG 3 inventory + ARG 4 propertyDelegate diff --git a/mappings/net/minecraft/screen/Generic3x3ContainerScreenHandler.mapping b/mappings/net/minecraft/screen/Generic3x3ContainerScreenHandler.mapping index 8d140a1cf7..467016aaec 100644 --- a/mappings/net/minecraft/screen/Generic3x3ContainerScreenHandler.mapping +++ b/mappings/net/minecraft/screen/Generic3x3ContainerScreenHandler.mapping @@ -2,5 +2,8 @@ CLASS net/minecraft/class_1716 net/minecraft/screen/Generic3x3ContainerScreenHan FIELD field_7806 inventory Lnet/minecraft/class_1263; METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId + ARG 2 playerInventory METHOD (ILnet/minecraft/class_1661;Lnet/minecraft/class_1263;)V ARG 1 syncId + ARG 2 playerInventory + ARG 3 inventory diff --git a/mappings/net/minecraft/screen/GenericContainerScreenHandler.mapping b/mappings/net/minecraft/screen/GenericContainerScreenHandler.mapping index 0e17b7bb9b..6d0cb7485e 100644 --- a/mappings/net/minecraft/screen/GenericContainerScreenHandler.mapping +++ b/mappings/net/minecraft/screen/GenericContainerScreenHandler.mapping @@ -1,24 +1,42 @@ CLASS net/minecraft/class_1707 net/minecraft/screen/GenericContainerScreenHandler FIELD field_17495 inventory Lnet/minecraft/class_1263; FIELD field_17496 rows I - METHOD (Lnet/minecraft/class_3917;ILnet/minecraft/class_1661;Lnet/minecraft/class_1263;I)V + 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; ARG 0 syncId + ARG 1 playerInventory METHOD method_19245 createGeneric9x3 (ILnet/minecraft/class_1661;Lnet/minecraft/class_1263;)Lnet/minecraft/class_1707; ARG 0 syncId + ARG 1 playerInventory + ARG 2 inventory METHOD method_19246 createGeneric9x2 (ILnet/minecraft/class_1661;)Lnet/minecraft/class_1707; ARG 0 syncId + ARG 1 playerInventory METHOD method_19247 createGeneric9x6 (ILnet/minecraft/class_1661;Lnet/minecraft/class_1263;)Lnet/minecraft/class_1707; ARG 0 syncId + ARG 1 playerInventory + ARG 2 inventory METHOD method_19248 createGeneric9x3 (ILnet/minecraft/class_1661;)Lnet/minecraft/class_1707; ARG 0 syncId + ARG 1 playerInventory METHOD method_19249 createGeneric9x4 (ILnet/minecraft/class_1661;)Lnet/minecraft/class_1707; ARG 0 syncId + ARG 1 playerInventory METHOD method_19250 createGeneric9x5 (ILnet/minecraft/class_1661;)Lnet/minecraft/class_1707; ARG 0 syncId + ARG 1 playerInventory METHOD method_19251 createGeneric9x6 (ILnet/minecraft/class_1661;)Lnet/minecraft/class_1707; ARG 0 syncId + ARG 1 playerInventory METHOD method_7629 getInventory ()Lnet/minecraft/class_1263; diff --git a/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping b/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping index 8ebde1f0e5..d3ae2f030e 100644 --- a/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping +++ b/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping @@ -1,11 +1,14 @@ CLASS net/minecraft/class_3803 net/minecraft/screen/GrindstoneScreenHandler - 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 + ARG 2 playerInventory METHOD (ILnet/minecraft/class_1661;Lnet/minecraft/class_3914;)V ARG 1 syncId + ARG 2 playerInventory + ARG 3 context METHOD method_16693 grind (Lnet/minecraft/class_1799;II)Lnet/minecraft/class_1799; ARG 1 item ARG 2 damage diff --git a/mappings/net/minecraft/screen/HopperScreenHandler.mapping b/mappings/net/minecraft/screen/HopperScreenHandler.mapping index a3cfac4537..2f4f3d3729 100644 --- a/mappings/net/minecraft/screen/HopperScreenHandler.mapping +++ b/mappings/net/minecraft/screen/HopperScreenHandler.mapping @@ -2,5 +2,8 @@ CLASS net/minecraft/class_1722 net/minecraft/screen/HopperScreenHandler FIELD field_7826 inventory Lnet/minecraft/class_1263; METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId + ARG 2 playerInventory METHOD (ILnet/minecraft/class_1661;Lnet/minecraft/class_1263;)V ARG 1 syncId + ARG 2 playerInventory + ARG 3 inventory diff --git a/mappings/net/minecraft/screen/HorseScreenHandler.mapping b/mappings/net/minecraft/screen/HorseScreenHandler.mapping index 4399790447..d38fdee119 100644 --- a/mappings/net/minecraft/screen/HorseScreenHandler.mapping +++ b/mappings/net/minecraft/screen/HorseScreenHandler.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_1724 net/minecraft/screen/HorseScreenHandler - 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 entity diff --git a/mappings/net/minecraft/screen/LecternScreenHandler.mapping b/mappings/net/minecraft/screen/LecternScreenHandler.mapping index f4ba6d5840..fd9518778b 100644 --- a/mappings/net/minecraft/screen/LecternScreenHandler.mapping +++ b/mappings/net/minecraft/screen/LecternScreenHandler.mapping @@ -5,5 +5,7 @@ CLASS net/minecraft/class_3916 net/minecraft/screen/LecternScreenHandler ARG 1 syncId METHOD (ILnet/minecraft/class_1263;Lnet/minecraft/class_3913;)V ARG 1 syncId + ARG 2 inventory + ARG 3 propertyDelegate METHOD method_17418 getBookItem ()Lnet/minecraft/class_1799; METHOD method_17419 getPage ()I diff --git a/mappings/net/minecraft/screen/LoomScreenHandler.mapping b/mappings/net/minecraft/screen/LoomScreenHandler.mapping index 2e32653e71..0412f56efb 100644 --- a/mappings/net/minecraft/screen/LoomScreenHandler.mapping +++ b/mappings/net/minecraft/screen/LoomScreenHandler.mapping @@ -6,13 +6,16 @@ CLASS net/minecraft/class_1726 net/minecraft/screen/LoomScreenHandler 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/screen/MerchantScreenHandler.mapping b/mappings/net/minecraft/screen/MerchantScreenHandler.mapping index 67efd17fe6..125b9c5604 100644 --- a/mappings/net/minecraft/screen/MerchantScreenHandler.mapping +++ b/mappings/net/minecraft/screen/MerchantScreenHandler.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_1728 net/minecraft/screen/MerchantScreenHandler 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/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/NamedScreenHandlerFactory.mapping b/mappings/net/minecraft/screen/NamedScreenHandlerFactory.mapping new file mode 100644 index 0000000000..898da89510 --- /dev/null +++ b/mappings/net/minecraft/screen/NamedScreenHandlerFactory.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_3908 net/minecraft/screen/NamedScreenHandlerFactory + METHOD method_5476 getDisplayName ()Lnet/minecraft/class_2561; + COMMENT Returns the title of this screen handler; will be a part of the open + COMMENT screen packet sent to the client. diff --git a/mappings/net/minecraft/screen/PlayerScreenHandler.mapping b/mappings/net/minecraft/screen/PlayerScreenHandler.mapping index 5d5c66f926..0f84a12ca7 100644 --- a/mappings/net/minecraft/screen/PlayerScreenHandler.mapping +++ b/mappings/net/minecraft/screen/PlayerScreenHandler.mapping @@ -8,8 +8,8 @@ CLASS net/minecraft/class_1723 net/minecraft/screen/PlayerScreenHandler 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 diff --git a/mappings/net/minecraft/screen/Property.mapping b/mappings/net/minecraft/screen/Property.mapping index f5ce402806..82299ab008 100644 --- a/mappings/net/minecraft/screen/Property.mapping +++ b/mappings/net/minecraft/screen/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}. + COMMENT An integer property that is stored in a {@link ScreenHandler}. 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 ScreenHandler#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/ScreenHandler.mapping b/mappings/net/minecraft/screen/ScreenHandler.mapping index cde09f44f3..1792aa86b0 100644 --- a/mappings/net/minecraft/screen/ScreenHandler.mapping +++ b/mappings/net/minecraft/screen/ScreenHandler.mapping @@ -15,13 +15,14 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler ARG 1 type ARG 2 syncId METHOD method_17358 getType ()Lnet/minecraft/class_3917; - METHOD method_17359 checkContainerSize (Lnet/minecraft/class_1263;I)V + 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 - METHOD method_17361 checkContainerDataCount (Lnet/minecraft/class_3913;I)V + 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} @@ -41,10 +42,12 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler 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 @@ -54,9 +57,11 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler 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; METHOD method_7603 removeListener (Lnet/minecraft/class_1712;)V ARG 1 listener @@ -86,7 +91,9 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler 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/screen/BlockContext.mapping b/mappings/net/minecraft/screen/ScreenHandlerContext.mapping similarity index 58% rename from mappings/net/minecraft/screen/BlockContext.mapping rename to mappings/net/minecraft/screen/ScreenHandlerContext.mapping index 3a2985aafe..395f94f3f8 100644 --- a/mappings/net/minecraft/screen/BlockContext.mapping +++ b/mappings/net/minecraft/screen/ScreenHandlerContext.mapping @@ -1,7 +1,10 @@ -CLASS net/minecraft/class_3914 net/minecraft/screen/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/screen/ScreenHandlerContext + COMMENT Screen handler contexts allow screen handlers to interact with the + COMMENT logical server's world safely. FIELD field_17304 EMPTY Lnet/minecraft/class_3914; + COMMENT The dummy screen handler context for clientside screen handlers. METHOD method_17392 create (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3914; + COMMENT Returns an active screen handler context. Used on the logical server. ARG 0 world ARG 1 pos METHOD method_17393 run (Ljava/util/function/BiConsumer;)V diff --git a/mappings/net/minecraft/screen/ScreenHandlerListener.mapping b/mappings/net/minecraft/screen/ScreenHandlerListener.mapping index 696ebdef10..bd3f3de728 100644 --- a/mappings/net/minecraft/screen/ScreenHandlerListener.mapping +++ b/mappings/net/minecraft/screen/ScreenHandlerListener.mapping @@ -2,8 +2,11 @@ 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 + ARG 3 value METHOD method_7634 onHandlerRegistered (Lnet/minecraft/class_1703;Lnet/minecraft/class_2371;)V ARG 1 handler + ARG 2 stacks METHOD method_7635 onSlotUpdate (Lnet/minecraft/class_1703;ILnet/minecraft/class_1799;)V ARG 1 handler ARG 2 slotId + ARG 3 stack diff --git a/mappings/net/minecraft/screen/ShulkerBoxScreenHandler.mapping b/mappings/net/minecraft/screen/ShulkerBoxScreenHandler.mapping index 6c624508fb..f053d8fe1b 100644 --- a/mappings/net/minecraft/screen/ShulkerBoxScreenHandler.mapping +++ b/mappings/net/minecraft/screen/ShulkerBoxScreenHandler.mapping @@ -2,5 +2,8 @@ CLASS net/minecraft/class_1733 net/minecraft/screen/ShulkerBoxScreenHandler FIELD field_7867 inventory Lnet/minecraft/class_1263; METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId + ARG 2 playerInventory METHOD (ILnet/minecraft/class_1661;Lnet/minecraft/class_1263;)V ARG 1 syncId + ARG 2 playerInventory + ARG 3 inventory diff --git a/mappings/net/minecraft/screen/SmokerScreenHandler.mapping b/mappings/net/minecraft/screen/SmokerScreenHandler.mapping index f3492407bb..c34e0d4f75 100644 --- a/mappings/net/minecraft/screen/SmokerScreenHandler.mapping +++ b/mappings/net/minecraft/screen/SmokerScreenHandler.mapping @@ -1,5 +1,9 @@ CLASS net/minecraft/class_3706 net/minecraft/screen/SmokerScreenHandler METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId + ARG 2 playerInventory METHOD (ILnet/minecraft/class_1661;Lnet/minecraft/class_1263;Lnet/minecraft/class_3913;)V ARG 1 syncId + ARG 2 playerInventory + ARG 3 inventory + ARG 4 propertyDelegate diff --git a/mappings/net/minecraft/screen/StonecutterScreenHandler.mapping b/mappings/net/minecraft/screen/StonecutterScreenHandler.mapping index 6cbe00a14f..39bbf817d0 100644 --- a/mappings/net/minecraft/screen/StonecutterScreenHandler.mapping +++ b/mappings/net/minecraft/screen/StonecutterScreenHandler.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_3971 net/minecraft/screen/StonecutterScreenHandler FIELD field_17627 inputSlot Lnet/minecraft/class_1735; FIELD field_17628 outputSlot Lnet/minecraft/class_1735; - FIELD field_17629 inventory Lnet/minecraft/class_1263; + FIELD field_17629 input Lnet/minecraft/class_1263; FIELD field_17630 context Lnet/minecraft/class_3914; FIELD field_17631 selectedRecipe Lnet/minecraft/class_3915; FIELD field_17632 world Lnet/minecraft/class_1937; @@ -9,11 +9,17 @@ CLASS net/minecraft/class_3971 net/minecraft/screen/StonecutterScreenHandler FIELD field_17634 inputStack Lnet/minecraft/class_1799; FIELD field_17635 lastTakeTime J FIELD field_17636 contentsChangedListener Ljava/lang/Runnable; + FIELD field_19173 output Lnet/minecraft/class_1731; 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_17855 updateInput (Lnet/minecraft/class_1263;Lnet/minecraft/class_1799;)V + ARG 1 input + ARG 2 stack METHOD method_17859 setContentsChangedListener (Ljava/lang/Runnable;)V METHOD method_17862 getSelectedRecipe ()I METHOD method_17863 getAvailableRecipes ()Ljava/util/List; diff --git a/mappings/net/minecraft/screen/slot/CraftingResultSlot.mapping b/mappings/net/minecraft/screen/slot/CraftingResultSlot.mapping index 1fd43af7a7..3eec30ec24 100644 --- a/mappings/net/minecraft/screen/slot/CraftingResultSlot.mapping +++ b/mappings/net/minecraft/screen/slot/CraftingResultSlot.mapping @@ -1,11 +1,11 @@ CLASS net/minecraft/class_1734 net/minecraft/screen/slot/CraftingResultSlot FIELD field_7868 player Lnet/minecraft/class_1657; FIELD field_7869 amount I - FIELD field_7870 craftingInv Lnet/minecraft/class_1715; + FIELD field_7870 input Lnet/minecraft/class_1715; METHOD (Lnet/minecraft/class_1657;Lnet/minecraft/class_1715;Lnet/minecraft/class_1263;III)V ARG 1 player - ARG 2 craftingInv + ARG 2 input 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/screen/slot/FurnaceFuelSlot.mapping b/mappings/net/minecraft/screen/slot/FurnaceFuelSlot.mapping index 73752cd362..1d9543469d 100644 --- a/mappings/net/minecraft/screen/slot/FurnaceFuelSlot.mapping +++ b/mappings/net/minecraft/screen/slot/FurnaceFuelSlot.mapping @@ -2,8 +2,9 @@ CLASS net/minecraft/class_1717 net/minecraft/screen/slot/FurnaceFuelSlot FIELD field_17083 handler 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 + 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/screen/slot/FurnaceOutputSlot.mapping b/mappings/net/minecraft/screen/slot/FurnaceOutputSlot.mapping index e2a66f95bc..dd9ef6ee92 100644 --- a/mappings/net/minecraft/screen/slot/FurnaceOutputSlot.mapping +++ b/mappings/net/minecraft/screen/slot/FurnaceOutputSlot.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_1719 net/minecraft/screen/slot/FurnaceOutputSlot FIELD field_7819 amount I METHOD (Lnet/minecraft/class_1657;Lnet/minecraft/class_1263;III)V ARG 1 player - ARG 3 invSlot - ARG 4 xPosition - ARG 5 yPosition + ARG 2 inventory + ARG 3 index + ARG 4 x + ARG 5 y diff --git a/mappings/net/minecraft/screen/slot/Slot.mapping b/mappings/net/minecraft/screen/slot/Slot.mapping index e13389da4e..d7ff612816 100644 --- a/mappings/net/minecraft/screen/slot/Slot.mapping +++ b/mappings/net/minecraft/screen/slot/Slot.mapping @@ -1,13 +1,14 @@ CLASS net/minecraft/class_1735 net/minecraft/screen/slot/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 2 invSlot - ARG 3 xPosition - ARG 4 yPosition + ARG 1 inventory + 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 @@ -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