diff --git a/mappings/net/minecraft/client/gl/GlBuffer.mapping b/mappings/net/minecraft/client/gl/GlBuffer.mapping
index a1f4ff9085..cc18df6fb0 100644
--- a/mappings/net/minecraft/client/gl/GlBuffer.mapping
+++ b/mappings/net/minecraft/client/gl/GlBuffer.mapping
@@ -6,6 +6,7 @@ CLASS cty net/minecraft/client/gl/GlBuffer
 		ARG 1 format
 	METHOD a bind ()V
 	METHOD a draw (I)V
+		ARG 1 mode
 	METHOD a set (Ljava/nio/ByteBuffer;)V
 		ARG 1 buffer
 	METHOD b unbind ()V
diff --git a/mappings/net/minecraft/client/gl/GlFramebuffer.mapping b/mappings/net/minecraft/client/gl/GlFramebuffer.mapping
index 46ce1d7e3d..da57c8bb8f 100644
--- a/mappings/net/minecraft/client/gl/GlFramebuffer.mapping
+++ b/mappings/net/minecraft/client/gl/GlFramebuffer.mapping
@@ -12,21 +12,31 @@ CLASS csx net/minecraft/client/gl/GlFramebuffer
 	METHOD <init> (IIZZ)V
 		ARG 1 width
 		ARG 2 height
+		ARG 3 useDepth
+		ARG 4 getError
 	METHOD a delete ()V
 	METHOD a setClearColor (FFFF)V
 		ARG 1 r
 		ARG 2 g
 		ARG 3 b
+		ARG 4 a
 	METHOD a setTexFilter (I)V
 	METHOD a draw (II)V
 		ARG 1 width
+		ARG 2 height
 	METHOD a resize (IIZ)V
 		ARG 1 width
+		ARG 2 height
+		ARG 3 getError
 	METHOD a beginWrite (Z)V
+		ARG 1 setViewport
 	METHOD b checkFramebufferStatus ()V
 	METHOD b initFbo (IIZ)V
 		ARG 1 width
+		ARG 2 height
+		ARG 3 getError
 	METHOD b clear (Z)V
+		ARG 1 getError
 	METHOD c beginRead ()V
 	METHOD c draw (IIZ)V
 		ARG 1 width
diff --git a/mappings/net/minecraft/client/gl/GlShader.mapping b/mappings/net/minecraft/client/gl/GlShader.mapping
index c63647f589..1df4b4311f 100644
--- a/mappings/net/minecraft/client/gl/GlShader.mapping
+++ b/mappings/net/minecraft/client/gl/GlShader.mapping
@@ -17,6 +17,11 @@ CLASS ctr net/minecraft/client/gl/GlShader
 	METHOD <init> (Lctr$a;ILjava/lang/String;)V
 		ARG 1 shaderType
 		ARG 2 shaderRef
+		ARG 3 name
+	METHOD a release ()V
 	METHOD a attachTo (Lctq;)V
 	METHOD a createFromResource (Lctr$a;Ljava/lang/String;Ljava/io/InputStream;)Lctr;
+		ARG 0 type
+		ARG 1 name
+		ARG 2 sourceCode
 	METHOD b getName ()Ljava/lang/String;
diff --git a/mappings/net/minecraft/client/gl/JsonGlProgram.mapping b/mappings/net/minecraft/client/gl/JsonGlProgram.mapping
index 6b3127f19a..b10973c832 100644
--- a/mappings/net/minecraft/client/gl/JsonGlProgram.mapping
+++ b/mappings/net/minecraft/client/gl/JsonGlProgram.mapping
@@ -25,6 +25,7 @@ CLASS djm net/minecraft/client/gl/JsonGlProgram
 	METHOD a deserializeBlendState (Lcom/google/gson/JsonObject;)Lctp;
 		ARG 0 json
 	METHOD a getUniformByName (Ljava/lang/String;)Lctt;
