diff --git a/mappings/coh.mapping b/mappings/coh.mapping
deleted file mode 100644
index 94e35eaca9..0000000000
--- a/mappings/coh.mapping
+++ /dev/null
@@ -1,6 +0,0 @@
-CLASS coh
-	METHOD a onResolutionChanged ()V
-	METHOD a setWindowFocused (Z)V
-		ARG 1 focused
-	METHOD a_ displayUpdate (Z)V
-		ARG 1 limitFps
diff --git a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping
index fd3d5dba60..c4743ab32b 100644
--- a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping
+++ b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping
@@ -159,6 +159,18 @@ CLASS com/mojang/blaze3d/platform/GlStateManager
 	METHOD alphaFunc (IF)V
 		ARG 0 func
 		ARG 1 ref
+	METHOD bindTexture (I)V
+		ARG 0 texture
+	METHOD blendEquation (I)V
+		ARG 0 mode
+	METHOD blendFunc (II)V
+		ARG 0 sfactor
+		ARG 1 dfactor
+	METHOD blendFuncSeparate (IIII)V
+		ARG 0 sFactorRGB
+		ARG 1 dFactorRGB
+		ARG 2 sFactorAlpha
+		ARG 3 dFactorAlpha
 	METHOD color3f (FFF)V
 		ARG 0 red
 		ARG 1 green
@@ -171,11 +183,51 @@ CLASS com/mojang/blaze3d/platform/GlStateManager
 	METHOD colorMaterial (II)V
 		ARG 0 face
 		ARG 1 mode
+	METHOD depthFunc (I)V
+		ARG 0 func
+	METHOD depthMask (Z)V
+		ARG 0 mask
 	METHOD drawArrays (III)V
 		ARG 0 mode
 		ARG 1 first
 		ARG 2 count
 	METHOD fogi fog (II)V
+	METHOD light (IILjava/nio/FloatBuffer;)V
+		ARG 0 light
+		ARG 1 pname
+		ARG 2 params
+	METHOD lightModel (ILjava/nio/FloatBuffer;)V
+		ARG 0 pname
+		ARG 1 params
+	METHOD normal3f (FFF)V
+		ARG 0 nx
+		ARG 1 ny
+		ARG 2 nz
+	METHOD pixelStore (II)V
+		ARG 0 pname
+		ARG 1 param
 	METHOD polygonOffset (FF)V
 		ARG 0 factor
 		ARG 1 units
