diff --git a/mappings/net/minecraft/network/encoding/VarInts.mapping b/mappings/net/minecraft/network/encoding/VarInts.mapping index 89a44e6cae..c8fcc6e539 100644 --- a/mappings/net/minecraft/network/encoding/VarInts.mapping +++ b/mappings/net/minecraft/network/encoding/VarInts.mapping @@ -1,4 +1,8 @@ CLASS net/minecraft/class_8703 net/minecraft/network/encoding/VarInts + FIELD field_45682 MAX_BYTES I + FIELD field_45683 DATA_BITS_MASK I + FIELD field_45684 MORE_BITS_MASK I + FIELD field_45685 DATA_BITS_PER_BYTE I METHOD method_53014 shouldContinueRead (B)Z ARG 0 b METHOD method_53015 getSizeInBytes (I)I diff --git a/mappings/net/minecraft/network/encoding/VarLongs.mapping b/mappings/net/minecraft/network/encoding/VarLongs.mapping index 3d2c0255a7..6ed9cc070e 100644 --- a/mappings/net/minecraft/network/encoding/VarLongs.mapping +++ b/mappings/net/minecraft/network/encoding/VarLongs.mapping @@ -1,4 +1,8 @@ CLASS net/minecraft/class_8704 net/minecraft/network/encoding/VarLongs + FIELD field_45686 MAX_BYTES I + FIELD field_45687 DATA_BITS_MASK I + FIELD field_45688 MORE_BITS_MASK I + FIELD field_45689 DATA_BITS_PER_BYTE I METHOD method_53018 shouldContinueRead (B)Z ARG 0 b METHOD method_53019 getSizeInBytes (J)I diff --git a/mappings/net/minecraft/network/listener/ClientCommonPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientCommonPacketListener.mapping index b789f941d4..5e06768666 100644 --- a/mappings/net/minecraft/network/listener/ClientCommonPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientCommonPacketListener.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_8705 net/minecraft/network/listener/ClientCommonPacket ARG 1 packet METHOD method_52782 onKeepAlive (Lnet/minecraft/class_2670;)V ARG 1 packet - METHOD method_52783 onPlayPing (Lnet/minecraft/class_6373;)V + METHOD method_52783 onPing (Lnet/minecraft/class_6373;)V ARG 1 packet METHOD method_52784 onResourcePackSend (Lnet/minecraft/class_2720;)V ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/ServerCommonPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerCommonPacketListener.mapping index 0474e2aa6a..60a28fc960 100644 --- a/mappings/net/minecraft/network/listener/ServerCommonPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ServerCommonPacketListener.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_8706 net/minecraft/network/listener/ServerCommonPacket ARG 1 packet METHOD method_52393 onKeepAlive (Lnet/minecraft/class_2827;)V ARG 1 packet - METHOD method_52394 onPlayPong (Lnet/minecraft/class_6374;)V + METHOD method_52394 onPong (Lnet/minecraft/class_6374;)V ARG 1 packet METHOD method_52395 onResourcePackStatus (Lnet/minecraft/class_2856;)V ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/TickablePacketListener.mapping b/mappings/net/minecraft/network/listener/TickablePacketListener.mapping index f48774880f..ed5deb088e 100644 --- a/mappings/net/minecraft/network/listener/TickablePacketListener.mapping +++ b/mappings/net/minecraft/network/listener/TickablePacketListener.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/class_7633 net/minecraft/network/listener/TickablePacketListener METHOD method_18784 tick ()V + COMMENT Ticks this packet listener on the game engine thread. The listener is responsible + COMMENT for synchronizing between the game engine and netty event loop threads. diff --git a/mappings/net/minecraft/network/packet/s2c/custom/BrandCustomPayload.mapping b/mappings/net/minecraft/network/packet/BrandCustomPayload.mapping similarity index 54% rename from mappings/net/minecraft/network/packet/s2c/custom/BrandCustomPayload.mapping rename to mappings/net/minecraft/network/packet/BrandCustomPayload.mapping index 617bb40599..aa686fa783 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/BrandCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/BrandCustomPayload.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_8709 net/minecraft/network/packet/s2c/custom/BrandCustomPayload +CLASS net/minecraft/class_8709 net/minecraft/network/packet/BrandCustomPayload FIELD field_45697 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/Packet.mapping b/mappings/net/minecraft/network/packet/Packet.mapping index 1803a15677..b8e76d2dea 100644 --- a/mappings/net/minecraft/network/packet/Packet.mapping +++ b/mappings/net/minecraft/network/packet/Packet.mapping @@ -9,3 +9,7 @@ CLASS net/minecraft/class_2596 net/minecraft/network/packet/Packet METHOD method_52273 getNewNetworkState ()Lnet/minecraft/class_2539; COMMENT {@return a new network state to transition to, or {@code null} COMMENT to indicate no state change} + COMMENT

