FabricMC · modmuss50 · Mar 8, 2020 · Feb 9, 2020 · Feb 9, 2020 · Mar 1, 2020
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 <init> (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
@@ -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 <init> (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
@@ -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 <init> (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
@@ -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 <init> (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
@@ -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 <init> (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
diff --git 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 <init> (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
@@ -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
@@ -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 <init> (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
@@ -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 <init> (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
@@ -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 <init> (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
@@ -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 <init> (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
@@ -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 <init> (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
@@ -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 <init> (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
@@ -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 <init> (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
@@ -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 <init> (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
@@ -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 <init> (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
@@ -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/...gui/screen/ingame/ContainerScreen.mapping → ...i/screen/ingame/ScreenWithHandler.mapping b/...gui/screen/ingame/ContainerScreen.mapping → ...i/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,21 +16,21 @@ 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
 	FIELD field_2801 BACKGROUND_TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_2802 touchDropOriginSlot Lnet/minecraft/class_1735;
 	FIELD field_2803 draggedStackRemainder I
 	METHOD <init> (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
@@ -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 <init> (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
@@ -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 <init> (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
@@ -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
@@ -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/...ient/recipe/book/ClientRecipeBook.mapping → ...lient/recipebook/ClientRecipeBook.mapping b/...ient/recipe/book/ClientRecipeBook.mapping → ...lient/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/...lient/recipe/book/RecipeBookGroup.mapping → ...client/recipebook/RecipeBookGroup.mapping b/...lient/recipe/book/RecipeBookGroup.mapping → ...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 <init> (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
diff --git a/mappings/net/minecraft/container/NameableContainerFactory.mapping b/mappings/net/minecraft/container/NameableContainerFactory.mapping
diff --git a/mappings/net/minecraft/container/ShulkerBoxSlot.mapping b/mappings/net/minecraft/container/ShulkerBoxSlot.mapping
diff --git a/mappings/net/minecraft/container/SlotActionType.mapping b/mappings/net/minecraft/container/SlotActionType.mapping
diff --git 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
@@ -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
@@ -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 <init> (Lnet/minecraft/class_1703;II)V
-		ARG 1 container
+		ARG 1 handler
 		ARG 2 width
 		ARG 3 height
 	METHOD method_17397 getHeight ()I