diff --git a/mappings/net/minecraft/class_5225.mapping b/mappings/net/minecraft/class_5225.mapping
deleted file mode 100644
index 2feefcbb98..0000000000
--- a/mappings/net/minecraft/class_5225.mapping
+++ /dev/null
@@ -1,6 +0,0 @@
-CLASS net/minecraft/class_5225
-	CLASS class_5230
-		FIELD field_24236 length I
-		METHOD <init> (Lnet/minecraft/class_5225;F)V
-			ARG 1 x0
-		METHOD method_27513 getMatchLength ()I
diff --git a/mappings/net/minecraft/class_5250.mapping b/mappings/net/minecraft/class_5250.mapping
deleted file mode 100644
index 884e6e9cfc..0000000000
--- a/mappings/net/minecraft/class_5250.mapping
+++ /dev/null
@@ -1,3 +0,0 @@
-CLASS net/minecraft/class_5250
-	METHOD method_10852 append (Lnet/minecraft/class_2561;)Lnet/minecraft/class_5250;
-	METHOD method_10862 setStyle (Lnet/minecraft/class_2583;)Lnet/minecraft/class_5250;
diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping
index ee627c22d2..9f3b73c4b0 100644
--- a/mappings/net/minecraft/client/MinecraftClient.mapping
+++ b/mappings/net/minecraft/client/MinecraftClient.mapping
@@ -51,7 +51,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 	FIELD field_1739 netProxy Ljava/net/Proxy;
 	FIELD field_17404 renderTaskQueue Ljava/util/Queue;
 	FIELD field_17405 worldGenProgressTracker Ljava/util/concurrent/atomic/AtomicReference;
-	FIELD field_1740 DEFAULT_TEXT_RENDERER_ID Lnet/minecraft/class_2960;
+	FIELD field_1740 DEFAULT_FONT_ID Lnet/minecraft/class_2960;
 	FIELD field_1741 pausedTickDelta F
 	FIELD field_1742 itemRenderer Lnet/minecraft/class_918;
 	FIELD field_1743 skipGameRender Z
@@ -96,6 +96,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 	FIELD field_22224 trackingTick I
 	FIELD field_22225 tickTimeTracker Lnet/minecraft/class_4757;
 	FIELD field_22226 tickProfilerResult Lnet/minecraft/class_3696;
+	FIELD field_24211 UNICODE_FONT_ID Lnet/minecraft/class_2960;
 	METHOD <init> (Lnet/minecraft/class_542;)V
 		ARG 1 args
 	METHOD method_1476 checkIs64Bit ()Z
@@ -239,3 +240,5 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 	METHOD method_24460 endMonitor (ZLnet/minecraft/class_4758;)V
 		ARG 1 active
 		ARG 2 monitor
+	METHOD method_27466 initFont (Z)V
+		ARG 1 forcesUnicode
diff --git a/mappings/net/minecraft/client/font/FontManager.mapping b/mappings/net/minecraft/client/font/FontManager.mapping
index 9e7871c127..c5fb82f2ec 100644
--- a/mappings/net/minecraft/client/font/FontManager.mapping
+++ b/mappings/net/minecraft/client/font/FontManager.mapping
@@ -1,8 +1,14 @@
 CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager
 	FIELD field_18215 resourceReloadListener Lnet/minecraft/class_3302;
-	FIELD field_2259 textRenderers Ljava/util/Map;
+	FIELD field_2259 fontStorages Ljava/util/Map;
 	FIELD field_2260 textureManager Lnet/minecraft/class_1060;
 	FIELD field_2261 LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD field_24254 MISSING_STORAGE_ID Lnet/minecraft/class_2960;
+	FIELD field_24255 missingStorage Lnet/minecraft/class_377;
+	FIELD field_24256 idOverrides Ljava/util/Map;
 	METHOD <init> (Lnet/minecraft/class_1060;)V
 		ARG 1 manager
 	METHOD method_18627 getResourceReloadListener ()Lnet/minecraft/class_3302;
