Merge pull request #3 from creeper123123321/1.14

fix light

common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/WorldPackets.java

@@ -1,5 +1,7 @@
 package us.myles.ViaVersion.protocols.protocol1_14to1_13_2.packets;
 
+import com.google.common.primitives.Bytes;
+import io.netty.buffer.ByteBuf;
 import us.myles.ViaVersion.api.PacketWrapper;
 import us.myles.ViaVersion.api.minecraft.BlockChangeRecord;
 import us.myles.ViaVersion.api.minecraft.chunks.Chunk;
@@ -14,8 +16,6 @@ import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.Protocol1_14To1_13_2;
 import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.types.Chunk1_14Type;
 import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
 
-import java.util.Arrays;
-
 public class WorldPackets {
 
 	public static void register(Protocol protocol) {
@@ -38,9 +38,40 @@ public class WorldPackets {
 							}
 						}
 
-						if (chunk.isBiomeData()) {
+						PacketWrapper lightPacket = wrapper.create(0x57);
-							Arrays.fill(chunk.getBiomeData(), (byte) 0);  //TODO map biome ids
+						lightPacket.write(Type.VAR_INT, chunk.getX());
+						lightPacket.write(Type.VAR_INT, chunk.getZ());
+						int skyLightMask = 0;
+						int blockLightMask = 0;
+						for (int i = 0; i < chunk.getSections().length; i++) {
+							ChunkSection sec = chunk.getSections()[i];
+							if (sec == null) continue;
+							if (sec.hasSkyLight()) {
+								skyLightMask |= (1 << (i + 1));
 							}
+							blockLightMask |= (1 << (i + 1));
+						}
+						lightPacket.write(Type.VAR_INT, skyLightMask);
+						lightPacket.write(Type.VAR_INT, blockLightMask);
+						for (ChunkSection section : chunk.getSections()) {
+							if (section == null || !section.hasSkyLight()) continue;
+							ByteBuf buf = wrapper.user().getChannel().alloc().buffer();
+							section.writeSkyLight(buf);
+							byte[] data = new byte[buf.readableBytes()];
+							buf.readBytes(data);
+							buf.release();
+							lightPacket.write(Type.BYTE_ARRAY, Bytes.asList(data).toArray(new Byte[0]));
+						}
+						for (ChunkSection section : chunk.getSections()) {
+							if (section == null) continue;
+							ByteBuf buf = wrapper.user().getChannel().alloc().buffer();
+							section.writeBlockLight(buf);
+							byte[] data = new byte[buf.readableBytes()];
+							buf.readBytes(data);
+							buf.release();
+							lightPacket.write(Type.BYTE_ARRAY, Bytes.asList(data).toArray(new Byte[0]));
+						}
+						lightPacket.send(Protocol1_14To1_13_2.class);
 					}
 				});
 			}

common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/types/Chunk1_14Type.java

@@ -82,7 +82,7 @@ public class Chunk1_14Type extends PartialType<Chunk, ClientWorld> {
 		for (int i = 0; i < 16; i++) {
 			ChunkSection section = chunk.getSections()[i];
 			if (section == null) continue; // Section not set
-			buf.writeShort(0);  //TODO find out what this short does (number of air blocks, important?)
+			buf.writeShort(4096);  //TODO find out what this short does (number of air blocks, important?)
 			section.writeBlocks1_13(buf);
 		}
 		buf.readerIndex(0);