Skip to content

Commit

Permalink
NETWORKING
Browse files Browse the repository at this point in the history
  • Loading branch information
@ix0rai
ix0rai committed Aug 9, 2023
1 parent 46fe8cf commit 96d6fac
Show file tree
Hide file tree
Showing 17 changed files with 229 additions and 4 deletions.
1 change: 1 addition & 0 deletions buildSrc/src/main/resources/minecraft_specific_words.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,7 @@ craftable
dumpable
enchantable
equippable
loggable
hoverable
infestable
interpolatable
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
54 changes: 54 additions & 0 deletions mappings/net/minecraft/network/ClientConnection.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand All @@ -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.
Expand All @@ -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
Expand All @@ -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.
Expand Down
7 changes: 7 additions & 0 deletions mappings/net/minecraft/network/ConnectionIntent.mapping
View file
Original file line number Diff line number Diff line change
@@ -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;
1 change: 1 addition & 0 deletions mappings/net/minecraft/network/DecoderHandler.mapping
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
13 changes: 13 additions & 0 deletions mappings/net/minecraft/network/LegacyQueryHandler.mapping
View file
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions mappings/net/minecraft/network/PacketBundler.mapping
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
32 changes: 32 additions & 0 deletions mappings/net/minecraft/network/PacketByteBuf.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
7 changes: 6 additions & 1 deletion mappings/net/minecraft/network/PacketInflater.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 5 additions & 0 deletions mappings/net/minecraft/network/QueryableServer.mapping
View file
Original file line number Diff line number Diff line change
@@ -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;
1 change: 1 addition & 0 deletions mappings/net/minecraft/network/SizePrepender.mapping
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 8 additions & 1 deletion mappings/net/minecraft/network/SplitterHandler.mapping
View file
Original file line number Diff line number Diff line change
@@ -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
8 changes: 8 additions & 0 deletions mappings/net/minecraft/network/encoding/StringEncoding.mapping
View file
Original file line number Diff line number Diff line change
@@ -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
14 changes: 14 additions & 0 deletions mappings/net/minecraft/network/encoding/VarInts.mapping
View file
Original file line number Diff line number Diff line change
@@ -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
14 changes: 14 additions & 0 deletions mappings/net/minecraft/network/encoding/VarLongs.mapping
View file
Original file line number Diff line number Diff line change
@@ -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
Loading

3 comments on commit 96d6fac

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With commit 96d6fac, 104 file(s) were updated with 1316 line(s) added and 1170 removed compared to the latest Quilt Mappings version.

View the diff here (1/3): 
Only in namedSrc/net/minecraft/client: connection
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/InGameHud.java namedSrc/net/minecraft/client/gui/hud/InGameHud.java
--- namedTargetSrc/net/minecraft/client/gui/hud/InGameHud.java	2023-08-09 03:13:11.077605406 +0000
+++ namedSrc/net/minecraft/client/gui/hud/InGameHud.java	2023-08-09 03:11:40.816878518 +0000
@@ -40,6 +40,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.registry.tag.FluidTags;
 import net.minecraft.scoreboard.Scoreboard;
+import net.minecraft.scoreboard.ScoreboardDisplaySlot;
 import net.minecraft.scoreboard.ScoreboardObjective;
 import net.minecraft.scoreboard.ScoreboardPlayerScore;
 import net.minecraft.scoreboard.Team;
@@ -47,7 +48,6 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_oakvluoh;
 import net.minecraft.util.Arm;
 import net.minecraft.util.ChatUtil;
 import net.minecraft.util.Formatting;
@@ -632,13 +632,13 @@
          ScoreboardObjective lv6 = null;
          Team lv7 = lv5.getPlayerTeam(this.client.player.getEntityName());
          if (lv7 != null) {
-            C_oakvluoh lv8 = C_oakvluoh.m_kbezgswv(lv7.getColor());
+            ScoreboardDisplaySlot lv8 = ScoreboardDisplaySlot.fromFormatting(lv7.getColor());
             if (lv8 != null) {
                lv6 = lv5.getObjectiveForSlot(lv8);
             }
          }
 
-         ScoreboardObjective lv9 = lv6 != null ? lv6 : lv5.getObjectiveForSlot(C_oakvluoh.SIDEBAR);
+         ScoreboardObjective lv9 = lv6 != null ? lv6 : lv5.getObjectiveForSlot(ScoreboardDisplaySlot.SIDEBAR);
          if (lv9 != null) {
             this.renderScoreboardSidebar(graphics, lv9);
          }
@@ -649,7 +649,7 @@
          this.client.getProfiler().push("chat");
          this.chatHud.render(graphics, this.ticks, x, y);
          this.client.getProfiler().pop();
-         lv9 = lv5.getObjectiveForSlot(C_oakvluoh.LIST);
+         lv9 = lv5.getObjectiveForSlot(ScoreboardDisplaySlot.LIST);
          if (!this.client.options.playerListKey.isPressed()
             || this.client.isInSingleplayer() && this.client.player.networkHandler.getListedPlayers().size() <= 1 && lv9 == null) {
             this.playerListHud.setVisible(false);
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/PlayerListHud.java namedSrc/net/minecraft/client/gui/hud/PlayerListHud.java
--- namedTargetSrc/net/minecraft/client/gui/hud/PlayerListHud.java	2023-08-09 03:13:11.017605036 +0000
+++ namedSrc/net/minecraft/client/gui/hud/PlayerListHud.java	2023-08-09 03:11:40.744877851 +0000
@@ -296,7 +296,7 @@
                PlayerEntity lv6 = this.client.world.getPlayerByUuid(gameProfile.getId());
                boolean bl2 = lv6 != null && LivingEntityRenderer.renderFlipped(lv6);
                boolean bl3 = lv6 != null && lv6.isPartVisible(PlayerModelPart.HAT);
-               PlayerFaceRenderer.draw(graphics, lv5.m_luhtdkqd().texture(), ab, ac, 8, bl3, bl2);
+               PlayerFaceRenderer.draw(graphics, lv5.getSkin().texture(), ab, ac, 8, bl3, bl2);
                ab += 9;
             }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ConnectScreen.java namedSrc/net/minecraft/client/gui/screen/ConnectScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ConnectScreen.java	2023-08-09 03:13:11.153605874 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ConnectScreen.java	2023-08-09 03:11:40.924879519 +0000
@@ -188,7 +188,7 @@
                }
 
                ConnectScreen.this.connection
