diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3cf563bf14..93355e1859 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ download_task = "4.1.1"
 guava = "31.1-jre"
 jackson_xml = "2.14.1"
 launchermeta_parser = "1.0.0"
-enigma = "2.2.0"
+enigma = "2.2.1"
 enigma_plugin = "2.2.0"
 tiny_remapper = "0.7.2"
 stitch = "0.6.1"
diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping
index de3e7552ba..50bdc0166d 100644
--- a/mappings/net/minecraft/item/ItemStack.mapping
+++ b/mappings/net/minecraft/item/ItemStack.mapping
@@ -37,6 +37,7 @@ CLASS net/minecraft/unmapped/C_sddaxwyk net/minecraft/item/ItemStack
 	COMMENT Custom NBT data needs to be re-evaluated as of the changes in 24w09a.
 	FIELD f_bnghiwgu PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu;
 	FIELD f_eqmyksbs item Lnet/minecraft/unmapped/C_vorddnax;
+	FIELD f_iboyubuh OPTIONAL_PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu;
 	FIELD f_llcklqth count I
 	FIELD f_lrxqoedj EMPTY Lnet/minecraft/unmapped/C_sddaxwyk;
 	FIELD f_lxaedfnb cooldown I
diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping
index 35248571b8..2689d11c8e 100644
--- a/mappings/net/minecraft/network/PacketByteBuf.mapping
+++ b/mappings/net/minecraft/network/PacketByteBuf.mapping
@@ -343,6 +343,9 @@ CLASS net/minecraft/unmapped/C_idfydwco net/minecraft/network/PacketByteBuf
 		COMMENT @return the read bit set
 		COMMENT @see #writeBitSet(BitSet)
 	METHOD m_etdtxgpv readMap (Ljava/util/function/IntFunction;Lnet/minecraft/unmapped/C_ajdohfrc;Lnet/minecraft/unmapped/C_ajdohfrc;)Ljava/util/Map;
+		ARG 1 mapFactory
+		ARG 2 keyDecoder
+		ARG 3 valueDecoder
 	METHOD m_eznoskdd readMap (Lnet/minecraft/unmapped/C_ajdohfrc;Lnet/minecraft/unmapped/C_ajdohfrc;)Ljava/util/Map;
 	METHOD m_fjcnjxnm readString (I)Ljava/lang/String;
 		COMMENT Reads a string from this buf. A string is represented by a byte array of
@@ -356,7 +359,7 @@ CLASS net/minecraft/unmapped/C_idfydwco net/minecraft/network/PacketByteBuf
 		COMMENT @see #writeString(String, int)
 		ARG 1 maxLength
 			COMMENT the maximum length of the string read
-	METHOD m_fjolbvuh (Lnet/minecraft/unmapped/C_ajdohfrc;)Ljava/lang/Object;
+	METHOD m_fjolbvuh readNullable (Lnet/minecraft/unmapped/C_ajdohfrc;)Ljava/lang/Object;
 		ARG 1 decoder
 	METHOD m_ftclzqhi readChunkSectionPos ()Lnet/minecraft/unmapped/C_zubvmeye;
 		COMMENT Reads a chunk section position from this buf. A chunk section position is