+	METHOD setupSolidRenderingTextureCombine (I)V
+		ARG 0 color
+	METHOD texImage2D (IIIIIIIILjava/nio/IntBuffer;)V
+		ARG 0 target
+		ARG 1 level
+		ARG 2 internalFormat
+		ARG 3 width
+		ARG 4 height
+		ARG 5 border
+		ARG 6 format
+		ARG 7 type
+		ARG 8 pixels
+	METHOD texSubImage2D (IIIIIIIIJ)V
+		ARG 0 target
+		ARG 1 level
+		ARG 2 xOffset
+		ARG 3 yOffset
+		ARG 4 width
+		ARG 5 height
+		ARG 6 format
+		ARG 7 type
+		ARG 8 pixels
diff --git a/mappings/com/mojang/blaze3d/platform/TextureUtil.mapping b/mappings/com/mojang/blaze3d/platform/TextureUtil.mapping
new file mode 100644
index 0000000000..8403f63f20
--- /dev/null
+++ b/mappings/com/mojang/blaze3d/platform/TextureUtil.mapping
@@ -0,0 +1,23 @@
+CLASS com/mojang/blaze3d/platform/TextureUtil
+	METHOD bind (I)V
+		ARG 0 texture
+	METHOD prepareImage (III)V
+		ARG 0 texture
+		ARG 1 width
+		ARG 2 height
+	METHOD prepareImage (IIII)V
+		ARG 0 texture
+		ARG 1 levels
+		ARG 2 width
+		ARG 3 height
+	METHOD prepareImage (Lcob$b;III)V
+		ARG 0 pixelFormat
+		ARG 1 texture
+		ARG 2 width
+		ARG 3 height
+	METHOD prepareImage (Lcob$b;IIII)V
+		ARG 0 pixelFormat
+		ARG 1 texture
+		ARG 2 levels
+		ARG 3 width
+		ARG 4 height
diff --git a/mappings/crv.mapping b/mappings/crv.mapping
deleted file mode 100644
index 18bd92149b..0000000000
--- a/mappings/crv.mapping
+++ /dev/null
@@ -1,2 +0,0 @@
-CLASS crv
-	METHOD a load (Lwj;)V
diff --git a/mappings/crw.mapping b/mappings/crw.mapping
deleted file mode 100644
index 4d29068370..0000000000
--- a/mappings/crw.mapping
+++ /dev/null
@@ -1,3 +0,0 @@
-CLASS crw
-	FIELD a game Lcpk;
-	FIELD b fontRenderer Lcpy;
diff --git a/mappings/crx.mapping b/mappings/crx.mapping
deleted file mode 100644
index 3f08e2e1ac..0000000000
--- a/mappings/crx.mapping
+++ /dev/null
@@ -1,12 +0,0 @@
-CLASS crx
-	FIELD b uMin F
-	FIELD c uMax F
-	FIELD d vMin F
-	FIELD e vMax F
-	METHOD a (Ldnp;ZFFLcou;FFFF)V
-		ARG 3 x
-		ARG 4 y
-		ARG 5 buffer
-		ARG 6 r
-		ARG 7 g
-		ARG 8 b
diff --git a/mappings/cry.mapping b/mappings/cry.mapping
deleted file mode 100644
index 5824724803..0000000000
--- a/mappings/cry.mapping
+++ /dev/null
@@ -1,8 +0,0 @@
-CLASS cry
-	METHOD a (Ldnp;ZFFLcou;FFFF)V
-		ARG 3 x
-		ARG 4 y
-		ARG 5 buffer
-		ARG 6 r
-		ARG 7 g
-		ARG 8 b
diff --git a/mappings/net/minecraft/block/entity/SignBlockEntity.mapping b/mappings/net/minecraft/block/entity/SignBlockEntity.mapping
index 9d83f7b421..449ef227c9 100644
--- a/mappings/net/minecraft/block/entity/SignBlockEntity.mapping
+++ b/mappings/net/minecraft/block/entity/SignBlockEntity.mapping
@@ -1,10 +1,28 @@
 CLASS bom net/minecraft/block/entity/SignBlockEntity
 	FIELD a text [Ljd;
+	FIELD b caretVisible Z
+	FIELD c currentRow I
+	FIELD g selectionStart I
+	FIELD h selectionEnd I
 	FIELD i editable Z
 	FIELD j editor Larb;
+	FIELD k textBeingEdited [Ljava/lang/String;
+	FIELD l color Lavl;
 	METHOD K_ shouldBroadcastConsoleToOps ()Z
 	METHOD a sendCommandFeedback ()Z
+	METHOD a getTextOnRow (I)Ljd;
+		ARG 1 row
+	METHOD a setSelectionState (IIIZ)V
+		ARG 1 currentRow
+		ARG 2 selectionStart
+		ARG 3 selectionEnd
+		ARG 4 caretVisible
+	METHOD a setTextOnRow (ILjd;)V
+		ARG 1 row
+		ARG 2 text
 	METHOD a setEditor (Larb;)V
+	METHOD a setColor (Lavl;)Z
+		ARG 1 color
 	METHOD a fromTag (Lhs;)V
 	METHOD a appendCommandFeedback (Ljd;)V
 	METHOD a setEditable (Z)V
@@ -15,3 +33,9 @@ CLASS bom net/minecraft/block/entity/SignBlockEntity
 	METHOD b toTag (Lhs;)Lhs;
 	METHOD d isEditable ()Z
 	METHOD e getEditor ()Larb;
+	METHOD f getColor ()Lavl;
+	METHOD g resetSelectionState ()V
+	METHOD i isCaretVisible ()Z
+	METHOD j getCurrentRow ()I
+	METHOD k getSelectionStart ()I
+	METHOD l getSelectionEnd ()I
diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping
index 89ad22dcc9..39c88e916f 100644
--- a/mappings/net/minecraft/client/MinecraftClient.mapping
+++ b/mappings/net/minecraft/client/MinecraftClient.mapping
@@ -1,12 +1,14 @@
 CLASS cpk net/minecraft/client/MinecraftClient
 	FIELD E LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD F cachedMaxTextureSize I
+	FIELD G resourcePackDir Ljava/io/File;
 	FIELD H sessionPropertyMap Lcom/mojang/authlib/properties/PropertyMap;
 	FIELD I windowSettings Lcnu;
 	FIELD J currentServerEntry Ldbl;
 	FIELD K textureManager Ldnp;
 	FIELD L instance Lcpk;
 	FIELD M dataFixer Lcom/mojang/datafixers/DataFixer;
+	FIELD N windowProvider Ldep;
 	FIELD O crashed Z
 	FIELD P crashReport Lb;
 	FIELD Q connectedToRealms Z
@@ -42,17 +44,24 @@ CLASS cpk net/minecraft/client/MinecraftClient
 	FIELD ag netProxy Ljava/net/Proxy;
 	FIELD ah levelStorage Lcik;
 	FIELD ai currentFps I
+	FIELD aj itemUseCooldown I
 	FIELD ak autoConnectServerIp Ljava/lang/String;
 	FIELD al autoConnectServerPort I
 	FIELD ao is64Bit Z
 	FIELD ap isDemo Z
+	FIELD aq clientConnection Lir;
+	FIELD ar isIntegratedServerRunning Z
 	FIELD as profiler Laeq;
 	FIELD at resourceManager Lwh;
+	FIELD au resourcePackCreator Ldnw;
 	FIELD av resourcePackContainerManager Lwb;
 	FIELD aw languageManager Ldoi;
 	FIELD ax blockColorMap Lcpt;
 	FIELD ay itemColorMap Lcpw;
 	FIELD az framebuffer Lcnr;
+	FIELD b defaultFontRendererId Lqc;
+	FIELD c altFontRendererId Lqc;
+	FIELD d memoryReservedForCrash [B
 	FIELD e interactionManager Ldbh;
 	FIELD g window Lcog;
 	FIELD h world Ldbi;
@@ -70,6 +79,7 @@ CLASS cpk net/minecraft/client/MinecraftClient
 	FIELD v mouse Lcpl;
 	FIELD w keyboard Lcpj;
 	FIELD x runDirectory Ljava/io/File;
+	FIELD y metricsData Lyo;
 	FIELD z fpsDebugString Ljava/lang/String;
 	METHOD A getServer ()Ldqk;
 	METHOD B getSnooper ()Lafy;
@@ -133,7 +143,11 @@ CLASS cpk net/minecraft/client/MinecraftClient
 	METHOD ao getGame ()Lcpf;
 	METHOD ap init ()V
 	METHOD ar checkIs64Bit ()Z
-	METHOD av getFramerate ()I
+	METHOD as startTimerHackThread ()V
+	METHOD at checkGameData ()V
+	METHOD au drawGuiWithoutMouse ()V
+	METHOD av getFramerateLimit ()I
+	METHOD aw isFramerateLimited ()Z
 	METHOD ay isMainThread ()Z
 	METHOD b start ()V
 	METHOD b populateCrashReport (Lb;)Lb;
@@ -149,6 +163,7 @@ CLASS cpk net/minecraft/client/MinecraftClient
 	METHOD g reloadResources ()V
 	METHOD h getLevelStorage ()Lcik;
 	METHOD i stop ()V
+	METHOD j cleanUpAfterCrash ()V
 	METHOD k stopThread ()V
 	METHOD m getMusicTracker ()Ldqq;
 	METHOD n tick ()V
@@ -160,3 +175,4 @@ CLASS cpk net/minecraft/client/MinecraftClient
 	METHOD v reloadResourcesConcurrently ()Ljava/util/concurrent/CompletableFuture;
 	METHOD w getMaxTextureSize ()I
 	METHOD x getCurrentServerEntry ()Ldbl;
+	METHOD y isIntegratedServerRunning ()Z
diff --git a/mappings/net/minecraft/client/WindowEventHandler.mapping b/mappings/net/minecraft/client/WindowEventHandler.mapping
new file mode 100644
index 0000000000..c161b89124
--- /dev/null
+++ b/mappings/net/minecraft/client/WindowEventHandler.mapping
@@ -0,0 +1,5 @@
+CLASS coh net/minecraft/client/WindowEventHandler
+	METHOD a onResolutionChanged ()V
+	METHOD a setWindowFocused (Z)V
+	METHOD a_ updateDisplay (Z)V
+		ARG 1 respectFramerateLimit
diff --git a/mappings/net/minecraft/client/font/BlankFont.mapping b/mappings/net/minecraft/client/font/BlankFont.mapping
new file mode 100644
index 0000000000..9034c1c548
--- /dev/null
+++ b/mappings/net/minecraft/client/font/BlankFont.mapping
@@ -0,0 +1,2 @@
+CLASS crs net/minecraft/client/font/BlankFont
+	METHOD a getGlyph (C)Lcnp;
diff --git a/mappings/net/minecraft/client/font/BlankGlyph.mapping b/mappings/net/minecraft/client/font/BlankGlyph.mapping
index 78d329ef86..db753335e4 100644
--- a/mappings/net/minecraft/client/font/BlankGlyph.mapping
+++ b/mappings/net/minecraft/client/font/BlankGlyph.mapping
@@ -1,2 +1,8 @@
 CLASS crz net/minecraft/client/font/BlankGlyph
 	FIELD a INSTANCE Lcrz;
+	FIELD b IMAGE Lcob;
+	METHOD a upload (II)V
+	METHOD d getWidth ()I
+	METHOD e getHeight ()I
+	METHOD f hasColor ()Z
+	METHOD g getOversample ()F
diff --git a/mappings/net/minecraft/client/font/EmptyGlyphRenderer.mapping b/mappings/net/minecraft/client/font/EmptyGlyphRenderer.mapping
new file mode 100644
index 0000000000..c6b01ea4b9
--- /dev/null
+++ b/mappings/net/minecraft/client/font/EmptyGlyphRenderer.mapping
@@ -0,0 +1,10 @@
+CLASS cry net/minecraft/client/font/EmptyGlyphRenderer
+	METHOD a getId ()Lqc;
+	METHOD a draw (Ldnp;ZFFLcou;FFFF)V
+		ARG 3 x
+		ARG 4 y
+		ARG 5 buffer
+		ARG 6 red
+		ARG 7 green
+		ARG 8 blue
+		ARG 9 alpha
diff --git a/mappings/net/minecraft/client/font/Font.mapping b/mappings/net/minecraft/client/font/Font.mapping
new file mode 100644
index 0000000000..e2e09f3182
--- /dev/null
+++ b/mappings/net/minecraft/client/font/Font.mapping
@@ -0,0 +1,2 @@
+CLASS cno net/minecraft/client/font/Font
+	METHOD a getGlyph (C)Lcnp;
diff --git a/mappings/net/minecraft/client/font/FontLoaderTTF.mapping b/mappings/net/minecraft/client/font/FontLoaderTTF.mapping
deleted file mode 100644
index a540e316a0..0000000000
--- a/mappings/net/minecraft/client/font/FontLoaderTTF.mapping
+++ /dev/null
@@ -1,10 +0,0 @@
-CLASS csg net/minecraft/client/font/FontLoaderTTF
-	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
-	FIELD b filename Lqc;
-	FIELD c size F
-	FIELD d oversample F
-	METHOD <init> (Lqc;FFFFLjava/lang/String;)V
-		ARG 1 filename
-		ARG 2 size
-		ARG 3 oversample
-	METHOD a load (Lwj;)Lcno;
diff --git a/mappings/net/minecraft/client/font/FontRenderer.mapping b/mappings/net/minecraft/client/font/FontRenderer.mapping
index f44595cd20..fb505581ee 100644
--- a/mappings/net/minecraft/client/font/FontRenderer.mapping
+++ b/mappings/net/minecraft/client/font/FontRenderer.mapping
@@ -1,5 +1,5 @@
 CLASS cpy net/minecraft/client/font/FontRenderer
-	CLASS cpy$a CharacterRenderInfo
+	CLASS cpy$a Rectangle
 		FIELD a xMin F
 		FIELD b yMin F
 		FIELD c xMax F
@@ -8,6 +8,15 @@ CLASS cpy net/minecraft/client/font/FontRenderer
 		FIELD f green F
 		FIELD g blue F
 		FIELD h alpha F
+		METHOD <init> (FFFFFFFF)V
+			ARG 1 xMin
+			ARG 2 yMin
+			ARG 3 xMax
+			ARG 4 yMax
+			ARG 5 red
+			ARG 6 green
+			ARG 7 blue
+			ARG 8 alpha
 		METHOD a draw (Lcou;)V
 	FIELD a fontHeight I
 	FIELD b random Ljava/util/Random;
@@ -18,7 +27,34 @@ CLASS cpy net/minecraft/client/font/FontRenderer
 		ARG 1 textureManager
 	METHOD a isRightToLeft ()Z
 	METHOD a getCharWidth (C)F
-	METHOD a (Lcrx;ZZFFFLcou;FFFF)V
+	METHOD a mirror (Ljava/lang/String;)Ljava/lang/String;
+	METHOD a drawWithShadow (Ljava/lang/String;FFI)I
+		ARG 1 string
+		ARG 2 x
+		ARG 3 y
+	METHOD a draw (Ljava/lang/String;FFIZ)I
+		ARG 1 str
+		ARG 2 x
+		ARG 3 y
+		ARG 4 color
+		ARG 5 withShadow
+	METHOD a (Ljava/lang/String;I)Ljava/lang/String;
+		ARG 1 string
+	METHOD a drawStringBounded (Ljava/lang/String;IIII)V
+		ARG 1 str
+		ARG 2 x
+		ARG 3 y
+		ARG 4 maxWidth
+	METHOD a findWordEdge (Ljava/lang/String;IIZ)I
+		ARG 1 string
+		ARG 2 direction
+		ARG 3 position
+		ARG 4 skipWhitespaceToRightOfWord
+	METHOD a (Ljava/lang/String;IZ)Ljava/lang/String;
+		ARG 1 string
+		ARG 2 width
+	METHOD a drawGlyph (Lcrx;ZZFFFLcou;FFFF)V
+		ARG 1 glyphRenderer
 		ARG 2 bold
 		ARG 3 strikethrough
 		ARG 4 boldOffset
@@ -28,37 +64,19 @@ CLASS cpy net/minecraft/client/font/FontRenderer
 		ARG 8 red
 		ARG 9 green
 		ARG 10 blue
-	METHOD a mirror (Ljava/lang/String;)Ljava/lang/String;
-	METHOD a drawWithShadow (Ljava/lang/String;FFI)I
-		ARG 1 string
-		ARG 2 x
-		ARG 3 y
-	METHOD a drawInternal (Ljava/lang/String;FFIZ)I
-		ARG 1 str
-		ARG 2 x
-		ARG 3 y
-		ARG 4 color
-	METHOD a (Ljava/lang/String;I)Ljava/lang/String;
-		ARG 1 string
-	METHOD a drawStringBounded (Ljava/lang/String;IIII)V
-		ARG 1 str
-		ARG 2 x
-		ARG 3 y
-		ARG 4 maxWidth
-	METHOD a (Ljava/lang/String;IZ)Ljava/lang/String;
-		ARG 1 string
-		ARG 2 width
+		ARG 11 alpha
 	METHOD a setRightToLeft (Z)V
 	METHOD b getStringWidth (Ljava/lang/String;)I
 	METHOD b draw (Ljava/lang/String;FFI)I
 		ARG 1 string
 		ARG 2 x
 		ARG 3 y
-	METHOD b drawStringInternal (Ljava/lang/String;FFIZ)F
+	METHOD b drawLayer (Ljava/lang/String;FFIZ)F
 		ARG 1 str
 		ARG 2 x
 		ARG 3 y
 		ARG 4 color
+		ARG 5 isShadow
 	METHOD b getStringBoundedHeight (Ljava/lang/String;I)I
 		ARG 1 str
 	METHOD b renderStringBounded (Ljava/lang/String;IIII)V
diff --git a/mappings/net/minecraft/client/font/FontRendererManager.mapping b/mappings/net/minecraft/client/font/FontRendererManager.mapping
new file mode 100644
index 0000000000..e37d95bfaa
--- /dev/null
+++ b/mappings/net/minecraft/client/font/FontRendererManager.mapping
@@ -0,0 +1,9 @@
+CLASS crt net/minecraft/client/font/FontRendererManager
+	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD b fontRenderers Ljava/util/Map;
+	FIELD c textureManager Ldnp;
+	FIELD d forceUnicodeFont Z
+	METHOD a getFontRenderer (Lqc;)Lcpy;
+	METHOD a onResourceReload (Lwj;)V
+		ARG 1 manager
+	METHOD a setForceUnicodeFont (Z)V
diff --git a/mappings/net/minecraft/client/font/FontStorage.mapping b/mappings/net/minecraft/client/font/FontStorage.mapping
index f04bb4fbab..e366c28c5a 100644
--- a/mappings/net/minecraft/client/font/FontStorage.mapping
+++ b/mappings/net/minecraft/client/font/FontStorage.mapping
@@ -1,6 +1,27 @@
 CLASS cru net/minecraft/client/font/FontStorage
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD b EMPTY_GLYPH_RENDERER Lcry;
+	FIELD c SPACE Lcnn;
 	FIELD d RANDOM Ljava/util/Random;
-	FIELD h entries Ljava/util/List;
+	FIELD e textureManager Ldnp;
+	FIELD f id Lqc;
+	FIELD g BLANK_GLYPH_RENDERER Lcrx;
+	FIELD h fonts Ljava/util/List;
+	FIELD i glyphRendererCache Lit/unimi/dsi/fastutil/chars/Char2ObjectMap;
 	FIELD j glyphCache Lit/unimi/dsi/fastutil/chars/Char2ObjectMap;
+	FIELD k charactersByWidth Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
+	METHOD <init> (Ldnp;Lqc;)V
+		ARG 1 textureManager
+		ARG 2 id
 	METHOD a getGlyph (C)Lcnn;
+		ARG 1 c
+	METHOD a getObfuscatedGlyphRenderer (Lcnn;)Lcrx;
+		ARG 1 glyph
+	METHOD a getObfuscatedGlyphRenderer (Lcnn;)Lcry;
+	METHOD a getGlyphRenderer (Lcnp;)Lcrx;
+		ARG 1 c
+	METHOD b getGlyphRenderer (C)Lcrx;
+		ARG 1 c
+	METHOD b getGlyphRenderer (C)Lcry;
+	METHOD c getRenderableGlyph (C)Lcnp;
+		ARG 1 c
diff --git a/mappings/net/minecraft/client/font/FontType.mapping b/mappings/net/minecraft/client/font/FontType.mapping
index 970d07e4f3..9f3188de23 100644
--- a/mappings/net/minecraft/client/font/FontType.mapping
+++ b/mappings/net/minecraft/client/font/FontType.mapping
@@ -1,10 +1,13 @@
 CLASS cse net/minecraft/client/font/FontType
+	FIELD a BITMAP Lcse;
+	FIELD b TTF Lcse;
+	FIELD c LEGACY_UNICODE Lcse;
 	FIELD d REGISTRY Ljava/util/Map;
 	FIELD e id Ljava/lang/String;
-	FIELD f factory Ljava/util/function/Function;
+	FIELD f loaderFactory Ljava/util/function/Function;
 	METHOD <init> (Ljava/lang/String;ILjava/lang/String;Ljava/util/function/Function;)V
 		ARG 3 id
 		ARG 4 factory
-	METHOD a create (Lcom/google/gson/JsonObject;)Lcsd;
+	METHOD a createLoader (Lcom/google/gson/JsonObject;)Lcsd;
 	METHOD a byId (Ljava/lang/String;)Lcse;
 		ARG 0 id
diff --git a/mappings/net/minecraft/client/font/Glyph.mapping b/mappings/net/minecraft/client/font/Glyph.mapping
index 6148f1e935..eca38cb922 100644
--- a/mappings/net/minecraft/client/font/Glyph.mapping
+++ b/mappings/net/minecraft/client/font/Glyph.mapping
@@ -1,5 +1,6 @@
 CLASS cnn net/minecraft/client/font/Glyph
 	METHOD a getBearingX ()F
 	METHOD a getAdvance (Z)F
+		ARG 1 isBold
 	METHOD b getBoldOffset ()F
 	METHOD c getShadowOffset ()F
diff --git a/mappings/net/minecraft/client/font/GlyphAtlasTexture.mapping b/mappings/net/minecraft/client/font/GlyphAtlasTexture.mapping
new file mode 100644
index 0000000000..392ae51a7e
--- /dev/null
+++ b/mappings/net/minecraft/client/font/GlyphAtlasTexture.mapping
@@ -0,0 +1,20 @@
+CLASS crv net/minecraft/client/font/GlyphAtlasTexture
+	CLASS crv$a Slot
+		FIELD a x I
+		FIELD b y I
+		FIELD c width I
+		FIELD d height I
+		FIELD e subSlot1 Lcrv$a;
+		FIELD f subSlot2 Lcrv$a;
+		FIELD g isOccupied Z
+		METHOD a findSlotFor (Lcnp;)Lcrv$a;
+			ARG 1 glyph
+	FIELD f id Lqc;
+	FIELD g hasColor Z
+	FIELD h rootSlot Lcrv$a;
+	METHOD <init> (Lqc;Z)V
+		ARG 2 hasColor
+	METHOD a getId ()Lqc;
+	METHOD a getGlyphRenderer (Lcnp;)Lcrx;
+		ARG 1 glyph
+	METHOD a load (Lwj;)V
diff --git a/mappings/net/minecraft/client/font/GlyphRenderer.mapping b/mappings/net/minecraft/client/font/GlyphRenderer.mapping
new file mode 100644
index 0000000000..f16b7f14e9
--- /dev/null
+++ b/mappings/net/minecraft/client/font/GlyphRenderer.mapping
@@ -0,0 +1,29 @@
+CLASS crx net/minecraft/client/font/GlyphRenderer
+	FIELD a id Lqc;
+	FIELD b uMin F
+	FIELD c uMax F
+	FIELD d vMin F
+	FIELD e vMax F
+	FIELD f xMin F
+	FIELD g xMax F
+	FIELD h yMin F
+	FIELD i yMax F
+	METHOD <init> (Lqc;FFFFFFFF)V
+		ARG 2 uMin
+		ARG 3 uMax
+		ARG 4 vMin
+		ARG 5 vMax
+		ARG 6 xMin
+		ARG 7 xMax
+		ARG 8 yMin
+		ARG 9 yMax
+	METHOD a getId ()Lqc;
+	METHOD a draw (Ldnp;ZFFLcou;FFFF)V
+		ARG 2 italic
+		ARG 3 x
+		ARG 4 y
+		ARG 5 buffer
+		ARG 6 red
+		ARG 7 green
+		ARG 8 blue
+		ARG 9 alpha
diff --git a/mappings/net/minecraft/client/font/RenderableGlyph.mapping b/mappings/net/minecraft/client/font/RenderableGlyph.mapping
new file mode 100644
index 0000000000..e2f0d88ad5
--- /dev/null
+++ b/mappings/net/minecraft/client/font/RenderableGlyph.mapping
@@ -0,0 +1,13 @@
+CLASS cnp net/minecraft/client/font/RenderableGlyph
+	METHOD a upload (II)V
+		ARG 1 x
+		ARG 2 y
+	METHOD d getWidth ()I
+	METHOD e getHeight ()I
+	METHOD f hasColor ()Z
+	METHOD g getOversample ()F
+	METHOD h getXMin ()F
+	METHOD i getXMax ()F
+	METHOD j getYMin ()F
+	METHOD k getYMax ()F
+	METHOD l getAscent ()F
diff --git a/mappings/net/minecraft/client/font/TextureFont.mapping b/mappings/net/minecraft/client/font/TextureFont.mapping
index a4325715cf..297dbfcbae 100644
--- a/mappings/net/minecraft/client/font/TextureFont.mapping
+++ b/mappings/net/minecraft/client/font/TextureFont.mapping
@@ -1,9 +1,50 @@
 CLASS csc net/minecraft/client/font/TextureFont
 	CLASS csc$a Loader
 		FIELD a filename Lqc;
+		FIELD b chars Ljava/util/List;
 		FIELD c height I
 		FIELD d ascent I
+		METHOD <init> (Lqc;IILjava/util/List;)V
+			ARG 1 id
+			ARG 2 height
+			ARG 3 ascent
+			ARG 4 chars
+		METHOD a findCharacterStartX (Lcob;IIII)I
+			ARG 1 image
+			ARG 2 characterWidth
+			ARG 3 characterHeight
+			ARG 4 charPosX
+			ARG 5 charPosY
 		METHOD a load (Lwj;)Lcno;
-	CLASS csc$b
+	CLASS csc$b TextureFontGlyph
+		FIELD a scaleFactor F
+		FIELD b image Lcob;
+		FIELD c x I
+		FIELD d y I
+		FIELD e width I
+		FIELD f height I
 		FIELD g advance I
+		FIELD h ascent I
+		METHOD <init> (FLcob;IIIIII)V
+			ARG 1 scaleFactor
+			ARG 2 image
+			ARG 3 x
+			ARG 4 y
+			ARG 5 width
+			ARG 6 height
+			ARG 7 advance
+			ARG 8 ascent
+		METHOD a upload (II)V
+			ARG 1 x
+			ARG 2 y
+		METHOD d getWidth ()I
+		METHOD e getHeight ()I
+		METHOD f hasColor ()Z
+		METHOD g getOversample ()F
+		METHOD l getAscent ()F
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD b image Lcob;
+	FIELD c characterToGlyphMap Lit/unimi/dsi/fastutil/chars/Char2ObjectMap;
+	METHOD <init> (Lcob;Lit/unimi/dsi/fastutil/chars/Char2ObjectMap;)V
+		ARG 1 image
+	METHOD a getGlyph (C)Lnopackage/cnp;
diff --git a/mappings/net/minecraft/client/font/TrueTypeFont.mapping b/mappings/net/minecraft/client/font/TrueTypeFont.mapping
index b9422a201b..99bf44130a 100644
--- a/mappings/net/minecraft/client/font/TrueTypeFont.mapping
+++ b/mappings/net/minecraft/client/font/TrueTypeFont.mapping
@@ -1,8 +1,38 @@
 CLASS cnq net/minecraft/client/font/TrueTypeFont
-	CLASS cnq$a
+	CLASS cnq$a TtfGlyph
+		FIELD b width I
+		FIELD c height I
+		FIELD d bearingX F
+		FIELD e ascent F
 		FIELD f advance F
+		FIELD g glyphIndex I
+		METHOD <init> (Lcnq;IIIIFFI)V
+			ARG 1 xMin
+			ARG 2 xMax
+			ARG 3 yMax
+			ARG 4 yMin
+			ARG 5 advance
+			ARG 7 glyphIndex
 		METHOD a getBearingX ()F
+		METHOD a upload (II)V
+		METHOD d getWidth ()I
+		METHOD e getHeight ()I
+		METHOD f hasColor ()Z
+		METHOD g getOversample ()F
+		METHOD l getAscent ()F
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD b info Lorg/lwjgl/stb/STBTTFontinfo;
-	FIELD g stbScaleFactor F
+	FIELD c oversample F
+	FIELD d excludedCharacters Lit/unimi/dsi/fastutil/chars/CharSet;
+	FIELD e shiftX F
+	FIELD f shiftY F
+	FIELD g scaleFactor F
 	FIELD h ascent F
+	METHOD <init> (Lorg/lwjgl/stb/STBTTFontinfo;FFFFLjava/lang/String;)V
+		ARG 1 info
+		ARG 3 oversample
+		ARG 4 shiftX
+		ARG 5 shiftY
+		ARG 6 excludedCharacters
+	METHOD a getSTBTTFontInfo (Ljava/nio/ByteBuffer;)Lorg/lwjgl/stb/STBTTFontinfo;
+		ARG 0 font
diff --git a/mappings/net/minecraft/client/font/TrueTypeFontLoader.mapping b/mappings/net/minecraft/client/font/TrueTypeFontLoader.mapping
new file mode 100644
index 0000000000..70b1e37bc9
--- /dev/null
+++ b/mappings/net/minecraft/client/font/TrueTypeFontLoader.mapping
@@ -0,0 +1,17 @@
+CLASS csg net/minecraft/client/font/TrueTypeFontLoader
+	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD b filename Lqc;
+	FIELD c size F
+	FIELD d oversample F
+	FIELD e shiftX F
+	FIELD f shiftY F
+	FIELD g excludedCharacters Ljava/lang/String;
+	METHOD <init> (Lqc;FFFFLjava/lang/String;)V
+		ARG 1 filename
+		ARG 2 size
+		ARG 3 oversample
+		ARG 4 shiftX
+		ARG 5 shiftY
+		ARG 6 excludedCharacters
+	METHOD a fromJson (Lcom/google/gson/JsonObject;)Lcsd;
+	METHOD a load (Lwj;)Lcno;
diff --git a/mappings/net/minecraft/client/font/UnicodeTextureFont.mapping b/mappings/net/minecraft/client/font/UnicodeTextureFont.mapping
index 17ee3cccab..a79b642989 100644
--- a/mappings/net/minecraft/client/font/UnicodeTextureFont.mapping
+++ b/mappings/net/minecraft/client/font/UnicodeTextureFont.mapping
@@ -1,9 +1,25 @@
 CLASS csf net/minecraft/client/font/UnicodeTextureFont
 	CLASS csf$a Loader
 		METHOD a load (Lwj;)Lcno;
-	CLASS csf$b
+	CLASS csf$b UnicodeTextureGlyph
+		FIELD a width I
+		FIELD b height I
+		FIELD c unpackSkipPixels I
+		FIELD d unpackSkipRows I
 		FIELD e image Lcob;
+		METHOD <init> (IIIILcob;)V
+			ARG 1 unpackSkipPixels
+			ARG 2 unpackSkipRows
+			ARG 3 width
+			ARG 4 height
+			ARG 5 image
+		METHOD a upload (II)V
 		METHOD b getBoldOffset ()F
 		METHOD c getShadowOffset ()F
+		METHOD d getWidth ()I
+		METHOD e getHeight ()I
+		METHOD f hasColor ()Z
+		METHOD g getOversample ()F
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD c widths [B
+	METHOD a getGlyph (C)Lcnp;
diff --git a/mappings/net/minecraft/client/gui/CloseWorldGui.mapping b/mappings/net/minecraft/client/gui/CloseWorldGui.mapping
index 883b4726b1..5cc7d45a1f 100644
--- a/mappings/net/minecraft/client/gui/CloseWorldGui.mapping
+++ b/mappings/net/minecraft/client/gui/CloseWorldGui.mapping
@@ -5,4 +5,4 @@ CLASS ctf net/minecraft/client/gui/CloseWorldGui
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
-	METHOD ap_ canClose ()Z
+	METHOD ap_ doesEscapeKeyClose ()Z
diff --git a/mappings/net/minecraft/client/gui/ContainerGui.mapping b/mappings/net/minecraft/client/gui/ContainerGui.mapping
index 52a2ba8a33..7af2b3dd10 100644
--- a/mappings/net/minecraft/client/gui/ContainerGui.mapping
+++ b/mappings/net/minecraft/client/gui/ContainerGui.mapping
@@ -53,7 +53,7 @@ CLASS cuk net/minecraft/client/gui/ContainerGui
 		ARG 1 stack
 		ARG 2 xPosition
 		ARG 3 yPosition
-	METHOD ap_ canClose ()Z
+	METHOD ap_ doesEscapeKeyClose ()Z
 	METHOD b mouseReleased (DDI)Z
 		ARG 1 mouseX
 		ARG 3 mouseY
diff --git a/mappings/net/minecraft/client/gui/Gui.mapping b/mappings/net/minecraft/client/gui/Gui.mapping
index adfb9c2bc0..0953e23724 100644
--- a/mappings/net/minecraft/client/gui/Gui.mapping
+++ b/mappings/net/minecraft/client/gui/Gui.mapping
@@ -13,6 +13,7 @@ CLASS ctp net/minecraft/client/gui/Gui
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
+		ARG 3 delta
 	METHOD a keyPressed (III)Z
 		ARG 1 keyCode
 		ARG 2 scanCode
@@ -41,7 +42,7 @@ CLASS ctp net/minecraft/client/gui/Gui
 		ARG 1 component
 		ARG 2 x
 		ARG 3 y
-	METHOD ap_ canClose ()Z
+	METHOD ap_ doesEscapeKeyClose ()Z
 	METHOD b getEntries ()Ljava/util/List;
 	METHOD b onScaleChanged (Lcpk;II)V
 		ARG 1 client
diff --git a/mappings/net/minecraft/client/gui/MainMenuGui.mapping b/mappings/net/minecraft/client/gui/MainMenuGui.mapping
index 4dd206f41c..6d400b46fc 100644
--- a/mappings/net/minecraft/client/gui/MainMenuGui.mapping
+++ b/mappings/net/minecraft/client/gui/MainMenuGui.mapping
@@ -56,7 +56,7 @@ CLASS ctu net/minecraft/client/gui/MainMenuGui
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
-	METHOD ap_ canClose ()Z
+	METHOD ap_ doesEscapeKeyClose ()Z
 	METHOD b initWidgetsNormal (II)V
 	METHOD c onInitialized ()V
 	METHOD c initWidgetsDemo (II)V
diff --git a/mappings/net/minecraft/client/gui/ingame/DeathGui.mapping b/mappings/net/minecraft/client/gui/ingame/DeathGui.mapping
index b57e814edb..7d7e4d59b9 100644
--- a/mappings/net/minecraft/client/gui/ingame/DeathGui.mapping
+++ b/mappings/net/minecraft/client/gui/ingame/DeathGui.mapping
@@ -16,7 +16,7 @@ CLASS csz net/minecraft/client/gui/ingame/DeathGui
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
-	METHOD ap_ canClose ()Z
+	METHOD ap_ doesEscapeKeyClose ()Z
 	METHOD c onInitialized ()V
 	METHOD confirmResult handle (ZI)V
 		ARG 1 result
diff --git a/mappings/net/minecraft/client/gui/ingame/EditSignGui.mapping b/mappings/net/minecraft/client/gui/ingame/EditSignGui.mapping
index e0418d8f29..84fec1f8e3 100644
--- a/mappings/net/minecraft/client/gui/ingame/EditSignGui.mapping
+++ b/mappings/net/minecraft/client/gui/ingame/EditSignGui.mapping
@@ -4,6 +4,9 @@ CLASS cvm net/minecraft/client/gui/ingame/EditSignGui
 			ARG 1 mouseX
 			ARG 3 mouseY
 	FIELD a sign Lbom;
+	FIELD f ticksSinceOpened I
+	FIELD g currentRow I
+	FIELD h selectionManager Lcrw;
 	METHOD a charTyped (CI)Z
 		ARG 1 chr
 		ARG 2 keyCode
diff --git a/mappings/net/minecraft/client/gui/menu/BackupPromptGui.mapping b/mappings/net/minecraft/client/gui/menu/BackupPromptGui.mapping
index b1f7de10e4..cad48b6619 100644
--- a/mappings/net/minecraft/client/gui/menu/BackupPromptGui.mapping
+++ b/mappings/net/minecraft/client/gui/menu/BackupPromptGui.mapping
@@ -31,5 +31,5 @@ CLASS csq net/minecraft/client/gui/menu/BackupPromptGui
 		ARG 1 keyCode
 		ARG 2 scanCode
 		ARG 3 modifiers
-	METHOD ap_ canClose ()Z
+	METHOD ap_ doesEscapeKeyClose ()Z
 	METHOD c onInitialized ()V
diff --git a/mappings/net/minecraft/client/gui/menu/DisconnectedGui.mapping b/mappings/net/minecraft/client/gui/menu/DisconnectedGui.mapping
index d50832fcd8..e58221445f 100644
--- a/mappings/net/minecraft/client/gui/menu/DisconnectedGui.mapping
+++ b/mappings/net/minecraft/client/gui/menu/DisconnectedGui.mapping
@@ -14,5 +14,5 @@ CLASS ctc net/minecraft/client/gui/menu/DisconnectedGui
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
-	METHOD ap_ canClose ()Z
+	METHOD ap_ doesEscapeKeyClose ()Z
 	METHOD c onInitialized ()V
diff --git a/mappings/net/minecraft/client/gui/menu/DownloadingTerrainGui.mapping b/mappings/net/minecraft/client/gui/menu/DownloadingTerrainGui.mapping
index 88ae066cc3..694a80212b 100644
--- a/mappings/net/minecraft/client/gui/menu/DownloadingTerrainGui.mapping
+++ b/mappings/net/minecraft/client/gui/menu/DownloadingTerrainGui.mapping
@@ -2,5 +2,5 @@ CLASS cto net/minecraft/client/gui/menu/DownloadingTerrainGui
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
-	METHOD ap_ canClose ()Z
+	METHOD ap_ doesEscapeKeyClose ()Z
 	METHOD e isPauseScreen ()Z
diff --git a/mappings/net/minecraft/client/gui/menu/ErrorGui.mapping b/mappings/net/minecraft/client/gui/menu/ErrorGui.mapping
index da00f6f56b..688b904524 100644
--- a/mappings/net/minecraft/client/gui/menu/ErrorGui.mapping
+++ b/mappings/net/minecraft/client/gui/menu/ErrorGui.mapping
@@ -10,5 +10,5 @@ CLASS cte net/minecraft/client/gui/menu/ErrorGui
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
-	METHOD ap_ canClose ()Z
+	METHOD ap_ doesEscapeKeyClose ()Z
 	METHOD c onInitialized ()V
diff --git a/mappings/net/minecraft/client/gui/menu/OutOfMemoryGui.mapping b/mappings/net/minecraft/client/gui/menu/OutOfMemoryGui.mapping
index c711ebccf3..6fcb28c0f6 100644
--- a/mappings/net/minecraft/client/gui/menu/OutOfMemoryGui.mapping
+++ b/mappings/net/minecraft/client/gui/menu/OutOfMemoryGui.mapping
@@ -10,5 +10,5 @@ CLASS ctk net/minecraft/client/gui/menu/OutOfMemoryGui
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
-	METHOD ap_ canClose ()Z
+	METHOD ap_ doesEscapeKeyClose ()Z
 	METHOD c onInitialized ()V
diff --git a/mappings/net/minecraft/client/gui/menu/ServerConnectingGui.mapping b/mappings/net/minecraft/client/gui/menu/ServerConnectingGui.mapping
index d3df838109..24d4c4344a 100644
--- a/mappings/net/minecraft/client/gui/menu/ServerConnectingGui.mapping
+++ b/mappings/net/minecraft/client/gui/menu/ServerConnectingGui.mapping
@@ -12,6 +12,6 @@ CLASS csw net/minecraft/client/gui/menu/ServerConnectingGui
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
-	METHOD ap_ canClose ()Z
+	METHOD ap_ doesEscapeKeyClose ()Z
 	METHOD c onInitialized ()V
 	METHOD f update ()V
diff --git a/mappings/net/minecraft/client/gui/menu/WorkingGui.mapping b/mappings/net/minecraft/client/gui/menu/WorkingGui.mapping
index b6febb97a4..ace244e975 100644
--- a/mappings/net/minecraft/client/gui/menu/WorkingGui.mapping
+++ b/mappings/net/minecraft/client/gui/menu/WorkingGui.mapping
@@ -8,4 +8,4 @@ CLASS ctn net/minecraft/client/gui/menu/WorkingGui
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
-	METHOD ap_ canClose ()Z
+	METHOD ap_ doesEscapeKeyClose ()Z
diff --git a/mappings/net/minecraft/client/gui/menu/YesNoGui.mapping b/mappings/net/minecraft/client/gui/menu/YesNoGui.mapping
index 02e1fa4e61..c89213ee80 100644
--- a/mappings/net/minecraft/client/gui/menu/YesNoGui.mapping
+++ b/mappings/net/minecraft/client/gui/menu/YesNoGui.mapping
@@ -32,7 +32,7 @@ CLASS csv net/minecraft/client/gui/menu/YesNoGui
 		ARG 1 keyCode
 		ARG 2 scanCode
 		ARG 3 modifiers
-	METHOD ap_ canClose ()Z
+	METHOD ap_ doesEscapeKeyClose ()Z
 	METHOD b disableButtons (I)V
 	METHOD c onInitialized ()V
 	METHOD f update ()V
diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
index 6666bd6784..5852e3febc 100644
--- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
+++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
@@ -207,6 +207,7 @@ CLASS dbf net/minecraft/client/network/ClientPlayNetworkHandler
 	METHOD b getCommandSource ()Ldbg;
 	METHOD b validateResourcePackUrl (Ljava/lang/String;)Z
 	METHOD d getRecipeManager ()Layx;
+	METHOD f getProfile ()Lcom/mojang/authlib/GameProfile;
 	METHOD g getAdvancementHandler ()Ldbc;
 	METHOD i getWorld ()Ldbi;
 	METHOD j getTagManager ()Lyg;
diff --git a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping
index 947d0f6871..26cf2c3c09 100644
--- a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping
+++ b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping
@@ -1,4 +1,5 @@
 CLASS ddl net/minecraft/client/network/ClientPlayerEntity
+	FIELD cB activeHand Lafo;
 	FIELD cj stats Lxx;
 	FIELD ck recipeBook Lcpd;
 	FIELD cm clientPermissionLevel I
diff --git a/mappings/net/minecraft/client/render/BufferBuilder.mapping b/mappings/net/minecraft/client/render/BufferBuilder.mapping
index 757f3b069c..1db9ecbcb4 100644
--- a/mappings/net/minecraft/client/render/BufferBuilder.mapping
+++ b/mappings/net/minecraft/client/render/BufferBuilder.mapping
@@ -51,6 +51,8 @@ CLASS cou net/minecraft/client/render/BufferBuilder
 	METHOD b clear ()V
 	METHOD b vertex (DDD)Lcou;
 		ARG 1 x
+		ARG 3 y
+		ARG 5 z
 	METHOD b postNormal (FFF)V
 		ARG 1 x
 		ARG 2 y
diff --git a/mappings/net/minecraft/client/sortme/FontManager.mapping b/mappings/net/minecraft/client/sortme/FontManager.mapping
deleted file mode 100644
index 83ab90000d..0000000000
--- a/mappings/net/minecraft/client/sortme/FontManager.mapping
+++ /dev/null
@@ -1,5 +0,0 @@
-CLASS crt net/minecraft/client/sortme/FontManager
-	FIELD d forceUnicodeFont Z
-	METHOD a onResourceReload (Lwj;)V
-		ARG 1 manager
-	METHOD a setForceUnicodeFont (Z)V
diff --git a/mappings/net/minecraft/client/texture/NativeImage.mapping b/mappings/net/minecraft/client/texture/NativeImage.mapping
index 9732a80817..9c18bba896 100644
--- a/mappings/net/minecraft/client/texture/NativeImage.mapping
+++ b/mappings/net/minecraft/client/texture/NativeImage.mapping
@@ -1,15 +1,32 @@
 CLASS cob net/minecraft/client/texture/NativeImage
 	CLASS cob$a Format
 		FIELD e bytesPerPixel I
+		METHOD <init> (IIZZZZZIIIIIZ)V
+			ARG 1 bytesPerPixel
 		METHOD a getBytesPerPixel ()I
-	FIELD b imageFormat Lcob$a;
+	CLASS net/minecraft/client/texture/NativeImage$b PixelFormat
+		FIELD a RGBA Lcob$b;
+		FIELD b RGB Lcob$b;
+		FIELD c LUMINANCE_ALPHA Lcob$b;
+		FIELD d LUMINANCE Lcob$b;
+		FIELD f value I
+		METHOD a asInteger ()I
+	FIELD a WRITE_TO_FILE_OPEN_OPTIONS Ljava/util/Set;
+	FIELD b format Lcob$a;
 	FIELD c width I
 	FIELD d height I
+	FIELD e isStbImage Z
 	FIELD f pointer J
 	FIELD g sizeBytes I
+	METHOD <init> (Lcob$a;IIZ)V
+		ARG 1 format
+		ARG 2 width
+		ARG 3 height
+		ARG 4 zeroFill
 	METHOD <init> (Lcob$a;IIZJ)V
 		ARG 2 width
 		ARG 3 height
+		ARG 5 pointer
 	METHOD a getWidth ()I
 	METHOD a getPixelRGBA (II)I
 		ARG 1 x
@@ -22,7 +39,22 @@ CLASS cob net/minecraft/client/texture/NativeImage
 		ARG 3 width
 		ARG 4 height
 	METHOD a upload (IIIIIIIZ)V
+		ARG 1 level
+		ARG 2 xOffset
+		ARG 3 yOffset
+		ARG 4 unpackSkipPixels
+		ARG 5 unpackSkipRows
+		ARG 6 width
+		ARG 7 height
 	METHOD a upload (IIIIIIIZZZ)V
+		ARG 1 level
+		ARG 2 xOffset
+		ARG 3 yOffset
+		ARG 4 unpackSkipPixels
+		ARG 5 unpackSkipRows
+		ARG 6 width
+		ARG 7 height
+		ARG 9 clamp
 	METHOD a resizeSubRectTo (IIIILcob;)V
 	METHOD a upload (IIIZ)V
 	METHOD a fromInputStream (Lcob$a;Ljava/io/InputStream;)Lcob;
@@ -32,7 +64,20 @@ CLASS cob net/minecraft/client/texture/NativeImage
 	METHOD a writeFile (Ljava/lang/String;)V
 	METHOD a fromByteBuffer (Ljava/nio/ByteBuffer;)Lcob;
 	METHOD a writeFile (Ljava/nio/file/Path;)V
+	METHOD a makeGlyphBitmapSubpixel (Lorg/lwjgl/stb/STBTTFontinfo;IIIFFFFII)V
+		ARG 1 fontInfo
+		ARG 2 glyphIndex
+		ARG 3 width
+		ARG 4 height
+		ARG 5 scaleX
+		ARG 6 scaleY
+		ARG 7 shiftX
+		ARG 8 shiftY
+		ARG 10 glyph
 	METHOD b getHeight ()I
+	METHOD b getAlphaOrLuminance (II)B
+		ARG 1 x
+		ARG 2 y
 	METHOD b blendPixel (III)V
 	METHOD b fromBase64 (Ljava/lang/String;)Lcob;
 		ARG 0 string
diff --git a/mappings/net/minecraft/client/util/GLFWUtil.mapping b/mappings/net/minecraft/client/util/GLFWUtil.mapping
new file mode 100644
index 0000000000..833b2f7bf9
--- /dev/null
+++ b/mappings/net/minecraft/client/util/GLFWUtil.mapping
@@ -0,0 +1,2 @@
+CLASS cnj net/minecraft/client/util/GlfwUtil
+	METHOD b getTime ()D
diff --git a/mappings/net/minecraft/client/util/Monitor.mapping b/mappings/net/minecraft/client/util/Monitor.mapping
index ef09357e28..bf72b223bc 100644
--- a/mappings/net/minecraft/client/util/Monitor.mapping
+++ b/mappings/net/minecraft/client/util/Monitor.mapping
@@ -1,4 +1,5 @@
 CLASS cnz net/minecraft/client/util/Monitor
+	FIELD a monitorTracker Lcod;
 	FIELD b handle J
 	FIELD c videoModes Ljava/util/List;
 	FIELD d currentVideoMode Lcof;
diff --git a/mappings/net/minecraft/client/util/MonitorTracker.mapping b/mappings/net/minecraft/client/util/MonitorTracker.mapping
new file mode 100644
index 0000000000..548233d929
--- /dev/null
+++ b/mappings/net/minecraft/client/util/MonitorTracker.mapping
@@ -0,0 +1,12 @@
+CLASS cod net/minecraft/client/util/MonitorTracker
+	FIELD a pointerToMonitorMap Ljava/util/Map;
+	FIELD b pointerToWindowMap Ljava/util/Map;
+	FIELD c windowToMonitorMap Ljava/util/Map;
+	FIELD d monitorFactory Lcoa;
+	METHOD a stop ()V
+	METHOD a getMonitor (J)Lcnz;
+		ARG 1 pointer
+	METHOD a handleMonitorEvent (JI)V
+		ARG 1 monitor
+		ARG 3 event
+	METHOD a getMonitor (Lcog;)Lcnz;
diff --git a/mappings/net/minecraft/client/util/SelectionManager.mapping b/mappings/net/minecraft/client/util/SelectionManager.mapping
new file mode 100644
index 0000000000..cd144c943b
--- /dev/null
+++ b/mappings/net/minecraft/client/util/SelectionManager.mapping
@@ -0,0 +1,16 @@
+CLASS crw net/minecraft/client/util/SelectionManager
+	FIELD a client Lcpk;
+	FIELD b fontRenderer Lcpy;
+	FIELD c stringSupplier Ljava/util/function/Supplier;
+	FIELD d stringConsumer Ljava/util/function/Consumer;
+	FIELD f selectionStart I
+	FIELD g selectionEnd I
+	METHOD a insert (C)Z
+	METHOD a handleSpecialKey (I)Z
+		ARG 1 keyCode
+	METHOD a insert (Ljava/lang/String;)V
+	METHOD b moveCaretToEnd ()V
+	METHOD c getSelectionStart ()I
+	METHOD d getSelectionEnd ()I
+	METHOD e getSelectedText ()Ljava/lang/String;
+	METHOD f deleteSelectedText ()V
diff --git a/mappings/net/minecraft/client/util/VideoMode.mapping b/mappings/net/minecraft/client/util/VideoMode.mapping
index bb1f87002c..68bdf8d97c 100644
--- a/mappings/net/minecraft/client/util/VideoMode.mapping
+++ b/mappings/net/minecraft/client/util/VideoMode.mapping
@@ -7,6 +7,7 @@ CLASS cof net/minecraft/client/util/VideoMode
 	FIELD f refreshRate I
 	FIELD g PATTERN Ljava/util/regex/Pattern;
 	METHOD a getWidth ()I
+	METHOD a fromString (Ljava/lang/String;)Ljava/util/Optional;
 	METHOD b getHeight ()I
 	METHOD c getRedBits ()I
 	METHOD d getGreenBits ()I
diff --git a/mappings/net/minecraft/client/util/Window.mapping b/mappings/net/minecraft/client/util/Window.mapping
index f7a98255c7..e6fee01cf4 100644
--- a/mappings/net/minecraft/client/util/Window.mapping
+++ b/mappings/net/minecraft/client/util/Window.mapping
@@ -1,6 +1,8 @@
 CLASS cog net/minecraft/client/util/Window
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD b errorCallback Lorg/lwjgl/glfw/GLFWErrorCallback;
+	FIELD c windowEventHandler Lcoh;
+	FIELD d monitorTracker Lcod;
 	FIELD e monitor Lcnz;
 	FIELD f handle J
 	FIELD k videoMode Ljava/util/Optional;
@@ -11,15 +13,21 @@ CLASS cog net/minecraft/client/util/Window
 	FIELD u scaledHeight I
 	FIELD w phase Ljava/lang/String;
 	FIELD z framerateLimit I
+	METHOD a logOnGlError ()V
 	METHOD a setFramerateLimit (I)V
+	METHOD a logGlError (IJ)V
+		ARG 1 error
+		ARG 2 description
 	METHOD a setWindowIcon (Ljava/io/InputStream;Ljava/io/InputStream;)V
 		ARG 1 icon16
 	METHOD a setPhase (Ljava/lang/String;)V
 		ARG 1 phase
 	METHOD b getFramerateLimit ()I
+	METHOD b throwExceptionForGlError (IJ)V
 	METHOD b onSizeChanged (JII)V
 		ARG 1 handle
 	METHOD b setVsync (Z)V
+	METHOD c waitForFramerateLimit ()V
 	METHOD c setFullscreen (Z)V
 	METHOD d getVideoMode ()Ljava/util/Optional;
 	METHOD g toggleFullscreen ()V
@@ -30,3 +38,5 @@ CLASS cog net/minecraft/client/util/Window
 	METHOD l pollEvents ()V
 	METHOD o getScaledWidth ()I
 	METHOD p getScaledHeight ()I
+	METHOD t throwExceptionOnGlError ()V
+	METHOD u getMonitor ()V
diff --git a/mappings/net/minecraft/client/util/WindowProvider.mapping b/mappings/net/minecraft/client/util/WindowProvider.mapping
new file mode 100644
index 0000000000..121ebe05bf
--- /dev/null
+++ b/mappings/net/minecraft/client/util/WindowProvider.mapping
@@ -0,0 +1,5 @@
+CLASS dep net/minecraft/client/util/WindowProvider
+	FIELD a client Lcpk;
+	FIELD b monitorTracker Lcod;
+	METHOD a createMonitor (J)Lcnz;
+	METHOD a createWindow (Lcnu;Ljava/lang/String;Ljava/lang/String;)Lcog;
diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping
index 540133e3d1..3ef28228ca 100644
--- a/mappings/net/minecraft/server/MinecraftServer.mapping
+++ b/mappings/net/minecraft/server/MinecraftServer.mapping
@@ -182,5 +182,6 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
 	METHOD u exit ()V
 	METHOD v isNetherAllowed ()Z
 	METHOD w start ()V
+	METHOD x isServerThreadAlive ()Z
 	METHOD y getWorlds ()Ljava/lang/Iterable;
 	METHOD z getVersion ()Ljava/lang/String;