Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-11-16 23:55:14 +01:00
Code Issues Projects Releases Wiki Activity

Added format version in the chunk serialized output

Browse Source 
Signed-off-by: TheMode <themode@outlook.fr>
This commit is contained in:
TheMode 2020-10-18 21:51:49 +02:00
parent 26ce63763a
commit 32d13dcbd1
2 changed files with 91 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/main/java/net/minestom/server/instance/DynamicChunk.java
View File

@ -31,6 +31,12 @@ import java.util.concurrent.CopyOnWriteArraySet;
*/
public class DynamicChunk extends Chunk {
/**
* Represents the version which will be present in the serialized output.
* Used to define which deserializer to use.
*/
private static final int DATA_FORMAT_VERSION = 1;
// blocks id based on coordinate, see Chunk#getBlockIndex
// WARNING: those arrays are NOT thread-safe
// and modifying them can cause issue with block data, update, block entity and the cached chunk packet
@ -212,21 +218,32 @@ public class DynamicChunk extends Chunk {
// Used for blocks data (unused if empty at the end)
Object2ShortMap<String> typeToIndexMap = new Object2ShortOpenHashMap<>();
BinaryWriter binaryWriter = new BinaryWriter();
// Order of buffers in the final serialized array
BinaryWriter versionWriter = new BinaryWriter();
BinaryWriter dataIndexWriter = new BinaryWriter();
BinaryWriter chunkWriter = new BinaryWriter();
// VERSION WRITER
{
versionWriter.writeInt(DATA_FORMAT_VERSION);
versionWriter.writeInt(MinecraftServer.PROTOCOL_VERSION);
}
// CHUNK DATA WRITER
{
// Chunk data
final boolean hasChunkData = data instanceof SerializableData && !data.isEmpty();
binaryWriter.writeBoolean(hasChunkData);
chunkWriter.writeBoolean(hasChunkData);
if (hasChunkData) {
// Get the un-indexed data
final byte[] serializedData = ((SerializableData) data).getSerializedData(typeToIndexMap, false);
binaryWriter.writeBytes(serializedData);
chunkWriter.writeBytes(serializedData);
}
// Write the biomes id
for (int i = 0; i < BIOME_COUNT; i++) {
final byte id = (byte) biomes[i].getId();
binaryWriter.writeByte(id);
chunkWriter.writeByte(id);
}
// Loop all blocks
@ -243,38 +260,43 @@ public class DynamicChunk extends Chunk {
continue;
// Chunk coordinates
binaryWriter.writeShort((short) index);
chunkWriter.writeShort((short) index);
// Block ids
binaryWriter.writeShort(blockStateId);
binaryWriter.writeShort(customBlockId);
chunkWriter.writeShort(blockStateId);
chunkWriter.writeShort(customBlockId);
// Data
final Data data = getBlockData(index);
final boolean hasBlockData = data instanceof SerializableData && !data.isEmpty();
binaryWriter.writeBoolean(hasBlockData);
chunkWriter.writeBoolean(hasBlockData);
if (hasBlockData) {
// Get the un-indexed data
final byte[] serializedData = ((SerializableData) data).getSerializedData(typeToIndexMap, false);
binaryWriter.writeBytes(serializedData);
chunkWriter.writeBytes(serializedData);
}
}
}
}
}
// DATA INDEX WRITER
{
// If the chunk data contains SerializableData type, it needs to be added in the header
BinaryWriter indexWriter = new BinaryWriter();
final boolean hasDataIndex = !typeToIndexMap.isEmpty();
indexWriter.writeBoolean(hasDataIndex);
dataIndexWriter.writeBoolean(hasDataIndex);
if (hasDataIndex) {
// Get the index buffer (prefixed by true to say that the chunk contains data indexes)
SerializableData.writeDataIndexHeader(indexWriter, typeToIndexMap);
SerializableData.writeDataIndexHeader(dataIndexWriter, typeToIndexMap);
}
}
// Add the hasIndex field & the index header if it has it
binaryWriter.writeAtStart(indexWriter);
final BinaryWriter finalBuffer = new BinaryWriter(
versionWriter.getBuffer(),
dataIndexWriter.getBuffer(),
chunkWriter.getBuffer());
return binaryWriter.toByteArray();
return finalBuffer.toByteArray();
}
@Override
@ -282,11 +304,21 @@ public class DynamicChunk extends Chunk {
// Run in the scheduler thread pool
MinecraftServer.getSchedulerManager().buildTask(() -> {
synchronized (this) {
try {
// VERSION DATA
final int dataFormatVersion = reader.readInteger();
final int dataProtocol = reader.readInteger();
if (dataFormatVersion != DATA_FORMAT_VERSION) {
throw new UnsupportedOperationException(
"You are parsing an old version of the chunk format, please contact the developer: " + dataFormatVersion);
}
// INDEX DATA
// Used for blocks data
Object2ShortMap<String> typeToIndexMap = null;
try {
// Get if the chunk has data indexes (used for blocks data)
final boolean hasDataIndex = reader.readBoolean();
if (hasDataIndex) {
@ -294,6 +326,7 @@ public class DynamicChunk extends Chunk {
typeToIndexMap = SerializableData.readDataIndexes(reader);
}
// CHUNK DATA
// Chunk data
final boolean hasChunkData = reader.readBoolean();
if (hasChunkData) {

9
src/main/java/net/minestom/server/utils/binary/BinaryWriter.java
View File

@ -34,6 +34,15 @@ public class BinaryWriter extends OutputStream {
this.buffer = Unpooled.buffer(initialCapacity);
}
/**
* Creates a {@link BinaryWriter} from multiple buffers.
*
* @param buffers the buffers making this
*/
public BinaryWriter(ByteBuf... buffers) {
this.buffer = Unpooled.wrappedBuffer(buffers);
}
/**
* Creates a {@link BinaryWriter} with a "reasonably small initial capacity".
*/