+		ARG 1 name
 	METHOD a bindSampler (Ljava/lang/String;Ljava/lang/Object;)V
 		ARG 1 samplerName
 	METHOD a getShader (Lxc;Lctr$a;Ljava/lang/String;)Lctr;
@@ -33,6 +34,7 @@ CLASS djm net/minecraft/client/gl/JsonGlProgram
 		ARG 2 name
 	METHOD b addUniform (Lcom/google/gson/JsonElement;)V
 	METHOD b getUniformByNameOrDummy (Ljava/lang/String;)Lcto;
+		ARG 1 name
 	METHOD e disable ()V
 	METHOD f enable ()V
 	METHOD h finalizeUniformsAndSamplers ()V
diff --git a/mappings/net/minecraft/client/gl/PostProcessShader.mapping b/mappings/net/minecraft/client/gl/PostProcessShader.mapping
index efc7ceb9f4..dac07bceb9 100644
--- a/mappings/net/minecraft/client/gl/PostProcessShader.mapping
+++ b/mappings/net/minecraft/client/gl/PostProcessShader.mapping
@@ -2,6 +2,10 @@ CLASS dka net/minecraft/client/gl/PostProcessShader
 	FIELD a input Lcsx;
 	FIELD b output Lcsx;
 	FIELD c program Ldjm;
+	FIELD d samplerValues Ljava/util/List;
+	FIELD e samplerNames Ljava/util/List;
+	FIELD f samplerWidths Ljava/util/List;
+	FIELD g samplerHeights Ljava/util/List;
 	FIELD h projectionMatrix Lcuc;
 	METHOD <init> (Lxc;Ljava/lang/String;Lcsx;Lcsx;)V
 		ARG 1 resourceManager
@@ -13,4 +17,8 @@ CLASS dka net/minecraft/client/gl/PostProcessShader
 	METHOD a setProjectionMatrix (Lcuc;)V
 		ARG 1 projectionMatrix
 	METHOD a addAuxTarget (Ljava/lang/String;Ljava/lang/Object;II)V
+		ARG 1 name
+		ARG 2 target
+		ARG 3 width
+		ARG 4 height
 	METHOD b getProgram ()Ldjm;
diff --git a/mappings/net/minecraft/client/gui/AbstractCommandBlockScreen.mapping b/mappings/net/minecraft/client/gui/AbstractCommandBlockScreen.mapping
index 1bb8f63e25..55d30bf388 100644
--- a/mappings/net/minecraft/client/gui/AbstractCommandBlockScreen.mapping
+++ b/mappings/net/minecraft/client/gui/AbstractCommandBlockScreen.mapping
@@ -14,4 +14,6 @@ CLASS czs net/minecraft/client/gui/AbstractCommandBlockScreen
 		ARG 1 command
 	METHOD b onCommandChanged (Ljava/lang/String;)V
 	METHOD c updateTrackedOutput ()V
+	METHOD d commitAndClose ()V
+	METHOD e cancelAndClose ()V
 	METHOD f updateCommand ()V
diff --git a/mappings/net/minecraft/client/gui/ContainerScreen.mapping b/mappings/net/minecraft/client/gui/ContainerScreen.mapping
index ce3dcbfb67..bece6816de 100644
--- a/mappings/net/minecraft/client/gui/ContainerScreen.mapping
+++ b/mappings/net/minecraft/client/gui/ContainerScreen.mapping
@@ -1,5 +1,7 @@
 CLASS czt net/minecraft/client/gui/ContainerScreen
 	FIELD A lastClickedButton I
+	FIELD B isDoubleClicking Z
+	FIELD C quickMovingStack Lbbp;
 	FIELD a BACKGROUND_TEXTURE Lqr;
 	FIELD b containerWidth I
 	FIELD c containerHeight I
@@ -22,6 +24,8 @@ CLASS czt net/minecraft/client/gui/ContainerScreen
 	FIELD t touchDropTimer J
 	FIELD u heldButtonType I
 	FIELD v heldButtonCode I
