diff --git a/buildSrc/src/main/resources/minecraft_specific_words.txt b/buildSrc/src/main/resources/minecraft_specific_words.txt
index 35db4db81e..0cd791f908 100644
--- a/buildSrc/src/main/resources/minecraft_specific_words.txt
+++ b/buildSrc/src/main/resources/minecraft_specific_words.txt
@@ -420,6 +420,7 @@ craftable
 dumpable
 enchantable
 equippable
+loggable
 hoverable
 infestable
 interpolatable
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5cdd333071..c7ddc074d9 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 = "1.8.7"
+enigma = "1.8.8"
 enigma_plugin = "1.3.2"
 tiny_remapper = "0.7.2"
 stitch = "0.6.1"
diff --git a/mappings/net/minecraft/network/ClientConnection.mapping b/mappings/net/minecraft/network/ClientConnection.mapping
index 2dc144363a..61bf710d7e 100644
--- a/mappings/net/minecraft/network/ClientConnection.mapping
+++ b/mappings/net/minecraft/network/ClientConnection.mapping
@@ -13,11 +13,15 @@ CLASS net/minecraft/unmapped/C_oasmcckk net/minecraft/network/ClientConnection
 	FIELD f_hudxxxbp CLIENT_IO_GROUP Ljava/util/function/Supplier;
 	FIELD f_jrcdtkyf averagePacketsSent F
 	FIELD f_kawdlrjp channel Lio/netty/channel/Channel;
+	FIELD f_lafevvyl queuedTasks Ljava/util/Queue;
 	FIELD f_lspmidtv LOGGER Lorg/slf4j/Logger;
+	FIELD f_ltsvsynv S2C_PROTOCOL_KEY Lio/netty/util/AttributeKey;
 	FIELD f_mamtuefi packetsReceivedCounter I
+	FIELD f_naljjxui disconnectListener Lnet/minecraft/unmapped/C_tkgdawqw;
 	FIELD f_nqkzlzra PACKET_SENT_MARKER Lorg/slf4j/Marker;
 	FIELD f_pdctspiv EPOLL_CLIENT_IO_GROUP Ljava/util/function/Supplier;
 	FIELD f_sjhnumre averagePacketsReceived F
+	FIELD f_tealfggb C2S_PROTOCOL_KEY Lio/netty/util/AttributeKey;
 	FIELD f_ucdtbtsq packetListener Lnet/minecraft/unmapped/C_tkgdawqw;
 	FIELD f_vcukytvt errored Z
 	FIELD f_wborsynf NETWORK_MARKER Lorg/slf4j/Marker;
@@ -48,15 +52,23 @@ CLASS net/minecraft/unmapped/C_oasmcckk net/minecraft/network/ClientConnection
 		ARG 0 address
 		ARG 1 useEpoll
 		ARG 2 connection
+	METHOD m_ayigybdt disableAutoReload ()V
 	METHOD m_bgcagbfi sendImmediately (Lnet/minecraft/unmapped/C_zyjtrjrl;Lnet/minecraft/unmapped/C_zddpfpkk;Z)V
 		ARG 1 packet
 		ARG 2 listener
+		ARG 3 flush
 	METHOD m_bhwloxoc getPacketListener ()Lnet/minecraft/unmapped/C_tkgdawqw;
 	METHOD m_bjjkjdwd (Lorg/slf4j/Marker;)V
 		ARG 0 marker
 	METHOD m_bnpqdudq hasChannel ()Z
 	METHOD m_bywquzql getDisconnectReason ()Lnet/minecraft/unmapped/C_rdaqiwdt;
+	METHOD m_cmmddozg setProtocolAttributes (Lio/netty/channel/Channel;)V
+		ARG 0 channel
 	METHOD m_cxygpyan disableAutoRead ()V
+	METHOD m_dinouaaw getProtocolKey (Lnet/minecraft/unmapped/C_exeqxqdd;)Lio/netty/util/AttributeKey;
+		ARG 0 side
+	METHOD m_ebhlhyxr setS2CPacketHandler (Lnet/minecraft/unmapped/C_uxoyljpb;)V
+		ARG 1 intent
 	METHOD m_ebvsfyfg setupEncryption (Ljavax/crypto/Cipher;Ljavax/crypto/Cipher;)V
 		ARG 1 decryptionCipher
 		ARG 2 encryptionCipher
@@ -66,16 +78,47 @@ CLASS net/minecraft/unmapped/C_oasmcckk net/minecraft/network/ClientConnection
 	METHOD m_ejdecnhl addHandlers (Lio/netty/channel/ChannelPipeline;Lnet/minecraft/unmapped/C_exeqxqdd;)V
 		ARG 0 pipeline
 		ARG 1 side
