From 3f333bf3279f670a79554152d3bf4ce9deee38ef Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Sun, 6 Aug 2023 08:18:31 +0900 Subject: [PATCH] 23w31a more networking (#3621) --- mappings/net/minecraft/nbt/NbtIo.mapping | 39 ++++++++++++++-- .../minecraft/network/PacketByteBuf.mapping | 29 ++++++------ .../listener/ServerPlayPacketListener.mapping | 2 +- .../c2s/common/PlayPongC2SPacket.mapping | 4 +- .../login/LoginQueryResponseC2SPacket.mapping | 10 ++--- ...ping => LoginQueryResponsePayload.mapping} | 2 +- ... UnknownLoginQueryResponsePayload.mapping} | 2 +- ...ing => AcknowledgeChunksC2SPacket.mapping} | 2 +- .../s2c/common/PlayPingS2CPacket.mapping | 4 +- .../DebugStructuresCustomPayload.mapping | 15 +++++++ .../server/network/ChunkDataSender.mapping | 29 +++++++++++- .../server/network/ChunkFilter.mapping | 44 +++++++++++++++++++ .../server/network/DebugInfoSender.mapping | 1 + .../PlayerAssociatedNetworkHandler.mapping | 4 ++ .../server/network/ServerPlayerEntity.mapping | 4 ++ .../world/EntityTrackingListener.mapping | 5 --- .../world/PlayerChunkWatchingManager.mapping | 3 ++ .../world/ThreadedAnvilChunkStorage.mapping | 31 +++++++++++++ 18 files changed, 193 insertions(+), 37 deletions(-) rename mappings/net/minecraft/network/packet/c2s/login/{LoginQueryResponse.mapping => LoginQueryResponsePayload.mapping} (80%) rename mappings/net/minecraft/network/packet/c2s/login/{EmptyLoginQueryResponse.mapping => UnknownLoginQueryResponsePayload.mapping} (75%) rename mappings/net/minecraft/network/packet/c2s/play/{ChunkBatchSizeC2SPacket.mapping => AcknowledgeChunksC2SPacket.mapping} (79%) create mode 100644 mappings/net/minecraft/server/network/ChunkFilter.mapping create mode 100644 mappings/net/minecraft/server/network/PlayerAssociatedNetworkHandler.mapping delete mode 100644 mappings/net/minecraft/server/world/EntityTrackingListener.mapping diff --git a/mappings/net/minecraft/nbt/NbtIo.mapping b/mappings/net/minecraft/nbt/NbtIo.mapping index e21c5e515a..81844d6af3 100644 --- a/mappings/net/minecraft/nbt/NbtIo.mapping +++ b/mappings/net/minecraft/nbt/NbtIo.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo COMMENT A set of utility functions for reading, writing, and scanning NBT files. - METHOD method_10625 read (Ljava/io/DataInput;Lnet/minecraft/class_2505;)Lnet/minecraft/class_2487; + METHOD method_10625 readCompound (Ljava/io/DataInput;Lnet/minecraft/class_2505;)Lnet/minecraft/class_2487; COMMENT Reads an NBT compound from {@code input}. COMMENT COMMENT @return the NBT compound from the input @@ -12,15 +12,15 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo ARG 0 input ARG 1 depth ARG 2 tracker - METHOD method_10627 read (Ljava/io/DataInput;)Lnet/minecraft/class_2487; + METHOD method_10627 readCompound (Ljava/io/DataInput;)Lnet/minecraft/class_2487; COMMENT Reads an NBT compound from {@code input}. COMMENT COMMENT @return the NBT compound from the input COMMENT @throws IOException if the IO operation fails or if the root NBT element is COMMENT not a compound ARG 0 input - METHOD method_10628 write (Lnet/minecraft/class_2487;Ljava/io/DataOutput;)V - COMMENT Writes the {@code nbt} to {@code file}. + METHOD method_10628 writeCompound (Lnet/minecraft/class_2487;Ljava/io/DataOutput;)V + COMMENT Writes the {@code nbt} to {@code output}. COMMENT COMMENT @throws IOException if the IO operation fails COMMENT @see #write(NbtCompound, File) @@ -42,6 +42,13 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo ARG 0 nbt ARG 1 file METHOD method_10631 write (Lnet/minecraft/class_2520;Ljava/io/DataOutput;)V + COMMENT Writes the {@code nbt} to {@code output}. The output is the byte indicating + COMMENT the element type, followed by {@linkplain DataOutput#writeUTF an empty string} + COMMENT and the NBT data. + COMMENT + COMMENT @throws IOException if the IO operation fails + COMMENT @see #read(DataInput, NbtTagSizeTracker) + COMMENT @see #writeForPacket(NbtElement, DataOutput) ARG 0 nbt ARG 1 output METHOD method_10633 read (Ljava/io/File;)Lnet/minecraft/class_2487; @@ -108,3 +115,27 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo METHOD method_40059 decompress (Ljava/io/InputStream;)Ljava/io/DataInputStream; COMMENT {@return a new input stream that decompresses the input {@code stream}} ARG 0 stream + METHOD method_52892 read (Ljava/io/DataInput;ILnet/minecraft/class_2505;B)Lnet/minecraft/class_2520; + ARG 0 input + ARG 1 depth + ARG 2 tracker + ARG 3 type + METHOD method_52893 writeForPacket (Lnet/minecraft/class_2520;Ljava/io/DataOutput;)V + COMMENT Writes the {@code nbt} to {@code output}. The output is the byte indicating + COMMENT the element type, followed by the NBT data. + COMMENT + COMMENT @apiNote In vanilla, this is used exclusively in networking. + COMMENT @throws IOException if the IO operation fails + COMMENT @see #read(DataInput, NbtTagSizeTracker) + COMMENT @see #write(NbtElement, DataOutput) + ARG 0 nbt + ARG 1 output + METHOD method_52894 read (Ljava/io/DataInput;Lnet/minecraft/class_2505;)Lnet/minecraft/class_2520; + COMMENT Reads an NBT element from {@code input}. Unlike {@link + COMMENT #readCompound(DataInput, NbtTagSizeTracker)}, the element does not have to + COMMENT be a compound. + COMMENT + COMMENT @return the NBT element from the input + COMMENT @throws IOException if the IO operation fails + ARG 0 input + ARG 1 tracker diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping index 8caef75d8a..9b96ed3214 100644 --- a/mappings/net/minecraft/network/PacketByteBuf.mapping +++ b/mappings/net/minecraft/network/PacketByteBuf.mapping @@ -102,7 +102,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT {@link RegistryKey}{@link #readRegistryKey(RegistryKey)}{@link #writeRegistryKey(RegistryKey)} COMMENT COMMENT - COMMENT {@link RegistryKey} of a registry{@link #readRegistryKey()}{@link #writeRegistryKey(RegistryKey)} + COMMENT {@link RegistryKey} of a registry{@link #readRegistryRef()}{@link #writeRegistryKey(RegistryKey)} COMMENT COMMENT COMMENT {@link Date}{@link #readDate()}{@link #writeDate(Date)} @@ -324,7 +324,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT COMMENT @return this buf, for chaining COMMENT @see #readVarLong() - COMMENT @see #getVarLongLength(long) + COMMENT @see net.minecraft.network.encoding.VarLong ARG 1 value COMMENT the value to write METHOD method_10792 readVarLong ()J @@ -343,16 +343,16 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf ARG 1 stack COMMENT the stack to write METHOD method_10794 writeNbt (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2540; - COMMENT Writes an NBT compound to this buf. The binary representation of NBT is - COMMENT handled by {@link net.minecraft.nbt.NbtIo}. If {@code compound} is {@code + COMMENT Writes an NBT element to this buf. The binary representation of NBT is + COMMENT handled by {@link net.minecraft.nbt.NbtIo}. If {@code nbt} is {@code COMMENT null}, it is treated as an NBT null. COMMENT COMMENT @return this buf, for chaining COMMENT @throws io.netty.handler.codec.EncoderException if the NBT cannot be COMMENT written COMMENT @see #readNbt() - COMMENT @see #readUnlimitedNbt() COMMENT @see #readNbt(NbtTagSizeTracker) + ARG 1 nbt METHOD method_10795 readByteArray ()[B COMMENT Reads an array of primitive bytes from this buf. The array first has a COMMENT var int indicating its length, followed by the actual bytes. The array @@ -383,11 +383,13 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT this method returns {@code null}. The compound can have a maximum size of COMMENT {@value #MAX_READ_NBT_SIZE} bytes. COMMENT + COMMENT

Note that unlike {@link #readNbt(NbtTagSizeTracker)}, this can only + COMMENT read compounds. + COMMENT COMMENT @return the read compound, may be {@code null} COMMENT @throws io.netty.handler.codec.EncoderException if the NBT cannot be read COMMENT @throws RuntimeException if the compound exceeds the allowed maximum size COMMENT @see #writeNbt(NbtCompound) - COMMENT @see #readUnlimitedNbt() COMMENT @see #readNbt(NbtTagSizeTracker) COMMENT @see #MAX_READ_NBT_SIZE METHOD method_10799 readIntArray (I)[I @@ -459,7 +461,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT COMMENT @return this buf, for chaining COMMENT @see #readVarInt() - COMMENT @see #getVarIntLength(int) + COMMENT @see net.minecraft.network.encoding.VarInts ARG 1 value COMMENT the value to write METHOD method_10805 writeText (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2540; @@ -652,17 +654,16 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf ARG 2 codec ARG 3 value METHOD method_30616 readNbt (Lnet/minecraft/class_2505;)Lnet/minecraft/class_2520; - COMMENT Reads an NBT compound from this buf. The binary representation of NBT is + COMMENT Reads an NBT element from this buf. The binary representation of NBT is COMMENT handled by {@link net.minecraft.nbt.NbtIo}. If an NBT null is encountered, - COMMENT this method returns {@code null}. The compound can have a maximum size + COMMENT this method returns {@code null}. The element can have a maximum size COMMENT controlled by the {@code sizeTracker}. COMMENT - COMMENT @return the read compound, may be {@code null} + COMMENT @return the read element, may be {@code null} COMMENT @throws io.netty.handler.codec.EncoderException if the NBT cannot be read - COMMENT @throws RuntimeException if the compound exceeds the allowed maximum size - COMMENT @see #writeNbt(NbtCompound) + COMMENT @throws RuntimeException if the element exceeds the allowed maximum size + COMMENT @see #writeNbt(NbtElement) COMMENT @see #readNbt() - COMMENT @see #readUnlimitedNbt() ARG 1 sizeTracker METHOD method_33134 readLongArray ()[J COMMENT Reads an array of primitive longs from this buf. The array first has a @@ -1098,7 +1099,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT Converts {@code value} to an integer representing its ID, then COMMENT writes a {@linkplain #readVarInt var int} representation of such ID. COMMENT - COMMENT @see #decode(ToIntFunction) + COMMENT @see #decode(IntFunction) ARG 1 valueToId COMMENT a function that gets the value's integer ID ARG 2 value diff --git a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping index 22ac4b5d96..71458e4064 100644 --- a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping @@ -88,7 +88,7 @@ CLASS net/minecraft/class_2792 net/minecraft/network/listener/ServerPlayPacketLi ARG 1 packet METHOD method_46367 onPlayerSession (Lnet/minecraft/class_7861;)V ARG 1 packet - METHOD method_52278 onChunkBatchSize (Lnet/minecraft/class_8590;)V + METHOD method_52278 onAcknowledgeChunks (Lnet/minecraft/class_8590;)V ARG 1 packet METHOD method_52279 onAcknowledgeReconfiguration (Lnet/minecraft/class_8591;)V ARG 1 packet diff --git a/mappings/net/minecraft/network/packet/c2s/common/PlayPongC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/common/PlayPongC2SPacket.mapping index 49ec1d0282..6498d8929a 100644 --- a/mappings/net/minecraft/network/packet/c2s/common/PlayPongC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/common/PlayPongC2SPacket.mapping @@ -3,8 +3,8 @@ CLASS net/minecraft/class_6374 net/minecraft/network/packet/c2s/common/PlayPongC COMMENT play ping packet from the server, passing the {@link #parameter} back to the COMMENT server. COMMENT - COMMENT @see net.minecraft.network.packet.s2c.play.PlayPingS2CPacket - COMMENT @see net.minecraft.network.packet.c2s.play.KeepAliveC2SPacket + COMMENT @see net.minecraft.network.packet.s2c.common.PlayPingS2CPacket + COMMENT @see net.minecraft.network.packet.c2s.common.KeepAliveC2SPacket COMMENT @see net.minecraft.network.packet.c2s.query.QueryPingC2SPacket FIELD field_33752 parameter I METHOD (I)V diff --git a/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping index e822c6baad..ffe36093de 100644 --- a/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping @@ -4,12 +4,12 @@ CLASS net/minecraft/class_2913 net/minecraft/network/packet/c2s/login/LoginQuery FIELD field_33374 MAX_PAYLOAD_SIZE I METHOD comp_1569 queryId ()I METHOD comp_1570 response ()Lnet/minecraft/class_8594; - METHOD method_52290 readResponse (ILnet/minecraft/class_2540;)Lnet/minecraft/class_8594; - COMMENT {@return the response read from {@code buf}} + METHOD method_52290 readPayload (ILnet/minecraft/class_2540;)Lnet/minecraft/class_8594; + COMMENT {@return the response payload read from {@code buf}} COMMENT - COMMENT @implNote This delegates the logic to {@link #getVanillaResponse}, + COMMENT @implNote This delegates the logic to {@link #getVanillaPayload}, COMMENT which simply validates the size of the buffer and returns {@link - COMMENT EmptyLoginQueryResponse#INSTANCE}. + COMMENT UnknownLoginQueryResponsePayload#INSTANCE}. ARG 0 queryId ARG 1 buf METHOD method_52291 (Lnet/minecraft/class_2540;Lnet/minecraft/class_8594;)V @@ -17,5 +17,5 @@ CLASS net/minecraft/class_2913 net/minecraft/network/packet/c2s/login/LoginQuery ARG 1 response METHOD method_52292 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2913; ARG 0 buf - METHOD method_52293 getVanillaResponse (Lnet/minecraft/class_2540;)Lnet/minecraft/class_8594; + METHOD method_52293 getVanillaPayload (Lnet/minecraft/class_2540;)Lnet/minecraft/class_8594; ARG 0 buf diff --git a/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponse.mapping b/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponsePayload.mapping similarity index 80% rename from mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponse.mapping rename to mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponsePayload.mapping index 6a9d0e67a2..2e3394f947 100644 --- a/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponse.mapping +++ b/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponsePayload.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_8594 net/minecraft/network/packet/c2s/login/LoginQueryResponse +CLASS net/minecraft/class_8594 net/minecraft/network/packet/c2s/login/LoginQueryResponsePayload METHOD method_52295 write (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/login/EmptyLoginQueryResponse.mapping b/mappings/net/minecraft/network/packet/c2s/login/UnknownLoginQueryResponsePayload.mapping similarity index 75% rename from mappings/net/minecraft/network/packet/c2s/login/EmptyLoginQueryResponse.mapping rename to mappings/net/minecraft/network/packet/c2s/login/UnknownLoginQueryResponsePayload.mapping index fa0770988d..896d628e98 100644 --- a/mappings/net/minecraft/network/packet/c2s/login/EmptyLoginQueryResponse.mapping +++ b/mappings/net/minecraft/network/packet/c2s/login/UnknownLoginQueryResponsePayload.mapping @@ -1,2 +1,2 @@ -CLASS net/minecraft/class_8596 net/minecraft/network/packet/c2s/login/EmptyLoginQueryResponse +CLASS net/minecraft/class_8596 net/minecraft/network/packet/c2s/login/UnknownLoginQueryResponsePayload FIELD field_44980 INSTANCE Lnet/minecraft/class_8596; diff --git a/mappings/net/minecraft/network/packet/c2s/play/ChunkBatchSizeC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/AcknowledgeChunksC2SPacket.mapping similarity index 79% rename from mappings/net/minecraft/network/packet/c2s/play/ChunkBatchSizeC2SPacket.mapping rename to mappings/net/minecraft/network/packet/c2s/play/AcknowledgeChunksC2SPacket.mapping index d5fb6fd7b7..66223a8be6 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ChunkBatchSizeC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/AcknowledgeChunksC2SPacket.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_8590 net/minecraft/network/packet/c2s/play/ChunkBatchSizeC2SPacket +CLASS net/minecraft/class_8590 net/minecraft/network/packet/c2s/play/AcknowledgeChunksC2SPacket METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/common/PlayPingS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/PlayPingS2CPacket.mapping index 160f2189aa..051150ddd1 100644 --- a/mappings/net/minecraft/network/packet/s2c/common/PlayPingS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/PlayPingS2CPacket.mapping @@ -2,8 +2,8 @@ CLASS net/minecraft/class_6373 net/minecraft/network/packet/s2c/common/PlayPingS 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.play.PlayPongC2SPacket - COMMENT @see net.minecraft.network.packet.s2c.play.KeepAliveS2CPacket + COMMENT @see net.minecraft.network.packet.c2s.common.PlayPongC2SPacket + COMMENT @see net.minecraft.network.packet.s2c.common.KeepAliveS2CPacket COMMENT @see net.minecraft.network.packet.s2c.query.QueryPongS2CPacket FIELD field_33751 parameter I COMMENT The parameter of this ping packet. diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugStructuresCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugStructuresCustomPayload.mapping index b3cf7783c2..c60d1854a5 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugStructuresCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugStructuresCustomPayload.mapping @@ -1,2 +1,17 @@ CLASS net/minecraft/class_8726 net/minecraft/network/packet/s2c/custom/DebugStructuresCustomPayload FIELD field_45710 ID Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_53037 writeBox (Lnet/minecraft/class_2540;Lnet/minecraft/class_3341;)V + ARG 0 buf + ARG 1 box + METHOD method_53038 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2540;Lnet/minecraft/class_8726$class_8727;)V + ARG 1 buf2 + ARG 2 piece + METHOD method_53039 readBox (Lnet/minecraft/class_2540;)Lnet/minecraft/class_3341; + ARG 0 buf + CLASS class_8727 Piece + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_53040 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/server/network/ChunkDataSender.mapping b/mappings/net/minecraft/server/network/ChunkDataSender.mapping index 64fc3fb13b..65f14a12f2 100644 --- a/mappings/net/minecraft/server/network/ChunkDataSender.mapping +++ b/mappings/net/minecraft/server/network/ChunkDataSender.mapping @@ -1,3 +1,30 @@ CLASS net/minecraft/class_8608 net/minecraft/server/network/ChunkDataSender - METHOD method_52383 setDesiredBatchSize (F)V + FIELD field_45002 LOGGER Lorg/slf4j/Logger; + FIELD field_45005 chunks Lit/unimi/dsi/fastutil/longs/LongSet; + FIELD field_45006 local Z + FIELD field_45007 desiredBatchSize F + FIELD field_45008 pending F + FIELD field_45009 unacknowledgedBatches I + FIELD field_45010 maxUnacknowledgedBatches I + METHOD (Z)V + ARG 1 local + METHOD method_52383 onAcknowledgeChunks (F)V ARG 1 desiredBatchSize + METHOD method_52384 isInNextBatch (J)Z + ARG 1 chunkPos + METHOD method_52385 makeBatch (Lnet/minecraft/class_3898;Lnet/minecraft/class_1923;)Ljava/util/List; + ARG 1 chunkStorage + ARG 2 playerPos + METHOD method_52386 sendChunkBatches (Lnet/minecraft/class_3222;)V + ARG 1 player + METHOD method_52387 unload (Lnet/minecraft/class_3222;Lnet/minecraft/class_1923;)V + ARG 1 player + ARG 2 pos + METHOD method_52388 sendChunkData (Lnet/minecraft/class_3244;Lnet/minecraft/class_3218;Lnet/minecraft/class_2818;)V + ARG 0 handler + ARG 1 world + ARG 2 chunk + METHOD method_52389 (Lnet/minecraft/class_1923;Lnet/minecraft/class_2818;)I + ARG 1 chunk + METHOD method_52390 add (Lnet/minecraft/class_2818;)V + ARG 1 chunk diff --git a/mappings/net/minecraft/server/network/ChunkFilter.mapping b/mappings/net/minecraft/server/network/ChunkFilter.mapping new file mode 100644 index 0000000000..b5e6dc1881 --- /dev/null +++ b/mappings/net/minecraft/server/network/ChunkFilter.mapping @@ -0,0 +1,44 @@ +CLASS net/minecraft/class_8603 net/minecraft/server/network/ChunkFilter + FIELD field_44986 IGNORE_ALL Lnet/minecraft/class_8603; + METHOD method_52356 isWithinDistance (II)Z + ARG 1 x + ARG 2 z + METHOD method_52357 isWithinDistanceExcludingEdge (IIIII)Z + ARG 0 centerX + ARG 1 centerZ + ARG 2 viewDistance + ARG 3 x + ARG 4 z + METHOD method_52358 isWithinDistance (IIIIIZ)Z + ARG 0 centerX + ARG 1 centerZ + ARG 2 viewDistance + ARG 3 x + ARG 4 z + ARG 5 includeEdge + METHOD method_52359 isWithinDistance (IIZ)Z + ARG 1 x + ARG 2 z + ARG 3 includeEdge + METHOD method_52360 forEachChangedChunk (Lnet/minecraft/class_8603;Lnet/minecraft/class_8603;Ljava/util/function/Consumer;Ljava/util/function/Consumer;)V + ARG 0 oldFilter + ARG 1 newFilter + ARG 2 newlyIncluded + ARG 3 justRemoved + METHOD method_52361 isWithinDistance (Lnet/minecraft/class_1923;)Z + ARG 1 pos + METHOD method_52362 cylindrical (Lnet/minecraft/class_1923;I)Lnet/minecraft/class_8603; + ARG 0 center + ARG 1 viewDistance + METHOD method_52363 forEach (Ljava/util/function/Consumer;)V + ARG 1 consumer + METHOD method_52364 isWithinDistanceExcludingEdge (II)Z + ARG 1 x + ARG 2 z + CLASS class_8604 Cylindrical + METHOD method_52365 overlaps (Lnet/minecraft/class_8603$class_8604;)Z + ARG 1 o + METHOD method_52366 getLeft ()I + METHOD method_52367 getBottom ()I + METHOD method_52368 getRight ()I + METHOD method_52369 getTop ()I diff --git a/mappings/net/minecraft/server/network/DebugInfoSender.mapping b/mappings/net/minecraft/server/network/DebugInfoSender.mapping index 727e46066d..c20a5cc549 100644 --- a/mappings/net/minecraft/server/network/DebugInfoSender.mapping +++ b/mappings/net/minecraft/server/network/DebugInfoSender.mapping @@ -42,6 +42,7 @@ CLASS net/minecraft/class_4209 net/minecraft/server/network/DebugInfoSender ARG 4 duration METHOD method_22319 sendToAll (Lnet/minecraft/class_3218;Lnet/minecraft/class_8710;)V ARG 0 world + ARG 1 payload METHOD method_23855 sendBeeDebugData (Lnet/minecraft/class_4466;)V ARG 0 bee METHOD method_23856 sendBeehiveDebugData (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_4482;)V diff --git a/mappings/net/minecraft/server/network/PlayerAssociatedNetworkHandler.mapping b/mappings/net/minecraft/server/network/PlayerAssociatedNetworkHandler.mapping new file mode 100644 index 0000000000..0e9bc74a07 --- /dev/null +++ b/mappings/net/minecraft/server/network/PlayerAssociatedNetworkHandler.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_5629 net/minecraft/server/network/PlayerAssociatedNetworkHandler + METHOD method_14364 sendPacket (Lnet/minecraft/class_2596;)V + ARG 1 packet + METHOD method_32311 getPlayer ()Lnet/minecraft/class_3222; diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index f0ae8319ed..18f921158a 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -50,6 +50,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity FIELD field_39985 sculkShriekerWarningManager Lnet/minecraft/class_7262; FIELD field_39986 session Lnet/minecraft/class_7822; FIELD field_44990 viewDistance Ljava/util/OptionalInt; + FIELD field_44991 chunkFilter Lnet/minecraft/class_8603; METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_3218;Lcom/mojang/authlib/GameProfile;)V ARG 1 server ARG 2 world @@ -238,6 +239,9 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity ARG 1 world METHOD method_51469 getServerWorld ()Lnet/minecraft/class_3218; METHOD method_52371 getViewDistance ()Ljava/util/OptionalInt; + METHOD method_52372 getChunkFilter ()Lnet/minecraft/class_8603; + METHOD method_52373 setChunkFilter (Lnet/minecraft/class_8603;)V + ARG 1 chunkFilter METHOD method_52374 createCommonPlayerSpawnInfo (Lnet/minecraft/class_3218;)Lnet/minecraft/class_8589; ARG 1 world METHOD method_7336 changeGameMode (Lnet/minecraft/class_1934;)Z diff --git a/mappings/net/minecraft/server/world/EntityTrackingListener.mapping b/mappings/net/minecraft/server/world/EntityTrackingListener.mapping deleted file mode 100644 index 93c40c1a39..0000000000 --- a/mappings/net/minecraft/server/world/EntityTrackingListener.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_5629 net/minecraft/server/world/EntityTrackingListener - COMMENT A listener to entity tracking within threaded anvil chunk storage. - METHOD method_14364 sendPacket (Lnet/minecraft/class_2596;)V - ARG 1 packet - METHOD method_32311 getPlayer ()Lnet/minecraft/class_3222; diff --git a/mappings/net/minecraft/server/world/PlayerChunkWatchingManager.mapping b/mappings/net/minecraft/server/world/PlayerChunkWatchingManager.mapping index 66f0cd08cf..cffb039a0e 100644 --- a/mappings/net/minecraft/server/world/PlayerChunkWatchingManager.mapping +++ b/mappings/net/minecraft/server/world/PlayerChunkWatchingManager.mapping @@ -4,7 +4,10 @@ CLASS net/minecraft/class_3210 net/minecraft/server/world/PlayerChunkWatchingMan ARG 1 player METHOD method_14083 getPlayersWatchingChunk ()Ljava/util/Set; METHOD method_14084 remove (Lnet/minecraft/class_3222;)V + ARG 1 player METHOD method_14085 add (Lnet/minecraft/class_3222;Z)V + ARG 1 player + ARG 2 inactive METHOD method_14086 disableWatch (Lnet/minecraft/class_3222;)V ARG 1 player METHOD method_14087 enableWatch (Lnet/minecraft/class_3222;)V diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index 4a455e5e91..3ca98558cd 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -239,6 +239,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor ARG 1 player ARG 2 pos METHOD method_38783 shouldTick (Lnet/minecraft/class_1923;)Z + ARG 1 pos METHOD method_39220 (Lnet/minecraft/class_2818;)Ljava/lang/Integer; ARG 0 chunk METHOD method_39221 (Lnet/minecraft/class_2818;)Ljava/lang/Integer; @@ -293,6 +294,36 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor METHOD method_51834 (Lcom/mojang/datafixers/util/Either;Ljava/lang/Throwable;)Ljava/lang/Object; ARG 1 chunk ARG 2 throwable + METHOD method_52345 isTracked (Lnet/minecraft/class_3222;II)Z + ARG 1 player + ARG 2 chunkX + ARG 3 chunkZ + METHOD method_52346 sendWatchPackets (Lnet/minecraft/class_3222;Lnet/minecraft/class_8603;)V + ARG 1 player + ARG 2 chunkFilter + METHOD method_52347 track (Lnet/minecraft/class_3222;Lnet/minecraft/class_1923;)V + ARG 1 player + ARG 2 pos + METHOD method_52348 track (Lnet/minecraft/class_3222;Lnet/minecraft/class_2818;)V + ARG 0 player + ARG 1 chunk + METHOD method_52349 sendToPlayers (Lnet/minecraft/class_2818;)V + ARG 1 chunk + METHOD method_52350 getViewDistance (Lnet/minecraft/class_3222;)I + ARG 1 player + METHOD method_52351 isOnTrackEdge (Lnet/minecraft/class_3222;II)Z + ARG 1 player + ARG 2 chunkX + ARG 3 chunkZ + METHOD method_52352 untrack (Lnet/minecraft/class_3222;Lnet/minecraft/class_1923;)V + ARG 0 player + ARG 1 pos + METHOD method_52353 getWorldChunk (J)Lnet/minecraft/class_2818; + ARG 1 pos + METHOD method_52354 (Lnet/minecraft/class_3222;Lnet/minecraft/class_1923;)V + ARG 1 chunkPos + METHOD method_52355 (Lnet/minecraft/class_3222;Lnet/minecraft/class_1923;)V + ARG 2 chunkPos CLASS class_3208 EntityTracker COMMENT An entity tracker governs which players' clients can see an entity. Each COMMENT tracker corresponds to one entity in a server world and is mapped from the