From 39238625a2e2f086e700033e8518f8b6c4bcfb35 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Sat, 20 Jan 2024 02:17:19 +0900 Subject: [PATCH] 24w03a/b networking --- .../network/ClientLoginNetworkHandler.mapping | 7 + .../network/ClientPlayNetworkHandler.mapping | 1 + .../network/ClientConnection.mapping | 38 +++- .../minecraft/network/NetworkState.mapping | 11 +- .../network/NetworkStateBuilder.mapping | 52 +++++ .../network/NetworkStateType.mapping | 5 + .../minecraft/network/PacketByteBuf.mapping | 8 +- .../{codec => }/RegistryByteBuf.mapping | 5 +- .../network/codec/PacketCodec.mapping | 85 +++++++- .../network/codec/PacketCodecs.mapping | 182 ++++++++++++++++-- .../network/codec/PacketDecoder.mapping | 7 + .../network/codec/PacketEncoder.mapping | 7 + .../network/codec/ValueFirstEncoder.mapping | 7 + .../network/encoding/StringEncoding.mapping | 4 +- .../network/handler/DecoderHandler.mapping | 4 + .../network/handler/EncoderHandler.mapping | 9 + .../network/handler/HandlerNames.mapping | 17 ++ .../NetworkStateTransitionHandler.mapping | 6 + .../handler/NetworkStateTransitions.mapping | 36 ++++ .../handler/PacketBundleHandler.mapping | 1 + .../network/handler/PacketBundler.mapping | 2 + .../handler/PacketCodecDispatcher.mapping | 25 +++ .../network/handler/PacketEncoder.mapping | 6 - .../network/handler/PacketUnbundler.mapping | 3 + ...eValidatingDispatchingCodecBuilder.mapping | 9 + .../s2c/common/CustomPayloadS2CPacket.mapping | 6 + .../s2c/login/LoginHelloS2CPacket.mapping | 3 + .../s2c/play/StatisticsS2CPacket.mapping | 2 + .../play/SynchronizeRecipesS2CPacket.mapping | 2 + .../network/state/ConfigurationStates.mapping | 7 + .../network/state/HandshakeStates.mapping | 2 + .../network/state/LoginStates.mapping | 7 + .../network/state/PlayStateFactories.mapping | 7 + .../network/state/QueryStates.mapping | 7 + .../minecraft/server/MinecraftServer.mapping | 1 + .../ServerHandshakeNetworkHandler.mapping | 3 + .../network/ServerLoginNetworkHandler.mapping | 2 + 37 files changed, 552 insertions(+), 34 deletions(-) create mode 100644 mappings/net/minecraft/network/NetworkStateBuilder.mapping create mode 100644 mappings/net/minecraft/network/NetworkStateType.mapping rename mappings/net/minecraft/network/{codec => }/RegistryByteBuf.mapping (65%) create mode 100644 mappings/net/minecraft/network/handler/EncoderHandler.mapping create mode 100644 mappings/net/minecraft/network/handler/HandlerNames.mapping create mode 100644 mappings/net/minecraft/network/handler/NetworkStateTransitions.mapping create mode 100644 mappings/net/minecraft/network/handler/PacketCodecDispatcher.mapping delete mode 100644 mappings/net/minecraft/network/handler/PacketEncoder.mapping create mode 100644 mappings/net/minecraft/network/handler/SideValidatingDispatchingCodecBuilder.mapping create mode 100644 mappings/net/minecraft/network/state/ConfigurationStates.mapping create mode 100644 mappings/net/minecraft/network/state/HandshakeStates.mapping create mode 100644 mappings/net/minecraft/network/state/LoginStates.mapping create mode 100644 mappings/net/minecraft/network/state/PlayStateFactories.mapping create mode 100644 mappings/net/minecraft/network/state/QueryStates.mapping diff --git a/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping index 2d063bcc9a..1488ee1dac 100644 --- a/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping @@ -9,6 +9,8 @@ CLASS net/minecraft/class_635 net/minecraft/client/network/ClientLoginNetworkHan FIELD field_41384 worldLoadTime Ljava/time/Duration; FIELD field_44809 minigameName Ljava/lang/String; FIELD field_46192 state Ljava/util/concurrent/atomic/AtomicReference; + FIELD field_48400 serverCookies Ljava/util/Map; + FIELD field_48401 hasCookies Z METHOD (Lnet/minecraft/class_2535;Lnet/minecraft/class_310;Lnet/minecraft/class_642;Lnet/minecraft/class_437;ZLjava/time/Duration;Ljava/util/function/Consumer;Lnet/minecraft/class_9112;)V ARG 1 connection ARG 2 client @@ -17,6 +19,7 @@ CLASS net/minecraft/class_635 net/minecraft/client/network/ClientLoginNetworkHan ARG 5 newWorld ARG 6 worldLoadTime ARG 7 statusConsumer + ARG 8 cookieStorage METHOD method_2891 getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; METHOD method_2892 joinServerSession (Ljava/lang/String;)Lnet/minecraft/class_2561; ARG 1 serverId @@ -31,6 +34,10 @@ CLASS net/minecraft/class_635 net/minecraft/client/network/ClientLoginNetworkHan ARG 1 state METHOD method_53873 (Lnet/minecraft/class_635$class_8798;Lnet/minecraft/class_635$class_8798;)Lnet/minecraft/class_635$class_8798; ARG 1 currentState + METHOD method_56151 setupEncryption (Lnet/minecraft/class_2917;Ljavax/crypto/Cipher;Ljavax/crypto/Cipher;)V + ARG 1 keyPacket + ARG 2 decryptionCipher + ARG 3 encryptionCipher CLASS class_8798 State FIELD field_46197 name Lnet/minecraft/class_2561; FIELD field_46198 prevStates Ljava/util/Set; diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 10eea89241..f807a20bb2 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -33,6 +33,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand FIELD field_46187 worldCleared Z FIELD field_46578 worldLoadingState Lnet/minecraft/class_8819; FIELD field_47878 scoreboard Lnet/minecraft/class_269; + FIELD field_48403 secureChatEnforced Z METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_2535;Lnet/minecraft/class_8675;)V ARG 1 client METHOD method_16690 getSessionId ()Ljava/util/UUID; diff --git a/mappings/net/minecraft/network/ClientConnection.mapping b/mappings/net/minecraft/network/ClientConnection.mapping index d4048a2965..d818468fde 100644 --- a/mappings/net/minecraft/network/ClientConnection.mapping +++ b/mappings/net/minecraft/network/ClientConnection.mapping @@ -34,6 +34,8 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection FIELD field_45668 queuedTasks Ljava/util/Queue; FIELD field_45669 prePlayStateListener Lnet/minecraft/class_2547; FIELD field_45955 packetSizeLogger Lnet/minecraft/class_8762; + FIELD field_48514 C2S_HANDSHAKE_STATE Lnet/minecraft/class_9127; + FIELD field_48515 duringLogin Z METHOD (Lnet/minecraft/class_2598;)V ARG 1 side METHOD channelActive (Lio/netty/channel/ChannelHandlerContext;)V @@ -122,6 +124,8 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection ARG 0 address ARG 1 useEpoll ARG 2 connection + METHOD method_52900 (Lnet/minecraft/class_9127;Lnet/minecraft/class_8697;Ljava/lang/String;ILnet/minecraft/class_8592;Lnet/minecraft/class_9127;Lnet/minecraft/class_2535;)V + ARG 7 connection METHOD method_52902 connect (Ljava/lang/String;ILnet/minecraft/class_2896;)V ARG 1 address ARG 2 port @@ -133,6 +137,8 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection METHOD method_52904 connect (Ljava/lang/String;ILnet/minecraft/class_9127;Lnet/minecraft/class_9127;Lnet/minecraft/class_8697;Lnet/minecraft/class_8592;)V ARG 1 address ARG 2 port + ARG 3 outboundState + ARG 4 inboundState ARG 5 prePlayStateListener ARG 6 intent METHOD method_52905 submit (Ljava/util/function/Consumer;)V @@ -152,7 +158,8 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection COMMENT Sets the initial packet listener. COMMENT COMMENT @throws IllegalStateException if the listener was already set - COMMENT @see #setPacketListener + COMMENT @see #transitionInbound + COMMENT @see #transitionOutbound ARG 1 packetListener METHOD method_52915 flush ()V METHOD method_52918 flushInternal ()V @@ -163,7 +170,36 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection METHOD method_56326 connect (Ljava/lang/String;ILnet/minecraft/class_9127;Lnet/minecraft/class_9127;Lnet/minecraft/class_8697;Z)V ARG 1 address ARG 2 port + ARG 3 outboundState + ARG 4 inboundState + ARG 5 prePlayStateListener ARG 6 transfer + METHOD method_56327 (Lnet/minecraft/class_8035;Lio/netty/channel/ChannelHandlerContext;)V + ARG 1 context + METHOD method_56328 (Lnet/minecraft/class_8036;Lio/netty/channel/ChannelHandlerContext;)V + ARG 1 context + METHOD method_56329 transitionOutbound (Lnet/minecraft/class_9127;)V + ARG 1 newState + METHOD method_56330 transitionInbound (Lnet/minecraft/class_9127;Lnet/minecraft/class_2547;)V + ARG 1 state + ARG 2 packetListener + METHOD method_56331 (ZLio/netty/channel/ChannelHandlerContext;)V + ARG 2 context + METHOD method_56332 setPacketListener (Lnet/minecraft/class_9127;Lnet/minecraft/class_2547;)V + ARG 1 state + ARG 2 listener + METHOD method_56333 getOutboundHandlerName (Z)Ljava/lang/String; + ARG 0 sendingSide + METHOD method_56334 getInboundHandlerName (Z)Ljava/lang/String; + ARG 0 receivingSide CLASS 1 METHOD initChannel (Lio/netty/channel/Channel;)V ARG 1 channel + CLASS 2 + METHOD write (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Lio/netty/channel/ChannelPromise;)V + ARG 1 context + ARG 2 value + ARG 3 promise + CLASS 3 + 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 0c433547fa..61ea029234 100644 --- a/mappings/net/minecraft/network/NetworkState.mapping +++ b/mappings/net/minecraft/network/NetworkState.mapping @@ -1,5 +1,6 @@ -CLASS net/minecraft/class_2539 net/minecraft/network/NetworkState - FIELD field_20594 stateId Ljava/lang/String; - METHOD (Ljava/lang/String;ILjava/lang/String;)V - ARG 3 stateId - METHOD method_10785 getId ()Ljava/lang/String; +CLASS net/minecraft/class_9127 net/minecraft/network/NetworkState + METHOD comp_2235 side ()Lnet/minecraft/class_2598; + METHOD comp_2237 bundleHandler ()Lnet/minecraft/class_8039; + CLASS class_9128 Factory + METHOD bind (Ljava/util/function/Function;)Lnet/minecraft/class_9127; + ARG 1 registryBinder diff --git a/mappings/net/minecraft/network/NetworkStateBuilder.mapping b/mappings/net/minecraft/network/NetworkStateBuilder.mapping new file mode 100644 index 0000000000..a9dbe02f34 --- /dev/null +++ b/mappings/net/minecraft/network/NetworkStateBuilder.mapping @@ -0,0 +1,52 @@ +CLASS net/minecraft/class_9147 net/minecraft/network/NetworkStateBuilder + FIELD field_48616 type Lnet/minecraft/class_2539; + FIELD field_48617 side Lnet/minecraft/class_2598; + FIELD field_48618 packetTypes Ljava/util/List; + FIELD field_48619 bundleHandler Lnet/minecraft/class_8039; + METHOD (Lnet/minecraft/class_2539;Lnet/minecraft/class_2598;)V + ARG 1 type + ARG 2 side + METHOD method_56447 buildFactory ()Lnet/minecraft/class_9127$class_9128; + METHOD method_56448 (Ljava/util/List;Lnet/minecraft/class_8039;Ljava/util/function/Function;)Lnet/minecraft/class_9127; + ARG 3 bufUpgrader + METHOD method_56449 build (Ljava/util/function/Function;)Lnet/minecraft/class_9127; + ARG 1 bufUpgrader + METHOD method_56450 createCodec (Ljava/util/function/Function;Ljava/util/List;)Lnet/minecraft/class_9139; + ARG 1 bufUpgrader + ARG 2 packetTypes + METHOD method_56451 c2s (Lnet/minecraft/class_2539;Ljava/util/function/Consumer;)Lnet/minecraft/class_9127; + ARG 0 type + ARG 1 registrar + METHOD method_56452 build (Lnet/minecraft/class_2539;Lnet/minecraft/class_2598;Ljava/util/function/Consumer;)Lnet/minecraft/class_9127; + ARG 0 type + ARG 1 side + ARG 2 registrar + METHOD method_56453 addBundle (Lnet/minecraft/class_9145;Ljava/util/function/Function;Lnet/minecraft/class_8037;)Lnet/minecraft/class_9147; + ARG 1 id + ARG 2 bundler + ARG 3 splitter + METHOD method_56454 add (Lnet/minecraft/class_9145;Lnet/minecraft/class_9139;)Lnet/minecraft/class_9147; + ARG 1 id + ARG 2 codec + METHOD method_56455 s2c (Lnet/minecraft/class_2539;Ljava/util/function/Consumer;)Lnet/minecraft/class_9127; + ARG 0 type + ARG 1 registrar + METHOD method_56456 buildFactory (Lnet/minecraft/class_2539;Lnet/minecraft/class_2598;Ljava/util/function/Consumer;)Lnet/minecraft/class_9127$class_9128; + ARG 0 type + ARG 1 side + ARG 2 registrar + METHOD method_56457 c2sFactory (Lnet/minecraft/class_2539;Ljava/util/function/Consumer;)Lnet/minecraft/class_9127$class_9128; + ARG 0 type + ARG 1 registrar + METHOD method_56458 s2cFactory (Lnet/minecraft/class_2539;Ljava/util/function/Consumer;)Lnet/minecraft/class_9127$class_9128; + ARG 0 type + ARG 1 registrar + CLASS class_9148 PacketType + FIELD comp_2232 id Lnet/minecraft/class_9145; + FIELD comp_2233 codec Lnet/minecraft/class_9139; + METHOD comp_2232 id ()Lnet/minecraft/class_9145; + METHOD comp_2233 codec ()Lnet/minecraft/class_9139; + METHOD method_56459 add (Lnet/minecraft/class_9146;Ljava/util/function/Function;)V + ARG 1 builder + ARG 2 bufUpgrader + CLASS class_9149 NetworkStateImpl diff --git a/mappings/net/minecraft/network/NetworkStateType.mapping b/mappings/net/minecraft/network/NetworkStateType.mapping new file mode 100644 index 0000000000..35389f36e2 --- /dev/null +++ b/mappings/net/minecraft/network/NetworkStateType.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_2539 net/minecraft/network/NetworkStateType + FIELD field_20594 stateId Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 stateId + METHOD method_10785 getId ()Ljava/lang/String; diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping index 11fe32153c..b2f2e462a7 100644 --- a/mappings/net/minecraft/network/PacketByteBuf.mapping +++ b/mappings/net/minecraft/network/PacketByteBuf.mapping @@ -15,9 +15,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT Codec-based (JSON){@link #decodeAsJson(Codec)}{@link #encodeAsJson(Codec, Object)} COMMENT COMMENT - COMMENT {@link net.minecraft.registry.Registry} value{@link #readRegistryValue(IndexedIterable)}{@link #writeRegistryValue(IndexedIterable, Object)} - COMMENT - COMMENT COMMENT Integer-identified value{@link #decode(IntFunction)}{@link #encode(ToIntFunction, Object)} COMMENT COMMENT @@ -90,9 +87,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT {@link NbtCompound}{@link #readNbt()}{@link #writeNbt(NbtCompound)} COMMENT COMMENT - COMMENT {@link ItemStack}{@link #readItemStack()}{@link #writeItemStack(ItemStack)} - COMMENT - COMMENT COMMENT {@link String}{@link #readString()}{@link #writeString(String)} COMMENT COMMENT @@ -765,6 +759,8 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @see #readMap(PacketByteBuf.PacketReader, PacketByteBuf.PacketReader) ARG 1 mapFactory COMMENT a factory that creates a map with a given size + ARG 2 keyReader + ARG 3 valueReader METHOD method_34070 (Lnet/minecraft/class_2520;Ljava/lang/String;)Lio/netty/handler/codec/DecoderException; ARG 1 error METHOD method_36130 writeChunkPos (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2540; diff --git a/mappings/net/minecraft/network/codec/RegistryByteBuf.mapping b/mappings/net/minecraft/network/RegistryByteBuf.mapping similarity index 65% rename from mappings/net/minecraft/network/codec/RegistryByteBuf.mapping rename to mappings/net/minecraft/network/RegistryByteBuf.mapping index e296bb567a..46fb88b7e0 100644 --- a/mappings/net/minecraft/network/codec/RegistryByteBuf.mapping +++ b/mappings/net/minecraft/network/RegistryByteBuf.mapping @@ -1,4 +1,7 @@ -CLASS net/minecraft/class_9129 net/minecraft/network/codec/RegistryByteBuf +CLASS net/minecraft/class_9129 net/minecraft/network/RegistryByteBuf + COMMENT A packet byte buffer bound to a particular {@link DynamicRegistryManager} instance. + COMMENT + COMMENT

