some nbt work

mappings/net/minecraft/nbt/NbtByteArray.mapping

@@ -7,14 +7,16 @@ CLASS net/minecraft/unmapped/C_umipmxwv net/minecraft/nbt/NbtByteArray
 		ARG 1 value
 	METHOD <init> ([B)V
 		ARG 1 value
+	METHOD clear clear ()V
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 o
 	METHOD get (I)Ljava/lang/Object;
 		ARG 1 index
 	METHOD m_jinrzhol getByteArray ()[B
 	METHOD m_zreujoew toArray (Ljava/util/List;)[B
 		ARG 0 list
+	METHOD size size ()I
 	CLASS C_qzarviwo
-		METHOD m_kndswgtt (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)[B
+		METHOD m_kndswgtt readRaw (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)[B
 			ARG 0 input
 			ARG 1 tracker

mappings/net/minecraft/nbt/NbtCompound.mapping

@@ -1,8 +1,10 @@
 CLASS net/minecraft/unmapped/C_hhlwcnih net/minecraft/nbt/NbtCompound
 	COMMENT Represents an NBT compound object which holds unordered key-value pairs with distinct case-sensitive string keys.
+	FIELD f_aetpjbog ENTRY_SIZE I
 	FIELD f_ckdatsht CODEC Lcom/mojang/serialization/Codec;
 	FIELD f_dopajgtr entries Ljava/util/Map;
 	FIELD f_ghusyxdr TYPE Lnet/minecraft/unmapped/C_ueidorcc;
+	FIELD f_qucoyxms SIZE I
 	METHOD <init> (Ljava/util/Map;)V
 		ARG 1 entries
 	METHOD equals (Ljava/lang/Object;)Z
@@ -68,6 +70,7 @@ CLASS net/minecraft/unmapped/C_hhlwcnih net/minecraft/nbt/NbtCompound
 	METHOD m_oidzekic putInt (Ljava/lang/String;I)V
 		ARG 1 key
 		ARG 2 value
+	METHOD m_poylyjba createNbt ()Lnet/minecraft/unmapped/C_hhlwcnih;
 	METHOD m_pvrsstff putByteArray (Ljava/lang/String;Ljava/util/List;)V
 		ARG 1 key
 		ARG 2 value
@@ -98,6 +101,7 @@ CLASS net/minecraft/unmapped/C_hhlwcnih net/minecraft/nbt/NbtCompound
 	METHOD m_sfeexgrr getList (Ljava/lang/String;I)Lnet/minecraft/unmapped/C_hqhtfwlr;
 		ARG 1 key
 		ARG 2 type
+	METHOD m_smzpndim getEntries ()Ljava/util/Set;
 	METHOD m_ulzvmblb remove (Ljava/lang/String;)V
 		ARG 1 key
 	METHOD m_utczects copyFrom (Lnet/minecraft/unmapped/C_hhlwcnih;)Lnet/minecraft/unmapped/C_hhlwcnih;
@@ -131,13 +135,13 @@ CLASS net/minecraft/unmapped/C_hhlwcnih net/minecraft/nbt/NbtCompound
 	METHOD m_zsbbwdsl getByteArray (Ljava/lang/String;)[B
 		ARG 1 key
 	CLASS C_krlbszwn
-		METHOD m_heopwcei (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_avcaqucb;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_avcaqucb$C_ysedvtle;
+		METHOD m_heopwcei parseCompound (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_avcaqucb;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_avcaqucb$C_ysedvtle;
 			ARG 0 input
 			ARG 1 scanner
 			ARG 2 tracker
-		METHOD m_mlnxbtqt (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Ljava/lang/String;
+		METHOD m_mlnxbtqt readString (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Ljava/lang/String;
 			ARG 0 input
 			ARG 1 tracker
-		METHOD m_qbdkgvms (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_hhlwcnih;
+		METHOD m_qbdkgvms readCompound (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_hhlwcnih;
 			ARG 0 input
 			ARG 1 tracker

mappings/net/minecraft/nbt/NbtDouble.mapping

@@ -11,6 +11,6 @@ CLASS net/minecraft/unmapped/C_xiyjytpd net/minecraft/nbt/NbtDouble
 	METHOD m_oxqlveuv of (D)Lnet/minecraft/unmapped/C_xiyjytpd;
 		ARG 0 value
 	CLASS C_iubarszc
-		METHOD m_frmxzypg (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)D
+		METHOD m_frmxzypg readRaw (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)D
 			ARG 0 input
 			ARG 1 tracker

mappings/net/minecraft/nbt/NbtElement.mapping

@@ -62,10 +62,7 @@ CLASS net/minecraft/unmapped/C_oivssbvb net/minecraft/nbt/NbtElement
 		COMMENT
 		COMMENT @see NbtLong
 	FIELD f_zfdwqdmd STRING_SIZE I
-	METHOD m_ehqkdijp copy ()Lnet/minecraft/unmapped/C_oivssbvb;
-		COMMENT Copies this NBT element.
-		COMMENT
-		COMMENT @return the copied element
+	METHOD m_ehqkdijp shallowCopy ()Lnet/minecraft/unmapped/C_oivssbvb;
 	METHOD m_gvxsfqzz scanAsRoot (Lnet/minecraft/unmapped/C_avcaqucb;)V
 		ARG 1 scanner
 	METHOD m_hbuflhqa getSizeInBytes ()I

mappings/net/minecraft/nbt/NbtFloat.mapping

@@ -11,6 +11,6 @@ CLASS net/minecraft/unmapped/C_nmjwsnmy net/minecraft/nbt/NbtFloat
 	METHOD m_ugeyistl of (F)Lnet/minecraft/unmapped/C_nmjwsnmy;
 		ARG 0 value
 	CLASS C_rfwycmsf
-		METHOD m_vpkdnupw (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)F
+		METHOD m_vpkdnupw readFloat (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)F
 			ARG 0 input
 			ARG 1 tracker

mappings/net/minecraft/nbt/NbtFormatException.mapping

@@ -0,0 +1 @@
+CLASS net/minecraft/unmapped/C_prxxuhrw net/minecraft/nbt/NbtFormatException

mappings/net/minecraft/nbt/NbtInt.mapping

@@ -9,6 +9,10 @@ CLASS net/minecraft/unmapped/C_mtwrptzz net/minecraft/nbt/NbtInt
 		ARG 1 o
 	METHOD m_snczrdnb of (I)Lnet/minecraft/unmapped/C_mtwrptzz;
 		ARG 0 value
+	CLASS C_kbxvfdkb
+		METHOD m_wqbmlueb readInt (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)I
+			ARG 0 input
+			ARG 1 tracker
 	CLASS C_kjktlgdl Cache
 		FIELD f_bhlqmokc HIGH I
 		FIELD f_haatbjko LOW I

mappings/net/minecraft/nbt/NbtIntArray.mapping

@@ -7,14 +7,16 @@ CLASS net/minecraft/unmapped/C_qkxiqejc net/minecraft/nbt/NbtIntArray
 		ARG 1 value
 	METHOD <init> ([I)V
 		ARG 1 value
+	METHOD clear clear ()V
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 o
 	METHOD get (I)Ljava/lang/Object;
 		ARG 1 index
 	METHOD m_eipocahk toArray (Ljava/util/List;)[I
 		ARG 0 list
 	METHOD m_tlehgtua getIntArray ()[I
+	METHOD size size ()I
 	CLASS C_ytzlewdv
-		METHOD m_rmdqbzlz (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)[I
+		METHOD m_rmdqbzlz readArray (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)[I
 			ARG 0 input
 			ARG 1 tracker

mappings/net/minecraft/nbt/NbtIo.mapping

@@ -1,19 +1,41 @@
 CLASS net/minecraft/unmapped/C_plrkqquc net/minecraft/nbt/NbtIo
+	FIELD f_zwmbytoi OPEN_OPTIONS [Ljava/nio/file/OpenOption;
+	METHOD m_cvfqsgxo compress (Ljava/io/OutputStream;)Ljava/io/DataOutputStream;
+	METHOD m_dxxrvgvk writeAnyElement (Lnet/minecraft/unmapped/C_oivssbvb;Ljava/io/DataOutput;)V
+		ARG 0 element
+	METHOD m_hjflxsyo decompress (Ljava/io/InputStream;)Ljava/io/DataInputStream;
 	METHOD m_hsrlntfm write (Lnet/minecraft/unmapped/C_oivssbvb;Ljava/io/DataOutput;)V
 		ARG 0 nbt
 		ARG 1 output
+	METHOD m_jguziyiy readElement (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;B)Lnet/minecraft/unmapped/C_oivssbvb;
+	METHOD m_jsabavmz readCompressed (Ljava/nio/file/Path;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_hhlwcnih;
+	METHOD m_kfuaemox write (Lnet/minecraft/unmapped/C_hhlwcnih;Ljava/nio/file/Path;)V
 	METHOD m_kuwxotkv write (Lnet/minecraft/unmapped/C_hhlwcnih;Ljava/io/DataOutput;)V
 		ARG 0 compound
 		ARG 1 output
+	METHOD m_kyzyffmz readCompressed (Ljava/io/InputStream;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_hhlwcnih;
+	METHOD m_lvarbmqk readElement (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_oivssbvb;
+		ARG 0 input
+	METHOD m_lwpolkuf read (Ljava/nio/file/Path;)Lnet/minecraft/unmapped/C_hhlwcnih;
+		ARG 0 path
+	METHOD m_mrabewpj parseCompressed (Ljava/nio/file/Path;Lnet/minecraft/unmapped/C_avcaqucb;Lnet/minecraft/unmapped/C_fozrrtcx;)V
+		ARG 2 tracker
 	METHOD m_nvtwzikn writeCompressed (Lnet/minecraft/unmapped/C_hhlwcnih;Ljava/nio/file/Path;)V
 	METHOD m_pzvkgxhc read (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_hhlwcnih;
 		ARG 0 input
 		ARG 1 tracker
+	METHOD m_qmknfifn readAnyElement (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_oivssbvb;
 	METHOD m_rkhihfmf writeCompressed (Lnet/minecraft/unmapped/C_hhlwcnih;Ljava/io/OutputStream;)V
 		ARG 0 compound
 		ARG 1 stream
 	METHOD m_rqnlssft read (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_avcaqucb;Lnet/minecraft/unmapped/C_fozrrtcx;)V
 		ARG 0 input
 		ARG 1 visitor
+		ARG 2 tracker
+	METHOD m_voryzjqe parseCompressed (Ljava/io/InputStream;Lnet/minecraft/unmapped/C_avcaqucb;Lnet/minecraft/unmapped/C_fozrrtcx;)V
+		ARG 2 tracker
+	METHOD m_yicwdxov writeWithFallback (Lnet/minecraft/unmapped/C_oivssbvb;Ljava/io/DataOutput;)V
+		ARG 1 output
 	METHOD m_zjsgjdoa read (Ljava/io/DataInput;)Lnet/minecraft/unmapped/C_hhlwcnih;
 		ARG 0 input
+	CLASS C_wbbhdkdn StringFallbackDataOutput

mappings/net/minecraft/nbt/NbtList.mapping

@@ -4,6 +4,7 @@ CLASS net/minecraft/unmapped/C_hqhtfwlr net/minecraft/nbt/NbtList
 	COMMENT An NBT list holds values of the same {@linkplain NbtElement#getType NBT type}.
 	COMMENT The {@linkplain AbstractNbtList#getHeldType NBT type} of an NBT list is determined
 	COMMENT once its first element is inserted; empty NBT lists return {@link NbtElement#NULL_TYPE NULL_TYPE} as their held {@linkplain AbstractNbtList#getHeldType NBT type}.
+	FIELD f_carzcmxv SIZE I
 	FIELD f_llxejsfu value Ljava/util/List;
 	FIELD f_ssgpdobr type B
 	FIELD f_zntedfnn TYPE Lnet/minecraft/unmapped/C_ueidorcc;
@@ -38,3 +39,11 @@ CLASS net/minecraft/unmapped/C_hqhtfwlr net/minecraft/nbt/NbtList
 	METHOD m_zjesrfve getFloat (I)F
 		ARG 1 index
 	METHOD size size ()I
+	CLASS C_bicgwqxa
+		METHOD m_abkyninv parseList (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_avcaqucb;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_avcaqucb$C_ysedvtle;
+			ARG 0 input
+			ARG 1 scanner
+			ARG 2 tracker
+		METHOD m_ticywlad parseList (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_hqhtfwlr;
+			ARG 0 input
+			ARG 1 tracker

mappings/net/minecraft/nbt/NbtLong.mapping

@@ -10,7 +10,7 @@ CLASS net/minecraft/unmapped/C_mbybaqku net/minecraft/nbt/NbtLong
 	METHOD m_ftkuryps of (J)Lnet/minecraft/unmapped/C_mbybaqku;
 		ARG 0 value
 	CLASS C_jxppaniz
-		METHOD m_tkntekub (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)J
+		METHOD m_tkntekub readLong (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)J
 			ARG 0 input
 			ARG 1 tracker
 	CLASS C_jzqitqhh Cache

mappings/net/minecraft/nbt/NbtLongArray.mapping

@@ -17,6 +17,6 @@ CLASS net/minecraft/unmapped/C_ojdqftoi net/minecraft/nbt/NbtLongArray
 	METHOD m_kxlzbotw toArray (Ljava/util/List;)[J
 		ARG 0 list
 	CLASS C_rrrssqiv
-		METHOD m_bsmidfhx (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)[J
+		METHOD m_bsmidfhx readArray (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)[J
 			ARG 0 input
 			ARG 1 tracker

mappings/net/minecraft/nbt/NbtOps.mapping

@@ -18,20 +18,31 @@ CLASS net/minecraft/unmapped/C_fybaywjo net/minecraft/nbt/NbtOps
 		COMMENT with an ordered list of values in serialization). In fact, since
 		COMMENT Minecraft NBT lists can only contain elements of the same type, this op
 		COMMENT cannot compress maps.
+	FIELD f_zjvitncb MARKER_KEY Ljava/lang/String;
 	METHOD convertTo (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Ljava/lang/Object;
 		ARG 2 element
 	METHOD createBoolean (Z)Ljava/lang/Object;
 		ARG 1 value
 	METHOD createByte (B)Ljava/lang/Object;
 		ARG 1 value
+	METHOD createByteList (Ljava/nio/ByteBuffer;)Ljava/lang/Object;
+		ARG 1 buffer
 	METHOD createDouble (D)Ljava/lang/Object;
 		ARG 1 value
 	METHOD createFloat (F)Ljava/lang/Object;
 		ARG 1 value
 	METHOD createInt (I)Ljava/lang/Object;
 		ARG 1 value
+	METHOD createIntList (Ljava/util/stream/IntStream;)Ljava/lang/Object;
+		ARG 1 stream
+	METHOD createList (Ljava/util/stream/Stream;)Ljava/lang/Object;
+		ARG 1 stream
 	METHOD createLong (J)Ljava/lang/Object;
 		ARG 1 value
+	METHOD createLongList (Ljava/util/stream/LongStream;)Ljava/lang/Object;
+		ARG 1 stream
+	METHOD createMap (Ljava/util/stream/Stream;)Ljava/lang/Object;
+		ARG 1 stream
 	METHOD createNumeric (Ljava/lang/Number;)Ljava/lang/Object;
 		ARG 1 value
 	METHOD createShort (S)Ljava/lang/Object;
@@ -58,17 +69,90 @@ CLASS net/minecraft/unmapped/C_fybaywjo net/minecraft/nbt/NbtOps
 		ARG 1 element
 	METHOD getStringValue (Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
 		ARG 1 element
+	METHOD m_kvzwcnej tryUnwrap (Lnet/minecraft/unmapped/C_hhlwcnih;)Lnet/minecraft/unmapped/C_oivssbvb;
+		ARG 0 nbt
+	METHOD m_vpbkfzmz createCollector (Lnet/minecraft/unmapped/C_oivssbvb;)Ljava/util/Optional;
+		ARG 0 element
 	METHOD mapBuilder mapBuilder ()Lcom/mojang/serialization/RecordBuilder;
 	METHOD mergeToList (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
 		ARG 1 list
 		ARG 2 value
+	METHOD mergeToList (Ljava/lang/Object;Ljava/util/List;)Lcom/mojang/serialization/DataResult;
+		ARG 1 list
+		ARG 2 values
 	METHOD mergeToMap (Ljava/lang/Object;Lcom/mojang/serialization/MapLike;)Lcom/mojang/serialization/DataResult;
 		ARG 1 element
+		ARG 2 values
 	METHOD mergeToMap (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
 		ARG 1 map
 		ARG 2 key
 		ARG 3 value
+	METHOD mergeToMap (Ljava/lang/Object;Ljava/util/Map;)Lcom/mojang/serialization/DataResult;
+		ARG 1 element
+		ARG 2 values
 	METHOD remove (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 		ARG 1 element
 		ARG 2 key
+	CLASS C_cfjsyyyh SimpleListCollector
+		FIELD f_zdfsryne result Lnet/minecraft/unmapped/C_hqhtfwlr;
+		METHOD <init> (Lnet/minecraft/unmapped/C_hqhtfwlr;)V
+			ARG 1 nbt
+		METHOD <init> (Lnet/minecraft/unmapped/C_oivssbvb;)V
+			ARG 1 element
 	CLASS C_cmafvjrt MapBuilder
+		METHOD append (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+			ARG 1 key
+			ARG 2 element
+			ARG 3 nbt
+		METHOD build (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
+			ARG 1 nbt
+			ARG 2 element
+	CLASS C_cpsqmvih ByteListCollector
+		FIELD f_ijtscyyp values Lit/unimi/dsi/fastutil/bytes/ByteArrayList;
+		METHOD <init> (B)V
+			ARG 1 value
+		METHOD <init> ([B)V
+			ARG 1 values
+	CLASS C_dwkvaauw LongListCollector
+		FIELD f_rjyiwlrj values Lit/unimi/dsi/fastutil/longs/LongArrayList;
+		METHOD <init> (J)V
+			ARG 1 value
+		METHOD <init> ([J)V
+			ARG 1 values
+	CLASS C_lrggpudd DelegatingListCollector
+		FIELD f_oknzgzfq INSTANCE Lnet/minecraft/unmapped/C_fybaywjo$C_lrggpudd;
+	CLASS C_nehsnwyp ListCollector
+		METHOD m_berihwml accept (Lnet/minecraft/unmapped/C_oivssbvb;)Lnet/minecraft/unmapped/C_fybaywjo$C_nehsnwyp;
+			ARG 1 element
+		METHOD m_fjtdnzmx accept (Ljava/lang/Iterable;)Lnet/minecraft/unmapped/C_fybaywjo$C_nehsnwyp;
+			ARG 1 elements
+		METHOD m_gxpktbdp accept (Ljava/util/stream/Stream;)Lnet/minecraft/unmapped/C_fybaywjo$C_nehsnwyp;
+			ARG 1 elements
+		METHOD m_mlztdcvi getResult ()Lnet/minecraft/unmapped/C_oivssbvb;
+	CLASS C_rkolbfzv IntListCollector
+		FIELD f_pvqmoapp values Lit/unimi/dsi/fastutil/ints/IntArrayList;
+		METHOD <init> (I)V
+			ARG 1 value
+		METHOD <init> ([I)V
+			ARG 1 values
+	CLASS C_yartmlgv
+		METHOD entries entries ()Ljava/util/stream/Stream;
+		METHOD get (Ljava/lang/Object;)Ljava/lang/Object;
+			ARG 1 element
+		METHOD get (Ljava/lang/String;)Ljava/lang/Object;
+			ARG 1 key
+	CLASS C_zcsovcmj WrappingListCollector
+		FIELD f_kuucpbgx result Lnet/minecraft/unmapped/C_hqhtfwlr;
+		METHOD <init> (Lit/unimi/dsi/fastutil/bytes/ByteArrayList;)V
+			ARG 1 list
+		METHOD <init> (Lit/unimi/dsi/fastutil/ints/IntArrayList;)V
+			ARG 1 list
+		METHOD <init> (Lit/unimi/dsi/fastutil/longs/LongArrayList;)V
+			ARG 1 list
+		METHOD <init> (Ljava/util/Collection;)V
+			ARG 1 elements
+		METHOD m_fhjbuhyx isWrapper (Lnet/minecraft/unmapped/C_hhlwcnih;)Z
+			ARG 0 nbt
+		METHOD m_ntfjawdo wrapElement (Lnet/minecraft/unmapped/C_oivssbvb;)Lnet/minecraft/unmapped/C_hhlwcnih;
+		METHOD m_vxfjomvi wrapIfNeeded (Lnet/minecraft/unmapped/C_oivssbvb;)Lnet/minecraft/unmapped/C_oivssbvb;
+			ARG 0 element

mappings/net/minecraft/nbt/NbtShort.mapping

@@ -10,7 +10,7 @@ CLASS net/minecraft/unmapped/C_mospmwws net/minecraft/nbt/NbtShort
 	METHOD m_rvuvoulx of (S)Lnet/minecraft/unmapped/C_mospmwws;
 		ARG 0 value
 	CLASS C_cpjbekql
-		METHOD m_jvvhjgeo (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)S
+		METHOD m_jvvhjgeo readRaw (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)S
 			ARG 0 input
 			ARG 1 tracker
 	CLASS C_hybexkey Cache

mappings/net/minecraft/nbt/NbtString.mapping

@@ -5,6 +5,7 @@ CLASS net/minecraft/unmapped/C_bzopmfms net/minecraft/nbt/NbtString
 	FIELD f_fbhlabsj NULL C
 	FIELD f_gpwsgzrd SINGLE_QUOTE C
 	FIELD f_jrhkwuxy ESCAPE C
+	FIELD f_pyxvntyi SIZE I
 	FIELD f_ymnohvfg EMPTY Lnet/minecraft/unmapped/C_bzopmfms;
 	FIELD f_yoyepecd value Ljava/lang/String;
 	METHOD <init> (Ljava/lang/String;)V
@@ -18,6 +19,6 @@ CLASS net/minecraft/unmapped/C_bzopmfms net/minecraft/nbt/NbtString
 	METHOD m_yhcxaelt skipString (Ljava/io/DataInput;)V
 		ARG 0 input
 	CLASS C_khgdkwrh
-		METHOD m_evrerdyg (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Ljava/lang/String;
+		METHOD m_evrerdyg readRaw (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Ljava/lang/String;
 			ARG 0 input
 			ARG 1 tracker

mappings/net/minecraft/nbt/NbtType.mapping

@@ -14,8 +14,9 @@ CLASS net/minecraft/unmapped/C_ueidorcc net/minecraft/nbt/NbtType
 		COMMENT
 		COMMENT @return {@code true} if this NBT type is immutable, or {@code false} otherwise
 	METHOD m_hxfuaaoy getCommandFeedbackName ()Ljava/lang/String;
-	METHOD m_lcnankcv (Ljava/io/DataInput;ILnet/minecraft/unmapped/C_fozrrtcx;)V
+	METHOD m_lcnankcv skip (Ljava/io/DataInput;ILnet/minecraft/unmapped/C_fozrrtcx;)V
 		ARG 1 input
+		ARG 2 count
 		ARG 3 tracker
 	METHOD m_poctbjiy read (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_oivssbvb;
 		ARG 1 input

mappings/net/minecraft/nbt/StringNbtReader.mapping

@@ -1,7 +1,9 @@
 CLASS net/minecraft/unmapped/C_jjafokvs net/minecraft/nbt/StringNbtReader
 	FIELD f_dbbftgji COMMA C
+	FIELD f_dphkcylp CODEC Lcom/mojang/serialization/Codec;
 	FIELD f_gmanexmy ARRAY_MIXED Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType;
 	FIELD f_hchyzgjp INT_PATTERN Ljava/util/regex/Pattern;
+	FIELD f_hlrulnyw LENIENT_CODEC Lcom/mojang/serialization/Codec;
 	FIELD f_idvemkib DOUBLE_PATTERN Ljava/util/regex/Pattern;
 	FIELD f_imrzedat EXPECTED_VALUE Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
 	FIELD f_kgwidfyi OBJECT_START C
@@ -34,6 +36,7 @@ CLASS net/minecraft/unmapped/C_jjafokvs net/minecraft/nbt/StringNbtReader
 		ARG 1 input
 	METHOD m_ugaydtjf parseElementPrimitive ()Lnet/minecraft/unmapped/C_oivssbvb;
 	METHOD m_uvwydsmr expect (C)V
+		ARG 1 c
 	METHOD m_vyzmihxm parseElementPrimitiveArray ()Lnet/minecraft/unmapped/C_oivssbvb;
 	METHOD m_wngfymzu parseList ()Lnet/minecraft/unmapped/C_oivssbvb;
 	METHOD m_wzhkiqtt readComma ()Z