обработка NBT в чанках

proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacketTest.java

@@ -1,10 +1,10 @@
 package mc.core.network.proto_1_12_2.packets;
 
+import com.flowpowered.nbt.*;
 import mc.core.network.proto_1_12_2.ByteArrayOutputNetStream;
 import mc.core.network.proto_1_12_2.packets.DumbChunkData.DumbChunkSection;
 import mc.core.world.Biome;
-import mc.core.world.block.BlockFactory;
-import mc.core.world.block.BlockType;
+import mc.core.world.block.*;
 import mc.core.world.chunk.Chunk;
 import mc.core.world.chunk.ChunkSection;
 import org.apache.commons.io.IOUtils;
@@ -72,6 +72,29 @@ class ChunkDataPacketTest {
         setupActualData();
     }
 
+    private static Block createChestBlock(BlockType type, int x, int y, int z, int height) {
+        final BlockLocation location = new BlockLocation(x, y, z);
+
+        final CompoundMap compoundMap = new CompoundMap();
+        compoundMap.put(new IntTag("x", x));
+        compoundMap.put(new IntTag("y", (height << 4) + y));
+        compoundMap.put(new IntTag("z", z));
+        compoundMap.put(new StringTag("id", type.getNamedId()));
+        final CompoundTag compoundTag = new CompoundTag("", compoundMap);
+
+        return new AbstractBlock(type) {
+            @Override
+            public BlockLocation getLocation() {
+                return location;
+            }
+
+            @Override
+            public CompoundTag getNBTData() {
+                return compoundTag;
+            }
+        };
+    }
+
     private static ChunkSection createChunkSection(int height) {
         final ChunkSection chunkSection = mock(ChunkSection.class);
         when(chunkSection.getSkyLightLocal(anyInt(), anyInt(), anyInt())).thenReturn(0);
@@ -107,13 +130,23 @@ class ChunkDataPacketTest {
 
                 BlockFactory blockFactory = new BlockFactory();
 
-                if (y == 0) {
-                    return blockFactory.create(BlockType.DIRT, x, y, z);
-                } else if (y == 1) {
-                    return blockFactory.create(BlockType.GRASS, x, y, z);
-                } else {
-                    return blockFactory.create(BlockType.AIR, x, y, z);
+                // @formatter:off
+                if      (y == 0) return blockFactory.create(BlockType.DIRT, x, y, z);
+                else if (y == 1) return blockFactory.create(BlockType.GRASS, x, y, z);
+                else if (y == 2) {
+                    if      ((x == 2 || x == 4 || x == 5) && z == 1)
+                        return createChestBlock(BlockType.CHEST_NORTH, x, y, z, height);
+                    else if ((x == 2 || x == 3 || x == 5) && z == 6)
+                        return createChestBlock(BlockType.CHEST_SOUTH, x, y, z, height);
+                    else if (x == 1 && (z == 2 || z == 3 || z == 5))
+                        return createChestBlock(BlockType.CHEST_WEST, x, y, z, height);
+                    else if (x == 6 && (z == 2 || z == 4 || z == 5))
+                        return createChestBlock(BlockType.CHEST_EAST, x, y, z, height);
+                    else
+                        return blockFactory.create(BlockType.AIR, x, y, z);
                 }
+                else             return blockFactory.create(BlockType.AIR, x, y, z);
+                // @formatter:on
             });
         }
 
@@ -132,6 +165,11 @@ class ChunkDataPacketTest {
     @Test
     void testNBT() {
         assertEquals(expectedDumbChunkData.getNumberNBT(), actualDumbChunkData.getNumberNBT());
+        assertEquals(expectedDumbChunkData.getNbt().size(), actualDumbChunkData.getNbt().size());
+
+        for (Tag<?> tag : actualDumbChunkData.getNbt()) {
+            assertTrue(expectedDumbChunkData.getNbt().contains(tag));
+        }
     }
 
     @Test

proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/DumbChunkData.java

@@ -1,5 +1,6 @@
 package mc.core.network.proto_1_12_2.packets;
 
+import com.flowpowered.nbt.Tag;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -8,6 +9,7 @@ import mc.core.world.block.BlockType;
 import java.nio.ByteBuffer;
 import java.nio.LongBuffer;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
@@ -23,9 +25,10 @@ class DumbChunkData {
     private byte[] biomes;
 
     private int numberNBT;
+    private List<Tag<?>> nbt;
 
     private static BlockType deserializeBlockState(int blockState) {
-        return BlockType.getByIdMeta((blockState & 0xF0) >> 4, blockState & 0x0F);
+        return BlockType.getByIdMeta(blockState >> 4, blockState & 0x0F);
     }
 
     static DumbChunkData ReadFromNetInputStream(byte[] bytes) {
@@ -95,6 +98,14 @@ class DumbChunkData {
         netStream.readBytes(dumbChunkData.biomes);
 
         dumbChunkData.numberNBT = netStream.readVarInt();
+        if (dumbChunkData.numberNBT > 0) {
+            dumbChunkData.nbt = new ArrayList<>(dumbChunkData.numberNBT);
+            for (int i = 0; i < dumbChunkData.numberNBT; i++) {
+                dumbChunkData.nbt.add(netStream.readNBT());
+            }
+        } else {
+            dumbChunkData.nbt = Collections.emptyList();
+        }
 
         return dumbChunkData;
     }