23w31a client gui

FabricMC · Aug 5, 2023 · 79ab389 · 79ab389
1 parent f44d331
commit 79ab389
Show file tree

Hide file tree

Showing 42 changed files with 366 additions and 16 deletions.
diff --git a/mappings/net/minecraft/client/gui/Element.mapping b/mappings/net/minecraft/client/gui/Element.mapping
@@ -56,8 +56,10 @@ CLASS net/minecraft/class_364 net/minecraft/client/gui/Element
 			COMMENT the X coordinate of the mouse
 		ARG 3 mouseY
 			COMMENT the Y coordinate of the mouse
-		ARG 5 amount
-			COMMENT value is {@code < 0} if scrolled down, {@code > 0} if scrolled up
+		ARG 5 horizontalAmount
+			COMMENT the horizontal scroll amount
+		ARG 7 verticalAmount
+			COMMENT the vertical scroll amount
 	METHOD method_25402 mouseClicked (DDI)Z
 		COMMENT Callback for when a mouse button down event
 		COMMENT has been captured.

diff --git a/mappings/net/minecraft/client/gui/ParentElement.mapping b/mappings/net/minecraft/client/gui/ParentElement.mapping
@@ -4,6 +4,8 @@ CLASS net/minecraft/class_4069 net/minecraft/client/gui/ParentElement
 	METHOD method_19355 hoveredElement (DD)Ljava/util/Optional;
 		ARG 1 mouseX
 		ARG 3 mouseY
+	METHOD method_20082 (DDDDLnet/minecraft/class_364;)Z
+		ARG 8 element
 	METHOD method_20083 (DDILnet/minecraft/class_364;)Z
 		ARG 5 element
 	METHOD method_20086 focusOn (Lnet/minecraft/class_364;)V

diff --git a/mappings/net/minecraft/client/gui/PlayerSkinDrawer.mapping b/mappings/net/minecraft/client/gui/PlayerSkinDrawer.mapping
@@ -31,3 +31,9 @@ CLASS net/minecraft/class_7532 net/minecraft/client/gui/PlayerSkinDrawer
 		ARG 4 size
 		ARG 5 hatVisible
 		ARG 6 upsideDown
+	METHOD method_52722 draw (Lnet/minecraft/class_332;Lnet/minecraft/class_8685;III)V
+		ARG 0 context
+		ARG 1 textures
+		ARG 2 x
+		ARG 3 y
+		ARG 4 size
diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping
@@ -139,6 +139,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud
 		ARG 1 context
 		ARG 2 x
 		ARG 3 y
+		ARG 4 tickDelta
 		ARG 5 player
 		ARG 6 stack
 		ARG 7 seed

diff --git a/mappings/net/minecraft/client/gui/hud/MessageIndicator.mapping b/mappings/net/minecraft/client/gui/hud/MessageIndicator.mapping
@@ -19,8 +19,8 @@ CLASS net/minecraft/class_7591 net/minecraft/client/gui/hud/MessageIndicator
 		FIELD field_45292 texture Lnet/minecraft/class_2960;
 		METHOD <init> (Ljava/lang/String;ILnet/minecraft/class_2960;II)V
 			ARG 3 texture
-			ARG 4 v
-			ARG 5 width
+			ARG 4 width
+			ARG 5 height
 		METHOD method_44712 draw (Lnet/minecraft/class_332;II)V
 			ARG 1 context
 			ARG 2 x

diff --git a/mappings/net/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu.mapping b/mappings/net/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu.mapping
@@ -11,10 +11,11 @@ CLASS net/minecraft/class_540 net/minecraft/client/gui/hud/spectator/TeamTelepor
 	CLASS class_541 TeleportToSpecificTeamCommand
 		FIELD field_3274 scoreboardEntries Ljava/util/List;
 		FIELD field_3275 team Lnet/minecraft/class_268;