+	FIELD w cancelNextRelease Z
+	FIELD x draggedStackRemainder I
 	FIELD y lastButtonClickTime J
 	FIELD z lastClickedSlot Lazd;
 	METHOD <init> (Laxq;Lavl;Ljm;)V
diff --git a/mappings/net/minecraft/client/gui/ContainerScreenRegistry.mapping b/mappings/net/minecraft/client/gui/ContainerScreenRegistry.mapping
index 1591edb8b4..faedece777 100644
--- a/mappings/net/minecraft/client/gui/ContainerScreenRegistry.mapping
+++ b/mappings/net/minecraft/client/gui/ContainerScreenRegistry.mapping
@@ -12,6 +12,7 @@ CLASS cyr net/minecraft/client/gui/ContainerScreenRegistry
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD b GUI_FACTORIES Ljava/util/Map;
 	METHOD a checkData ()Z
+	METHOD a getFactory (Layr;)Lcyr$a;
 	METHOD a openScreen (Layr;Lcus;ILjm;)V
 		ARG 0 containerType
 		ARG 1 client
diff --git a/mappings/net/minecraft/client/gui/CubeMapRenderer.mapping b/mappings/net/minecraft/client/gui/CubeMapRenderer.mapping
index e920463e42..6d5b1ab9ad 100644
--- a/mappings/net/minecraft/client/gui/CubeMapRenderer.mapping
+++ b/mappings/net/minecraft/client/gui/CubeMapRenderer.mapping
@@ -7,3 +7,4 @@ CLASS djl net/minecraft/client/gui/CubeMapRenderer
 		ARG 2 x
 		ARG 3 y
 		ARG 4 alpha