+	METHOD method_27539 createTextRenderer ()Lnet/minecraft/class_327;
+	METHOD method_27541 setIdOverrides (Ljava/util/Map;)V
+		ARG 1 overrides
diff --git a/mappings/net/minecraft/client/font/TextHandler.mapping b/mappings/net/minecraft/client/font/TextHandler.mapping
new file mode 100644
index 0000000000..b491e75213
--- /dev/null
+++ b/mappings/net/minecraft/client/font/TextHandler.mapping
@@ -0,0 +1,145 @@
+CLASS net/minecraft/class_5225 net/minecraft/client/font/TextHandler
+	FIELD field_24216 widthRetriever Lnet/minecraft/class_5225$class_5231;
+	METHOD <init> (Lnet/minecraft/class_5225$class_5231;)V
+		ARG 1 widthRetriever
+	METHOD method_27482 getWidth (Ljava/lang/String;)F
+		COMMENT Returns the width of a string.
+		ARG 1 text
+	METHOD method_27483 moveCursorByWords (Ljava/lang/String;IIZ)I
+		ARG 0 text
+		ARG 1 offset
+		ARG 2 cursor
+		ARG 3 consumeSpaceOrBreak
+	METHOD method_27484 getTrimmedLength (Ljava/lang/String;ILnet/minecraft/class_2583;)I
+		COMMENT Returns the length of a string when it is trimmed to be at most {@code
+		COMMENT maxWidth} wide.
+		ARG 1 text
+			COMMENT the string to trim
+		ARG 2 maxWidth
+			COMMENT the max width of the trimmed string
+		ARG 3 style
+			COMMENT the style of the trimmed string
+	METHOD method_27485 wrapLines (Ljava/lang/String;ILnet/minecraft/class_2583;ZLnet/minecraft/class_5225$class_5229;)V
+		ARG 1 text
+		ARG 2 maxWidth
+		ARG 3 style
+		ARG 4 retainTrailingWordSplit
+		ARG 5 consumer
+	METHOD method_27488 getWidth (Lnet/minecraft/class_2561;)F
+		COMMENT Returns the width of a text.
+		ARG 1 text
+	METHOD method_27489 trimToWidth (Lnet/minecraft/class_2561;I)Lnet/minecraft/class_2561;
+		COMMENT Trim a text to be at most {@code maxWidth} wide.
+		COMMENT
+		COMMENT @return the trimmed text
+		ARG 1 text
+			COMMENT the text
+		ARG 2 maxWidth
+			COMMENT the max width of the trimmed text
+	METHOD method_27490 trimToWidth (Lnet/minecraft/class_2561;ILnet/minecraft/class_2583;)Lnet/minecraft/class_5250;
+		ARG 1 text
+		ARG 2 width
+		ARG 3 style
+	METHOD method_27491 wrapLines (Lnet/minecraft/class_2561;ILnet/minecraft/class_2583;Z)Ljava/util/List;
+		ARG 1 text
+			COMMENT the content to split
+		ARG 2 maxWidth
+			COMMENT the max width of a line
+		ARG 3 style
+			COMMENT a parent style applied to all the lines
+		ARG 4 retainTrailingWordSplit
+			COMMENT whether an original trailing space or newline is removed after a ling wrap
+	METHOD method_27494 trimToWidth (Ljava/lang/String;ILnet/minecraft/class_2583;)Ljava/lang/String;
+		COMMENT Trim a string to be at most {@code maxWidth} wide.
+		COMMENT
+		COMMENT @return the trimmed string
+		ARG 1 text
+			COMMENT the string to trim
+		ARG 2 maxWidth
+			COMMENT the max width of the trimmed string
+		ARG 3 style
+			COMMENT the style of the trimmed string
+	METHOD method_27495 wrapLines (Lnet/minecraft/class_2561;ILnet/minecraft/class_2583;)Ljava/util/List;
+		ARG 1 text
+		ARG 2 maxWidth
+		ARG 3 style
+	METHOD method_27497 trimToWidthBackwards (Ljava/lang/String;ILnet/minecraft/class_2583;)Ljava/lang/String;
+		COMMENT Trim a string from right to left to be at most {@code maxWidth} wide.
+		COMMENT
+		COMMENT @return the trimmed string
+		ARG 1 text
+			COMMENT the string to trim
+		ARG 2 maxWidth
+			COMMENT the max width of the trimmed string
+		ARG 3 style
+			COMMENT the style of the trimmed string
+	METHOD method_27498 wrapLines (Ljava/lang/String;ILnet/minecraft/class_2583;)Ljava/util/List;
+		ARG 1 text
+		ARG 2 maxWidth
+		ARG 3 style
+	CLASS 1
+		FIELD field_24219 collector Lnet/minecraft/class_5222;
+	CLASS class_5226 LineWrappingCollector
+		FIELD field_24220 parts Ljava/util/List;
+		FIELD field_24221 joined Ljava/lang/String;
+		METHOD <init> (Ljava/util/List;)V
+			ARG 1 parts
+		METHOD method_27499 collectRemainers ()Lnet/minecraft/class_2561;
+		METHOD method_27500 charAt (I)C
+			ARG 1 index
+		METHOD method_27501 collectLine (IILnet/minecraft/class_2583;)Lnet/minecraft/class_2561;
+			ARG 1 lineLength
+			ARG 2 skippedLength
+			ARG 3 style
+	CLASS class_5227 LineBreakingVisitor
+		FIELD field_24223 maxWidth F
+		FIELD field_24224 endIndex I
+		FIELD field_24225 endStyle Lnet/minecraft/class_2583;
+		FIELD field_24226 nonEmpty Z
+		FIELD field_24227 totalWidth F
+		FIELD field_24228 lastSpaceBreak I
+		FIELD field_24229 lastSpaceStyle Lnet/minecraft/class_2583;
+		FIELD field_24230 count I
+		FIELD field_24231 startOffset I
+		METHOD <init> (Lnet/minecraft/class_5225;F)V
+			ARG 2 maxWidth
+		METHOD method_27505 getEndingIndex ()I
+		METHOD method_27506 offset (I)V
+			ARG 1 extraOffset
+		METHOD method_27507 breakLine (ILnet/minecraft/class_2583;)Z
+			ARG 1 finishIndex
+			ARG 2 finishStyle
+		METHOD method_27508 getEndingStyle ()Lnet/minecraft/class_2583;
+		METHOD method_27509 hasLineBreak ()Z
+	CLASS class_5228 FormattedString
+		FIELD field_24232 text Ljava/lang/String;
+		FIELD field_24233 style Lnet/minecraft/class_2583;
+		METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_2583;)V
+			ARG 1 text
+			ARG 2 style
+		METHOD method_27510 getText ()Lnet/minecraft/class_5250;
+	CLASS class_5229 LineWrappingConsumer
+		COMMENT A consumer of the line-breaking information.
+		METHOD accept accept (Lnet/minecraft/class_2583;II)V
+			COMMENT Accepts the information on a line-wrap segment.
+			ARG 1 style
+				COMMENT the style of this line segment
+			ARG 2 start
+				COMMENT the start index of this segment in the original string, inclusive
+			ARG 3 end
+				COMMENT the end index of this segment in the original string, exclusive
+	CLASS class_5230 WidthLimitingVisitor
+		FIELD field_24235 widthLeft F
+		FIELD field_24236 length I
+		METHOD <init> (Lnet/minecraft/class_5225;F)V
+			ARG 2 maxWidth
+		METHOD method_27513 getLength ()I
+		METHOD method_27514 resetLength ()V
+	CLASS class_5231 WidthRetriever
+		COMMENT A retriever of character width.
+		METHOD getWidth getWidth (ILnet/minecraft/class_2583;)F
+			COMMENT Returns the width of a character.
+			ARG 1 codePoint
+				COMMENT the character's code point
+			ARG 2 style
+				COMMENT the style of the character, carrying font and formatting information
diff --git a/mappings/net/minecraft/client/font/TextRenderer.mapping b/mappings/net/minecraft/client/font/TextRenderer.mapping
index 1492a7b2a5..cc0ba3622f 100644
--- a/mappings/net/minecraft/client/font/TextRenderer.mapping
+++ b/mappings/net/minecraft/client/font/TextRenderer.mapping
@@ -1,8 +1,12 @@
 CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer
-	FIELD field_1997 fontStorage Ljava/util/function/Function;
+	FIELD field_1997 fontStorageAccessor Ljava/util/function/Function;
 	FIELD field_1999 rightToLeft Z
 	FIELD field_2000 fontHeight I
 	FIELD field_2001 random Ljava/util/Random;
+	FIELD field_24237 FORWARD_SHIFT Lnet/minecraft/class_1160;
+	FIELD field_24238 handler Lnet/minecraft/class_5225;
+	METHOD <init> (Ljava/util/function/Function;)V
+		ARG 1 fontStorageAccessor
 	METHOD method_1710 drawGlyph (Lnet/minecraft/class_382;ZZFFFLnet/minecraft/class_1159;Lnet/minecraft/class_4588;FFFFI)V
 		ARG 1 glyphRenderer
 		ARG 2 bold
@@ -18,6 +22,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer
 		ARG 12 alpha
 		ARG 13 light
 	METHOD method_1712 drawTrimmed (Lnet/minecraft/class_2561;IIII)V
+		ARG 1 text
 		ARG 2 x
 		ARG 3 y
 		ARG 4 maxWidth
@@ -26,13 +31,20 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer
 		ARG 1 text
 		ARG 2 maxWidth
 	METHOD method_1714 trimToWidth (Lnet/minecraft/class_2561;I)Lnet/minecraft/class_5250;
+		ARG 1 text
 		ARG 2 width
 	METHOD method_1719 setRightToLeft (Z)V
 		ARG 1 rightToLeft
 	METHOD method_1720 drawWithShadow (Lnet/minecraft/class_4587;Ljava/lang/String;FFI)I
+		ARG 1 matrices
+		ARG 2 text
+		ARG 3 x
+		ARG 4 y
+		ARG 5 color
 	METHOD method_1721 mirror (Ljava/lang/String;)Ljava/lang/String;
 		ARG 1 text
 	METHOD method_1723 drawInternal (Lnet/minecraft/class_2561;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)I
+		ARG 1 text
 		ARG 2 x
 		ARG 3 y
 		ARG 4 color
@@ -54,17 +66,106 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer
 		ARG 9 underlineColor
 		ARG 10 light
 	METHOD method_1726 isRightToLeft ()Z
-	METHOD method_1727 getStringWidth (Ljava/lang/String;)I
-	METHOD method_1728 wrapStringToWidthAsList (Lnet/minecraft/class_2561;I)Ljava/util/List;
+	METHOD method_1727 getWidth (Ljava/lang/String;)I
+		ARG 1 text
+	METHOD method_1728 wrapLines (Lnet/minecraft/class_2561;I)Ljava/util/List;
+		ARG 1 text
 		ARG 2 width
 	METHOD method_1729 draw (Lnet/minecraft/class_4587;Ljava/lang/String;FFI)I
+		ARG 1 matrices
+		ARG 2 text
+		ARG 3 x
+		ARG 4 y
+		ARG 5 color
 	METHOD method_22941 draw (Lnet/minecraft/class_2561;FFILnet/minecraft/class_1159;Z)I
+		ARG 1 text
 		ARG 2 x
 		ARG 3 y
 		ARG 4 color
 		ARG 5 matrix
 		ARG 6 shadow
 	METHOD method_22942 draw (Lnet/minecraft/class_2561;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)I
