stash 3
This commit is contained in:
@@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j;
|
||||
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;
|
||||
@@ -40,7 +41,7 @@ Packet structure
|
||||
| +------------------------------------------------+ |
|
||||
| | Chunk Section | Byte array | | - https://wiki.vg/Chunk_Format#Chunk_Section_structure
|
||||
| | +------------------------------------------+ | |
|
||||
| | | Bits Per Block | Unsigned Byte | | |
|
||||
| | | Bits Per Block | Unsigned Byte | | | (we use 4 bits per block)
|
||||
| | |--------------------|---------------------| | |
|
||||
| | | Palette | Byte array | | | - https://wiki.vg/Chunk_Format#Palettes
|
||||
| | | +------------------------------------+ | | | (we use Indirect type palette)
|
||||
@@ -53,9 +54,9 @@ Packet structure
|
||||
| | |--------------------|---------------------| | |
|
||||
| | | Data Array | Array of Long | | |
|
||||
| | |--------------------|---------------------| | |
|
||||
| | | Block Light | Byte Array | | |
|
||||
| | | Block Light | Byte Array | | | (Half byte per block)
|
||||
| | |--------------------|---------------------| | |
|
||||
| | | Sky Light | Optional Byte Array | | |
|
||||
| | | Sky Light | Optional Byte Array | | | (Only if in the Overworld; half byte per block)
|
||||
| | +------------------------------------------+ | |
|
||||
| |-----------------------|------------------------| |
|
||||
| | Biomes | Optional Byte array | |
|
||||
@@ -79,25 +80,86 @@ public class ChunkDataPacket implements SCPacket {
|
||||
@Getter
|
||||
private List<Chunk> chunks = new ArrayList<>();
|
||||
|
||||
private long serializeBlockState(Block block) {
|
||||
return (block.getId() << 4) | block.getState();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeSelf(NetOutputStream netStream) {
|
||||
netStream.writeInt(x);
|
||||
netStream.writeInt(z);
|
||||
netStream.writeBoolean(initChunk);
|
||||
netStream.writeInt(x); // Chunk X
|
||||
netStream.writeInt(z); // Chunk Y
|
||||
netStream.writeBoolean(initChunk); // Init Chunk
|
||||
netStream.writeVarInt(0b11111111); // Primary Bit Mask
|
||||
|
||||
ByteArrayOutputNetStream baos = new ByteArrayOutputNetStream();
|
||||
final ByteArrayOutputNetStream data = new ByteArrayOutputNetStream();
|
||||
|
||||
for (Chunk chunk : chunks) {
|
||||
// <Bits Per Block />
|
||||
// <Palette />
|
||||
// <Data Array Length />
|
||||
// <Data Array />
|
||||
// <Block Light />
|
||||
// <Sky Light />
|
||||
final List<Long> palette = new ArrayList<>();
|
||||
final ByteArrayOutputNetStream dataArray = new ByteArrayOutputNetStream();
|
||||
final ByteArrayOutputNetStream blockLight = new ByteArrayOutputNetStream();
|
||||
final ByteArrayOutputNetStream skyLight = new ByteArrayOutputNetStream();
|
||||
final ByteArrayOutputNetStream biomes = new ByteArrayOutputNetStream();
|
||||
|
||||
int blockLightCompacted = 0;
|
||||
boolean flagFirstHalf = true;
|
||||
|
||||
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 currentIndexPaletteBlock;
|
||||
if (!palette.contains(blockState)) {
|
||||
palette.add(blockState);
|
||||
currentIndexPaletteBlock = palette.size()-1;
|
||||
} else {
|
||||
currentIndexPaletteBlock = palette.indexOf(blockState);
|
||||
}
|
||||
|
||||
dataArray.writeLong(currentIndexPaletteBlock);
|
||||
if (flagFirstHalf) {
|
||||
blockLightCompacted = block.getLight();
|
||||
flagFirstHalf = false;
|
||||
} else {
|
||||
blockLightCompacted = (blockLightCompacted << 4) | block.getLight();
|
||||
blockLight.writeByte(blockLightCompacted);
|
||||
flagFirstHalf = true;
|
||||
skyLight.writeByte(0b11111111); //FIXME
|
||||
}
|
||||
|
||||
biomes.writeByte(chunk.getBiome(x, z));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// <Chunk Section>
|
||||
// <Palette>
|
||||
data.writeUnsignedByte(4); // Bits Per Block
|
||||
data.writeVarInt(palette.size()); // Size of palette
|
||||
palette.stream()
|
||||
.mapToInt(Long::intValue)
|
||||
.forEach(data::writeVarInt); // Palette
|
||||
// </Palette>
|
||||
// <Data Array>
|
||||
data.writeVarInt(dataArray.size()); // Size of Data Array
|
||||
data.writeBytes(dataArray.toByteArray()); // Data Array
|
||||
// </Data Array>
|
||||
// <Block Light>
|
||||
data.writeBytes(blockLight.toByteArray());
|
||||
// </Block Light>
|
||||
// <Sky Light>
|
||||
data.writeBytes(skyLight.toByteArray());
|
||||
// </Sky Light>
|
||||
// </Chunk Section>
|
||||
// <Biomes>
|
||||
data.writeBytes(biomes.toByteArray());
|
||||
// </Biomes>
|
||||
}
|
||||
netStream.writeVarInt(baos.size()); // Size of Data in bytes
|
||||
netStream.writeBytes(baos.toByteArray()); // Data chunks
|
||||
netStream.writeVarInt(0); // size NBT
|
||||
|
||||
netStream.writeVarInt(data.size()); // Size of Data
|
||||
netStream.writeBytes(data.toByteArray()); // Data
|
||||
netStream.writeVarInt(0); // Number of block entities
|
||||
/* writeNBT */
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user