From dcdcf045759c156bf74f15d9456658c5fa50b483 Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Fri, 1 Oct 2021 13:00:25 -0500 Subject: [PATCH] Map chunk and light data, used for packet transport and async reading (#2713) Signed-off-by: liach Co-authored-by: liach --- .../network/ClientPlayNetworkHandler.mapping | 8 +++ .../network/packet/s2c/play/ChunkData.mapping | 54 +++++++++++++++++++ .../s2c/play/ChunkDataS2CPacket.mapping | 7 +++ .../network/packet/s2c/play/LightData.mapping | 39 ++++++++++++++ .../s2c/play/LightUpdateS2CPacket.mapping | 6 +++ .../world/ThreadedAnvilChunkStorage.mapping | 1 + .../chunk/light/ChunkLightProvider.mapping | 1 + .../world/chunk/light/LightStorage.mapping | 1 + .../chunk/light/LightingProvider.mapping | 2 + 9 files changed, 119 insertions(+) create mode 100644 mappings/net/minecraft/network/packet/s2c/play/ChunkData.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/play/LightData.mapping diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index e5c99f90ec..4b8c664da4 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -38,6 +38,10 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand ARG 2 chunkZ ARG 3 provider ARG 4 type + ARG 5 inited + ARG 6 uninited + ARG 7 nibbles + ARG 8 nonEdge METHOD method_2871 getPlayerListEntry (Ljava/util/UUID;)Lnet/minecraft/class_640; ARG 1 uuid METHOD method_2873 sendResourcePackStatus (Lnet/minecraft/class_2856$class_2857;)V @@ -73,3 +77,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand ARG 1 customPrompt METHOD method_37472 (I)V ARG 1 entityId + METHOD method_38543 readLightData (IILnet/minecraft/class_6606;)V + ARG 1 x + ARG 2 z + ARG 3 data diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChunkData.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkData.mapping new file mode 100644 index 0000000000..1119b377af --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkData.mapping @@ -0,0 +1,54 @@ +CLASS net/minecraft/class_6603 net/minecraft/network/packet/s2c/play/ChunkData + FIELD field_34862 MAX_SECTIONS_DATA_SIZE I + FIELD field_34863 heightmap Lnet/minecraft/class_2487; + FIELD field_34864 sectionsData [B + FIELD field_34865 blockEntities Ljava/util/List; + METHOD (Lnet/minecraft/class_2540;II)V + ARG 1 buf + ARG 2 x + ARG 3 z + METHOD (Lnet/minecraft/class_2818;)V + ARG 1 chunk + METHOD method_38586 getSectionsDataBuf ()Lnet/minecraft/class_2540; + METHOD method_38587 getBlockEntities (II)Ljava/util/function/Consumer; + ARG 1 x + ARG 2 z + METHOD method_38588 (IILnet/minecraft/class_6603$class_6605;)V + ARG 3 visitor + METHOD method_38589 getSectionsPacketSize (Lnet/minecraft/class_2818;)I + ARG 0 chunk + METHOD method_38590 write (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_38591 writeSections (Lnet/minecraft/class_2540;Lnet/minecraft/class_2818;)V + ARG 0 buf + ARG 1 chunk + METHOD method_38592 (Lnet/minecraft/class_2540;Lnet/minecraft/class_6603$class_6604;)V + ARG 0 buf + ARG 1 entry + METHOD method_38593 iterateBlockEntities (Lnet/minecraft/class_6603$class_6605;II)V + ARG 1 consumer + ARG 2 x + ARG 3 z + METHOD method_38594 getHeightmap ()Lnet/minecraft/class_2487; + METHOD method_38595 getWritableSectionsDataBuf ()Lio/netty/buffer/ByteBuf; + CLASS class_6604 BlockEntityData + FIELD field_34866 localXz I + FIELD field_34867 y I + FIELD field_34868 type Lnet/minecraft/class_2591; + FIELD field_34869 nbt Lnet/minecraft/class_2487; + METHOD (IILnet/minecraft/class_2591;Lnet/minecraft/class_2487;)V + ARG 1 localXz + ARG 2 y + ARG 3 type + ARG 4 nbt + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_38596 of (Lnet/minecraft/class_2586;)Lnet/minecraft/class_6603$class_6604; + ARG 0 blockEntity + METHOD method_38597 write (Lnet/minecraft/class_2540;)V + ARG 1 buf + CLASS class_6605 BlockEntityVisitor + METHOD accept (Lnet/minecraft/class_2338;Lnet/minecraft/class_2591;Lnet/minecraft/class_2487;)V + ARG 1 pos + ARG 2 type + ARG 3 nbt diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping index 33ae5c4521..2644f07c1a 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping @@ -1,5 +1,12 @@ CLASS net/minecraft/class_2672 net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket FIELD field_12235 chunkZ I FIELD field_12236 chunkX I + FIELD field_34870 chunkData Lnet/minecraft/class_6603; + FIELD field_34871 lightData Lnet/minecraft/class_6606; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD (Lnet/minecraft/class_2818;Lnet/minecraft/class_3568;Ljava/util/BitSet;Ljava/util/BitSet;Z)V + ARG 1 chunk + ARG 2 lightProvider METHOD method_11523 getX ()I METHOD method_11524 getZ ()I diff --git a/mappings/net/minecraft/network/packet/s2c/play/LightData.mapping b/mappings/net/minecraft/network/packet/s2c/play/LightData.mapping new file mode 100644 index 0000000000..94a4bdb129 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/LightData.mapping @@ -0,0 +1,39 @@ +CLASS net/minecraft/class_6606 net/minecraft/network/packet/s2c/play/LightData + FIELD field_34873 initedSky Ljava/util/BitSet; + FIELD field_34874 initedBlock Ljava/util/BitSet; + FIELD field_34875 uninitedSky Ljava/util/BitSet; + FIELD field_34876 uninitedBlock Ljava/util/BitSet; + FIELD field_34877 skyNibbles Ljava/util/List; + FIELD field_34878 blockNibbles Ljava/util/List; + FIELD field_34879 nonEdge Z + METHOD (Lnet/minecraft/class_1923;Lnet/minecraft/class_3568;Ljava/util/BitSet;Ljava/util/BitSet;Z)V + ARG 1 pos + ARG 2 lightProvider + ARG 3 skyBits + ARG 4 blockBits + ARG 5 nonEdge + METHOD (Lnet/minecraft/class_2540;II)V + ARG 1 buf + ARG 2 x + ARG 3 y + METHOD method_38601 getInitedSky ()Ljava/util/BitSet; + METHOD method_38602 putChunk (Lnet/minecraft/class_1923;Lnet/minecraft/class_3568;Lnet/minecraft/class_1944;ILjava/util/BitSet;Ljava/util/BitSet;Ljava/util/List;)V + ARG 1 pos + ARG 2 lightProvider + ARG 3 type + ARG 4 y + ARG 5 initialized + ARG 6 uninitialized + ARG 7 nibbles + METHOD method_38603 write (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_38604 getUninitedSky ()Ljava/util/BitSet; + METHOD method_38605 (Lnet/minecraft/class_2540;)[B + ARG 0 b + METHOD method_38606 getSkyNibbles ()Ljava/util/List; + METHOD method_38607 (Lnet/minecraft/class_2540;)[B + ARG 0 b + METHOD method_38608 getInitedBlock ()Ljava/util/BitSet; + METHOD method_38609 getUninitedBlock ()Ljava/util/BitSet; + METHOD method_38610 getBlockNibbles ()Ljava/util/List; + METHOD method_38611 isNonEdge ()Z diff --git a/mappings/net/minecraft/network/packet/s2c/play/LightUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/LightUpdateS2CPacket.mapping index 9ef436262d..bf7eefbe3e 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/LightUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/LightUpdateS2CPacket.mapping @@ -1,9 +1,15 @@ CLASS net/minecraft/class_2676 net/minecraft/network/packet/s2c/play/LightUpdateS2CPacket FIELD field_12264 chunkZ I FIELD field_12265 chunkX I + FIELD field_34872 data Lnet/minecraft/class_6606; METHOD (Lnet/minecraft/class_1923;Lnet/minecraft/class_3568;Ljava/util/BitSet;Ljava/util/BitSet;Z)V ARG 1 chunkPos ARG 2 lightProvider + ARG 3 skyBits + ARG 4 blockBits ARG 5 nonEdge + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf METHOD method_11554 getChunkZ ()I METHOD method_11558 getChunkX ()I + METHOD method_38600 getData ()Lnet/minecraft/class_6606; diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index 5f012397a7..88dfbafa7f 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -107,6 +107,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor ARG 2 added METHOD method_18715 sendChunkDataPackets (Lnet/minecraft/class_3222;Lorg/apache/commons/lang3/mutable/MutableObject;Lnet/minecraft/class_2818;)V ARG 1 player + ARG 2 cachedDataPacket ARG 3 chunk METHOD method_18716 unloadEntity (Lnet/minecraft/class_1297;)V ARG 1 entity diff --git a/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping b/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping index fedff3ed0b..621454623b 100644 --- a/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping +++ b/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_3558 net/minecraft/world/chunk/light/ChunkLightProvide METHOD method_15515 enqueueSectionData (JLnet/minecraft/class_2804;Z)V ARG 1 sectionPos ARG 3 lightArray + ARG 4 nonEdge METHOD method_15517 getCurrentLevelFromSection (Lnet/minecraft/class_2804;J)I ARG 1 section ARG 2 blockPos diff --git a/mappings/net/minecraft/world/chunk/light/LightStorage.mapping b/mappings/net/minecraft/world/chunk/light/LightStorage.mapping index ee7a28ebbc..cb3552eea7 100644 --- a/mappings/net/minecraft/world/chunk/light/LightStorage.mapping +++ b/mappings/net/minecraft/world/chunk/light/LightStorage.mapping @@ -54,6 +54,7 @@ CLASS net/minecraft/class_3560 net/minecraft/world/chunk/light/LightStorage METHOD method_15532 enqueueSectionData (JLnet/minecraft/class_2804;Z)V ARG 1 sectionPos ARG 3 array + ARG 4 nonEdge METHOD method_15533 getLightSection (Lnet/minecraft/class_3556;J)Lnet/minecraft/class_2804; ARG 1 storage ARG 2 sectionPos diff --git a/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping b/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping index 40189c01d0..985ec15213 100644 --- a/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping +++ b/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_3568 net/minecraft/world/chunk/light/LightingProvider ARG 1 lightType ARG 2 pos ARG 3 nibbles + ARG 4 nonEdge METHOD method_15562 get (Lnet/minecraft/class_1944;)Lnet/minecraft/class_3562; ARG 1 lightType METHOD method_20601 setRetainData (Lnet/minecraft/class_1923;Z)V @@ -20,6 +21,7 @@ CLASS net/minecraft/class_3568 net/minecraft/world/chunk/light/LightingProvider ARG 2 ambientDarkness METHOD method_22876 displaySectionLevel (Lnet/minecraft/class_1944;Lnet/minecraft/class_4076;)Ljava/lang/String; ARG 1 lightType + ARG 2 pos METHOD method_31928 getHeight ()I METHOD method_31929 getBottomY ()I METHOD method_31930 getTopY ()I