-		FIELD field_41115 skinId Ljava/util/function/Supplier;
+		FIELD field_41115 skinTexturesSupplier Ljava/util/function/Supplier;
 		METHOD <init> (Lnet/minecraft/class_268;Ljava/util/List;Ljava/util/function/Supplier;)V
 			ARG 1 team
 			ARG 2 scoreboardEntries
+			ARG 3 skinTexturesSupplier
 		METHOD method_47433 create (Lnet/minecraft/class_310;Lnet/minecraft/class_268;)Ljava/util/Optional;
 			ARG 0 client
 			ARG 1 team
diff --git a/...s/net/minecraft/client/gui/hud/spectator/TeleportToSpecificPlayerSpectatorCommand.mapping b/...s/net/minecraft/client/gui/hud/spectator/TeleportToSpecificPlayerSpectatorCommand.mapping
@@ -1,5 +1,6 @@
 CLASS net/minecraft/class_530 net/minecraft/client/gui/hud/spectator/TeleportToSpecificPlayerSpectatorCommand
 	FIELD field_26611 name Lnet/minecraft/class_2561;
 	FIELD field_3253 gameProfile Lcom/mojang/authlib/GameProfile;
+	FIELD field_45578 skinTexturesSupplier Ljava/util/function/Supplier;
 	METHOD <init> (Lcom/mojang/authlib/GameProfile;)V
 		ARG 1 gameProfile
diff --git a/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingButtons.mapping b/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingButtons.mapping
@@ -1,3 +1,9 @@
 CLASS net/minecraft/class_8082 net/minecraft/client/gui/screen/AccessibilityOnboardingButtons
 	METHOD method_48592 createLanguageButton (ILnet/minecraft/class_4185$class_4241;Z)Lnet/minecraft/class_8662;
+		ARG 0 width
+		ARG 1 onPress
+		ARG 2 hideText
 	METHOD method_48594 createAccessibilityButton (ILnet/minecraft/class_4185$class_4241;Z)Lnet/minecraft/class_8662;
+		ARG 0 width
+		ARG 1 onPress
+		ARG 2 hideText
diff --git a/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping b/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping
@@ -19,3 +19,5 @@ CLASS net/minecraft/class_8032 net/minecraft/client/gui/screen/AccessibilityOnbo
 		ARG 1 button
 	METHOD method_49298 (Lnet/minecraft/class_4185;)V
 		ARG 1 button
+	METHOD method_52746 (Lnet/minecraft/class_7847;)V
+		ARG 0 positioner
diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping
@@ -51,11 +51,13 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen
 	METHOD method_25420 renderBackground (Lnet/minecraft/class_332;IIF)V
 		COMMENT Renders the background of this screen.
 		COMMENT