+	METHOD m_faopouol flushInternal ()V
+	METHOD m_fqnxiapg submit (Ljava/util/function/Consumer;)V
+		ARG 1 task
+	METHOD m_gwpixgaq connect (Ljava/lang/String;ILnet/minecraft/unmapped/C_tkgdawqw;Lnet/minecraft/unmapped/C_uxoyljpb;)V
+		ARG 1 address
+		ARG 2 port
+		ARG 3 listener
+		ARG 4 intent
+	METHOD m_hmamwxog sendWithoutFlush (Lnet/minecraft/unmapped/C_zyjtrjrl;Lnet/minecraft/unmapped/C_zddpfpkk;)V
+		ARG 1 packet
+		ARG 2 sendListener
 	METHOD m_honyjhko (Lorg/slf4j/Marker;)V
 		ARG 0 marker
+	METHOD m_iopaivkv addValidatorInternal (Lio/netty/channel/ChannelPipeline;Lnet/minecraft/unmapped/C_exeqxqdd;)V
+		ARG 0 pipeline
+		ARG 1 side
+	METHOD m_jfnkfhlj addValidator (Lio/netty/channel/ChannelPipeline;Lnet/minecraft/unmapped/C_exeqxqdd;)V
+		ARG 0 pipeline
+		ARG 1 side
 	METHOD m_jitsmihi getAveragePacketsReceived ()F
 	METHOD m_kbtplepg disconnect (Lnet/minecraft/unmapped/C_rdaqiwdt;)V
 		ARG 1 disconnectReason
 	METHOD m_kqbvmhdm getOppositeSide ()Lnet/minecraft/unmapped/C_exeqxqdd;
 		COMMENT Returns the opposite side of this connection, or the direction of the packets
 		COMMENT sent by this connection.
+	METHOD m_kxmmachs setHandshakeListener (Lnet/minecraft/unmapped/C_tkgdawqw;)V
+		ARG 1 listener
+	METHOD m_lpkwetce sendWithoutFlush (Lnet/minecraft/unmapped/C_zyjtrjrl;)V
+		ARG 1 packet
 	METHOD m_lyptmghi connectLocal (Ljava/net/SocketAddress;)Lnet/minecraft/unmapped/C_oasmcckk;
 		ARG 0 address
+	METHOD m_myzbxovj connect (Ljava/lang/String;ILnet/minecraft/unmapped/C_jsvwwjov;)V
+		ARG 1 address
+		ARG 2 port
+		ARG 3 listener
+	METHOD m_oetgkssj (Lnet/minecraft/unmapped/C_zyjtrjrl;Lnet/minecraft/unmapped/C_zddpfpkk;ZLnet/minecraft/unmapped/C_oasmcckk;)V
+		ARG 3 connection
+	METHOD m_qoorbrdh connect (Ljava/lang/String;ILnet/minecraft/unmapped/C_nyzvjqyd;)V
+		ARG 1 address
+		ARG 2 port
+		ARG 3 listener
 	METHOD m_qqopfmuz setPacketListener (Lnet/minecraft/unmapped/C_tkgdawqw;)V
 		COMMENT Sets the packet listener that will handle oncoming packets, including
 		COMMENT ones that are not yet handled by the current packet listener.
@@ -89,8 +132,13 @@ CLASS net/minecraft/unmapped/C_oasmcckk net/minecraft/network/ClientConnection
 	METHOD m_rsirbonf send (Lnet/minecraft/unmapped/C_zyjtrjrl;Lnet/minecraft/unmapped/C_zddpfpkk;)V
 		ARG 1 packet
 		ARG 2 listener
+	METHOD m_rvagcspt getLoggableAddress (Z)Ljava/lang/String;
+		ARG 1 logIps
 	METHOD m_sigcqeza getAddress ()Ljava/net/SocketAddress;
+	METHOD m_sprgohsj flush ()V
 	METHOD m_tulexlec tick ()V
+	METHOD m_ufahuesy (Lnet/minecraft/unmapped/C_zddpfpkk;Lio/netty/util/concurrent/Future;)V
+		ARG 2 future
 	METHOD m_uhgukhmf getAveragePacketsSent ()F
 	METHOD m_urabqmij isEncrypted ()Z
 	METHOD m_uyfxzupt setCompressionThreshold (IZ)V
@@ -112,11 +160,17 @@ CLASS net/minecraft/unmapped/C_oasmcckk net/minecraft/network/ClientConnection
 	METHOD m_vyytglie sendInternal (Lnet/minecraft/unmapped/C_zyjtrjrl;Lnet/minecraft/unmapped/C_zddpfpkk;Z)V
 		ARG 1 packet
 		ARG 2 listener
