diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index bd9f60bda6..f3035e46f3 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -161,3 +161,4 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand METHOD method_47657 updateKeyPair (Lnet/minecraft/class_7427;)V ARG 1 keyPair METHOD method_47658 clearWorld ()V + METHOD method_48296 getConnection ()Lnet/minecraft/class_2535; diff --git a/mappings/net/minecraft/network/ClientConnection.mapping b/mappings/net/minecraft/network/ClientConnection.mapping index a653fb393e..18ddaebea8 100644 --- a/mappings/net/minecraft/network/ClientConnection.mapping +++ b/mappings/net/minecraft/network/ClientConnection.mapping @@ -124,6 +124,9 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection ARG 0 marker METHOD method_45082 (Lnet/minecraft/class_7648;Lio/netty/util/concurrent/Future;)V ARG 2 future + METHOD method_48311 addHandlers (Lio/netty/channel/ChannelPipeline;Lnet/minecraft/class_2598;)V + ARG 0 pipeline + ARG 1 side CLASS 1 METHOD initChannel (Lio/netty/channel/Channel;)V ARG 1 channel diff --git a/mappings/net/minecraft/network/NetworkState.mapping b/mappings/net/minecraft/network/NetworkState.mapping index d01a1f6e0f..db3b698710 100644 --- a/mappings/net/minecraft/network/NetworkState.mapping +++ b/mappings/net/minecraft/network/NetworkState.mapping @@ -35,6 +35,8 @@ CLASS net/minecraft/class_2539 net/minecraft/network/NetworkState FIELD field_20596 packetIds Lit/unimi/dsi/fastutil/objects/Object2IntMap; FIELD field_20597 packetFactories Ljava/util/List; FIELD field_36381 LOGGER Lorg/slf4j/Logger; + FIELD field_41867 bundler Lnet/minecraft/class_8039; + FIELD field_41868 bundlePacketTypes Ljava/util/Set; METHOD method_22310 createPacket (ILnet/minecraft/class_2540;)Lnet/minecraft/class_2596; ARG 1 id ARG 2 buf @@ -45,6 +47,16 @@ CLASS net/minecraft/class_2539 net/minecraft/network/NetworkState METHOD method_22313 register (Ljava/lang/Class;Ljava/util/function/Function;)Lnet/minecraft/class_2539$class_4532; ARG 1 type ARG 2 packetFactory + METHOD method_48313 getBundler ()Lnet/minecraft/class_8039; + METHOD method_48314 forEachPacketType (Ljava/util/function/Consumer;)V + ARG 1 consumer + METHOD method_48315 (Lnet/minecraft/class_8037;Lnet/minecraft/class_2540;)Lnet/minecraft/class_8037; + ARG 1 buf + METHOD method_48316 (Ljava/lang/Class;)Z + ARG 0 type + METHOD method_48317 registerBundlePacket (Ljava/lang/Class;Ljava/util/function/Function;)Lnet/minecraft/class_2539$class_4532; + ARG 1 bundlePacketType + ARG 2 bundleFunction CLASS class_4533 PacketHandlerInitializer FIELD field_20598 packetHandlers Ljava/util/Map; METHOD method_22315 setup (Lnet/minecraft/class_2598;Lnet/minecraft/class_2539$class_4532;)Lnet/minecraft/class_2539$class_4533; diff --git a/mappings/net/minecraft/network/PacketBundleHandler.mapping b/mappings/net/minecraft/network/PacketBundleHandler.mapping new file mode 100644 index 0000000000..472818be52 --- /dev/null +++ b/mappings/net/minecraft/network/PacketBundleHandler.mapping @@ -0,0 +1,22 @@ +CLASS net/minecraft/class_8039 net/minecraft/network/PacketBundleHandler + FIELD field_41877 KEY Lio/netty/util/AttributeKey; + FIELD field_41878 MAX_PACKETS I + FIELD field_41879 NOOP Lnet/minecraft/class_8039; + METHOD method_48325 create (Ljava/lang/Class;Ljava/util/function/Function;Lnet/minecraft/class_8037;)Lnet/minecraft/class_8039; + ARG 0 bundlePacketType + ARG 1 bundleFunction + ARG 2 splitter + METHOD method_48326 createBundler (Lnet/minecraft/class_2596;)Lnet/minecraft/class_8039$class_8040; + ARG 1 splitter + METHOD method_48327 forEachPacket (Lnet/minecraft/class_2596;Ljava/util/function/Consumer;)V + ARG 1 packet + ARG 2 consumer + CLASS 2 + CLASS 1 + FIELD field_41884 packets Ljava/util/List; + CLASS class_8040 Bundler + METHOD method_48328 add (Lnet/minecraft/class_2596;)Lnet/minecraft/class_2596; + ARG 1 packet + CLASS class_8041 BundlerGetter + METHOD method_48312 getBundler (Lnet/minecraft/class_2598;)Lnet/minecraft/class_8039; + ARG 1 side diff --git a/mappings/net/minecraft/network/PacketBundler.mapping b/mappings/net/minecraft/network/PacketBundler.mapping new file mode 100644 index 0000000000..17bc1ca2ef --- /dev/null +++ b/mappings/net/minecraft/network/PacketBundler.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_8035 net/minecraft/network/PacketBundler + FIELD field_41869 currentBundler Lnet/minecraft/class_8039$class_8040; + FIELD field_41870 bundleHandler Lnet/minecraft/class_8039; + FIELD field_41871 side Lnet/minecraft/class_2598; + METHOD (Lnet/minecraft/class_2598;)V + ARG 1 side + METHOD decode (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Ljava/util/List;)V + ARG 1 context + ARG 2 packet + ARG 3 packets diff --git a/mappings/net/minecraft/network/PacketUnbundler.mapping b/mappings/net/minecraft/network/PacketUnbundler.mapping new file mode 100644 index 0000000000..1c787f6cd6 --- /dev/null +++ b/mappings/net/minecraft/network/PacketUnbundler.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_8036 net/minecraft/network/PacketUnbundler + FIELD field_41872 side Lnet/minecraft/class_2598; + METHOD (Lnet/minecraft/class_2598;)V + ARG 1 side + METHOD encode (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Ljava/util/List;)V + ARG 1 context + ARG 2 packet + ARG 3 packets diff --git a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping index 2e9eb271a9..efee939566 100644 --- a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping @@ -211,7 +211,7 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_45728 onFeatures (Lnet/minecraft/class_7832;)V ARG 1 packet - METHOD method_48294 onBundlePacket (Lnet/minecraft/class_8042;)V + METHOD method_48294 onBundle (Lnet/minecraft/class_8042;)V ARG 1 packet METHOD method_48295 onDamageTilt (Lnet/minecraft/class_8043;)V ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/PacketListener.mapping b/mappings/net/minecraft/network/listener/PacketListener.mapping index d94ed7d8d3..f2c6969e37 100644 --- a/mappings/net/minecraft/network/listener/PacketListener.mapping +++ b/mappings/net/minecraft/network/listener/PacketListener.mapping @@ -21,3 +21,4 @@ CLASS net/minecraft/class_2547 net/minecraft/network/listener/PacketListener COMMENT code will be unaffected, and always gets logged without crashing. COMMENT COMMENT @see ServerPacketListener + METHOD method_48106 isConnectionOpen ()Z diff --git a/mappings/net/minecraft/network/packet/BundleSplitterPacket.mapping b/mappings/net/minecraft/network/packet/BundleSplitterPacket.mapping new file mode 100644 index 0000000000..3c36da7d9a --- /dev/null +++ b/mappings/net/minecraft/network/packet/BundleSplitterPacket.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8037 net/minecraft/network/packet/BundleSplitterPacket diff --git a/mappings/net/minecraft/network/packet/s2c/play/BundleS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BundleS2CPacket.mapping new file mode 100644 index 0000000000..f3d2a98c73 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/BundleS2CPacket.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_8042 net/minecraft/network/packet/s2c/play/BundleS2CPacket diff --git a/mappings/net/minecraft/network/packet/s2c/play/Flag.mapping b/mappings/net/minecraft/network/packet/s2c/play/PositionFlag.mapping similarity index 95% rename from mappings/net/minecraft/network/packet/s2c/play/Flag.mapping rename to mappings/net/minecraft/network/packet/s2c/play/PositionFlag.mapping index 7b2b880201..143a426f14 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/Flag.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PositionFlag.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2709 net/minecraft/network/packet/s2c/play/Flag +CLASS net/minecraft/class_2709 net/minecraft/network/packet/s2c/play/PositionFlag FIELD field_12399 shift I FIELD field_40710 VALUES Ljava/util/Set; FIELD field_40711 ROT Ljava/util/Set; diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index 9d8756d15a..5d6549d27f 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -206,6 +206,7 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan ARG 1 session 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; CLASS 1 METHOD method_33897 processInteract (Lnet/minecraft/class_1268;Lnet/minecraft/class_3244$class_5860;)V ARG 1 hand