-		COMMENT <p>If the client is in a world, renders the translucent background gradient.
+		COMMENT <p>If the client is in a world, {@linkplain #renderIngameBackground
+		COMMENT renders the translucent background gradient}.
 		COMMENT Otherwise {@linkplain #renderBackgroundTexture renders the background texture}.
 		ARG 1 context
-		ARG 2 x
-		ARG 3 y
+		ARG 2 mouseX
+		ARG 3 mouseY
+		ARG 4 delta
 	METHOD method_25421 shouldPause ()Z
 	METHOD method_25422 shouldCloseOnEsc ()Z
 		COMMENT Checks whether this screen should be closed when the escape key is pressed.
@@ -163,7 +165,8 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen
 		COMMENT Called when the screen is displayed using {@link MinecraftClient#setScreen}
 		COMMENT before {@link #init()} or {@link #initTabNavigation()} is called.
 	METHOD method_50024 getMusic ()Lnet/minecraft/class_5195;
-	METHOD method_52752 (Lnet/minecraft/class_332;)V
+	METHOD method_52752 renderInGameBackground (Lnet/minecraft/class_332;)V
+		COMMENT Renders the translucent background gradient used as the in-game screen background.
 		ARG 1 context
 	CLASS class_6390 SelectedElementNarrationData
 		FIELD field_33825 selectable Lnet/minecraft/class_6379;

diff --git a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping
@@ -59,6 +59,7 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen
 		FIELD field_18758 comparator Ljava/util/Comparator;
 		FIELD field_18759 selectedStatType Lnet/minecraft/class_3448;
 		FIELD field_18760 listOrder I
+		FIELD field_45422 headerIconTextures [Lnet/minecraft/class_2960;
 		METHOD <init> (Lnet/minecraft/class_447;Lnet/minecraft/class_310;)V
 			ARG 2 client
 		METHOD method_19406 getText (Lnet/minecraft/class_1792;)Lnet/minecraft/class_2561;
@@ -78,6 +79,7 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen
 			METHOD <init> (Lnet/minecraft/class_447$class_4200;Lnet/minecraft/class_1792;)V
 				ARG 2 item
 			METHOD method_19405 render (Lnet/minecraft/class_332;Lnet/minecraft/class_3445;IIZ)V
+				ARG 1 context
 				ARG 2 stat
 				ARG 3 x
 				ARG 4 y

diff --git a/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping
@@ -9,8 +9,13 @@ CLASS net/minecraft/class_490 net/minecraft/client/gui/screen/ingame/InventorySc
 	METHOD method_19891 (Lnet/minecraft/class_4185;)V
 		ARG 1 button
 	METHOD method_2486 drawEntity (Lnet/minecraft/class_332;IIIIIFFFLnet/minecraft/class_1309;)V
+		ARG 0 context
 		ARG 1 x
 		ARG 2 y
+		ARG 7 mouseX
+		ARG 8 mouseY
+		ARG 9 entity
 	METHOD method_48472 drawEntity (Lnet/minecraft/class_332;FFILorg/joml/Vector3f;Lorg/joml/Quaternionf;Lorg/joml/Quaternionf;Lnet/minecraft/class_1309;)V
 		ARG 0 context
 		ARG 3 size
+		ARG 7 entity
diff --git a/...gs/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping b/...gs/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping
@@ -38,6 +38,8 @@ CLASS net/minecraft/class_5521 net/minecraft/client/gui/screen/multiplayer/Socia
 		ARG 2 includeOffline
 	METHOD method_44760 (Lnet/minecraft/class_5519;)Ljava/lang/Integer;
 		ARG 0 player
+	METHOD method_44761 (Lnet/minecraft/class_5519;)Ljava/lang/Integer;
+		ARG 1 player
 	METHOD method_44762 sortPlayers ()V
 	METHOD method_45665 collectReportableProfiles (Lnet/minecraft/class_7555;)Ljava/util/Collection;
 		ARG 0 log
diff --git a/mappings/net/minecraft/client/gui/screen/option/TelemetryEventWidget.mapping b/mappings/net/minecraft/client/gui/screen/option/TelemetryEventWidget.mapping
@@ -33,6 +33,7 @@ CLASS net/minecraft/class_7941 net/minecraft/client/gui/screen/option/TelemetryE
 	CLASS class_7943 ContentsBuilder
 		FIELD field_41362 gridWidth I
 		FIELD field_41366 narration Lnet/minecraft/class_5250;
+		FIELD field_45566 layout Lnet/minecraft/class_8667;
 		METHOD <init> (I)V
 			ARG 1 gridWidth
 		METHOD method_47641 build ()Lnet/minecraft/class_7941$class_7942;

diff --git a/mappings/net/minecraft/client/gui/screen/option/TelemetryInfoScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/TelemetryInfoScreen.mapping
@@ -8,6 +8,7 @@ CLASS net/minecraft/class_7944 net/minecraft/client/gui/screen/option/TelemetryI
 	FIELD field_41374 options Lnet/minecraft/class_315;
 	FIELD field_41375 telemetryEventWidget Lnet/minecraft/class_7941;
 	FIELD field_41376 scroll D
+	FIELD field_45567 PRIVACY_STATEMENT_TEXT Lnet/minecraft/class_2561;
 	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V
 		ARG 1 parent
 		ARG 2 options
@@ -29,3 +30,7 @@ CLASS net/minecraft/class_7944 net/minecraft/client/gui/screen/option/TelemetryI
 	METHOD method_47653 createOptInButton ()Lnet/minecraft/class_339;
 	METHOD method_48286 (Lnet/minecraft/class_7944;Lnet/minecraft/class_364;)V
 		ARG 1 child
+	METHOD method_52765 openPrivacyStatementPage (Lnet/minecraft/class_4185;)V
+		ARG 1 button
+	METHOD method_52766 (Z)V
+		ARG 1 confirmed
diff --git a/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping b/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping
@@ -48,6 +48,8 @@ CLASS net/minecraft/class_5375 net/minecraft/client/gui/screen/pack/PackScreen
 	METHOD method_48277 switchFocusedList (Lnet/minecraft/class_521;)V
 		ARG 1 listWidget
 	METHOD method_48278 clearSelection ()V
+	METHOD method_52760 streamFileNames (Ljava/util/Collection;)Ljava/util/stream/Stream;
+		ARG 0 paths
 	CLASS class_5426 DirectoryWatcher
 		FIELD field_25790 watchService Ljava/nio/file/WatchService;
 		FIELD field_25791 path Ljava/nio/file/Path;

diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/AbstractFurnaceRecipeBookScreen.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/AbstractFurnaceRecipeBookScreen.mapping
@@ -1,5 +1,6 @@
 CLASS net/minecraft/class_517 net/minecraft/client/gui/screen/recipebook/AbstractFurnaceRecipeBookScreen
 	FIELD field_3149 fuels Lnet/minecraft/class_1856;
+	FIELD field_45540 TEXTURES Lnet/minecraft/class_8666;
 	METHOD method_17065 getAllowedFuels ()Ljava/util/Set;
 	METHOD method_49301 (Lnet/minecraft/class_1792;)Z
 		ARG 1 item
diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookResults.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookResults.mapping
@@ -12,6 +12,8 @@ CLASS net/minecraft/class_513 net/minecraft/client/gui/screen/recipebook/RecipeB
 	FIELD field_3134 recipeDisplayListeners Ljava/util/List;
 	FIELD field_3135 currentPage I
 	FIELD field_3136 recipeBook Lnet/minecraft/class_3439;
+	FIELD field_45552 PAGE_FORWARD_TEXTURES Lnet/minecraft/class_8666;
+	FIELD field_45553 PAGE_BACKWARD_TEXTURES Lnet/minecraft/class_8666;
 	METHOD method_2625 refreshResultButtons ()V
 	METHOD method_2626 hideShowPageButtons ()V
 	METHOD method_2627 setResults (Ljava/util/List;Z)V

diff --git a/mappings/net/minecraft/client/gui/screen/report/ChatSelectionScreen.mapping b/mappings/net/minecraft/client/gui/screen/report/ChatSelectionScreen.mapping
@@ -86,7 +86,7 @@ CLASS net/minecraft/class_7543 net/minecraft/client/gui/screen/report/ChatSelect
 		CLASS class_7549 SenderEntry
 			FIELD field_39607 PLAYER_SKIN_SIZE I
 			FIELD field_39608 headingText Lnet/minecraft/class_2561;
-			FIELD field_39609 skinTextureId Ljava/util/function/Supplier;
+			FIELD field_39609 skinTexturesSupplier Ljava/util/function/Supplier;
 			FIELD field_39610 fromReportedPlayer Z
 			METHOD <init> (Lnet/minecraft/class_7543$class_7544;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_2561;Z)V
 				ARG 2 gameProfile

diff --git a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping
@@ -17,6 +17,7 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS
 	FIELD field_43081 HEADER_SEPARATOR_TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_43082 FOOTER_SEPARATOR_TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_44672 LIGHT_DIRT_BACKGROUND_TEXTURE Lnet/minecraft/class_2960;
+	FIELD field_45568 symlinkFinder Lnet/minecraft/class_8580;
 	METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_437;Lnet/minecraft/class_7193;Ljava/util/Optional;Ljava/util/OptionalLong;)V
 		ARG 1 client
 		ARG 2 parent

diff --git a/mappings/net/minecraft/client/gui/screen/world/SymlinkWarningScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/SymlinkWarningScreen.mapping
@@ -0,0 +1,24 @@
+CLASS net/minecraft/class_8669 net/minecraft/client/gui/screen/world/SymlinkWarningScreen
+	FIELD field_45408 WORLD_TITLE Lnet/minecraft/class_2561;
+	FIELD field_45409 WORLD_MESSAGE Lnet/minecraft/class_2561;
+	FIELD field_45410 PACK_TITLE Lnet/minecraft/class_2561;
+	FIELD field_45411 PACK_MESSAGE Lnet/minecraft/class_2561;
+	FIELD field_45412 message Lnet/minecraft/class_2561;
+	FIELD field_45413 link Ljava/lang/String;
+	FIELD field_45414 parent Lnet/minecraft/class_437;
+	FIELD field_45415 grid Lnet/minecraft/class_7845;
+	METHOD <init> (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Ljava/lang/String;Lnet/minecraft/class_437;)V
+		ARG 1 title
+		ARG 2 message
+		ARG 3 link
+		ARG 4 parent
+	METHOD method_52747 (Lnet/minecraft/class_4185;)V
+		ARG 1 button
+	METHOD method_52748 world (Lnet/minecraft/class_437;)Lnet/minecraft/class_437;
+		ARG 0 parent
+	METHOD method_52749 (Lnet/minecraft/class_4185;)V
+		ARG 1 button
+	METHOD method_52750 pack (Lnet/minecraft/class_437;)Lnet/minecraft/class_437;
+		ARG 0 parent
+	METHOD method_52751 (Lnet/minecraft/class_4185;)V
+		ARG 1 button
diff --git a/mappings/net/minecraft/client/gui/widget/AxisGridWidget.mapping b/mappings/net/minecraft/client/gui/widget/AxisGridWidget.mapping
@@ -21,6 +21,9 @@ CLASS net/minecraft/class_7849 net/minecraft/client/gui/widget/AxisGridWidget
 	METHOD method_46500 getMainPositioner ()Lnet/minecraft/class_7847;
 	METHOD method_48230 (Ljava/util/function/Consumer;Lnet/minecraft/class_7849$class_7850;)V
 		ARG 1 element
+	METHOD method_52731 add (Lnet/minecraft/class_8021;Ljava/util/function/Consumer;)Lnet/minecraft/class_8021;
+		ARG 1 widget
+		ARG 2 callback
 	CLASS class_7850 Element
 	CLASS class_7851 DisplayAxis
 		METHOD method_46502 getSameAxisLength (Lnet/minecraft/class_8021;)I

diff --git a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping
@@ -17,6 +17,12 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget
 	FIELD field_41097 lastHoveredTime J
 	FIELD field_41098 wasHovered Z
 	FIELD field_42116 navigationOrder I
+	METHOD <init> (IIIILnet/minecraft/class_2561;)V
+		ARG 1 x
+		ARG 2 y
+		ARG 3 width
+		ARG 4 height
+		ARG 5 message
 	METHOD method_25348 onClick (DD)V
 		ARG 1 mouseX
 		ARG 3 mouseY

diff --git a/mappings/net/minecraft/client/gui/widget/DirectionalLayoutWidget.mapping b/mappings/net/minecraft/client/gui/widget/DirectionalLayoutWidget.mapping
@@ -0,0 +1,39 @@
+CLASS net/minecraft/class_8667 net/minecraft/client/gui/widget/DirectionalLayoutWidget
+	COMMENT A widget implementing one-directional layout. The elements can be
+	COMMENT positioned either horizontally or vertically.
+	COMMENT
+	COMMENT <p>Use {@link AxisGridWidget} to allow multiple elements per row or column.
+	COMMENT
+	COMMENT @see AxisGridWidget
+	FIELD field_45400 grid Lnet/minecraft/class_7845;
+	FIELD field_45401 axis Lnet/minecraft/class_8667$class_8668;
+	FIELD field_45402 currentIndex I
+	METHOD <init> (IILnet/minecraft/class_8667$class_8668;)V
+		ARG 1 x
+		ARG 2 y
+		ARG 3 axis
+	METHOD <init> (Lnet/minecraft/class_8667$class_8668;)V
+		ARG 1 axis
+	METHOD method_52735 spacing (I)Lnet/minecraft/class_8667;
+		ARG 1 spacing
+	METHOD method_52736 add (Lnet/minecraft/class_8021;)Lnet/minecraft/class_8021;
+		ARG 1 widget
+	METHOD method_52737 add (Lnet/minecraft/class_8021;Lnet/minecraft/class_7847;)Lnet/minecraft/class_8021;
+		ARG 1 widget
+		ARG 2 positioner
+	METHOD method_52738 add (Lnet/minecraft/class_8021;Ljava/util/function/Consumer;)Lnet/minecraft/class_8021;
+		ARG 1 widget
+		ARG 2 callback
+	METHOD method_52739 copyPositioner ()Lnet/minecraft/class_7847;
+	METHOD method_52740 getMainPositioner ()Lnet/minecraft/class_7847;
+	METHOD method_52741 vertical ()Lnet/minecraft/class_8667;
+	METHOD method_52742 horizontal ()Lnet/minecraft/class_8667;
+	CLASS class_8668 DisplayAxis
+		METHOD method_52744 setSpacing (Lnet/minecraft/class_7845;I)V
+			ARG 1 grid
+			ARG 2 spacing
+		METHOD method_52745 add (Lnet/minecraft/class_7845;Lnet/minecraft/class_8021;ILnet/minecraft/class_7847;)Lnet/minecraft/class_8021;
+			ARG 1 grid
+			ARG 2 widget
+			ARG 3 index
+			ARG 4 positioner
diff --git a/mappings/net/minecraft/client/gui/widget/EditBoxWidget.mapping b/mappings/net/minecraft/client/gui/widget/EditBoxWidget.mapping
@@ -12,7 +12,10 @@ CLASS net/minecraft/class_7529 net/minecraft/client/gui/widget/EditBoxWidget
 		COMMENT The placeholder text that gets rendered when the edit box is empty. This does not
 		COMMENT get returned from {@link #getText}; an empty string will be returned in such cases.
 	FIELD field_39509 editBox Lnet/minecraft/class_7530;
+	FIELD field_45363 CURSOR_BLINK_INTERVAL I
+	FIELD field_45364 lastSwitchFocusTime J
 	METHOD <init> (Lnet/minecraft/class_327;IIIILnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V
+		ARG 1 textRenderer
 		ARG 2 x
 		ARG 3 y
 		ARG 4 width

diff --git a/mappings/net/minecraft/client/gui/widget/GridWidget.mapping b/mappings/net/minecraft/client/gui/widget/GridWidget.mapping
@@ -42,6 +42,18 @@ CLASS net/minecraft/class_7845 net/minecraft/client/gui/widget/GridWidget
 		ARG 1 rowSpacing
 	METHOD method_48637 setSpacing (I)Lnet/minecraft/class_7845;
 		ARG 1 spacing
+	METHOD method_52733 add (Lnet/minecraft/class_8021;IIIILjava/util/function/Consumer;)Lnet/minecraft/class_8021;
+		ARG 1 widget
+		ARG 2 row
+		ARG 3 column
+		ARG 4 occupiedBelow
+		ARG 5 occupiedAbove
+		ARG 6 callback
+	METHOD method_52734 add (Lnet/minecraft/class_8021;IILjava/util/function/Consumer;)Lnet/minecraft/class_8021;
+		ARG 1 widget
+		ARG 2 row
+		ARG 3 column
+		ARG 4 callback
 	CLASS class_7846 Element
 		FIELD field_40774 row I
 		FIELD field_40775 column I

diff --git a/mappings/net/minecraft/client/gui/widget/IconWidget.mapping b/mappings/net/minecraft/client/gui/widget/IconWidget.mapping
@@ -4,25 +4,25 @@ CLASS net/minecraft/class_8208 net/minecraft/client/gui/widget/IconWidget
 		ARG 2 y
 		ARG 3 width
 		ARG 4 height
-	METHOD method_52720 (IILnet/minecraft/class_2960;)Lnet/minecraft/class_8208;
+	METHOD method_52720 create (IILnet/minecraft/class_2960;)Lnet/minecraft/class_8208;
 		ARG 0 width
 		ARG 1 height
 		ARG 2 texture
-	METHOD method_52721 (IILnet/minecraft/class_2960;II)Lnet/minecraft/class_8208;
+	METHOD method_52721 create (IILnet/minecraft/class_2960;II)Lnet/minecraft/class_8208;
 		ARG 0 width
 		ARG 1 height
 		ARG 2 texture
 		ARG 3 textureWidth
 		ARG 4 textureHeight
-	CLASS class_8659
+	CLASS class_8659 Simple
 		FIELD field_45357 texture Lnet/minecraft/class_2960;
 		METHOD <init> (IIIILnet/minecraft/class_2960;)V
 			ARG 1 x
 			ARG 2 y
 			ARG 3 width
 			ARG 4 height
 			ARG 5 texture
-	CLASS class_8660
+	CLASS class_8660 Texture
 		FIELD field_45358 texture Lnet/minecraft/class_2960;
 		FIELD field_45359 textureWidth I
 		FIELD field_45360 textureHeight I

diff --git a/mappings/net/minecraft/client/gui/widget/NarratedMultilineTextWidget.mapping b/mappings/net/minecraft/client/gui/widget/NarratedMultilineTextWidget.mapping
@@ -1,5 +1,13 @@
 CLASS net/minecraft/class_8019 net/minecraft/client/gui/widget/NarratedMultilineTextWidget
 	FIELD field_41801 BACKGROUND_COLOR I
 	FIELD field_41802 EXPANSION I
+	FIELD field_45355 alwaysShowBorders Z
+	METHOD <init> (ILnet/minecraft/class_2561;Lnet/minecraft/class_327;)V
+		ARG 1 maxWidth
+		ARG 2 message
+		ARG 3 textRenderer
 	METHOD <init> (ILnet/minecraft/class_2561;Lnet/minecraft/class_327;Z)V
-		ARG 2 text
+		ARG 1 maxWidth
+		ARG 2 message
+		ARG 3 textRenderer
+		ARG 4 alwaysShowBorders
diff --git a/mappings/net/minecraft/client/gui/widget/SimplePositioningWidget.mapping b/mappings/net/minecraft/client/gui/widget/SimplePositioningWidget.mapping
@@ -53,4 +53,7 @@ CLASS net/minecraft/class_7843 net/minecraft/client/gui/widget/SimplePositioning
 		ARG 1 rect
 		ARG 2 relativeX
 		ARG 3 relativeY
+	METHOD method_52732 add (Lnet/minecraft/class_8021;Ljava/util/function/Consumer;)Lnet/minecraft/class_8021;
+		ARG 1 widget
+		ARG 2 callback
 	CLASS class_7844 Element