+		ARG 3 flush
 	METHOD m_wlmhzfek handleDisconnection ()V
 	METHOD m_wrxqepoa isLocal ()Z
 	METHOD m_wzyhrrka (Lorg/slf4j/Marker;)V
 		ARG 0 marker
 	METHOD m_xphjmqxa isOpen ()Z
+	METHOD m_yimhdukv enableAutoReload ()V
+	METHOD m_zbfykobd send (Lnet/minecraft/unmapped/C_zyjtrjrl;Lnet/minecraft/unmapped/C_zddpfpkk;Z)V
+		ARG 1 packet
+		ARG 2 sendListener
+		ARG 3 flush
 	METHOD m_ziivfjpb getSide ()Lnet/minecraft/unmapped/C_exeqxqdd;
 		COMMENT Returns the side of this connection, or the direction of the packets received
 		COMMENT by this connection.
diff --git a/mappings/net/minecraft/network/ConnectionIntent.mapping b/mappings/net/minecraft/network/ConnectionIntent.mapping
new file mode 100644
index 0000000000..a2470776e0
--- /dev/null
+++ b/mappings/net/minecraft/network/ConnectionIntent.mapping
@@ -0,0 +1,7 @@
+CLASS net/minecraft/unmapped/C_uxoyljpb net/minecraft/network/ConnectionIntent
+	FIELD f_ipgpjumr LOGIN_ID I
+	FIELD f_jclclbta STATUS_ID I
+	METHOD m_urowrtvw byId (I)Lnet/minecraft/unmapped/C_uxoyljpb;
+		ARG 0 id
+	METHOD m_vbiyalqs getId ()I
+	METHOD m_xmbsvuou getState ()Lnet/minecraft/unmapped/C_kxdobmrm;
diff --git a/mappings/net/minecraft/network/DecoderHandler.mapping b/mappings/net/minecraft/network/DecoderHandler.mapping
index e7d5aa3101..4c0aca8e09 100644
--- a/mappings/net/minecraft/network/DecoderHandler.mapping
+++ b/mappings/net/minecraft/network/DecoderHandler.mapping
@@ -1,4 +1,5 @@
 CLASS net/minecraft/unmapped/C_anuorqvf net/minecraft/network/DecoderHandler
+	FIELD f_vfzgevwc protocolKey Lio/netty/util/AttributeKey;
 	FIELD f_yxifsiie LOGGER Lorg/slf4j/Logger;
 	METHOD decode decode (Lio/netty/channel/ChannelHandlerContext;Lio/netty/buffer/ByteBuf;Ljava/util/List;)V
 		ARG 1 context
diff --git a/mappings/net/minecraft/network/LegacyQueryHandler.mapping b/mappings/net/minecraft/network/LegacyQueryHandler.mapping
index 11b21cbd50..d6cafe6c41 100644
--- a/mappings/net/minecraft/network/LegacyQueryHandler.mapping
+++ b/mappings/net/minecraft/network/LegacyQueryHandler.mapping
@@ -1,8 +1,21 @@
 CLASS net/minecraft/unmapped/C_avdfsszh net/minecraft/network/LegacyQueryHandler
 	FIELD f_vfsyhtrl LOGGER Lorg/slf4j/Logger;
+	FIELD f_wdggkjco server Lnet/minecraft/unmapped/C_izclhiva;
+	METHOD <init> (Lnet/minecraft/unmapped/C_izclhiva;)V
+		ARG 1 server
 	METHOD channelRead channelRead (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;)V
 		ARG 1 ctx
 		ARG 2 msg
+	METHOD m_ennidrzj createLegacyDisconnectPacket (Lio/netty/buffer/ByteBufAllocator;Ljava/lang/String;)Lio/netty/buffer/ByteBuf;
+		ARG 0 bufAllocator
+		ARG 1 string
+	METHOD m_irydumar isLegacyQuery (Lio/netty/buffer/ByteBuf;)Z
+		ARG 0 buf
+	METHOD m_oosmvotf createV0Response (Lnet/minecraft/unmapped/C_izclhiva;)Ljava/lang/String;
+		ARG 0 server
+	METHOD m_uebdfllr createV1Response (Lnet/minecraft/unmapped/C_izclhiva;)Ljava/lang/String;
+		ARG 0 server
 	METHOD m_wzruoctl reply (Lio/netty/channel/ChannelHandlerContext;Lio/netty/buffer/ByteBuf;)V
+		ARG 0 handlerContext
 		ARG 1 ctx
 		ARG 2 buf
