diff --git a/CONVENTIONS.md b/CONVENTIONS.md index d9d747b797..a7db58a81c 100644 --- a/CONVENTIONS.md +++ b/CONVENTIONS.md @@ -126,8 +126,8 @@ way. There are however three exceptions to this rule: - Use "world" for what Mojang calls "level" (see https://github.com/FabricMC/yarn/issues/89) - - Use "container" for what Mojang calls "menu" (see https://github.com/FabricMC/yarn/issues/386) - - Use "inventory" for what Mojang calls "container" (no issue yet, requires renaming "container" first) + - 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/AbstractFurnaceBlock.mapping b/mappings/net/minecraft/block/AbstractFurnaceBlock.mapping index 73f29c64ef..3dc01b44b7 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 openContainer (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;)V + METHOD method_17025 openScreen (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;)V ARG 1 world ARG 2 pos ARG 3 player diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index ddc923956d..e4a8225098 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -34,7 +34,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 2 world ARG 3 pos METHOD method_16841 getOffsetType ()Lnet/minecraft/class_2248$class_2250; - METHOD method_17454 createContainerFactory (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3908; + METHOD method_17454 createScreenHandlerFactory (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3908; ARG 1 state ARG 2 world ARG 3 pos diff --git a/mappings/net/minecraft/block/LecternBlock.mapping b/mappings/net/minecraft/block/LecternBlock.mapping index 61c347c667..70249f435c 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 openContainer (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;)V + METHOD method_17470 openScreen (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/client/gui/screen/ingame/AbstractFurnaceScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/AbstractFurnaceScreen.mapping index f1737e4692..4f7afe2789 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 container + ARG 1 handler 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 5a925dd914..a98922a7bb 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/AnvilScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/AnvilScreen.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_471 net/minecraft/client/gui/screen/ingame/AnvilScreen - FIELD field_2819 BG_TEX Lnet/minecraft/class_2960; + FIELD field_2819 TEXTURE Lnet/minecraft/class_2960; FIELD field_2821 nameField Lnet/minecraft/class_342; METHOD (Lnet/minecraft/class_1706;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 container + ARG 1 handler 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 4d0015d9f4..7b65fe340a 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping @@ -3,9 +3,9 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree FIELD field_17413 secondaryEffect Lnet/minecraft/class_1291; FIELD field_2804 doneButton Lnet/minecraft/class_466$class_468; FIELD field_2805 consumeGem Z - FIELD field_2808 BG_TEX Lnet/minecraft/class_2960; + FIELD field_2808 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_1704;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 container + ARG 1 handler ARG 2 inventory ARG 3 title CLASS class_467 CancelButtonWidget diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BrewingStandScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BrewingStandScreen.mapping index 30fbc047ac..dfef096b57 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BrewingStandScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BrewingStandScreen.mapping @@ -2,6 +2,6 @@ CLASS net/minecraft/class_472 net/minecraft/client/gui/screen/ingame/BrewingStan FIELD field_2823 TEXTURE Lnet/minecraft/class_2960; FIELD field_2824 BUBBLE_PROGRESS [I METHOD (Lnet/minecraft/class_1708;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 container - ARG 2 playerInventory + ARG 1 handler + ARG 2 inventory ARG 3 title diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping index dafb0cb572..c200b48600 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_3934 net/minecraft/client/gui/screen/ingame/CartographyTableScreen FIELD field_17421 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_3910;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 container + ARG 1 handler 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/ContainerProvider.mapping b/mappings/net/minecraft/client/gui/screen/ingame/ContainerProvider.mapping deleted file mode 100644 index 88e82beab3..0000000000 --- a/mappings/net/minecraft/client/gui/screen/ingame/ContainerProvider.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_3936 net/minecraft/client/gui/screen/ingame/ContainerProvider - METHOD method_17577 getContainer ()Lnet/minecraft/class_1703; diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CraftingTableScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CraftingTableScreen.mapping index c2f95d190a..4a698ad944 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CraftingTableScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CraftingTableScreen.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_479 net/minecraft/client/gui/screen/ingame/CraftingTableScreen FIELD field_2877 isNarrow Z - FIELD field_2878 BG_TEX Lnet/minecraft/class_2960; - FIELD field_2880 recipeBookGui Lnet/minecraft/class_507; - FIELD field_2881 RECIPE_BUTTON_TEX Lnet/minecraft/class_2960; + FIELD field_2878 TEXTURE Lnet/minecraft/class_2960; + FIELD field_2880 recipeBook Lnet/minecraft/class_507; + FIELD field_2881 RECIPE_BUTTON_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_1714;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 container + ARG 1 handler 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 83e0d5bba2..6f1e2b4195 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping @@ -40,7 +40,7 @@ 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 CreativeContainer + CLASS class_483 CreativeScreenHandler FIELD field_2897 itemList Lnet/minecraft/class_2371; METHOD method_2473 scrollItems (F)V ARG 1 position diff --git a/mappings/net/minecraft/client/gui/screen/ingame/EnchantingScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/EnchantingScreen.mapping index dfd113a5b9..6a15d6eb83 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/EnchantingScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/EnchantingScreen.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_486 net/minecraft/client/gui/screen/ingame/EnchantingS FIELD field_2914 pageAngle F FIELD field_2915 ticks I METHOD (Lnet/minecraft/class_1718;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 container + ARG 1 handler ARG 2 inventory ARG 3 title METHOD method_2478 doTick ()V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/Generic3x3ContainerScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/Generic3x3ContainerScreen.mapping index 6b5ab57282..6286f43ef4 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/Generic3x3ContainerScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/Generic3x3ContainerScreen.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_480 net/minecraft/client/gui/screen/ingame/Generic3x3ContainerScreen FIELD field_2885 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_1716;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 container + ARG 1 handler 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/GenericContainerScreen.mapping index 2b9b25842a..efdac026d6 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/GenericContainerScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/GenericContainerScreen.mapping @@ -2,6 +2,6 @@ CLASS net/minecraft/class_476 net/minecraft/client/gui/screen/ingame/GenericCont 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 container + ARG 1 handler 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 d2e6e0fe3f..2112d7b602 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/GrindstoneScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/GrindstoneScreen.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3802 net/minecraft/client/gui/screen/ingame/GrindstoneScreen FIELD field_16769 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_3803;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 container + ARG 1 handler ARG 2 inventory ARG 3 title diff --git a/mappings/net/minecraft/client/gui/screen/ingame/HopperScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/HopperScreen.mapping index ebf3d5bcf6..7c47fbbacf 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/HopperScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/HopperScreen.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_488 net/minecraft/client/gui/screen/ingame/HopperScreen FIELD field_2919 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_1722;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 container + ARG 1 handler ARG 2 inventory ARG 3 title diff --git a/mappings/net/minecraft/client/gui/screen/ingame/HorseScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/HorseScreen.mapping index af01da4eaf..3619f9c050 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/HorseScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/HorseScreen.mapping @@ -4,6 +4,6 @@ CLASS net/minecraft/class_491 net/minecraft/client/gui/screen/ingame/HorseScreen FIELD field_2939 mouseX F FIELD field_2941 entity Lnet/minecraft/class_1496; METHOD (Lnet/minecraft/class_1724;Lnet/minecraft/class_1661;Lnet/minecraft/class_1496;)V - ARG 1 container + ARG 1 handler ARG 2 inventory ARG 3 entity diff --git a/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping index 08ecae1bcf..9c9fdae9e7 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_490 net/minecraft/client/gui/screen/ingame/InventorySc FIELD field_2930 isMouseDown Z FIELD field_2931 isNarrow Z FIELD field_2932 isOpen Z - FIELD field_2933 RECIPE_BUTTON_TEX Lnet/minecraft/class_2960; + FIELD field_2933 RECIPE_BUTTON_TEXTURE Lnet/minecraft/class_2960; FIELD field_2934 mouseY F FIELD field_2935 mouseX F METHOD (Lnet/minecraft/class_1657;)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping index 5545a11481..c936e5d3e6 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_494 net/minecraft/client/gui/screen/ingame/LoomScreen FIELD field_2968 scrollPosition F FIELD field_2970 firstPatternButtonId I METHOD (Lnet/minecraft/class_1726;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 container + ARG 1 handler ARG 2 inventory ARG 3 title METHOD method_17576 onInventoryChanged ()V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping index e0bf5727e3..b14b0da23c 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_492 net/minecraft/client/gui/screen/ingame/MerchantScr FIELD field_19164 scrolling Z FIELD field_2950 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_1728;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 container + ARG 1 handler 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 new file mode 100644 index 0000000000..70bb3e5213 --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/ingame/ScreenHandlerProvider.mapping @@ -0,0 +1,2 @@ +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/ContainerScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/ScreenWithHandler.mapping similarity index 93% rename from mappings/net/minecraft/client/gui/screen/ingame/ContainerScreen.mapping rename to mappings/net/minecraft/client/gui/screen/ingame/ScreenWithHandler.mapping index f9f1e83fa3..e92d45ad5b 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/ContainerScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/ScreenWithHandler.mapping @@ -1,9 +1,9 @@ -CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/ContainerScreen +CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/ScreenWithHandler FIELD field_17410 playerInventory Lnet/minecraft/class_1661; FIELD field_2776 x I FIELD field_2777 touchDragSlotStart Lnet/minecraft/class_1735; FIELD field_2778 heldButtonCode I - FIELD field_2779 containerHeight I + FIELD field_2779 backgroundHeight I FIELD field_2780 touchHoveredSlot Lnet/minecraft/class_1735; FIELD field_2781 touchDropTimer J FIELD field_2782 touchDragStack Lnet/minecraft/class_1799; @@ -16,12 +16,12 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/ContainerSc FIELD field_2789 touchIsRightClickDrag Z FIELD field_2790 heldButtonType I FIELD field_2791 quickMovingStack Lnet/minecraft/class_1799; - FIELD field_2792 containerWidth I + FIELD field_2792 backgroundWidth I FIELD field_2793 cursorDragSlots Ljava/util/Set; FIELD field_2794 isCursorDragging Z FIELD field_2795 touchDropTime J FIELD field_2796 touchDropY I - FIELD field_2797 container Lnet/minecraft/class_1703; + FIELD field_2797 handler 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/ContainerSc 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 container - ARG 2 playerInventory + ARG 1 handler + ARG 2 inventory ARG 3 name METHOD method_2378 isPointWithinBounds (IIIIDD)Z ARG 1 xPosition diff --git a/mappings/net/minecraft/client/gui/screen/ingame/ShulkerBoxScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/ShulkerBoxScreen.mapping index 00e6a0ec86..a8e9ca37dc 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/ShulkerBoxScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/ShulkerBoxScreen.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_495 net/minecraft/client/gui/screen/ingame/ShulkerBoxScreen FIELD field_2973 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_1733;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 container + ARG 1 handler ARG 2 inventory ARG 3 title diff --git a/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping index 62f47331d6..8783b177b3 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_3979 net/minecraft/client/gui/screen/ingame/Stonecutte FIELD field_17673 TEXTURE Lnet/minecraft/class_2960; FIELD field_17674 scrollAmount F METHOD (Lnet/minecraft/class_3971;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 container + ARG 1 handler 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 a2bda0adb6..99d0690508 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 craftingContainer Lnet/minecraft/class_1729; + FIELD field_3137 craftingScreenHandler 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 4eba8049f9..7e014c758b 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 craftingContainer Lnet/minecraft/class_1729; + FIELD field_3095 craftingScreenHandler 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 containerWidth + ARG 3 parentWidth 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 craftingContainer + ARG 5 craftingScreenHandler 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/recipe/book/ClientRecipeBook.mapping b/mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping similarity index 79% rename from mappings/net/minecraft/client/recipe/book/ClientRecipeBook.mapping rename to mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping index e11c7a23bd..78b11aa71b 100644 --- a/mappings/net/minecraft/client/recipe/book/ClientRecipeBook.mapping +++ b/mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_299 net/minecraft/client/recipe/book/ClientRecipeBook +CLASS net/minecraft/class_299 net/minecraft/client/recipebook/ClientRecipeBook FIELD field_1637 orderedResults Ljava/util/List; FIELD field_1638 resultsByGroup Ljava/util/Map; FIELD field_1639 manager Lnet/minecraft/class_1863; @@ -7,8 +7,8 @@ CLASS net/minecraft/class_299 net/minecraft/client/recipe/book/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 getGroupsForContainer (Lnet/minecraft/class_1729;)Ljava/util/List; - ARG 0 container + METHOD method_1395 getGroups (Lnet/minecraft/class_1729;)Ljava/util/List; + ARG 0 handler METHOD method_1396 getResultsForGroup (Lnet/minecraft/class_314;)Ljava/util/List; ARG 1 category METHOD method_1400 getGroupForRecipe (Lnet/minecraft/class_1860;)Lnet/minecraft/class_314; diff --git a/mappings/net/minecraft/client/recipe/book/RecipeBookGroup.mapping b/mappings/net/minecraft/client/recipebook/RecipeBookGroup.mapping similarity index 68% rename from mappings/net/minecraft/client/recipe/book/RecipeBookGroup.mapping rename to mappings/net/minecraft/client/recipebook/RecipeBookGroup.mapping index 867861ffe9..c19ee94a08 100644 --- a/mappings/net/minecraft/client/recipe/book/RecipeBookGroup.mapping +++ b/mappings/net/minecraft/client/recipebook/RecipeBookGroup.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_314 net/minecraft/client/recipe/book/RecipeBookGroup +CLASS net/minecraft/class_314 net/minecraft/client/recipebook/RecipeBookGroup FIELD field_1807 icons Ljava/util/List; METHOD (Ljava/lang/String;I[Lnet/minecraft/class_1799;)V ARG 3 entries diff --git a/mappings/net/minecraft/container/ContainerListener.mapping b/mappings/net/minecraft/container/ContainerListener.mapping deleted file mode 100644 index ed9e1255fe..0000000000 --- a/mappings/net/minecraft/container/ContainerListener.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS net/minecraft/class_1712 net/minecraft/container/ContainerListener - METHOD method_7633 onContainerPropertyUpdate (Lnet/minecraft/class_1703;II)V - ARG 1 container - ARG 2 propertyId - METHOD method_7634 onContainerRegistered (Lnet/minecraft/class_1703;Lnet/minecraft/class_2371;)V - ARG 1 container - METHOD method_7635 onContainerSlotUpdate (Lnet/minecraft/class_1703;ILnet/minecraft/class_1799;)V - ARG 1 container - ARG 2 slotId diff --git a/mappings/net/minecraft/container/NameableContainerFactory.mapping b/mappings/net/minecraft/container/NameableContainerFactory.mapping deleted file mode 100644 index 1086e95f67..0000000000 --- a/mappings/net/minecraft/container/NameableContainerFactory.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_3908 net/minecraft/container/NameableContainerFactory - METHOD method_5476 getDisplayName ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/container/ShulkerBoxSlot.mapping b/mappings/net/minecraft/container/ShulkerBoxSlot.mapping deleted file mode 100644 index c7ceb7b773..0000000000 --- a/mappings/net/minecraft/container/ShulkerBoxSlot.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1736 net/minecraft/container/ShulkerBoxSlot diff --git a/mappings/net/minecraft/container/SlotActionType.mapping b/mappings/net/minecraft/container/SlotActionType.mapping deleted file mode 100644 index ca111891ff..0000000000 --- a/mappings/net/minecraft/container/SlotActionType.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_1713 net/minecraft/container/SlotActionType diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index bf1b723d4c..0e6a556ad1 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 playerContainer Lnet/minecraft/class_1723; + FIELD field_7498 playerScreenHandler Lnet/minecraft/class_1723; FIELD field_7499 capeZ D FIELD field_7500 capeX D FIELD field_7501 spawnPosition Lnet/minecraft/class_2338; @@ -27,7 +27,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity FIELD field_7508 lastPlayedLevelUpSoundTime I FIELD field_7510 experienceProgress F FIELD field_7511 SCORE Lnet/minecraft/class_2940; - FIELD field_7512 container Lnet/minecraft/class_1703; + FIELD field_7512 currentScreenHandler Lnet/minecraft/class_1703; FIELD field_7513 fishHook Lnet/minecraft/class_1536; FIELD field_7514 inventory Lnet/minecraft/class_1661; FIELD field_7515 spawnForced Z @@ -51,7 +51,8 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 4 experience ARG 5 leveled ARG 6 refreshable - METHOD method_17355 openContainer (Lnet/minecraft/class_3908;)Ljava/util/OptionalInt; + METHOD method_17355 openHandledScreen (Lnet/minecraft/class_3908;)Ljava/util/OptionalInt; + ARG 1 factory METHOD method_17356 playSound (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FF)V ARG 1 event ARG 2 category @@ -217,7 +218,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 closeContainer ()V + METHOD method_7346 closeHandledScreen ()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 3c2a6b70ff..121da56554 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 getContainer (ILnet/minecraft/class_1661;)Lnet/minecraft/class_1703; + METHOD method_17357 getScreenHandler (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 41fe06f1f8..451b2d3ac0 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 container Lnet/minecraft/class_1703; + FIELD field_7802 handler 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 container + ARG 1 handler ARG 2 width ARG 3 height METHOD method_17397 getHeight ()I diff --git a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping index a867251e5e..4769c5382f 100644 --- a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping @@ -23,7 +23,7 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_11088 onMapUpdate (Lnet/minecraft/class_2683;)V ARG 1 packet - METHOD method_11089 onOpenHorseContainer (Lnet/minecraft/class_2648;)V + METHOD method_11089 onOpenHorseScreen (Lnet/minecraft/class_2648;)V ARG 1 packet METHOD method_11090 onCraftFailedResponse (Lnet/minecraft/class_2695;)V ARG 1 packet @@ -49,7 +49,7 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_11101 onExperienceBarUpdate (Lnet/minecraft/class_2748;)V ARG 1 packet - METHOD method_11102 onCloseContainer (Lnet/minecraft/class_2645;)V + METHOD method_11102 onCloseScreen (Lnet/minecraft/class_2645;)V ARG 1 packet METHOD method_11103 onTitle (Lnet/minecraft/class_2762;)V ARG 1 packet @@ -63,7 +63,7 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_11108 onSignEditorOpen (Lnet/minecraft/class_2693;)V ARG 1 packet - METHOD method_11109 onContainerSlotUpdate (Lnet/minecraft/class_2653;)V + METHOD method_11109 onScreenHandlerSlotUpdate (Lnet/minecraft/class_2653;)V ARG 1 packet METHOD method_11110 onEntityAttach (Lnet/minecraft/class_2740;)V ARG 1 packet @@ -107,7 +107,7 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_11130 onAdvancements (Lnet/minecraft/class_2779;)V ARG 1 packet - METHOD method_11131 onContainerPropertyUpdate (Lnet/minecraft/class_2651;)V + METHOD method_11131 onScreenHandlerPropertyUpdate (Lnet/minecraft/class_2651;)V ARG 1 packet METHOD method_11132 onVelocityUpdate (Lnet/minecraft/class_2743;)V ARG 1 packet @@ -171,7 +171,7 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_17586 onSetTradeOffers (Lnet/minecraft/class_3943;)V ARG 1 packet - METHOD method_17587 onOpenContainer (Lnet/minecraft/class_3944;)V + METHOD method_17587 onOpenScreen (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/packet/s2c/play/CloseContainerS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CloseScreenS2CPacket.mapping similarity index 81% rename from mappings/net/minecraft/network/packet/s2c/play/CloseContainerS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/CloseScreenS2CPacket.mapping index c6afc9d6bc..32d8ac7375 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/CloseContainerS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/CloseScreenS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2645 net/minecraft/network/packet/s2c/play/CloseContainerS2CPacket +CLASS net/minecraft/class_2645 net/minecraft/network/packet/s2c/play/CloseScreenS2CPacket FIELD field_12137 syncId I METHOD (I)V ARG 1 syncId diff --git a/mappings/net/minecraft/network/packet/s2c/play/OpenHorseContainerS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/OpenHorseScreenS2CPacket.mapping similarity index 90% rename from mappings/net/minecraft/network/packet/s2c/play/OpenHorseContainerS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/OpenHorseScreenS2CPacket.mapping index e3409affb2..f569d4c9b6 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/OpenHorseContainerS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/OpenHorseScreenS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2648 net/minecraft/network/packet/s2c/play/OpenHorseContainerS2CPacket +CLASS net/minecraft/class_2648 net/minecraft/network/packet/s2c/play/OpenHorseScreenS2CPacket 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/OpenContainerS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/OpenScreenS2CPacket.mapping similarity index 72% rename from mappings/net/minecraft/network/packet/s2c/play/OpenContainerS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/OpenScreenS2CPacket.mapping index df86e10726..391439bfc4 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/OpenContainerS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/OpenScreenS2CPacket.mapping @@ -1,11 +1,11 @@ -CLASS net/minecraft/class_3944 net/minecraft/network/packet/s2c/play/OpenContainerS2CPacket +CLASS net/minecraft/class_3944 net/minecraft/network/packet/s2c/play/OpenScreenS2CPacket FIELD field_17436 syncId I - FIELD field_17437 containerId I + FIELD field_17437 screenHandlerId 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 getContainerType ()Lnet/minecraft/class_3917; + METHOD method_17593 getScreenHandlerType ()Lnet/minecraft/class_3917; METHOD method_17594 getName ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/network/packet/s2c/play/ContainerPropertyUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerPropertyUpdateS2CPacket.mapping similarity index 88% rename from mappings/net/minecraft/network/packet/s2c/play/ContainerPropertyUpdateS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerPropertyUpdateS2CPacket.mapping index 3411cc0910..6ba7b3f26d 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ContainerPropertyUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerPropertyUpdateS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2651 net/minecraft/network/packet/s2c/play/ContainerPropertyUpdateS2CPacket +CLASS net/minecraft/class_2651 net/minecraft/network/packet/s2c/play/ScreenHandlerPropertyUpdateS2CPacket 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/ContainerSlotUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.mapping similarity index 91% rename from mappings/net/minecraft/network/packet/s2c/play/ContainerSlotUpdateS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.mapping index 3bbb46df9e..873ae4294f 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ContainerSlotUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2653 net/minecraft/network/packet/s2c/play/ContainerSlotUpdateS2CPacket +CLASS net/minecraft/class_2653 net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket FIELD field_12151 slot I FIELD field_12152 syncId I FIELD field_12153 stack Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/recipe/InputSlotFiller.mapping b/mappings/net/minecraft/recipe/InputSlotFiller.mapping index 763ad835c5..c36c3ac277 100644 --- a/mappings/net/minecraft/recipe/InputSlotFiller.mapping +++ b/mappings/net/minecraft/recipe/InputSlotFiller.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_2955 net/minecraft/recipe/InputSlotFiller FIELD field_13347 recipeFinder Lnet/minecraft/class_1662; - FIELD field_13348 craftingContainer Lnet/minecraft/class_1729; + FIELD field_13348 craftingScreenHandler Lnet/minecraft/class_1729; FIELD field_13349 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_13350 inventory Lnet/minecraft/class_1661; METHOD method_12819 getAmountToFill (ZIZ)I diff --git a/mappings/net/minecraft/recipe/book/RecipeBook.mapping b/mappings/net/minecraft/recipe/book/RecipeBook.mapping index e67a7f933d..72fec579e2 100644 --- a/mappings/net/minecraft/recipe/book/RecipeBook.mapping +++ b/mappings/net/minecraft/recipe/book/RecipeBook.mapping @@ -20,7 +20,7 @@ CLASS net/minecraft/class_3439 net/minecraft/recipe/book/RecipeBook METHOD method_14879 remove (Lnet/minecraft/class_2960;)V ARG 1 id METHOD method_14880 isFilteringCraftable (Lnet/minecraft/class_1729;)Z - ARG 1 container + ARG 1 handler METHOD method_14881 add (Lnet/minecraft/class_2960;)V ARG 1 id METHOD method_14882 setFurnaceGuiOpen (Z)V diff --git a/mappings/net/minecraft/container/AbstractFurnaceContainer.mapping b/mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping similarity index 90% rename from mappings/net/minecraft/container/AbstractFurnaceContainer.mapping rename to mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping index dcabea0d40..f72afa8023 100644 --- a/mappings/net/minecraft/container/AbstractFurnaceContainer.mapping +++ b/mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1720 net/minecraft/container/AbstractFurnaceContainer +CLASS net/minecraft/class_1720 net/minecraft/screen/AbstractFurnaceScreenHandler FIELD field_17286 propertyDelegate Lnet/minecraft/class_3913; FIELD field_17494 recipeType Lnet/minecraft/class_3956; FIELD field_7822 world Lnet/minecraft/class_1937; diff --git a/mappings/net/minecraft/container/AnvilContainer.mapping b/mappings/net/minecraft/screen/AnvilScreenHandler.mapping similarity index 88% rename from mappings/net/minecraft/container/AnvilContainer.mapping rename to mappings/net/minecraft/screen/AnvilScreenHandler.mapping index f9dee8858a..be129000f3 100644 --- a/mappings/net/minecraft/container/AnvilContainer.mapping +++ b/mappings/net/minecraft/screen/AnvilScreenHandler.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1706 net/minecraft/container/AnvilContainer +CLASS net/minecraft/class_1706 net/minecraft/screen/AnvilScreenHandler 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/container/ArrayPropertyDelegate.mapping b/mappings/net/minecraft/screen/ArrayPropertyDelegate.mapping similarity index 63% rename from mappings/net/minecraft/container/ArrayPropertyDelegate.mapping rename to mappings/net/minecraft/screen/ArrayPropertyDelegate.mapping index f420305fd6..c51f29dfe3 100644 --- a/mappings/net/minecraft/container/ArrayPropertyDelegate.mapping +++ b/mappings/net/minecraft/screen/ArrayPropertyDelegate.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3919 net/minecraft/container/ArrayPropertyDelegate +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 diff --git a/mappings/net/minecraft/container/BeaconContainer.mapping b/mappings/net/minecraft/screen/BeaconScreenHandler.mapping similarity index 91% rename from mappings/net/minecraft/container/BeaconContainer.mapping rename to mappings/net/minecraft/screen/BeaconScreenHandler.mapping index 41a5cc7307..808ef1b265 100644 --- a/mappings/net/minecraft/container/BeaconContainer.mapping +++ b/mappings/net/minecraft/screen/BeaconScreenHandler.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1704 net/minecraft/container/BeaconContainer +CLASS net/minecraft/class_1704 net/minecraft/screen/BeaconScreenHandler FIELD field_17287 paymentInv Lnet/minecraft/class_1263; FIELD field_17288 paymentSlot Lnet/minecraft/class_1704$class_1705; FIELD field_17289 context Lnet/minecraft/class_3914; diff --git a/mappings/net/minecraft/container/BlastFurnaceContainer.mapping b/mappings/net/minecraft/screen/BlastFurnaceScreenHandler.mapping similarity index 69% rename from mappings/net/minecraft/container/BlastFurnaceContainer.mapping rename to mappings/net/minecraft/screen/BlastFurnaceScreenHandler.mapping index 6786fbf1ee..6a85f687db 100644 --- a/mappings/net/minecraft/container/BlastFurnaceContainer.mapping +++ b/mappings/net/minecraft/screen/BlastFurnaceScreenHandler.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3705 net/minecraft/container/BlastFurnaceContainer +CLASS net/minecraft/class_3705 net/minecraft/screen/BlastFurnaceScreenHandler METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId METHOD (ILnet/minecraft/class_1661;Lnet/minecraft/class_1263;Lnet/minecraft/class_3913;)V diff --git a/mappings/net/minecraft/container/BlockContext.mapping b/mappings/net/minecraft/screen/BlockContext.mapping similarity index 89% rename from mappings/net/minecraft/container/BlockContext.mapping rename to mappings/net/minecraft/screen/BlockContext.mapping index 6d3f44bfbb..3a2985aafe 100644 --- a/mappings/net/minecraft/container/BlockContext.mapping +++ b/mappings/net/minecraft/screen/BlockContext.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3914 net/minecraft/container/BlockContext +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}. FIELD field_17304 EMPTY Lnet/minecraft/class_3914; METHOD method_17392 create (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3914; diff --git a/mappings/net/minecraft/container/BrewingStandContainer.mapping b/mappings/net/minecraft/screen/BrewingStandScreenHandler.mapping similarity index 86% rename from mappings/net/minecraft/container/BrewingStandContainer.mapping rename to mappings/net/minecraft/screen/BrewingStandScreenHandler.mapping index 09b442db6e..29cca0e361 100644 --- a/mappings/net/minecraft/container/BrewingStandContainer.mapping +++ b/mappings/net/minecraft/screen/BrewingStandScreenHandler.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1708 net/minecraft/container/BrewingStandContainer +CLASS net/minecraft/class_1708 net/minecraft/screen/BrewingStandScreenHandler 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/container/CartographyTableContainer.mapping b/mappings/net/minecraft/screen/CartographyTableScreenHandler.mapping similarity index 88% rename from mappings/net/minecraft/container/CartographyTableContainer.mapping rename to mappings/net/minecraft/screen/CartographyTableScreenHandler.mapping index a63153e104..c0b9346dfa 100644 --- a/mappings/net/minecraft/container/CartographyTableContainer.mapping +++ b/mappings/net/minecraft/screen/CartographyTableScreenHandler.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3910 net/minecraft/container/CartographyTableContainer +CLASS net/minecraft/class_3910 net/minecraft/screen/CartographyTableScreenHandler 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/container/CraftingContainer.mapping b/mappings/net/minecraft/screen/CraftingScreenHandler.mapping similarity index 85% rename from mappings/net/minecraft/container/CraftingContainer.mapping rename to mappings/net/minecraft/screen/CraftingScreenHandler.mapping index a8b7113f87..54d705267d 100644 --- a/mappings/net/minecraft/container/CraftingContainer.mapping +++ b/mappings/net/minecraft/screen/CraftingScreenHandler.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1729 net/minecraft/container/CraftingContainer +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 diff --git a/mappings/net/minecraft/container/CraftingTableContainer.mapping b/mappings/net/minecraft/screen/CraftingTableScreenHandler.mapping similarity index 88% rename from mappings/net/minecraft/container/CraftingTableContainer.mapping rename to mappings/net/minecraft/screen/CraftingTableScreenHandler.mapping index f0844440c0..3549c8bea0 100644 --- a/mappings/net/minecraft/container/CraftingTableContainer.mapping +++ b/mappings/net/minecraft/screen/CraftingTableScreenHandler.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1714 net/minecraft/container/CraftingTableContainer +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; diff --git a/mappings/net/minecraft/container/EnchantingTableContainer.mapping b/mappings/net/minecraft/screen/EnchantingTableScreenHandler.mapping similarity index 88% rename from mappings/net/minecraft/container/EnchantingTableContainer.mapping rename to mappings/net/minecraft/screen/EnchantingTableScreenHandler.mapping index ec7a47d646..ee65e64da7 100644 --- a/mappings/net/minecraft/container/EnchantingTableContainer.mapping +++ b/mappings/net/minecraft/screen/EnchantingTableScreenHandler.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1718 net/minecraft/container/EnchantingTableContainer +CLASS net/minecraft/class_1718 net/minecraft/screen/EnchantingTableScreenHandler FIELD field_7808 enchantmentPower [I FIELD field_7809 inventory Lnet/minecraft/class_1263; FIELD field_7810 enchantmentLevel [I diff --git a/mappings/net/minecraft/container/SmokerContainer.mapping b/mappings/net/minecraft/screen/FurnaceScreenHandler.mapping similarity index 70% rename from mappings/net/minecraft/container/SmokerContainer.mapping rename to mappings/net/minecraft/screen/FurnaceScreenHandler.mapping index eaf70b149b..42ac3b7559 100644 --- a/mappings/net/minecraft/container/SmokerContainer.mapping +++ b/mappings/net/minecraft/screen/FurnaceScreenHandler.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3706 net/minecraft/container/SmokerContainer +CLASS net/minecraft/class_3858 net/minecraft/screen/FurnaceScreenHandler METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId METHOD (ILnet/minecraft/class_1661;Lnet/minecraft/class_1263;Lnet/minecraft/class_3913;)V diff --git a/mappings/net/minecraft/container/Generic3x3Container.mapping b/mappings/net/minecraft/screen/Generic3x3ContainerScreenHandler.mapping similarity index 70% rename from mappings/net/minecraft/container/Generic3x3Container.mapping rename to mappings/net/minecraft/screen/Generic3x3ContainerScreenHandler.mapping index 25577fb5e1..8d140a1cf7 100644 --- a/mappings/net/minecraft/container/Generic3x3Container.mapping +++ b/mappings/net/minecraft/screen/Generic3x3ContainerScreenHandler.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1716 net/minecraft/container/Generic3x3Container +CLASS net/minecraft/class_1716 net/minecraft/screen/Generic3x3ContainerScreenHandler FIELD field_7806 inventory Lnet/minecraft/class_1263; METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId diff --git a/mappings/net/minecraft/container/GenericContainer.mapping b/mappings/net/minecraft/screen/GenericContainerScreenHandler.mapping similarity index 93% rename from mappings/net/minecraft/container/GenericContainer.mapping rename to mappings/net/minecraft/screen/GenericContainerScreenHandler.mapping index 155ab4a64c..0e17b7bb9b 100644 --- a/mappings/net/minecraft/container/GenericContainer.mapping +++ b/mappings/net/minecraft/screen/GenericContainerScreenHandler.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1707 net/minecraft/container/GenericContainer +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 diff --git a/mappings/net/minecraft/container/GrindstoneContainer.mapping b/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping similarity index 91% rename from mappings/net/minecraft/container/GrindstoneContainer.mapping rename to mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping index 5d97de6d14..8ebde1f0e5 100644 --- a/mappings/net/minecraft/container/GrindstoneContainer.mapping +++ b/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3803 net/minecraft/container/GrindstoneContainer +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_16775 context Lnet/minecraft/class_3914; diff --git a/mappings/net/minecraft/container/HopperContainer.mapping b/mappings/net/minecraft/screen/HopperScreenHandler.mapping similarity index 73% rename from mappings/net/minecraft/container/HopperContainer.mapping rename to mappings/net/minecraft/screen/HopperScreenHandler.mapping index d1e4fc53bb..a3cfac4537 100644 --- a/mappings/net/minecraft/container/HopperContainer.mapping +++ b/mappings/net/minecraft/screen/HopperScreenHandler.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1722 net/minecraft/container/HopperContainer +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 diff --git a/mappings/net/minecraft/container/HorseContainer.mapping b/mappings/net/minecraft/screen/HorseScreenHandler.mapping similarity index 75% rename from mappings/net/minecraft/container/HorseContainer.mapping rename to mappings/net/minecraft/screen/HorseScreenHandler.mapping index 8b0bc84496..4399790447 100644 --- a/mappings/net/minecraft/container/HorseContainer.mapping +++ b/mappings/net/minecraft/screen/HorseScreenHandler.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1724 net/minecraft/container/HorseContainer +CLASS net/minecraft/class_1724 net/minecraft/screen/HorseScreenHandler FIELD field_7836 playerInv Lnet/minecraft/class_1263; FIELD field_7837 entity Lnet/minecraft/class_1496; METHOD (ILnet/minecraft/class_1661;Lnet/minecraft/class_1263;Lnet/minecraft/class_1496;)V diff --git a/mappings/net/minecraft/container/LecternContainer.mapping b/mappings/net/minecraft/screen/LecternScreenHandler.mapping similarity index 82% rename from mappings/net/minecraft/container/LecternContainer.mapping rename to mappings/net/minecraft/screen/LecternScreenHandler.mapping index 40718741cb..f4ba6d5840 100644 --- a/mappings/net/minecraft/container/LecternContainer.mapping +++ b/mappings/net/minecraft/screen/LecternScreenHandler.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3916 net/minecraft/container/LecternContainer +CLASS net/minecraft/class_3916 net/minecraft/screen/LecternScreenHandler 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/container/LoomContainer.mapping b/mappings/net/minecraft/screen/LoomScreenHandler.mapping similarity index 94% rename from mappings/net/minecraft/container/LoomContainer.mapping rename to mappings/net/minecraft/screen/LoomScreenHandler.mapping index d0f2cea453..2e32653e71 100644 --- a/mappings/net/minecraft/container/LoomContainer.mapping +++ b/mappings/net/minecraft/screen/LoomScreenHandler.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1726 net/minecraft/container/LoomContainer +CLASS net/minecraft/class_1726 net/minecraft/screen/LoomScreenHandler 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/container/MerchantContainer.mapping b/mappings/net/minecraft/screen/MerchantScreenHandler.mapping similarity index 94% rename from mappings/net/minecraft/container/MerchantContainer.mapping rename to mappings/net/minecraft/screen/MerchantScreenHandler.mapping index e12a7b7238..67efd17fe6 100644 --- a/mappings/net/minecraft/container/MerchantContainer.mapping +++ b/mappings/net/minecraft/screen/MerchantScreenHandler.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1728 net/minecraft/container/MerchantContainer +CLASS net/minecraft/class_1728 net/minecraft/screen/MerchantScreenHandler FIELD field_18669 levelProgress I FIELD field_18670 levelled Z FIELD field_19358 canRefreshTrades Z diff --git a/mappings/net/minecraft/screen/NameableScreenHandlerFactory.mapping b/mappings/net/minecraft/screen/NameableScreenHandlerFactory.mapping new file mode 100644 index 0000000000..2f711d2aa3 --- /dev/null +++ b/mappings/net/minecraft/screen/NameableScreenHandlerFactory.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_3908 net/minecraft/screen/NameableScreenHandlerFactory + METHOD method_5476 getDisplayName ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/container/PlayerContainer.mapping b/mappings/net/minecraft/screen/PlayerScreenHandler.mapping similarity index 92% rename from mappings/net/minecraft/container/PlayerContainer.mapping rename to mappings/net/minecraft/screen/PlayerScreenHandler.mapping index dd8d58a1cf..5d5c66f926 100644 --- a/mappings/net/minecraft/container/PlayerContainer.mapping +++ b/mappings/net/minecraft/screen/PlayerScreenHandler.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1723 net/minecraft/container/PlayerContainer +CLASS net/minecraft/class_1723 net/minecraft/screen/PlayerScreenHandler 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/container/Property.mapping b/mappings/net/minecraft/screen/Property.mapping similarity index 94% rename from mappings/net/minecraft/container/Property.mapping rename to mappings/net/minecraft/screen/Property.mapping index 44572f7629..f5ce402806 100644 --- a/mappings/net/minecraft/container/Property.mapping +++ b/mappings/net/minecraft/screen/Property.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3915 net/minecraft/container/Property +CLASS net/minecraft/class_3915 net/minecraft/screen/Property COMMENT An integer property that is stored in a {@link Container}. COMMENT COMMENT

{@code Property} instances are used for tracking integer properties in property delegates diff --git a/mappings/net/minecraft/container/PropertyDelegate.mapping b/mappings/net/minecraft/screen/PropertyDelegate.mapping similarity index 82% rename from mappings/net/minecraft/container/PropertyDelegate.mapping rename to mappings/net/minecraft/screen/PropertyDelegate.mapping index 22c67c90e5..1bedef8edc 100644 --- a/mappings/net/minecraft/container/PropertyDelegate.mapping +++ b/mappings/net/minecraft/screen/PropertyDelegate.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3913 net/minecraft/container/PropertyDelegate +CLASS net/minecraft/class_3913 net/minecraft/screen/PropertyDelegate COMMENT A property delegate represents an indexed list of integer properties. COMMENT COMMENT

Property delegates are used for displaying integer values in screens, diff --git a/mappings/net/minecraft/container/Container.mapping b/mappings/net/minecraft/screen/ScreenHandler.mapping similarity index 98% rename from mappings/net/minecraft/container/Container.mapping rename to mappings/net/minecraft/screen/ScreenHandler.mapping index 4738d41fd5..cde09f44f3 100644 --- a/mappings/net/minecraft/container/Container.mapping +++ b/mappings/net/minecraft/screen/ScreenHandler.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1703 net/minecraft/container/Container +CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler FIELD field_17285 properties Ljava/util/List; FIELD field_17493 type Lnet/minecraft/class_3917; FIELD field_7757 quickCraftSlots Ljava/util/Set; diff --git a/mappings/net/minecraft/container/ContainerFactory.mapping b/mappings/net/minecraft/screen/ScreenHandlerFactory.mapping similarity index 66% rename from mappings/net/minecraft/container/ContainerFactory.mapping rename to mappings/net/minecraft/screen/ScreenHandlerFactory.mapping index 4bdf4d1c61..8b07bf1192 100644 --- a/mappings/net/minecraft/container/ContainerFactory.mapping +++ b/mappings/net/minecraft/screen/ScreenHandlerFactory.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1270 net/minecraft/container/ContainerFactory +CLASS net/minecraft/class_1270 net/minecraft/screen/ScreenHandlerFactory 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/screen/ScreenHandlerListener.mapping new file mode 100644 index 0000000000..696ebdef10 --- /dev/null +++ b/mappings/net/minecraft/screen/ScreenHandlerListener.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_1712 net/minecraft/screen/ScreenHandlerListener + METHOD method_7633 onPropertyUpdate (Lnet/minecraft/class_1703;II)V + ARG 1 handler + ARG 2 propertyId + METHOD method_7634 onHandlerRegistered (Lnet/minecraft/class_1703;Lnet/minecraft/class_2371;)V + ARG 1 handler + METHOD method_7635 onSlotUpdate (Lnet/minecraft/class_1703;ILnet/minecraft/class_1799;)V + ARG 1 handler + ARG 2 slotId diff --git a/mappings/net/minecraft/container/ContainerType.mapping b/mappings/net/minecraft/screen/ScreenHandlerType.mapping similarity index 88% rename from mappings/net/minecraft/container/ContainerType.mapping rename to mappings/net/minecraft/screen/ScreenHandlerType.mapping index e1be8227d6..7c68bc17ed 100644 --- a/mappings/net/minecraft/container/ContainerType.mapping +++ b/mappings/net/minecraft/screen/ScreenHandlerType.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3917 net/minecraft/container/ContainerType +CLASS net/minecraft/class_3917 net/minecraft/screen/ScreenHandlerType FIELD field_17344 factory Lnet/minecraft/class_3917$class_3918; METHOD (Lnet/minecraft/class_3917$class_3918;)V ARG 1 factory diff --git a/mappings/net/minecraft/container/ShulkerBoxContainer.mapping b/mappings/net/minecraft/screen/ShulkerBoxScreenHandler.mapping similarity index 72% rename from mappings/net/minecraft/container/ShulkerBoxContainer.mapping rename to mappings/net/minecraft/screen/ShulkerBoxScreenHandler.mapping index de8f4465e5..6c624508fb 100644 --- a/mappings/net/minecraft/container/ShulkerBoxContainer.mapping +++ b/mappings/net/minecraft/screen/ShulkerBoxScreenHandler.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1733 net/minecraft/container/ShulkerBoxContainer +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 diff --git a/mappings/net/minecraft/container/SimpleNamedContainerFactory.mapping b/mappings/net/minecraft/screen/SimpleNamedScreenHandlerFactory.mapping similarity index 71% rename from mappings/net/minecraft/container/SimpleNamedContainerFactory.mapping rename to mappings/net/minecraft/screen/SimpleNamedScreenHandlerFactory.mapping index 8bd8599e3f..50308e1bb1 100644 --- a/mappings/net/minecraft/container/SimpleNamedContainerFactory.mapping +++ b/mappings/net/minecraft/screen/SimpleNamedScreenHandlerFactory.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_747 net/minecraft/container/SimpleNamedContainerFactory +CLASS net/minecraft/class_747 net/minecraft/screen/SimpleNamedScreenHandlerFactory 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/container/FurnaceContainer.mapping b/mappings/net/minecraft/screen/SmokerScreenHandler.mapping similarity index 70% rename from mappings/net/minecraft/container/FurnaceContainer.mapping rename to mappings/net/minecraft/screen/SmokerScreenHandler.mapping index 555eedb049..f3492407bb 100644 --- a/mappings/net/minecraft/container/FurnaceContainer.mapping +++ b/mappings/net/minecraft/screen/SmokerScreenHandler.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3858 net/minecraft/container/FurnaceContainer +CLASS net/minecraft/class_3706 net/minecraft/screen/SmokerScreenHandler METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId METHOD (ILnet/minecraft/class_1661;Lnet/minecraft/class_1263;Lnet/minecraft/class_3913;)V diff --git a/mappings/net/minecraft/container/StonecutterContainer.mapping b/mappings/net/minecraft/screen/StonecutterScreenHandler.mapping similarity index 93% rename from mappings/net/minecraft/container/StonecutterContainer.mapping rename to mappings/net/minecraft/screen/StonecutterScreenHandler.mapping index 71301e83a9..6cbe00a14f 100644 --- a/mappings/net/minecraft/container/StonecutterContainer.mapping +++ b/mappings/net/minecraft/screen/StonecutterScreenHandler.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3971 net/minecraft/container/StonecutterContainer +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; diff --git a/mappings/net/minecraft/container/CraftingResultSlot.mapping b/mappings/net/minecraft/screen/slot/CraftingResultSlot.mapping similarity index 81% rename from mappings/net/minecraft/container/CraftingResultSlot.mapping rename to mappings/net/minecraft/screen/slot/CraftingResultSlot.mapping index a7597ad419..1fd43af7a7 100644 --- a/mappings/net/minecraft/container/CraftingResultSlot.mapping +++ b/mappings/net/minecraft/screen/slot/CraftingResultSlot.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1734 net/minecraft/container/CraftingResultSlot +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; diff --git a/mappings/net/minecraft/container/FurnaceFuelSlot.mapping b/mappings/net/minecraft/screen/slot/FurnaceFuelSlot.mapping similarity index 58% rename from mappings/net/minecraft/container/FurnaceFuelSlot.mapping rename to mappings/net/minecraft/screen/slot/FurnaceFuelSlot.mapping index b0371db78c..73752cd362 100644 --- a/mappings/net/minecraft/container/FurnaceFuelSlot.mapping +++ b/mappings/net/minecraft/screen/slot/FurnaceFuelSlot.mapping @@ -1,6 +1,7 @@ -CLASS net/minecraft/class_1717 net/minecraft/container/FurnaceFuelSlot - FIELD field_17083 container Lnet/minecraft/class_1720; +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 diff --git a/mappings/net/minecraft/container/FurnaceOutputSlot.mapping b/mappings/net/minecraft/screen/slot/FurnaceOutputSlot.mapping similarity index 70% rename from mappings/net/minecraft/container/FurnaceOutputSlot.mapping rename to mappings/net/minecraft/screen/slot/FurnaceOutputSlot.mapping index e7be122d63..e2a66f95bc 100644 --- a/mappings/net/minecraft/container/FurnaceOutputSlot.mapping +++ b/mappings/net/minecraft/screen/slot/FurnaceOutputSlot.mapping @@ -1,9 +1,8 @@ -CLASS net/minecraft/class_1719 net/minecraft/container/FurnaceOutputSlot +CLASS net/minecraft/class_1719 net/minecraft/screen/slot/FurnaceOutputSlot FIELD field_7818 player Lnet/minecraft/class_1657; FIELD field_7819 amount I METHOD (Lnet/minecraft/class_1657;Lnet/minecraft/class_1263;III)V ARG 1 player - ARG 2 inventory ARG 3 invSlot ARG 4 xPosition ARG 5 yPosition diff --git a/mappings/net/minecraft/screen/slot/ShulkerBoxSlot.mapping b/mappings/net/minecraft/screen/slot/ShulkerBoxSlot.mapping new file mode 100644 index 0000000000..27b9409f8a --- /dev/null +++ b/mappings/net/minecraft/screen/slot/ShulkerBoxSlot.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1736 net/minecraft/screen/slot/ShulkerBoxSlot diff --git a/mappings/net/minecraft/container/Slot.mapping b/mappings/net/minecraft/screen/slot/Slot.mapping similarity index 94% rename from mappings/net/minecraft/container/Slot.mapping rename to mappings/net/minecraft/screen/slot/Slot.mapping index d2737fda46..e13389da4e 100644 --- a/mappings/net/minecraft/container/Slot.mapping +++ b/mappings/net/minecraft/screen/slot/Slot.mapping @@ -1,11 +1,10 @@ -CLASS net/minecraft/class_1735 net/minecraft/container/Slot +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_7874 id I FIELD field_7875 invSlot I METHOD (Lnet/minecraft/class_1263;III)V - ARG 1 inventory ARG 2 invSlot ARG 3 xPosition ARG 4 yPosition diff --git a/mappings/net/minecraft/screen/slot/SlotActionType.mapping b/mappings/net/minecraft/screen/slot/SlotActionType.mapping new file mode 100644 index 0000000000..49f76e4fb4 --- /dev/null +++ b/mappings/net/minecraft/screen/slot/SlotActionType.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_1713 net/minecraft/screen/slot/SlotActionType diff --git a/mappings/net/minecraft/container/TradeOutputSlot.mapping b/mappings/net/minecraft/screen/slot/TradeOutputSlot.mapping similarity index 83% rename from mappings/net/minecraft/container/TradeOutputSlot.mapping rename to mappings/net/minecraft/screen/slot/TradeOutputSlot.mapping index 4b9c413163..1e7b0c9e2a 100644 --- a/mappings/net/minecraft/container/TradeOutputSlot.mapping +++ b/mappings/net/minecraft/screen/slot/TradeOutputSlot.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1727 net/minecraft/container/TradeOutputSlot +CLASS net/minecraft/class_1727 net/minecraft/screen/slot/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/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 4a4e1203e5..3d96a67a5c 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 containerSyncId I + FIELD field_13986 screenHandlerSyncId I FIELD field_13987 networkHandler Lnet/minecraft/class_3244; FIELD field_13988 removedEntities Ljava/util/List; FIELD field_13989 notInAnyWorld Z @@ -38,8 +38,8 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_14203 copyFrom (Lnet/minecraft/class_3222;Z)V ARG 1 oldPlayer ARG 2 alive - METHOD method_14204 openContainer (Lnet/minecraft/class_1703;)V - ARG 1 container + METHOD method_14204 openHandledScreen (Lnet/minecraft/class_1703;)V + ARG 1 handler METHOD method_14205 sendInitialChunkPackets (Lnet/minecraft/class_1923;Lnet/minecraft/class_2596;Lnet/minecraft/class_2596;)V METHOD method_14207 handleFall (DZ)V ARG 1 heightDifference @@ -66,7 +66,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_14232 getCameraPosition ()Lnet/minecraft/class_4076; METHOD method_14234 updateLastActionTime ()V METHOD method_14236 getAdvancementTracker ()Lnet/minecraft/class_2985; - METHOD method_14237 incrementContainerSyncId ()V + METHOD method_14237 incrementScreenHandlerSyncId ()V METHOD method_14238 getClientChatVisibility ()Lnet/minecraft/class_1659; METHOD method_14240 onTeleportationDone ()V METHOD method_14242 getCameraEntity ()Lnet/minecraft/class_1297; diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping index d6d088fbc9..4db06c95c7 100644 --- a/mappings/net/minecraft/util/registry/Registry.mapping +++ b/mappings/net/minecraft/util/registry/Registry.mapping @@ -5,7 +5,7 @@ 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 CONTAINER 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