diff --git a/CONVENTIONS.md b/CONVENTIONS.md index d14ad2a3f4..59e279eb71 100644 --- a/CONVENTIONS.md +++ b/CONVENTIONS.md @@ -126,9 +126,8 @@ 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) ## Things to avoid diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index c864dcc9ad..e19e3777af 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock METHOD (Lnet/minecraft/class_4970$class_2251;)V ARG 1 settings METHOD method_16841 getOffsetType ()Lnet/minecraft/class_4970$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 @@ -431,7 +431,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 1 world ARG 2 pos ARG 3 direction - METHOD method_26196 createScreenHandlerFactory (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3908; + METHOD method_26196 createMenuFactory (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3908; ARG 1 world ARG 2 pos METHOD method_26197 onBlockRemoved (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Z)V 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/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/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..b449397714 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/AnvilScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/AnvilScreen.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_471 net/minecraft/client/gui/screen/ingame/AnvilScreen 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 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..bb23de84a4 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree FIELD field_2805 consumeGem Z FIELD field_2808 TEXTURE 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 ec8a3772e9..38ad09ccc9 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 TEXTURE 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..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 handler - ARG 2 inventory + 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 c200b48600..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 handler + 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/CraftingScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CraftingScreen.mapping index a268727407..8008bf092f 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CraftingScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CraftingScreen.mapping @@ -4,6 +4,6 @@ CLASS net/minecraft/class_479 net/minecraft/client/gui/screen/ingame/CraftingScr 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 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..9c115e4456 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 @@ -49,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/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/EnchantmentScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.mapping index e371c69f18..66acb6ea46 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_486 net/minecraft/client/gui/screen/ingame/Enchantment 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/ForgingScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping index 1635c5b198..c9a8e8fffd 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/ForgingScreen.mapping @@ -1,7 +1,7 @@ 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 1 menu ARG 2 playerInventory ARG 3 title ARG 4 texture 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..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 handler + 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 7c47fbbacf..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 handler + 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 3619f9c050..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 handler + ARG 1 menu ARG 2 inventory ARG 3 entity 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 83284de353..29dc4e50a6 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping @@ -12,7 +12,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 menu 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/HandledScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/MenuScreen.mapping similarity index 96% rename from mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping rename to mappings/net/minecraft/client/gui/screen/ingame/MenuScreen.mapping index 42fa5f9852..ff8a0758d9 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/MenuScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/HandledScreen +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; @@ -21,7 +21,7 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/HandledScre 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/HandledScre 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 title METHOD method_2378 isPointWithinBounds (IIIIDD)Z ARG 1 xPosition diff --git a/mappings/net/minecraft/client/gui/screen/ingame/HandledScreens.mapping b/mappings/net/minecraft/client/gui/screen/ingame/MenuScreens.mapping similarity index 96% rename from mappings/net/minecraft/client/gui/screen/ingame/HandledScreens.mapping rename to mappings/net/minecraft/client/gui/screen/ingame/MenuScreens.mapping index 6698d24139..abf3cbf230 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/HandledScreens.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/ingame/HandledScreens +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 @@ -14,7 +14,7 @@ CLASS net/minecraft/class_3929 net/minecraft/client/gui/screen/ingame/HandledScr 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 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 diff --git a/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping index b14b0da23c..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 handler + 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/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..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 handler + ARG 1 menu 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/SmithingScreen.mapping index d9c7462422..9d104d1722 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/SmithingScreen.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/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 handler + 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 8783b177b3..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 handler + ARG 1 menu 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/recipebook/ClientRecipeBook.mapping index 78b11aa71b..aeede6632a 100644 --- a/mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping +++ b/mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping @@ -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/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index dd89022636..95f4186c64 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_7502 prevCapeY D @@ -26,7 +26,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_7518 PLAYER_MODEL_PARTS Lnet/minecraft/class_2940; @@ -50,7 +50,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; + 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 @@ -212,7 +212,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 7987977e3a..bf8aad07bf 100644 --- a/mappings/net/minecraft/entity/vehicle/StorageMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/StorageMinecartEntity.mapping @@ -8,7 +8,7 @@ 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 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/AbstractRecipeScreenHandler.mapping b/mappings/net/minecraft/menu/AbstractCraftingMenu.mapping similarity index 73% rename from mappings/net/minecraft/screen/AbstractRecipeScreenHandler.mapping rename to mappings/net/minecraft/menu/AbstractCraftingMenu.mapping index c6102cdb06..14dc17eec6 100644 --- a/mappings/net/minecraft/screen/AbstractRecipeScreenHandler.mapping +++ b/mappings/net/minecraft/menu/AbstractCraftingMenu.mapping @@ -1,13 +1,8 @@ -CLASS net/minecraft/class_1729 net/minecraft/screen/AbstractRecipeScreenHandler +CLASS net/minecraft/class_1729 net/minecraft/menu/AbstractCraftingMenu 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 diff --git a/mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping b/mappings/net/minecraft/menu/AbstractFurnaceMenu.mapping similarity index 89% rename from mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping rename to mappings/net/minecraft/menu/AbstractFurnaceMenu.mapping index 87c7f7802e..fbcd7a768e 100644 --- a/mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping +++ b/mappings/net/minecraft/menu/AbstractFurnaceMenu.mapping @@ -1,4 +1,4 @@ -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; @@ -14,7 +14,7 @@ CLASS net/minecraft/class_1720 net/minecraft/screen/AbstractFurnaceScreenHandler ARG 3 syncId ARG 4 playerInventory ARG 5 inventory - ARG 6 propertyDelegate + 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 88% rename from mappings/net/minecraft/screen/AnvilScreenHandler.mapping rename to mappings/net/minecraft/menu/AnvilMenu.mapping index e04627d3ea..38ab73ace6 100644 --- a/mappings/net/minecraft/screen/AnvilScreenHandler.mapping +++ b/mappings/net/minecraft/menu/AnvilMenu.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1706 net/minecraft/screen/AnvilScreenHandler +CLASS net/minecraft/class_1706 net/minecraft/menu/AnvilMenu 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 92% rename from mappings/net/minecraft/screen/BeaconScreenHandler.mapping rename to mappings/net/minecraft/menu/BeaconMenu.mapping index 5ebfa6d615..8cea7d694f 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 payment 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 78% rename from mappings/net/minecraft/screen/SmokerScreenHandler.mapping rename to mappings/net/minecraft/menu/BlastFurnaceMenu.mapping index c34e0d4f75..9b75fb2875 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 ARG 2 playerInventory diff --git a/mappings/net/minecraft/screen/BrewingStandScreenHandler.mapping b/mappings/net/minecraft/menu/BrewingStandMenu.mapping similarity index 90% rename from mappings/net/minecraft/screen/BrewingStandScreenHandler.mapping rename to mappings/net/minecraft/menu/BrewingStandMenu.mapping index ca727e8b88..73d8996a80 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 89% rename from mappings/net/minecraft/screen/CraftingScreenHandler.mapping rename to mappings/net/minecraft/menu/CraftingMenu.mapping index b008d19748..5745d07bb4 100644 --- a/mappings/net/minecraft/screen/CraftingScreenHandler.mapping +++ b/mappings/net/minecraft/menu/CraftingMenu.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1714 net/minecraft/screen/CraftingScreenHandler +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; diff --git a/mappings/net/minecraft/screen/slot/CraftingResultSlot.mapping b/mappings/net/minecraft/menu/CraftingResultSlot.mapping similarity index 80% rename from mappings/net/minecraft/screen/slot/CraftingResultSlot.mapping rename to mappings/net/minecraft/menu/CraftingResultSlot.mapping index 3eec30ec24..95cd47b579 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 input Lnet/minecraft/class_1715; diff --git a/mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping b/mappings/net/minecraft/menu/EnchantmentMenu.mapping similarity index 90% rename from mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping rename to mappings/net/minecraft/menu/EnchantmentMenu.mapping index 03a06245c6..2a98885950 100644 --- a/mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping +++ b/mappings/net/minecraft/menu/EnchantmentMenu.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1718 net/minecraft/screen/EnchantmentScreenHandler +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/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 1d9543469d..58ec827a5f 100644 --- a/mappings/net/minecraft/screen/slot/FurnaceFuelSlot.mapping +++ b/mappings/net/minecraft/menu/FurnaceFuelSlot.mapping @@ -1,7 +1,7 @@ -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 1 menu ARG 2 inventory ARG 3 index ARG 4 x diff --git a/mappings/net/minecraft/screen/FurnaceScreenHandler.mapping b/mappings/net/minecraft/menu/FurnaceMenu.mapping similarity index 78% rename from mappings/net/minecraft/screen/FurnaceScreenHandler.mapping rename to mappings/net/minecraft/menu/FurnaceMenu.mapping index 2bd0f8637a..74b0b906bf 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 ARG 2 playerInventory diff --git a/mappings/net/minecraft/screen/slot/FurnaceOutputSlot.mapping b/mappings/net/minecraft/menu/FurnaceOutputSlot.mapping similarity index 74% rename from mappings/net/minecraft/screen/slot/FurnaceOutputSlot.mapping rename to mappings/net/minecraft/menu/FurnaceOutputSlot.mapping index dd9ef6ee92..558a163b35 100644 --- a/mappings/net/minecraft/screen/slot/FurnaceOutputSlot.mapping +++ b/mappings/net/minecraft/menu/FurnaceOutputSlot.mapping @@ -1,4 +1,4 @@ -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 diff --git a/mappings/net/minecraft/screen/Generic3x3ContainerScreenHandler.mapping b/mappings/net/minecraft/menu/Generic3x3Menu.mapping similarity index 65% rename from mappings/net/minecraft/screen/Generic3x3ContainerScreenHandler.mapping rename to mappings/net/minecraft/menu/Generic3x3Menu.mapping index 467016aaec..908137f65d 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 85% rename from mappings/net/minecraft/screen/GenericContainerScreenHandler.mapping rename to mappings/net/minecraft/menu/GenericMenu.mapping index 6d0cb7485e..683300e0d5 100644 --- a/mappings/net/minecraft/screen/GenericContainerScreenHandler.mapping +++ b/mappings/net/minecraft/menu/GenericMenu.mapping @@ -1,4 +1,8 @@ -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 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 d3ae2f030e..660794434f 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 input Lnet/minecraft/class_1263; FIELD field_16773 result 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 78% rename from mappings/net/minecraft/screen/HopperScreenHandler.mapping rename to mappings/net/minecraft/menu/HopperMenu.mapping index 2f4f3d3729..b305c46441 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 d38fdee119..f9c8a20576 100644 --- a/mappings/net/minecraft/screen/HorseScreenHandler.mapping +++ b/mappings/net/minecraft/menu/HorseMenu.mapping @@ -1,8 +1,8 @@ -CLASS net/minecraft/class_1724 net/minecraft/screen/HorseScreenHandler +CLASS net/minecraft/class_1724 net/minecraft/menu/HorseMenu 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 + ARG 4 horse diff --git a/mappings/net/minecraft/screen/LecternScreenHandler.mapping b/mappings/net/minecraft/menu/LecternMenu.mapping similarity index 83% rename from mappings/net/minecraft/screen/LecternScreenHandler.mapping rename to mappings/net/minecraft/menu/LecternMenu.mapping index fd9518778b..e01d2166a7 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 0412f56efb..ba33a346e3 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 81% rename from mappings/net/minecraft/screen/ScreenHandler.mapping rename to mappings/net/minecraft/menu/Menu.mapping index e05bd8d0a5..9b489c6aef 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; @@ -22,6 +37,8 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler 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 @@ -29,6 +46,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 @@ -69,6 +87,7 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler ARG 1 player 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 ARG 1 listener METHOD method_7604 onButtonClick (Lnet/minecraft/class_1657;I)Z diff --git a/mappings/net/minecraft/screen/ScreenHandlerContext.mapping b/mappings/net/minecraft/menu/MenuContext.mapping similarity index 77% rename from mappings/net/minecraft/screen/ScreenHandlerContext.mapping rename to mappings/net/minecraft/menu/MenuContext.mapping index 395f94f3f8..8e7c20068d 100644 --- a/mappings/net/minecraft/screen/ScreenHandlerContext.mapping +++ b/mappings/net/minecraft/menu/MenuContext.mapping @@ -1,6 +1,5 @@ -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. +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; 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; 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/screen/ScreenHandlerListener.mapping b/mappings/net/minecraft/menu/MenuListener.mapping similarity index 51% rename from mappings/net/minecraft/screen/ScreenHandlerListener.mapping rename to mappings/net/minecraft/menu/MenuListener.mapping index bd3f3de728..eab794b34d 100644 --- a/mappings/net/minecraft/screen/ScreenHandlerListener.mapping +++ b/mappings/net/minecraft/menu/MenuListener.mapping @@ -1,12 +1,12 @@ -CLASS net/minecraft/class_1712 net/minecraft/screen/ScreenHandlerListener +CLASS net/minecraft/class_1712 net/minecraft/menu/MenuListener METHOD method_7633 onPropertyUpdate (Lnet/minecraft/class_1703;II)V - ARG 1 handler + ARG 1 menu ARG 2 propertyId ARG 3 value - METHOD method_7634 onHandlerRegistered (Lnet/minecraft/class_1703;Lnet/minecraft/class_2371;)V - ARG 1 handler + METHOD method_7634 onMenuRegistered (Lnet/minecraft/class_1703;Lnet/minecraft/class_2371;)V + ARG 1 menu ARG 2 stacks METHOD method_7635 onSlotUpdate (Lnet/minecraft/class_1703;ILnet/minecraft/class_1799;)V - ARG 1 handler + 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 125b9c5604..38d0a93eb6 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/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/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 0f84a12ca7..c6a9a3fe4f 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 77% rename from mappings/net/minecraft/screen/ShulkerBoxScreenHandler.mapping rename to mappings/net/minecraft/menu/ShulkerBoxMenu.mapping index f053d8fe1b..a9c7b9ee24 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 95% rename from mappings/net/minecraft/screen/slot/Slot.mapping rename to mappings/net/minecraft/menu/Slot.mapping index d7ff612816..bc06399741 100644 --- a/mappings/net/minecraft/screen/slot/Slot.mapping +++ b/mappings/net/minecraft/menu/Slot.mapping @@ -1,4 +1,4 @@ -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 y I FIELD field_7873 x I diff --git a/mappings/net/minecraft/screen/slot/SlotActionType.mapping b/mappings/net/minecraft/menu/SlotActionType.mapping similarity index 96% rename from mappings/net/minecraft/screen/slot/SlotActionType.mapping rename to mappings/net/minecraft/menu/SlotActionType.mapping index 8e291b45fd..29aac4dd69 100644 --- a/mappings/net/minecraft/screen/slot/SlotActionType.mapping +++ b/mappings/net/minecraft/menu/SlotActionType.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1713 net/minecraft/screen/slot/SlotActionType +CLASS net/minecraft/class_1713 net/minecraft/menu/SlotActionType FIELD field_7789 QUICK_CRAFT Lnet/minecraft/class_1713; COMMENT Drags items between multiple slots. This is usually triggered by the player clicking and dragging between slots. COMMENT diff --git a/mappings/net/minecraft/screen/SmithingScreenHandler.mapping b/mappings/net/minecraft/menu/SmithingMenu.mapping similarity index 77% rename from mappings/net/minecraft/screen/SmithingScreenHandler.mapping rename to mappings/net/minecraft/menu/SmithingMenu.mapping index 418dd051ac..b0fef10337 100644 --- a/mappings/net/minecraft/screen/SmithingScreenHandler.mapping +++ b/mappings/net/minecraft/menu/SmithingMenu.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4862 net/minecraft/screen/SmithingScreenHandler +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/screen/BlastFurnaceScreenHandler.mapping b/mappings/net/minecraft/menu/SmokerMenu.mapping similarity index 77% rename from mappings/net/minecraft/screen/BlastFurnaceScreenHandler.mapping rename to mappings/net/minecraft/menu/SmokerMenu.mapping index 2723ba89d3..4e8a85442b 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 ARG 2 playerInventory diff --git a/mappings/net/minecraft/screen/StonecutterScreenHandler.mapping b/mappings/net/minecraft/menu/StonecutterMenu.mapping similarity index 94% rename from mappings/net/minecraft/screen/StonecutterScreenHandler.mapping rename to mappings/net/minecraft/menu/StonecutterMenu.mapping index 39bbf817d0..0d69ef7b1c 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 input 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 82299ab008..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 ScreenHandler}. +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 ScreenHandler#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 e4deccfee4..1dbb221f22 100644 --- a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping @@ -24,7 +24,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 @@ -50,7 +50,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 @@ -64,7 +64,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 @@ -93,7 +93,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 @@ -109,7 +109,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 @@ -173,7 +173,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 9ab06a5892..3a852fa2da 100644 --- a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping @@ -18,7 +18,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 @@ -62,13 +62,13 @@ 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 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/ClickWindowC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping similarity index 96% rename from mappings/net/minecraft/network/packet/c2s/play/ClickWindowC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping index ec34d52692..fffcfb207c 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 clickData 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/ConfirmMenuActionC2SPacket.mapping similarity index 54% rename from mappings/net/minecraft/network/packet/c2s/play/ConfirmGuiActionC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/ConfirmMenuActionC2SPacket.mapping index 5a17102da7..3ddc9e6528 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ConfirmGuiActionC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ConfirmMenuActionC2SPacket.mapping @@ -1,10 +1,10 @@ -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 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/ConfirmMenuActionS2CPacket.mapping similarity index 69% rename from mappings/net/minecraft/network/packet/s2c/play/ConfirmGuiActionS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/ConfirmMenuActionS2CPacket.mapping index 7dd5257cb1..ced32f49b6 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ConfirmGuiActionS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ConfirmMenuActionS2CPacket.mapping @@ -1,11 +1,11 @@ -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 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/InventoryS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/InventoryS2CPacket.mapping index f9bc6ef76e..9992136988 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/InventoryS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/InventoryS2CPacket.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_2649 net/minecraft/network/packet/s2c/play/InventoryS2 COMMENT Represents the contents of a block or entity inventory being synchronized COMMENT from the server to the client. FIELD field_12146 syncId I - COMMENT The {@link net.minecraft.screen.ScreenHandler#syncId} of a screen handler. + COMMENT The {@link net.minecraft.menu.Menu#syncId} of a menu. FIELD field_12147 contents Ljava/util/List; METHOD (ILnet/minecraft/class_2371;)V ARG 1 syncId 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..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 handler + ARG 1 menu 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/NamedScreenHandlerFactory.mapping b/mappings/net/minecraft/screen/NamedScreenHandlerFactory.mapping deleted file mode 100644 index 898da89510..0000000000 --- a/mappings/net/minecraft/screen/NamedScreenHandlerFactory.mapping +++ /dev/null @@ -1,4 +0,0 @@ -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/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/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 1032f5b832..fe4a966a17 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 @@ -40,8 +40,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 @@ -69,14 +69,17 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_14234 updateLastActionTime ()V METHOD method_14235 onSpawn ()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 178f63c968..2c90dec7f5 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