diff --git a/mappings/net/minecraft/network/PacketBundler.mapping b/mappings/net/minecraft/network/PacketBundler.mapping
index b093b0f6e2..483b1d641d 100644
--- a/mappings/net/minecraft/network/PacketBundler.mapping
+++ b/mappings/net/minecraft/network/PacketBundler.mapping
@@ -1,6 +1,7 @@
 CLASS net/minecraft/unmapped/C_xyumsucd net/minecraft/network/PacketBundler
 	FIELD f_aomhaitc handler Lnet/minecraft/unmapped/C_ixirlvvy$C_ldzjqxye;
 	FIELD f_bfxntkhd info Lnet/minecraft/unmapped/C_ixirlvvy;
+	FIELD f_qjvawdwl protocolKey Lio/netty/util/AttributeKey;
 	METHOD decode decode (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Ljava/util/List;)V
 		ARG 1 context
 		ARG 2 packet
diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping
index 7adfb5799a..cfdefed9d7 100644
--- a/mappings/net/minecraft/network/PacketByteBuf.mapping
+++ b/mappings/net/minecraft/network/PacketByteBuf.mapping
@@ -272,6 +272,12 @@ CLASS net/minecraft/unmapped/C_idfydwco net/minecraft/network/PacketByteBuf
 		COMMENT @see #readProperty()
 		ARG 1 property
 	METHOD m_abmmdpgc writePropertyMap (Lcom/mojang/authlib/properties/PropertyMap;)V
+		COMMENT Writes a map of properties to this buf.
+		COMMENT A property is represented by two strings, indicating the key and value, followed by a boolean indicating if a
+		COMMENT a signature is present, followed by a string indicating the signature only if it's present.
+		COMMENT
+		COMMENT @see #readPropertyMap()
+		COMMENT @see #writeProperty(Property)
 		ARG 1 propertyMap
 	METHOD m_aghygfnm readMap (Ljava/util/function/IntFunction;Lnet/minecraft/unmapped/C_idfydwco$C_qteuvzud;Lnet/minecraft/unmapped/C_idfydwco$C_qteuvzud;)Ljava/util/Map;
 		COMMENT Reads a map from this buf. The map is stored as a leading
@@ -288,6 +294,7 @@ CLASS net/minecraft/unmapped/C_idfydwco net/minecraft/network/PacketByteBuf
 			COMMENT a factory that creates a map with a given size
 		ARG 2 keyReader
 		ARG 3 valueReader
+	METHOD m_aiozlifw readRegistryKey ()Lnet/minecraft/unmapped/C_xhhleach;
 	METHOD m_alotuvgi writeOptional (Ljava/util/Optional;Lnet/minecraft/unmapped/C_idfydwco$C_urseyllo;)V
 		COMMENT Writes an optional value to this buf. An optional value is represented by
 		COMMENT a boolean indicating if the value is present, followed by the value only if
@@ -513,6 +520,7 @@ CLASS net/minecraft/unmapped/C_idfydwco net/minecraft/network/PacketByteBuf
 		COMMENT written
 		COMMENT @see #readNbt()
 		COMMENT @see #readNbt(NbtTagSizeTracker)
+		ARG 1 nbtElement
 	METHOD m_jrgknvio decode (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Codec;Lnet/minecraft/unmapped/C_fozrrtcx;)Ljava/lang/Object;
 		COMMENT Reads an object from this buf as a compound NBT with the given codec.
 		COMMENT
@@ -601,6 +609,12 @@ CLASS net/minecraft/unmapped/C_idfydwco net/minecraft/network/PacketByteBuf
 		COMMENT @return this buf, for chaining
 		ARG 1 array
 			COMMENT the array to write