This is used during the {@link NetworkStateType#PLAY} phase only. FIELD field_48538 registryManager Lnet/minecraft/class_5455; METHOD (Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_5455;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/codec/PacketCodec.mapping b/mappings/net/minecraft/network/codec/PacketCodec.mapping index 67f2bdfe5c..435cf4b9ba 100644 --- a/mappings/net/minecraft/network/codec/PacketCodec.mapping +++ b/mappings/net/minecraft/network/codec/PacketCodec.mapping @@ -1,23 +1,81 @@ CLASS net/minecraft/class_9139 net/minecraft/network/codec/PacketCodec + COMMENT A codec that is used for serializing a packet. + COMMENT + COMMENT

Packet codecs serialize to, and deserialize from, {@link net.minecraft.network.PacketByteBuf}, + COMMENT which is a stream of data. To integrate the classic {@link net.minecraft.network.PacketByteBuf}-based + COMMENT code, use {@link #of(ValueFirstEncoder, PacketDecoder)} + COMMENT like this: + COMMENT + COMMENT 

{@code
+	COMMENT public static final PacketCodec CODEC = PacketCodec.of(MyPacket::write, MyPacket::new);
+	COMMENT
+	COMMENT private MyPacket(PacketByteBuf buf) {
+	COMMENT \tthis.text = buf.readString();
+	COMMENT }
+	COMMENT
+	COMMENT private void write(PacketByteBuf buf) {
+	COMMENT \tbuf.writeString(this.text);
+	COMMENT }
+	COMMENT }
+ COMMENT + COMMENT

While this serves similar functions as codecs in the DataFixerUpper library, + COMMENT the two are wholly separate and DataFixerUpper methods cannot be used with this. + COMMENT However, a packet codec may reference a regular codec by using {@link + COMMENT PacketCodecs#codec}, which serializes the data to NBT. + COMMENT + COMMENT

See {@link PacketCodecs} for codecs to serialize various objects. + COMMENT + COMMENT @param the type of the buffer; {@link net.minecraft.network.RegistryByteBuf} + COMMENT for play-phase packets, {@link net.minecraft.network.PacketByteBuf} for other + COMMENT phases (like configuration) + COMMENT @param the type of the value to be encoded/decoded METHOD method_56430 cast ()Lnet/minecraft/class_9139; METHOD method_56431 unit (Ljava/lang/Object;)Lnet/minecraft/class_9139; + COMMENT {@return a codec that always returns {@code value}} + COMMENT + COMMENT

This does not encode anything. Instead, it throws {@link + COMMENT IllegalStateException} when the value does not + COMMENT equal {@code value}. This comparison is made with {@code equals()}, not + COMMENT reference equality ({@code ==}). ARG 0 value METHOD method_56432 xmap (Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/class_9139; + COMMENT {@return a codec that maps its encode input and decode output with {@code from} + COMMENT and {@code to}, respectively} + COMMENT + COMMENT

This can be used to transform a codec for a simple value (like a string) + COMMENT into a corresponding, more complex value (like an identifier). An example: + COMMENT + COMMENT 

{@code
+		COMMENT public static final PacketCodec PACKET_CODEC = PacketCodecs.STRING.xmap(Identifier::new, Identifier::toString);
+		COMMENT }
ARG 1 to ARG 2 from - METHOD method_56433 mapResult (Lnet/minecraft/class_9139$class_9140;)Lnet/minecraft/class_9139; + METHOD method_56433 collect (Lnet/minecraft/class_9139$class_9140;)Lnet/minecraft/class_9139; + COMMENT {@return the result mapped with {@code function}} + COMMENT + COMMENT

For example, passing {@code PacketCodecs::optional} makes the value + COMMENT optional. Additionally, this method can be used like Stream {@link + COMMENT java.util.stream.Collectors} - hence its name. For example, to make a codec + COMMENT for a list of something, write {@code parentCodec.collect(PacketCodecs.toList())}. + COMMENT + COMMENT @see PacketCodecs#optional + COMMENT @see PacketCodecs#toCollection + COMMENT @see PacketCodecs#toList ARG 1 function METHOD method_56434 tuple (Lnet/minecraft/class_9139;Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/class_9139; + COMMENT {@return a codec for encoding one value} ARG 0 codec ARG 1 from ARG 2 to METHOD method_56435 tuple (Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Ljava/util/function/BiFunction;)Lnet/minecraft/class_9139; + COMMENT {@return a codec for encoding two values} ARG 0 codec1 ARG 1 from1 ARG 2 codec2 ARG 3 from2 ARG 4 to METHOD method_56436 tuple (Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function3;)Lnet/minecraft/class_9139; + COMMENT {@return a codec for encoding three values} ARG 0 codec1 ARG 1 from1 ARG 2 codec2 @@ -26,16 +84,41 @@ CLASS net/minecraft/class_9139 net/minecraft/network/codec/PacketCodec ARG 5 from3 ARG 6 to METHOD method_56437 of (Lnet/minecraft/class_9142;Lnet/minecraft/class_9141;)Lnet/minecraft/class_9139; + COMMENT {@return a packet codec from the {@code encoder} and {@code decoder}} + COMMENT + COMMENT @apiNote This is useful for integrating with code that uses static methods for + COMMENT packet writing, where the buffer is the first argument, like + COMMENT {@code static void write(PacketByteBuf buf, Data data)}. + COMMENT For code that uses instance methods like {@code void write(PacketByteBuf buf)}, + COMMENT use {@link #of(ValueFirstEncoder, PacketDecoder)}. ARG 0 encoder ARG 1 decoder METHOD method_56438 of (Lnet/minecraft/class_9143;Lnet/minecraft/class_9141;)Lnet/minecraft/class_9139; + COMMENT {@return a packet codec from the {@code encoder} and {@code decoder}} + COMMENT + COMMENT @apiNote This is useful for integrating with code that uses instance methods for + COMMENT packet writing, like {@code void write(PacketByteBuf buf)}. + COMMENT For code that uses static methods like {@code static void write(PacketByteBuf buf, Data data)}, + COMMENT where the buffer is the first argument, use {@link #of(PacketEncoder, PacketDecoder)}. ARG 0 encoder ARG 1 decoder METHOD method_56439 mapBuf (Ljava/util/function/Function;)Lnet/minecraft/class_9139; ARG 1 function METHOD method_56440 dispatch (Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/class_9139; + COMMENT {@return a codec that dispatches one of the sub-codecs based on the type} + COMMENT + COMMENT

For example, subtypes of {@link net.minecraft.stat.Stat} requires different values + COMMENT to be serialized, yet it makes sense to use the same codec for all stats. + COMMENT This method should be called on the codec for the "type" - like {@link + COMMENT net.minecraft.stat.StatType}. An example: + COMMENT + COMMENT 

{@code
+		COMMENT public static final PacketCodec> PACKET_CODEC = PacketCodecs.registryValue(RegistryKeys.THING_TYPE).dispatch(Thing::getType, ThingType::getPacketCodec);
+		COMMENT }
ARG 1 type + COMMENT a function that, given a value, returns its "type" ARG 2 codec + COMMENT a function that, given a "type", returns the codec for encoding/decoding the value CLASS class_9140 ResultFunction METHOD apply (Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; ARG 1 codec diff --git a/mappings/net/minecraft/network/codec/PacketCodecs.mapping b/mappings/net/minecraft/network/codec/PacketCodecs.mapping index 2e28545a35..244e502595 100644 --- a/mappings/net/minecraft/network/codec/PacketCodecs.mapping +++ b/mappings/net/minecraft/network/codec/PacketCodecs.mapping @@ -1,51 +1,187 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs + COMMENT A set of pre-defined packet codecs. + COMMENT + COMMENT @see PacketCodec FIELD field_48547 BOOL Lnet/minecraft/class_9139; + COMMENT A codec for a boolean value. + COMMENT + COMMENT @see io.netty.buffer.ByteBuf#readBoolean + COMMENT @see io.netty.buffer.ByteBuf#writeBoolean FIELD field_48548 BYTE Lnet/minecraft/class_9139; + COMMENT A codec for a byte value. + COMMENT + COMMENT @see io.netty.buffer.ByteBuf#readByte + COMMENT @see io.netty.buffer.ByteBuf#writeByte FIELD field_48549 SHORT Lnet/minecraft/class_9139; + COMMENT A codec for a short value. + COMMENT + COMMENT @see io.netty.buffer.ByteBuf#readShort + COMMENT @see io.netty.buffer.ByteBuf#writeShort FIELD field_48550 VAR_INT Lnet/minecraft/class_9139; + COMMENT A codec for a variable-length integer (var int) value. + COMMENT + COMMENT @see net.minecraft.network.PacketByteBuf#readVarInt + COMMENT @see net.minecraft.network.PacketByteBuf#writeVarInt FIELD field_48551 VAR_LONG Lnet/minecraft/class_9139; + COMMENT A codec for a variable-length long (var long) value. + COMMENT + COMMENT @see net.minecraft.network.PacketByteBuf#readVarLong + COMMENT @see net.minecraft.network.PacketByteBuf#writeVarLong FIELD field_48552 FLOAT Lnet/minecraft/class_9139; + COMMENT A codec for a float value. + COMMENT + COMMENT @see io.netty.buffer.ByteBuf#readFloat + COMMENT @see io.netty.buffer.ByteBuf#writeFloat FIELD field_48553 DOUBLE Lnet/minecraft/class_9139; + COMMENT A codec for a double value. + COMMENT + COMMENT @see io.netty.buffer.ByteBuf#readDouble + COMMENT @see io.netty.buffer.ByteBuf#writeDouble FIELD field_48554 STRING Lnet/minecraft/class_9139; + COMMENT A codec for a string value with maximum length {@value Short.MAX_VALUE}. + COMMENT + COMMENT @see #string + COMMENT @see net.minecraft.network.PacketByteBuf#readString() + COMMENT @see net.minecraft.network.PacketByteBuf#writeString(String) FIELD field_48555 NBT_ELEMENT Lnet/minecraft/class_9139; - FIELD field_48556 NBT_COMPUND Lnet/minecraft/class_9139; + COMMENT A codec for an NBT element of unlimited size. + COMMENT + COMMENT @see #nbt + COMMENT @see net.minecraft.network.PacketByteBuf#readNbt(NbtSizeTracker) + COMMENT @see net.minecraft.network.PacketByteBuf#writeNbt(NbtElement) + FIELD field_48556 NBT_COMPOUND Lnet/minecraft/class_9139; + COMMENT A codec for an NBT compound of unlimited size. + COMMENT + COMMENT @see #nbt + COMMENT @see net.minecraft.network.PacketByteBuf#readNbt(NbtSizeTracker) + COMMENT @see net.minecraft.network.PacketByteBuf#writeNbt(NbtElement) FIELD field_48557 OPTIONAL_NBT Lnet/minecraft/class_9139; + COMMENT A codec for an optional NBT compound of up to {@value + COMMENT net.minecraft.network.PacketByteBuf#MAX_READ_NBT_SIZE} bytes. + COMMENT + COMMENT @see #nbt + COMMENT @see net.minecraft.network.PacketByteBuf#readNbt(PacketByteBuf) + COMMENT @see net.minecraft.network.PacketByteBuf#writeNbt(PacketByteBuf, NbtCompound) FIELD field_48558 VECTOR3F Lnet/minecraft/class_9139; - FIELD field_48559 QUATERNION Lnet/minecraft/class_9139; - METHOD method_56363 listMapper ()Lnet/minecraft/class_9139$class_9140; + COMMENT A codec for a {@link org.joml.Vector3f}. + COMMENT + COMMENT @see net.minecraft.network.PacketByteBuf#readVector3f() + COMMENT @see net.minecraft.network.PacketByteBuf#writeVector3f(Vector3f) + FIELD field_48559 QUATERNIONF Lnet/minecraft/class_9139; + COMMENT A codec for a {@link org.joml.Quaternionf}. + COMMENT + COMMENT @see net.minecraft.network.PacketByteBuf#readQuaternionf() + COMMENT @see net.minecraft.network.PacketByteBuf#writeQuaternionf(Quaternionf) + METHOD method_56363 toList ()Lnet/minecraft/class_9139$class_9140; + COMMENT Used to make a codec for a list of values using {@link PacketCodec#collect}. + COMMENT This creates an {@link java.util.ArrayList}, so the decoded result can be modified. + COMMENT + COMMENT

For example, to make a codec for a list of values, write {@code + COMMENT codec.collect(PacketCodecs.toList())}. + COMMENT + COMMENT @see #toCollection METHOD method_56364 string (I)Lnet/minecraft/class_9139; - ARG 0 length - METHOD method_56365 registry (Lnet/minecraft/class_5321;)Lnet/minecraft/class_9139; + COMMENT {@return a codec for a string value with maximum length {@code maxLength}} + COMMENT + COMMENT @see #STRING + COMMENT @see net.minecraft.network.PacketByteBuf#readString(int) + COMMENT @see net.minecraft.network.PacketByteBuf#writeString(String, int) + ARG 0 maxLength + METHOD method_56365 registryValue (Lnet/minecraft/class_5321;)Lnet/minecraft/class_9139; + COMMENT {@return a codec for a {@link net.minecraft.registry.Registry}-registered value} + COMMENT + COMMENT

This codec only works with {@link net.minecraft.network.RegistryByteBuf}, used + COMMENT during the play phase. Consider using {@link #entryOf} for encoding a value of a + COMMENT static registry during login or configuration phases. + COMMENT + COMMENT @implNote The value is serialized as the corresponding raw ID (as {@link #VAR_INT + COMMENT a var int}). + COMMENT + COMMENT @see #entryOf ARG 0 registry METHOD method_56366 registry (Lnet/minecraft/class_5321;Ljava/util/function/Function;)Lnet/minecraft/class_9139; ARG 0 registry ARG 1 registryTransformer METHOD method_56367 registryEntry (Lnet/minecraft/class_5321;Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; + COMMENT {@return a codec for a {@link net.minecraft.registry.entry.RegistryEntry}} + COMMENT + COMMENT

This codec only works with {@link net.minecraft.network.RegistryByteBuf}, used + COMMENT during the play phase. Consider using {@link #entryOf} for encoding a value of a + COMMENT static registry during login or configuration phases. + COMMENT + COMMENT @implNote If the entry is a reference entry, the value is serialized as the + COMMENT corresponding raw ID (as {@link #VAR_INT a var int}). If it is a direct entry, + COMMENT it is encoded using {@code directCodec}. + COMMENT + COMMENT @see #registryValue + COMMENT @see #registryEntry(RegistryKey) ARG 0 registry - ARG 1 fallback - METHOD method_56368 ofCodec (Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_9139; + ARG 1 directCodec + METHOD method_56368 codec (Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_9139; + COMMENT {@return a codec from DataFixerUpper codec {@code codec}} + COMMENT + COMMENT

Internally, the data is serialized as an NBT element of unlimited size. ARG 0 codec METHOD method_56369 (Lcom/mojang/serialization/Codec;Ljava/lang/Object;)Lnet/minecraft/class_2520; ARG 1 value METHOD method_56370 (Lcom/mojang/serialization/Codec;Lnet/minecraft/class_2520;)Ljava/lang/Object; ARG 1 nbt - METHOD method_56371 ofIterable (Lnet/minecraft/class_2359;)Lnet/minecraft/class_9139; + METHOD method_56371 entryOf (Lnet/minecraft/class_2359;)Lnet/minecraft/class_9139; + COMMENT {@return a codec for an entry of {@code iterable}} + COMMENT + COMMENT @see #indexed ARG 0 iterable + METHOD method_56372 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2359; + ARG 0 registry METHOD method_56373 (Ljava/lang/Object;Ljava/lang/String;)Lio/netty/handler/codec/EncoderException; ARG 1 error - METHOD method_56374 collectionMapper (Ljava/util/function/IntFunction;)Lnet/minecraft/class_9139$class_9140; - ARG 0 factory + METHOD method_56374 toCollection (Ljava/util/function/IntFunction;)Lnet/minecraft/class_9139$class_9140; + COMMENT Used to make a codec for a collection of values using {@link PacketCodec#collect}. + COMMENT + COMMENT

For example, to make a codec for a set of values, write {@code + COMMENT codec.collect(PacketCodecs.toCollection(HashSet::new))}. + COMMENT + COMMENT @see #toList + ARG 0 collectionFactory + COMMENT a function that, given the collection's size, returns a new empty collection METHOD method_56375 indexed (Ljava/util/function/IntFunction;Ljava/util/function/ToIntFunction;)Lnet/minecraft/class_9139; - ARG 0 from - ARG 1 to + COMMENT {@return a codec for an indexed value} + COMMENT + COMMENT

An example of an indexed value is an enum. + COMMENT + COMMENT @see net.minecraft.util.function.ValueLists + COMMENT @see net.minecraft.network.PacketByteBuf#encode(ToIntFunction, Object) + COMMENT @see net.minecraft.network.PacketByteBuf#decode(IntFunction) + ARG 0 indexToValue + COMMENT a function that gets a value from its index + ARG 1 valueToIndex + COMMENT a function that gets a value's index METHOD method_56376 collection (Ljava/util/function/IntFunction;Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; + COMMENT {@return a codec for a collection of values} + COMMENT + COMMENT @see net.minecraft.network.PacketByteBuf#readCollection + COMMENT @see net.minecraft.network.PacketByteBuf#writeCollection ARG 0 factory + COMMENT a function that, given the collection's size, returns a new empty collection ARG 1 elementCodec + COMMENT the codec of the collection's elements METHOD method_56377 map (Ljava/util/function/IntFunction;Lnet/minecraft/class_9139;Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; + COMMENT {@return a codec for a map} + COMMENT + COMMENT @see net.minecraft.network.PacketByteBuf#readMap(IntFunction, PacketDecoder, PacketDecoder) + COMMENT @see net.minecraft.network.PacketByteBuf#writeMap(java.util.Map, PacketEncoder, PacketEncoder) ARG 0 factory + COMMENT a function that, given the map's size, returns a new empty map ARG 1 keyCodec + COMMENT the codec for the map's keys ARG 2 valueCodec + COMMENT the codec for the map's values METHOD method_56378 nbt (Ljava/util/function/Supplier;)Lnet/minecraft/class_9139; + COMMENT {@return a codec for an NBT element} + COMMENT + COMMENT @see #NBT_ELEMENT + COMMENT @see net.minecraft.network.PacketByteBuf#readNbt(NbtSizeTracker) + COMMENT @see net.minecraft.network.PacketByteBuf#writeNbt(NbtElement) ARG 0 sizeTracker METHOD method_56379 (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2520; ARG 0 nbt @@ -54,13 +190,35 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs METHOD method_56381 (Lnet/minecraft/class_2520;Ljava/lang/String;)Lio/netty/handler/codec/DecoderException; ARG 1 error METHOD method_56382 optional (Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; + COMMENT {@return a codec wrapping another codec, the value of which is optional} + COMMENT + COMMENT

This can be used with {@link PacketCodec#collect} like + COMMENT {@code codec.collect(PacketCodecs::optional)}. + COMMENT + COMMENT @see net.minecraft.network.PacketByteBuf#readOptional + COMMENT @see net.minecraft.network.PacketByteBuf#writeOptional ARG 0 codec METHOD method_56383 registryEntry (Lnet/minecraft/class_5321;)Lnet/minecraft/class_9139; + COMMENT {@return a codec for a reference {@link net.minecraft.registry.entry.RegistryEntry}} + COMMENT + COMMENT

This codec only works with {@link net.minecraft.network.RegistryByteBuf}, used + COMMENT during the play phase. Consider using {@link #entryOf} for encoding a value of a + COMMENT static registry during login or configuration phases. + COMMENT + COMMENT @implNote The value is serialized as the corresponding raw ID (as {@link #VAR_INT + COMMENT a var int}). This does not handle direct (unregistered) entries. + COMMENT + COMMENT @see #registryValue + COMMENT @see #registryEntry(RegistryKey, PacketCodec) ARG 0 registry METHOD method_56384 (Ljava/util/function/IntFunction;Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; ARG 1 codec METHOD method_56385 (Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; ARG 0 codec + CLASS 7 + METHOD method_56419 (Lnet/minecraft/class_9139;Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_9139;Ljava/lang/Object;Ljava/lang/Object;)V + ARG 3 k + ARG 4 v CLASS 9 METHOD method_56424 getIterable (Lnet/minecraft/class_9129;)Lnet/minecraft/class_2359; ARG 1 buf diff --git a/mappings/net/minecraft/network/codec/PacketDecoder.mapping b/mappings/net/minecraft/network/codec/PacketDecoder.mapping index 370840c930..69c8fc8c47 100644 --- a/mappings/net/minecraft/network/codec/PacketDecoder.mapping +++ b/mappings/net/minecraft/network/codec/PacketDecoder.mapping @@ -1,3 +1,10 @@ CLASS net/minecraft/class_9141 net/minecraft/network/codec/PacketDecoder + COMMENT A functional interface that, given a buffer, decodes a value. + COMMENT + COMMENT

A constructor taking {@link net.minecraft.network.PacketByteBuf} as an + COMMENT argument can be used as a decoder. + COMMENT + COMMENT @see PacketEncoder + COMMENT @see ValueFirstEncoder METHOD decode (Ljava/lang/Object;)Ljava/lang/Object; ARG 1 buf diff --git a/mappings/net/minecraft/network/codec/PacketEncoder.mapping b/mappings/net/minecraft/network/codec/PacketEncoder.mapping index 22bd7f9fd4..3c2b171ebc 100644 --- a/mappings/net/minecraft/network/codec/PacketEncoder.mapping +++ b/mappings/net/minecraft/network/codec/PacketEncoder.mapping @@ -1,4 +1,11 @@ CLASS net/minecraft/class_9142 net/minecraft/network/codec/PacketEncoder + COMMENT A functional interface that, given a buffer and a value, encodes it. + COMMENT + COMMENT

A static method taking {@link net.minecraft.network.PacketByteBuf} and the + COMMENT value as the arguments can be used as an encoder. + COMMENT + COMMENT @see PacketDecoder + COMMENT @see ValueFirstEncoder METHOD encode (Ljava/lang/Object;Ljava/lang/Object;)V ARG 1 buf ARG 2 value diff --git a/mappings/net/minecraft/network/codec/ValueFirstEncoder.mapping b/mappings/net/minecraft/network/codec/ValueFirstEncoder.mapping index ce0f31fdbb..a9d6c0be31 100644 --- a/mappings/net/minecraft/network/codec/ValueFirstEncoder.mapping +++ b/mappings/net/minecraft/network/codec/ValueFirstEncoder.mapping @@ -1,4 +1,11 @@ CLASS net/minecraft/class_9143 net/minecraft/network/codec/ValueFirstEncoder + COMMENT A functional interface that, given a value and a buffer, encodes it. + COMMENT + COMMENT

An instance method taking {@link net.minecraft.network.PacketByteBuf} as an + COMMENT argument can be used as a value-first encoder. + COMMENT + COMMENT @see PacketDecoder + COMMENT @see PacketEncoder METHOD encode (Ljava/lang/Object;Ljava/lang/Object;)V ARG 1 value ARG 2 buf diff --git a/mappings/net/minecraft/network/encoding/StringEncoding.mapping b/mappings/net/minecraft/network/encoding/StringEncoding.mapping index ac356c2865..769946c79c 100644 --- a/mappings/net/minecraft/network/encoding/StringEncoding.mapping +++ b/mappings/net/minecraft/network/encoding/StringEncoding.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_8702 net/minecraft/network/encoding/StringEncoding METHOD method_53012 decode (Lio/netty/buffer/ByteBuf;I)Ljava/lang/String; ARG 0 buf - ARG 1 length + ARG 1 maxLength METHOD method_53013 encode (Lio/netty/buffer/ByteBuf;Ljava/lang/CharSequence;I)V ARG 0 buf ARG 1 string - ARG 2 length + ARG 2 maxLength diff --git a/mappings/net/minecraft/network/handler/DecoderHandler.mapping b/mappings/net/minecraft/network/handler/DecoderHandler.mapping index 5c18a48788..121eb484cc 100644 --- a/mappings/net/minecraft/network/handler/DecoderHandler.mapping +++ b/mappings/net/minecraft/network/handler/DecoderHandler.mapping @@ -1,5 +1,9 @@ CLASS net/minecraft/class_2543 net/minecraft/network/handler/DecoderHandler FIELD field_11715 LOGGER Lorg/slf4j/Logger; + FIELD field_48536 state Lnet/minecraft/class_9127; + METHOD (Lnet/minecraft/class_9127;)V + ARG 1 state METHOD decode (Lio/netty/channel/ChannelHandlerContext;Lio/netty/buffer/ByteBuf;Ljava/util/List;)V + ARG 1 context ARG 2 buf ARG 3 objects diff --git a/mappings/net/minecraft/network/handler/EncoderHandler.mapping b/mappings/net/minecraft/network/handler/EncoderHandler.mapping new file mode 100644 index 0000000000..28d26472c7 --- /dev/null +++ b/mappings/net/minecraft/network/handler/EncoderHandler.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_2545 net/minecraft/network/handler/EncoderHandler + FIELD field_11721 LOGGER Lorg/slf4j/Logger; + FIELD field_48537 state Lnet/minecraft/class_9127; + METHOD (Lnet/minecraft/class_9127;)V + ARG 1 state + METHOD encode (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Lio/netty/buffer/ByteBuf;)V + ARG 1 context + ARG 2 packet + ARG 3 out diff --git a/mappings/net/minecraft/network/handler/HandlerNames.mapping b/mappings/net/minecraft/network/handler/HandlerNames.mapping new file mode 100644 index 0000000000..08b1745a20 --- /dev/null +++ b/mappings/net/minecraft/network/handler/HandlerNames.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/class_9126 net/minecraft/network/handler/HandlerNames + FIELD field_48518 DECOMPRESS Ljava/lang/String; + FIELD field_48519 COMPRESS Ljava/lang/String; + FIELD field_48520 DECODER Ljava/lang/String; + FIELD field_48521 ENCODER Ljava/lang/String; + FIELD field_48522 INBOUND_CONFIG Ljava/lang/String; + FIELD field_48523 OUTBOUND_CONFIG Ljava/lang/String; + FIELD field_48524 SPLITTER Ljava/lang/String; + FIELD field_48525 PREPENDER Ljava/lang/String; + FIELD field_48526 DECRYPT Ljava/lang/String; + FIELD field_48527 ENCRYPT Ljava/lang/String; + FIELD field_48528 UNBUNDLER Ljava/lang/String; + FIELD field_48529 BUNDLER Ljava/lang/String; + FIELD field_48530 PACKET_HANDLER Ljava/lang/String; + FIELD field_48531 TIMEOUT Ljava/lang/String; + FIELD field_48532 LEGACY_QUERY Ljava/lang/String; + FIELD field_48533 LATENCY Ljava/lang/String; diff --git a/mappings/net/minecraft/network/handler/NetworkStateTransitionHandler.mapping b/mappings/net/minecraft/network/handler/NetworkStateTransitionHandler.mapping index 152218ad2d..284a95c1b7 100644 --- a/mappings/net/minecraft/network/handler/NetworkStateTransitionHandler.mapping +++ b/mappings/net/minecraft/network/handler/NetworkStateTransitionHandler.mapping @@ -1 +1,7 @@ CLASS net/minecraft/class_8700 net/minecraft/network/handler/NetworkStateTransitionHandler + METHOD method_56347 onDecoded (Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/class_2596;)V + ARG 0 context + ARG 1 packet + METHOD method_56348 onEncoded (Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/class_2596;)V + ARG 0 context + ARG 1 packet diff --git a/mappings/net/minecraft/network/handler/NetworkStateTransitions.mapping b/mappings/net/minecraft/network/handler/NetworkStateTransitions.mapping new file mode 100644 index 0000000000..1286a331ee --- /dev/null +++ b/mappings/net/minecraft/network/handler/NetworkStateTransitions.mapping @@ -0,0 +1,36 @@ +CLASS net/minecraft/class_9130 net/minecraft/network/handler/NetworkStateTransitions + METHOD method_56352 decoderSwapper (Lio/netty/channel/ChannelInboundHandler;)Lnet/minecraft/class_9130$class_9132; + ARG 0 newDecoder + METHOD method_56353 (Lio/netty/channel/ChannelInboundHandler;Lio/netty/channel/ChannelHandlerContext;)V + ARG 1 context + METHOD method_56354 encoderSwapper (Lio/netty/channel/ChannelOutboundHandler;)Lnet/minecraft/class_9130$class_9134; + ARG 0 newEncoder + METHOD method_56355 (Lio/netty/channel/ChannelOutboundHandler;Lio/netty/channel/ChannelHandlerContext;)V + ARG 1 context + METHOD method_56356 decoderTransitioner (Lnet/minecraft/class_9127;)Lnet/minecraft/class_9130$class_9132; + ARG 0 newState + METHOD method_56357 encoderTransitioner (Lnet/minecraft/class_9127;)Lnet/minecraft/class_9130$class_9134; + ARG 0 newState + CLASS class_9131 InboundConfigurer + METHOD channelRead (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;)V + ARG 1 context + ARG 2 received + METHOD write (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Lio/netty/channel/ChannelPromise;)V + ARG 1 context + ARG 2 received + ARG 3 promise + CLASS class_9132 DecoderTransitioner + METHOD method_56358 (Lnet/minecraft/class_9130$class_9132;Lio/netty/channel/ChannelHandlerContext;)V + ARG 2 context + METHOD run (Lio/netty/channel/ChannelHandlerContext;)V + ARG 1 context + CLASS class_9133 OutboundConfigurer + METHOD write (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Lio/netty/channel/ChannelPromise;)V + ARG 1 context + ARG 2 received + ARG 3 promise + CLASS class_9134 EncoderTransitioner + METHOD method_56359 (Lnet/minecraft/class_9130$class_9134;Lio/netty/channel/ChannelHandlerContext;)V + ARG 2 context + METHOD run (Lio/netty/channel/ChannelHandlerContext;)V + ARG 1 context diff --git a/mappings/net/minecraft/network/handler/PacketBundleHandler.mapping b/mappings/net/minecraft/network/handler/PacketBundleHandler.mapping index 228002cafa..36c47efba6 100644 --- a/mappings/net/minecraft/network/handler/PacketBundleHandler.mapping +++ b/mappings/net/minecraft/network/handler/PacketBundleHandler.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_8039 net/minecraft/network/handler/PacketBundleHandler FIELD field_41878 MAX_PACKETS I METHOD method_48325 create (Lnet/minecraft/class_9145;Ljava/util/function/Function;Lnet/minecraft/class_8037;)Lnet/minecraft/class_8039; + ARG 0 id ARG 1 bundleFunction ARG 2 splitter METHOD method_48326 createBundler (Lnet/minecraft/class_2596;)Lnet/minecraft/class_8039$class_8040; diff --git a/mappings/net/minecraft/network/handler/PacketBundler.mapping b/mappings/net/minecraft/network/handler/PacketBundler.mapping index f836a14a58..b5f0e5bc7b 100644 --- a/mappings/net/minecraft/network/handler/PacketBundler.mapping +++ b/mappings/net/minecraft/network/handler/PacketBundler.mapping @@ -7,3 +7,5 @@ CLASS net/minecraft/class_8035 net/minecraft/network/handler/PacketBundler ARG 1 context ARG 2 packet ARG 3 packets + METHOD method_56346 ensureNotTransitioning (Lnet/minecraft/class_2596;)V + ARG 0 packet diff --git a/mappings/net/minecraft/network/handler/PacketCodecDispatcher.mapping b/mappings/net/minecraft/network/handler/PacketCodecDispatcher.mapping new file mode 100644 index 0000000000..67ea700e0a --- /dev/null +++ b/mappings/net/minecraft/network/handler/PacketCodecDispatcher.mapping @@ -0,0 +1,25 @@ +CLASS net/minecraft/class_9136 net/minecraft/network/handler/PacketCodecDispatcher + FIELD field_48576 UNKNOWN_PACKET_INDEX I + FIELD field_48577 packetIdGetter Ljava/util/function/Function; + FIELD field_48578 packetTypes Ljava/util/List; + FIELD field_48579 typeToIndex Lit/unimi/dsi/fastutil/objects/Object2IntMap; + METHOD (Ljava/util/function/Function;Ljava/util/List;Lit/unimi/dsi/fastutil/objects/Object2IntMap;)V + ARG 1 packetIdGetter + ARG 2 packetTypes + ARG 3 typeToIndex + METHOD method_56427 builder (Ljava/util/function/Function;)Lnet/minecraft/class_9136$class_9137; + ARG 0 packetIdGetter + CLASS class_9137 Builder + FIELD field_48580 packetTypes Ljava/util/List; + FIELD field_48581 packetIdGetter Ljava/util/function/Function; + METHOD (Ljava/util/function/Function;)V + ARG 1 packetIdGetter + METHOD method_56428 build ()Lnet/minecraft/class_9136; + METHOD method_56429 add (Ljava/lang/Object;Lnet/minecraft/class_9139;)Lnet/minecraft/class_9136$class_9137; + ARG 1 id + ARG 2 codec + CLASS class_9138 PacketType + FIELD comp_2228 codec Lnet/minecraft/class_9139; + FIELD comp_2229 id Ljava/lang/Object; + METHOD comp_2228 codec ()Lnet/minecraft/class_9139; + METHOD comp_2229 id ()Ljava/lang/Object; diff --git a/mappings/net/minecraft/network/handler/PacketEncoder.mapping b/mappings/net/minecraft/network/handler/PacketEncoder.mapping deleted file mode 100644 index 76b6c2ecfa..0000000000 --- a/mappings/net/minecraft/network/handler/PacketEncoder.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_2545 net/minecraft/network/handler/PacketEncoder - FIELD field_11721 LOGGER Lorg/slf4j/Logger; - METHOD encode (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Lio/netty/buffer/ByteBuf;)V - ARG 1 ctx - ARG 2 packet - ARG 3 out diff --git a/mappings/net/minecraft/network/handler/PacketUnbundler.mapping b/mappings/net/minecraft/network/handler/PacketUnbundler.mapping index 7f6c9e8090..acfe517bf9 100644 --- a/mappings/net/minecraft/network/handler/PacketUnbundler.mapping +++ b/mappings/net/minecraft/network/handler/PacketUnbundler.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_8036 net/minecraft/network/handler/PacketUnbundler + FIELD field_48535 bundleHandler Lnet/minecraft/class_8039; + METHOD (Lnet/minecraft/class_8039;)V + ARG 1 bundleHandler METHOD encode (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Ljava/util/List;)V ARG 1 context ARG 2 packet diff --git a/mappings/net/minecraft/network/handler/SideValidatingDispatchingCodecBuilder.mapping b/mappings/net/minecraft/network/handler/SideValidatingDispatchingCodecBuilder.mapping new file mode 100644 index 0000000000..940b483221 --- /dev/null +++ b/mappings/net/minecraft/network/handler/SideValidatingDispatchingCodecBuilder.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_9146 net/minecraft/network/handler/SideValidatingDispatchingCodecBuilder + FIELD field_48614 backingBuilder Lnet/minecraft/class_9136$class_9137; + FIELD field_48615 side Lnet/minecraft/class_2598; + METHOD (Lnet/minecraft/class_2598;)V + ARG 1 side + METHOD method_56445 build ()Lnet/minecraft/class_9139; + METHOD method_56446 add (Lnet/minecraft/class_9145;Lnet/minecraft/class_9139;)Lnet/minecraft/class_9146; + ARG 1 id + ARG 2 codec diff --git a/mappings/net/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket.mapping index 900ec290dd..9499766a54 100644 --- a/mappings/net/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket.mapping @@ -1,2 +1,8 @@ CLASS net/minecraft/class_2658 net/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket FIELD field_33326 MAX_PAYLOAD_SIZE I + FIELD field_48620 PLAY_CODEC Lnet/minecraft/class_9139; + FIELD field_48621 CONFIGURATION_CODEC Lnet/minecraft/class_9139; + METHOD method_56460 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_9139; + ARG 0 id + METHOD method_56461 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_9139; + ARG 0 id diff --git a/mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping index f3e63a668a..c3ddd125fd 100644 --- a/mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping @@ -3,10 +3,12 @@ CLASS net/minecraft/class_2905 net/minecraft/network/packet/s2c/login/LoginHello FIELD field_13210 nonce [B FIELD field_13211 publicKey [B FIELD field_48234 CODEC Lnet/minecraft/class_9139; + FIELD field_48235 needsAuthentication Z METHOD (Ljava/lang/String;[B[BZ)V ARG 1 serverId ARG 2 publicKey ARG 3 nonce + ARG 4 needsAuthentication METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_12610 getServerId ()Ljava/lang/String; @@ -14,3 +16,4 @@ CLASS net/minecraft/class_2905 net/minecraft/network/packet/s2c/login/LoginHello METHOD method_12613 getNonce ()[B METHOD method_56012 write (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_56013 needsAuthentication ()Z diff --git a/mappings/net/minecraft/network/packet/s2c/play/StatisticsS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/StatisticsS2CPacket.mapping index 1b14c63248..584cd31f94 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/StatisticsS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/StatisticsS2CPacket.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_2617 net/minecraft/network/packet/s2c/play/StatisticsS2CPacket FIELD comp_2197 stats Lit/unimi/dsi/fastutil/objects/Object2IntMap; + FIELD field_47899 CODEC Lnet/minecraft/class_9139; + FIELD field_47900 STAT_MAP_CODEC Lnet/minecraft/class_9139; METHOD comp_2197 stats ()Lit/unimi/dsi/fastutil/objects/Object2IntMap; diff --git a/mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping index c10273b0da..5c3cabd35c 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping @@ -4,3 +4,5 @@ CLASS net/minecraft/class_2788 net/minecraft/network/packet/s2c/play/Synchronize METHOD (Ljava/util/Collection;)V ARG 1 recipes METHOD method_11998 getRecipes ()Ljava/util/List; + METHOD method_55955 (Lnet/minecraft/class_2788;)Ljava/util/List; + ARG 0 packet diff --git a/mappings/net/minecraft/network/state/ConfigurationStates.mapping b/mappings/net/minecraft/network/state/ConfigurationStates.mapping new file mode 100644 index 0000000000..1ed5d06f86 --- /dev/null +++ b/mappings/net/minecraft/network/state/ConfigurationStates.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_9157 net/minecraft/network/state/ConfigurationStates + FIELD field_48698 C2S Lnet/minecraft/class_9127; + FIELD field_48699 S2C Lnet/minecraft/class_9127; + METHOD method_56512 (Lnet/minecraft/class_9147;)V + ARG 0 builder + METHOD method_56513 (Lnet/minecraft/class_9147;)V + ARG 0 builder diff --git a/mappings/net/minecraft/network/state/HandshakeStates.mapping b/mappings/net/minecraft/network/state/HandshakeStates.mapping new file mode 100644 index 0000000000..b0a15d0f10 --- /dev/null +++ b/mappings/net/minecraft/network/state/HandshakeStates.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_9097 net/minecraft/network/state/HandshakeStates + FIELD field_48231 C2S Lnet/minecraft/class_9127; diff --git a/mappings/net/minecraft/network/state/LoginStates.mapping b/mappings/net/minecraft/network/state/LoginStates.mapping new file mode 100644 index 0000000000..80814b4ae8 --- /dev/null +++ b/mappings/net/minecraft/network/state/LoginStates.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_9099 net/minecraft/network/state/LoginStates + FIELD field_48247 C2S Lnet/minecraft/class_9127; + FIELD field_48248 S2C Lnet/minecraft/class_9127; + METHOD method_56018 (Lnet/minecraft/class_9147;)V + ARG 0 builder + METHOD method_56019 (Lnet/minecraft/class_9147;)V + ARG 0 builder diff --git a/mappings/net/minecraft/network/state/PlayStateFactories.mapping b/mappings/net/minecraft/network/state/PlayStateFactories.mapping new file mode 100644 index 0000000000..e909e8141e --- /dev/null +++ b/mappings/net/minecraft/network/state/PlayStateFactories.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_9095 net/minecraft/network/state/PlayStateFactories + FIELD field_48172 C2S Lnet/minecraft/class_9127$class_9128; + FIELD field_48173 S2C Lnet/minecraft/class_9127$class_9128; + METHOD method_55958 (Lnet/minecraft/class_9147;)V + ARG 0 builder + METHOD method_55959 (Lnet/minecraft/class_9147;)V + ARG 0 builder diff --git a/mappings/net/minecraft/network/state/QueryStates.mapping b/mappings/net/minecraft/network/state/QueryStates.mapping new file mode 100644 index 0000000000..933901f95d --- /dev/null +++ b/mappings/net/minecraft/network/state/QueryStates.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_9103 net/minecraft/network/state/QueryStates + FIELD field_48263 C2S Lnet/minecraft/class_9127; + FIELD field_48264 S2C Lnet/minecraft/class_9127; + METHOD method_56029 (Lnet/minecraft/class_9147;)V + ARG 0 builder + METHOD method_56030 (Lnet/minecraft/class_9147;)V + ARG 0 builder diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index ea6998daa7..c1ca9732ff 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -450,6 +450,7 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_54834 getAverageNanosPerTick ()J METHOD method_54835 getTickTimes ()[J METHOD method_54837 getAutosaveInterval ()I + METHOD method_56040 acceptsTransfers ()Z CLASS class_6414 DebugStart FIELD field_33980 time J FIELD field_33981 tick I diff --git a/mappings/net/minecraft/server/network/ServerHandshakeNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerHandshakeNetworkHandler.mapping index acf0c45870..0429bfa0bd 100644 --- a/mappings/net/minecraft/server/network/ServerHandshakeNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerHandshakeNetworkHandler.mapping @@ -5,3 +5,6 @@ CLASS net/minecraft/class_3246 net/minecraft/server/network/ServerHandshakeNetwo METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;)V ARG 1 server ARG 2 connection + METHOD method_56048 login (Lnet/minecraft/class_2889;Z)V + ARG 1 packet + ARG 2 transfer diff --git a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping index 9995d97309..94f01b41f6 100644 --- a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping @@ -23,9 +23,11 @@ CLASS net/minecraft/class_3248 net/minecraft/server/network/ServerLoginNetworkHa FIELD field_29779 TIMEOUT_TICKS I FIELD field_45028 profileName Ljava/lang/String; FIELD field_45029 profile Lcom/mojang/authlib/GameProfile; + FIELD field_48275 transferred Z METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;Z)V ARG 1 server ARG 2 connection + ARG 3 transferred METHOD method_14380 disconnect (Lnet/minecraft/class_2561;)V ARG 1 reason METHOD method_14383 getConnectionInfo ()Ljava/lang/String;