diff --git a/mappings/net/minecraft/client/gui/ContainerScreen.mapping b/mappings/net/minecraft/client/gui/ContainerScreen.mapping
index 943550084e..86b673f62c 100644
--- a/mappings/net/minecraft/client/gui/ContainerScreen.mapping
+++ b/mappings/net/minecraft/client/gui/ContainerScreen.mapping
@@ -29,12 +29,15 @@ CLASS dal net/minecraft/client/gui/ContainerScreen
 	FIELD y lastButtonClickTime J
 	FIELD z lastClickedSlot Lazo;
 	METHOD <init> (Layb;Lavw;Ljm;)V
+		ARG 1 container
+		ARG 2 playerInventory
 		ARG 3 name
 	METHOD a isClickOutsideBounds (DDIII)Z
 		ARG 1 mouseX
 		ARG 3 mouseY
 		ARG 5 left
 		ARG 6 top
+		ARG 7 button
 	METHOD a drawBackground (FII)V
 		ARG 1 delta
 		ARG 2 mouseX
diff --git a/mappings/net/minecraft/client/gui/DrawableHelper.mapping b/mappings/net/minecraft/client/gui/DrawableHelper.mapping
index deb2048dbe..edd1c2e32f 100644
--- a/mappings/net/minecraft/client/gui/DrawableHelper.mapping
+++ b/mappings/net/minecraft/client/gui/DrawableHelper.mapping
@@ -1,4 +1,34 @@
 CLASS cwc net/minecraft/client/gui/DrawableHelper
+	METHOD blit (IIFFIIII)V
+		ARG 0 x
+		ARG 1 y
+		ARG 2 u
+		ARG 3 v
+		ARG 4 width
+		ARG 5 height
+		ARG 6 texWidth
+		ARG 7 texHeight
+	METHOD blit (IIIFFIIII)V
+		ARG 0 x
+		ARG 1 y
+		ARG 2 z
+		ARG 3 u
+		ARG 4 v
+		ARG 5 width
+		ARG 6 height
+		ARG 7 texHeight
+		ARG 8 texWidth
+	METHOD blit (IIIIFFIIII)V
+		ARG 0 x
+		ARG 1 y
+		ARG 2 width
+		ARG 3 height
+		ARG 4 u
+		ARG 5 v
+		ARG 6 uWidth
+		ARG 7 vHeight
+		ARG 8 texWidth
+		ARG 9 texHeight
 	METHOD blit (IIIIII)V
 		ARG 1 x
 		ARG 2 y
@@ -6,6 +36,13 @@ CLASS cwc net/minecraft/client/gui/DrawableHelper
 		ARG 4 v
 		ARG 5 width
 		ARG 6 height
+	METHOD blit (IIIIILdug;)V
+		ARG 0 x
+		ARG 1 y
+		ARG 2 z
+		ARG 3 width
+		ARG 4 height
+		ARG 5 sprite
 	METHOD drawCenteredString (Lcwa;Ljava/lang/String;III)V
 		ARG 1 textRenderer
 		ARG 2 str
@@ -37,3 +74,35 @@ CLASS cwc net/minecraft/client/gui/DrawableHelper
 		ARG 4 bottom
 		ARG 5 color1
 		ARG 6 color2
+	METHOD hLine (IIII)V
+		ARG 1 xStart
+		ARG 2 xEnd
+		ARG 3 y
+		ARG 4 color
+	METHOD innerBlit (IIIIIFFFF)V
+		ARG 0 xStart
+		ARG 1 xEnd
+		ARG 2 yStart
+		ARG 3 yEnd
+		ARG 4 z
+		ARG 5 uStart
+		ARG 6 uEnd
+		ARG 7 vStart
+		ARG 8 vEnd
+	METHOD innerBlit (IIIIIIIFFII)V
+		ARG 0 xStart
+		ARG 1 xEnd
+		ARG 2 yStart
+		ARG 3 yEnd
+		ARG 4 z
+		ARG 5 width
+		ARG 6 height
+		ARG 7 u
+		ARG 8 v
+		ARG 9 texWidth
+		ARG 10 texHeight
+	METHOD vLine (IIII)V
+		ARG 1 x
+		ARG 2 yStart
+		ARG 3 yEnd
+		ARG 4 color
diff --git a/mappings/net/minecraft/client/gui/ParentElement.mapping b/mappings/net/minecraft/client/gui/ParentElement.mapping
index 927dc5120b..4be0813d32 100644
--- a/mappings/net/minecraft/client/gui/ParentElement.mapping
+++ b/mappings/net/minecraft/client/gui/ParentElement.mapping
@@ -1,4 +1,11 @@
 CLASS cxj net/minecraft/client/gui/ParentElement
+	METHOD a hoveredElement (DD)Ljava/util/Optional;
+		ARG 1 mouseX
+		ARG 3 mouseY
+	METHOD a setInitialFocus (Lcxk;)V
+		ARG 1 element
+	METHOD b focusOn (Lcxk;)V
+		ARG 1 element
 	METHOD charTyped (CI)Z
 		ARG 1 chr
 		ARG 2 keyCode
diff --git a/mappings/net/minecraft/client/gui/Screen.mapping b/mappings/net/minecraft/client/gui/Screen.mapping
index a96517e848..ff9908ea97 100644
--- a/mappings/net/minecraft/client/gui/Screen.mapping
+++ b/mappings/net/minecraft/client/gui/Screen.mapping
@@ -1,10 +1,18 @@
 CLASS czr net/minecraft/client/gui/Screen
+	METHOD <init> (Ljm;)V
+		ARG 1 title
 	METHOD addButton (Lcwm;)Lcwm;
 		ARG 1 button
+	METHOD confirmLink (Z)V
+		ARG 1 open
+	METHOD getTooltipFromItem (Lbca;)Ljava/util/List;
+		ARG 1 stack
 	METHOD init (Lcvi;II)V
 		ARG 1 client
 		ARG 2 width
 		ARG 3 height
+	METHOD insertText (Ljava/lang/String;Z)V
+		ARG 1 text
 	METHOD isCopy (I)Z
 		ARG 0 code
 	METHOD isCut (I)Z
@@ -16,10 +24,16 @@ CLASS czr net/minecraft/client/gui/Screen
 		ARG 0 code
 	METHOD isSelectAll (I)Z
 		ARG 0 code
+	METHOD isValidCharacterForName (Ljava/lang/String;CI)Z
+		ARG 1 name
+		ARG 2 character
+		ARG 3 cursorPos
 	METHOD keyPressed (III)Z
 		ARG 1 keyCode
 		ARG 2 scanCode
 		ARG 3 modifiers
+	METHOD openLink (Ljava/net/URI;)V
+		ARG 1 link
 	METHOD render (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
@@ -48,5 +62,15 @@ CLASS czr net/minecraft/client/gui/Screen
 		ARG 1 client
 		ARG 2 width
 		ARG 3 height
+	METHOD sendMessage (Ljava/lang/String;)V
+		ARG 1 message
 	METHOD sendMessage (Ljava/lang/String;Z)V
 		ARG 1 message
+		ARG 2 toHud
+	METHOD setSize (II)V
+		ARG 1 width
+		ARG 2 height
+	METHOD wrapScreenError (Ljava/lang/Runnable;Ljava/lang/String;Ljava/lang/String;)V
+		ARG 0 task
+		ARG 1 errorTitle
+		ARG 2 screenName