+	METHOD m_ngsogwlc decodeById (Ljava/util/function/IntFunction;)Ljava/lang/Object;
+		COMMENT Reads a {@linkplain #readVarInt var int} from this buf,
+		COMMENT and then runs {@code idToValue} to convert it to a value.
+		COMMENT
+		COMMENT @return the decoded value
+		ARG 1 idToValue
 	METHOD m_nhmhnzug readBitSet (I)Ljava/util/BitSet;
 		ARG 1 bitSet
 	METHOD m_nhqatmjh writeJson (Lcom/mojang/serialization/Codec;Ljava/lang/Object;)V
@@ -688,6 +702,12 @@ CLASS net/minecraft/unmapped/C_idfydwco net/minecraft/network/PacketByteBuf
 		ARG 1 bitSet
 			COMMENT the bit set to write
 	METHOD m_rfxcdbdu readPropertyMap ()Lcom/mojang/authlib/properties/PropertyMap;
+		COMMENT Reads a map of properties from this buf.
+		COMMENT A property is represented by two strings, indicating the key and value, followed by a boolean indicating if a
+		COMMENT a signature is present, followed by a string indicating the signature only if it's present.
+		COMMENT
+		COMMENT @see #writePropertyMap(PropertyMap)
+		COMMENT @see #readProperty()
 	METHOD m_rmsqcqnf writeEither (Lcom/mojang/datafixers/util/Either;Lnet/minecraft/unmapped/C_idfydwco$C_urseyllo;Lnet/minecraft/unmapped/C_idfydwco$C_urseyllo;)V
 		COMMENT Writes a value of two possible types, either left or right, to this buf.
 		COMMENT An Either value is represented by a boolean indicating whether to use the
@@ -786,10 +806,18 @@ CLASS net/minecraft/unmapped/C_idfydwco net/minecraft/network/PacketByteBuf
 		COMMENT @see #readBlockHitResult()
 		ARG 1 hitResult
 			COMMENT the block hit result to write
+	METHOD m_tpmwdhmz writeById (Ljava/util/function/ToIntFunction;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_idfydwco;
+		COMMENT Runs {@code valueToId} on {@code value} to generate an id,
+		COMMENT and then writes it as a {@linkplain #readVarInt var int} to this buf.
+		COMMENT
+		COMMENT @return this buf, for chaining
+		ARG 1 valueToId
+		ARG 2 value
 	METHOD m_tuovdjxm (Lnet/minecraft/unmapped/C_idfydwco$C_urseyllo;Ljava/lang/Object;)V
 		ARG 2 object
 	METHOD m_ucosefkt decode (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Codec;)Ljava/lang/Object;
 	METHOD m_uedohhct readNbt (Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_oivssbvb;
+		ARG 1 tagSizeTracker
 	METHOD m_uvlqpwrk readLongArray ([J)[J
 		COMMENT Reads an array of primitive longs from this buf. The array first has a
 		COMMENT var int indicating its length, followed by the regular long (not var
@@ -1044,6 +1072,8 @@ CLASS net/minecraft/unmapped/C_idfydwco net/minecraft/network/PacketByteBuf
 	METHOD resetReaderIndex resetReaderIndex ()Lio/netty/buffer/ByteBuf;
 	METHOD resetWriterIndex resetWriterIndex ()Lio/netty/buffer/ByteBuf;
 	METHOD retain retain ()Lio/netty/util/ReferenceCounted;
+	METHOD retain (I)Lio/netty/buffer/ByteBuf;
+		ARG 1 i
 	METHOD retain retain (I)Lio/netty/util/ReferenceCounted;
 		ARG 1 increment
 	METHOD retainedDuplicate retainedDuplicate ()Lio/netty/buffer/ByteBuf;
@@ -1149,6 +1179,8 @@ CLASS net/minecraft/unmapped/C_idfydwco net/minecraft/network/PacketByteBuf
 	METHOD toString toString (Ljava/nio/charset/Charset;)Ljava/lang/String;
 		ARG 1 charset
 	METHOD touch touch ()Lio/netty/util/ReferenceCounted;
+	METHOD touch (Ljava/lang/Object;)Lio/netty/buffer/ByteBuf;
+		ARG 1 o
 	METHOD touch touch (Ljava/lang/Object;)Lio/netty/util/ReferenceCounted;
 		ARG 1 o
 	METHOD unwrap unwrap ()Lio/netty/buffer/ByteBuf;
diff --git a/mappings/net/minecraft/network/PacketInflater.mapping b/mappings/net/minecraft/network/PacketInflater.mapping
index 617f6c529e..6febb76018 100644
--- a/mappings/net/minecraft/network/PacketInflater.mapping
+++ b/mappings/net/minecraft/network/PacketInflater.mapping
@@ -8,10 +8,15 @@ CLASS net/minecraft/unmapped/C_twqrkcqp net/minecraft/network/PacketInflater
 	METHOD <init> (IZ)V
 		ARG 1 compressionThreshold
 		ARG 2 rejectsBadPackets
-	METHOD decode decode (Lio/netty/channel/ChannelHandlerContext;Lio/netty/buffer/ByteBuf;Ljava/util/List;)V
+	METHOD decode (Lio/netty/channel/ChannelHandlerContext;Lio/netty/buffer/ByteBuf;Ljava/util/List;)V
 		ARG 1 context
 		ARG 2 buffer
 		ARG 3 output
+	METHOD m_psqvgbxv inflate (Lio/netty/channel/ChannelHandlerContext;I)Lio/netty/buffer/ByteBuf;
+		ARG 1 handlerContext
+		ARG 2 expectedSize
 	METHOD m_tatdfypu setCompressionThreshold (IZ)V
 		ARG 1 compressionThreshold
 		ARG 2 rejectsBadPackets
+	METHOD m_zdbudlnd setupInputBuf (Lio/netty/buffer/ByteBuf;)V
+		ARG 1 buf
diff --git a/mappings/net/minecraft/network/QueryableServer.mapping b/mappings/net/minecraft/network/QueryableServer.mapping
new file mode 100644
index 0000000000..6ec41a0750
--- /dev/null
+++ b/mappings/net/minecraft/network/QueryableServer.mapping
@@ -0,0 +1,5 @@
+CLASS net/minecraft/unmapped/C_izclhiva net/minecraft/network/QueryableServer
+	METHOD m_jlkyffol getMotd ()I
+	METHOD m_ngtuslcn getMaxPlayerCount ()I
+	METHOD m_verihzmf getPlayerCount ()Ljava/lang/String;
+	METHOD m_zhlwscbp getVersion ()Ljava/lang/String;
diff --git a/mappings/net/minecraft/network/SizePrepender.mapping b/mappings/net/minecraft/network/SizePrepender.mapping
index a78920490d..e8e547caaf 100644
--- a/mappings/net/minecraft/network/SizePrepender.mapping
+++ b/mappings/net/minecraft/network/SizePrepender.mapping
@@ -1,4 +1,5 @@
 CLASS net/minecraft/unmapped/C_kkkztqzf net/minecraft/network/SizePrepender
+	FIELD f_dceclpvh MAX_PREPEND_LENGTH I
 	METHOD encode encode (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Lio/netty/buffer/ByteBuf;)V
 		ARG 1 context
 		ARG 2 buffer
diff --git a/mappings/net/minecraft/network/SplitterHandler.mapping b/mappings/net/minecraft/network/SplitterHandler.mapping
index 23254516cf..a3392736e9 100644
--- a/mappings/net/minecraft/network/SplitterHandler.mapping
+++ b/mappings/net/minecraft/network/SplitterHandler.mapping
@@ -1,5 +1,12 @@
 CLASS net/minecraft/unmapped/C_hoasxhkp net/minecraft/network/SplitterHandler
-	METHOD decode decode (Lio/netty/channel/ChannelHandlerContext;Lio/netty/buffer/ByteBuf;Ljava/util/List;)V
+	FIELD f_bmaoystr MAX_LENGTH_BYTES I
+	FIELD f_rvhsntis helperBuf Lio/netty/buffer/ByteBuf;
+	METHOD decode (Lio/netty/channel/ChannelHandlerContext;Lio/netty/buffer/ByteBuf;Ljava/util/List;)V
 		ARG 1 context
 		ARG 2 buffer
 		ARG 3 output
+	METHOD handlerRemoved0 (Lio/netty/channel/ChannelHandlerContext;)V
+		ARG 1 handlerContext
+	METHOD m_uxxlispy copyVarInt (Lio/netty/buffer/ByteBuf;Lio/netty/buffer/ByteBuf;)Z
+		ARG 0 buf1
+		ARG 1 buf2
diff --git a/mappings/net/minecraft/network/encoding/StringEncoding.mapping b/mappings/net/minecraft/network/encoding/StringEncoding.mapping
new file mode 100644
index 0000000000..b56c4319a3
--- /dev/null
+++ b/mappings/net/minecraft/network/encoding/StringEncoding.mapping
@@ -0,0 +1,8 @@
+CLASS net/minecraft/unmapped/C_pqjlsntn net/minecraft/network/encoding/StringEncoding
+	METHOD m_nqvomhdl read (Lio/netty/buffer/ByteBuf;I)Ljava/lang/String;
+		ARG 0 buf
+		ARG 1 maxLength
+	METHOD m_xkifcdol write (Lio/netty/buffer/ByteBuf;Ljava/lang/CharSequence;I)V
+		ARG 0 buf
+		ARG 1 string
+		ARG 2 maxLength
diff --git a/mappings/net/minecraft/network/encoding/VarInts.mapping b/mappings/net/minecraft/network/encoding/VarInts.mapping
new file mode 100644
index 0000000000..125ef4fd0e
--- /dev/null
+++ b/mappings/net/minecraft/network/encoding/VarInts.mapping
@@ -0,0 +1,14 @@
+CLASS net/minecraft/unmapped/C_wttjudfn net/minecraft/network/encoding/VarInts
+	FIELD f_hycthvdj MAX_VAR_INT_SIZE I
+	FIELD f_niofpker DATA_BITS_PER_BYTE I
+	FIELD f_okmrimwg DATA_BITS_MASK I
+	FIELD f_tkubqhfl CONTINUATION_BIT_MASK I
+	METHOD m_mrpwkmdl read (Lio/netty/buffer/ByteBuf;)I
+		ARG 0 buf
+	METHOD m_nmzriqzv write (Lio/netty/buffer/ByteBuf;I)Lio/netty/buffer/ByteBuf;
+		ARG 0 buf
+		ARG 1 i
+	METHOD m_vmtzkwuq shouldContinueRead (B)Z
+		ARG 0 b
+	METHOD m_ylnpcfew getSizeBytes (I)I
+		ARG 0 i
diff --git a/mappings/net/minecraft/network/encoding/VarLongs.mapping b/mappings/net/minecraft/network/encoding/VarLongs.mapping
new file mode 100644
index 0000000000..3a71ccc8e6
--- /dev/null
+++ b/mappings/net/minecraft/network/encoding/VarLongs.mapping
@@ -0,0 +1,14 @@
+CLASS net/minecraft/unmapped/C_azpiyxng net/minecraft/network/encoding/VarLongs
+	FIELD f_akazvhkz DATA_BITS_PER_BYTE I
+	FIELD f_uxgeildm DATA_BITS_MASK I
+	FIELD f_veomxwqz CONTINUATION_BIT_MASK I
+	FIELD f_wioeobfz MAX_VAR_LONG_SIZE I
+	METHOD m_lvwinszs shouldContinueRead (B)Z
+		ARG 0 b
+	METHOD m_oifgejik read (Lio/netty/buffer/ByteBuf;)J
+		ARG 0 buf
+	METHOD m_stgjvvst getSizeBytes (J)I
+		ARG 0 l
+	METHOD m_ttzoekcn write (Lio/netty/buffer/ByteBuf;J)Lio/netty/buffer/ByteBuf;
+		ARG 0 buf
+		ARG 1 l
diff --git a/mappings/net/minecraft/network/packet/s2c/play/CommandTreeUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CommandTreeUpdateS2CPacket.mapping
index 997b0e98d7..64babae6b6 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/CommandTreeUpdateS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/CommandTreeUpdateS2CPacket.mapping
@@ -1,4 +1,5 @@
 CLASS net/minecraft/unmapped/C_vzeoulff net/minecraft/network/packet/s2c/play/CommandTreeUpdateS2CPacket
+	FIELD f_cfiypoez rootIndex I
 	FIELD f_cybsakfx TYPE_ROOT B
 	FIELD f_efqgydcd FLAG_CUSTOM_SUGGESTIONS B
 	FIELD f_etdwrupj FLAG_EXECUTABLE B
@@ -11,18 +12,67 @@ CLASS net/minecraft/unmapped/C_vzeoulff net/minecraft/network/packet/s2c/play/Co
 		ARG 1 commandTree
 	METHOD <init> (Lnet/minecraft/unmapped/C_idfydwco;)V
 		ARG 1 buf
-	METHOD m_dcigsfhx (Ljava/util/List;Ljava/util/function/BiPredicate;)V
+	METHOD m_dcigsfhx validate (Ljava/util/List;Ljava/util/function/BiPredicate;)V
 		ARG 0 commandNodeData
+		ARG 1 validator
+	METHOD m_fgrlobuc validate (Ljava/util/List;)V
+		ARG 0 commandNodes
+	METHOD m_hbnsdhxt read (Lnet/minecraft/unmapped/C_idfydwco;B)Lnet/minecraft/unmapped/C_vzeoulff$C_oiqqdfah;
+		ARG 1 flags
 	METHOD m_jebnlxkj readCommandNode (Lnet/minecraft/unmapped/C_idfydwco;)Lnet/minecraft/unmapped/C_vzeoulff$C_irxeyhvf;
 		ARG 0 buf
 	METHOD m_kyfvkrqc getCommandTree (Lnet/minecraft/unmapped/C_bprdujxm;)Lcom/mojang/brigadier/tree/RootCommandNode;
+		ARG 1 context
+	METHOD m_mzuqkiag (Ljava/util/function/BiPredicate;Ljava/util/List;Lit/unimi/dsi/fastutil/ints/IntSet;I)Z
+		ARG 3 index
+	METHOD m_opvncnpa createNodeData (Lcom/mojang/brigadier/tree/CommandNode;Lit/unimi/dsi/fastutil/objects/Object2IntMap;)Lnet/minecraft/unmapped/C_vzeoulff$C_irxeyhvf;
+		ARG 0 node
+		ARG 1 nodes
 	METHOD m_qlyjkgkv traverse (Lcom/mojang/brigadier/tree/RootCommandNode;)Lit/unimi/dsi/fastutil/objects/Object2IntMap;
 		ARG 0 commandTree
+	METHOD m_sidanbvm createCommandNodes (Lit/unimi/dsi/fastutil/objects/Object2IntMap;)Ljava/util/List;
+		ARG 0 nodes
+	METHOD m_udbndlky (Lnet/minecraft/unmapped/C_idfydwco;Lnet/minecraft/unmapped/C_vzeoulff$C_irxeyhvf;)V
+		ARG 1 commandNode
 	CLASS C_irxeyhvf CommandNodeData
+		FIELD f_bnaktlld node Lnet/minecraft/unmapped/C_vzeoulff$C_oiqqdfah;
 		FIELD f_eckdjrcz childNodeIndices [I
 		FIELD f_rzrsdnmn flags I
 		FIELD f_xofhrgkq redirectNodeIndex I
 		METHOD <init> (Lnet/minecraft/unmapped/C_vzeoulff$C_oiqqdfah;II[I)V
+			ARG 1 node
 			ARG 2 flags
 			ARG 3 redirectNodeIndex
 			ARG 4 childNodeIndices
+		METHOD m_eijlsxqi canResolve (Lit/unimi/dsi/fastutil/ints/IntSet;)Z
+			ARG 1 indices
+		METHOD m_mhcvweoz canBuild (Lit/unimi/dsi/fastutil/ints/IntSet;)Z
+			ARG 1 indices
+		METHOD m_saxnmtme write (Lnet/minecraft/unmapped/C_idfydwco;)V
+	CLASS C_mtqtcwbc NodeResolver
+		FIELD f_ilvmukkm nodes Ljava/util/List;
+		FIELD f_peraevec context Lnet/minecraft/unmapped/C_bprdujxm;
+		FIELD f_rmwcykdw entries Ljava/util/List;
+		METHOD m_jxmqjagu (Lcom/mojang/brigadier/context/CommandContext;)I
+			ARG 0 context
+		METHOD m_xligpunh resolve (I)Lcom/mojang/brigadier/tree/CommandNode;
+			ARG 1 index
+	CLASS C_oiqqdfah Node
+		METHOD m_xrazseov write (Lnet/minecraft/unmapped/C_idfydwco;)V
+		METHOD m_ykkmupml build (Lnet/minecraft/unmapped/C_bprdujxm;)Lcom/mojang/brigadier/builder/ArgumentBuilder;
+			ARG 1 context
+	CLASS C_vuntotjx LiteralNode
+		FIELD f_lnhawqwm id Ljava/lang/String;
+	CLASS C_xvscvcsz ArgumentNode
+		FIELD f_blzxvwug id Ljava/lang/String;
+		FIELD f_dnaozebn suggestionId Lnet/minecraft/unmapped/C_ncpywfca;
+		FIELD f_mndqyfwo argumentType Lnet/minecraft/unmapped/C_yvmgapuw$C_jhdtbgye;
+		METHOD <init> (Lcom/mojang/brigadier/tree/ArgumentCommandNode;)V
+			ARG 1 commandNode
+		METHOD m_bncjsviq getSuggestionId (Lcom/mojang/brigadier/suggestion/SuggestionProvider;)Lnet/minecraft/unmapped/C_ncpywfca;
+			ARG 0 provider
+		METHOD m_mkgsnfyv write (Lnet/minecraft/unmapped/C_idfydwco;Lnet/minecraft/unmapped/C_yvmgapuw$C_jhdtbgye;)V
+			ARG 1 template
+		METHOD m_spdpgdxu write (Lnet/minecraft/unmapped/C_idfydwco;Lnet/minecraft/unmapped/C_yvmgapuw;Lnet/minecraft/unmapped/C_yvmgapuw$C_jhdtbgye;)V
+			ARG 1 type
+			ARG 2 template
diff --git a/mappings/net/minecraft/util/network/LegacyQueryUtil.mapping b/mappings/net/minecraft/util/network/LegacyQueryUtil.mapping
new file mode 100644
index 0000000000..f0561bc3b5
--- /dev/null
+++ b/mappings/net/minecraft/util/network/LegacyQueryUtil.mapping
@@ -0,0 +1,12 @@
+CLASS net/minecraft/unmapped/C_rmqwqdfp net/minecraft/util/network/LegacyQueryUtil
+	FIELD f_dwwpwfxv QUERY_INFO_PACKET_VERSION I
+	FIELD f_kqepobnp CUSTOM_PAYLOAD_PACKET_ID I
+	FIELD f_oifrnwvr CUSTOM_PAYLOAD_PACKET_PING_CHANNEL Ljava/lang/String;
+	FIELD f_pdmxsxoh FAKE_PROTOCOL_VERSION I
+	FIELD f_ppbxvghx DISCONNECT_PACKET_ID I
+	FIELD f_sccvugza QUERY_PACKET_ID I
+	METHOD m_fysytacf readString (Lio/netty/buffer/ByteBuf;Ljava/lang/String;)V
+		ARG 0 buf
+		ARG 1 string
+	METHOD m_hczwptxm writeString (Lio/netty/buffer/ByteBuf;)Ljava/lang/String;
+		ARG 0 buf