From 1b4f2f8eac43d287bd9301fa57362afea5600825 Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Sat, 4 Aug 2018 18:40:11 +0300
Subject: [PATCH] fix: ChunkDataPacket

Many thanks Forwolk!
---
 .../proto_1_12_2/packets/ChunkDataPacket.java | 61 +++++++++++++------
 1 file changed, 43 insertions(+), 18 deletions(-)

diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java
index af8789f..aecbbc6 100644
--- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java
+++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java
@@ -8,14 +8,14 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
+import mc.core.Location;
 import mc.core.network.NetOutputStream;
 import mc.core.network.SCPacket;
 import mc.core.network.proto_1_12_2.ByteArrayOutputNetStream;
 import mc.core.world.Block;
 import mc.core.world.Chunk;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -80,8 +80,8 @@ public class ChunkDataPacket implements SCPacket {
     @Getter
     private List<Chunk> chunks = new ArrayList<>();
 
-    private long serializeBlockState(Block block) {
-        return (block.getId() << 4) | block.getState();
+    private int serializeBlockState(int id, int state) {
+        return (id << 4) | state;
     }
 
     @Override
@@ -89,25 +89,33 @@ public class ChunkDataPacket implements SCPacket {
         netStream.writeInt(x); // Chunk X
         netStream.writeInt(z); // Chunk Y
         netStream.writeBoolean(initChunk); // Init Chunk
-        netStream.writeVarInt(0b11111111); // Primary Bit Mask
+        netStream.writeVarInt(0b00000001); // Primary Bit Mask
 
         final ByteArrayOutputNetStream data = new ByteArrayOutputNetStream();
+        int dataItems = 0;
+        final int airBlockPalette = serializeBlockState(0, 0);
 
         for (Chunk chunk : chunks) {
-            final List<Long> palette = new ArrayList<>();
+            final List<Integer> palette = new ArrayList<>();
+            palette.add(airBlockPalette);
             final ByteArrayOutputNetStream dataArray = new ByteArrayOutputNetStream();
             final ByteArrayOutputNetStream blockLight = new ByteArrayOutputNetStream();
             final ByteArrayOutputNetStream skyLight = new ByteArrayOutputNetStream();
             final ByteArrayOutputNetStream biomes = new ByteArrayOutputNetStream();
 
+            long dataValueCompacted = 0;
             int blockLightCompacted = 0;
-            boolean flagFirstHalf = true;
+            int skyLightCompacted = 0;
+
+            int idxHalfLong = 0;
+            int idxHalfByte = 0;
+            boolean biomeFinally = false;
 
             for (int y = 0; y < 16; y++) {
                 for (int z = 0; z < 16; z++) {
                     for (int x = 0; x < 16; x++) {
                         Block block = chunk.getBlock(x, y, z);
-                        long blockState = serializeBlockState(block);
+                        int blockState = serializeBlockState(block.getId(), block.getState());
 
                         int currentIndexPaletteBlock;
                         if (!palette.contains(blockState)) {
@@ -117,18 +125,37 @@ public class ChunkDataPacket implements SCPacket {
                             currentIndexPaletteBlock = palette.indexOf(blockState);
                         }
 
-                        dataArray.writeLong(currentIndexPaletteBlock);
-                        if (flagFirstHalf) {
+                        if (idxHalfLong == 0) {
+                            dataValueCompacted = currentIndexPaletteBlock;
+                            idxHalfLong++;
+                        } else if (idxHalfLong > 0 && idxHalfLong < 15) {
+                            dataValueCompacted = (dataValueCompacted << 4) | currentIndexPaletteBlock;
+                            idxHalfLong++;
+                        } else {
+                            dataValueCompacted = (dataValueCompacted << 4) | currentIndexPaletteBlock;
+                            dataArray.writeLong(dataValueCompacted);
+                            idxHalfLong = 0;
+                            dataItems++;
+                        }
+
+                        if (idxHalfByte == 0) {
                             blockLightCompacted = block.getLight();
-                            flagFirstHalf = false;
+                            skyLightCompacted = chunk.getSkyLight(x, y, z);
+                            idxHalfByte++;
                         } else {
                             blockLightCompacted = (blockLightCompacted << 4) | block.getLight();
                             blockLight.writeByte(blockLightCompacted);
-                            flagFirstHalf = true;
-                            skyLight.writeByte(0b11111111); //FIXME
+                            skyLightCompacted = (skyLightCompacted << 4) | chunk.getSkyLight(x, y, z);
+                            skyLight.writeByte(skyLightCompacted);
+                            idxHalfByte = 0;
                         }
 
-                        biomes.writeByte(chunk.getBiome(x, z));
+                        if (!biomeFinally) {
+                            biomes.writeByte(chunk.getBiome(x, z));
+                            if (x == 15 && z == 15) {
+                                biomeFinally = true;
+                            }
+                        }
                     }
                 }
             }
@@ -137,12 +164,10 @@ public class ChunkDataPacket implements SCPacket {
             //     <Palette>
             data.writeUnsignedByte(4); // Bits Per Block
             data.writeVarInt(palette.size()); // Size of palette
-            palette.stream()
-                    .mapToInt(Long::intValue)
-                    .forEach(data::writeVarInt); // Palette
+            palette.forEach(data::writeVarInt); // Palette
             //     </Palette>
             //     <Data Array>
-            data.writeVarInt(dataArray.size()); // Size of Data Array
+            data.writeVarInt(dataItems); // Size of Data Array
             data.writeBytes(dataArray.toByteArray()); // Data Array
             //     </Data Array>
             //     <Block Light>