+		ARG 1 text
+		ARG 2 x
+		ARG 3 y
+		ARG 4 color
+		ARG 5 shadow
+		ARG 6 matrix
+		ARG 7 vertexConsumers
+		ARG 8 seeThrough
+		ARG 9 backgroundColor
+		ARG 10 light
+	METHOD method_27515 tweakTransparency (I)I
+		ARG 0 argb
+	METHOD method_27517 drawWithShadow (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;FFI)I
+		ARG 1 matrices
+		ARG 2 text
+		ARG 3 x
+		ARG 4 y
+		ARG 5 color
+	METHOD method_27520 draw (Ljava/lang/String;FFILnet/minecraft/class_1159;ZZ)I
+		ARG 1 text
+		ARG 2 x
+		ARG 3 y
+		ARG 4 color
+		ARG 5 matrix
+		ARG 6 shadow
+		ARG 7 rightToLeft
+	METHOD method_27521 draw (Ljava/lang/String;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)I
+		ARG 1 text
+		ARG 2 x
+		ARG 3 y
+		ARG 4 color
+		ARG 5 shadow
+		ARG 6 matrix
+		ARG 7 vertexConsumers
+		ARG 8 seeThrough
+		ARG 9 backgroundColor
+		ARG 10 light
+	METHOD method_27522 draw (Ljava/lang/String;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZIIZ)I
+		ARG 1 text
+		ARG 2 x
+		ARG 3 y
+		ARG 4 color
+		ARG 5 shadow
+		ARG 6 matrix
+		ARG 7 vertexConsumers
+		ARG 8 seeThrough
+		ARG 9 backgroundColor
+		ARG 10 light
+		ARG 11 rightToLeft
+	METHOD method_27523 trimToWidth (Ljava/lang/String;I)Ljava/lang/String;
+		ARG 1 text
+		ARG 2 maxWidth
+	METHOD method_27524 trimToWidth (Ljava/lang/String;IZ)Ljava/lang/String;
+		ARG 1 text
+		ARG 2 maxWidth
+		ARG 3 backwards
+	METHOD method_27525 getWidth (Lnet/minecraft/class_2561;)I
+		ARG 1 text
+	METHOD method_27526 getFontStorage (Lnet/minecraft/class_2960;)Lnet/minecraft/class_377;
+		ARG 1 id
+	METHOD method_27527 getTextHandler ()Lnet/minecraft/class_5225;
+	METHOD method_27528 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;FFI)I
+		ARG 1 matrices
+		ARG 2 text
+		ARG 3 x
+		ARG 4 y
+		ARG 5 color
+	METHOD method_27529 drawInternal (Ljava/lang/String;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZIIZ)I
+		ARG 1 text
+		ARG 2 x
+		ARG 3 y
+		ARG 4 color
+		ARG 5 shadow
+		ARG 6 matrix
+		ARG 7 vertexConsumers
+		ARG 8 seeThrough
+		ARG 9 backgroundColor
+		ARG 10 light
+		ARG 11 rightToLeft
+	METHOD method_27530 drawLayer (Lnet/minecraft/class_2561;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)F
+		ARG 1 text
 		ARG 2 x
 		ARG 3 y
 		ARG 4 color
@@ -72,5 +173,33 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer
 		ARG 6 matrix
 		ARG 7 vertexConsumerProvider
 		ARG 8 seeThrough
-		ARG 9 backgroundColor
+		ARG 9 underlineColor
 		ARG 10 light
