summaryrefslogtreecommitdiffstats
path: root/src/Protocol/ChunkDataSerializer.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/Protocol/ChunkDataSerializer.cpp118
1 files changed, 118 insertions, 0 deletions
diff --git a/src/Protocol/ChunkDataSerializer.cpp b/src/Protocol/ChunkDataSerializer.cpp
index 6577aaedd..d4e23f11f 100644
--- a/src/Protocol/ChunkDataSerializer.cpp
+++ b/src/Protocol/ChunkDataSerializer.cpp
@@ -5,10 +5,12 @@
#include "Protocol_1_9.h"
#include "../ByteBuffer.h"
#include "../ClientHandle.h"
+#include "../WorldStorage/FastNBT.h"
#include "Palettes/Upgrade.h"
#include "Palettes/Palette_1_13.h"
#include "Palettes/Palette_1_13_1.h"
+#include "Palettes/Palette_1_14.h"
@@ -102,6 +104,11 @@ void cChunkDataSerializer::SendToClients(const std::unordered_set<cClientHandle
Serialize393<&Palette_1_13_1::FromBlock>(Entry.second);
continue;
}
+ case cProtocol::Version::Version_1_14:
+ {
+ Serialize477(Entry.second);
+ continue;
+ }
}
LOGERROR("cChunkDataSerializer::Serialize(): Unknown version: %d", Entry.first);
@@ -497,6 +504,117 @@ void cChunkDataSerializer::Serialize393(const std::vector<cClientHandle *> & a_S
+void cChunkDataSerializer::Serialize477(const std::vector<cClientHandle *> & a_SendTo)
+{
+ // This function returns the fully compressed packet (including packet size), not the raw packet!
+
+ // Create the packet:
+ cByteBuffer Packet(512 KiB);
+ Packet.WriteVarInt32(0x21); // Packet id (Chunk Data packet)
+ Packet.WriteBEInt32(m_ChunkX);
+ Packet.WriteBEInt32(m_ChunkZ);
+ Packet.WriteBool(true); // "Ground-up continuous", or rather, "biome data present" flag
+ Packet.WriteVarInt32(m_Data.GetSectionBitmask());
+
+ {
+ cFastNBTWriter Writer;
+ // TODO: client works fine without?
+ // std::array<Int64, 36> Longz = {};
+ // Writer.AddLongArray("MOTION_BLOCKING", Longz.data(), Longz.size());
+ Writer.Finish();
+ Packet.Write(Writer.GetResult().data(), Writer.GetResult().size());
+ }
+
+ // Write the chunk size in bytes:
+ const UInt8 BitsPerEntry = 14;
+ const size_t Mask = (1 << BitsPerEntry) - 1;
+ const size_t ChunkSectionDataArraySize = (cChunkData::SectionBlockCount * BitsPerEntry) / 8 / 8;
+ const size_t ChunkSectionSize = (
+ 2 + // Block count, BEInt16, 2 bytes
+ 1 + // Bits per entry, BEUInt8, 1 byte
+ Packet.GetVarIntSize(static_cast<UInt32>(ChunkSectionDataArraySize)) + // Field containing "size of whole section", VarInt32, variable size
+ ChunkSectionDataArraySize * 8 // Actual section data, lots of bytes (multiplier 1 long = 8 bytes)
+ );
+
+ const size_t BiomeDataSize = cChunkDef::Width * cChunkDef::Width;
+ const size_t ChunkSize = (
+ ChunkSectionSize * m_Data.NumPresentSections() +
+ BiomeDataSize * 4 // Biome data now BE ints
+ );
+ Packet.WriteVarInt32(static_cast<UInt32>(ChunkSize));
+
+ // Write each chunk section...
+ ForEachSection(m_Data, [&](const cChunkData::sChunkSection & a_Section)
+ {
+ Packet.WriteBEInt16(-1);
+ Packet.WriteBEUInt8(BitsPerEntry);
+ Packet.WriteVarInt32(static_cast<UInt32>(ChunkSectionDataArraySize));
+ WriteSectionDataSeamless(Packet, a_Section, BitsPerEntry);
+ }
+ );
+
+ // Write the biome data
+ for (size_t i = 0; i != BiomeDataSize; i++)
+ {
+ Packet.WriteBEUInt32(static_cast<UInt32>(m_BiomeData[i]) & 0xff);
+ }
+
+ // Identify 1.9.4's tile entity list as empty
+ Packet.WriteVarInt32(0);
+
+ CompressAndSend(Packet, a_SendTo);
+}
+
+
+
+
+
+void cChunkDataSerializer::WriteSectionDataSeamless(cByteBuffer & a_Packet, const cChunkData::sChunkSection & a_Section, const UInt8 a_BitsPerEntry)
+{
+ // https://wiki.vg/Chunk_Format#Data_structure
+
+ // We shift a UInt64 by a_BitsPerEntry, the latter cannot be too big:
+ ASSERT(a_BitsPerEntry < 64);
+
+ UInt64 Buffer = 0; // A buffer to compose multiple smaller bitsizes into one 64-bit number
+ unsigned char BitIndex = 0; // The bit-position in Buffer that represents where to write next
+
+ for (size_t Index = 0; Index != cChunkData::SectionBlockCount; Index++)
+ {
+ const UInt32 BlockType = a_Section.m_BlockTypes[Index];
+ const UInt32 BlockMeta = (a_Section.m_BlockMetas[Index / 2] >> ((Index % 2) * 4)) & 0x0f;
+ const UInt32 Value = Palette_1_14::FromBlock(PaletteUpgrade::FromBlock(BlockType, BlockMeta));
+
+ // Write as much as possible of Value, starting from BitIndex, into Buffer:
+ Buffer |= static_cast<UInt64>(Value) << BitIndex;
+
+ // The _signed_ count of bits in Value left to write
+ const char Remaining = a_BitsPerEntry - (64 - BitIndex);
+ if (Remaining >= 0)
+ {
+ // There were some bits remaining: we've filled the buffer. Flush it:
+ a_Packet.WriteBEUInt64(Buffer);
+
+ // And write the remaining bits, setting the new BitIndex:
+ Buffer = Value >> (a_BitsPerEntry - Remaining);
+ BitIndex = Remaining;
+ }
+ else
+ {
+ // It fit, sexcellent.
+ BitIndex += a_BitsPerEntry;
+ }
+ }
+
+ static_assert((cChunkData::SectionBlockCount % 64) == 0, "Section must fit wholly into a 64-bit long array");
+ ASSERT(BitIndex == 0);
+ ASSERT(Buffer == 0);
+}
+
+
+
+
+
void cChunkDataSerializer::CompressAndSend(cByteBuffer & a_Packet, const std::vector<cClientHandle *> & a_SendTo)
{
AString PacketData;