+ COMMENT The state transition is done on both the sender and receiver sides, but it + COMMENT is only in one direction (out of C2S and S2C). Another packet must be processed + COMMENT in the reverse direction to ensure the state in both directions are updated. diff --git a/mappings/net/minecraft/network/packet/c2s/common/PlayPongC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/common/CommonPongC2SPacket.mapping similarity index 84% rename from mappings/net/minecraft/network/packet/c2s/common/PlayPongC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/common/CommonPongC2SPacket.mapping index 6498d8929a..6d8fc78918 100644 --- a/mappings/net/minecraft/network/packet/c2s/common/PlayPongC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/common/CommonPongC2SPacket.mapping @@ -1,9 +1,9 @@ -CLASS net/minecraft/class_6374 net/minecraft/network/packet/c2s/common/PlayPongC2SPacket +CLASS net/minecraft/class_6374 net/minecraft/network/packet/c2s/common/CommonPongC2SPacket COMMENT This is a packet that is sent by the client during tick after receiving a COMMENT play ping packet from the server, passing the {@link #parameter} back to the COMMENT server. COMMENT - COMMENT @see net.minecraft.network.packet.s2c.common.PlayPingS2CPacket + COMMENT @see net.minecraft.network.packet.s2c.common.CommonPingS2CPacket COMMENT @see net.minecraft.network.packet.c2s.common.KeepAliveC2SPacket COMMENT @see net.minecraft.network.packet.c2s.query.QueryPingC2SPacket FIELD field_33752 parameter I diff --git a/mappings/net/minecraft/network/ConnectionIntent.mapping b/mappings/net/minecraft/network/packet/c2s/handshake/ConnectionIntent.mapping similarity index 70% rename from mappings/net/minecraft/network/ConnectionIntent.mapping rename to mappings/net/minecraft/network/packet/c2s/handshake/ConnectionIntent.mapping index 0c2775a935..fd40468685 100644 --- a/mappings/net/minecraft/network/ConnectionIntent.mapping +++ b/mappings/net/minecraft/network/packet/c2s/handshake/ConnectionIntent.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_8592 net/minecraft/network/ConnectionIntent +CLASS net/minecraft/class_8592 net/minecraft/network/packet/c2s/handshake/ConnectionIntent FIELD field_44976 STATUS_ID I FIELD field_44977 LOGIN_ID I METHOD method_52283 getId ()I diff --git a/mappings/net/minecraft/network/packet/s2c/common/PlayPingS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/CommonPingS2CPacket.mapping similarity index 89% rename from mappings/net/minecraft/network/packet/s2c/common/PlayPingS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/common/CommonPingS2CPacket.mapping index 051150ddd1..888fd562f5 100644 --- a/mappings/net/minecraft/network/packet/s2c/common/PlayPingS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/CommonPingS2CPacket.mapping @@ -1,8 +1,8 @@ -CLASS net/minecraft/class_6373 net/minecraft/network/packet/s2c/common/PlayPingS2CPacket +CLASS net/minecraft/class_6373 net/minecraft/network/packet/s2c/common/CommonPingS2CPacket COMMENT A packet sent by the server; the client will reply with a pong packet on the COMMENT first tick after it receives this packet, with the same {@link #parameter}. COMMENT - COMMENT @see net.minecraft.network.packet.c2s.common.PlayPongC2SPacket + COMMENT @see net.minecraft.network.packet.c2s.common.CommonPongC2SPacket COMMENT @see net.minecraft.network.packet.s2c.common.KeepAliveS2CPacket COMMENT @see net.minecraft.network.packet.s2c.query.QueryPongS2CPacket FIELD field_33751 parameter I diff --git a/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping index 45515d5f68..2de5813176 100644 --- a/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping @@ -13,6 +13,6 @@ CLASS net/minecraft/class_8610 net/minecraft/server/network/ServerConfigurationN METHOD method_52407 (Lnet/minecraft/server/MinecraftServer$class_7460;)V ARG 1 properties METHOD method_52409 sendConfigurations ()V - METHOD method_52410 queueJoinWorldTask ()V + METHOD method_52410 endConfiguration ()V METHOD method_52411 queueSendResourcePackTask ()V METHOD method_52412 pollTask ()V diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index 210f90e230..576c362e52 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -187,6 +187,8 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan METHOD method_46366 (Lnet/minecraft/class_7822;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; ARG 2 executor METHOD method_48107 getConnectionAddress ()Ljava/net/SocketAddress; + METHOD method_52414 reconfigurate ()V + METHOD method_52415 cleanUp ()V CLASS 1 METHOD method_33897 processInteract (Lnet/minecraft/class_1268;Lnet/minecraft/class_3244$class_5860;)V ARG 1 hand