+	METHOD a loadTexturesAsync (Ldtp;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
diff --git a/mappings/net/minecraft/client/gui/DrawableHelper.mapping b/mappings/net/minecraft/client/gui/DrawableHelper.mapping
index 7de31b22a5..44498e5c2f 100644
--- a/mappings/net/minecraft/client/gui/DrawableHelper.mapping
+++ b/mappings/net/minecraft/client/gui/DrawableHelper.mapping
@@ -9,13 +9,23 @@ CLASS cvm net/minecraft/client/gui/DrawableHelper
 	METHOD blit (IIFFIIFF)V
 		ARG 0 x
 		ARG 1 y
+		ARG 2 u
+		ARG 3 v
 		ARG 4 width
 		ARG 5 height
+		ARG 6 textureWidth
+		ARG 7 textureHeight
 	METHOD blit (IIFFIIIIFF)V
 		ARG 0 x
 		ARG 1 y
+		ARG 2 u
+		ARG 3 v
+		ARG 4 uvWidth
+		ARG 5 uvHeight
 		ARG 6 width
 		ARG 7 height
+		ARG 8 textureWidth
+		ARG 9 textureHeight
 	METHOD blit (IIIIII)V
 		ARG 1 x
 		ARG 2 y
@@ -30,13 +40,19 @@ CLASS cvm net/minecraft/client/gui/DrawableHelper
 		ARG 4 width
 		ARG 5 height
 	METHOD drawCenteredString (Lcvk;Ljava/lang/String;III)V
-		ARG 1 fontRenderer
+		ARG 1 textRenderer
 		ARG 2 str
-		ARG 3 x
+		ARG 3 centerX
+		ARG 4 y
+		ARG 5 color
+	METHOD drawRightAlignedString (Lcvk;Ljava/lang/String;III)V
+		ARG 1 textRenderer
+		ARG 2 str
+		ARG 3 rightX
 		ARG 4 y
 		ARG 5 color
 	METHOD drawString (Lcvk;Ljava/lang/String;III)V
-		ARG 1 fontRenderer
+		ARG 1 textRenderer
 		ARG 2 str
 		ARG 3 x
 		ARG 4 y
diff --git a/mappings/net/minecraft/client/gui/WrittenBookScreen.mapping b/mappings/net/minecraft/client/gui/WrittenBookScreen.mapping
index 0b5e59fdc7..4dcb94e3d6 100644
--- a/mappings/net/minecraft/client/gui/WrittenBookScreen.mapping
+++ b/mappings/net/minecraft/client/gui/WrittenBookScreen.mapping
@@ -21,8 +21,11 @@ CLASS czz net/minecraft/client/gui/WrittenBookScreen
 	FIELD f cachedPageIndex I
 	FIELD g lastPageButton Ldaw;
 	FIELD h nextPageButton Ldaw;
+	FIELD i pageTurnSound Z
 	METHOD <init> (Lczz$a;)V
 		ARG 1 pageProvider
+	METHOD <init> (Lczz$a;Z)V
+		ARG 2 playPageTurnSound
 	METHOD a getPageCount ()I
 	METHOD a getLineAt (DD)Ljm;
 		ARG 1 x
diff --git a/mappings/net/minecraft/client/gui/widget/BookPageButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/BookPageButtonWidget.mapping
index 621ac95697..7b55efaebc 100644
--- a/mappings/net/minecraft/client/gui/widget/BookPageButtonWidget.mapping
+++ b/mappings/net/minecraft/client/gui/widget/BookPageButtonWidget.mapping
@@ -1,5 +1,7 @@
 CLASS daw net/minecraft/client/gui/widget/BookPageButtonWidget
 	FIELD a isNextPageButton Z
+	FIELD b playPageTurnSound Z
 	METHOD <init> (IIZLcvx$a;Z)V
 		ARG 1 x
 		ARG 2 y
+		ARG 5 playPageTurnSound
diff --git a/mappings/net/minecraft/client/texture/AsyncTexture.mapping b/mappings/net/minecraft/client/texture/AsyncTexture.mapping
index 233050a988..694cb9f3f7 100644
--- a/mappings/net/minecraft/client/texture/AsyncTexture.mapping
+++ b/mappings/net/minecraft/client/texture/AsyncTexture.mapping
@@ -1,2 +1,3 @@
 CLASS dtj net/minecraft/client/texture/AsyncTexture
 	FIELD g future Ljava/util/concurrent/CompletableFuture;
+	METHOD a getLoadCompleteFuture ()Ljava/util/concurrent/CompletableFuture;
diff --git a/mappings/net/minecraft/client/texture/TextureManager.mapping b/mappings/net/minecraft/client/texture/TextureManager.mapping
index c5a6c6e097..a1b51eaa6c 100644
--- a/mappings/net/minecraft/client/texture/TextureManager.mapping
+++ b/mappings/net/minecraft/client/texture/TextureManager.mapping
@@ -11,5 +11,6 @@ CLASS dtp net/minecraft/client/texture/TextureManager
 		ARG 1 id
 	METHOD a registerTextureUpdateable (Lqr;Ldts;)Z
 		ARG 1 id
+	METHOD a loadTextureAsync (Lqr;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
 	METHOD b getTexture (Lqr;)Ldtq;
 	METHOD c destroyTexture (Lqr;)V
diff --git a/mappings/net/minecraft/client/util/math/Matrix4f.mapping b/mappings/net/minecraft/client/util/math/Matrix4f.mapping
index 409fb42122..59b2252aba 100644
--- a/mappings/net/minecraft/client/util/math/Matrix4f.mapping
+++ b/mappings/net/minecraft/client/util/math/Matrix4f.mapping
@@ -1,5 +1,10 @@
 CLASS cuc net/minecraft/client/util/math/Matrix4f
 	FIELD a components [F
+	METHOD a projectionMatrix (FFFF)Lcuc;
+		ARG 0 viewportWidth
+		ARG 1 viewportHeight
+		ARG 2 nearPlane
+		ARG 3 farPlane
 	METHOD a set (IIF)V
 		ARG 1 row
 		ARG 2 col