@@ -513,7 +516,7 @@ CLASS net/minecraft/unmapped/C_idfydwco net/minecraft/network/PacketByteBuf
 	METHOD m_mafeqoqe readNbt (Lio/netty/buffer/ByteBuf;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_oivssbvb;
 		ARG 0 buf
 		ARG 1 nbtTagSizeTracker
-	METHOD m_mdkhzffo (Lio/netty/buffer/ByteBuf;Lnet/minecraft/unmapped/C_ajdohfrc;)Ljava/lang/Object;
+	METHOD m_mdkhzffo readNullable (Lio/netty/buffer/ByteBuf;Lnet/minecraft/unmapped/C_ajdohfrc;)Ljava/lang/Object;
 		ARG 0 buf
 		ARG 1 decoder
 	METHOD m_mhlenoxy readPos (Lio/netty/buffer/ByteBuf;)Lnet/minecraft/unmapped/C_hynzadkk;
@@ -552,7 +555,7 @@ CLASS net/minecraft/unmapped/C_idfydwco net/minecraft/network/PacketByteBuf
 	METHOD m_olpsrdqq getMaxValidator (Ljava/util/function/IntFunction;I)Ljava/util/function/IntFunction;
 		ARG 0 applier
 		ARG 1 max
-	METHOD m_omssfaex (Lio/netty/buffer/ByteBuf;Ljava/lang/Object;Lnet/minecraft/unmapped/C_hiksfskl;)V
+	METHOD m_omssfaex writeNullable (Lio/netty/buffer/ByteBuf;Ljava/lang/Object;Lnet/minecraft/unmapped/C_hiksfskl;)V
 		ARG 0 buf
 		ARG 2 encoder
 	METHOD m_pihymbdn readQuaternion ()Lorg/joml/Quaternionf;
@@ -760,6 +763,7 @@ CLASS net/minecraft/unmapped/C_idfydwco net/minecraft/network/PacketByteBuf
 		COMMENT @see #readCollection(IntFunction, Reader)
 		ARG 1 collection
 			COMMENT the collection to write
+		ARG 2 valueEncoder
 	METHOD m_wxfnqbwh readVarInt ()I
 		COMMENT Reads a single var int from this buf.
 		COMMENT
@@ -777,6 +781,8 @@ CLASS net/minecraft/unmapped/C_idfydwco net/minecraft/network/PacketByteBuf
 		COMMENT @see #readMap(IntFunction, Reader, Reader)
 		ARG 1 map
 			COMMENT the map to write
+		ARG 2 keyEncoder
+		ARG 3 valueEncoder
 	METHOD m_ybnsdtco readRegistryKey (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_xhhleach;
 		COMMENT Reads a registry key from this buf. A registry key is represented by an
 		COMMENT identifier.
@@ -801,7 +807,7 @@ CLASS net/minecraft/unmapped/C_idfydwco net/minecraft/network/PacketByteBuf
 		COMMENT length over {@code maxSize}
 		ARG 1 maxSize
 			COMMENT the max length of the read array
-	METHOD m_zcmiuaxl (Ljava/lang/Object;Lnet/minecraft/unmapped/C_hiksfskl;)V
+	METHOD m_zcmiuaxl writeNullable (Ljava/lang/Object;Lnet/minecraft/unmapped/C_hiksfskl;)V
 		ARG 2 encoder
 	METHOD m_zflhnxwv writeString (Ljava/lang/String;)Lnet/minecraft/unmapped/C_idfydwco;
 		COMMENT Writes a string to this buf. A string is represented by a byte array of
diff --git a/mappings/net/minecraft/network/codec/PacketCodec.mapping b/mappings/net/minecraft/network/codec/PacketCodec.mapping
index 2f8b45d580..a6b122b646 100644
--- a/mappings/net/minecraft/network/codec/PacketCodec.mapping
+++ b/mappings/net/minecraft/network/codec/PacketCodec.mapping
@@ -1,13 +1,80 @@
 CLASS net/minecraft/unmapped/C_qsrmwluu net/minecraft/network/codec/PacketCodec
-	METHOD m_aekplkat create (Lnet/minecraft/unmapped/C_dptxqryi;Lnet/minecraft/unmapped/C_ajdohfrc;)Lnet/minecraft/unmapped/C_qsrmwluu;
+	METHOD m_aekplkat ofMember (Lnet/minecraft/unmapped/C_dptxqryi;Lnet/minecraft/unmapped/C_ajdohfrc;)Lnet/minecraft/unmapped/C_qsrmwluu;
 		ARG 0 encoder
 		ARG 1 decoder
-	METHOD m_jnlparpp create (Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_qsrmwluu;
-	METHOD m_neslfeqk create (Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Ljava/util/function/BiFunction;)Lnet/minecraft/unmapped/C_qsrmwluu;
-	METHOD m_rgewxgtr create (Lnet/minecraft/unmapped/C_hiksfskl;Lnet/minecraft/unmapped/C_ajdohfrc;)Lnet/minecraft/unmapped/C_qsrmwluu;
+	METHOD m_jnlparpp mapBuf (Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_qsrmwluu;
+		ARG 1 function
+	METHOD m_kqzabmpi tuple (Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function3;)Lnet/minecraft/unmapped/C_qsrmwluu;
+		ARG 0 codec1
+		ARG 1 from1
+		ARG 2 codec2
+		ARG 3 from2
+		ARG 4 codec3
+		ARG 5 from3
+		ARG 6 to
+	METHOD m_neslfeqk tuple (Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Ljava/util/function/BiFunction;)Lnet/minecraft/unmapped/C_qsrmwluu;
+		ARG 0 codec1
+		ARG 1 from1
+		ARG 2 codec2
+		ARG 3 from2
+		ARG 4 to
+	METHOD m_ouxffrgo tuple (Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function4;)Lnet/minecraft/unmapped/C_qsrmwluu;
+		ARG 0 codec1
+		ARG 1 from1
+		ARG 2 codec2
+		ARG 3 from2
+		ARG 4 codec3
+		ARG 5 from3
+		ARG 6 codec4
+		ARG 7 from4
+		ARG 8 to
+	METHOD m_rgewxgtr of (Lnet/minecraft/unmapped/C_hiksfskl;Lnet/minecraft/unmapped/C_ajdohfrc;)Lnet/minecraft/unmapped/C_qsrmwluu;
 		ARG 0 encoder
 		ARG 1 decoder
-	METHOD m_tahgmrfg create (Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_qsrmwluu;
-	METHOD m_vdpeazsa create (Ljava/lang/Object;)Lnet/minecraft/unmapped/C_qsrmwluu;
-	METHOD m_xdepsjrp create (Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_qsrmwluu;
+	METHOD m_tahgmrfg tuple (Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_qsrmwluu;
+		ARG 0 codec
+		ARG 1 from
+		ARG 2 to
+	METHOD m_ufniiqur recursive (Ljava/util/function/UnaryOperator;)Lnet/minecraft/unmapped/C_qsrmwluu;
+		ARG 0 codecGetter
+	METHOD m_vdpeazsa unit (Ljava/lang/Object;)Lnet/minecraft/unmapped/C_qsrmwluu;
+		ARG 0 value
+	METHOD m_whbpgkrx tuple (Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function5;)Lnet/minecraft/unmapped/C_qsrmwluu;
+		ARG 0 codec1
+		ARG 1 from1
+		ARG 2 codec2
+		ARG 3 from2
+		ARG 4 codec3
+		ARG 5 from3
+		ARG 6 codec4
+		ARG 7 from4
+		ARG 8 codec5
+		ARG 9 from5
+		ARG 10 to
+	METHOD m_xdepsjrp map (Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_qsrmwluu;
+		ARG 1 to
+		ARG 2 from
 	METHOD m_xepolosp apply (Lnet/minecraft/unmapped/C_qsrmwluu$C_afmwjpzk;)Lnet/minecraft/unmapped/C_qsrmwluu;
+		ARG 1 function
+	METHOD m_xkeikrrc dispatch (Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_qsrmwluu;
+		ARG 1 type
+		ARG 2 codec
+	METHOD m_yeusexqs cast ()Lnet/minecraft/unmapped/C_qsrmwluu;
+	METHOD m_ysrdtnvi tuple (Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function6;)Lnet/minecraft/unmapped/C_qsrmwluu;
+		ARG 0 codec1
+		ARG 1 from1
+		ARG 2 codec2
+		ARG 3 from2
+		ARG 4 codec3
+		ARG 5 from3
+		ARG 6 codec4
+		ARG 7 from4
+		ARG 8 codec5
+		ARG 9 from5
+		ARG 10 codec6
+		ARG 11 from6
+		ARG 12 to
+	CLASS C_afmwjpzk ResultFunction
+		METHOD apply apply (Lnet/minecraft/unmapped/C_qsrmwluu;)Lnet/minecraft/unmapped/C_qsrmwluu;
+	CLASS C_vqnuwlhg
+		FIELD f_qahzmlxg codecSupplier Ljava/util/function/Supplier;
diff --git a/mappings/net/minecraft/network/codec/PacketCodecs.mapping b/mappings/net/minecraft/network/codec/PacketCodecs.mapping
index 4b3f6c1b1e..d0a7a73c23 100644
--- a/mappings/net/minecraft/network/codec/PacketCodecs.mapping
+++ b/mappings/net/minecraft/network/codec/PacketCodecs.mapping
@@ -1,20 +1,127 @@
 CLASS net/minecraft/unmapped/C_anfarvhg net/minecraft/network/codec/PacketCodecs
 	FIELD f_aqqzyznr VAR_LONG Lnet/minecraft/unmapped/C_qsrmwluu;
+	FIELD f_bgegdnvw PROPERTY_MAP Lnet/minecraft/unmapped/C_qsrmwluu;
+	FIELD f_crcpeyzs UNLIMITED_NBT_COMPOUND Lnet/minecraft/unmapped/C_qsrmwluu;
 	FIELD f_dmnihysa BYTE Lnet/minecraft/unmapped/C_qsrmwluu;
 	FIELD f_fhotulhk FLOAT Lnet/minecraft/unmapped/C_qsrmwluu;
 	FIELD f_frcdpjld STRING Lnet/minecraft/unmapped/C_qsrmwluu;
+	FIELD f_ggqudulf BYTE_ARRAY Lnet/minecraft/unmapped/C_qsrmwluu;
 	FIELD f_jbsfgkwv OPTIONAL_NBT Lnet/minecraft/unmapped/C_qsrmwluu;
 	FIELD f_jvjadjsq QUATERNIONF Lnet/minecraft/unmapped/C_qsrmwluu;
 	FIELD f_kcibtezy NBT_ELEMENT Lnet/minecraft/unmapped/C_qsrmwluu;
+	FIELD f_kvwzvahn GAME_PROFILE Lnet/minecraft/unmapped/C_qsrmwluu;
+	FIELD f_lbagivqh UNLIMITED_NBT_ELEMENT Lnet/minecraft/unmapped/C_qsrmwluu;
 	FIELD f_nsxxlrdp VECTOR3F Lnet/minecraft/unmapped/C_qsrmwluu;
 	FIELD f_pvgxhbfa NBT_COMPOUND Lnet/minecraft/unmapped/C_qsrmwluu;
 	FIELD f_rfaaqzbo DOUBLE Lnet/minecraft/unmapped/C_qsrmwluu;
+	FIELD f_supiohbz MAX_INITIAL_SIZE I
 	FIELD f_uragsrtm SHORT Lnet/minecraft/unmapped/C_qsrmwluu;
+	FIELD f_uyscbhlw INT Lnet/minecraft/unmapped/C_qsrmwluu;
 	FIELD f_zeeybklf BOOL Lnet/minecraft/unmapped/C_qsrmwluu;
 	FIELD f_zvxeyjsp VAR_INT Lnet/minecraft/unmapped/C_qsrmwluu;
+	METHOD m_alnjbjmz collection (Ljava/util/function/IntFunction;Lnet/minecraft/unmapped/C_qsrmwluu;I)Lnet/minecraft/unmapped/C_qsrmwluu;
+		ARG 0 factory
+		ARG 1 elementCodec
+		ARG 2 maxSize
+	METHOD m_ciouqnhu optional (Lnet/minecraft/unmapped/C_qsrmwluu;)Lnet/minecraft/unmapped/C_qsrmwluu;
+	METHOD m_dpnrrusl map (Ljava/util/function/IntFunction;Lnet/minecraft/unmapped/C_qsrmwluu;Lnet/minecraft/unmapped/C_qsrmwluu;)Lnet/minecraft/unmapped/C_qsrmwluu;
+	METHOD m_drmsxvwy (Lnet/minecraft/unmapped/C_hhlwcnih;)Lnet/minecraft/unmapped/C_oivssbvb;
+		ARG 0 element
+	METHOD m_egxexijk fromRegistryCodec (Lcom/mojang/serialization/Codec;Ljava/util/function/Supplier;)Lnet/minecraft/unmapped/C_qsrmwluu;
+	METHOD m_exbtwozt (Lcom/mojang/serialization/Codec;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_oivssbvb;
+		ARG 1 value
+	METHOD m_fcmaafce nbtElement (Ljava/util/function/Supplier;)Lnet/minecraft/unmapped/C_qsrmwluu;
+		ARG 0 sizeTracker
 	METHOD m_fhfovxvd registryValue (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_qsrmwluu;
 	METHOD m_fvunjhob string (I)Lnet/minecraft/unmapped/C_qsrmwluu;
 		ARG 0 maxLength
 	METHOD m_hbizjcsr registryEntry (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_qsrmwluu;
+	METHOD m_hnoeqrke factory (Ljava/util/function/IntFunction;Lnet/minecraft/unmapped/C_qsrmwluu;)Lnet/minecraft/unmapped/C_qsrmwluu;
+	METHOD m_hzgsqquo fromCodec (Lcom/mojang/serialization/Codec;Ljava/util/function/Supplier;)Lnet/minecraft/unmapped/C_qsrmwluu;
+	METHOD m_jqcxtmyk entryOf (Lnet/minecraft/unmapped/C_feaetnaz;)Lnet/minecraft/unmapped/C_qsrmwluu;
+	METHOD m_likrvuxr holderSet (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_qsrmwluu;
+	METHOD m_limimtjq fromCodec (Lcom/mojang/serialization/Codec;)Lnet/minecraft/unmapped/C_qsrmwluu;
+	METHOD m_lyaauawx readCollectionSize (Lio/netty/buffer/ByteBuf;I)I
+		ARG 1 maxSize
+	METHOD m_mdzisppw (Lcom/mojang/serialization/Codec;Lnet/minecraft/unmapped/C_oivssbvb;)Ljava/lang/Object;
+		ARG 1 element
+	METHOD m_mjfejzjf either (Lnet/minecraft/unmapped/C_qsrmwluu;Lnet/minecraft/unmapped/C_qsrmwluu;)Lnet/minecraft/unmapped/C_qsrmwluu;
+		ARG 0 left
+		ARG 1 right
+	METHOD m_mmxkfddk (Lnet/minecraft/unmapped/C_oivssbvb;Ljava/lang/String;)Lio/netty/handler/codec/DecoderException;
+		ARG 1 string
+	METHOD m_mxlbflvn (Ljava/lang/Object;Ljava/lang/String;)Lio/netty/handler/codec/EncoderException;
+		ARG 1 string
+	METHOD m_npmxjnbl toCollection ()Lnet/minecraft/unmapped/C_qsrmwluu$C_afmwjpzk;
+	METHOD m_nqqkdxck map (Ljava/util/function/IntFunction;Lnet/minecraft/unmapped/C_qsrmwluu;Lnet/minecraft/unmapped/C_qsrmwluu;I)Lnet/minecraft/unmapped/C_qsrmwluu;
+		ARG 0 factory
+		ARG 1 keyCodec
+		ARG 2 valueCodec
+		ARG 3 maxSize
+	METHOD m_oloxdgqd toCollection (I)Lnet/minecraft/unmapped/C_qsrmwluu$C_afmwjpzk;
+		ARG 0 maxSize
+	METHOD m_oxatcqxo indexed (Ljava/util/function/IntFunction;Ljava/util/function/ToIntFunction;)Lnet/minecraft/unmapped/C_qsrmwluu;
+		ARG 0 indexToValue
+		ARG 1 valueToIndex
+	METHOD m_prosdmov nbtCompound (Ljava/util/function/Supplier;)Lnet/minecraft/unmapped/C_qsrmwluu;
+	METHOD m_pzbvtfeh fromCodecUnlimited (Lcom/mojang/serialization/Codec;)Lnet/minecraft/unmapped/C_qsrmwluu;
+	METHOD m_qaqftswj fromRegistryCodec (Lcom/mojang/serialization/Codec;)Lnet/minecraft/unmapped/C_qsrmwluu;
+	METHOD m_ttkrtamq fromRegistryCodecUnlimited (Lcom/mojang/serialization/Codec;)Lnet/minecraft/unmapped/C_qsrmwluu;
 	METHOD m_ugyvwjlm registry (Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_qsrmwluu;
+		ARG 1 registryTransformer
 	METHOD m_vpmnqxks registryEntry (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_qsrmwluu;)Lnet/minecraft/unmapped/C_qsrmwluu;
+	METHOD m_ydaogaft byteArray (I)Lnet/minecraft/unmapped/C_qsrmwluu;
+		ARG 0 maxLength
+	METHOD m_ygyhvfaa writeCollectionSize (Lio/netty/buffer/ByteBuf;II)V
+		ARG 1 size
+		ARG 2 maxSize
+	METHOD m_yjwewpbh (Lnet/minecraft/unmapped/C_oivssbvb;)Lnet/minecraft/unmapped/C_hhlwcnih;
+		ARG 0 element
+	METHOD m_yypssatp toCollection (Ljava/util/function/IntFunction;)Lnet/minecraft/unmapped/C_qsrmwluu$C_afmwjpzk;
+		ARG 0 factory
+	CLASS C_dhtumjvv
+		FIELD f_pzuarqam DIRECT_ENTRY I
+		FIELD f_ysesalon holderCodec Lnet/minecraft/unmapped/C_qsrmwluu;
+	CLASS C_hvrqkwdr
+		METHOD m_kfajemtk decode (Lio/netty/buffer/ByteBuf;)[B
+			ARG 1 buf
+		METHOD m_vyhpugrn encode (Lio/netty/buffer/ByteBuf;[B)V
+			ARG 1 buf
+			ARG 2 stack
+	CLASS C_kafuxsar
+		FIELD f_pjmbtmut MAX_NAME_LENGTH I
+		FIELD f_qryhtiop MAX_VALUE_LENGTH I
+		FIELD f_tfyfoyzd MAX_MAP_SIZE I
+		FIELD f_tudrrsev MAX_SIGNATURE_LENGTH I
+		METHOD m_nunuxbop (Lio/netty/buffer/ByteBuf;)Ljava/lang/String;
+			ARG 0 byteBuf
+		METHOD m_qimnbrnr (Lio/netty/buffer/ByteBuf;Ljava/lang/String;)V
+			ARG 0 byteBuf
+			ARG 1 string
+	CLASS C_oatylnwr
+		METHOD m_goafjuxj (Lnet/minecraft/unmapped/C_qsrmwluu;Lio/netty/buffer/ByteBuf;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/lang/Object;Ljava/lang/Object;)V
+			ARG 3 key
+			ARG 4 value
+	CLASS C_pylymjel
+		METHOD m_kmfqehwe (Lio/netty/buffer/ByteBuf;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/lang/Object;)V
+			ARG 2 value
+		METHOD m_shxibpeq (Lio/netty/buffer/ByteBuf;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/lang/Object;)V
+			ARG 2 value
+	CLASS C_qocgsfeq
+		METHOD m_fvtpsqsq (Ljava/lang/Object;Ljava/lang/String;)Lio/netty/handler/codec/EncoderException;
+			ARG 1 string
+		METHOD m_wvxmideb (Lnet/minecraft/unmapped/C_oivssbvb;Ljava/lang/String;)Lio/netty/handler/codec/DecoderException;
+			ARG 1 string
+	CLASS C_roxkizqk
+		METHOD m_meevnjcw decode (Lio/netty/buffer/ByteBuf;)[B
+			ARG 1 buf
+		METHOD m_zwyjwjob encode (Lio/netty/buffer/ByteBuf;[B)V
+			ARG 1 buf
+			ARG 2 stack
+	CLASS C_vvbhljtb
+		FIELD f_iesrdjsl DIRECT_VALUE I
+		METHOD m_foxeftop getHolderIdMap (Lnet/minecraft/unmapped/C_bngyzsts;)Lnet/minecraft/unmapped/C_feaetnaz;
+			ARG 1 buf
+	CLASS C_xvgblejl
+		METHOD m_eqcajgzv createIterable (Lnet/minecraft/unmapped/C_bngyzsts;)Lnet/minecraft/unmapped/C_feaetnaz;
+			ARG 1 buf
diff --git a/mappings/net/minecraft/network/codec/PacketEncoder.mapping b/mappings/net/minecraft/network/codec/PacketEncoder.mapping
index 2493197c55..b29034d4c7 100644
--- a/mappings/net/minecraft/network/codec/PacketEncoder.mapping
+++ b/mappings/net/minecraft/network/codec/PacketEncoder.mapping
@@ -1,4 +1,4 @@
 CLASS net/minecraft/unmapped/C_hiksfskl net/minecraft/network/codec/PacketEncoder
-	METHOD encode (Ljava/lang/Object;Ljava/lang/Object;)V
+	METHOD encode encode (Ljava/lang/Object;Ljava/lang/Object;)V
 		ARG 1 buf
 		ARG 2 stack
diff --git a/mappings/net/minecraft/network/codec/ValueFirstEncoder.mapping b/mappings/net/minecraft/network/codec/ValueFirstEncoder.mapping
index b608f9e21d..2601385d86 100644
--- a/mappings/net/minecraft/network/codec/ValueFirstEncoder.mapping
+++ b/mappings/net/minecraft/network/codec/ValueFirstEncoder.mapping
@@ -1 +1,4 @@
 CLASS net/minecraft/unmapped/C_dptxqryi net/minecraft/network/codec/ValueFirstEncoder
+	METHOD encode encode (Ljava/lang/Object;Ljava/lang/Object;)V
+		ARG 1 value
+		ARG 2 buf
diff --git a/mappings/net/minecraft/registry/HolderLookup.mapping b/mappings/net/minecraft/registry/HolderLookup.mapping
index f837dcae3d..299294c5c1 100644
--- a/mappings/net/minecraft/registry/HolderLookup.mapping
+++ b/mappings/net/minecraft/registry/HolderLookup.mapping
@@ -18,6 +18,7 @@ CLASS net/minecraft/unmapped/C_vtbxyypo net/minecraft/registry/HolderLookup
 		METHOD m_ejzrnhrb getHolderProvider ()Lnet/minecraft/unmapped/C_pzdchrcy$C_pbvqpmst;
 		METHOD m_iwetggkj getLookup (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional;
 		METHOD m_onxuqmul getLookupOrThrow (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl;
+		METHOD m_uwaazyzq createSerializationContext (Lcom/mojang/serialization/DynamicOps;)Lnet/minecraft/unmapped/C_piadqmzm;
 		CLASS C_ikewmnmv
 			METHOD m_axtnqmym (Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl;)Lnet/minecraft/unmapped/C_pzdchrcy;
 				ARG 0 value
diff --git a/mappings/net/minecraft/registry/RegistryKey.mapping b/mappings/net/minecraft/registry/RegistryKey.mapping
index 94d24487cd..632bdba4e1 100644
--- a/mappings/net/minecraft/registry/RegistryKey.mapping
+++ b/mappings/net/minecraft/registry/RegistryKey.mapping
@@ -14,6 +14,7 @@ CLASS net/minecraft/unmapped/C_xhhleach net/minecraft/registry/RegistryKey
 		ARG 2 value
 	METHOD m_achtcauh (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_xhhleach;
 		ARG 1 value
+	METHOD m_bbzwrvpr packetCodec (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_qsrmwluu;
 	METHOD m_fvrtwzrl of (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_xhhleach;
 		COMMENT Creates a registry key for a value in a registry with a registry key for
 		COMMENT the value-holding registry in the root registry and an identifier of the
@@ -47,7 +48,11 @@ CLASS net/minecraft/unmapped/C_xhhleach net/minecraft/registry/RegistryKey
 		COMMENT @param <T> the element type of the registry
 		ARG 0 registry
 			COMMENT the identifier of the registry
+	METHOD m_slcuvcqz (Lnet/minecraft/unmapped/C_xhhleach$C_gdrqkfgh;)Lnet/minecraft/unmapped/C_xhhleach;
+		ARG 0 internKey
 	METHOD m_tbhhljwv getRegistry ()Lnet/minecraft/unmapped/C_ncpywfca;
+	METHOD m_xhwzyssj (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_xhhleach;
+		ARG 1 id
 	METHOD m_yomlikvd cast (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional;
 		ARG 1 registry
 	CLASS C_gdrqkfgh InternKey
diff --git a/mappings/net/minecraft/registry/RegistryKeys.mapping b/mappings/net/minecraft/registry/RegistryKeys.mapping
index 801d2c5002..9a7d41e5ec 100644
--- a/mappings/net/minecraft/registry/RegistryKeys.mapping
+++ b/mappings/net/minecraft/registry/RegistryKeys.mapping
@@ -8,6 +8,7 @@ CLASS net/minecraft/unmapped/C_msgswxvc net/minecraft/registry/RegistryKeys
 	FIELD f_csjwbrzj CHUNK_GENERATOR Lnet/minecraft/unmapped/C_xhhleach;
 	FIELD f_dbitqvtd STRUCTURE_PROCESSOR_TYPE Lnet/minecraft/unmapped/C_xhhleach;
 	FIELD f_ddyigrco LOOT_POOL_ENTRY_TYPE Lnet/minecraft/unmapped/C_xhhleach;
+	FIELD f_djhmtgiv ROOT Lnet/minecraft/unmapped/C_ncpywfca;
 	FIELD f_dkrlikwc HEIGHT_PROVIDER_TYPE Lnet/minecraft/unmapped/C_xhhleach;
 	FIELD f_dkshocoq MULTI_NOISE_BIOME_SOURCE_PARAMETER_LIST Lnet/minecraft/unmapped/C_xhhleach;
 	FIELD f_dpcrzasg TRIM_MATERIAL Lnet/minecraft/unmapped/C_xhhleach;
diff --git a/mappings/net/minecraft/util/ChatUtil.mapping b/mappings/net/minecraft/util/ChatUtil.mapping
index 96d4ad0d7b..91b5e3f101 100644
--- a/mappings/net/minecraft/util/ChatUtil.mapping
+++ b/mappings/net/minecraft/util/ChatUtil.mapping
@@ -4,6 +4,8 @@ CLASS net/minecraft/unmapped/C_myfdnbpo net/minecraft/util/ChatUtil
 	FIELD f_tsspjsfg PATTERN Ljava/util/regex/Pattern;
 	METHOD m_abbwkasr isEmpty (Ljava/lang/String;)Z
 		ARG 0 text
+	METHOD m_anvjegoa isValidPlayerName (Ljava/lang/String;)Z
+		ARG 0 playerName
 	METHOD m_laqnwome countLines (Ljava/lang/String;)I
 		ARG 0 text
 	METHOD m_lxtzyqql endsWithLineBreak (Ljava/lang/String;)Z
diff --git a/mappings/net/minecraft/util/collection/IndexedIterable.mapping b/mappings/net/minecraft/util/collection/IndexedIterable.mapping
index 1071a9bb13..1de9568af0 100644
--- a/mappings/net/minecraft/util/collection/IndexedIterable.mapping
+++ b/mappings/net/minecraft/util/collection/IndexedIterable.mapping
@@ -1,5 +1,6 @@
 CLASS net/minecraft/unmapped/C_feaetnaz net/minecraft/util/collection/IndexedIterable
 	FIELD f_iecnjcxw DEFAULT I
+	METHOD m_hjasljfw getRawIdOrThrow (Ljava/lang/Object;)I
 	METHOD m_jmjsmdoh get (I)Ljava/lang/Object;
 		ARG 1 index
 	METHOD m_lwumvtoo getOrThrow (I)Ljava/lang/Object;
diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping
index 73fee069d4..cdd3f0eca5 100644
--- a/mappings/net/minecraft/util/dynamic/Codecs.mapping
+++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping
@@ -7,6 +7,7 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs
 	FIELD f_aylcbfcj identifierPath Lcom/mojang/serialization/Codec;
 	FIELD f_bcprdsha FROM_OPTIONAL_LONG Ljava/util/function/Function;
 	FIELD f_bwjbifvs BIT_SET Lcom/mojang/serialization/Codec;
+	FIELD f_bxtwhxeq PLAYER_NAME Lcom/mojang/serialization/Codec;
 	FIELD f_dawkqtjs POSITIVE_FLOAT Lcom/mojang/serialization/Codec;
 	FIELD f_gkaqcuyx GAME_PROFILE Lcom/mojang/serialization/Codec;
 	FIELD f_hebpgars QUATERNIONF_COMPONENTS Lcom/mojang/serialization/Codec;
@@ -16,6 +17,7 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs
 	FIELD f_mnhteojj TO_OPTIONAL_LONG Ljava/util/function/Function;
 	FIELD f_mowibqnt QUATERNIONF Lcom/mojang/serialization/Codec;
 	FIELD f_oawolklc PROPERTY Lcom/mojang/serialization/Codec;
+	FIELD f_oqekknlk UNSIGNED_BYTE Lcom/mojang/serialization/Codec;
 	FIELD f_ozwtoxnd INSTANT Lcom/mojang/serialization/Codec;
 	FIELD f_pfcngcne PATTERN Lcom/mojang/serialization/Codec;
 	FIELD f_pkhgdcwg BASE64_STRING Lcom/mojang/serialization/Codec;
@@ -32,34 +34,84 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs
 	METHOD m_aeryaqrd createStrictOptionalField (Lcom/mojang/serialization/Codec;Ljava/lang/String;Ljava/lang/Object;)Lcom/mojang/serialization/MapCodec;
 		ARG 1 name
 		ARG 2 fallback
+	METHOD m_ahlasxan withLifecycle (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec;
+		ARG 1 entryLifestyleGetter
+		ARG 2 lifestyleGetter
+	METHOD m_awjfgfbh (Lcom/mojang/datafixers/util/Either;)Lcom/mojang/authlib/properties/PropertyMap;
+		ARG 0 either
+	METHOD m_azagsdch (Ljava/util/BitSet;)Ljava/util/stream/LongStream;
+		ARG 0 bitSet
+	METHOD m_bbclwurz (Lcom/mojang/authlib/properties/Property;)Ljava/util/Optional;
+		ARG 0 property
+	METHOD m_bpcsbcqp (Lcom/mojang/authlib/GameProfile;Lcom/mojang/authlib/properties/PropertyMap;)Lcom/mojang/authlib/GameProfile;
+		ARG 1 propertyMap
+	METHOD m_bqtubtow (Ljava/util/function/Function;Ljava/util/Collection;)Lcom/mojang/serialization/DataResult;
+		ARG 1 collection
+	METHOD m_bylmenao withLifecycle (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec;
+		ARG 1 lifestyleGetter
+	METHOD m_cjkdnnjx (Ljava/util/List;)Lorg/joml/Vector3f;
+		ARG 0 list2
+	METHOD m_cjobvjnd (IILjava/lang/String;)Lcom/mojang/serialization/DataResult;
+		ARG 2 string
 	METHOD m_cjqijzpr createStrictOptionalField (Lcom/mojang/serialization/Codec;Ljava/lang/String;)Lcom/mojang/serialization/MapCodec;
 		ARG 1 name
+	METHOD m_cqinaoub (IILjava/util/function/Function;Ljava/lang/Integer;)Lcom/mojang/serialization/DataResult;
+		ARG 3 value
 	METHOD m_dgtnqbdd withOptionalParameters (Ljava/lang/String;Ljava/lang/String;Lcom/mojang/serialization/Codec;Ljava/util/function/Function;Ljava/util/function/Function;)Lcom/mojang/serialization/MapCodec;
 		ARG 0 typeKey
 		ARG 1 parametersKey
 		ARG 2 typeCodec
 		ARG 3 typeGetter
 		ARG 4 parameterCodecGetter
+	METHOD m_dmqewsll (Lorg/joml/AxisAngle4f;)Lorg/joml/Vector3f;
+		ARG 0 axisAngle4f
 	METHOD m_dujfhivb orElsePartial (Ljava/lang/Object;)Lcom/mojang/serialization/Codec$ResultFunction;
 		ARG 0 partial
 	METHOD m_flhgmmki fromOps (Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/Codec;
+	METHOD m_fqehmthq (Lcom/mojang/datafixers/util/Either;)Ljava/lang/Object;
+		ARG 0 either
 	METHOD m_fvpeuyuk (Ljava/lang/String;)Lcom/mojang/serialization/DataResult;
 		ARG 0 string
+	METHOD m_fzwwvhqc (ILjava/util/List;)Lcom/mojang/serialization/DataResult;
+		ARG 1 list
+	METHOD m_gcywmtgx (Ljava/util/List;)Lcom/mojang/serialization/DataResult;
+		ARG 0 list
+	METHOD m_gglkhqew (Lorg/joml/Matrix4f;)Ljava/util/List;
+		ARG 0 matrix4f
 	METHOD m_gtuotoel createStrictUnboundedMap (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)Lnet/minecraft/unmapped/C_tyjpezxh$C_psivvwhx;
 		ARG 0 keyCodec
 		ARG 1 elementCodec
+	METHOD m_gyrtopxy (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+		ARG 0 instance
+	METHOD m_gywbxzse (Lcom/mojang/serialization/Codec;Ljava/lang/String;Ljava/lang/String;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+		ARG 3 instance
+	METHOD m_hpsmlhqm (Ljava/util/List;)Lcom/mojang/serialization/DataResult;
+		ARG 0 value
 	METHOD m_hsukemqs (Ljava/util/function/IntFunction;Ljava/lang/Integer;)Lcom/mojang/serialization/DataResult;
 		ARG 1 id
 	METHOD m_ifdvuwzy formattedTime (Ljava/time/format/DateTimeFormatter;)Lcom/mojang/serialization/Codec;
 		ARG 0 formatter
+	METHOD m_ihmqisju (FFLjava/util/function/Function;Ljava/lang/Float;)Lcom/mojang/serialization/DataResult;
+		ARG 3 value
 	METHOD m_ihvqsgya retrieveContext (Ljava/util/function/Function;)Lcom/mojang/serialization/MapCodec;
 		ARG 0 retriever
+	METHOD m_ilnvpqgy optionalEmptyMap (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
+	METHOD m_iuewvnnu ([B)Ljava/lang/String;
+		ARG 0 bytes
+	METHOD m_ivlefwee (Ljava/lang/String;)Lcom/mojang/serialization/DataResult;
+		ARG 0 string
+	METHOD m_ixzsdsbs (Ljava/util/function/Function;Ljava/util/function/Function;Ljava/lang/Object;)Ljava/util/List;
+		ARG 2 object
 	METHOD m_izqjachd (Ljava/util/function/Function;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
 		ARG 1 element
+	METHOD m_jrgbljpx (Ljava/lang/Object;Ljava/util/Optional;)Ljava/lang/Object;
+		ARG 1 optional
 	METHOD m_juozehmq withNonEmptyHolderSet (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
 		ARG 0 codec
 	METHOD m_kbffjffi exceptionCatchingDecoder (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
 		ARG 0 codec
+	METHOD m_kcbwhxls (Lorg/joml/AxisAngle4f;)Ljava/lang/Float;
+		ARG 0 axisAngle4f
 	METHOD m_kcyhqcjs xor (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
 		COMMENT Returns an exclusive-or codec for {@link Either} instances.
 		COMMENT
@@ -78,6 +130,8 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs
 			COMMENT the first codec
 		ARG 1 second
 			COMMENT the second codec
+	METHOD m_kekplbns (Ljava/lang/Object;)Ljava/lang/Object;
+		ARG 0 value
 	METHOD m_lebygrcd createRawIdResolverCodec (Ljava/util/function/ToIntFunction;Ljava/util/function/IntFunction;I)Lcom/mojang/serialization/Codec;
 		ARG 0 elementToId
 		ARG 1 idToElement
@@ -89,14 +143,20 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs
 	METHOD m_ljxipwty validate (Lcom/mojang/serialization/MapCodec;Ljava/util/function/Function;)Lcom/mojang/serialization/MapCodec;
 		ARG 0 codec
 		ARG 1 validator
+	METHOD m_lmmxgycz (Ljava/lang/Object;)Ljava/lang/Object;
+		ARG 0 value
 	METHOD m_lprwixza either (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
 		ARG 0 first
 		ARG 1 second
+	METHOD m_lqfxmpnv (Ljava/util/Optional;)Ljava/util/OptionalLong;
+		ARG 0 optional
 	METHOD m_lrcwcdqs orCompressed (Lcom/mojang/serialization/MapCodec;Lcom/mojang/serialization/MapCodec;)Lcom/mojang/serialization/MapCodec;
 		ARG 0 uncompressed
 		ARG 1 compressed
 	METHOD m_lruqlezz asOptionalLong (Lcom/mojang/serialization/MapCodec;)Lcom/mojang/serialization/MapCodec;
 		ARG 0 codec
+	METHOD m_lscrzsve (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_tyjpezxh$C_pdblrsjv;
+		ARG 0 id
 	METHOD m_lxagintb (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/Dynamic;
 		ARG 1 object
 	METHOD m_lybgbxfe createEqualTypeChecker (Ljava/util/function/Function;)Ljava/util/function/Function;
@@ -104,18 +164,35 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs
 	METHOD m_lytzwisw validate (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec;
 		ARG 0 codec
 		ARG 1 validator
+	METHOD m_mcwzjvkz (Ljava/util/List;)Lcom/mojang/serialization/DataResult;
+		ARG 0 list
+	METHOD m_mfpnjepb (Lorg/joml/Vector3f;)Ljava/util/List;
+		ARG 0 vector3f
 	METHOD m_mgvopkql (Lcom/mojang/authlib/properties/PropertyMap;Ljava/util/List;)V
 		ARG 1 list
+	METHOD m_mhgxozyd (Ljava/lang/String;)Lcom/mojang/serialization/DataResult;
+		ARG 0 value
 	METHOD m_mrsshdck createEither (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)Lnet/minecraft/unmapped/C_tyjpezxh$C_utmdutep;
 		ARG 0 first
 		ARG 1 second
+	METHOD m_mxydmzvu (Ljava/lang/Integer;)Lcom/mojang/serialization/DataResult;
+		ARG 0 size
+	METHOD m_njoxfqbl sizeLimitedMap (Lcom/mojang/serialization/Codec;I)Lcom/mojang/serialization/Codec;
+		ARG 1 maxSize
 	METHOD m_nsiytucc withNonEmptyList (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
 		ARG 0 originalCodec
 	METHOD m_nuxvjbjt createRangedInt (II)Lcom/mojang/serialization/Codec;
 		ARG 0 min
 		ARG 1 max
+	METHOD m_nvmahqoi (Lcom/mojang/authlib/GameProfile;Ljava/lang/String;Lcom/mojang/authlib/properties/Property;)V
+		ARG 1 key
+		ARG 2 property
+	METHOD m_nyqaucfx (Ljava/util/function/BiFunction;Ljava/util/List;)Lcom/mojang/serialization/DataResult;
+		ARG 1 list
 	METHOD m_paojkcnu (Lcom/mojang/authlib/properties/PropertyMap;)Lcom/mojang/datafixers/util/Either;
 		ARG 0 propertyMap
+	METHOD m_pbrvpbbc (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+		ARG 0 instance
 	METHOD m_pknstmhl createCodecForPairObject (Lcom/mojang/serialization/Codec;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/BiFunction;Ljava/util/function/Function;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec;
 		ARG 0 codec
 		ARG 1 leftFieldName
@@ -124,40 +201,121 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs
 		ARG 4 leftFunction
 		ARG 5 rightFunction
 	METHOD m_pqmgxbkr (Ljava/util/List;)Lorg/joml/Quaternionf;
-		ARG 0 list
+		ARG 0 list2
+	METHOD m_pwhzhqyq (Ljava/util/function/BiFunction;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/serialization/DataResult;
+		ARG 1 pair
+	METHOD m_qhmqfpeu (Ljava/time/format/DateTimeFormatter;Ljava/lang/String;)Lcom/mojang/serialization/DataResult;
+		ARG 1 string
+	METHOD m_qnecbchq (IILjava/lang/Integer;)Ljava/lang/String;
+		ARG 2 value
 	METHOD m_qunssoca (Ljava/lang/String;III)Ljava/lang/String;
 		ARG 0 string
+	METHOD m_rjbacnta unboundedDispatchMap (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec;
+		ARG 0 keyCodec
+		ARG 1 keyToValueCodec
+	METHOD m_rtlolhzf (Ljava/util/stream/LongStream;)Ljava/util/BitSet;
+		ARG 0 longStream
 	METHOD m_segfvobg createRecursive (Ljava/lang/String;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec;
 		ARG 0 name
 		ARG 1 codecFunction
+	METHOD m_shkjkhku (Ljava/lang/String;)Lcom/mojang/serialization/DataResult;
+		ARG 0 name
+	METHOD m_sjbitenz (Ljava/util/function/Function;Lcom/mojang/datafixers/util/Either;)Ljava/lang/Object;
+		ARG 1 either
+	METHOD m_skoqjmlp (Ljava/lang/Object;)Ljava/lang/Object;
+		ARG 0 value
 	METHOD m_sltnwzrc createRangedFloat (FFLjava/util/function/Function;)Lcom/mojang/serialization/Codec;
 		ARG 0 min
 		ARG 1 max
 		ARG 2 messageFactory
+	METHOD m_sohjlqwr (Ljava/util/function/BiFunction;Ljava/util/List;)Lcom/mojang/serialization/DataResult;
+		ARG 1 list2
+	METHOD m_spzosery (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+		ARG 0 instance
 	METHOD m_szibgwdf (Ljava/lang/String;)Lcom/mojang/serialization/DataResult;
 		ARG 0 string
 	METHOD m_szwqjlsd createStringResolverCodec (Ljava/util/function/Function;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec;
 		ARG 0 elementToString
 		ARG 1 stringToElement
+	METHOD m_tcqadgvx (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_tyjpezxh$C_pdblrsjv;
+		ARG 0 id
 	METHOD m_tewufcxl either (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec;
 		ARG 0 serialized
 		ARG 1 alternative
 		ARG 2 alternativeMapper
+	METHOD m_tjbitvra (Ljava/lang/Integer;)Ljava/lang/String;
+		ARG 0 value
+	METHOD m_traryqmn (Lorg/joml/Quaternionf;)Ljava/util/List;
+		ARG 0 quaternionf
+	METHOD m_ttlzdlzb (ILjava/util/Map;)Lcom/mojang/serialization/DataResult;
+		ARG 1 map
+	METHOD m_tuzltnkq (Ljava/lang/Integer;)Ljava/lang/String;
+		ARG 0 value
+	METHOD m_twpkqstu (Ljava/util/function/Function;Ljava/util/function/Function;Ljava/lang/Object;)Lcom/mojang/datafixers/util/Pair;
+		ARG 2 object
+	METHOD m_uecgbzal (Lcom/mojang/authlib/properties/PropertyMap;Ljava/util/Map;)V
+		ARG 1 map
+	METHOD m_ukhaibge (Lnet/minecraft/unmapped/C_odfnijdo;)Lcom/mojang/serialization/DataResult;
+		ARG 0 value
+	METHOD m_uxwzesrj (Ljava/lang/String;)Lcom/mojang/serialization/DataResult;
+		ARG 0 string
 	METHOD m_uyhsvlud orCompressed (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
 		ARG 0 uncompressed
 		ARG 1 compressed
+	METHOD m_uywslctn (Ljava/util/List;)Lorg/joml/Matrix4f;
+		ARG 0 list2
 	METHOD m_vcaoiues sizeLimitedString (II)Lcom/mojang/serialization/Codec;
 		ARG 0 min
 		ARG 1 max
+	METHOD m_vwvcmdbr (Ljava/util/OptionalLong;)Ljava/util/Optional;
+		ARG 0 optionalLong
+	METHOD m_wbwqgbrh (Ljava/lang/String;)Lcom/mojang/serialization/DataResult;
+		ARG 0 string
+	METHOD m_wdvkpnng (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+		ARG 0 instance
+	METHOD m_whwogkgz (Ljava/lang/String;)Lcom/mojang/serialization/DataResult;
+		ARG 0 value
 	METHOD m_wifswwjp object2BooleanMap (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
+	METHOD m_wnlfxiwt (Ljava/util/List;)Lcom/mojang/serialization/DataResult;
+		ARG 0 list
+	METHOD m_wqqvahsk createRecursiveMap (Ljava/lang/String;Ljava/util/function/Function;)Lcom/mojang/serialization/MapCodec;
+		ARG 0 name
+		ARG 1 mapCodecFunction
+	METHOD m_wxgzhhdm (Ljava/util/function/ToIntFunction;ILjava/lang/Object;)Lcom/mojang/serialization/DataResult;
+		ARG 2 element
 	METHOD m_wxkgkkvl (Ljava/util/function/Function;Ljava/util/function/Function;Ljava/lang/Object;)Lcom/mojang/datafixers/util/Either;
 		ARG 2 object
+	METHOD m_wyxpcupd (Ljava/util/function/BiFunction;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
+		ARG 1 object
+	METHOD m_xtpmdryr (Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Optional;
+		ARG 1 value
 	METHOD m_yffzvlqa (Lcom/mojang/authlib/properties/PropertyMap;Ljava/lang/String;Ljava/util/List;)V
 		ARG 1 key
+		ARG 2 list
+	METHOD m_ykbqyyyz (Ljava/lang/String;Ljava/lang/String;Ljava/util/Optional;)Lcom/mojang/authlib/properties/Property;
+		ARG 0 name
+		ARG 1 value
+		ARG 2 signature
+	METHOD m_ysxquhwr sizeLimitedList (Lcom/mojang/serialization/Codec;I)Lcom/mojang/serialization/Codec;
+		ARG 1 maxSize
 	METHOD m_ywccywds (Ljava/util/function/Function;Ljava/lang/String;)Lcom/mojang/serialization/DataResult;
 		ARG 1 string
+	METHOD m_ywzojanw (Ljava/util/function/BiFunction;Lcom/mojang/datafixers/util/Either;)Lcom/mojang/serialization/DataResult;
+		ARG 1 either
 	METHOD m_yxbdjpqp createLazy (Ljava/util/function/Supplier;)Lcom/mojang/serialization/Codec;
 		ARG 0 supplier
+	METHOD m_zvytsfav (Ljava/lang/Float;)Ljava/lang/String;
+		ARG 0 value
+	CLASS C_ckxfvtoi
+		METHOD decode decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
+			ARG 2 input
+		METHOD encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
+			ARG 1 optional
+			ARG 3 input
+		METHOD m_hchbtrfv (Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/datafixers/util/Pair;
+			ARG 0 pair
+		METHOD m_pvrihuux isEmptyMap (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Z
+			ARG 1 input
 	CLASS C_cuphesbl Xor
 		COMMENT An xor codec that only permits exactly one of the two data choices to be
 		COMMENT present.
@@ -199,6 +357,17 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs
 			ARG 3 builder
 		METHOD keys keys (Lcom/mojang/serialization/DynamicOps;)Ljava/util/stream/Stream;
 			ARG 1 ops
+	CLASS C_dmssmuns RecursiveMapCodec
+		FIELD f_bpbqdiqc name Ljava/lang/String;
+		FIELD f_fprpyiqj wrapped Ljava/util/function/Supplier;
+		METHOD <init> (Ljava/lang/String;Ljava/util/function/Function;)V
+			ARG 2 codecFunction
+		METHOD decode decode (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/MapLike;)Lcom/mojang/serialization/DataResult;
+			ARG 2 input
+		METHOD encode encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/RecordBuilder;)Lcom/mojang/serialization/RecordBuilder;
+			ARG 1 input
+			ARG 3 builder
+		METHOD keys keys (Lcom/mojang/serialization/DynamicOps;)Ljava/util/stream/Stream;
 	CLASS C_lduttodi
 		METHOD decode decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
 			ARG 2 input
@@ -313,3 +482,34 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs
 			ARG 4 pair
 		METHOD m_dsdzbjrq encodeStart (Lcom/mojang/serialization/Codec;Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/DataResult;
 			ARG 2 input
+	CLASS C_yruhnvhw
+		METHOD decode decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
+			ARG 2 input
+		METHOD encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
+			ARG 1 map
+			ARG 3 input
+		METHOD m_bcyjyvkk (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/DynamicOps;Ljava/util/function/Function;Ljava/util/Map;Ljava/util/stream/Stream$Builder;Lcom/mojang/serialization/DataResult;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/serialization/DataResult;
+			ARG 5 result
+			ARG 6 pair
+		METHOD m_bshbkoan (Lcom/mojang/datafixers/util/Unit;Lcom/mojang/datafixers/util/Unit;)Lcom/mojang/datafixers/util/Unit;
+			ARG 0 unit1
+			ARG 1 unit2
+		METHOD m_gqablwod (Ljava/lang/String;)V
+			ARG 0 string
+		METHOD m_kxmdoyea (Ljava/util/Map;Ljava/lang/Object;Lcom/mojang/datafixers/util/Unit;)Lcom/mojang/datafixers/util/Pair;
+			ARG 2 unit
+		METHOD m_ofwybkui (Lcom/mojang/datafixers/util/Unit;Ljava/lang/Object;)Lcom/mojang/datafixers/util/Unit;
+			ARG 0 unit
+			ARG 1 object
+		METHOD m_phaauqkt (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;
+			ARG 1 string
+		METHOD m_thgvrayt (Lcom/mojang/serialization/DataResult;Lcom/mojang/serialization/DataResult;)Lcom/mojang/serialization/DataResult;
+			ARG 0 result1
+			ARG 1 result2
+		METHOD m_wrrnxofc (Lcom/mojang/datafixers/util/Unit;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/datafixers/util/Unit;
+			ARG 0 unit
+			ARG 1 pair2
+		METHOD m_xcawbqca (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/DynamicOps;Ljava/util/function/Function;Ljava/lang/Object;Lcom/mojang/serialization/MapLike;)Lcom/mojang/serialization/DataResult;
+			ARG 4 map
+		METHOD m_yrwtnzav encodeStart (Lcom/mojang/serialization/Codec;Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/DataResult;
+			ARG 2 input
diff --git a/mappings/net/minecraft/util/dynamic/GlobalPos.mapping b/mappings/net/minecraft/util/dynamic/GlobalPos.mapping
index 3ae9f1b287..e6b99930a5 100644
--- a/mappings/net/minecraft/util/dynamic/GlobalPos.mapping
+++ b/mappings/net/minecraft/util/dynamic/GlobalPos.mapping
@@ -1,4 +1,5 @@
 CLASS net/minecraft/unmapped/C_ovcqqyqp net/minecraft/util/dynamic/GlobalPos
+	FIELD f_cndvtbkm MAP_CODEC Lcom/mojang/serialization/MapCodec;
 	FIELD f_gxtqwfba dimension Lnet/minecraft/unmapped/C_xhhleach;
 	FIELD f_krdfmqhs CODEC Lcom/mojang/serialization/Codec;
 	FIELD f_rielnpzh pos Lnet/minecraft/unmapped/C_hynzadkk;
diff --git a/mappings/net/minecraft/util/math/BlockPos.mapping b/mappings/net/minecraft/util/math/BlockPos.mapping
index 16623fccda..91d72a457c 100644
--- a/mappings/net/minecraft/util/math/BlockPos.mapping
+++ b/mappings/net/minecraft/util/math/BlockPos.mapping
@@ -244,3 +244,4 @@ CLASS net/minecraft/unmapped/C_hynzadkk net/minecraft/util/math/BlockPos
 			ARG 4 z
 	CLASS C_ztsnshls
 		FIELD f_lgtbqrhx pos Lnet/minecraft/unmapped/C_hynzadkk$C_egqitdjk;
+		FIELD f_nhmdgdci currentIndex I
diff --git a/simple_type_field_names.json5 b/simple_type_field_names.json5
index 678a810291..8b03f06fae 100644
--- a/simple_type_field_names.json5
+++ b/simple_type_field_names.json5
@@ -9,6 +9,7 @@
     ]
   },
   "com/mojang/serialization/MapCodec": "codec",
+  "net/minecraft/unmapped/C_qsrmwluu": "packetCodec", // PacketCodec
 
   // Data
   "net/minecraft/unmapped/C_nykrdyol": "exporter", // RecipeExporter