-                  .m_myzbxovj(
+                  .connect(
                      inetSocketAddress.getHostName(),
                      inetSocketAddress.getPort(),
                      new ClientLoginNetworkHandler(
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.java namedSrc/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.java	2023-08-09 03:13:11.117605652 +0000
+++ namedSrc/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.java	2023-08-09 03:11:40.876879074 +0000
@@ -89,7 +89,7 @@
          PlayerListEntry lv2 = lv.getPlayerListEntry(uUID);
          if (lv2 != null) {
             boolean bl = lv2.hasChatSession();
-            entries.put(uUID, new SocialInteractionsPlayerListEntry(this.client, this.parent, uUID, lv2.getProfile().getName(), lv2::m_luhtdkqd, bl));
+            entries.put(uUID, new SocialInteractionsPlayerListEntry(this.client, this.parent, uUID, lv2.getProfile().getName(), lv2::getSkin, bl));
          }
       }
    }
@@ -228,7 +228,7 @@
          && (Strings.isNullOrEmpty(this.currentSearch) || player.getProfile().getName().toLowerCase(Locale.ROOT).contains(this.currentSearch))) {
          boolean bl = player.hasChatSession();
          SocialInteractionsPlayerListEntry lv2 = new SocialInteractionsPlayerListEntry(
-            this.client, this.parent, player.getProfile().getId(), player.getProfile().getName(), player::m_luhtdkqd, bl
+            this.client, this.parent, player.getProfile().getId(), player.getProfile().getName(), player::getSkin, bl
          );
          this.addEntry(lv2);
          this.players.add(lv2);
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.java namedSrc/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.java	2023-08-09 03:13:11.153605874 +0000
+++ namedSrc/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.java	2023-08-09 03:11:40.928879556 +0000
@@ -419,7 +419,7 @@
          String string = "";
          ServerInfo lv = client.getCurrentServerEntry();
          if (client.isInSingleplayer()) {
-            string = client.getServer().m_zhlwscbp();
+            string = client.getServer().getVersion();
          } else if (lv != null) {
             string = lv.name;
          }
Only in namedSrc/net/minecraft/client: listener
diff -bur namedTargetSrc/net/minecraft/client/MinecraftClient.java namedSrc/net/minecraft/client/MinecraftClient.java
--- namedTargetSrc/net/minecraft/client/MinecraftClient.java	2023-08-09 03:13:11.049605233 +0000
+++ namedSrc/net/minecraft/client/MinecraftClient.java	2023-08-09 03:11:40.784878221 +0000
@@ -2909,7 +2909,7 @@
       Duration duration = Duration.between(instant, Instant.now());
       SocketAddress socketAddress = this.server.getNetworkIo().bindLocal();
       ClientConnection lv5 = ClientConnection.connectLocal(socketAddress);
-      lv5.m_myzbxovj(socketAddress.toString(), 0, new ClientLoginNetworkHandler(lv5, this, null, null, isNewWorld, duration, text -> {
+      lv5.connect(socketAddress.toString(), 0, new ClientLoginNetworkHandler(lv5, this, null, null, isNewWorld, duration, text -> {
       }));
       lv5.send(new LoginHelloC2SPacket(this.getSession().getUsername(), this.getSession().getPlayerUuid()));
       this.integratedServerConnection = lv5;
diff -bur namedTargetSrc/net/minecraft/client/network/AbstractClientPlayerEntity.java namedSrc/net/minecraft/client/network/AbstractClientPlayerEntity.java
--- namedTargetSrc/net/minecraft/client/network/AbstractClientPlayerEntity.java	2023-08-09 03:13:11.101605554 +0000
+++ namedSrc/net/minecraft/client/network/AbstractClientPlayerEntity.java	2023-08-09 03:11:40.852878852 +0000
@@ -112,11 +112,12 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_kzmhnjvr Lnet/minecraft/unmapped/C_sgyyxgui;m_kzmhnjvr()Lnet/minecraft/unmapped/C_idvschhb;}
+    * @mapping {@literal named getSkin Lnet/minecraft/client/network/AbstractClientPlayerEntity;getSkin()Lnet/minecraft/unmapped/C_idvschhb;}
     */
-   public C_idvschhb m_kzmhnjvr() {
+   public C_idvschhb getSkin() {
       PlayerListEntry lv = this.getPlayerListEntry();
-      return lv == null ? DefaultSkinHelper.m_yzpnfxzl(this.getUuid()) : lv.m_luhtdkqd();
+      return lv == null ? DefaultSkinHelper.m_yzpnfxzl(this.getUuid()) : lv.getSkin();
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/network/ClientLoginNetworkHandler.java namedSrc/net/minecraft/client/network/ClientLoginNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientLoginNetworkHandler.java	2023-08-09 03:13:11.021605060 +0000
+++ namedSrc/net/minecraft/client/network/ClientLoginNetworkHandler.java	2023-08-09 03:11:40.744877851 +0000
@@ -18,6 +18,7 @@
 import net.fabricmc.api.Environment;
 import net.minecraft.client.ClientBrandRetriever;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.connection.ClientConnectionState;
 import net.minecraft.client.gui.screen.DisconnectedScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.realms.gui.screen.DisconnectedRealmsScreen;
@@ -28,20 +29,19 @@
 import net.minecraft.network.PacketSendListener;
 import net.minecraft.network.encryption.NetworkEncryptionUtils;
 import net.minecraft.network.listener.ClientLoginPacketListener;
+import net.minecraft.network.packet.c2s.login.LoginAcknowledgementC2SPacket;
 import net.minecraft.network.packet.c2s.login.LoginKeyC2SPacket;
+import net.minecraft.network.packet.c2s.login.LoginQueryResponseC2SPacket;
 import net.minecraft.network.packet.c2s.play.CustomPayloadC2SPacket;
 import net.minecraft.network.packet.s2c.login.LoginCompressionS2CPacket;
 import net.minecraft.network.packet.s2c.login.LoginDisconnectS2CPacket;
 import net.minecraft.network.packet.s2c.login.LoginHelloS2CPacket;
 import net.minecraft.network.packet.s2c.login.LoginQueryRequestS2CPacket;
 import net.minecraft.network.packet.s2c.login.LoginSuccessS2CPacket;
+import net.minecraft.network.packet.s2c.payload.BrandPayload;
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_aswgqekn;
 import net.minecraft.unmapped.C_mkgltvrq;
-import net.minecraft.unmapped.C_mmnuqgam;
-import net.minecraft.unmapped.C_rhwnywfq;
-import net.minecraft.unmapped.C_yyngrkbw;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 
@@ -198,13 +198,13 @@
    public void onLoginSuccess(LoginSuccessS2CPacket packet) {
       this.statusConsumer.accept(Text.translatable("connect.joining"));
       GameProfile gameProfile = packet.getProfile();
-      this.connection.send(new C_rhwnywfq());
+      this.connection.send(new LoginAcknowledgementC2SPacket());
       this.connection
          .setPacketListener(
             new C_mkgltvrq(
                this.client,
                this.connection,
-               new C_aswgqekn(
+               new ClientConnectionState(
                   gameProfile,
                   this.client.getTelemetryManager().createWorldTelemetryManager(this.isNewWorld, this.worldLoadTime, this.minigameName),
                   ClientRegistryLayer.createLayeredManager().getCompositeManager(),
@@ -215,7 +215,7 @@
                )
             )
          );
-      this.connection.send(new CustomPayloadC2SPacket(new C_yyngrkbw(ClientBrandRetriever.getClientModName())));
+      this.connection.send(new CustomPayloadC2SPacket(new BrandPayload(ClientBrandRetriever.getClientModName())));
    }
 
    /**
@@ -262,7 +262,7 @@
    @Override
    public void onLoginQueryRequest(LoginQueryRequestS2CPacket packet) {
       this.statusConsumer.accept(Text.translatable("connect.negotiating"));
-      this.connection.send(new C_mmnuqgam(packet.transactionId(), null));
+      this.connection.send(new LoginQueryResponseC2SPacket(packet.transactionId(), null));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2023-08-09 03:13:11.165605948 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2023-08-09 03:11:40.940879667 +0000
@@ -29,6 +29,7 @@
 import net.minecraft.block.entity.CommandBlockBlockEntity;
 import net.minecraft.block.entity.SignBlockEntity;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.connection.ClientConnectionState;
 import net.minecraft.client.gui.screen.CreditsScreen;
 import net.minecraft.client.gui.screen.DeathScreen;
 import net.minecraft.client.gui.screen.DemoScreen;
@@ -121,13 +122,33 @@
 import net.minecraft.network.packet.c2s.play.ChatCommandC2SPacket;
 import net.minecraft.network.packet.c2s.play.ChatMessageC2SPacket;
 import net.minecraft.network.packet.c2s.play.ChatSessionUpdateC2SPacket;
+import net.minecraft.network.packet.c2s.play.ChunkBatchAcknowledgementC2SPacket;
 import net.minecraft.network.packet.c2s.play.ClientStatusUpdateC2SPacket;
 import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
+import net.minecraft.network.packet.c2s.play.ReconfigurationAcknowledgementC2SPacket;
 import net.minecraft.network.packet.c2s.play.TeleportConfirmationC2SPacket;
 import net.minecraft.network.packet.c2s.play.VehicleMoveC2SPacket;
+import net.minecraft.network.packet.payload.CustomPayload;
 import net.minecraft.network.packet.s2c.ChunkBiomeDataS2CPacket;
 import net.minecraft.network.packet.s2c.PacketBundleS2CPacket;
 import net.minecraft.network.packet.s2c.PlayerRemovalS2CPacket;
+import net.minecraft.network.packet.s2c.payload.BeeDebugPayload;
+import net.minecraft.network.packet.s2c.payload.BrainDebugPayload;
+import net.minecraft.network.packet.s2c.payload.GameEventDebugPayload;
+import net.minecraft.network.packet.s2c.payload.GameEventListenersDebugPayload;
+import net.minecraft.network.packet.s2c.payload.GameTestClearDebugPayload;
+import net.minecraft.network.packet.s2c.payload.GameTestMarkerAdditionDebugPayload;
+import net.minecraft.network.packet.s2c.payload.GoalSelectorDebugPayload;
+import net.minecraft.network.packet.s2c.payload.HiveDebugPayload;
+import net.minecraft.network.packet.s2c.payload.NeighborsUpdateDebugPayload;
+import net.minecraft.network.packet.s2c.payload.PathDebugPayload;
+import net.minecraft.network.packet.s2c.payload.PoiAddedDebugPayload;
+import net.minecraft.network.packet.s2c.payload.PoiRemovedDebugPayload;
+import net.minecraft.network.packet.s2c.payload.PoiTicketCountDebugPayload;
+import net.minecraft.network.packet.s2c.payload.RaidsDebugPayload;
+import net.minecraft.network.packet.s2c.payload.StructuresDebugPayload;
+import net.minecraft.network.packet.s2c.payload.VillageSectionsDebugPayload;
+import net.minecraft.network.packet.s2c.payload.WorldgenAttemptDebugPayload;
 import net.minecraft.network.packet.s2c.play.AdvancementTabSelectionS2CPacket;
 import net.minecraft.network.packet.s2c.play.AdvancementUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.BlockBreakingProgressUpdateS2CPacket;
@@ -138,6 +159,7 @@
 import net.minecraft.network.packet.s2c.play.BossBarUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.CameraEntityUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.ChatMessageS2CPacket;
+import net.minecraft.network.packet.s2c.play.ChunkBatchCompletionS2CPacket;
 import net.minecraft.network.packet.s2c.play.ChunkDataS2CPacket;
 import net.minecraft.network.packet.s2c.play.ChunkDeltaUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.ChunkLoadDistanceUpdateS2CPacket;
@@ -196,6 +218,7 @@
 import net.minecraft.network.packet.s2c.play.ProfileIndependentMessageS2CPacket;
 import net.minecraft.network.packet.s2c.play.RecipeSynchronizationS2CPacket;
 import net.minecraft.network.packet.s2c.play.RecipesUnlockS2CPacket;
+import net.minecraft.network.packet.s2c.play.ReconfigureS2CPacket;
 import net.minecraft.network.packet.s2c.play.ScoreboardDisplayS2CPacket;
 import net.minecraft.network.packet.s2c.play.ScoreboardObjectiveUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.ScoreboardPlayerUpdateS2CPacket;
@@ -209,6 +232,7 @@
 import net.minecraft.network.packet.s2c.play.SimulationDistanceUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.SoundPlayS2CPacket;
 import net.minecraft.network.packet.s2c.play.SoundStopS2CPacket;
+import net.minecraft.network.packet.s2c.play.StartChunkBatchS2CPacket;
 import net.minecraft.network.packet.s2c.play.StatisticsUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.SubtitleS2CPacket;
 import net.minecraft.network.packet.s2c.play.SystemMessageS2CPacket;
@@ -252,34 +276,10 @@
 import net.minecraft.stat.Stat;
 import net.minecraft.stat.StatHandler;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_aswgqekn;
-import net.minecraft.unmapped.C_avmcnpdc;
-import net.minecraft.unmapped.C_bmpbldgo;
-import net.minecraft.unmapped.C_bvezrjxv;
-import net.minecraft.unmapped.C_bxadaxpd;
-import net.minecraft.unmapped.C_djjgdtqh;
-import net.minecraft.unmapped.C_djufnofa;
-import net.minecraft.unmapped.C_jcphmavb;
-import net.minecraft.unmapped.C_jdnmugdl;
-import net.minecraft.unmapped.C_jmmijfmi;
-import net.minecraft.unmapped.C_lyxmhfsc;
 import net.minecraft.unmapped.C_mkgltvrq;
-import net.minecraft.unmapped.C_oqfbzhlw;
-import net.minecraft.unmapped.C_ovwalqod;
-import net.minecraft.unmapped.C_oyolgusa;
-import net.minecraft.unmapped.C_pnrerjik;
-import net.minecraft.unmapped.C_rgclxlhl;
-import net.minecraft.unmapped.C_rtwzcqhy;
-import net.minecraft.unmapped.C_rvqaifaf;
-import net.minecraft.unmapped.C_safrxeyv;
 import net.minecraft.unmapped.C_srbitiuw;
-import net.minecraft.unmapped.C_swtvykbp;
-import net.minecraft.unmapped.C_tlditsxa;
 import net.minecraft.unmapped.C_wdflwuss;
-import net.minecraft.unmapped.C_wfemmhfs;
-import net.minecraft.unmapped.C_wyviwobq;
 import net.minecraft.unmapped.C_xcfjcqcn;
-import net.minecraft.unmapped.C_ylnjwyso;
 import net.minecraft.unmapped.C_zsjubkei;
 import net.minecraft.util.Hand;
 import net.minecraft.util.Identifier;
@@ -337,9 +337,10 @@
     */
    private static final Text CHAT_VALIDATION_FAILED_DISCONNECT = Text.translatable("multiplayer.disconnect.chat_validation_failed");
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_wvoodfrp Lnet/minecraft/unmapped/C_nuofrxvi;f_wvoodfrp:Lnet/minecraft/unmapped/C_rdaqiwdt;}
+    * @mapping {@literal named RECONFIGING Lnet/minecraft/client/network/ClientPlayNetworkHandler;RECONFIGING:Lnet/minecraft/text/Text;}
     */
-   private static final Text f_wvoodfrp = Text.translatable("connect.reconfiging");
+   private static final Text RECONFIGING = Text.translatable("connect.reconfiging");
    /**
     * @mapping {@literal hashed f_loanvahw Lnet/minecraft/unmapped/C_nuofrxvi;f_loanvahw:I}
     * @mapping {@literal named PENDING_OFFSET_THRESHOLD Lnet/minecraft/client/network/ClientPlayNetworkHandler;PENDING_OFFSET_THRESHOLD:I}
@@ -462,9 +463,9 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_nuofrxvi;<init>(Lnet/minecraft/unmapped/C_ayfeobid;Lnet/minecraft/unmapped/C_oasmcckk;Lnet/minecraft/unmapped/C_aswgqekn;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/client/network/ClientPlayNetworkHandler;<init>(Lnet/minecraft/client/MinecraftClient;Lnet/minecraft/network/ClientConnection;Lnet/minecraft/unmapped/C_aswgqekn;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/client/network/ClientPlayNetworkHandler;<init>(Lnet/minecraft/client/MinecraftClient;Lnet/minecraft/network/ClientConnection;Lnet/minecraft/client/connection/ClientConnectionState;)V}
     */
-   public ClientPlayNetworkHandler(MinecraftClient client, ClientConnection arg2, C_aswgqekn arg3) {
+   public ClientPlayNetworkHandler(MinecraftClient client, ClientConnection arg2, ClientConnectionState arg3) {
       super(client, arg2, arg3);
       this.profile = arg3.localGameProfile();
       this.clientRegistryManager = arg3.receivedRegistries();
@@ -942,20 +943,22 @@
     * Mapping not found
     */
    @Override
-   public void m_ctiivuwr(C_swtvykbp arg) {
-      this.f_ixguppmf.m_ayigybdt();
-      NetworkThreadUtils.forceMainThread(arg, this, this.client);
-      this.client.m_uottczas(new C_wdflwuss(f_wvoodfrp, this.f_ixguppmf));
+   public void onReconfigure(ReconfigureS2CPacket packet) {
+      this.f_ixguppmf.disableAutoReload();
+      NetworkThreadUtils.forceMainThread(packet, this, this.client);
+      this.client.m_uottczas(new C_wdflwuss(RECONFIGING, this.f_ixguppmf));
       this.f_ixguppmf
          .setPacketListener(
             new C_mkgltvrq(
                this.client,
                this.f_ixguppmf,
-               new C_aswgqekn(this.profile, this.f_utwrhkbc, this.clientRegistryManager, this.enabledFlags, this.f_lhgeaaaz, this.f_epofvvju, this.f_ruhiglgi)
+               new ClientConnectionState(
+                  this.profile, this.f_utwrhkbc, this.clientRegistryManager, this.enabledFlags, this.f_lhgeaaaz, this.f_epofvvju, this.f_ruhiglgi
+               )
             )
          );
-      this.f_ixguppmf.m_yimhdukv();
-      this.m_tadqcyiv(new C_pnrerjik());
+      this.f_ixguppmf.enableAutoReload();
+      this.m_tadqcyiv(new ReconfigurationAcknowledgementC2SPacket());
    }
 
    /**
@@ -1803,8 +1806,8 @@
     * Mapping not found
     */
    @Override
-   public void m_mnobafaz(TagsSynchronizationS2CPacket arg) {
-      super.m_mnobafaz(arg);
+   public void onTagsSynchronization(TagsSynchronizationS2CPacket packet) {
+      super.onTagsSynchronization(packet);
       this.m_ziemnttr();
    }
 
@@ -2243,44 +2246,44 @@
     * Mapping not found
     */
    @Override
-   public void m_zsokzpat(C_oqfbzhlw arg) {
-      if (arg instanceof C_rvqaifaf lv) {
+   public void m_zsokzpat(CustomPayload arg) {
+      if (arg instanceof PathDebugPayload lv) {
          this.client.debugRenderer.pathfindingDebugRenderer.addPath(lv.entityId(), lv.path(), lv.maxNodeDistance());
-      } else if (arg instanceof C_lyxmhfsc lv2) {
+      } else if (arg instanceof NeighborsUpdateDebugPayload lv2) {
          ((NeighborUpdateDebugRenderer)this.client.debugRenderer.neighborUpdateDebugRenderer).addNeighborUpdate(lv2.time(), lv2.pos());
-      } else if (arg instanceof C_djjgdtqh lv3) {
+      } else if (arg instanceof StructuresDebugPayload lv3) {
          this.client.debugRenderer.structureDebugRenderer.addStructure(lv3.mainBB(), lv3.pieces(), lv3.dimension());
-      } else if (arg instanceof C_djufnofa lv4) {
+      } else if (arg instanceof WorldgenAttemptDebugPayload lv4) {
          ((WorldGenAttemptDebugRenderer)this.client.debugRenderer.worldGenAttemptDebugRenderer)
             .addPosition(lv4.pos(), lv4.scale(), lv4.red(), lv4.green(), lv4.blue(), lv4.alpha());
-      } else if (arg instanceof C_rgclxlhl lv5) {
+      } else if (arg instanceof PoiTicketCountDebugPayload lv5) {
          this.client.debugRenderer.villageDebugRenderer.setFreeTicketCount(lv5.pos(), lv5.freeTicketCount());
-      } else if (arg instanceof C_bxadaxpd lv6) {
+      } else if (arg instanceof PoiAddedDebugPayload lv6) {
          VillageDebugRenderer.PointOfInterest lv7 = new VillageDebugRenderer.PointOfInterest(lv6.pos(), lv6.type(), lv6.freeTicketCount());
          this.client.debugRenderer.villageDebugRenderer.addPointOfInterest(lv7);
-      } else if (arg instanceof C_ovwalqod lv8) {
+      } else if (arg instanceof PoiRemovedDebugPayload lv8) {
          this.client.debugRenderer.villageDebugRenderer.removePointOfInterest(lv8.pos());
-      } else if (arg instanceof C_jdnmugdl lv9) {
+      } else if (arg instanceof VillageSectionsDebugPayload lv9) {
          VillageSectionsDebugRenderer lv10 = this.client.debugRenderer.villageSectionsDebugRenderer;
          lv9.villageChunks().forEach(lv10::addSection);
          lv9.notVillageChunks().forEach(lv10::removeSection);
-      } else if (arg instanceof C_bvezrjxv lv11) {
+      } else if (arg instanceof GoalSelectorDebugPayload lv11) {
          this.client.debugRenderer.goalSelectorDebugRenderer.setGoalSelectorList(lv11.entityId(), lv11.pos(), lv11.goals());
-      } else if (arg instanceof C_tlditsxa lv12) {
+      } else if (arg instanceof BrainDebugPayload lv12) {
          this.client.debugRenderer.villageDebugRenderer.addBrain(lv12.brainDump());
-      } else if (arg instanceof C_safrxeyv lv13) {
+      } else if (arg instanceof BeeDebugPayload lv13) {
          this.client.debugRenderer.beeDebugRenderer.addBee(lv13.beeInfo());
-      } else if (arg instanceof C_rtwzcqhy lv14) {
+      } else if (arg instanceof HiveDebugPayload lv14) {
          this.client.debugRenderer.beeDebugRenderer.addHive(lv14.hiveInfo(), this.world.getTime());
-      } else if (arg instanceof C_oyolgusa lv15) {
+      } else if (arg instanceof GameTestMarkerAdditionDebugPayload lv15) {
          this.client.debugRenderer.gameTestDebugRenderer.addMarker(lv15.pos(), lv15.color(), lv15.text(), lv15.durationMs());
-      } else if (arg instanceof C_ylnjwyso) {
+      } else if (arg instanceof GameTestClearDebugPayload) {
          this.client.debugRenderer.gameTestDebugRenderer.clear();
-      } else if (arg instanceof C_wfemmhfs lv16) {
+      } else if (arg instanceof RaidsDebugPayload lv16) {
          this.client.debugRenderer.raidCenterDebugRenderer.setRaidCenters(lv16.raidCenters());
-      } else if (arg instanceof C_avmcnpdc lv17) {
+      } else if (arg instanceof GameEventDebugPayload lv17) {
          this.client.debugRenderer.gameEventDebugRenderer.addEvent(lv17.type(), lv17.pos());
-      } else if (arg instanceof C_jcphmavb lv18) {
+      } else if (arg instanceof GameEventListenersDebugPayload lv18) {
          this.client.debugRenderer.gameEventDebugRenderer.addListener(lv18.listenerPos(), lv18.listenerRange());
       } else {
          this.m_oayrwreh(arg);
@@ -2290,8 +2293,8 @@
    /**
     * Mapping not found
     */
-   private void m_oayrwreh(C_oqfbzhlw arg) {
-      LOGGER.warn("Unknown custom packet payload: {}", arg.m_qaikjtym());
+   private void m_oayrwreh(CustomPayload arg) {
+      LOGGER.warn("Unknown custom packet payload: {}", arg.id());
    }
 
    /**
@@ -2592,7 +2595,7 @@
     * Mapping not found
     */
    @Override
-   public void m_zwbicmlf(C_bmpbldgo arg) {
+   public void onStartChunkBatch(StartChunkBatchS2CPacket packet) {
       this.f_sahycbrm = Util.getMeasuringTimeMs();
    }
 
@@ -2600,16 +2603,16 @@
     * Mapping not found
     */
    @Override
-   public void m_slzphwux(C_wyviwobq arg) {
+   public void onChunkBatchCompletion(ChunkBatchCompletionS2CPacket packet) {
       long l = Util.getMeasuringTimeMs() - this.f_sahycbrm;
-      int i = arg.batchSize();
+      int i = packet.batchSize();
       if (i > 0) {
          this.f_okzotsji.m_luvwsczo(i, l);
       }
 
       double d = Math.max(0.0, this.f_okzotsji.m_knemczpj());
       float f = (float)(25.0 / d);
-      this.m_tadqcyiv(new C_jmmijfmi(f));
+      this.m_tadqcyiv(new ChunkBatchAcknowledgementC2SPacket(f));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/network/MultiplayerServerListPinger.java namedSrc/net/minecraft/client/network/MultiplayerServerListPinger.java
--- namedTargetSrc/net/minecraft/client/network/MultiplayerServerListPinger.java	2023-08-09 03:13:11.057605282 +0000
+++ namedSrc/net/minecraft/client/network/MultiplayerServerListPinger.java	2023-08-09 03:11:40.796878332 +0000
@@ -171,7 +171,7 @@
          };
 
          try {
-            lv2.m_qoorbrdh(lv.getAddress(), lv.getPort(), lv3);
+            lv2.connect(lv.getAddress(), lv.getPort(), lv3);
             lv2.send(new MetadataQueryC2SPacket());
          } catch (Throwable var9) {
             LOGGER.error("Failed to ping server {}", lv, var9);
diff -bur namedTargetSrc/net/minecraft/client/network/PlayerListEntry.java namedSrc/net/minecraft/client/network/PlayerListEntry.java
--- namedTargetSrc/net/minecraft/client/network/PlayerListEntry.java	2023-08-09 03:13:11.045605208 +0000
+++ namedSrc/net/minecraft/client/network/PlayerListEntry.java	2023-08-09 03:11:40.784878221 +0000
@@ -31,9 +31,10 @@
     */
    private final GameProfile profile;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_bixmkpsr Lnet/minecraft/unmapped/C_rdnfmxue;f_bixmkpsr:Ljava/util/function/Supplier;}
+    * @mapping {@literal named skinSupplier Lnet/minecraft/client/network/PlayerListEntry;skinSupplier:Ljava/util/function/Supplier;}
     */
-   private final Supplier<C_idvschhb> f_bixmkpsr;
+   private final Supplier<C_idvschhb> skinSupplier;
    /**
     * @mapping {@literal hashed f_hnnviwpi Lnet/minecraft/unmapped/C_rdnfmxue;f_hnnviwpi:Lnet/minecraft/unmapped/C_lghcpyvl;}
     * @mapping {@literal named gameMode Lnet/minecraft/client/network/PlayerListEntry;gameMode:Lnet/minecraft/world/GameMode;}
@@ -69,16 +70,17 @@
    public PlayerListEntry(GameProfile profile, boolean rejectAllMessages) {
       this.profile = profile;
       this.messageVerifier = getVerifier(rejectAllMessages);
-      Supplier<Supplier<C_idvschhb>> supplier = Suppliers.memoize(() -> m_hbtevnmm(profile));
-      this.f_bixmkpsr = () -> (C_idvschhb)((Supplier)supplier.get()).get();
+      Supplier<Supplier<C_idvschhb>> supplier = Suppliers.memoize(() -> getSkinSupplier(profile));
+      this.skinSupplier = () -> (C_idvschhb)((Supplier)supplier.get()).get();
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_hbtevnmm Lnet/minecraft/unmapped/C_rdnfmxue;m_hbtevnmm(Lcom/mojang/authlib/GameProfile;)Ljava/util/function/Supplier;}
+    * @mapping {@literal named getSkinSupplier Lnet/minecraft/client/network/PlayerListEntry;getSkinSupplier(Lcom/mojang/authlib/GameProfile;)Ljava/util/function/Supplier;}
     */
-   private static Supplier<C_idvschhb> m_hbtevnmm(GameProfile gameProfile) {
+   private static Supplier<C_idvschhb> getSkinSupplier(GameProfile gameProfile) {
       MinecraftClient lv = MinecraftClient.getInstance();
-      CompletableFuture<C_idvschhb> completableFuture = m_advxzpiq(gameProfile, lv.getSkinProvider(), lv.getSessionService());
+      CompletableFuture<C_idvschhb> completableFuture = fetchSkin(gameProfile, lv.getSkinProvider(), lv.getSessionService());
       boolean bl = !lv.m_feekilwg(gameProfile.getId());
       C_idvschhb lv2 = DefaultSkinHelper.m_vnjgvuxa(gameProfile);
       return () -> {
@@ -88,29 +90,31 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_advxzpiq Lnet/minecraft/unmapped/C_rdnfmxue;m_advxzpiq(Lcom/mojang/authlib/GameProfile;Lnet/minecraft/unmapped/C_pyciilvf;Lcom/mojang/authlib/minecraft/MinecraftSessionService;)Ljava/util/concurrent/CompletableFuture;}
+    * @mapping {@literal named fetchSkin Lnet/minecraft/client/network/PlayerListEntry;fetchSkin(Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/texture/PlayerSkinProvider;Lcom/mojang/authlib/minecraft/MinecraftSessionService;)Ljava/util/concurrent/CompletableFuture;}
     */
-   private static CompletableFuture<C_idvschhb> m_advxzpiq(GameProfile gameProfile, PlayerSkinProvider arg, MinecraftSessionService minecraftSessionService) {
+   private static CompletableFuture<C_idvschhb> fetchSkin(GameProfile gameProfile, PlayerSkinProvider skinProvider, MinecraftSessionService sessionService) {
       CompletableFuture<GameProfile> completableFuture;
-      if (arg.m_oolqbfwk(gameProfile)) {
+      if (skinProvider.m_oolqbfwk(gameProfile)) {
          completableFuture = CompletableFuture.completedFuture(gameProfile);
       } else {
-         completableFuture = CompletableFuture.supplyAsync(() -> m_ktxkluwh(gameProfile, minecraftSessionService), Util.getIoWorkerExecutor());
+         completableFuture = CompletableFuture.supplyAsync(() -> putSessionProperties(gameProfile, sessionService), Util.getIoWorkerExecutor());
       }
 
-      return completableFuture.thenCompose(arg::m_grixgoty);
+      return completableFuture.thenCompose(skinProvider::m_grixgoty);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ktxkluwh Lnet/minecraft/unmapped/C_rdnfmxue;m_ktxkluwh(Lcom/mojang/authlib/GameProfile;Lcom/mojang/authlib/minecraft/MinecraftSessionService;)Lcom/mojang/authlib/GameProfile;}
+    * @mapping {@literal named putSessionProperties Lnet/minecraft/client/network/PlayerListEntry;putSessionProperties(Lcom/mojang/authlib/GameProfile;Lcom/mojang/authlib/minecraft/MinecraftSessionService;)Lcom/mojang/authlib/GameProfile;}
     */
-   private static GameProfile m_ktxkluwh(GameProfile gameProfile, MinecraftSessionService minecraftSessionService) {
+   private static GameProfile putSessionProperties(GameProfile gameProfile, MinecraftSessionService sessionService) {
       MinecraftClient lv = MinecraftClient.getInstance();
       gameProfile.getProperties().clear();
       if (lv.m_feekilwg(gameProfile.getId())) {
          gameProfile.getProperties().putAll(lv.getSessionProperties());
       } else {
-         GameProfile gameProfile2 = minecraftSessionService.fetchProfile(gameProfile.getId(), true);
+         GameProfile gameProfile2 = sessionService.fetchProfile(gameProfile.getId(), true);
          if (gameProfile2 != null) {
             gameProfile2.getProperties().putAll(gameProfile2.getProperties());
          }
@@ -211,10 +215,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_luhtdkqd Lnet/minecraft/unmapped/C_rdnfmxue;m_luhtdkqd()Lnet/minecraft/unmapped/C_idvschhb;}
+    * @mapping {@literal named getSkin Lnet/minecraft/client/network/PlayerListEntry;getSkin()Lnet/minecraft/unmapped/C_idvschhb;}
     */
-   public C_idvschhb m_luhtdkqd() {
-      return (C_idvschhb)this.f_bixmkpsr.get();
+   public C_idvschhb getSkin() {
+      return (C_idvschhb)this.skinSupplier.get();
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/option/GameOptions.java namedSrc/net/minecraft/client/option/GameOptions.java
--- namedTargetSrc/net/minecraft/client/option/GameOptions.java	2023-08-09 03:13:11.149605850 +0000
+++ namedSrc/net/minecraft/client/option/GameOptions.java	2023-08-09 03:11:40.924879519 +0000
@@ -92,9 +92,10 @@
     */
    static final Gson GSON = new Gson();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_jfxxipzn Lnet/minecraft/unmapped/C_lscptbhn;f_jfxxipzn:Lcom/google/gson/reflect/TypeToken;}
+    * @mapping {@literal named STRING_LIST_TYPE Lnet/minecraft/client/option/GameOptions;STRING_LIST_TYPE:Lcom/google/gson/reflect/TypeToken;}
     */
-   private static final TypeToken<List<String>> f_jfxxipzn = new TypeToken<List<String>>() {
+   private static final TypeToken<List<String>> STRING_LIST_TYPE = new TypeToken<List<String>>() {
    };
    /**
     * @mapping {@literal hashed f_jlwpdhyd Lnet/minecraft/unmapped/C_lscptbhn;f_jlwpdhyd:I}
@@ -236,10 +237,10 @@
       Option.optionEnumText(),
       new Option.EnumValueSet<>(
          Arrays.asList(CloudRenderMode.values()),
-         Codecs.m_tewufcxl(CloudRenderMode.CODEC, Codec.BOOL, enabled -> enabled ? CloudRenderMode.FANCY : CloudRenderMode.OFF)
+         Codecs.either(CloudRenderMode.CODEC, Codec.BOOL, enabled -> enabled ? CloudRenderMode.FANCY : CloudRenderMode.OFF)
       ),
       CloudRenderMode.FANCY,
-      arg -> {
+      renderMode -> {
          if (MinecraftClient.isFabulousGraphicsOrBetter()) {
             Framebuffer lv = MinecraftClient.getInstance().worldRenderer.getCloudsFramebuffer();
             if (lv != null) {
@@ -271,28 +272,28 @@
     */
    private final Option<GraphicsMode> graphicsMode = new Option<>(
       "options.graphics",
-      arg -> {
-         return switch (arg) {
+      graphicsMode -> {
+         return switch (graphicsMode) {
             case FANCY -> Tooltip.create(FANCY_GRAPHICS_TOOLTIP);
             case FAST -> Tooltip.create(FAST_GRAPHICS_TOOLTIP);
             case FABULOUS -> Tooltip.create(FABULOUS_GRAPHICS_TOOLTIP);
          };
       },
-      (arg, arg2) -> {
-         MutableText lv = Text.translatable(arg2.getTranslationKey());
-         return arg2 == GraphicsMode.FABULOUS ? lv.formatted(Formatting.ITALIC) : lv;
+      (text, graphicsMode) -> {
+         MutableText lv = Text.translatable(graphicsMode.getTranslationKey());
+         return graphicsMode == GraphicsMode.FABULOUS ? lv.formatted(Formatting.ITALIC) : lv;
       },
       new Option.AlternativeEnumValueSet<>(
          Arrays.asList(GraphicsMode.values()),
-         (List<GraphicsMode>)Stream.of(GraphicsMode.values()).filter(arg -> arg != GraphicsMode.FABULOUS).collect(Collectors.toList()),
+         (List<GraphicsMode>)Stream.of(GraphicsMode.values()).filter(mode -> mode != GraphicsMode.FABULOUS).collect(Collectors.toList()),
          () -> MinecraftClient.getInstance().isRunning() && MinecraftClient.getInstance().getVideoWarningManager().hasCancelledAfterWarning(),
-         (arg, value) -> {
+         (option, value) -> {
             MinecraftClient lv = MinecraftClient.getInstance();
             VideoWarningManager lv2 = lv.getVideoWarningManager();
             if (value == GraphicsMode.FABULOUS && lv2.canWarn()) {
                lv2.scheduleWarning();
             } else {
-               arg.set(value);
+               option.set(value);
                lv.worldRenderer.reload();
             }
          },
@@ -2165,8 +2166,10 @@
       visitor.visit("prioritizeChunkUpdates", this.prioritizeChunkUpdates);
       visitor.visit("biomeBlendRadius", this.biomeBlendRadius);
       visitor.visit("renderClouds", this.renderClouds);
-      this.resourcePacks = visitor.visitObject("resourcePacks", this.resourcePacks, GameOptions::m_aqdjuews, GSON::toJson);
-      this.incompatibleResourcePacks = visitor.visitObject("incompatibleResourcePacks", this.incompatibleResourcePacks, GameOptions::m_aqdjuews, GSON::toJson);
+      this.resourcePacks = visitor.visitObject("resourcePacks", this.resourcePacks, GameOptions::deserializeStringList, GSON::toJson);
+      this.incompatibleResourcePacks = visitor.visitObject(
+         "incompatibleResourcePacks", this.incompatibleResourcePacks, GameOptions::deserializeStringList, GSON::toJson
+      );
       this.lastServer = visitor.visitString("lastServer", this.lastServer);
       this.language = visitor.visitString("lang", this.language);
       visitor.visit("soundDevice", this.soundDevice);
@@ -2650,10 +2653,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_aqdjuews Lnet/minecraft/unmapped/C_lscptbhn;m_aqdjuews(Ljava/lang/String;)Ljava/util/List;}
+    * @mapping {@literal named deserializeStringList Lnet/minecraft/client/option/GameOptions;deserializeStringList(Ljava/lang/String;)Ljava/util/List;}
     */
-   private static List<String> m_aqdjuews(String string) {
-      List<String> list = JsonHelper.deserialize(GSON, string, f_jfxxipzn);
+   private static List<String> deserializeStringList(String jsonContent) {
+      List<String> list = JsonHelper.deserialize(GSON, jsonContent, STRING_LIST_TYPE);
       return (List<String>)(list != null ? list : Lists.<String>newArrayList());
    }
 
diff -bur namedTargetSrc/net/minecraft/client/option/Option.java namedSrc/net/minecraft/client/option/Option.java
--- namedTargetSrc/net/minecraft/client/option/Option.java	2023-08-09 03:13:11.073605381 +0000
+++ namedSrc/net/minecraft/client/option/Option.java	2023-08-09 03:11:40.812878481 +0000
@@ -790,7 +790,7 @@
        */
       @Override
       public Codec<Double> codec() {
-         return Codecs.m_tewufcxl(Codec.doubleRange(0.0, 1.0), Codec.BOOL, arg -> arg ? 1.0 : 0.0);
+         return Codecs.either(Codec.doubleRange(0.0, 1.0), Codec.BOOL, arg -> arg ? 1.0 : 0.0);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/client/realms/RealmsConnection.java namedSrc/net/minecraft/client/realms/RealmsConnection.java
--- namedTargetSrc/net/minecraft/client/realms/RealmsConnection.java	2023-08-09 03:13:11.161605924 +0000
+++ namedSrc/net/minecraft/client/realms/RealmsConnection.java	2023-08-09 03:11:40.936879630 +0000
@@ -96,7 +96,7 @@
                      return;
                   }
    
-                  RealmsConnection.this.connection.m_myzbxovj(string, i, lv);
+                  RealmsConnection.this.connection.connect(string, i, lv);
                   if (RealmsConnection.this.aborted) {
                      return;
                   }
diff -bur namedTargetSrc/net/minecraft/client/render/debug/BeeDebugRenderer.java namedSrc/net/minecraft/client/render/debug/BeeDebugRenderer.java
--- namedTargetSrc/net/minecraft/client/render/debug/BeeDebugRenderer.java	2023-08-09 03:13:11.173605998 +0000
+++ namedSrc/net/minecraft/client/render/debug/BeeDebugRenderer.java	2023-08-09 03:11:40.948879741 +0000
@@ -19,8 +19,8 @@
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.unmapped.C_rtwzcqhy;
-import net.minecraft.unmapped.C_safrxeyv;
+import net.minecraft.network.packet.s2c.payload.BeeDebugPayload;
+import net.minecraft.network.packet.s2c.payload.HiveDebugPayload;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Position;
 import org.jetbrains.annotations.Nullable;
@@ -175,7 +175,7 @@
     * @mapping {@literal hashed f_innlvhov Lnet/minecraft/unmapped/C_ufhpzxdd;f_innlvhov:Ljava/util/Map;}
     * @mapping {@literal named bees Lnet/minecraft/client/render/debug/BeeDebugRenderer;bees:Ljava/util/Map;}
     */
-   private final Map<UUID, C_safrxeyv.C_pbjuaqgb> bees = new HashMap();
+   private final Map<UUID, BeeDebugPayload.BeeInfo> bees = new HashMap();
    /**
     * @mapping {@literal hashed f_neifirxb Lnet/minecraft/unmapped/C_ufhpzxdd;f_neifirxb:Ljava/util/UUID;}
     * @mapping {@literal named targetedEntity Lnet/minecraft/client/render/debug/BeeDebugRenderer;targetedEntity:Ljava/util/UUID;}
@@ -203,17 +203,17 @@
 
    /**
     * @mapping {@literal hashed m_tpwsplrk Lnet/minecraft/unmapped/C_ufhpzxdd;m_tpwsplrk(Lnet/minecraft/unmapped/C_rtwzcqhy$C_vhgskxqn;J)V}
-    * @mapping {@literal named addHive Lnet/minecraft/client/render/debug/BeeDebugRenderer;addHive(Lnet/minecraft/unmapped/C_rtwzcqhy$C_vhgskxqn;J)V}
+    * @mapping {@literal named addHive Lnet/minecraft/client/render/debug/BeeDebugRenderer;addHive(Lnet/minecraft/network/packet/s2c/payload/HiveDebugPayload$HiveInfo;J)V}
     */
-   public void addHive(C_rtwzcqhy.C_vhgskxqn arg, long l) {
+   public void addHive(HiveDebugPayload.HiveInfo arg, long l) {
       this.hives.put(arg.pos(), new BeeDebugRenderer.C_qidzekou(arg, l));
    }
 
    /**
     * @mapping {@literal hashed m_tnmpeian Lnet/minecraft/unmapped/C_ufhpzxdd;m_tnmpeian(Lnet/minecraft/unmapped/C_safrxeyv$C_pbjuaqgb;)V}
-    * @mapping {@literal named addBee Lnet/minecraft/client/render/debug/BeeDebugRenderer;addBee(Lnet/minecraft/unmapped/C_safrxeyv$C_pbjuaqgb;)V}
+    * @mapping {@literal named addBee Lnet/minecraft/client/render/debug/BeeDebugRenderer;addBee(Lnet/minecraft/network/packet/s2c/payload/BeeDebugPayload$BeeInfo;)V}
     */
-   public void addBee(C_safrxeyv.C_pbjuaqgb arg) {
+   public void addBee(BeeDebugPayload.BeeInfo arg) {
       this.bees.put(arg.uuid(), arg);
    }
 
@@ -243,7 +243,7 @@
     * @mapping {@literal named removeInvalidBees Lnet/minecraft/client/render/debug/BeeDebugRenderer;removeInvalidBees()V}
     */
    private void removeInvalidBees() {
-      this.bees.entrySet().removeIf(bee -> this.client.world.getEntityById(((C_safrxeyv.C_pbjuaqgb)bee.getValue()).id()) == null);
+      this.bees.entrySet().removeIf(bee -> this.client.world.getEntityById(((BeeDebugPayload.BeeInfo)bee.getValue()).id()) == null);
    }
 
    /**
@@ -355,9 +355,9 @@
 
    /**
     * @mapping {@literal hashed m_uyaaxxqi Lnet/minecraft/unmapped/C_ufhpzxdd;m_uyaaxxqi(Lnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;Lnet/minecraft/unmapped/C_rtwzcqhy$C_vhgskxqn;Ljava/util/Collection;)V}
-    * @mapping {@literal named drawHiveInfo Lnet/minecraft/client/render/debug/BeeDebugRenderer;drawHiveInfo(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/unmapped/C_rtwzcqhy$C_vhgskxqn;Ljava/util/Collection;)V}
+    * @mapping {@literal named drawHiveInfo Lnet/minecraft/client/render/debug/BeeDebugRenderer;drawHiveInfo(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/network/packet/s2c/payload/HiveDebugPayload$HiveInfo;Ljava/util/Collection;)V}
     */
-   private void drawHiveInfo(MatrixStack matrices, VertexConsumerProvider vertexConsumers, C_rtwzcqhy.C_vhgskxqn arg3, Collection<UUID> blacklistingBees) {
+   private void drawHiveInfo(MatrixStack matrices, VertexConsumerProvider vertexConsumers, HiveDebugPayload.HiveInfo arg3, Collection<UUID> blacklistingBees) {
       int i = 0;
       if (!blacklistingBees.isEmpty()) {
          drawString(matrices, vertexConsumers, "Blacklisted by " + toString(blacklistingBees), arg3, i++, -65536);
@@ -378,9 +378,9 @@
 
    /**
     * @mapping {@literal hashed m_mtgmqfsu Lnet/minecraft/unmapped/C_ufhpzxdd;m_mtgmqfsu(Lnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;Lnet/minecraft/unmapped/C_safrxeyv$C_pbjuaqgb;)V}
-    * @mapping {@literal named drawPath Lnet/minecraft/client/render/debug/BeeDebugRenderer;drawPath(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/unmapped/C_safrxeyv$C_pbjuaqgb;)V}
+    * @mapping {@literal named drawPath Lnet/minecraft/client/render/debug/BeeDebugRenderer;drawPath(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/network/packet/s2c/payload/BeeDebugPayload$BeeInfo;)V}
     */
-   private void drawPath(MatrixStack matrices, VertexConsumerProvider vertexConsumers, C_safrxeyv.C_pbjuaqgb arg3) {
+   private void drawPath(MatrixStack matrices, VertexConsumerProvider vertexConsumers, BeeDebugPayload.BeeInfo arg3) {
       if (arg3.path() != null) {
          PathfindingDebugRenderer.drawPath(
             matrices,
@@ -398,9 +398,9 @@
 
    /**
     * @mapping {@literal hashed m_gkyhojbi Lnet/minecraft/unmapped/C_ufhpzxdd;m_gkyhojbi(Lnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;Lnet/minecraft/unmapped/C_safrxeyv$C_pbjuaqgb;)V}
-    * @mapping {@literal named drawBee Lnet/minecraft/client/render/debug/BeeDebugRenderer;drawBee(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/unmapped/C_safrxeyv$C_pbjuaqgb;)V}
+    * @mapping {@literal named drawBee Lnet/minecraft/client/render/debug/BeeDebugRenderer;drawBee(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/network/packet/s2c/payload/BeeDebugPayload$BeeInfo;)V}
     */
-   private void drawBee(MatrixStack matrices, VertexConsumerProvider vertexConsumers, C_safrxeyv.C_pbjuaqgb arg3) {
+   private void drawBee(MatrixStack matrices, VertexConsumerProvider vertexConsumers, BeeDebugPayload.BeeInfo arg3) {
       boolean bl = this.isTargeted(arg3);
       int i = 0;
       drawString(matrices, vertexConsumers, arg3.pos(), i++, arg3.toString(), -1, 0.03F);
@@ -432,9 +432,11 @@
 
    /**
     * @mapping {@literal hashed m_yahfkugb Lnet/minecraft/unmapped/C_ufhpzxdd;m_yahfkugb(Lnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;Ljava/lang/String;Lnet/minecraft/unmapped/C_rtwzcqhy$C_vhgskxqn;II)V}
-    * @mapping {@literal named drawString Lnet/minecraft/client/render/debug/BeeDebugRenderer;drawString(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;Ljava/lang/String;Lnet/minecraft/unmapped/C_rtwzcqhy$C_vhgskxqn;II)V}
+    * @mapping {@literal named drawString Lnet/minecraft/client/render/debug/BeeDebugRenderer;drawString(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;Ljava/lang/String;Lnet/minecraft/network/packet/s2c/payload/HiveDebugPayload$HiveInfo;II)V}
     */
-   private static void drawString(MatrixStack matrices, VertexConsumerProvider vertexConsumers, String string, C_rtwzcqhy.C_vhgskxqn arg3, int line, int color) {
+   private static void drawString(
+      MatrixStack matrices, VertexConsumerProvider vertexConsumers, String string, HiveDebugPayload.HiveInfo arg3, int line, int color
+   ) {
       drawString(matrices, vertexConsumers, string, arg3.pos(), line, color);
    }
 
@@ -476,17 +478,17 @@
 
    /**
     * @mapping {@literal hashed m_wadrjnve Lnet/minecraft/unmapped/C_ufhpzxdd;m_wadrjnve(Lnet/minecraft/unmapped/C_rtwzcqhy$C_vhgskxqn;)Ljava/util/Set;}
-    * @mapping {@literal named getBeeNamesForHive Lnet/minecraft/client/render/debug/BeeDebugRenderer;getBeeNamesForHive(Lnet/minecraft/unmapped/C_rtwzcqhy$C_vhgskxqn;)Ljava/util/Set;}
+    * @mapping {@literal named getBeeNamesForHive Lnet/minecraft/client/render/debug/BeeDebugRenderer;getBeeNamesForHive(Lnet/minecraft/network/packet/s2c/payload/HiveDebugPayload$HiveInfo;)Ljava/util/Set;}
     */
-   private Set<String> getBeeNamesForHive(C_rtwzcqhy.C_vhgskxqn arg) {
+   private Set<String> getBeeNamesForHive(HiveDebugPayload.HiveInfo arg) {
       return (Set<String>)this.getBeesForHive(arg.pos()).stream().map(NameGenerator::name).collect(Collectors.toSet());
    }
 
    /**
     * @mapping {@literal hashed m_eyuwnxta Lnet/minecraft/unmapped/C_ufhpzxdd;m_eyuwnxta(Lnet/minecraft/unmapped/C_safrxeyv$C_pbjuaqgb;Lnet/minecraft/unmapped/C_hynzadkk;)Ljava/lang/String;}
-    * @mapping {@literal named getPositionString Lnet/minecraft/client/render/debug/BeeDebugRenderer;getPositionString(Lnet/minecraft/unmapped/C_safrxeyv$C_pbjuaqgb;Lnet/minecraft/util/math/BlockPos;)Ljava/lang/String;}
+    * @mapping {@literal named getPositionString Lnet/minecraft/client/render/debug/BeeDebugRenderer;getPositionString(Lnet/minecraft/network/packet/s2c/payload/BeeDebugPayload$BeeInfo;Lnet/minecraft/util/math/BlockPos;)Ljava/lang/String;}
     */
-   private String getPositionString(C_safrxeyv.C_pbjuaqgb arg, BlockPos pos) {
+   private String getPositionString(BeeDebugPayload.BeeInfo arg, BlockPos pos) {
       double d = Math.sqrt(pos.getSquaredDistanceToCenter(arg.pos()));
       double e = (double)Math.round(d * 10.0) / 10.0;
       return pos.toShortString() + " (dist " + e + ")";
@@ -494,17 +496,17 @@
 
    /**
     * @mapping {@literal hashed m_ugklqdwt Lnet/minecraft/unmapped/C_ufhpzxdd;m_ugklqdwt(Lnet/minecraft/unmapped/C_safrxeyv$C_pbjuaqgb;)Z}
-    * @mapping {@literal named isTargeted Lnet/minecraft/client/render/debug/BeeDebugRenderer;isTargeted(Lnet/minecraft/unmapped/C_safrxeyv$C_pbjuaqgb;)Z}
+    * @mapping {@literal named isTargeted Lnet/minecraft/client/render/debug/BeeDebugRenderer;isTargeted(Lnet/minecraft/network/packet/s2c/payload/BeeDebugPayload$BeeInfo;)Z}
     */
-   private boolean isTargeted(C_safrxeyv.C_pbjuaqgb arg) {
+   private boolean isTargeted(BeeDebugPayload.BeeInfo arg) {
       return Objects.equals(this.targetedEntity, arg.uuid());
    }
 
    /**
     * @mapping {@literal hashed m_kiwmbzcw Lnet/minecraft/unmapped/C_ufhpzxdd;m_kiwmbzcw(Lnet/minecraft/unmapped/C_safrxeyv$C_pbjuaqgb;)Z}
-    * @mapping {@literal named isInRange Lnet/minecraft/client/render/debug/BeeDebugRenderer;isInRange(Lnet/minecraft/unmapped/C_safrxeyv$C_pbjuaqgb;)Z}
+    * @mapping {@literal named isInRange Lnet/minecraft/client/render/debug/BeeDebugRenderer;isInRange(Lnet/minecraft/network/packet/s2c/payload/BeeDebugPayload$BeeInfo;)Z}
     */
-   private boolean isInRange(C_safrxeyv.C_pbjuaqgb arg) {
+   private boolean isInRange(BeeDebugPayload.BeeInfo arg) {
       PlayerEntity lv = this.client.player;
       BlockPos lv2 = BlockPos.create(lv.getX(), arg.pos().getY(), lv.getZ());
       BlockPos lv3 = BlockPos.fromPosition(arg.pos());
@@ -519,8 +521,8 @@
       return (Collection<UUID>)this.bees
          .values()
          .stream()
-         .filter(arg2 -> arg2.m_eiwhtmjf(hivePos))
-         .map(C_safrxeyv.C_pbjuaqgb::uuid)
+         .filter(arg2 -> arg2.matchesHivePos(hivePos))
+         .map(BeeDebugPayload.BeeInfo::uuid)
          .collect(Collectors.toSet());
    }
 
@@ -531,9 +533,9 @@
    private Map<BlockPos, List<String>> getBeesByHive() {
       Map<BlockPos, List<String>> map = Maps.<BlockPos, List<String>>newHashMap();
 
-      for (C_safrxeyv.C_pbjuaqgb lv : this.bees.values()) {
+      for (BeeDebugPayload.BeeInfo lv : this.bees.values()) {
          if (lv.hivePos() != null && !this.hives.containsKey(lv.hivePos())) {
-            ((List)map.computeIfAbsent(lv.hivePos(), pos -> Lists.newArrayList())).add(lv.m_xchfwztx());
+            ((List)map.computeIfAbsent(lv.hivePos(), pos -> Lists.newArrayList())).add(lv.getName());
          }
       }
 
@@ -553,6 +555,6 @@
     * @mapping {@literal named net/minecraft/client/render/debug/BeeDebugRenderer$C_qidzekou}
     */
    @Environment(EnvType.CLIENT)
-   static record C_qidzekou(C_rtwzcqhy.C_vhgskxqn info, long lastSeen) {
+   static record C_qidzekou(HiveDebugPayload.HiveInfo info, long lastSeen) {
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/debug/GoalSelectorDebugRenderer.java namedSrc/net/minecraft/client/render/debug/GoalSelectorDebugRenderer.java
--- namedTargetSrc/net/minecraft/client/render/debug/GoalSelectorDebugRenderer.java	2023-08-09 03:13:11.137605776 +0000
+++ namedSrc/net/minecraft/client/render/debug/GoalSelectorDebugRenderer.java	2023-08-09 03:11:40.904879334 +0000
@@ -9,7 +9,7 @@
 import net.minecraft.client.render.Camera;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.unmapped.C_bvezrjxv;
+import net.minecraft.network.packet.s2c.payload.GoalSelectorDebugPayload;
 import net.minecraft.util.math.BlockPos;
 
 /**
@@ -46,7 +46,7 @@
     * @mapping {@literal hashed m_idfhvvkx Lnet/minecraft/unmapped/C_oqgbmvdf;m_idfhvvkx(ILnet/minecraft/unmapped/C_hynzadkk;Ljava/util/List;)V}
     * @mapping {@literal named setGoalSelectorList Lnet/minecraft/client/render/debug/GoalSelectorDebugRenderer;setGoalSelectorList(ILnet/minecraft/util/math/BlockPos;Ljava/util/List;)V}
     */
-   public void setGoalSelectorList(int index, BlockPos pos, List<C_bvezrjxv.C_grrixivf> selectors) {
+   public void setGoalSelectorList(int index, BlockPos pos, List<GoalSelectorDebugPayload.Goal> selectors) {
       this.goalSelectors.put(index, new GoalSelectorDebugRenderer.C_wwexgied(pos, selectors));
    }
 
@@ -78,7 +78,7 @@
          BlockPos lv4 = lv3.entityPos;
          if (lv2.isWithinDistance(lv4, 160.0)) {
             for (int i = 0; i < lv3.goals.size(); ++i) {
-               C_bvezrjxv.C_grrixivf lv5 = (C_bvezrjxv.C_grrixivf)lv3.goals.get(i);
+               GoalSelectorDebugPayload.Goal lv5 = (GoalSelectorDebugPayload.Goal)lv3.goals.get(i);
                double g = (double)lv4.getX() + 0.5;
                double h = (double)lv4.getY() + 2.0 + (double)i * 0.25;
                double j = (double)lv4.getZ() + 0.5;
@@ -94,6 +94,6 @@
     * @mapping {@literal named net/minecraft/client/render/debug/GoalSelectorDebugRenderer$C_wwexgied}
     */
    @Environment(EnvType.CLIENT)
-   static record C_wwexgied(BlockPos entityPos, List<C_bvezrjxv.C_grrixivf> goals) {
+   static record C_wwexgied(BlockPos entityPos, List<GoalSelectorDebugPayload.Goal> goals) {
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/debug/StructureDebugRenderer.java namedSrc/net/minecraft/client/render/debug/StructureDebugRenderer.java
--- namedTargetSrc/net/minecraft/client/render/debug/StructureDebugRenderer.java	2023-08-09 03:13:11.165605948 +0000
+++ namedSrc/net/minecraft/client/render/debug/StructureDebugRenderer.java	2023-08-09 03:11:40.940879667 +0000
@@ -13,8 +13,8 @@
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.WorldRenderer;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.network.packet.s2c.payload.StructuresDebugPayload;
 import net.minecraft.registry.RegistryKey;
-import net.minecraft.unmapped.C_djjgdtqh;
 import net.minecraft.util.math.BlockBox;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
@@ -38,7 +38,7 @@
    /**
     * Mapping not found
     */
-   private final Map<RegistryKey<World>, Map<String, C_djjgdtqh.C_obwdgvyc>> f_agxstemf = Maps.<RegistryKey<World>, Map<String, C_djjgdtqh.C_obwdgvyc>>newIdentityHashMap(
+   private final Map<RegistryKey<World>, Map<String, StructuresDebugPayload.PieceQWE>> f_agxstemf = Maps.<RegistryKey<World>, Map<String, StructuresDebugPayload.PieceQWE>>newIdentityHashMap(
       
    );
    /**
@@ -88,9 +88,9 @@
          }
       }
 
-      Map<String, C_djjgdtqh.C_obwdgvyc> map = (Map)this.f_agxstemf.get(lv2);
+      Map<String, StructuresDebugPayload.PieceQWE> map = (Map)this.f_agxstemf.get(lv2);
       if (map != null) {
-         for (C_djjgdtqh.C_obwdgvyc lv6 : map.values()) {
+         for (StructuresDebugPayload.PieceQWE lv6 : map.values()) {
             BlockBox lv7 = lv6.boundingBox();
             if (lv3.isWithinDistance(lv7.getCenter(), 500.0)) {
                if (lv6.isStart()) {
@@ -139,11 +139,11 @@
     * @mapping {@literal hashed m_tmeqhmbo Lnet/minecraft/unmapped/C_jneftvkt;m_tmeqhmbo(Lnet/minecraft/unmapped/C_hmqypqzz;Ljava/util/List;Lnet/minecraft/unmapped/C_xhhleach;)V}
     * @mapping {@literal named addStructure Lnet/minecraft/client/render/debug/StructureDebugRenderer;addStructure(Lnet/minecraft/util/math/BlockBox;Ljava/util/List;Lnet/minecraft/registry/RegistryKey;)V}
     */
-   public void addStructure(BlockBox boundingBox, List<C_djjgdtqh.C_obwdgvyc> piecesBoundingBoxes, RegistryKey<World> registryKey) {
+   public void addStructure(BlockBox boundingBox, List<StructuresDebugPayload.PieceQWE> piecesBoundingBoxes, RegistryKey<World> registryKey) {
       ((Map)this.structureBoundingBoxes.computeIfAbsent(registryKey, registryKeyx -> new HashMap())).put(boundingBox.toString(), boundingBox);
-      Map<String, C_djjgdtqh.C_obwdgvyc> map = (Map)this.f_agxstemf.computeIfAbsent(registryKey, registryKeyx -> new HashMap());
+      Map<String, StructuresDebugPayload.PieceQWE> map = (Map)this.f_agxstemf.computeIfAbsent(registryKey, registryKeyx -> new HashMap());
 
-      for (C_djjgdtqh.C_obwdgvyc lv : piecesBoundingBoxes) {
+      for (StructuresDebugPayload.PieceQWE lv : piecesBoundingBoxes) {
          map.put(lv.boundingBox().toString(), lv);
       }
    }

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

View the diff here (2/3): 
diff -bur namedTargetSrc/net/minecraft/client/render/debug/VillageDebugRenderer.java namedSrc/net/minecraft/client/render/debug/VillageDebugRenderer.java
--- namedTargetSrc/net/minecraft/client/render/debug/VillageDebugRenderer.java	2023-08-09 03:13:11.081605430 +0000
+++ namedSrc/net/minecraft/client/render/debug/VillageDebugRenderer.java	2023-08-09 03:11:40.824878592 +0000
@@ -19,7 +19,7 @@
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.unmapped.C_tlditsxa;
+import net.minecraft.network.packet.s2c.payload.BrainDebugPayload;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Position;
 import org.jetbrains.annotations.Nullable;
@@ -220,7 +220,7 @@
     * @mapping {@literal hashed f_nkjlpgye Lnet/minecraft/unmapped/C_jrisckyo;f_nkjlpgye:Ljava/util/Map;}
     * @mapping {@literal named brains Lnet/minecraft/client/render/debug/VillageDebugRenderer;brains:Ljava/util/Map;}
     */
-   private final Map<UUID, C_tlditsxa.C_mwfakkmt> brains = Maps.<UUID, C_tlditsxa.C_mwfakkmt>newHashMap();
+   private final Map<UUID, BrainDebugPayload.BrainDump> brains = Maps.<UUID, BrainDebugPayload.BrainDump>newHashMap();
    /**
     * @mapping {@literal hashed f_opfxhwic Lnet/minecraft/unmapped/C_jrisckyo;f_opfxhwic:Ljava/util/UUID;}
     * @mapping {@literal named targetedEntity Lnet/minecraft/client/render/debug/VillageDebugRenderer;targetedEntity:Ljava/util/UUID;}
@@ -277,9 +277,9 @@
 
    /**
     * @mapping {@literal hashed m_ssjwdxjw Lnet/minecraft/unmapped/C_jrisckyo;m_ssjwdxjw(Lnet/minecraft/unmapped/C_tlditsxa$C_mwfakkmt;)V}
-    * @mapping {@literal named addBrain Lnet/minecraft/client/render/debug/VillageDebugRenderer;addBrain(Lnet/minecraft/unmapped/C_tlditsxa$C_mwfakkmt;)V}
+    * @mapping {@literal named addBrain Lnet/minecraft/client/render/debug/VillageDebugRenderer;addBrain(Lnet/minecraft/network/packet/s2c/payload/BrainDebugPayload$BrainDump;)V}
     */
-   public void addBrain(C_tlditsxa.C_mwfakkmt arg) {
+   public void addBrain(BrainDebugPayload.BrainDump arg) {
       this.brains.put(arg.uuid(), arg);
    }
 
@@ -309,7 +309,7 @@
     */
    private void removeRemovedBrains() {
       this.brains.entrySet().removeIf(entry -> {
-         Entity lv = this.client.world.getEntityById(((C_tlditsxa.C_mwfakkmt)entry.getValue()).id());
+         Entity lv = this.client.world.getEntityById(((BrainDebugPayload.BrainDump)entry.getValue()).id());
          return lv == null || lv.isRemoved();
       });
    }
@@ -391,10 +391,10 @@
 
    /**
     * @mapping {@literal hashed m_oeajyocj Lnet/minecraft/unmapped/C_jrisckyo;m_oeajyocj(Lnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;Lnet/minecraft/unmapped/C_tlditsxa$C_mwfakkmt;DDD)V}
-    * @mapping {@literal named drawPath Lnet/minecraft/client/render/debug/VillageDebugRenderer;drawPath(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/unmapped/C_tlditsxa$C_mwfakkmt;DDD)V}
+    * @mapping {@literal named drawPath Lnet/minecraft/client/render/debug/VillageDebugRenderer;drawPath(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/network/packet/s2c/payload/BrainDebugPayload$BrainDump;DDD)V}
     */
    private void drawPath(
-      MatrixStack matrices, VertexConsumerProvider vertexConsumers, C_tlditsxa.C_mwfakkmt arg3, double cameraX, double cameraY, double cameraZ
+      MatrixStack matrices, VertexConsumerProvider vertexConsumers, BrainDebugPayload.BrainDump arg3, double cameraX, double cameraY, double cameraZ
    ) {
       if (arg3.path() != null) {
          PathfindingDebugRenderer.drawPath(matrices, vertexConsumers, arg3.path(), 0.5F, false, false, cameraX, cameraY, cameraZ);
@@ -403,10 +403,10 @@
 
    /**
     * @mapping {@literal hashed m_omoaayws Lnet/minecraft/unmapped/C_jrisckyo;m_omoaayws(Lnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;Lnet/minecraft/unmapped/C_tlditsxa$C_mwfakkmt;DDD)V}
-    * @mapping {@literal named drawBrain Lnet/minecraft/client/render/debug/VillageDebugRenderer;drawBrain(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/unmapped/C_tlditsxa$C_mwfakkmt;DDD)V}
+    * @mapping {@literal named drawBrain Lnet/minecraft/client/render/debug/VillageDebugRenderer;drawBrain(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/network/packet/s2c/payload/BrainDebugPayload$BrainDump;DDD)V}
     */
    private void drawBrain(
-      MatrixStack matrices, VertexConsumerProvider vertexConsumers, C_tlditsxa.C_mwfakkmt arg3, double cameraX, double cameraY, double cameraZ
+      MatrixStack matrices, VertexConsumerProvider vertexConsumers, BrainDebugPayload.BrainDump arg3, double cameraX, double cameraY, double cameraZ
    ) {
       boolean bl = this.isTargeted(arg3);
       int i = 0;
@@ -540,17 +540,17 @@
 
    /**
     * @mapping {@literal hashed m_qrdhihoz Lnet/minecraft/unmapped/C_jrisckyo;m_qrdhihoz(Lnet/minecraft/unmapped/C_tlditsxa$C_mwfakkmt;)Z}
-    * @mapping {@literal named isTargeted Lnet/minecraft/client/render/debug/VillageDebugRenderer;isTargeted(Lnet/minecraft/unmapped/C_tlditsxa$C_mwfakkmt;)Z}
+    * @mapping {@literal named isTargeted Lnet/minecraft/client/render/debug/VillageDebugRenderer;isTargeted(Lnet/minecraft/network/packet/s2c/payload/BrainDebugPayload$BrainDump;)Z}
     */
-   private boolean isTargeted(C_tlditsxa.C_mwfakkmt arg) {
+   private boolean isTargeted(BrainDebugPayload.BrainDump arg) {
       return Objects.equals(this.targetedEntity, arg.uuid());
    }
 
    /**
     * @mapping {@literal hashed m_dxufrkzd Lnet/minecraft/unmapped/C_jrisckyo;m_dxufrkzd(Lnet/minecraft/unmapped/C_tlditsxa$C_mwfakkmt;)Z}
-    * @mapping {@literal named isClose Lnet/minecraft/client/render/debug/VillageDebugRenderer;isClose(Lnet/minecraft/unmapped/C_tlditsxa$C_mwfakkmt;)Z}
+    * @mapping {@literal named isClose Lnet/minecraft/client/render/debug/VillageDebugRenderer;isClose(Lnet/minecraft/network/packet/s2c/payload/BrainDebugPayload$BrainDump;)Z}
     */
-   private boolean isClose(C_tlditsxa.C_mwfakkmt arg) {
+   private boolean isClose(BrainDebugPayload.BrainDump arg) {
       PlayerEntity lv = this.client.player;
       BlockPos lv2 = BlockPos.create(lv.getX(), arg.pos().getY(), lv.getZ());
       BlockPos lv3 = BlockPos.fromPosition(arg.pos());
@@ -565,8 +565,8 @@
       return (Collection<UUID>)this.brains
          .values()
          .stream()
-         .filter(arg2 -> arg2.m_ppymxqxv(pointOfInterest))
-         .map(C_tlditsxa.C_mwfakkmt::uuid)
+         .filter(arg2 -> arg2.isPoi(pointOfInterest))
+         .map(BrainDebugPayload.BrainDump::uuid)
          .collect(Collectors.toSet());
    }
 
@@ -578,8 +578,8 @@
       return (Collection<UUID>)this.brains
          .values()
          .stream()
-         .filter(arg2 -> arg2.m_zhybxfcq(potentialJobSite))
-         .map(C_tlditsxa.C_mwfakkmt::uuid)
+         .filter(arg2 -> arg2.isPotentialPoi(potentialJobSite))
+         .map(BrainDebugPayload.BrainDump::uuid)
          .collect(Collectors.toSet());
    }
 
@@ -590,7 +590,7 @@
    private Map<BlockPos, List<String>> getGhostPointsOfInterest() {
       Map<BlockPos, List<String>> map = Maps.<BlockPos, List<String>>newHashMap();
 
-      for (C_tlditsxa.C_mwfakkmt lv : this.brains.values()) {
+      for (BrainDebugPayload.BrainDump lv : this.brains.values()) {
          for (BlockPos lv2 : Iterables.concat(lv.pois(), lv.potentialPois())) {
             if (!this.pointsOfInterest.containsKey(lv2)) {
                ((List)map.computeIfAbsent(lv2, pos -> Lists.newArrayList())).add(lv.name());
diff -bur namedTargetSrc/net/minecraft/client/render/entity/EntityRenderDispatcher.java namedSrc/net/minecraft/client/render/entity/EntityRenderDispatcher.java
--- namedTargetSrc/net/minecraft/client/render/entity/EntityRenderDispatcher.java	2023-08-09 03:13:11.021605060 +0000
+++ namedSrc/net/minecraft/client/render/entity/EntityRenderDispatcher.java	2023-08-09 03:11:40.744877851 +0000
@@ -189,7 +189,7 @@
     */
    public <T extends Entity> EntityRenderer<? super T> getRenderer(T entity) {
       if (entity instanceof AbstractClientPlayerEntity lv) {
-         C_idvschhb.C_hdrocqaw lv2 = lv.m_kzmhnjvr().model();
+         C_idvschhb.C_hdrocqaw lv2 = lv.getSkin().model();
          EntityRenderer<? extends PlayerEntity> lv3 = (EntityRenderer)this.modelRenderers.get(lv2);
          return lv3 != null ? lv3 : (EntityRenderer)this.modelRenderers.get(C_idvschhb.C_hdrocqaw.WIDE);
       } else {
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/CapeFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/CapeFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/CapeFeatureRenderer.java	2023-08-09 03:13:11.181606047 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/CapeFeatureRenderer.java	2023-08-09 03:11:40.960879853 +0000
@@ -38,7 +38,7 @@
       MatrixStack arg, VertexConsumerProvider arg2, int i, AbstractClientPlayerEntity arg3, float f, float g, float h, float j, float k, float l
    ) {
       if (!arg3.isInvisible() && arg3.isPartVisible(PlayerModelPart.CAPE)) {
-         C_idvschhb lv = arg3.m_kzmhnjvr();
+         C_idvschhb lv = arg3.getSkin();
          if (lv.capeTexture() != null) {
             ItemStack lv2 = arg3.getEquippedStack(EquipmentSlot.CHEST);
             if (!lv2.isOf(Items.ELYTRA)) {
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/Deadmau5FeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/Deadmau5FeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/Deadmau5FeatureRenderer.java	2023-08-09 03:13:11.081605430 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/Deadmau5FeatureRenderer.java	2023-08-09 03:11:40.824878592 +0000
@@ -33,7 +33,7 @@
       MatrixStack arg, VertexConsumerProvider arg2, int i, AbstractClientPlayerEntity arg3, float f, float g, float h, float j, float k, float l
    ) {
       if ("deadmau5".equals(arg3.getName().getString()) && !arg3.isInvisible()) {
-         VertexConsumer lv = arg2.getBuffer(RenderLayer.getEntitySolid(arg3.m_kzmhnjvr().texture()));
+         VertexConsumer lv = arg2.getBuffer(RenderLayer.getEntitySolid(arg3.getSkin().texture()));
          int m = LivingEntityRenderer.getOverlay(arg3, 0.0F);
 
          for (int n = 0; n < 2; ++n) {
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/ElytraFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/ElytraFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/ElytraFeatureRenderer.java	2023-08-09 03:13:11.121605677 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/ElytraFeatureRenderer.java	2023-08-09 03:11:40.876879074 +0000
@@ -56,7 +56,7 @@
       if (lv.isOf(Items.ELYTRA)) {
          Identifier lv4;
          if (arg3 instanceof AbstractClientPlayerEntity lv2) {
-            C_idvschhb lv3 = lv2.m_kzmhnjvr();
+            C_idvschhb lv3 = lv2.getSkin();
             if (lv3.elytraTexture() != null) {
                lv4 = lv3.elytraTexture();
             } else if (lv3.capeTexture() != null && lv2.isPartVisible(PlayerModelPart.CAPE)) {
diff -bur namedTargetSrc/net/minecraft/client/render/entity/PlayerEntityRenderer.java namedSrc/net/minecraft/client/render/entity/PlayerEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/PlayerEntityRenderer.java	2023-08-09 03:13:11.153605874 +0000
+++ namedSrc/net/minecraft/client/render/entity/PlayerEntityRenderer.java	2023-08-09 03:11:40.928879556 +0000
@@ -26,11 +26,11 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.scoreboard.Scoreboard;
+import net.minecraft.scoreboard.ScoreboardDisplaySlot;
 import net.minecraft.scoreboard.ScoreboardObjective;
 import net.minecraft.scoreboard.ScoreboardPlayerScore;
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_oakvluoh;
 import net.minecraft.util.Arm;
 import net.minecraft.util.Hand;
 import net.minecraft.util.Identifier;
@@ -173,7 +173,7 @@
     * @mapping {@literal named getTexture Lnet/minecraft/client/render/entity/PlayerEntityRenderer;getTexture(Lnet/minecraft/client/network/AbstractClientPlayerEntity;)Lnet/minecraft/util/Identifier;}
     */
    public Identifier getTexture(AbstractClientPlayerEntity arg) {
-      return arg.m_kzmhnjvr().texture();
+      return arg.getSkin().texture();
    }
 
    /**
@@ -194,7 +194,7 @@
       arg3.push();
       if (d < 100.0) {
          Scoreboard lv = arg.getScoreboard();
-         ScoreboardObjective lv2 = lv.getObjectiveForSlot(C_oakvluoh.BELOW_NAME);
+         ScoreboardObjective lv2 = lv.getObjectiveForSlot(ScoreboardDisplaySlot.BELOW_NAME);
          if (lv2 != null) {
             ScoreboardPlayerScore lv3 = lv.getPlayerScore(arg.getEntityName(), lv2);
             super.renderLabelIfPresent(
@@ -238,7 +238,7 @@
       lv.leaningPitch = 0.0F;
       lv.setAngles(player, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F);
       arm.pitch = 0.0F;
-      Identifier lv2 = player.m_kzmhnjvr().texture();
+      Identifier lv2 = player.getSkin().texture();
       arm.render(matrices, vertexConsumers.getBuffer(RenderLayer.getEntitySolid(lv2)), light, OverlayTexture.DEFAULT_UV);
       sleeve.pitch = 0.0F;
       sleeve.render(matrices, vertexConsumers.getBuffer(RenderLayer.getEntityTranslucent(lv2)), light, OverlayTexture.DEFAULT_UV);
diff -bur namedTargetSrc/net/minecraft/command/argument/RegistryEntryArgumentType.java namedSrc/net/minecraft/command/argument/RegistryEntryArgumentType.java
--- namedTargetSrc/net/minecraft/command/argument/RegistryEntryArgumentType.java	2023-08-09 03:13:11.105605578 +0000
+++ namedSrc/net/minecraft/command/argument/RegistryEntryArgumentType.java	2023-08-09 03:11:40.856878889 +0000
@@ -213,7 +213,7 @@
        * @mapping {@literal named deserializeFromNetwork Lnet/minecraft/command/argument/RegistryEntryArgumentType$TypeInfo;deserializeFromNetwork(Lnet/minecraft/network/PacketByteBuf;)Lnet/minecraft/command/argument/RegistryEntryArgumentType$TypeInfo$Template;}
        */
       public RegistryEntryArgumentType.TypeInfo<T>.Template deserializeFromNetwork(PacketByteBuf arg) {
-         return new RegistryEntryArgumentType.TypeInfo.Template(arg.m_aiozlifw());
+         return new RegistryEntryArgumentType.TypeInfo.Template(arg.readRegistryKey());
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/command/argument/RegistryEntryOrTagArgument.java namedSrc/net/minecraft/command/argument/RegistryEntryOrTagArgument.java
--- namedTargetSrc/net/minecraft/command/argument/RegistryEntryOrTagArgument.java	2023-08-09 03:13:11.017605036 +0000
+++ namedSrc/net/minecraft/command/argument/RegistryEntryOrTagArgument.java	2023-08-09 03:11:40.740877813 +0000
@@ -201,7 +201,7 @@
        * @mapping {@literal named deserializeFromNetwork Lnet/minecraft/command/argument/RegistryEntryOrTagArgument$Info;deserializeFromNetwork(Lnet/minecraft/network/PacketByteBuf;)Lnet/minecraft/command/argument/RegistryEntryOrTagArgument$Info$Template;}
        */
       public RegistryEntryOrTagArgument.Info<T>.Template deserializeFromNetwork(PacketByteBuf arg) {
-         return new RegistryEntryOrTagArgument.Info.Template(arg.m_aiozlifw());
+         return new RegistryEntryOrTagArgument.Info.Template(arg.readRegistryKey());
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/command/argument/RegistryKeyOrTagKeyResult.java namedSrc/net/minecraft/command/argument/RegistryKeyOrTagKeyResult.java
--- namedTargetSrc/net/minecraft/command/argument/RegistryKeyOrTagKeyResult.java	2023-08-09 03:13:11.117605652 +0000
+++ namedSrc/net/minecraft/command/argument/RegistryKeyOrTagKeyResult.java	2023-08-09 03:11:40.868879000 +0000
@@ -129,7 +129,7 @@
        * @mapping {@literal named deserializeFromNetwork Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult$Info;deserializeFromNetwork(Lnet/minecraft/network/PacketByteBuf;)Lnet/minecraft/command/argument/RegistryKeyOrTagKeyResult$Info$Template;}
        */
       public RegistryKeyOrTagKeyResult.Info<T>.Template deserializeFromNetwork(PacketByteBuf arg) {
-         return new RegistryKeyOrTagKeyResult.Info.Template(arg.m_aiozlifw());
+         return new RegistryKeyOrTagKeyResult.Info.Template(arg.readRegistryKey());
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/command/argument/ResourceKeyArgument.java namedSrc/net/minecraft/command/argument/ResourceKeyArgument.java
--- namedTargetSrc/net/minecraft/command/argument/ResourceKeyArgument.java	2023-08-09 03:13:11.101605554 +0000
+++ namedSrc/net/minecraft/command/argument/ResourceKeyArgument.java	2023-08-09 03:11:40.852878852 +0000
@@ -182,7 +182,7 @@
        * @mapping {@literal named deserializeFromNetwork Lnet/minecraft/command/argument/ResourceKeyArgument$Info;deserializeFromNetwork(Lnet/minecraft/network/PacketByteBuf;)Lnet/minecraft/command/argument/ResourceKeyArgument$Info$Template;}
        */
       public ResourceKeyArgument.Info<T>.Template deserializeFromNetwork(PacketByteBuf arg) {
-         return new ResourceKeyArgument.Info.Template(arg.m_aiozlifw());
+         return new ResourceKeyArgument.Info.Template(arg.readRegistryKey());
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/command/argument/ScoreboardSlotArgumentType.java namedSrc/net/minecraft/command/argument/ScoreboardSlotArgumentType.java
--- namedTargetSrc/net/minecraft/command/argument/ScoreboardSlotArgumentType.java	2023-08-09 03:13:11.133605751 +0000
+++ namedSrc/net/minecraft/command/argument/ScoreboardSlotArgumentType.java	2023-08-09 03:11:40.888879185 +0000
@@ -11,15 +11,15 @@
 import java.util.Collection;
 import java.util.concurrent.CompletableFuture;
 import net.minecraft.command.CommandSource;
+import net.minecraft.scoreboard.ScoreboardDisplaySlot;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_oakvluoh;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_iualcntr}
  * @mapping {@literal named net/minecraft/command/argument/ScoreboardSlotArgumentType}
  */
-public class ScoreboardSlotArgumentType implements ArgumentType<C_oakvluoh> {
+public class ScoreboardSlotArgumentType implements ArgumentType<ScoreboardDisplaySlot> {
    /**
     * @mapping {@literal hashed f_ravjncyo Lnet/minecraft/unmapped/C_iualcntr;f_ravjncyo:Ljava/util/Collection;}
     * @mapping {@literal named EXAMPLES Lnet/minecraft/command/argument/ScoreboardSlotArgumentType;EXAMPLES:Ljava/util/Collection;}
@@ -49,19 +49,19 @@
 
    /**
     * @mapping {@literal hashed m_xetmavcj Lnet/minecraft/unmapped/C_iualcntr;m_xetmavcj(Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/unmapped/C_oakvluoh;}
-    * @mapping {@literal named getScoreboardSlot Lnet/minecraft/command/argument/ScoreboardSlotArgumentType;getScoreboardSlot(Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/unmapped/C_oakvluoh;}
+    * @mapping {@literal named getScoreboardSlot Lnet/minecraft/command/argument/ScoreboardSlotArgumentType;getScoreboardSlot(Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/scoreboard/ScoreboardDisplaySlot;}
     */
-   public static C_oakvluoh getScoreboardSlot(CommandContext<ServerCommandSource> context, String name) {
-      return context.getArgument(name, C_oakvluoh.class);
+   public static ScoreboardDisplaySlot getScoreboardSlot(CommandContext<ServerCommandSource> context, String name) {
+      return context.getArgument(name, ScoreboardDisplaySlot.class);
    }
 
    /**
     * @mapping {@literal hashed m_baezuxrb Lnet/minecraft/unmapped/C_iualcntr;m_baezuxrb(Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/unmapped/C_oakvluoh;}
-    * @mapping {@literal named parse Lnet/minecraft/command/argument/ScoreboardSlotArgumentType;parse(Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/unmapped/C_oakvluoh;}
+    * @mapping {@literal named parse Lnet/minecraft/command/argument/ScoreboardSlotArgumentType;parse(Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/scoreboard/ScoreboardDisplaySlot;}
     */
-   public C_oakvluoh parse(StringReader stringReader) throws CommandSyntaxException {
+   public ScoreboardDisplaySlot parse(StringReader stringReader) throws CommandSyntaxException {
       String string = stringReader.readUnquotedString();
-      C_oakvluoh lv = (C_oakvluoh)C_oakvluoh.f_zzsgiezz.get(string);
+      ScoreboardDisplaySlot lv = (ScoreboardDisplaySlot)ScoreboardDisplaySlot.CODEC.get(string);
       if (lv == null) {
          throw INVALID_SLOT_EXCEPTION.create(string);
       } else {
@@ -75,7 +75,7 @@
     */
    @Override
    public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder) {
-      return CommandSource.suggestMatching(Arrays.stream(C_oakvluoh.values()).map(C_oakvluoh::asString), builder);
+      return CommandSource.suggestMatching(Arrays.stream(ScoreboardDisplaySlot.values()).map(ScoreboardDisplaySlot::asString), builder);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/network/ClientConnection.java namedSrc/net/minecraft/network/ClientConnection.java
--- namedTargetSrc/net/minecraft/network/ClientConnection.java	2023-08-09 03:13:11.109605603 +0000
+++ namedSrc/net/minecraft/network/ClientConnection.java	2023-08-09 03:11:40.864878963 +0000
@@ -47,8 +47,6 @@
 import net.minecraft.network.packet.s2c.login.LoginDisconnectS2CPacket;
 import net.minecraft.network.packet.s2c.play.DisconnectS2CPacket;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_ofiswvvz;
-import net.minecraft.unmapped.C_uxoyljpb;
 import net.minecraft.util.Util;
 import net.minecraft.util.math.MathHelper;
 import org.apache.commons.lang3.Validate;
@@ -103,13 +101,15 @@
     */
    public static final Marker PACKET_SENT_MARKER = Util.make(MarkerFactory.getMarker("PACKET_SENT"), marker -> marker.add(NETWORK_PACKETS_MARKER));
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_tealfggb Lnet/minecraft/unmapped/C_oasmcckk;f_tealfggb:Lio/netty/util/AttributeKey;}
+    * @mapping {@literal named C2S_PROTOCOL_KEY Lnet/minecraft/network/ClientConnection;C2S_PROTOCOL_KEY:Lio/netty/util/AttributeKey;}
     */
-   public static final AttributeKey<NetworkState.C_zzcdyzpt<?>> f_tealfggb = AttributeKey.valueOf("serverbound_protocol");
+   public static final AttributeKey<NetworkState.PacketHandler<?>> C2S_PROTOCOL_KEY = AttributeKey.valueOf("serverbound_protocol");
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ltsvsynv Lnet/minecraft/unmapped/C_oasmcckk;f_ltsvsynv:Lio/netty/util/AttributeKey;}
+    * @mapping {@literal named S2C_PROTOCOL_KEY Lnet/minecraft/network/ClientConnection;S2C_PROTOCOL_KEY:Lio/netty/util/AttributeKey;}
     */
-   public static final AttributeKey<NetworkState.C_zzcdyzpt<?>> f_ltsvsynv = AttributeKey.valueOf("clientbound_protocol");
+   public static final AttributeKey<NetworkState.PacketHandler<?>> S2C_PROTOCOL_KEY = AttributeKey.valueOf("clientbound_protocol");
    /**
     * @mapping {@literal hashed f_hudxxxbp Lnet/minecraft/unmapped/C_oasmcckk;f_hudxxxbp:Ljava/util/function/Supplier;}
     * @mapping {@literal named CLIENT_IO_GROUP Lnet/minecraft/network/ClientConnection;CLIENT_IO_GROUP:Ljava/util/function/Supplier;}
@@ -139,9 +139,10 @@
     */
    private final NetworkSide side;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_lafevvyl Lnet/minecraft/unmapped/C_oasmcckk;f_lafevvyl:Ljava/util/Queue;}
+    * @mapping {@literal named queuedTasks Lnet/minecraft/network/ClientConnection;queuedTasks:Ljava/util/Queue;}
     */
-   private final Queue<Consumer<ClientConnection>> f_lafevvyl = Queues.<Consumer<ClientConnection>>newConcurrentLinkedQueue();
+   private final Queue<Consumer<ClientConnection>> queuedTasks = Queues.<Consumer<ClientConnection>>newConcurrentLinkedQueue();
    /**
     * @mapping {@literal hashed f_kawdlrjp Lnet/minecraft/unmapped/C_oasmcckk;f_kawdlrjp:Lio/netty/channel/Channel;}
     * @mapping {@literal named channel Lnet/minecraft/network/ClientConnection;channel:Lio/netty/channel/Channel;}
@@ -153,10 +154,11 @@
     */
    private SocketAddress address;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_naljjxui Lnet/minecraft/unmapped/C_oasmcckk;f_naljjxui:Lnet/minecraft/unmapped/C_tkgdawqw;}
+    * @mapping {@literal named disconnectListener Lnet/minecraft/network/ClientConnection;disconnectListener:Lnet/minecraft/network/listener/PacketListener;}
     */
    @Nullable
-   private volatile PacketListener f_naljjxui;
+   private volatile PacketListener disconnectListener;
    /**
     * @mapping {@literal hashed f_ucdtbtsq Lnet/minecraft/unmapped/C_oasmcckk;f_ucdtbtsq:Lnet/minecraft/unmapped/C_tkgdawqw;}
     * @mapping {@literal named packetListener Lnet/minecraft/network/ClientConnection;packetListener:Lnet/minecraft/network/listener/PacketListener;}
@@ -239,11 +241,12 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_cmmddozg Lnet/minecraft/unmapped/C_oasmcckk;m_cmmddozg(Lio/netty/channel/Channel;)V}
+    * @mapping {@literal named setProtocolAttributes Lnet/minecraft/network/ClientConnection;setProtocolAttributes(Lio/netty/channel/Channel;)V}
     */
-   public static void m_cmmddozg(Channel channel) {
-      channel.attr(f_tealfggb).set(NetworkState.HANDSHAKING.m_xyqoenxy(NetworkSide.S2C));
-      channel.attr(f_ltsvsynv).set(NetworkState.HANDSHAKING.m_xyqoenxy(NetworkSide.C2S));
+   public static void setProtocolAttributes(Channel channel) {
+      channel.attr(C2S_PROTOCOL_KEY).set(NetworkState.HANDSHAKING.getHandler(NetworkSide.S2C));
+      channel.attr(S2C_PROTOCOL_KEY).set(NetworkState.HANDSHAKING.getHandler(NetworkSide.C2S));
    }
 
    /**
@@ -275,7 +278,7 @@
                if (bl) {
                   LOGGER.debug("Failed to sent packet", ex);
                   if (this.getOppositeSide() == NetworkSide.C2S) {
-                     NetworkState lv2 = this.channel.attr(f_ltsvsynv).get().m_qfglzfxi();
+                     NetworkState lv2 = this.channel.attr(S2C_PROTOCOL_KEY).get().getState();
                      Packet<?> lv3 = (Packet<?>)(lv2 == NetworkState.LOGIN ? new LoginDisconnectS2CPacket(lv) : new DisconnectS2CPacket(lv));
                      this.send(lv3, PacketSendListener.alwaysRun(() -> this.disconnect(lv)));
                   } else {
@@ -302,7 +305,7 @@
          if (lv == null) {
             throw new IllegalStateException("Received a packet before the packet listener was initialized");
          } else {
-            if (lv.m_yyjbzspg(arg)) {
+            if (lv.shouldAccept(arg)) {
                try {
                   handlePacket(arg, lv);
                } catch (OffThreadException var5) {
@@ -328,16 +331,18 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ayigybdt Lnet/minecraft/unmapped/C_oasmcckk;m_ayigybdt()V}
+    * @mapping {@literal named disableAutoReload Lnet/minecraft/network/ClientConnection;disableAutoReload()V}
     */
-   public void m_ayigybdt() {
+   public void disableAutoReload() {
       this.channel.config().setAutoRead(false);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_yimhdukv Lnet/minecraft/unmapped/C_oasmcckk;m_yimhdukv()V}
+    * @mapping {@literal named enableAutoReload Lnet/minecraft/network/ClientConnection;enableAutoReload()V}
     */
-   public void m_yimhdukv() {
+   public void enableAutoReload() {
       this.channel.config().setAutoRead(true);
    }
 
@@ -353,67 +358,72 @@
     */
    public void setPacketListener(PacketListener listener) {
       Validate.notNull(listener, "packetListener");
-      NetworkSide lv = listener.m_pnpgkoqp();
+      NetworkSide lv = listener.getSide();
       if (lv != this.side) {
          throw new IllegalStateException("Trying to set listener for wrong side: connection is " + this.side + ", but listener is " + lv);
       } else {
-         NetworkState lv2 = listener.m_eqgvuckk();
-         NetworkState lv3 = this.channel.attr(m_dinouaaw(lv)).get().m_qfglzfxi();
+         NetworkState lv2 = listener.getState();
+         NetworkState lv3 = this.channel.attr(getProtocolKey(lv)).get().getState();
          if (lv3 != lv2) {
             throw new IllegalStateException(
-               "Trying to set listener for protocol " + lv2.m_faxdemrm() + ", but current " + lv + " protocol is " + lv3.m_faxdemrm()
+               "Trying to set listener for protocol " + lv2.getStateId() + ", but current " + lv + " protocol is " + lv3.getStateId()
             );
          } else {
             this.packetListener = listener;
-            this.f_naljjxui = null;
+            this.disconnectListener = null;
          }
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_kxmmachs Lnet/minecraft/unmapped/C_oasmcckk;m_kxmmachs(Lnet/minecraft/unmapped/C_tkgdawqw;)V}
+    * @mapping {@literal named setHandshakeListener Lnet/minecraft/network/ClientConnection;setHandshakeListener(Lnet/minecraft/network/listener/PacketListener;)V}
     */
-   public void m_kxmmachs(PacketListener arg) {
+   public void setHandshakeListener(PacketListener listener) {
       if (this.packetListener != null) {
          throw new IllegalStateException("Listener already set");
-      } else if (this.side == NetworkSide.S2C && arg.m_pnpgkoqp() == NetworkSide.S2C && arg.m_eqgvuckk() == NetworkState.HANDSHAKING) {
-         this.packetListener = arg;
+      } else if (this.side == NetworkSide.S2C && listener.getSide() == NetworkSide.S2C && listener.getState() == NetworkState.HANDSHAKING) {
+         this.packetListener = listener;
       } else {
          throw new IllegalStateException("Invalid initial listener");
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_qoorbrdh Lnet/minecraft/unmapped/C_oasmcckk;m_qoorbrdh(Ljava/lang/String;ILnet/minecraft/unmapped/C_nyzvjqyd;)V}
+    * @mapping {@literal named connect Lnet/minecraft/network/ClientConnection;connect(Ljava/lang/String;ILnet/minecraft/network/listener/ClientQueryPacketListener;)V}
     */
-   public void m_qoorbrdh(String string, int i, ClientQueryPacketListener arg) {
-      this.m_gwpixgaq(string, i, arg, C_uxoyljpb.STATUS);
+   public void connect(String address, int port, ClientQueryPacketListener listener) {
+      this.connect(address, port, listener, ConnectionIntent.STATUS);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_myzbxovj Lnet/minecraft/unmapped/C_oasmcckk;m_myzbxovj(Ljava/lang/String;ILnet/minecraft/unmapped/C_jsvwwjov;)V}
+    * @mapping {@literal named connect Lnet/minecraft/network/ClientConnection;connect(Ljava/lang/String;ILnet/minecraft/network/listener/ClientLoginPacketListener;)V}
     */
-   public void m_myzbxovj(String string, int i, ClientLoginPacketListener arg) {
-      this.m_gwpixgaq(string, i, arg, C_uxoyljpb.LOGIN);
+   public void connect(String address, int port, ClientLoginPacketListener listener) {
+      this.connect(address, port, listener, ConnectionIntent.LOGIN);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_gwpixgaq Lnet/minecraft/unmapped/C_oasmcckk;m_gwpixgaq(Ljava/lang/String;ILnet/minecraft/unmapped/C_tkgdawqw;Lnet/minecraft/unmapped/C_uxoyljpb;)V}
+    * @mapping {@literal named connect Lnet/minecraft/network/ClientConnection;connect(Ljava/lang/String;ILnet/minecraft/network/listener/PacketListener;Lnet/minecraft/network/ConnectionIntent;)V}
     */
-   private void m_gwpixgaq(String string, int i, PacketListener arg, C_uxoyljpb arg2) {
-      this.f_naljjxui = arg;
-      this.m_fqnxiapg(arg3 -> {
-         arg3.m_ebhlhyxr(arg2);
-         this.setPacketListener(arg);
-         arg3.sendImmediately(new HandshakeC2SPacket(SharedConstants.getGameVersion().getProtocolVersion(), string, i, arg2), null, true);
+   private void connect(String address, int port, PacketListener listener, ConnectionIntent intent) {
+      this.disconnectListener = listener;
+      this.submit(arg3 -> {
+         arg3.setS2CPacketHandler(intent);
+         this.setPacketListener(listener);
+         arg3.sendImmediately(new HandshakeC2SPacket(SharedConstants.getGameVersion().getProtocolVersion(), address, port, intent), null, true);
       });
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ebhlhyxr Lnet/minecraft/unmapped/C_oasmcckk;m_ebhlhyxr(Lnet/minecraft/unmapped/C_uxoyljpb;)V}
+    * @mapping {@literal named setS2CPacketHandler Lnet/minecraft/network/ClientConnection;setS2CPacketHandler(Lnet/minecraft/network/ConnectionIntent;)V}
     */
-   public void m_ebhlhyxr(C_uxoyljpb arg) {
-      this.channel.attr(f_ltsvsynv).set(arg.m_xmbsvuou().m_xyqoenxy(NetworkSide.C2S));
+   public void setS2CPacketHandler(ConnectionIntent intent) {
+      this.channel.attr(S2C_PROTOCOL_KEY).set(intent.getState().getHandler(NetworkSide.C2S));
    }
 
    /**
@@ -425,10 +435,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_lpkwetce Lnet/minecraft/unmapped/C_oasmcckk;m_lpkwetce(Lnet/minecraft/unmapped/C_zyjtrjrl;)V}
+    * @mapping {@literal named sendWithoutFlush Lnet/minecraft/network/ClientConnection;sendWithoutFlush(Lnet/minecraft/network/packet/Packet;)V}
     */
-   public void m_lpkwetce(Packet<?> arg) {
-      this.m_hmamwxog(arg, null);
+   public void sendWithoutFlush(Packet<?> packet) {
+      this.sendWithoutFlush(packet, null);
    }
 
    /**
@@ -436,37 +447,40 @@
     * @mapping {@literal named send Lnet/minecraft/network/ClientConnection;send(Lnet/minecraft/network/packet/Packet;Lnet/minecraft/network/PacketSendListener;)V}
     */
    public void send(Packet<?> packet, @Nullable PacketSendListener listener) {
-      this.m_zbfykobd(packet, listener, true);
+      this.send(packet, listener, true);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_hmamwxog Lnet/minecraft/unmapped/C_oasmcckk;m_hmamwxog(Lnet/minecraft/unmapped/C_zyjtrjrl;Lnet/minecraft/unmapped/C_zddpfpkk;)V}
+    * @mapping {@literal named sendWithoutFlush Lnet/minecraft/network/ClientConnection;sendWithoutFlush(Lnet/minecraft/network/packet/Packet;Lnet/minecraft/network/PacketSendListener;)V}
     */
-   public void m_hmamwxog(Packet<?> arg, @Nullable PacketSendListener arg2) {
-      this.m_zbfykobd(arg, arg2, false);
+   public void sendWithoutFlush(Packet<?> packet, @Nullable PacketSendListener sendListener) {
+      this.send(packet, sendListener, false);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_zbfykobd Lnet/minecraft/unmapped/C_oasmcckk;m_zbfykobd(Lnet/minecraft/unmapped/C_zyjtrjrl;Lnet/minecraft/unmapped/C_zddpfpkk;Z)V}
+    * @mapping {@literal named send Lnet/minecraft/network/ClientConnection;send(Lnet/minecraft/network/packet/Packet;Lnet/minecraft/network/PacketSendListener;Z)V}
     */
-   public void m_zbfykobd(Packet<?> arg, @Nullable PacketSendListener arg2, boolean bl) {
+   public void send(Packet<?> packet, @Nullable PacketSendListener sendListener, boolean flush) {
       if (this.isOpen()) {
          this.sendQueuedPackets();
-         this.sendImmediately(arg, arg2, bl);
+         this.sendImmediately(packet, sendListener, flush);
       } else {
-         this.f_lafevvyl.add((Consumer)arg3 -> arg3.sendImmediately(arg, arg2, bl));
+         this.queuedTasks.add((Consumer)connection -> connection.sendImmediately(packet, sendListener, flush));
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_fqnxiapg Lnet/minecraft/unmapped/C_oasmcckk;m_fqnxiapg(Ljava/util/function/Consumer;)V}
+    * @mapping {@literal named submit Lnet/minecraft/network/ClientConnection;submit(Ljava/util/function/Consumer;)V}
     */
-   public void m_fqnxiapg(Consumer<ClientConnection> consumer) {
+   public void submit(Consumer<ClientConnection> task) {
       if (this.isOpen()) {
          this.sendQueuedPackets();
-         consumer.accept(this);
+         task.accept(this);
       } else {
-         this.f_lafevvyl.add(consumer);
+         this.queuedTasks.add(task);
       }
    }
 
@@ -474,12 +488,12 @@
     * @mapping {@literal hashed m_bgcagbfi Lnet/minecraft/unmapped/C_oasmcckk;m_bgcagbfi(Lnet/minecraft/unmapped/C_zyjtrjrl;Lnet/minecraft/unmapped/C_zddpfpkk;Z)V}
     * @mapping {@literal named sendImmediately Lnet/minecraft/network/ClientConnection;sendImmediately(Lnet/minecraft/network/packet/Packet;Lnet/minecraft/network/PacketSendListener;Z)V}
     */
-   private void sendImmediately(Packet<?> packet, @Nullable PacketSendListener listener, boolean bl) {
+   private void sendImmediately(Packet<?> packet, @Nullable PacketSendListener listener, boolean flush) {
       ++this.packetsSentCounter;
       if (this.channel.eventLoop().inEventLoop()) {
-         this.sendInternal(packet, listener, bl);
+         this.sendInternal(packet, listener, flush);
       } else {
-         this.channel.eventLoop().execute(() -> this.sendInternal(packet, listener, bl));
+         this.channel.eventLoop().execute(() -> this.sendInternal(packet, listener, flush));
       }
    }
 
@@ -487,8 +501,8 @@
     * @mapping {@literal hashed m_vyytglie Lnet/minecraft/unmapped/C_oasmcckk;m_vyytglie(Lnet/minecraft/unmapped/C_zyjtrjrl;Lnet/minecraft/unmapped/C_zddpfpkk;Z)V}
     * @mapping {@literal named sendInternal Lnet/minecraft/network/ClientConnection;sendInternal(Lnet/minecraft/network/packet/Packet;Lnet/minecraft/network/PacketSendListener;Z)V}
     */
-   private void sendInternal(Packet<?> packet, @Nullable PacketSendListener listener, boolean bl) {
-      ChannelFuture channelFuture = bl ? this.channel.writeAndFlush(packet) : this.channel.write(packet);
+   private void sendInternal(Packet<?> packet, @Nullable PacketSendListener listener, boolean flush) {
+      ChannelFuture channelFuture = flush ? this.channel.writeAndFlush(packet) : this.channel.write(packet);
       if (listener != null) {
          channelFuture.addListener(future -> {
             if (future.isSuccess()) {
@@ -507,20 +521,22 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_sprgohsj Lnet/minecraft/unmapped/C_oasmcckk;m_sprgohsj()V}
+    * @mapping {@literal named flush Lnet/minecraft/network/ClientConnection;flush()V}
     */
-   public void m_sprgohsj() {
+   public void flush() {
       if (this.isOpen()) {
-         this.m_faopouol();
+         this.flushInternal();
       } else {
-         this.f_lafevvyl.add(ClientConnection::m_faopouol);
+         this.queuedTasks.add(ClientConnection::flushInternal);
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_faopouol Lnet/minecraft/unmapped/C_oasmcckk;m_faopouol()V}
+    * @mapping {@literal named flushInternal Lnet/minecraft/network/ClientConnection;flushInternal()V}
     */
-   private void m_faopouol() {
+   private void flushInternal() {
       if (this.channel.eventLoop().inEventLoop()) {
          this.channel.flush();
       } else {
@@ -529,12 +545,13 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_dinouaaw Lnet/minecraft/unmapped/C_oasmcckk;m_dinouaaw(Lnet/minecraft/unmapped/C_exeqxqdd;)Lio/netty/util/AttributeKey;}
+    * @mapping {@literal named getProtocolKey Lnet/minecraft/network/ClientConnection;getProtocolKey(Lnet/minecraft/network/NetworkSide;)Lio/netty/util/AttributeKey;}
     */
-   private static AttributeKey<NetworkState.C_zzcdyzpt<?>> m_dinouaaw(NetworkSide arg) {
-      return switch (arg) {
-         case C2S -> f_ltsvsynv;
-         case S2C -> f_tealfggb;
+   private static AttributeKey<NetworkState.PacketHandler<?>> getProtocolKey(NetworkSide side) {
+      return switch (side) {
+         case C2S -> S2C_PROTOCOL_KEY;
+         case S2C -> C2S_PROTOCOL_KEY;
       };
    }
 
@@ -544,9 +561,9 @@
     */
    private void sendQueuedPackets() {
       if (this.channel != null && this.channel.isOpen()) {
-         synchronized (this.f_lafevvyl) {
+         synchronized (this.queuedTasks) {
             Consumer<ClientConnection> consumer;
-            while ((consumer = (Consumer)this.f_lafevvyl.poll()) != null) {
+            while ((consumer = (Consumer)this.queuedTasks.poll()) != null) {
                consumer.accept(this);
             }
          }
@@ -597,13 +614,14 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_rvagcspt Lnet/minecraft/unmapped/C_oasmcckk;m_rvagcspt(Z)Ljava/lang/String;}
+    * @mapping {@literal named getLoggableAddress Lnet/minecraft/network/ClientConnection;getLoggableAddress(Z)Ljava/lang/String;}
     */
-   public String m_rvagcspt(boolean bl) {
+   public String getLoggableAddress(boolean logIps) {
       if (this.address == null) {
          return "local";
       } else {
-         return bl ? this.address.toString() : "IP hidden";
+         return logIps ? this.address.toString() : "IP hidden";
       }
    }
 
@@ -685,7 +703,7 @@
           */
          @Override
          protected void initChannel(Channel channel) {
-            ClientConnection.m_cmmddozg(channel);
+            ClientConnection.setProtocolAttributes(channel);
 
             try {
                channel.config().setOption(ChannelOption.TCP_NODELAY, true);
@@ -705,8 +723,8 @@
     */
    public static void addHandlers(ChannelPipeline pipeline, NetworkSide side) {
       NetworkSide lv = side.getOpposite();
-      AttributeKey<NetworkState.C_zzcdyzpt<?>> attributeKey = m_dinouaaw(side);
-      AttributeKey<NetworkState.C_zzcdyzpt<?>> attributeKey2 = m_dinouaaw(lv);
+      AttributeKey<NetworkState.PacketHandler<?>> attributeKey = getProtocolKey(side);
+      AttributeKey<NetworkState.PacketHandler<?>> attributeKey2 = getProtocolKey(lv);
       pipeline.addLast("splitter", new SplitterHandler())
          .addLast("decoder", new DecoderHandler(attributeKey))
          .addLast("prepender", new SizePrepender())
@@ -716,20 +734,22 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_iopaivkv Lnet/minecraft/unmapped/C_oasmcckk;m_iopaivkv(Lio/netty/channel/ChannelPipeline;Lnet/minecraft/unmapped/C_exeqxqdd;)V}
+    * @mapping {@literal named addValidatorInternal Lnet/minecraft/network/ClientConnection;addValidatorInternal(Lio/netty/channel/ChannelPipeline;Lnet/minecraft/network/NetworkSide;)V}
     */
-   private static void m_iopaivkv(ChannelPipeline channelPipeline, NetworkSide arg) {
-      NetworkSide lv = arg.getOpposite();
-      AttributeKey<NetworkState.C_zzcdyzpt<?>> attributeKey = m_dinouaaw(arg);
-      AttributeKey<NetworkState.C_zzcdyzpt<?>> attributeKey2 = m_dinouaaw(lv);
-      channelPipeline.addLast("validator", new C_ofiswvvz(attributeKey, attributeKey2));
+   private static void addValidatorInternal(ChannelPipeline pipeline, NetworkSide side) {
+      NetworkSide lv = side.getOpposite();
+      AttributeKey<NetworkState.PacketHandler<?>> attributeKey = getProtocolKey(side);
+      AttributeKey<NetworkState.PacketHandler<?>> attributeKey2 = getProtocolKey(lv);
+      pipeline.addLast("validator", new PacketFlowValidator(attributeKey, attributeKey2));
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_jfnkfhlj Lnet/minecraft/unmapped/C_oasmcckk;m_jfnkfhlj(Lio/netty/channel/ChannelPipeline;Lnet/minecraft/unmapped/C_exeqxqdd;)V}
+    * @mapping {@literal named addValidator Lnet/minecraft/network/ClientConnection;addValidator(Lio/netty/channel/ChannelPipeline;Lnet/minecraft/network/NetworkSide;)V}
     */
-   public static void m_jfnkfhlj(ChannelPipeline channelPipeline, NetworkSide arg) {
-      m_iopaivkv(channelPipeline, arg);
+   public static void addValidator(ChannelPipeline pipeline, NetworkSide side) {
+      addValidatorInternal(pipeline, side);
    }
 
    /**
@@ -745,9 +765,9 @@
           */
          @Override
          protected void initChannel(Channel channel) {
-            ClientConnection.m_cmmddozg(channel);
+            ClientConnection.setProtocolAttributes(channel);
             ChannelPipeline channelPipeline = channel.pipeline();
-            ClientConnection.m_jfnkfhlj(channelPipeline, NetworkSide.C2S);
+            ClientConnection.addValidator(channelPipeline, NetworkSide.C2S);
             channelPipeline.addLast("packet_handler", lv);
          }
       }).channel(LocalChannel.class).connect(address).syncUninterruptibly();
@@ -867,7 +887,7 @@
          } else {
             this.disconnected = true;
             PacketListener lv = this.getPacketListener();
-            PacketListener lv2 = lv != null ? lv : this.f_naljjxui;
+            PacketListener lv2 = lv != null ? lv : this.disconnectListener;
             if (lv2 != null) {
                Text lv3 = (Text)Objects.requireNonNullElseGet(this.getDisconnectReason(), () -> Text.translatable("multiplayer.disconnect.generic"));
                lv2.onDisconnected(lv3);
Only in namedSrc/net/minecraft/network: ConnectionIntent.java
diff -bur namedTargetSrc/net/minecraft/network/DecoderHandler.java namedSrc/net/minecraft/network/DecoderHandler.java
--- namedTargetSrc/net/minecraft/network/DecoderHandler.java	2023-08-09 03:13:11.025605085 +0000
+++ namedSrc/net/minecraft/network/DecoderHandler.java	2023-08-09 03:11:40.752877925 +0000
@@ -9,7 +9,6 @@
 import java.io.IOException;
 import java.util.List;
 import net.minecraft.network.packet.Packet;
-import net.minecraft.unmapped.C_vlkysaje;
 import net.minecraft.util.profiling.jfr.JvmProfiler;
 import org.slf4j.Logger;
 
@@ -17,22 +16,24 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_anuorqvf}
  * @mapping {@literal named net/minecraft/network/DecoderHandler}
  */
-public class DecoderHandler extends ByteToMessageDecoder implements C_vlkysaje {
+public class DecoderHandler extends ByteToMessageDecoder implements NetworkStateTransitionHandler {
    /**
     * @mapping {@literal hashed f_yxifsiie Lnet/minecraft/unmapped/C_anuorqvf;f_yxifsiie:Lorg/slf4j/Logger;}
     * @mapping {@literal named LOGGER Lnet/minecraft/network/DecoderHandler;LOGGER:Lorg/slf4j/Logger;}
     */
    private static final Logger LOGGER = LogUtils.getLogger();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_vfzgevwc Lnet/minecraft/unmapped/C_anuorqvf;f_vfzgevwc:Lio/netty/util/AttributeKey;}
+    * @mapping {@literal named protocolKey Lnet/minecraft/network/DecoderHandler;protocolKey:Lio/netty/util/AttributeKey;}
     */
-   private final AttributeKey<NetworkState.C_zzcdyzpt<?>> f_vfzgevwc;
+   private final AttributeKey<NetworkState.PacketHandler<?>> protocolKey;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_anuorqvf;<init>(Lio/netty/util/AttributeKey;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/network/DecoderHandler;<init>(Lio/netty/util/AttributeKey;)V}
     */
-   public DecoderHandler(AttributeKey<NetworkState.C_zzcdyzpt<?>> attributeKey) {
-      this.f_vfzgevwc = attributeKey;
+   public DecoderHandler(AttributeKey<NetworkState.PacketHandler<?>> protocolKey) {
+      this.protocolKey = protocolKey;
    }
 
    /**
@@ -43,19 +44,19 @@
    protected void decode(ChannelHandlerContext context, ByteBuf buffer, List<Object> packets) throws Exception {
       int i = buffer.readableBytes();
       if (i != 0) {
-         Attribute<NetworkState.C_zzcdyzpt<?>> attribute = context.channel().attr(this.f_vfzgevwc);
-         NetworkState.C_zzcdyzpt<?> lv = attribute.get();
+         Attribute<NetworkState.PacketHandler<?>> attribute = context.channel().attr(this.protocolKey);
+         NetworkState.PacketHandler<?> lv = attribute.get();
          PacketByteBuf lv2 = new PacketByteBuf(buffer);
          int j = lv2.readVarInt();
-         Packet<?> lv3 = lv.m_ivycqkez(j, lv2);
+         Packet<?> lv3 = lv.createPacket(j, lv2);
          if (lv3 == null) {
             throw new IOException("Bad packet id " + j);
          } else {
-            JvmProfiler.INSTANCE.onPacketReceived(lv.m_qfglzfxi(), j, context.channel().remoteAddress(), i);
+            JvmProfiler.INSTANCE.onPacketReceived(lv.getState(), j, context.channel().remoteAddress(), i);
             if (lv2.readableBytes() > 0) {
                throw new IOException(
                   "Packet "
-                     + lv.m_qfglzfxi().m_faxdemrm()
+                     + lv.getState().getStateId()
                      + "/"
                      + j
                      + " ("
@@ -68,10 +69,10 @@
             } else {
                packets.add(lv3);
                if (LOGGER.isDebugEnabled()) {
-                  LOGGER.debug(ClientConnection.PACKET_RECEIVED_MARKER, " IN: [{}:{}] {}", lv.m_qfglzfxi().m_faxdemrm(), j, lv3.getClass().getName());
+                  LOGGER.debug(ClientConnection.PACKET_RECEIVED_MARKER, " IN: [{}:{}] {}", lv.getState().getStateId(), j, lv3.getClass().getName());
                }
 
-               C_vlkysaje.m_zhivuwqp(attribute, lv3);
+               NetworkStateTransitionHandler.tryTransition(attribute, lv3);
             }
          }
       }
Only in namedSrc/net/minecraft/network: encoding
diff -bur namedTargetSrc/net/minecraft/network/LegacyQueryHandler.java namedSrc/net/minecraft/network/LegacyQueryHandler.java
--- namedTargetSrc/net/minecraft/network/LegacyQueryHandler.java	2023-08-09 03:13:11.113605628 +0000
+++ namedSrc/net/minecraft/network/LegacyQueryHandler.java	2023-08-09 03:11:40.868879000 +0000
@@ -8,8 +8,7 @@
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import java.net.SocketAddress;
 import java.util.Locale;
-import net.minecraft.unmapped.C_izclhiva;
-import net.minecraft.unmapped.C_rmqwqdfp;
+import net.minecraft.util.network.LegacyQueryUtil;
 import org.slf4j.Logger;
 
 /**
@@ -23,15 +22,17 @@
     */
    private static final Logger LOGGER = LogUtils.getLogger();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_wdggkjco Lnet/minecraft/unmapped/C_avdfsszh;f_wdggkjco:Lnet/minecraft/unmapped/C_izclhiva;}
+    * @mapping {@literal named server Lnet/minecraft/network/LegacyQueryHandler;server:Lnet/minecraft/network/QueryableServer;}
     */
-   private final C_izclhiva f_wdggkjco;
+   private final QueryableServer server;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_avdfsszh;<init>(Lnet/minecraft/unmapped/C_izclhiva;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/network/LegacyQueryHandler;<init>(Lnet/minecraft/network/QueryableServer;)V}
     */
-   public LegacyQueryHandler(C_izclhiva arg) {
-      this.f_wdggkjco = arg;
+   public LegacyQueryHandler(QueryableServer server) {
+      this.server = server;
    }
 
    /**
@@ -54,15 +55,15 @@
             int i = byteBuf.readableBytes();
             if (i == 0) {
                LOGGER.debug("Ping: (<1.3.x) from {}", socketAddress);
-               String string = m_oosmvotf(this.f_wdggkjco);
-               reply(ctx, m_ennidrzj(ctx.alloc(), string));
+               String string = createV0Response(this.server);
+               reply(ctx, createLegacyDisconnectPacket(ctx.alloc(), string));
             } else {
                if (byteBuf.readUnsignedByte() != 1) {
                   return;
                }
 
                if (byteBuf.isReadable()) {
-                  if (!m_irydumar(byteBuf)) {
+                  if (!isLegacyQuery(byteBuf)) {
                      return;
                   }
 
@@ -71,8 +72,8 @@
                   LOGGER.debug("Ping: (1.4-1.5.x) from {}", socketAddress);
                }
 
-               String string2 = m_uebdfllr(this.f_wdggkjco);
-               reply(ctx, m_ennidrzj(ctx.alloc(), string2));
+               String string2 = createV1Response(this.server);
+               reply(ctx, createLegacyDisconnectPacket(ctx.alloc(), string2));
             }
 
             byteBuf.release();
@@ -89,27 +90,28 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_irydumar Lnet/minecraft/unmapped/C_avdfsszh;m_irydumar(Lio/netty/buffer/ByteBuf;)Z}
+    * @mapping {@literal named isLegacyQuery Lnet/minecraft/network/LegacyQueryHandler;isLegacyQuery(Lio/netty/buffer/ByteBuf;)Z}
     */
-   private static boolean m_irydumar(ByteBuf byteBuf) {
-      short s = byteBuf.readUnsignedByte();
+   private static boolean isLegacyQuery(ByteBuf buf) {
+      short s = buf.readUnsignedByte();
       if (s != 250) {
          return false;
       } else {
-         String string = C_rmqwqdfp.m_hczwptxm(byteBuf);
+         String string = LegacyQueryUtil.writeString(buf);
          if (!"MC|PingHost".equals(string)) {
             return false;
          } else {
-            int i = byteBuf.readUnsignedShort();
-            if (byteBuf.readableBytes() != i) {
+            int i = buf.readUnsignedShort();
+            if (buf.readableBytes() != i) {
                return false;
             } else {
-               short t = byteBuf.readUnsignedByte();
+               short t = buf.readUnsignedByte();
                if (t < 73) {
                   return false;
                } else {
-                  String string2 = C_rmqwqdfp.m_hczwptxm(byteBuf);
-                  int j = byteBuf.readInt();
+                  String string2 = LegacyQueryUtil.writeString(buf);
+                  int j = buf.readInt();
                   return j <= 65535;
                }
             }
@@ -118,18 +120,26 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_oosmvotf Lnet/minecraft/unmapped/C_avdfsszh;m_oosmvotf(Lnet/minecraft/unmapped/C_izclhiva;)Ljava/lang/String;}
+    * @mapping {@literal named createV0Response Lnet/minecraft/network/LegacyQueryHandler;createV0Response(Lnet/minecraft/network/QueryableServer;)Ljava/lang/String;}
     */
-   private static String m_oosmvotf(C_izclhiva arg) {
-      return String.format(Locale.ROOT, "%s§%d§%d", arg.m_zhlwscbp(), arg.m_ngtuslcn(), arg.m_jlkyffol());
+   private static String createV0Response(QueryableServer server) {
+      return String.format(Locale.ROOT, "%s§%d§%d", server.getVersion(), server.getMaxPlayerCount(), server.getMotd());
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_uebdfllr Lnet/minecraft/unmapped/C_avdfsszh;m_uebdfllr(Lnet/minecraft/unmapped/C_izclhiva;)Ljava/lang/String;}
+    * @mapping {@literal named createV1Response Lnet/minecraft/network/LegacyQueryHandler;createV1Response(Lnet/minecraft/network/QueryableServer;)Ljava/lang/String;}
     */
-   private static String m_uebdfllr(C_izclhiva arg) {
+   private static String createV1Response(QueryableServer server) {
       return String.format(
-         Locale.ROOT, "§1\u0000%d\u0000%s\u0000%s\u0000%d\u0000%d", 127, arg.m_verihzmf(), arg.m_zhlwscbp(), arg.m_ngtuslcn(), arg.m_jlkyffol()
+         Locale.ROOT,
+         "§1\u0000%d\u0000%s\u0000%s\u0000%d\u0000%d",
+         127,
+         server.getPlayerCount(),
+         server.getVersion(),
+         server.getMaxPlayerCount(),
+         server.getMotd()
       );
    }
 
@@ -137,17 +147,18 @@
     * @mapping {@literal hashed m_wzruoctl Lnet/minecraft/unmapped/C_avdfsszh;m_wzruoctl(Lio/netty/channel/ChannelHandlerContext;Lio/netty/buffer/ByteBuf;)V}
     * @mapping {@literal named reply Lnet/minecraft/network/LegacyQueryHandler;reply(Lio/netty/channel/ChannelHandlerContext;Lio/netty/buffer/ByteBuf;)V}
     */
-   private static void reply(ChannelHandlerContext channelHandlerContext, ByteBuf ctx) {
-      channelHandlerContext.pipeline().firstContext().writeAndFlush(ctx).addListener(ChannelFutureListener.CLOSE);
+   private static void reply(ChannelHandlerContext handlerContext, ByteBuf ctx) {
+      handlerContext.pipeline().firstContext().writeAndFlush(ctx).addListener(ChannelFutureListener.CLOSE);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ennidrzj Lnet/minecraft/unmapped/C_avdfsszh;m_ennidrzj(Lio/netty/buffer/ByteBufAllocator;Ljava/lang/String;)Lio/netty/buffer/ByteBuf;}
+    * @mapping {@literal named createLegacyDisconnectPacket Lnet/minecraft/network/LegacyQueryHandler;createLegacyDisconnectPacket(Lio/netty/buffer/ByteBufAllocator;Ljava/lang/String;)Lio/netty/buffer/ByteBuf;}
     */
-   private static ByteBuf m_ennidrzj(ByteBufAllocator byteBufAllocator, String string) {
-      ByteBuf byteBuf = byteBufAllocator.buffer();
+   private static ByteBuf createLegacyDisconnectPacket(ByteBufAllocator bufAllocator, String string) {
+      ByteBuf byteBuf = bufAllocator.buffer();
       byteBuf.writeByte(255);
-      C_rmqwqdfp.m_fysytacf(byteBuf, string);
+      LegacyQueryUtil.readString(byteBuf, string);
       return byteBuf;
    }
 }
Only in namedSrc/net/minecraft/network/listener: ClientCommonPacketListener.java
diff -bur namedTargetSrc/net/minecraft/network/listener/ClientLoginPacketListener.java namedSrc/net/minecraft/network/listener/ClientLoginPacketListener.java
--- namedTargetSrc/net/minecraft/network/listener/ClientLoginPacketListener.java	2023-08-09 03:13:11.061605307 +0000
+++ namedSrc/net/minecraft/network/listener/ClientLoginPacketListener.java	2023-08-09 03:11:40.796878332 +0000
@@ -1,23 +1,23 @@
 package net.minecraft.network.listener;
 
+import net.minecraft.client.listener.ClientPacketListener;
 import net.minecraft.network.NetworkState;
 import net.minecraft.network.packet.s2c.login.LoginCompressionS2CPacket;
 import net.minecraft.network.packet.s2c.login.LoginDisconnectS2CPacket;
 import net.minecraft.network.packet.s2c.login.LoginHelloS2CPacket;
 import net.minecraft.network.packet.s2c.login.LoginQueryRequestS2CPacket;
 import net.minecraft.network.packet.s2c.login.LoginSuccessS2CPacket;
-import net.minecraft.unmapped.C_ifnchbtj;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_jsvwwjov}
  * @mapping {@literal named net/minecraft/network/listener/ClientLoginPacketListener}
  */
-public interface ClientLoginPacketListener extends C_ifnchbtj {
+public interface ClientLoginPacketListener extends ClientPacketListener {
    /**
     * Mapping not found
     */
    @Override
-   default NetworkState m_eqgvuckk() {
+   default NetworkState getState() {
       return NetworkState.LOGIN;
    }
 
diff -bur namedTargetSrc/net/minecraft/network/listener/ClientPlayPacketListener.java namedSrc/net/minecraft/network/listener/ClientPlayPacketListener.java
--- namedTargetSrc/net/minecraft/network/listener/ClientPlayPacketListener.java	2023-08-09 03:13:11.069605356 +0000
+++ namedSrc/net/minecraft/network/listener/ClientPlayPacketListener.java	2023-08-09 03:11:40.808878444 +0000
@@ -14,6 +14,7 @@
 import net.minecraft.network.packet.s2c.play.BossBarUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.CameraEntityUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.ChatMessageS2CPacket;
+import net.minecraft.network.packet.s2c.play.ChunkBatchCompletionS2CPacket;
 import net.minecraft.network.packet.s2c.play.ChunkDataS2CPacket;
 import net.minecraft.network.packet.s2c.play.ChunkDeltaUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.ChunkLoadDistanceUpdateS2CPacket;
@@ -72,6 +73,7 @@
 import net.minecraft.network.packet.s2c.play.ProfileIndependentMessageS2CPacket;
 import net.minecraft.network.packet.s2c.play.RecipeSynchronizationS2CPacket;
 import net.minecraft.network.packet.s2c.play.RecipesUnlockS2CPacket;
+import net.minecraft.network.packet.s2c.play.ReconfigureS2CPacket;
 import net.minecraft.network.packet.s2c.play.ScoreboardDisplayS2CPacket;
 import net.minecraft.network.packet.s2c.play.ScoreboardObjectiveUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.ScoreboardPlayerUpdateS2CPacket;
@@ -85,6 +87,7 @@
 import net.minecraft.network.packet.s2c.play.SimulationDistanceUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.SoundPlayS2CPacket;
 import net.minecraft.network.packet.s2c.play.SoundStopS2CPacket;
+import net.minecraft.network.packet.s2c.play.StartChunkBatchS2CPacket;
 import net.minecraft.network.packet.s2c.play.StatisticsUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.SubtitleS2CPacket;
 import net.minecraft.network.packet.s2c.play.SystemMessageS2CPacket;
@@ -103,10 +106,6 @@
 import net.minecraft.network.packet.s2c.play.WorldEventS2CPacket;
 import net.minecraft.network.packet.s2c.play.WorldTimeUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.WrittenBookOpenS2CPacket;
-import net.minecraft.unmapped.C_bmpbldgo;
-import net.minecraft.unmapped.C_sjvciiwk;
-import net.minecraft.unmapped.C_swtvykbp;
-import net.minecraft.unmapped.C_wyviwobq;
 
 /**
  * A client side packet listener where play stage packets from the server are processed.
@@ -114,12 +113,12 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_rbfddnlp}
  * @mapping {@literal named net/minecraft/network/listener/ClientPlayPacketListener}
  */
-public interface ClientPlayPacketListener extends C_sjvciiwk {
+public interface ClientPlayPacketListener extends ClientCommonPacketListener {
    /**
     * Mapping not found
     */
    @Override
-   default NetworkState m_eqgvuckk() {
+   default NetworkState getState() {
       return NetworkState.PLAY;
    }
 
@@ -740,17 +739,20 @@
    void handleDamageEvent(DamageEventS2CPacket packet);
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ctiivuwr Lnet/minecraft/unmapped/C_rbfddnlp;m_ctiivuwr(Lnet/minecraft/unmapped/C_swtvykbp;)V}
+    * @mapping {@literal named onReconfigure Lnet/minecraft/network/listener/ClientPlayPacketListener;onReconfigure(Lnet/minecraft/network/packet/s2c/play/ReconfigureS2CPacket;)V}
     */
-   void m_ctiivuwr(C_swtvykbp arg);
+   void onReconfigure(ReconfigureS2CPacket packet);
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_zwbicmlf Lnet/minecraft/unmapped/C_rbfddnlp;m_zwbicmlf(Lnet/minecraft/unmapped/C_bmpbldgo;)V}
+    * @mapping {@literal named onStartChunkBatch Lnet/minecraft/network/listener/ClientPlayPacketListener;onStartChunkBatch(Lnet/minecraft/network/packet/s2c/play/StartChunkBatchS2CPacket;)V}
     */
-   void m_zwbicmlf(C_bmpbldgo arg);
+   void onStartChunkBatch(StartChunkBatchS2CPacket packet);
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_slzphwux Lnet/minecraft/unmapped/C_rbfddnlp;m_slzphwux(Lnet/minecraft/unmapped/C_wyviwobq;)V}
+    * @mapping {@literal named onChunkBatchCompletion Lnet/minecraft/network/listener/ClientPlayPacketListener;onChunkBatchCompletion(Lnet/minecraft/network/packet/s2c/play/ChunkBatchCompletionS2CPacket;)V}
     */
-   void m_slzphwux(C_wyviwobq arg);
+   void onChunkBatchCompletion(ChunkBatchCompletionS2CPacket packet);
 }

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

View the diff here (3/3): 
diff -bur namedTargetSrc/net/minecraft/network/listener/ClientQueryPacketListener.java namedSrc/net/minecraft/network/listener/ClientQueryPacketListener.java
--- namedTargetSrc/net/minecraft/network/listener/ClientQueryPacketListener.java	2023-08-09 03:13:11.113605628 +0000
+++ namedSrc/net/minecraft/network/listener/ClientQueryPacketListener.java	2023-08-09 03:11:40.864878963 +0000
@@ -1,20 +1,20 @@
 package net.minecraft.network.listener;
 
+import net.minecraft.client.listener.ClientPacketListener;
 import net.minecraft.network.NetworkState;
 import net.minecraft.network.packet.s2c.query.QueryPongS2CPacket;
 import net.minecraft.network.packet.s2c.query.ServerMetadataS2CPacket;
-import net.minecraft.unmapped.C_ifnchbtj;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_nyzvjqyd}
  * @mapping {@literal named net/minecraft/network/listener/ClientQueryPacketListener}
  */
-public interface ClientQueryPacketListener extends C_ifnchbtj {
+public interface ClientQueryPacketListener extends ClientPacketListener {
    /**
     * Mapping not found
     */
    @Override
-   default NetworkState m_eqgvuckk() {
+   default NetworkState getState() {
       return NetworkState.STATUS;
    }
 
diff -bur namedTargetSrc/net/minecraft/network/listener/PacketListener.java namedSrc/net/minecraft/network/listener/PacketListener.java
--- namedTargetSrc/net/minecraft/network/listener/PacketListener.java	2023-08-09 03:13:11.049605233 +0000
+++ namedSrc/net/minecraft/network/listener/PacketListener.java	2023-08-09 03:11:40.784878221 +0000
@@ -17,14 +17,16 @@
  */
 public interface PacketListener {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_pnpgkoqp Lnet/minecraft/unmapped/C_tkgdawqw;m_pnpgkoqp()Lnet/minecraft/unmapped/C_exeqxqdd;}
+    * @mapping {@literal named getSide Lnet/minecraft/network/listener/PacketListener;getSide()Lnet/minecraft/network/NetworkSide;}
     */
-   NetworkSide m_pnpgkoqp();
+   NetworkSide getSide();
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_eqgvuckk Lnet/minecraft/unmapped/C_tkgdawqw;m_eqgvuckk()Lnet/minecraft/unmapped/C_kxdobmrm;}
+    * @mapping {@literal named getState Lnet/minecraft/network/listener/PacketListener;getState()Lnet/minecraft/network/NetworkState;}
     */
-   NetworkState m_eqgvuckk();
+   NetworkState getState();
 
    /**
     * Called when the connection this listener listens to has disconnected.
@@ -44,9 +46,10 @@
    boolean isConnected();
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_yyjbzspg Lnet/minecraft/unmapped/C_tkgdawqw;m_yyjbzspg(Lnet/minecraft/unmapped/C_zyjtrjrl;)Z}
+    * @mapping {@literal named shouldAccept Lnet/minecraft/network/listener/PacketListener;shouldAccept(Lnet/minecraft/network/packet/Packet;)Z}
     */
-   default boolean m_yyjbzspg(Packet<?> arg) {
+   default boolean shouldAccept(Packet<?> packet) {
       return this.isConnected();
    }
 
Only in namedSrc/net/minecraft/network/listener: ServerCommonPacketListener.java
diff -bur namedTargetSrc/net/minecraft/network/listener/ServerHandshakePacketListener.java namedSrc/net/minecraft/network/listener/ServerHandshakePacketListener.java
--- namedTargetSrc/net/minecraft/network/listener/ServerHandshakePacketListener.java	2023-08-09 03:13:11.037605159 +0000
+++ namedSrc/net/minecraft/network/listener/ServerHandshakePacketListener.java	2023-08-09 03:11:40.772878110 +0000
@@ -12,7 +12,7 @@
     * Mapping not found
     */
    @Override
-   default NetworkState m_eqgvuckk() {
+   default NetworkState getState() {
       return NetworkState.HANDSHAKING;
    }
 
diff -bur namedTargetSrc/net/minecraft/network/listener/ServerLoginPacketListener.java namedSrc/net/minecraft/network/listener/ServerLoginPacketListener.java
--- namedTargetSrc/net/minecraft/network/listener/ServerLoginPacketListener.java	2023-08-09 03:13:11.049605233 +0000
+++ namedSrc/net/minecraft/network/listener/ServerLoginPacketListener.java	2023-08-09 03:11:40.784878221 +0000
@@ -1,10 +1,10 @@
 package net.minecraft.network.listener;
 
 import net.minecraft.network.NetworkState;
+import net.minecraft.network.packet.c2s.login.LoginAcknowledgementC2SPacket;
 import net.minecraft.network.packet.c2s.login.LoginHelloC2SPacket;
 import net.minecraft.network.packet.c2s.login.LoginKeyC2SPacket;
-import net.minecraft.unmapped.C_mmnuqgam;
-import net.minecraft.unmapped.C_rhwnywfq;
+import net.minecraft.network.packet.c2s.login.LoginQueryResponseC2SPacket;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_kqippvwp}
@@ -15,7 +15,7 @@
     * Mapping not found
     */
    @Override
-   default NetworkState m_eqgvuckk() {
+   default NetworkState getState() {
       return NetworkState.LOGIN;
    }
 
@@ -33,12 +33,13 @@
 
    /**
     * @mapping {@literal hashed m_ahchzdem Lnet/minecraft/unmapped/C_kqippvwp;m_ahchzdem(Lnet/minecraft/unmapped/C_mmnuqgam;)V}
-    * @mapping {@literal named onQueryResponse Lnet/minecraft/network/listener/ServerLoginPacketListener;onQueryResponse(Lnet/minecraft/unmapped/C_mmnuqgam;)V}
+    * @mapping {@literal named onQueryResponse Lnet/minecraft/network/listener/ServerLoginPacketListener;onQueryResponse(Lnet/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket;)V}
     */
-   void onQueryResponse(C_mmnuqgam arg);
+   void onQueryResponse(LoginQueryResponseC2SPacket packet);
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_beuebqch Lnet/minecraft/unmapped/C_kqippvwp;m_beuebqch(Lnet/minecraft/unmapped/C_rhwnywfq;)V}
+    * @mapping {@literal named onLoginAcknowledgement Lnet/minecraft/network/listener/ServerLoginPacketListener;onLoginAcknowledgement(Lnet/minecraft/network/packet/c2s/login/LoginAcknowledgementC2SPacket;)V}
     */
-   void m_beuebqch(C_rhwnywfq arg);
+   void onLoginAcknowledgement(LoginAcknowledgementC2SPacket packet);
 }
diff -bur namedTargetSrc/net/minecraft/network/listener/ServerPlayPacketListener.java namedSrc/net/minecraft/network/listener/ServerPlayPacketListener.java
--- namedTargetSrc/net/minecraft/network/listener/ServerPlayPacketListener.java	2023-08-09 03:13:11.165605948 +0000
+++ namedSrc/net/minecraft/network/listener/ServerPlayPacketListener.java	2023-08-09 03:11:40.940879667 +0000
@@ -11,6 +11,7 @@
 import net.minecraft.network.packet.c2s.play.ChatCommandC2SPacket;
 import net.minecraft.network.packet.c2s.play.ChatMessageC2SPacket;
 import net.minecraft.network.packet.c2s.play.ChatSessionUpdateC2SPacket;
+import net.minecraft.network.packet.c2s.play.ChunkBatchAcknowledgementC2SPacket;
 import net.minecraft.network.packet.c2s.play.ClientCommandC2SPacket;
 import net.minecraft.network.packet.c2s.play.ClientSettingsUpdateC2SPacket;
 import net.minecraft.network.packet.c2s.play.ClientStatusUpdateC2SPacket;
@@ -38,6 +39,7 @@
 import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
 import net.minecraft.network.packet.c2s.play.RecipeBookUpdateC2SPacket;
 import net.minecraft.network.packet.c2s.play.RecipeCategoryOptionUpdateC2SPacket;
+import net.minecraft.network.packet.c2s.play.ReconfigurationAcknowledgementC2SPacket;
 import net.minecraft.network.packet.c2s.play.SelectedSlotUpdateC2SPacket;
 import net.minecraft.network.packet.c2s.play.SignUpdateC2SPacket;
 import net.minecraft.network.packet.c2s.play.SlotClickC2SPacket;
@@ -45,9 +47,6 @@
 import net.minecraft.network.packet.c2s.play.StructureBlockUpdateC2SPacket;
 import net.minecraft.network.packet.c2s.play.TeleportConfirmationC2SPacket;
 import net.minecraft.network.packet.c2s.play.VehicleMoveC2SPacket;
-import net.minecraft.unmapped.C_jmmijfmi;
-import net.minecraft.unmapped.C_pnrerjik;
-import net.minecraft.unmapped.C_umrqumqp;
 
 /**
  * A server side packet listener where play stage packets from a client are processed.
@@ -55,12 +54,12 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_eetcdhxt}
  * @mapping {@literal named net/minecraft/network/listener/ServerPlayPacketListener}
  */
-public interface ServerPlayPacketListener extends C_umrqumqp {
+public interface ServerPlayPacketListener extends ServerCommonPacketListener {
    /**
     * Mapping not found
     */
    @Override
-   default NetworkState m_eqgvuckk() {
+   default NetworkState getState() {
       return NetworkState.PLAY;
    }
 
@@ -329,12 +328,14 @@
    void onChatSessionUpdate(ChatSessionUpdateC2SPacket packet);
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_qolbmbqg Lnet/minecraft/unmapped/C_eetcdhxt;m_qolbmbqg(Lnet/minecraft/unmapped/C_pnrerjik;)V}
+    * @mapping {@literal named onReconfigurationAcknowledgement Lnet/minecraft/network/listener/ServerPlayPacketListener;onReconfigurationAcknowledgement(Lnet/minecraft/network/packet/c2s/play/ReconfigurationAcknowledgementC2SPacket;)V}
     */
-   void m_qolbmbqg(C_pnrerjik arg);
+   void onReconfigurationAcknowledgement(ReconfigurationAcknowledgementC2SPacket packet);
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_cofvhcmo Lnet/minecraft/unmapped/C_eetcdhxt;m_cofvhcmo(Lnet/minecraft/unmapped/C_jmmijfmi;)V}
+    * @mapping {@literal named onChunkBatchAcknowledgement Lnet/minecraft/network/listener/ServerPlayPacketListener;onChunkBatchAcknowledgement(Lnet/minecraft/network/packet/c2s/play/ChunkBatchAcknowledgementC2SPacket;)V}
     */
-   void m_cofvhcmo(C_jmmijfmi arg);
+   void onChunkBatchAcknowledgement(ChunkBatchAcknowledgementC2SPacket packet);
 }
diff -bur namedTargetSrc/net/minecraft/network/listener/ServerQueryPacketListener.java namedSrc/net/minecraft/network/listener/ServerQueryPacketListener.java
--- namedTargetSrc/net/minecraft/network/listener/ServerQueryPacketListener.java	2023-08-09 03:13:11.181606047 +0000
+++ namedSrc/net/minecraft/network/listener/ServerQueryPacketListener.java	2023-08-09 03:11:40.956879816 +0000
@@ -13,7 +13,7 @@
     * Mapping not found
     */
    @Override
-   default NetworkState m_eqgvuckk() {
+   default NetworkState getState() {
       return NetworkState.STATUS;
    }
 
diff -bur namedTargetSrc/net/minecraft/network/NetworkState.java namedSrc/net/minecraft/network/NetworkState.java
--- namedTargetSrc/net/minecraft/network/NetworkState.java	2023-08-09 03:13:11.093605504 +0000
+++ namedSrc/net/minecraft/network/NetworkState.java	2023-08-09 03:11:40.844878777 +0000
@@ -19,8 +19,10 @@
 import net.minecraft.network.packet.PacketBundle;
 import net.minecraft.network.packet.c2s.MessageAcknowledgmentC2SPacket;
 import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket;
+import net.minecraft.network.packet.c2s.login.LoginAcknowledgementC2SPacket;
 import net.minecraft.network.packet.c2s.login.LoginHelloC2SPacket;
 import net.minecraft.network.packet.c2s.login.LoginKeyC2SPacket;
+import net.minecraft.network.packet.c2s.login.LoginQueryResponseC2SPacket;
 import net.minecraft.network.packet.c2s.play.AdvancementTabOpenC2SPacket;
 import net.minecraft.network.packet.c2s.play.BeaconUpdateC2SPacket;
 import net.minecraft.network.packet.c2s.play.BlockNbtQueryC2SPacket;
@@ -30,6 +32,7 @@
 import net.minecraft.network.packet.c2s.play.ChatCommandC2SPacket;
 import net.minecraft.network.packet.c2s.play.ChatMessageC2SPacket;
 import net.minecraft.network.packet.c2s.play.ChatSessionUpdateC2SPacket;
+import net.minecraft.network.packet.c2s.play.ChunkBatchAcknowledgementC2SPacket;
 import net.minecraft.network.packet.c2s.play.ClientCommandC2SPacket;
 import net.minecraft.network.packet.c2s.play.ClientSettingsUpdateC2SPacket;
 import net.minecraft.network.packet.c2s.play.ClientStatusUpdateC2SPacket;
@@ -60,6 +63,7 @@
 import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
 import net.minecraft.network.packet.c2s.play.RecipeBookUpdateC2SPacket;
 import net.minecraft.network.packet.c2s.play.RecipeCategoryOptionUpdateC2SPacket;
+import net.minecraft.network.packet.c2s.play.ReconfigurationAcknowledgementC2SPacket;
 import net.minecraft.network.packet.c2s.play.ResourcePackStatusUpdateC2SPacket;
 import net.minecraft.network.packet.c2s.play.SelectedSlotUpdateC2SPacket;
 import net.minecraft.network.packet.c2s.play.SignUpdateC2SPacket;
@@ -88,6 +92,7 @@
 import net.minecraft.network.packet.s2c.play.BossBarUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.CameraEntityUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.ChatMessageS2CPacket;
+import net.minecraft.network.packet.s2c.play.ChunkBatchCompletionS2CPacket;
 import net.minecraft.network.packet.s2c.play.ChunkDataS2CPacket;
 import net.minecraft.network.packet.s2c.play.ChunkDeltaUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.ChunkLoadDistanceUpdateS2CPacket;
@@ -150,6 +155,7 @@
 import net.minecraft.network.packet.s2c.play.ProfileIndependentMessageS2CPacket;
 import net.minecraft.network.packet.s2c.play.RecipeSynchronizationS2CPacket;
 import net.minecraft.network.packet.s2c.play.RecipesUnlockS2CPacket;
+import net.minecraft.network.packet.s2c.play.ReconfigureS2CPacket;
 import net.minecraft.network.packet.s2c.play.ResourcePackS2CPacket;
 import net.minecraft.network.packet.s2c.play.ScoreboardDisplayS2CPacket;
 import net.minecraft.network.packet.s2c.play.ScoreboardObjectiveUpdateS2CPacket;
@@ -164,6 +170,7 @@
 import net.minecraft.network.packet.s2c.play.SimulationDistanceUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.SoundPlayS2CPacket;
 import net.minecraft.network.packet.s2c.play.SoundStopS2CPacket;
+import net.minecraft.network.packet.s2c.play.StartChunkBatchS2CPacket;
 import net.minecraft.network.packet.s2c.play.StatisticsUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.SubtitleS2CPacket;
 import net.minecraft.network.packet.s2c.play.SynchronizeEnabledFeatureFlagsS2CPacket;
@@ -185,16 +192,9 @@
 import net.minecraft.network.packet.s2c.play.WorldTimeUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.WrittenBookOpenS2CPacket;
 import net.minecraft.network.packet.s2c.query.QueryPongS2CPacket;
-import net.minecraft.unmapped.C_bmpbldgo;
 import net.minecraft.unmapped.C_elgbekgb;
-import net.minecraft.unmapped.C_jmmijfmi;
-import net.minecraft.unmapped.C_mmnuqgam;
 import net.minecraft.unmapped.C_plvddpam;
-import net.minecraft.unmapped.C_pnrerjik;
-import net.minecraft.unmapped.C_rhwnywfq;
-import net.minecraft.unmapped.C_swtvykbp;
 import net.minecraft.unmapped.C_syrsmrhh;
-import net.minecraft.unmapped.C_wyviwobq;
 import net.minecraft.util.Util;
 import net.minecraft.util.annotation.Debug;
 import org.jetbrains.annotations.Nullable;
@@ -212,8 +212,8 @@
    HANDSHAKING(
       "handshake",
       createPacketHandlerInitializer()
-         .setup(NetworkSide.C2S, new NetworkState.PacketHandler())
-         .setup(NetworkSide.S2C, new NetworkState.PacketHandler().register(HandshakeC2SPacket.class, HandshakeC2SPacket::new))
+         .setup(NetworkSide.C2S, new NetworkState.InternalPacketHandler())
+         .setup(NetworkSide.S2C, new NetworkState.InternalPacketHandler().register(HandshakeC2SPacket.class, HandshakeC2SPacket::new))
    ),
    /**
     * @mapping {@literal hashed f_nmosladz Lnet/minecraft/unmapped/C_kxdobmrm;f_nmosladz:Lnet/minecraft/unmapped/C_kxdobmrm;}
@@ -224,7 +224,7 @@
       createPacketHandlerInitializer()
          .setup(
             NetworkSide.C2S,
-            new NetworkState.PacketHandler()
+            new NetworkState.InternalPacketHandler()
                .withBundlePacket(PacketBundleS2CPacket.class, PacketBundleS2CPacket::new)
                .register(EntitySpawnS2CPacket.class, EntitySpawnS2CPacket::new)
                .register(ExperienceOrbSpawnS2CPacket.class, ExperienceOrbSpawnS2CPacket::new)
@@ -238,8 +238,8 @@
                .register(BlockUpdateS2CPacket.class, BlockUpdateS2CPacket::new)
                .register(BossBarUpdateS2CPacket.class, BossBarUpdateS2CPacket::new)
                .register(DifficultyUpdateS2CPacket.class, DifficultyUpdateS2CPacket::new)
-               .register(C_wyviwobq.class, C_wyviwobq::new)
-               .register(C_bmpbldgo.class, C_bmpbldgo::new)
+               .register(ChunkBatchCompletionS2CPacket.class, ChunkBatchCompletionS2CPacket::new)
+               .register(StartChunkBatchS2CPacket.class, StartChunkBatchS2CPacket::new)
                .register(ChunkBiomeDataS2CPacket.class, ChunkBiomeDataS2CPacket::new)
                .register(TitleClearS2CPacket.class, TitleClearS2CPacket::new)
                .register(CommandSuggestionsUpdateS2CPacket.class, CommandSuggestionsUpdateS2CPacket::new)
@@ -326,7 +326,7 @@
                .register(TitleFadeS2CPacket.class, TitleFadeS2CPacket::new)
                .register(PlaySoundFromEntityS2CPacket.class, PlaySoundFromEntityS2CPacket::new)
                .register(SoundPlayS2CPacket.class, SoundPlayS2CPacket::new)
-               .register(C_swtvykbp.class, C_swtvykbp::new)
+               .register(ReconfigureS2CPacket.class, ReconfigureS2CPacket::new)
                .register(SoundStopS2CPacket.class, SoundStopS2CPacket::new)
                .register(SystemMessageS2CPacket.class, SystemMessageS2CPacket::new)
                .register(PlayerListHeaderUpdateS2CPacket.class, PlayerListHeaderUpdateS2CPacket::new)
@@ -341,7 +341,7 @@
          )
          .setup(
             NetworkSide.S2C,
-            new NetworkState.PacketHandler()
+            new NetworkState.InternalPacketHandler()
                .register(TeleportConfirmationC2SPacket.class, TeleportConfirmationC2SPacket::new)
                .register(BlockNbtQueryC2SPacket.class, BlockNbtQueryC2SPacket::new)
                .register(DifficultyUpdateC2SPacket.class, DifficultyUpdateC2SPacket::new)
@@ -349,11 +349,11 @@
                .register(ChatCommandC2SPacket.class, ChatCommandC2SPacket::new)
                .register(ChatMessageC2SPacket.class, ChatMessageC2SPacket::new)
                .register(ChatSessionUpdateC2SPacket.class, ChatSessionUpdateC2SPacket::new)
-               .register(C_jmmijfmi.class, C_jmmijfmi::new)
+               .register(ChunkBatchAcknowledgementC2SPacket.class, ChunkBatchAcknowledgementC2SPacket::new)
                .register(ClientStatusUpdateC2SPacket.class, ClientStatusUpdateC2SPacket::new)
                .register(ClientSettingsUpdateC2SPacket.class, ClientSettingsUpdateC2SPacket::new)
                .register(CommandCompletionRequestC2SPacket.class, CommandCompletionRequestC2SPacket::new)
-               .register(C_pnrerjik.class, C_pnrerjik::new)
+               .register(ReconfigurationAcknowledgementC2SPacket.class, ReconfigurationAcknowledgementC2SPacket::new)
                .register(ButtonClickC2SPacket.class, ButtonClickC2SPacket::new)
                .register(SlotClickC2SPacket.class, SlotClickC2SPacket::new)
                .register(HandledScreenCloseC2SPacket.class, HandledScreenCloseC2SPacket::new)
@@ -406,13 +406,13 @@
       createPacketHandlerInitializer()
          .setup(
             NetworkSide.S2C,
-            new NetworkState.PacketHandler()
+            new NetworkState.InternalPacketHandler()
                .register(MetadataQueryC2SPacket.class, MetadataQueryC2SPacket::new)
                .register(QueryPingC2SPacket.class, QueryPingC2SPacket::new)
          )
          .setup(
             NetworkSide.C2S,
-            new NetworkState.PacketHandler()
+            new NetworkState.InternalPacketHandler()
                .register(
                   net.minecraft.network.packet.s2c.query.ServerMetadataS2CPacket.class, net.minecraft.network.packet.s2c.query.ServerMetadataS2CPacket::new
                )
@@ -428,7 +428,7 @@
       createPacketHandlerInitializer()
          .setup(
             NetworkSide.C2S,
-            new NetworkState.PacketHandler()
+            new NetworkState.InternalPacketHandler()
                .register(LoginDisconnectS2CPacket.class, LoginDisconnectS2CPacket::new)
                .register(LoginHelloS2CPacket.class, LoginHelloS2CPacket::new)
                .register(LoginSuccessS2CPacket.class, LoginSuccessS2CPacket::new)
@@ -437,11 +437,11 @@
          )
          .setup(
             NetworkSide.S2C,
-            new NetworkState.PacketHandler()
+            new NetworkState.InternalPacketHandler()
                .register(LoginHelloC2SPacket.class, LoginHelloC2SPacket::new)
                .register(LoginKeyC2SPacket.class, LoginKeyC2SPacket::new)
-               .register(C_mmnuqgam.class, C_mmnuqgam::m_uukbeyko)
-               .register(C_rhwnywfq.class, C_rhwnywfq::new)
+               .register(LoginQueryResponseC2SPacket.class, LoginQueryResponseC2SPacket::read)
+               .register(LoginAcknowledgementC2SPacket.class, LoginAcknowledgementC2SPacket::new)
          )
    ),
    /**
@@ -453,7 +453,7 @@
       createPacketHandlerInitializer()
          .setup(
             NetworkSide.C2S,
-            new NetworkState.PacketHandler()
+            new NetworkState.InternalPacketHandler()
                .register(CustomPayloadS2CPacket.class, CustomPayloadS2CPacket::new)
                .register(DisconnectS2CPacket.class, DisconnectS2CPacket::new)
                .register(C_syrsmrhh.class, C_syrsmrhh::new)
@@ -466,7 +466,7 @@
          )
          .setup(
             NetworkSide.S2C,
-            new NetworkState.PacketHandler()
+            new NetworkState.InternalPacketHandler()
                .register(CustomPayloadC2SPacket.class, CustomPayloadC2SPacket::new)
                .register(C_elgbekgb.class, C_elgbekgb::new)
                .register(KeepConnectionAliveC2SPacket.class, KeepConnectionAliveC2SPacket::new)
@@ -489,7 +489,7 @@
     * @mapping {@literal hashed f_stwztcyj Lnet/minecraft/unmapped/C_kxdobmrm;f_stwztcyj:Ljava/util/Map;}
     * @mapping {@literal named packetHandlers Lnet/minecraft/network/NetworkState;packetHandlers:Ljava/util/Map;}
     */
-   private final Map<NetworkSide, NetworkState.C_zzcdyzpt<?>> packetHandlers;
+   private final Map<NetworkSide, NetworkState.PacketHandler<?>> packetHandlers;
 
    /**
     * @mapping {@literal hashed m_mjjmcqbn Lnet/minecraft/unmapped/C_kxdobmrm;m_mjjmcqbn()Lnet/minecraft/unmapped/C_kxdobmrm$C_getxrmqs;}
@@ -503,9 +503,9 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_kxdobmrm;<init>(Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/unmapped/C_kxdobmrm$C_getxrmqs;)V}
     * @mapping {@literal named <init> Lnet/minecraft/network/NetworkState;<init>(Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/network/NetworkState$PacketHandlerInitializer;)V}
     */
-   private NetworkState(String stateId, NetworkState.PacketHandlerInitializer arg) {
+   private NetworkState(String stateId, NetworkState.PacketHandlerInitializer initializer) {
       this.stateId = stateId;
-      this.packetHandlers = arg.m_uthuzqyf(this);
+      this.packetHandlers = initializer.createSideToHandlerMap(this);
    }
 
    /**
@@ -514,144 +514,64 @@
     */
    @Debug
    public Int2ObjectMap<Class<? extends Packet<?>>> getPacketsByIds(NetworkSide networkSide) {
-      return ((NetworkState.C_zzcdyzpt)this.packetHandlers.get(networkSide)).m_kalukvnq();
+      return ((NetworkState.PacketHandler)this.packetHandlers.get(networkSide)).getPacketsByIds();
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_faxdemrm Lnet/minecraft/unmapped/C_kxdobmrm;m_faxdemrm()Ljava/lang/String;}
+    * @mapping {@literal named getStateId Lnet/minecraft/network/NetworkState;getStateId()Ljava/lang/String;}
     */
    @Debug
-   public String m_faxdemrm() {
+   public String getStateId() {
       return this.stateId;
    }
 
    /**
-    * Mapping not found
-    */
-   public NetworkState.C_zzcdyzpt<?> m_xyqoenxy(NetworkSide arg) {
-      return (NetworkState.C_zzcdyzpt<?>)this.packetHandlers.get(arg);
-   }
-
-   /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_kxdobmrm$C_zzcdyzpt}
-    * @mapping {@literal named net/minecraft/network/NetworkState$C_zzcdyzpt}
-    */
-   public static class C_zzcdyzpt<T extends PacketListener> implements PacketBundlerInfo.Provider {
-      /**
-       * Mapping not found
-       */
-      private final NetworkState f_acsbwnzv;
-      /**
-       * Mapping not found
-       */
-      private final NetworkSide f_rqcencgq;
-      /**
-       * Mapping not found
-       */
-      private final NetworkState.PacketHandler<T> f_shskfgxr;
-
-      /**
-       * Mapping not found
-       */
-      public C_zzcdyzpt(NetworkState arg, NetworkSide arg2, NetworkState.PacketHandler<T> arg3) {
-         this.f_acsbwnzv = arg;
-         this.f_rqcencgq = arg2;
-         this.f_shskfgxr = arg3;
-      }
-
-      /**
-       * Mapping not found
-       */
-      public NetworkState m_qfglzfxi() {
-         return this.f_acsbwnzv;
-      }
-
-      /**
-       * Mapping not found
+    * @mapping {@literal hashed m_xyqoenxy Lnet/minecraft/unmapped/C_kxdobmrm;m_xyqoenxy(Lnet/minecraft/unmapped/C_exeqxqdd;)Lnet/minecraft/unmapped/C_kxdobmrm$C_zzcdyzpt;}
+    * @mapping {@literal named getHandler Lnet/minecraft/network/NetworkState;getHandler(Lnet/minecraft/network/NetworkSide;)Lnet/minecraft/network/NetworkState$PacketHandler;}
        */
-      public NetworkSide m_trmqqide() {
-         return this.f_rqcencgq;
-      }
-
-      /**
-       * Mapping not found
-       */
-      public int m_ejolnocg(Packet<?> arg) {
-         return this.f_shskfgxr.getId(arg.getClass());
-      }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public PacketBundlerInfo m_dhleaskt() {
-         return this.f_shskfgxr.getBundlerInfo();
-      }
-
-      /**
-       * Mapping not found
-       */
-      Int2ObjectMap<Class<? extends Packet<?>>> m_kalukvnq() {
-         Int2ObjectMap<Class<? extends Packet<?>>> int2ObjectMap = new Int2ObjectOpenHashMap<>();
-         this.f_shskfgxr.packetIds.forEach((arg, integer) -> int2ObjectMap.put(integer.intValue(), arg));
-         return int2ObjectMap;
-      }
-
-      /**
-       * @mapping {@literal hashed m_ivycqkez Lnet/minecraft/unmapped/C_kxdobmrm$C_zzcdyzpt;m_ivycqkez(ILnet/minecraft/unmapped/C_idfydwco;)Lnet/minecraft/unmapped/C_zyjtrjrl;}
-       * @mapping {@literal named m_ivycqkez Lnet/minecraft/network/NetworkState$C_zzcdyzpt;m_ivycqkez(ILnet/minecraft/network/PacketByteBuf;)Lnet/minecraft/network/packet/Packet;}
-       */
-      @Nullable
-      public Packet<?> m_ivycqkez(int i, PacketByteBuf buf) {
-         return this.f_shskfgxr.createPacket(i, buf);
-      }
-
-      /**
-       * Mapping not found
-       */
-      public boolean m_alixnfrr(Packet<?> arg) {
-         return this.f_shskfgxr.m_dsimcctq(arg.getClass());
-      }
+   public NetworkState.PacketHandler<?> getHandler(NetworkSide side) {
+      return (NetworkState.PacketHandler<?>)this.packetHandlers.get(side);
    }
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_kxdobmrm$C_lmmjpqqz}
-    * @mapping {@literal named net/minecraft/network/NetworkState$PacketHandler}
+    * @mapping {@literal named net/minecraft/network/NetworkState$InternalPacketHandler}
     */
-   static class PacketHandler<T extends PacketListener> {
+   static class InternalPacketHandler<T extends PacketListener> {
       /**
        * @mapping {@literal hashed f_mseaveor Lnet/minecraft/unmapped/C_kxdobmrm$C_lmmjpqqz;f_mseaveor:Lorg/slf4j/Logger;}
-       * @mapping {@literal named LOGGER Lnet/minecraft/network/NetworkState$PacketHandler;LOGGER:Lorg/slf4j/Logger;}
+       * @mapping {@literal named LOGGER Lnet/minecraft/network/NetworkState$InternalPacketHandler;LOGGER:Lorg/slf4j/Logger;}
        */
       private static final Logger LOGGER = LogUtils.getLogger();
       /**
        * @mapping {@literal hashed f_feuhlzjs Lnet/minecraft/unmapped/C_kxdobmrm$C_lmmjpqqz;f_feuhlzjs:Lit/unimi/dsi/fastutil/objects/Object2IntMap;}
-       * @mapping {@literal named packetIds Lnet/minecraft/network/NetworkState$PacketHandler;packetIds:Lit/unimi/dsi/fastutil/objects/Object2IntMap;}
+       * @mapping {@literal named packetIds Lnet/minecraft/network/NetworkState$InternalPacketHandler;packetIds:Lit/unimi/dsi/fastutil/objects/Object2IntMap;}
        */
       final Object2IntMap<Class<? extends Packet<? super T>>> packetIds = Util.make(new Object2IntOpenHashMap<>(), map -> map.defaultReturnValue(-1));
       /**
        * @mapping {@literal hashed f_bzupszpd Lnet/minecraft/unmapped/C_kxdobmrm$C_lmmjpqqz;f_bzupszpd:Ljava/util/List;}
-       * @mapping {@literal named packetFactories Lnet/minecraft/network/NetworkState$PacketHandler;packetFactories:Ljava/util/List;}
+       * @mapping {@literal named packetFactories Lnet/minecraft/network/NetworkState$InternalPacketHandler;packetFactories:Ljava/util/List;}
        */
       private final List<Function<PacketByteBuf, ? extends Packet<? super T>>> packetFactories = Lists.<Function<PacketByteBuf, ? extends Packet<? super T>>>newArrayList(
          
       );
       /**
        * @mapping {@literal hashed f_kwrnroeo Lnet/minecraft/unmapped/C_kxdobmrm$C_lmmjpqqz;f_kwrnroeo:Lnet/minecraft/unmapped/C_ixirlvvy;}
-       * @mapping {@literal named bundlerInfo Lnet/minecraft/network/NetworkState$PacketHandler;bundlerInfo:Lnet/minecraft/network/PacketBundlerInfo;}
+       * @mapping {@literal named bundlerInfo Lnet/minecraft/network/NetworkState$InternalPacketHandler;bundlerInfo:Lnet/minecraft/network/PacketBundlerInfo;}
        */
       private PacketBundlerInfo bundlerInfo = PacketBundlerInfo.EMPTY;
       /**
        * @mapping {@literal hashed f_obnctdix Lnet/minecraft/unmapped/C_kxdobmrm$C_lmmjpqqz;f_obnctdix:Ljava/util/Set;}
-       * @mapping {@literal named packetTypes Lnet/minecraft/network/NetworkState$PacketHandler;packetTypes:Ljava/util/Set;}
+       * @mapping {@literal named packetTypes Lnet/minecraft/network/NetworkState$InternalPacketHandler;packetTypes:Ljava/util/Set;}
        */
       private final Set<Class<? extends Packet<T>>> packetTypes = new HashSet();
 
       /**
        * @mapping {@literal hashed m_kfitcvso Lnet/minecraft/unmapped/C_kxdobmrm$C_lmmjpqqz;m_kfitcvso(Ljava/lang/Class;Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_kxdobmrm$C_lmmjpqqz;}
-       * @mapping {@literal named register Lnet/minecraft/network/NetworkState$PacketHandler;register(Ljava/lang/Class;Ljava/util/function/Function;)Lnet/minecraft/network/NetworkState$PacketHandler;}
+       * @mapping {@literal named register Lnet/minecraft/network/NetworkState$InternalPacketHandler;register(Ljava/lang/Class;Ljava/util/function/Function;)Lnet/minecraft/network/NetworkState$InternalPacketHandler;}
        */
-      public <P extends Packet<? super T>> NetworkState.PacketHandler<T> register(Class<P> type, Function<PacketByteBuf, P> packetFactory) {
+      public <P extends Packet<? super T>> NetworkState.InternalPacketHandler<T> register(Class<P> type, Function<PacketByteBuf, P> packetFactory) {
          int i = this.packetFactories.size();
          int j = this.packetIds.put(type, i);
          if (j != -1) {
@@ -666,9 +586,9 @@
 
       /**
        * @mapping {@literal hashed m_kdjwucoq Lnet/minecraft/unmapped/C_kxdobmrm$C_lmmjpqqz;m_kdjwucoq(Ljava/lang/Class;Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_kxdobmrm$C_lmmjpqqz;}
-       * @mapping {@literal named withBundlePacket Lnet/minecraft/network/NetworkState$PacketHandler;withBundlePacket(Ljava/lang/Class;Ljava/util/function/Function;)Lnet/minecraft/network/NetworkState$PacketHandler;}
+       * @mapping {@literal named withBundlePacket Lnet/minecraft/network/NetworkState$InternalPacketHandler;withBundlePacket(Ljava/lang/Class;Ljava/util/function/Function;)Lnet/minecraft/network/NetworkState$InternalPacketHandler;}
        */
-      public <P extends PacketBundle<T>> NetworkState.PacketHandler<T> withBundlePacket(Class<P> packetType, Function<Iterable<Packet<T>>, P> function) {
+      public <P extends PacketBundle<T>> NetworkState.InternalPacketHandler<T> withBundlePacket(Class<P> packetType, Function<Iterable<Packet<T>>, P> function) {
          if (this.bundlerInfo != PacketBundlerInfo.EMPTY) {
             throw new IllegalStateException("Bundle packet already configured");
          } else {
@@ -682,22 +602,23 @@
 
       /**
        * @mapping {@literal hashed m_trywfarv Lnet/minecraft/unmapped/C_kxdobmrm$C_lmmjpqqz;m_trywfarv(Ljava/lang/Class;)I}
-       * @mapping {@literal named getId Lnet/minecraft/network/NetworkState$PacketHandler;getId(Ljava/lang/Class;)I}
+       * @mapping {@literal named getId Lnet/minecraft/network/NetworkState$InternalPacketHandler;getId(Ljava/lang/Class;)I}
        */
       public int getId(Class<?> packet) {
          return this.packetIds.getInt(packet);
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_dsimcctq Lnet/minecraft/unmapped/C_kxdobmrm$C_lmmjpqqz;m_dsimcctq(Ljava/lang/Class;)Z}
+       * @mapping {@literal named canHandle Lnet/minecraft/network/NetworkState$InternalPacketHandler;canHandle(Ljava/lang/Class;)Z}
        */
-      public boolean m_dsimcctq(Class<?> arg) {
-         return this.packetIds.containsKey(arg) || this.packetTypes.contains(arg);
+      public boolean canHandle(Class<?> packet) {
+         return this.packetIds.containsKey(packet) || this.packetTypes.contains(packet);
       }
 
       /**
        * @mapping {@literal hashed m_rjaodwou Lnet/minecraft/unmapped/C_kxdobmrm$C_lmmjpqqz;m_rjaodwou(ILnet/minecraft/unmapped/C_idfydwco;)Lnet/minecraft/unmapped/C_zyjtrjrl;}
-       * @mapping {@literal named createPacket Lnet/minecraft/network/NetworkState$PacketHandler;createPacket(ILnet/minecraft/network/PacketByteBuf;)Lnet/minecraft/network/packet/Packet;}
+       * @mapping {@literal named createPacket Lnet/minecraft/network/NetworkState$InternalPacketHandler;createPacket(ILnet/minecraft/network/PacketByteBuf;)Lnet/minecraft/network/packet/Packet;}
        */
       @Nullable
       public Packet<?> createPacket(int id, PacketByteBuf buf) {
@@ -707,7 +628,7 @@
 
       /**
        * @mapping {@literal hashed m_xcmncpjp Lnet/minecraft/unmapped/C_kxdobmrm$C_lmmjpqqz;m_xcmncpjp()Lnet/minecraft/unmapped/C_ixirlvvy;}
-       * @mapping {@literal named getBundlerInfo Lnet/minecraft/network/NetworkState$PacketHandler;getBundlerInfo()Lnet/minecraft/network/PacketBundlerInfo;}
+       * @mapping {@literal named getBundlerInfo Lnet/minecraft/network/NetworkState$InternalPacketHandler;getBundlerInfo()Lnet/minecraft/network/PacketBundlerInfo;}
        */
       public PacketBundlerInfo getBundlerInfo() {
          return this.bundlerInfo;
@@ -715,6 +636,97 @@
    }
 
    /**
+    * @mapping {@literal hashed net/minecraft/unmapped/C_kxdobmrm$C_zzcdyzpt}
+    * @mapping {@literal named net/minecraft/network/NetworkState$PacketHandler}
+    */
+   public static class PacketHandler<T extends PacketListener> implements PacketBundlerInfo.Provider {
+      /**
+       * @mapping {@literal hashed f_acsbwnzv Lnet/minecraft/unmapped/C_kxdobmrm$C_zzcdyzpt;f_acsbwnzv:Lnet/minecraft/unmapped/C_kxdobmrm;}
+       * @mapping {@literal named state Lnet/minecraft/network/NetworkState$PacketHandler;state:Lnet/minecraft/network/NetworkState;}
+       */
+      private final NetworkState state;
+      /**
+       * @mapping {@literal hashed f_rqcencgq Lnet/minecraft/unmapped/C_kxdobmrm$C_zzcdyzpt;f_rqcencgq:Lnet/minecraft/unmapped/C_exeqxqdd;}
+       * @mapping {@literal named side Lnet/minecraft/network/NetworkState$PacketHandler;side:Lnet/minecraft/network/NetworkSide;}
+       */
+      private final NetworkSide side;
+      /**
+       * @mapping {@literal hashed f_shskfgxr Lnet/minecraft/unmapped/C_kxdobmrm$C_zzcdyzpt;f_shskfgxr:Lnet/minecraft/unmapped/C_kxdobmrm$C_lmmjpqqz;}
+       * @mapping {@literal named backingHandler Lnet/minecraft/network/NetworkState$PacketHandler;backingHandler:Lnet/minecraft/network/NetworkState$InternalPacketHandler;}
+       */
+      private final NetworkState.InternalPacketHandler<T> backingHandler;
+
+      /**
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_kxdobmrm$C_zzcdyzpt;<init>(Lnet/minecraft/unmapped/C_kxdobmrm;Lnet/minecraft/unmapped/C_exeqxqdd;Lnet/minecraft/unmapped/C_kxdobmrm$C_lmmjpqqz;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/network/NetworkState$PacketHandler;<init>(Lnet/minecraft/network/NetworkState;Lnet/minecraft/network/NetworkSide;Lnet/minecraft/network/NetworkState$InternalPacketHandler;)V}
+       */
+      public PacketHandler(NetworkState state, NetworkSide side, NetworkState.InternalPacketHandler<T> backingHandler) {
+         this.state = state;
+         this.side = side;
+         this.backingHandler = backingHandler;
+      }
+
+      /**
+       * @mapping {@literal hashed m_qfglzfxi Lnet/minecraft/unmapped/C_kxdobmrm$C_zzcdyzpt;m_qfglzfxi()Lnet/minecraft/unmapped/C_kxdobmrm;}
+       * @mapping {@literal named getState Lnet/minecraft/network/NetworkState$PacketHandler;getState()Lnet/minecraft/network/NetworkState;}
+       */
+      public NetworkState getState() {
+         return this.state;
+      }
+
+      /**
+       * @mapping {@literal hashed m_trmqqide Lnet/minecraft/unmapped/C_kxdobmrm$C_zzcdyzpt;m_trmqqide()Lnet/minecraft/unmapped/C_exeqxqdd;}
+       * @mapping {@literal named getSide Lnet/minecraft/network/NetworkState$PacketHandler;getSide()Lnet/minecraft/network/NetworkSide;}
+       */
+      public NetworkSide getSide() {
+         return this.side;
+      }
+
+      /**
+       * @mapping {@literal hashed m_ejolnocg Lnet/minecraft/unmapped/C_kxdobmrm$C_zzcdyzpt;m_ejolnocg(Lnet/minecraft/unmapped/C_zyjtrjrl;)I}
+       * @mapping {@literal named getId Lnet/minecraft/network/NetworkState$PacketHandler;getId(Lnet/minecraft/network/packet/Packet;)I}
+       */
+      public int getId(Packet<?> packet) {
+         return this.backingHandler.getId(packet.getClass());
+      }
+
+      /**
+       * Mapping not found
+       */
+      @Override
+      public PacketBundlerInfo getBundlerInfo() {
+         return this.backingHandler.getBundlerInfo();
+      }
+
+      /**
+       * @mapping {@literal hashed m_kalukvnq Lnet/minecraft/unmapped/C_kxdobmrm$C_zzcdyzpt;m_kalukvnq()Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;}
+       * @mapping {@literal named getPacketsByIds Lnet/minecraft/network/NetworkState$PacketHandler;getPacketsByIds()Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;}
+       */
+      Int2ObjectMap<Class<? extends Packet<?>>> getPacketsByIds() {
+         Int2ObjectMap<Class<? extends Packet<?>>> int2ObjectMap = new Int2ObjectOpenHashMap<>();
+         this.backingHandler.packetIds.forEach((packet, id) -> int2ObjectMap.put(id.intValue(), packet));
+         return int2ObjectMap;
+      }
+
+      /**
+       * @mapping {@literal hashed m_ivycqkez Lnet/minecraft/unmapped/C_kxdobmrm$C_zzcdyzpt;m_ivycqkez(ILnet/minecraft/unmapped/C_idfydwco;)Lnet/minecraft/unmapped/C_zyjtrjrl;}
+       * @mapping {@literal named createPacket Lnet/minecraft/network/NetworkState$PacketHandler;createPacket(ILnet/minecraft/network/PacketByteBuf;)Lnet/minecraft/network/packet/Packet;}
+       */
+      @Nullable
+      public Packet<?> createPacket(int id, PacketByteBuf buf) {
+         return this.backingHandler.createPacket(id, buf);
+      }
+
+      /**
+       * @mapping {@literal hashed m_alixnfrr Lnet/minecraft/unmapped/C_kxdobmrm$C_zzcdyzpt;m_alixnfrr(Lnet/minecraft/unmapped/C_zyjtrjrl;)Z}
+       * @mapping {@literal named canHandle Lnet/minecraft/network/NetworkState$PacketHandler;canHandle(Lnet/minecraft/network/packet/Packet;)Z}
+       */
+      public boolean canHandle(Packet<?> packet) {
+         return this.backingHandler.canHandle(packet.getClass());
+      }
+   }
+
+   /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_kxdobmrm$C_getxrmqs}
     * @mapping {@literal named net/minecraft/network/NetworkState$PacketHandlerInitializer}
     */
@@ -723,30 +735,31 @@
        * @mapping {@literal hashed f_qaucgncx Lnet/minecraft/unmapped/C_kxdobmrm$C_getxrmqs;f_qaucgncx:Ljava/util/Map;}
        * @mapping {@literal named packetHandlers Lnet/minecraft/network/NetworkState$PacketHandlerInitializer;packetHandlers:Ljava/util/Map;}
        */
-      private final Map<NetworkSide, NetworkState.PacketHandler<?>> packetHandlers = Maps.newEnumMap(NetworkSide.class);
+      private final Map<NetworkSide, NetworkState.InternalPacketHandler<?>> packetHandlers = Maps.newEnumMap(NetworkSide.class);
 
       /**
        * @mapping {@literal hashed m_tymymizx Lnet/minecraft/unmapped/C_kxdobmrm$C_getxrmqs;m_tymymizx(Lnet/minecraft/unmapped/C_exeqxqdd;Lnet/minecraft/unmapped/C_kxdobmrm$C_lmmjpqqz;)Lnet/minecraft/unmapped/C_kxdobmrm$C_getxrmqs;}
-       * @mapping {@literal named setup Lnet/minecraft/network/NetworkState$PacketHandlerInitializer;setup(Lnet/minecraft/network/NetworkSide;Lnet/minecraft/network/NetworkState$PacketHandler;)Lnet/minecraft/network/NetworkState$PacketHandlerInitializer;}
+       * @mapping {@literal named setup Lnet/minecraft/network/NetworkState$PacketHandlerInitializer;setup(Lnet/minecraft/network/NetworkSide;Lnet/minecraft/network/NetworkState$InternalPacketHandler;)Lnet/minecraft/network/NetworkState$PacketHandlerInitializer;}
        */
-      public <T extends PacketListener> NetworkState.PacketHandlerInitializer setup(NetworkSide side, NetworkState.PacketHandler<T> handler) {
+      public <T extends PacketListener> NetworkState.PacketHandlerInitializer setup(NetworkSide side, NetworkState.InternalPacketHandler<T> handler) {
          this.packetHandlers.put(side, handler);
          return this;
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_uthuzqyf Lnet/minecraft/unmapped/C_kxdobmrm$C_getxrmqs;m_uthuzqyf(Lnet/minecraft/unmapped/C_kxdobmrm;)Ljava/util/Map;}
+       * @mapping {@literal named createSideToHandlerMap Lnet/minecraft/network/NetworkState$PacketHandlerInitializer;createSideToHandlerMap(Lnet/minecraft/network/NetworkState;)Ljava/util/Map;}
        */
-      public Map<NetworkSide, NetworkState.C_zzcdyzpt<?>> m_uthuzqyf(NetworkState arg) {
-         Map<NetworkSide, NetworkState.C_zzcdyzpt<?>> map = new EnumMap(NetworkSide.class);
+      public Map<NetworkSide, NetworkState.PacketHandler<?>> createSideToHandlerMap(NetworkState state) {
+         Map<NetworkSide, NetworkState.PacketHandler<?>> map = new EnumMap(NetworkSide.class);
 
          for (NetworkSide lv : NetworkSide.values()) {
-            NetworkState.PacketHandler<?> lv2 = (NetworkState.PacketHandler)this.packetHandlers.get(lv);
+            NetworkState.InternalPacketHandler<?> lv2 = (NetworkState.InternalPacketHandler)this.packetHandlers.get(lv);
             if (lv2 == null) {
-               throw new IllegalStateException("Missing packets for flow " + lv + " in protocol " + arg);
+               throw new IllegalStateException("Missing packets for flow " + lv + " in protocol " + state);
             }
 
-            map.put(lv, new NetworkState.C_zzcdyzpt<>(arg, lv, lv2));
+            map.put(lv, new NetworkState.PacketHandler<>(state, lv, lv2));
          }
 
          return map;
Only in namedSrc/net/minecraft/network: NetworkStateTransitionHandler.java
diff -bur namedTargetSrc/net/minecraft/network/NetworkThreadUtils.java namedSrc/net/minecraft/network/NetworkThreadUtils.java
--- namedTargetSrc/net/minecraft/network/NetworkThreadUtils.java	2023-08-09 03:13:11.053605258 +0000
+++ namedSrc/net/minecraft/network/NetworkThreadUtils.java	2023-08-09 03:11:40.792878295 +0000
@@ -33,7 +33,7 @@
    public static <T extends PacketListener> void forceMainThread(Packet<T> packet, T listener, ThreadExecutor<?> engine) throws OffThreadException {
       if (!engine.isOnThread()) {
          engine.executeIfPossible(() -> {
-            if (listener.m_yyjbzspg(packet)) {
+            if (listener.shouldAccept(packet)) {
                try {
                   packet.apply(listener);
                } catch (Exception var3) {
diff -bur namedTargetSrc/net/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket.java namedSrc/net/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket.java
--- namedTargetSrc/net/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket.java	2023-08-09 03:13:11.061605307 +0000
+++ namedSrc/net/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket.java	2023-08-09 03:11:40.800878370 +0000
@@ -1,16 +1,17 @@
 package net.minecraft.network.packet.c2s.handshake;
 
+import net.minecraft.network.ConnectionIntent;
 import net.minecraft.network.NetworkState;
 import net.minecraft.network.PacketByteBuf;
 import net.minecraft.network.listener.ServerHandshakePacketListener;
 import net.minecraft.network.packet.Packet;
-import net.minecraft.unmapped.C_uxoyljpb;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_ftiizbuk}
  * @mapping {@literal named net/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket}
  */
-public record HandshakeC2SPacket(int protocolVersion, String address, int port, C_uxoyljpb intendedState) implements Packet<ServerHandshakePacketListener> {
+public record HandshakeC2SPacket(int protocolVersion, String address, int port, ConnectionIntent intendedState)
+   implements Packet<ServerHandshakePacketListener> {
    /**
     * @mapping {@literal hashed f_rswigbdj Lnet/minecraft/unmapped/C_ftiizbuk;f_rswigbdj:I}
     * @mapping {@literal named MAX_ADDRESS_LENGTH Lnet/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket;MAX_ADDRESS_LENGTH:I}
@@ -19,10 +20,10 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ftiizbuk;<init>(ILjava/lang/String;ILnet/minecraft/unmapped/C_uxoyljpb;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket;<init>(ILjava/lang/String;ILnet/minecraft/unmapped/C_uxoyljpb;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket;<init>(ILjava/lang/String;ILnet/minecraft/network/ConnectionIntent;)V}
     */
    @Deprecated
-   public HandshakeC2SPacket(int protocolVersion, String address, int port, C_uxoyljpb intendedState) {
+   public HandshakeC2SPacket(int protocolVersion, String address, int port, ConnectionIntent intendedState) {
       this.protocolVersion = protocolVersion;
       this.address = address;
       this.port = port;
@@ -34,7 +35,7 @@
     * @mapping {@literal named <init> Lnet/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket;<init>(Lnet/minecraft/network/PacketByteBuf;)V}
     */
    public HandshakeC2SPacket(PacketByteBuf buf) {
-      this(buf.readVarInt(), buf.readString(255), buf.readUnsignedShort(), C_uxoyljpb.m_urowrtvw(buf.readVarInt()));
+      this(buf.readVarInt(), buf.readString(255), buf.readUnsignedShort(), ConnectionIntent.byId(buf.readVarInt()));
    }
 
    /**
@@ -45,7 +46,7 @@
       buf.writeVarInt(this.protocolVersion);
       buf.writeString(this.address);
       buf.writeShort(this.port);
-      buf.writeVarInt(this.intendedState.m_vbiyalqs());
+      buf.writeVarInt(this.intendedState.getId());
    }
 
    /**
@@ -60,8 +61,8 @@
     * Mapping not found
     */
    @Override
-   public NetworkState m_cuvjkrrj() {
-      return this.intendedState.m_xmbsvuou();
+   public NetworkState getNextNetworkState() {
+      return this.intendedState.getState();
    }
 
    /**
@@ -74,9 +75,9 @@
 
    /**
     * @mapping {@literal hashed m_jxpimbry Lnet/minecraft/unmapped/C_ftiizbuk;m_jxpimbry()Lnet/minecraft/unmapped/C_uxoyljpb;}
-    * @mapping {@literal named intention Lnet/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket;intention()Lnet/minecraft/unmapped/C_uxoyljpb;}
+    * @mapping {@literal named intention Lnet/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket;intention()Lnet/minecraft/network/ConnectionIntent;}
     */
-   public C_uxoyljpb intention() {
+   public ConnectionIntent intention() {
       return this.intendedState;
    }
 }
Only in namedSrc/net/minecraft/network/packet/c2s/login: LoginAcknowledgementC2SPacket.java
Only in namedSrc/net/minecraft/network/packet/c2s/login: LoginQueryResponseC2SPacket.java
Only in namedSrc/net/minecraft/network/packet/c2s/login: payload
Only in namedSrc/net/minecraft/network/packet/c2s/play: ChunkBatchAcknowledgementC2SPacket.java
diff -bur namedTargetSrc/net/minecraft/network/packet/c2s/play/CustomPayloadC2SPacket.java namedSrc/net/minecraft/network/packet/c2s/play/CustomPayloadC2SPacket.java
--- namedTargetSrc/net/minecraft/network/packet/c2s/play/CustomPayloadC2SPacket.java	2023-08-09 03:13:11.089605480 +0000
+++ namedSrc/net/minecraft/network/packet/c2s/play/CustomPayloadC2SPacket.java	2023-08-09 03:11:40.836878703 +0000
@@ -3,30 +3,31 @@
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import net.minecraft.network.PacketByteBuf;
+import net.minecraft.network.listener.ServerCommonPacketListener;
 import net.minecraft.network.packet.Packet;
-import net.minecraft.unmapped.C_oqfbzhlw;
-import net.minecraft.unmapped.C_rdvipvkj;
-import net.minecraft.unmapped.C_umrqumqp;
-import net.minecraft.unmapped.C_yyngrkbw;
+import net.minecraft.network.packet.payload.CustomPayload;
+import net.minecraft.network.packet.payload.DiscardedCustomPayload;
+import net.minecraft.network.packet.s2c.payload.BrandPayload;
 import net.minecraft.util.Identifier;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_otnddlok}
  * @mapping {@literal named net/minecraft/network/packet/c2s/play/CustomPayloadC2SPacket}
  */
-public record CustomPayloadC2SPacket(C_oqfbzhlw payload) implements Packet<C_umrqumqp> {
+public record CustomPayloadC2SPacket(CustomPayload payload) implements Packet<ServerCommonPacketListener> {
    /**
     * @mapping {@literal hashed f_fbngaxcj Lnet/minecraft/unmapped/C_otnddlok;f_fbngaxcj:I}
     * @mapping {@literal named MAX_PAYLOAD_SIZE Lnet/minecraft/network/packet/c2s/play/CustomPayloadC2SPacket;MAX_PAYLOAD_SIZE:I}
     */
    private static final int MAX_PAYLOAD_SIZE = 32767;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_rckywefn Lnet/minecraft/unmapped/C_otnddlok;f_rckywefn:Ljava/util/Map;}
+    * @mapping {@literal named KNOWN_TYPES Lnet/minecraft/network/packet/c2s/play/CustomPayloadC2SPacket;KNOWN_TYPES:Ljava/util/Map;}
     */
-   private static final Map<Identifier, PacketByteBuf.Reader<? extends C_oqfbzhlw>> f_rckywefn = ImmutableMap.<Identifier, PacketByteBuf.Reader<? extends C_oqfbzhlw>>builder(
+   private static final Map<Identifier, PacketByteBuf.Reader<? extends CustomPayload>> KNOWN_TYPES = ImmutableMap.<Identifier, PacketByteBuf.Reader<? extends CustomPayload>>builder(
          
       )
-      .put(C_yyngrkbw.f_iymhstjr, C_yyngrkbw::new)
+      .put(BrandPayload.ID, BrandPayload::new)
       .build();
 
    /**
@@ -34,27 +35,27 @@
     * @mapping {@literal named <init> Lnet/minecraft/network/packet/c2s/play/CustomPayloadC2SPacket;<init>(Lnet/minecraft/network/PacketByteBuf;)V}
     */
    public CustomPayloadC2SPacket(PacketByteBuf buf) {
-      this(m_yjjkkrgp(buf.readIdentifier(), buf));
+      this(readPayload(buf.readIdentifier(), buf));
    }
 
    /**
     * @mapping {@literal hashed m_yjjkkrgp Lnet/minecraft/unmapped/C_otnddlok;m_yjjkkrgp(Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_idfydwco;)Lnet/minecraft/unmapped/C_oqfbzhlw;}
-    * @mapping {@literal named m_yjjkkrgp Lnet/minecraft/network/packet/c2s/play/CustomPayloadC2SPacket;m_yjjkkrgp(Lnet/minecraft/util/Identifier;Lnet/minecraft/network/PacketByteBuf;)Lnet/minecraft/unmapped/C_oqfbzhlw;}
+    * @mapping {@literal named readPayload Lnet/minecraft/network/packet/c2s/play/CustomPayloadC2SPacket;readPayload(Lnet/minecraft/util/Identifier;Lnet/minecraft/network/PacketByteBuf;)Lnet/minecraft/network/packet/payload/CustomPayload;}
     */
-   private static C_oqfbzhlw m_yjjkkrgp(Identifier arg, PacketByteBuf buf) {
-      PacketByteBuf.Reader<? extends C_oqfbzhlw> lv = (PacketByteBuf.Reader)f_rckywefn.get(arg);
-      return (C_oqfbzhlw)(lv != null ? (C_oqfbzhlw)lv.apply(buf) : m_mrtyisql(arg, buf));
+   private static CustomPayload readPayload(Identifier id, PacketByteBuf buf) {
+      PacketByteBuf.Reader<? extends CustomPayload> lv = (PacketByteBuf.Reader)KNOWN_TYPES.get(id);
+      return (CustomPayload)(lv != null ? (CustomPayload)lv.apply(buf) : readUnknownPayload(id, buf));
    }
 
    /**
     * @mapping {@literal hashed m_mrtyisql Lnet/minecraft/unmapped/C_otnddlok;m_mrtyisql(Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_idfydwco;)Lnet/minecraft/unmapped/C_rdvipvkj;}
-    * @mapping {@literal named m_mrtyisql Lnet/minecraft/network/packet/c2s/play/CustomPayloadC2SPacket;m_mrtyisql(Lnet/minecraft/util/Identifier;Lnet/minecraft/network/PacketByteBuf;)Lnet/minecraft/unmapped/C_rdvipvkj;}
+    * @mapping {@literal named readUnknownPayload Lnet/minecraft/network/packet/c2s/play/CustomPayloadC2SPacket;readUnknownPayload(Lnet/minecraft/util/Identifier;Lnet/minecraft/network/PacketByteBuf;)Lnet/minecraft/network/packet/payload/DiscardedCustomPayload;}
     */
-   private static C_rdvipvkj m_mrtyisql(Identifier arg, PacketByteBuf buf) {
+   private static DiscardedCustomPayload readUnknownPayload(Identifier id, PacketByteBuf buf) {
       int i = buf.readableBytes();
       if (i >= 0 && i <= 32767) {
          buf.skipBytes(i);
-         return new C_rdvipvkj(arg);
+         return new DiscardedCustomPayload(id);
       } else {
          throw new IllegalArgumentException("Payload may not be larger than 32767 bytes");
       }
@@ -65,15 +66,15 @@
     */
    @Override
    public void write(PacketByteBuf buf) {
-      buf.writeIdentifier(this.payload.m_qaikjtym());
-      this.payload.m_wefaxwoq(buf);
+      buf.writeIdentifier(this.payload.id());
+      this.payload.write(buf);
    }
 
    /**
     * @mapping {@literal hashed m_wquzznwq Lnet/minecraft/unmapped/C_otnddlok;m_wquzznwq(Lnet/minecraft/unmapped/C_umrqumqp;)V}
-    * @mapping {@literal named apply Lnet/minecraft/network/packet/c2s/play/CustomPayloadC2SPacket;apply(Lnet/minecraft/unmapped/C_umrqumqp;)V}
+    * @mapping {@literal named apply Lnet/minecraft/network/packet/c2s/play/CustomPayloadC2SPacket;apply(Lnet/minecraft/network/listener/ServerCommonPacketListener;)V}
     */
-   public void apply(C_umrqumqp arg) {
-      arg.m_ieyoylpj(this);
+   public void apply(ServerCommonPacketListener arg) {
+      arg.onCustomPayload(this);
    }
 }
diff -bur namedTargetSrc/net/minecraft/network/packet/c2s/play/KeepConnectionAliveC2SPacket.java namedSrc/net/minecraft/network/packet/c2s/play/KeepConnectionAliveC2SPacket.java
--- namedTargetSrc/net/minecraft/network/packet/c2s/play/KeepConnectionAliveC2SPacket.java	2023-08-09 03:13:11.081605430 +0000
+++ namedSrc/net/minecraft/network/packet/c2s/play/KeepConnectionAliveC2SPacket.java	2023-08-09 03:11:40.824878592 +0000
@@ -1,14 +1,14 @@
 package net.minecraft.network.packet.c2s.play;
 
 import net.minecraft.network.PacketByteBuf;
+import net.minecraft.network.listener.ServerCommonPacketListener;
 import net.minecraft.network.packet.Packet;
-import net.minecraft.unmapped.C_umrqumqp;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_jaewbtca}
  * @mapping {@literal named net/minecraft/network/packet/c2s/play/KeepConnectionAliveC2SPacket}
  */
-public class KeepConnectionAliveC2SPacket implements Packet<C_umrqumqp> {
+public class KeepConnectionAliveC2SPacket implements Packet<ServerCommonPacketListener> {
    /**
     * @mapping {@literal hashed f_awugfswm Lnet/minecraft/unmapped/C_jaewbtca;f_awugfswm:J}
     * @mapping {@literal named id Lnet/minecraft/network/packet/c2s/play/KeepConnectionAliveC2SPacket;id:J}
@@ -25,10 +25,10 @@
 
    /**
     * @mapping {@literal hashed m_macoqdxv Lnet/minecraft/unmapped/C_jaewbtca;m_macoqdxv(Lnet/minecraft/unmapped/C_umrqumqp;)V}
-    * @mapping {@literal named apply Lnet/minecraft/network/packet/c2s/play/KeepConnectionAliveC2SPacket;apply(Lnet/minecraft/unmapped/C_umrqumqp;)V}
+    * @mapping {@literal named apply Lnet/minecraft/network/packet/c2s/play/KeepConnectionAliveC2SPacket;apply(Lnet/minecraft/network/listener/ServerCommonPacketListener;)V}
     */
-   public void apply(C_umrqumqp arg) {
-      arg.m_nvsmwopw(this);
+   public void apply(ServerCommonPacketListener arg) {
+      arg.onKeepConnectionAlive(this);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/network/packet/c2s/play/PlayPongC2SPacket.java namedSrc/net/minecraft/network/packet/c2s/play/PlayPongC2SPacket.java
--- namedTargetSrc/net/minecraft/network/packet/c2s/play/PlayPongC2SPacket.java	2023-08-09 03:13:11.129605726 +0000
+++ namedSrc/net/minecraft/network/packet/c2s/play/PlayPongC2SPacket.java	2023-08-09 03:11:40.888879185 +0000
@@ -1,8 +1,8 @@
 package net.minecraft.network.packet.c2s.play;
 
 import net.minecraft.network.PacketByteBuf;
+import net.minecraft.network.listener.ServerCommonPacketListener;
 import net.minecraft.network.packet.Packet;
-import net.minecraft.unmapped.C_umrqumqp;
 
 /**
  * This is a packet that is sent by the client during tick after receiving a
@@ -16,7 +16,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_sssnpwuj}
  * @mapping {@literal named net/minecraft/network/packet/c2s/play/PlayPongC2SPacket}
  */
-public class PlayPongC2SPacket implements Packet<C_umrqumqp> {
+public class PlayPongC2SPacket implements Packet<ServerCommonPacketListener> {
    /**
     * @mapping {@literal hashed f_ifcafjxl Lnet/minecraft/unmapped/C_sssnpwuj;f_ifcafjxl:I}
     * @mapping {@literal named parameter Lnet/minecraft/network/packet/c2s/play/PlayPongC2SPacket;parameter:I}
@@ -49,10 +49,10 @@
 
    /**
     * @mapping {@literal hashed m_bwjchqpa Lnet/minecraft/unmapped/C_sssnpwuj;m_bwjchqpa(Lnet/minecraft/unmapped/C_umrqumqp;)V}
-    * @mapping {@literal named apply Lnet/minecraft/network/packet/c2s/play/PlayPongC2SPacket;apply(Lnet/minecraft/unmapped/C_umrqumqp;)V}
+    * @mapping {@literal named apply Lnet/minecraft/network/packet/c2s/play/PlayPongC2SPacket;apply(Lnet/minecraft/network/listener/ServerCommonPacketListener;)V}
     */
-   public void apply(C_umrqumqp arg) {
-      arg.m_arpxfksi(this);
+   public void apply(ServerCommonPacketListener arg) {
+      arg.onPlayPong(this);
    }
 
    /**
Only in namedSrc/net/minecraft/network/packet/c2s/play: ReconfigurationAcknowledgementC2SPacket.java
diff -bur namedTargetSrc/net/minecraft/network/packet/c2s/play/ResourcePackStatusUpdateC2SPacket.java namedSrc/net/minecraft/network/packet/c2s/play/ResourcePackStatusUpdateC2SPacket.java
--- namedTargetSrc/net/minecraft/network/packet/c2s/play/ResourcePackStatusUpdateC2SPacket.java	2023-08-09 03:13:11.065605332 +0000
+++ namedSrc/net/minecraft/network/packet/c2s/play/ResourcePackStatusUpdateC2SPacket.java	2023-08-09 03:11:40.804878407 +0000
@@ -1,14 +1,14 @@
 package net.minecraft.network.packet.c2s.play;
 
 import net.minecraft.network.PacketByteBuf;
+import net.minecraft.network.listener.ServerCommonPacketListener;
 import net.minecraft.network.packet.Packet;
-import net.minecraft.unmapped.C_umrqumqp;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_gtifzcur}
  * @mapping {@literal named net/minecraft/network/packet/c2s/play/ResourcePackStatusUpdateC2SPacket}
  */
-public class ResourcePackStatusUpdateC2SPacket implements Packet<C_umrqumqp> {
+public class ResourcePackStatusUpdateC2SPacket implements Packet<ServerCommonPacketListener> {
    /**
     * @mapping {@literal hashed f_cuxmxele Lnet/minecraft/unmapped/C_gtifzcur;f_cuxmxele:Lnet/minecraft/unmapped/C_gtifzcur$C_velualoa;}
     * @mapping {@literal named status Lnet/minecraft/network/packet/c2s/play/ResourcePackStatusUpdateC2SPacket;status:Lnet/minecraft/network/packet/c2s/play/ResourcePackStatusUpdateC2SPacket$Status;}
@@ -41,10 +41,10 @@
 
    /**
     * @mapping {@literal hashed m_ekjjyczh Lnet/minecraft/unmapped/C_gtifzcur;m_ekjjyczh(Lnet/minecraft/unmapped/C_umrqumqp;)V}
-    * @mapping {@literal named apply Lnet/minecraft/network/packet/c2s/play/ResourcePackStatusUpdateC2SPacket;apply(Lnet/minecraft/unmapped/C_umrqumqp;)V}
+    * @mapping {@literal named apply Lnet/minecraft/network/packet/c2s/play/ResourcePackStatusUpdateC2SPacket;apply(Lnet/minecraft/network/listener/ServerCommonPacketListener;)V}
     */
-   public void apply(C_umrqumqp arg) {
-      arg.m_irbdeszu(this);
+   public void apply(ServerCommonPacketListener arg) {
+      arg.onResourcePackStatusUpdate(this);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/network/packet/Packet.java namedSrc/net/minecraft/network/packet/Packet.java
--- namedTargetSrc/net/minecraft/network/packet/Packet.java	2023-08-09 03:13:11.097605529 +0000
+++ namedSrc/net/minecraft/network/packet/Packet.java	2023-08-09 03:11:40.848878814 +0000
@@ -36,10 +36,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_cuvjkrrj Lnet/minecraft/unmapped/C_zyjtrjrl;m_cuvjkrrj()Lnet/minecraft/unmapped/C_kxdobmrm;}
+    * @mapping {@literal named getNextNetworkState Lnet/minecraft/network/packet/Packet;getNextNetworkState()Lnet/minecraft/network/NetworkState;}
     */
    @Nullable
-   default NetworkState m_cuvjkrrj() {
+   default NetworkState getNextNetworkState() {
       return null;
    }
 }
Only in namedSrc/net/minecraft/network/packet: payload


The remaining diff is too long!

Please sign in to comment.