+	CLASS class_5232 ShadowDrawer
+		FIELD field_24239 vertexConsumers Lnet/minecraft/class_4597;
+		FIELD field_24241 shadow Z
+		FIELD field_24242 brightnessMultiplier F
+		FIELD field_24243 red F
+		FIELD field_24244 green F
+		FIELD field_24245 blue F
+		FIELD field_24246 alpha F
+		FIELD field_24247 matrix Lnet/minecraft/class_1159;
+		FIELD field_24248 seeThrough Z
+		FIELD field_24249 light I
+		FIELD field_24250 x F
+		FIELD field_24251 y F
+		FIELD field_24252 rectangles Ljava/util/List;
+		METHOD <init> (Lnet/minecraft/class_327;Lnet/minecraft/class_4597;FFIZLnet/minecraft/class_1159;ZI)V
+			ARG 2 vertexConsumers
+			ARG 3 x
+			ARG 4 y
+			ARG 5 color
+			ARG 6 shadow
+			ARG 7 matrix
+			ARG 8 seeThrough
+			ARG 9 light
+		METHOD method_27531 drawLayer (IF)F
+			ARG 1 underlineColor
+			ARG 2 x
+		METHOD method_27532 addRectangle (Lnet/minecraft/class_382$class_328;)V
+			ARG 1 rectangle
diff --git a/mappings/net/minecraft/client/font/TextVisitFactory.mapping b/mappings/net/minecraft/client/font/TextVisitFactory.mapping
new file mode 100644
index 0000000000..89c7fd478b
--- /dev/null
+++ b/mappings/net/minecraft/client/font/TextVisitFactory.mapping
@@ -0,0 +1,108 @@
+CLASS net/minecraft/class_5223 net/minecraft/client/font/TextVisitFactory
+	COMMENT A utility class for visiting the characters of strings, handling surrogate
+	COMMENT code points and formatting codes.
+	FIELD field_24215 VISIT_TERMINATED Ljava/util/Optional;
+	METHOD method_27471 validateSurrogates (Ljava/lang/String;)Ljava/lang/String;
+		COMMENT Returns a new string that has all surrogate characters within validated
+		COMMENT from an original string.
+		ARG 0 text
+			COMMENT the original string
+	METHOD method_27472 visitFormatted (Ljava/lang/String;ILnet/minecraft/class_2583;Lnet/minecraft/class_5223$class_5224;)Z
+		COMMENT Visits the code points of a string, applying the formatting codes within.
+		COMMENT
+		COMMENT <p>The visit is in forward direction.</p>
+		COMMENT
+		COMMENT @return {@code true} if the full string was visited, or {@code false} indicating
+		COMMENT the {@code visitor} terminated half-way
+		ARG 0 text
+			COMMENT the string visited
+		ARG 1 startIndex
+			COMMENT the starting index of the visit
+		ARG 2 style
+			COMMENT the style of the string
+		ARG 3 visitor
+	METHOD method_27473 visitFormatted (Ljava/lang/String;ILnet/minecraft/class_2583;Lnet/minecraft/class_2583;Lnet/minecraft/class_5223$class_5224;)Z
+		COMMENT Visits the code points of a string, applying the formatting codes within.
+		COMMENT
+		COMMENT <p>The visit is in forward direction.</p>
+		COMMENT
+		COMMENT @return {@code true} if the full string was visited, or {@code false} indicating
+		COMMENT the {@code visitor} terminated half-way
+		ARG 0 text
+			COMMENT the string visited
+		ARG 1 startIndex
+			COMMENT the starting index of the visit
+		ARG 2 startingStyle
+			COMMENT the style of the string when the visit starts
+		ARG 3 resetStyle
+			COMMENT the style to reset to when a {@code §r} formatting code is encountered
+		ARG 4 visitor
+			COMMENT the visitor
+	METHOD method_27474 visitForwards (Ljava/lang/String;Lnet/minecraft/class_2583;Lnet/minecraft/class_5223$class_5224;)Z
+		COMMENT Visits the code points of a string in forward (left to right) direction.
+		COMMENT
+		COMMENT @return {@code true} if the full string was visited, or {@code false} indicating
+		COMMENT the {@code visitor} terminated half-way
+		ARG 0 text
+			COMMENT the string
+		ARG 1 style
+			COMMENT the style of the string
+		ARG 2 visitor
+			COMMENT the visitor of characters
+	METHOD method_27476 visitFormatted (Lnet/minecraft/class_2561;Lnet/minecraft/class_2583;Lnet/minecraft/class_5223$class_5224;)Z
+		COMMENT Visits the code points for every {@link Text#asString() partial string}
+		COMMENT of the texts in {@code text} and its siblings, applying the formatting
+		COMMENT codes within.
+		COMMENT
+		COMMENT <p>The visit is in forward direction.</p>
+		COMMENT
+		COMMENT @return {@code true} if the full string was visited, or {@code false} indicating
+		COMMENT the {@code visitor} terminated half-way
+		COMMENT @see Text#visit(Text.StyledVisitor, Style)
+		ARG 0 text
+		ARG 1 style
+		ARG 2 visitor
+	METHOD method_27477 visitRegularCharacter (Lnet/minecraft/class_2583;Lnet/minecraft/class_5223$class_5224;IC)Z
+		ARG 0 style
+		ARG 1 visitor
+		ARG 2 index
+		ARG 3 c
+	METHOD method_27478 visitBackwards (Ljava/lang/String;Lnet/minecraft/class_2583;Lnet/minecraft/class_5223$class_5224;)Z
+		COMMENT Visits the code points of a string in backward (right to left) direction.
+		COMMENT
+		COMMENT @return {@code true} if the full string was visited, or {@code false} indicating
+		COMMENT the {@code visitor} terminated half-way
+		ARG 0 text
+			COMMENT the string
+		ARG 1 style
+			COMMENT the style of the string
+		ARG 2 visitor
+			COMMENT the visitor
+	METHOD method_27479 visitFormatted (Ljava/lang/String;Lnet/minecraft/class_2583;Lnet/minecraft/class_5223$class_5224;)Z
+		COMMENT Visits the code points of a string, applying the formatting codes within.
+		COMMENT
+		COMMENT <p>The visit is in forward direction.</p>
+		COMMENT
+		COMMENT @return {@code true} if the full string was visited, or {@code false} indicating
+		COMMENT the {@code visitor} terminated half-way
+		ARG 0 text
+			COMMENT the string visited
+		ARG 1 style
+			COMMENT the style of the string
+		ARG 2 visitor
+			COMMENT the visitor
+	CLASS class_5224 CharacterVisitor
+		COMMENT A visitor for single characters in a string.
+		METHOD onChar onChar (ILnet/minecraft/class_2583;I)Z
+			COMMENT Visits a single character.
+			COMMENT
+			COMMENT <p>Multiple surrogate characters are converted into one single {@code
+			COMMENT codePoint} when passed into this method.</p>
+			COMMENT
+			COMMENT @return {@code true} to continue visiting other characters, or {@code false} to terminate the visit
+			ARG 1 index
+				COMMENT the current index of the character
+			ARG 2 style
+				COMMENT the style of the character, containing formatting and font information
+			ARG 3 codePoint
+				COMMENT the code point of the character
diff --git a/mappings/net/minecraft/client/util/ChatMessages.mapping b/mappings/net/minecraft/client/util/ChatMessages.mapping
new file mode 100644
index 0000000000..9e7cb10404
--- /dev/null
+++ b/mappings/net/minecraft/client/util/ChatMessages.mapping
@@ -0,0 +1,7 @@
+CLASS net/minecraft/class_341 net/minecraft/client/util/ChatMessages
+	METHOD method_1849 getRenderedChatMessage (Ljava/lang/String;)Ljava/lang/String;
+		ARG 0 message
+	METHOD method_1850 breakRenderedChatMessageLines (Lnet/minecraft/class_2561;ILnet/minecraft/class_327;)Ljava/util/List;
+		ARG 0 text
+		ARG 1 width
+		ARG 2 textRenderer
diff --git a/mappings/net/minecraft/client/util/SelectionManager.mapping b/mappings/net/minecraft/client/util/SelectionManager.mapping
index d42f9753f5..603c2440d7 100644
--- a/mappings/net/minecraft/client/util/SelectionManager.mapping
+++ b/mappings/net/minecraft/client/util/SelectionManager.mapping
@@ -1,14 +1,43 @@
 CLASS net/minecraft/class_3728 net/minecraft/client/util/SelectionManager
 	FIELD field_16452 selectionEnd I
 	FIELD field_16453 selectionStart I
-	FIELD field_16456 stringGetter Ljava/util/function/Supplier;
-	FIELD field_16458 stringSetter Ljava/util/function/Consumer;
+	FIELD field_16456 clipboardGetter Ljava/util/function/Supplier;
+	FIELD field_16458 clipboardSetter Ljava/util/function/Consumer;
+	FIELD field_24257 stringGetter Ljava/util/function/Supplier;
+	FIELD field_24258 stringSetter Ljava/util/function/Consumer;
+	FIELD field_24259 stringFilter Ljava/util/function/Predicate;
 	METHOD method_16197 insert (Ljava/lang/String;)V
 	METHOD method_16198 deleteSelectedText (Ljava/lang/String;)Ljava/lang/String;
 	METHOD method_16199 insert (C)Z
+		ARG 1 c
 	METHOD method_16200 getSelectedText (Ljava/lang/String;)Ljava/lang/String;
 	METHOD method_16201 getSelectionStart ()I
 	METHOD method_16202 handleSpecialKey (I)Z
 		ARG 1 keyCode
 	METHOD method_16203 getSelectionEnd ()I
 	METHOD method_16204 moveCaretToEnd ()V
+	METHOD method_27547 cut ()V
+	METHOD method_27549 moveCursor (IZ)V
+		ARG 1 offset
+		ARG 2 shiftDown
+	METHOD method_27550 makeClipboardGetter (Lnet/minecraft/class_310;)Ljava/util/function/Supplier;
+		ARG 0 client
+	METHOD method_27551 setClipboard (Lnet/minecraft/class_310;Ljava/lang/String;)V
+		ARG 0 client
+	METHOD method_27552 insert (Ljava/lang/String;Ljava/lang/String;)V
+		ARG 1 string
+		ARG 2 insertion
+	METHOD method_27554 paste ()V
+	METHOD method_27555 moveCursorPastWord (IZ)V
+		ARG 1 offset
+		ARG 2 shiftDown
+	METHOD method_27556 getClipboard (Lnet/minecraft/class_310;)Ljava/lang/String;
+		ARG 0 client
+	METHOD method_27559 copy ()V
+	METHOD method_27561 makeClipboardSetter (Lnet/minecraft/class_310;)Ljava/util/function/Consumer;
+		ARG 0 client
+	METHOD method_27562 updateSelectionRange (Z)V
+		ARG 1 shiftDown
+	METHOD method_27563 selectAll ()V
+	METHOD method_27564 delete (I)V
+		ARG 1 cursorOffset
diff --git a/mappings/net/minecraft/client/util/TextCollector.mapping b/mappings/net/minecraft/client/util/TextCollector.mapping
new file mode 100644
index 0000000000..404b1c29d4
--- /dev/null
+++ b/mappings/net/minecraft/client/util/TextCollector.mapping
@@ -0,0 +1,7 @@
+CLASS net/minecraft/class_5222 net/minecraft/client/util/TextCollector
+	FIELD field_24209 needsFakeRoot Z
+	FIELD field_24210 root Lnet/minecraft/class_5250;
+	METHOD method_27461 getRawCombined ()Lnet/minecraft/class_5250;
+	METHOD method_27462 add (Lnet/minecraft/class_5250;)V
+		ARG 1 text
+	METHOD method_27463 getCombined ()Lnet/minecraft/class_5250;
diff --git a/mappings/net/minecraft/client/util/Texts.mapping b/mappings/net/minecraft/client/util/Texts.mapping
deleted file mode 100644
index 9039b23cba..0000000000
--- a/mappings/net/minecraft/client/util/Texts.mapping
+++ /dev/null
@@ -1,7 +0,0 @@
-CLASS net/minecraft/class_341 net/minecraft/client/util/Texts
-	METHOD method_1849 getRenderChatMessage (Ljava/lang/String;)Ljava/lang/String;
-		ARG 0 string
-	METHOD method_1850 wrapLines (Lnet/minecraft/class_2561;ILnet/minecraft/class_327;)Ljava/util/List;
-		ARG 0 text
-		ARG 1 width
-		ARG 2 textRenderer
diff --git a/mappings/net/minecraft/text/HoverEvent.mapping b/mappings/net/minecraft/text/HoverEvent.mapping
index 59cf2062ad..03a7f799fc 100644
--- a/mappings/net/minecraft/text/HoverEvent.mapping
+++ b/mappings/net/minecraft/text/HoverEvent.mapping
@@ -1,9 +1,72 @@
 CLASS net/minecraft/class_2568 net/minecraft/text/HoverEvent
-	FIELD field_11755 value Ljava/lang/Object;
+	FIELD field_11755 contents Ljava/lang/Object;
 	FIELD field_11756 action Lnet/minecraft/class_2568$class_5247;
+	FIELD field_24341 LOGGER Lorg/apache/logging/log4j/Logger;
 	METHOD <init> (Lnet/minecraft/class_2568$class_5247;Ljava/lang/Object;)V
 		ARG 1 action
+		ARG 2 contents
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 obj
 	METHOD method_10891 getValue (Lnet/minecraft/class_2568$class_5247;)Ljava/lang/Object;
+		ARG 1 action
 	METHOD method_10892 getAction ()Lnet/minecraft/class_2568$class_5247;
+	METHOD method_27664 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_2568;
+		ARG 0 json
+	METHOD method_27665 toJson ()Lcom/google/gson/JsonObject;
+	CLASS class_5247 Action
+		FIELD field_24345 BY_NAME Ljava/util/Map;
+		FIELD field_24346 name Ljava/lang/String;
+		FIELD field_24347 parsable Z
+		FIELD field_24348 deserializer Ljava/util/function/Function;
+		FIELD field_24349 serializer Ljava/util/function/Function;
+		FIELD field_24350 legacyDeserializer Ljava/util/function/Function;
+		METHOD <init> (Ljava/lang/String;ZLjava/util/function/Function;Ljava/util/function/Function;Ljava/util/function/Function;)V
+			ARG 1 name
+			ARG 2 parsable
+			ARG 3 deserializer
+			ARG 4 serializer
+			ARG 5 legacyDeserializer
+		METHOD method_27667 isParsable ()Z
+		METHOD method_27668 buildHoverEvent (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2568;
+			ARG 1 contents
+		METHOD method_27669 contentsToJson (Ljava/lang/Object;)Lcom/google/gson/JsonElement;
+			ARG 1 contents
+		METHOD method_27670 byName (Ljava/lang/String;)Lnet/minecraft/class_2568$class_5247;
+			ARG 0 name
+		METHOD method_27671 buildHoverEvent (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2568;
+			ARG 1 value
+		METHOD method_27674 getName ()Ljava/lang/String;
+		METHOD method_27676 cast (Ljava/lang/Object;)Ljava/lang/Object;
+			ARG 1 o
+	CLASS class_5248 EntityContent
+		FIELD field_24351 entityType Lnet/minecraft/class_1299;
+		FIELD field_24352 uuid Ljava/util/UUID;
+		FIELD field_24353 name Lnet/minecraft/class_2561;
+		FIELD field_24354 tooltip Ljava/util/List;
+		METHOD <init> (Lnet/minecraft/class_1299;Ljava/util/UUID;Lnet/minecraft/class_2561;)V
+			ARG 1 entityType
+			ARG 2 uuid
+			ARG 3 name
+		METHOD method_27679 toJson ()Lcom/google/gson/JsonElement;
+		METHOD method_27680 parse (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2568$class_5248;
+			ARG 0 json
+		METHOD method_27681 parse (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2568$class_5248;
+			ARG 0 text
+		METHOD method_27682 asTooltip ()Ljava/util/List;
+	CLASS class_5249 ItemStackContent
+		FIELD field_24355 item Lnet/minecraft/class_1792;
+		FIELD field_24356 count I
+		FIELD field_24357 tag Lnet/minecraft/class_2487;
+		FIELD field_24358 stack Lnet/minecraft/class_1799;
+		METHOD <init> (Lnet/minecraft/class_1792;ILnet/minecraft/class_2487;)V
+			ARG 1 item
+			ARG 2 count
+			ARG 3 tag
+		METHOD <init> (Lnet/minecraft/class_1799;)V
+			ARG 1 stack
+		METHOD method_27683 asStack ()Lnet/minecraft/class_1799;
+		METHOD method_27687 toJson ()Lcom/google/gson/JsonElement;
+		METHOD method_27688 parse (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2568$class_5249;
+			ARG 0 json
+		METHOD method_27689 parse (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2568$class_5249;
+			ARG 0 text
diff --git a/mappings/net/minecraft/text/KeybindText.mapping b/mappings/net/minecraft/text/KeybindText.mapping
index 41b94723ec..c840e94cc5 100644
--- a/mappings/net/minecraft/text/KeybindText.mapping
+++ b/mappings/net/minecraft/text/KeybindText.mapping
@@ -1,9 +1,12 @@
 CLASS net/minecraft/class_2572 net/minecraft/text/KeybindText
-	FIELD field_11766 i18n Ljava/util/function/Function;
+	FIELD field_11766 translator Ljava/util/function/Function;
 	FIELD field_11767 key Ljava/lang/String;
-	FIELD field_11768 name Ljava/util/function/Supplier;
+	FIELD field_11768 translated Ljava/util/function/Supplier;
 	METHOD <init> (Ljava/lang/String;)V
 		ARG 1 key
 	METHOD method_10901 getKey ()Ljava/lang/String;
 	METHOD method_10904 (Ljava/lang/String;)Ljava/util/function/Supplier;
 		ARG 0 key
+	METHOD method_27690 setTranslator (Ljava/util/function/Function;)V
+		ARG 0 translator
+	METHOD method_27691 getTranslated ()Lnet/minecraft/class_2561;
diff --git a/mappings/net/minecraft/text/LiteralText.mapping b/mappings/net/minecraft/text/LiteralText.mapping
index 3a72ffefa7..73d45e9dd0 100644
--- a/mappings/net/minecraft/text/LiteralText.mapping
+++ b/mappings/net/minecraft/text/LiteralText.mapping
@@ -1,5 +1,6 @@
 CLASS net/minecraft/class_2585 net/minecraft/text/LiteralText
 	FIELD field_11862 string Ljava/lang/String;
+	FIELD field_24366 EMPTY Lnet/minecraft/class_2561;
 	METHOD <init> (Ljava/lang/String;)V
 		ARG 1 string
 	METHOD method_10993 getRawString ()Ljava/lang/String;
diff --git a/mappings/net/minecraft/text/MutableText.mapping b/mappings/net/minecraft/text/MutableText.mapping
new file mode 100644
index 0000000000..3bd456aa62
--- /dev/null
+++ b/mappings/net/minecraft/text/MutableText.mapping
@@ -0,0 +1,35 @@
+CLASS net/minecraft/class_5250 net/minecraft/text/MutableText
+	COMMENT A text with mutation operations.
+	METHOD method_10852 append (Lnet/minecraft/class_2561;)Lnet/minecraft/class_5250;
+		COMMENT Appends a text to this text's siblings.
+		ARG 1 text
+			COMMENT the sibling
+	METHOD method_10862 setStyle (Lnet/minecraft/class_2583;)Lnet/minecraft/class_5250;
+		COMMENT Sets the style of this text.
+		ARG 1 style
+	METHOD method_27692 formatted (Lnet/minecraft/class_124;)Lnet/minecraft/class_5250;
+		COMMENT Add a formatting to this text's style.
+		ARG 1 formatting
+			COMMENT a formatting
+	METHOD method_27693 append (Ljava/lang/String;)Lnet/minecraft/class_5250;
+		COMMENT Appends a literal text with content {@code text} to this text's siblings.
+		ARG 1 text
+			COMMENT the literal text content
+	METHOD method_27694 styled (Ljava/util/function/UnaryOperator;)Lnet/minecraft/class_5250;
+		COMMENT Updates the style of this text.
+		COMMENT
+		COMMENT @see Text#getStyle()
+		COMMENT @see #setStyle(Style)
+		ARG 1 styleUpdater
+			COMMENT the style updater
+	METHOD method_27695 formatted ([Lnet/minecraft/class_124;)Lnet/minecraft/class_5250;
+		COMMENT Adds some formattings to this text's style.
+		ARG 1 formattings
+			COMMENT an array of formattings
+	METHOD method_27696 fillStyle (Lnet/minecraft/class_2583;)Lnet/minecraft/class_5250;
+		COMMENT Fills the absent parts of this text's style with definitions from {@code
+		COMMENT styleOverride}.
+		COMMENT
+		COMMENT @see Style#withParent(Style)
+		ARG 1 styleOverride
+			COMMENT the style that provides definitions for absent definitions in this text's style
diff --git a/mappings/net/minecraft/text/NbtText.mapping b/mappings/net/minecraft/text/NbtText.mapping
index b6f405a5bd..7c9cea2802 100644
--- a/mappings/net/minecraft/text/NbtText.mapping
+++ b/mappings/net/minecraft/text/NbtText.mapping
@@ -59,9 +59,11 @@ CLASS net/minecraft/class_2574 net/minecraft/text/NbtText
 		FIELD field_21049 id Lnet/minecraft/class_2960;
 		METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_2203$class_2209;ZLnet/minecraft/class_2960;)V
 			ARG 1 rawPath
+			ARG 2 path
 			ARG 3 interpret
 			ARG 4 id
 		METHOD <init> (Ljava/lang/String;ZLnet/minecraft/class_2960;)V
 			ARG 1 rawPath
 			ARG 2 interpret
 			ARG 3 id
+		METHOD method_23728 getId ()Lnet/minecraft/class_2960;
diff --git a/mappings/net/minecraft/text/ParsableText.mapping b/mappings/net/minecraft/text/ParsableText.mapping
index 61d7968536..21995c7491 100644
--- a/mappings/net/minecraft/text/ParsableText.mapping
+++ b/mappings/net/minecraft/text/ParsableText.mapping
@@ -1,4 +1,5 @@
 CLASS net/minecraft/class_2566 net/minecraft/text/ParsableText
+	COMMENT A {@link Text} that needs to be parsed when it is loaded into the game.
 	METHOD method_10890 parse (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;I)Lnet/minecraft/class_5250;
 		ARG 1 source
 		ARG 2 sender
diff --git a/mappings/net/minecraft/text/ScoreText.mapping b/mappings/net/minecraft/text/ScoreText.mapping
index 9ae4185500..c05f46153e 100644
--- a/mappings/net/minecraft/text/ScoreText.mapping
+++ b/mappings/net/minecraft/text/ScoreText.mapping
@@ -5,5 +5,16 @@ CLASS net/minecraft/class_2578 net/minecraft/text/ScoreText
 	METHOD <init> (Ljava/lang/String;Ljava/lang/String;)V
 		ARG 1 name
 		ARG 2 objective
+	METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_2300;Ljava/lang/String;)V
+		ARG 1 name
+		ARG 2 selector
+		ARG 3 objective
 	METHOD method_10928 getObjective ()Ljava/lang/String;
 	METHOD method_10930 getName ()Ljava/lang/String;
+	METHOD method_27699 getPlayerName (Lnet/minecraft/class_2168;)Ljava/lang/String;
+		ARG 1 source
+	METHOD method_27700 getScore (Ljava/lang/String;Lnet/minecraft/class_2168;)Ljava/lang/String;
+		ARG 1 playerName
+		ARG 2 source
+	METHOD method_27701 parseEntitySelector (Ljava/lang/String;)Lnet/minecraft/class_2300;
+		ARG 0 name
diff --git a/mappings/net/minecraft/text/Style.mapping b/mappings/net/minecraft/text/Style.mapping
index 57123869e3..1c8c675a14 100644
--- a/mappings/net/minecraft/text/Style.mapping
+++ b/mappings/net/minecraft/text/Style.mapping
@@ -1,5 +1,11 @@
 CLASS net/minecraft/class_2583 net/minecraft/text/Style
-	FIELD field_11851 underline Ljava/lang/Boolean;
+	COMMENT The style of a {@link Text}, representing cosmetic attributes. It includes
+	COMMENT font, formatting, click/hover events (actions), color, etc.
+	COMMENT
+	COMMENT <p>A style is immutable.</p>
+	COMMENT
+	COMMENT @see Text
+	FIELD field_11851 underlined Ljava/lang/Boolean;
 	FIELD field_11852 italic Ljava/lang/Boolean;
 	FIELD field_11853 clickEvent Lnet/minecraft/class_2558;
 	FIELD field_11855 color Lnet/minecraft/class_5251;
@@ -8,31 +14,144 @@ CLASS net/minecraft/class_2583 net/minecraft/text/Style
 	FIELD field_11858 hoverEvent Lnet/minecraft/class_2568;
 	FIELD field_11859 insertion Ljava/lang/String;
 	FIELD field_11861 obfuscated Ljava/lang/Boolean;
+	FIELD field_24359 DEFAULT_FONT_ID Lnet/minecraft/class_2960;
+		COMMENT The identifier for the default font of a style.
+	FIELD field_24360 EMPTY Lnet/minecraft/class_2583;
+		COMMENT An empty style.
+	FIELD field_24361 font Lnet/minecraft/class_2960;
+	METHOD <init> (Lnet/minecraft/class_5251;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Lnet/minecraft/class_2558;Lnet/minecraft/class_2568;Ljava/lang/String;Lnet/minecraft/class_2960;)V
+		ARG 1 color
+		ARG 2 bold
+		ARG 3 italic
+		ARG 4 underlined
+		ARG 5 strikethrough
+		ARG 6 obfuscated
+		ARG 7 clickEvent
+		ARG 8 hoverEvent
+		ARG 9 insertion
+		ARG 10 font
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 obj
 	METHOD method_10949 setHoverEvent (Lnet/minecraft/class_2568;)Lnet/minecraft/class_2583;
+		COMMENT Returns a new style with the hover event provided and all other
+		COMMENT attributes of this style.
+		ARG 1 hoverEvent
+			COMMENT the new hover event
 	METHOD method_10955 getInsertion ()Ljava/lang/String;
-	METHOD method_10958 setClickEvent (Lnet/minecraft/class_2558;)Lnet/minecraft/class_2583;
+		COMMENT Returns the insertion text of the style.
+		COMMENT
+		COMMENT <p>An insertion is inserted when a piece of text clicked while shift key
+		COMMENT is down in the chat HUD.</p>
+	METHOD method_10958 withClickEvent (Lnet/minecraft/class_2558;)Lnet/minecraft/class_2583;
+		COMMENT Returns a new style with the click event provided and all other
+		COMMENT attributes of this style.
+		ARG 1 clickEvent
+			COMMENT the new click event
 	METHOD method_10965 isUnderlined ()Z
+		COMMENT Returns whether the style has underline formatting.
+		COMMENT
+		COMMENT @see Formatting#UNDERLINE
 	METHOD method_10966 isItalic ()Z
+		COMMENT Returns whether the style has italic formatting.
+		COMMENT
+		COMMENT @see Formatting#ITALIC
 	METHOD method_10967 isEmpty ()Z
+		COMMENT Returns if this is the empty style.
+		COMMENT
+		COMMENT @see #EMPTY
 	METHOD method_10969 getHoverEvent ()Lnet/minecraft/class_2568;
+		COMMENT Returns the hover event of this style.
 	METHOD method_10970 getClickEvent ()Lnet/minecraft/class_2558;
+		COMMENT Returns the click event of this style.
 	METHOD method_10973 getColor ()Lnet/minecraft/class_5251;
-	METHOD method_10975 setInsertion (Ljava/lang/String;)Lnet/minecraft/class_2583;
-	METHOD method_10977 setColor (Lnet/minecraft/class_124;)Lnet/minecraft/class_2583;
+		COMMENT Returns the color of this style.
+	METHOD method_10975 withInsertion (Ljava/lang/String;)Lnet/minecraft/class_2583;
+		COMMENT Returns a new style with the insertion provided and all other
+		COMMENT attributes of this style.
+		ARG 1 insertion
+			COMMENT the new insertion string
+	METHOD method_10977 withColor (Lnet/minecraft/class_124;)Lnet/minecraft/class_2583;
+		COMMENT Returns a new style with the color provided and all other attributes of
+		COMMENT this style.
 		ARG 1 color
-	METHOD method_10978 setItalic (Ljava/lang/Boolean;)Lnet/minecraft/class_2583;
-	METHOD method_10982 setBold (Ljava/lang/Boolean;)Lnet/minecraft/class_2583;
+			COMMENT the new color
+	METHOD method_10978 withItalic (Ljava/lang/Boolean;)Lnet/minecraft/class_2583;
+		COMMENT Returns a new style with the italic attribute provided and all other
+		COMMENT attributes of this style.
+		ARG 1 italic
+			COMMENT the new italic property
+	METHOD method_10982 withBold (Ljava/lang/Boolean;)Lnet/minecraft/class_2583;
+		COMMENT Returns a new style with the bold attribute provided and all other
+		COMMENT attributes of this style.
 		ARG 1 bold
+			COMMENT the new bold property
 	METHOD method_10984 isBold ()Z
+		COMMENT Returns whether the style has bold formatting.
+		COMMENT
+		COMMENT @see Formatting#BOLD
 	METHOD method_10986 isStrikethrough ()Z
+		COMMENT Returns whether the style has strikethrough formatting.
+		COMMENT
+		COMMENT @see Formatting#STRIKETHROUGH
 	METHOD method_10987 isObfuscated ()Z
+		COMMENT Returns whether the style has obfuscated formatting.
+		COMMENT
+		COMMENT @see Formatting#OBFUSCATED
+	METHOD method_27702 withParent (Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583;
+		COMMENT Returns a new style with the undefined attributes of this style filled
+		COMMENT by the {@code parent} style.
+		ARG 1 parent
+			COMMENT the parent style
+	METHOD method_27703 withColor (Lnet/minecraft/class_5251;)Lnet/minecraft/class_2583;
+		COMMENT Returns a new style with the color provided and all other attributes of
+		COMMENT this style.
+		ARG 1 color
+			COMMENT the new color
+	METHOD method_27704 withFont (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2583;
+		COMMENT Returns a new style with the font provided and all other
+		COMMENT attributes of this style.
+		ARG 1 font
+			COMMENT the new font
+	METHOD method_27705 withFormatting ([Lnet/minecraft/class_124;)Lnet/minecraft/class_2583;
+		COMMENT Returns a new style with the formattings provided and all other
+		COMMENT attributes of this style.
+		ARG 1 formattings
+			COMMENT an array of new formattings
+	METHOD method_27706 withFormatting (Lnet/minecraft/class_124;)Lnet/minecraft/class_2583;
+		COMMENT Returns a new style with the formatting provided and all other
+		COMMENT attributes of this style.
+		ARG 1 formatting
+			COMMENT the new formatting
+	METHOD method_27707 withExclusiveFormatting (Lnet/minecraft/class_124;)Lnet/minecraft/class_2583;
+		COMMENT Returns a new style with the formatting provided and some applicable
+		COMMENT attributes of this style.
+		COMMENT
+		COMMENT <p>When a color formatting is passed for {@code formatting}, the other
+		COMMENT formattings, including bold, italic, strikethrough, underlined, and
+		COMMENT obfuscated, are all removed.</p>
+		ARG 1 formatting
+			COMMENT the new formatting
+	METHOD method_27708 getFont ()Lnet/minecraft/class_2960;
+		COMMENT Returns the font of this style.
 	CLASS class_2584 Serializer
+		COMMENT A JSON serializer for {@link Style}.
 		METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
 			ARG 1 json
 			ARG 2 type
 			ARG 3 context
+		METHOD method_27710 getFont (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_2960;
+			ARG 0 root
+		METHOD method_27711 parseNullableBoolean (Lcom/google/gson/JsonObject;Ljava/lang/String;)Ljava/lang/Boolean;
+			ARG 0 root
+			ARG 1 key
+		METHOD method_27712 getHoverEvent (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_2568;
+			ARG 0 root
+		METHOD method_27713 getClickEvent (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_2558;
+			ARG 0 root
+		METHOD method_27714 parseInsertion (Lcom/google/gson/JsonObject;)Ljava/lang/String;
+			ARG 0 root
+		METHOD method_27715 parseColor (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_5251;
+			ARG 0 root
 		METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;
 			ARG 1 style
 			ARG 2 type
diff --git a/mappings/net/minecraft/text/Text.mapping b/mappings/net/minecraft/text/Text.mapping
index 9d26e94a0c..e376a328e1 100644
--- a/mappings/net/minecraft/text/Text.mapping
+++ b/mappings/net/minecraft/text/Text.mapping
@@ -1,10 +1,83 @@
 CLASS net/minecraft/class_2561 net/minecraft/text/Text
+	COMMENT A text. Can be converted to and from JSON format.
+	COMMENT
+	COMMENT <p>Each text has a tree structure, embodying all its {@link
+	COMMENT #getSiblings() siblings}. To iterate contents in the text and all
+	COMMENT its siblings, call {@code visit} methods.</p>
+	COMMENT
+	COMMENT <p>This interface does not expose mutation operations. For mutation,
+	COMMENT refer to {@link MutableText}.</p>
+	COMMENT
+	COMMENT @see MutableText
+	FIELD field_24340 TERMINATE_VISIT Ljava/util/Optional;
+		COMMENT An {@link Optional} that indicates a text visitor should be terminated.
+		COMMENT
+		COMMENT @see Visitor#accept(String)
+		COMMENT @see StyledVisitor#accept(Style, String)
+	METHOD getString getString ()Ljava/lang/String;
+		COMMENT Returns the full string representation of this text, including siblings.
+		COMMENT
+		COMMENT {@inheritDoc}
 	METHOD method_10851 asString ()Ljava/lang/String;
+		COMMENT Returns the string representation of this text itself, excluding siblings.
 	METHOD method_10855 getSiblings ()Ljava/util/List;
+		COMMENT Returns the siblings of this text.
 	METHOD method_10858 asTruncatedString (I)Ljava/lang/String;
+		COMMENT Returns the full string representation of this text, truncated beyond
+		COMMENT the supplied {@code length}.
 		ARG 1 length
+			COMMENT the max length allowed for the string representation of the text
 	METHOD method_10866 getStyle ()Lnet/minecraft/class_2583;
+		COMMENT Returns the style of this text.
+	METHOD method_27657 visit (Lnet/minecraft/class_2561$class_5245;)Ljava/util/Optional;
+		COMMENT Visits this text and its siblings.
+		COMMENT
+		COMMENT <p>When the visitor returns a {@link Optional#isPresent() non-empty
+		COMMENT optional} during visit, the visit is immediately terminated and the
+		COMMENT result is returned.</p>
+		COMMENT
+		COMMENT @return what the visitor returns, or {@link Optional#empty()} if the
+		COMMENT visitor always returned {@code Optional.empty()}.
+		ARG 1 visitor
+			COMMENT the text visitor
+	METHOD method_27658 visit (Lnet/minecraft/class_2561$class_5246;Lnet/minecraft/class_2583;)Ljava/util/Optional;
+		COMMENT Visits the code points of in each {@link Text#asString() partial string}
+		COMMENT representation of {@code text} and its siblings, applying the formatting
+		COMMENT codes within.
+		COMMENT
+		COMMENT <p>The visit is in forward direction.</p>
+		COMMENT
+		COMMENT @return {@code true} if the full string was visited, or {@code false} indicating
+		COMMENT the {@code visitor} terminated half-way
+		COMMENT @see Text#visit(Text.StyledVisitor, Style)
+		ARG 1 visitor
+			COMMENT the styled text visitor
+		ARG 2 style
+			COMMENT the starting style
+	METHOD method_27659 visitSelf (Lnet/minecraft/class_2561$class_5245;)Ljava/util/Optional;
+		COMMENT Visits the text itself.
+		COMMENT
+		COMMENT @see #visit(Visitor)
+		COMMENT @return the visitor's return value
+		ARG 1 visitor
+			COMMENT the visitor
+	METHOD method_27660 visitSelf (Lnet/minecraft/class_2561$class_5246;Lnet/minecraft/class_2583;)Ljava/util/Optional;
+		COMMENT Visits the text itself.
+		COMMENT
+		COMMENT @see #visit(StyledVisitor, Style)
+		COMMENT @return the visitor's return value
+		ARG 1 visitor
+			COMMENT the visitor
+		ARG 2 style
+			COMMENT the current style
+	METHOD method_27661 shallowCopy ()Lnet/minecraft/class_5250;
+		COMMENT Copies the text itself, the style, and the siblings.
+		COMMENT
+		COMMENT <p>A shallow copy is made for the siblings.</p>
+	METHOD method_27662 copy ()Lnet/minecraft/class_5250;
+		COMMENT Copies the text itself, excluding the styles or siblings.
 	CLASS class_2562 Serializer
+		COMMENT A JSON serializer for {@link Text}.
 		FIELD field_11752 JSON_READER_LINE_START Ljava/lang/reflect/Field;
 		FIELD field_11753 JSON_READER_POS Ljava/lang/reflect/Field;
 		FIELD field_11754 GSON Lcom/google/gson/Gson;
@@ -34,3 +107,27 @@ CLASS net/minecraft/class_2561 net/minecraft/text/Text
 			ARG 1 text
 			ARG 2 type
 			ARG 3 context
+	CLASS class_5245 Visitor
+		COMMENT A visitor for text content.
+		METHOD accept accept (Ljava/lang/String;)Ljava/util/Optional;
+			COMMENT Visits a text's {@link Text#asString() asString result}.
+			COMMENT
+			COMMENT <p>When a {@link Optional#isPresent() present optional} is returned,
+			COMMENT the visit is terminated before visiting all text. Can return {@link
+			COMMENT Text#TERMINATE_VISIT} for convenience.</p>
+			ARG 1 asString
+	CLASS class_5246 StyledVisitor
+		COMMENT A visitor for text content and a contextual {@link Style}.
+		METHOD accept accept (Lnet/minecraft/class_2583;Ljava/lang/String;)Ljava/util/Optional;
+			COMMENT Visits a text's contextual style and {@link Text#asString() asString
+			COMMENT result}.
+			COMMENT
+			COMMENT <p>A contextual style is obtained by calling {@link Style#withParent(Style)}
+			COMMENT on the current's text style, passing the previous contextual style or
+			COMMENT the starting style if it is the beginning of a visit.</p>
+			COMMENT
+			COMMENT <p>When a {@link Optional#isPresent() present optional} is returned,
+			COMMENT the visit is terminated before visiting all text. Can return {@link
+			COMMENT Text#TERMINATE_VISIT} for convenience.</p>
+			ARG 1 style
+			ARG 2 asString
diff --git a/mappings/net/minecraft/text/TextColor.mapping b/mappings/net/minecraft/text/TextColor.mapping
new file mode 100644
index 0000000000..145406bffa
--- /dev/null
+++ b/mappings/net/minecraft/text/TextColor.mapping
@@ -0,0 +1,35 @@
+CLASS net/minecraft/class_5251 net/minecraft/text/TextColor
+	COMMENT Represents an RGB color of a {@link Text}.
+	COMMENT
+	COMMENT <p>This is immutable, and part of a {@link Style}.</p>
+	COMMENT
+	COMMENT @see Style
+	FIELD field_24362 FORMATTING_TO_COLOR Ljava/util/Map;
+	FIELD field_24363 BY_NAME Ljava/util/Map;
+	FIELD field_24364 rgb I
+	FIELD field_24365 name Ljava/lang/String;
+	METHOD <init> (I)V
+		ARG 1 rgb
+	METHOD <init> (ILjava/lang/String;)V
+		ARG 1 rgb
+		ARG 2 name
+	METHOD method_27716 getRgb ()I
+		COMMENT Gets the RGB value of this color.
+		COMMENT
+		COMMENT <p>The red bits can be obtained by {@code (rgb >> 16) & 0xFF}, green bits
+		COMMENT by {@code (rgb >> 8) & 0xFF}, blue bits by {@code rgb & 0xFF}.</p>
+	METHOD method_27717 fromRgb (I)Lnet/minecraft/class_5251;
+		COMMENT Obtains a text color from an RGB value.
+		ARG 0 rgb
+			COMMENT the RGB color
+	METHOD method_27718 fromFormatting (Lnet/minecraft/class_124;)Lnet/minecraft/class_5251;
+		COMMENT Obtains a text color from a formatting.
+		ARG 0 formatting
+			COMMENT the formatting
+	METHOD method_27719 parse (Ljava/lang/String;)Lnet/minecraft/class_5251;
+		COMMENT Parses a color by its name.
+		ARG 0 name
+			COMMENT the name
+	METHOD method_27721 getName ()Ljava/lang/String;
+		COMMENT Gets the name of this color, used for converting the color to JSON format.
+	METHOD method_27723 getHexCode ()Ljava/lang/String;
diff --git a/mappings/net/minecraft/text/TranslatableText.mapping b/mappings/net/minecraft/text/TranslatableText.mapping
index ca5f6da828..ab8bac88d3 100644
--- a/mappings/net/minecraft/text/TranslatableText.mapping
+++ b/mappings/net/minecraft/text/TranslatableText.mapping
@@ -6,6 +6,11 @@ CLASS net/minecraft/class_2588 net/minecraft/text/TranslatableText
 	FIELD field_11875 args [Ljava/lang/Object;
 	FIELD field_11876 key Ljava/lang/String;
 	FIELD field_11877 translations Ljava/util/List;
+	FIELD field_24367 EMPTY_ARGUMENTS [Ljava/lang/Object;
+	FIELD field_24368 LITERAL_PERCENT_SIGN Lnet/minecraft/class_2585;
+	FIELD field_24369 NULL_ARGUMENT Lnet/minecraft/class_2585;
+	METHOD <init> (Ljava/lang/String;)V
+		ARG 1 key
 	METHOD <init> (Ljava/lang/String;[Ljava/lang/Object;)V
 		ARG 1 key
 		ARG 2 args
diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping
index 2754c878b4..67adf5d6d2 100644
--- a/mappings/net/minecraft/util/Util.mapping
+++ b/mappings/net/minecraft/util/Util.mapping
@@ -25,6 +25,12 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util
 	METHOD method_27173 getRandom ([Ljava/lang/Object;Ljava/util/Random;)Ljava/lang/Object;
 		ARG 0 array
 		ARG 1 random
+	METHOD method_27761 moveCursor (Ljava/lang/String;II)I
+		COMMENT Moves the {@code cursor} in the {@code string} by a {@code delta} amount.
+		COMMENT Skips surrogate characters.
+		ARG 0 string
+		ARG 1 cursor
+		ARG 2 delta
 	METHOD method_645 previous (Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/lang/Object;
 	METHOD method_646 createTranslationKey (Ljava/lang/String;Lnet/minecraft/class_2960;)Ljava/lang/String;
 		ARG 0 type