From baa20494bf5e4c98b220065d3a2813a3a36378c1 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 11 Dec 2021 19:34:38 +0100 Subject: [PATCH] World: Section: implement new section-based biome data format --- src/World/Chunk.cpp | 8 +++++ src/World/Chunk.hpp | 4 +-- src/World/Section.cpp | 83 ++++++++++++++++++++++++++++++++++++++++--- src/World/Section.hpp | 26 ++++++++++++-- 4 files changed, 113 insertions(+), 8 deletions(-) diff --git a/src/World/Chunk.cpp b/src/World/Chunk.cpp index a447cda..136c3bf 100644 --- a/src/World/Chunk.cpp +++ b/src/World/Chunk.cpp @@ -79,6 +79,14 @@ uint8_t Chunk::getBiome(block_idx_t x, y_idx_t y, block_idx_t z) const { return biomeInts->getValue(z*SIZE + x); case BYTE_ARRAY: return biomeBytes->getValue(z*SIZE + x); + case SECTION: { + section_idx_t Y = (y >> HSHIFT) - sectionOffset; + + if (Y < 0 || size_t(Y) >= sections.size() || !sections[Y]) + break; + + return sections[Y]->getBiomeAt(x, y & HMASK, z); + } default: break; } diff --git a/src/World/Chunk.hpp b/src/World/Chunk.hpp index 34a5184..611c3c8 100644 --- a/src/World/Chunk.hpp +++ b/src/World/Chunk.hpp @@ -36,9 +36,9 @@ public: // Since Minecraft 1.15, biome information is stored for // 4x4x4 block groups - static const unsigned BSHIFT = 2; + static const unsigned BSHIFT = Section::BSHIFT; // Number of biome values in a chunk in x/z dimensions - static const uint32_t BSIZE = SIZE >> BSHIFT; + static const uint32_t BSIZE = Section::BSIZE; // Number of biome values in a chunk in y dimension static const uint32_t BMAXY = MAXY >> BSHIFT; diff --git a/src/World/Section.cpp b/src/World/Section.cpp index bc10f96..8d50bca 100644 --- a/src/World/Section.cpp +++ b/src/World/Section.cpp @@ -6,6 +6,7 @@ #include "Section.hpp" +#include "../Resource/Biome.hpp" #include "../NBT/ByteTag.hpp" #include "../NBT/StringTag.hpp" @@ -24,6 +25,10 @@ const Resource::BlockType * Section::getBlockStateAt(block_idx_t, block_idx_t, b return nullptr; } +uint8_t Section::getBiomeAt(block_idx_t x, block_idx_t y, block_idx_t z) const { + return 0xff; +} + std::unique_ptr
Section::makeSection(const std::shared_ptr §ion, uint32_t dataVersion) { { const std::shared_ptr blockStates = section->get("block_states"); @@ -31,7 +36,13 @@ std::unique_ptr
Section::makeSection(const std::shared_ptr palette = assertValue(blockStates->get("palette")); std::shared_ptr data = blockStates->get("data"); - return std::unique_ptr
(new PaletteSection(section, std::move(data), palette, dataVersion)); + const std::shared_ptr biomes = assertValue(section->get("biomes")); + const std::shared_ptr biomePalette = assertValue(biomes->get("palette")); + std::shared_ptr biomeData = biomes->get("data"); + + return std::unique_ptr
(new PaletteSection( + section, std::move(data), palette, std::move(biomeData), biomePalette, dataVersion + )); } } @@ -40,7 +51,10 @@ std::unique_ptr
Section::makeSection(const std::shared_ptr palette = assertValue(section->get("Palette")); - return std::unique_ptr
(new PaletteSection(section, std::move(blockStates), palette, dataVersion)); + return std::unique_ptr
(new PaletteSection( + section, std::move(blockStates), palette, + std::shared_ptr(), std::shared_ptr(), dataVersion + )); } } @@ -76,8 +90,10 @@ PaletteSection::PaletteSection( const std::shared_ptr §ion, std::shared_ptr &&blockStates0, const std::shared_ptr &paletteData, + std::shared_ptr &&biomes0, + const std::shared_ptr &biomePaletteData, uint32_t dataVersion0 -) : Section(section), blockStates(blockStates0), dataVersion(dataVersion0) { +) : Section(section), blockStates(blockStates0), biomes(biomes0), dataVersion(dataVersion0) { bits = 4; while ((1u << bits) < paletteData->size()) { bits++; @@ -86,6 +102,16 @@ PaletteSection::PaletteSection( throw std::invalid_argument("unsupported block palette size"); } + biomeBits = 1; + if (biomePaletteData) { + while ((1u << biomeBits) < biomePaletteData->size()) { + biomeBits++; + + if (bits > 6) + throw std::invalid_argument("unsupported biome palette size"); + } + } + unsigned expectedLength; if (dataVersion < 2529) { @@ -96,7 +122,13 @@ PaletteSection::PaletteSection( } if (blockStates && blockStates->getLength() != expectedLength) - throw std::invalid_argument("corrupt section data"); + throw std::invalid_argument("corrupt section block data"); + + unsigned biomesPerWord = (64 / biomeBits); + unsigned expectedBiomeLength = (64 + biomesPerWord - 1) / biomesPerWord; + + if (biomes && biomes->getLength() != expectedBiomeLength) + throw std::invalid_argument("corrupt section biome data"); for (const auto &entry : *paletteData) { const NBT::CompoundTag &paletteEntry = *assertValue(dynamic_cast(entry.get())); @@ -108,6 +140,25 @@ PaletteSection::PaletteSection( palette.push_back(type); } + + if (biomePaletteData) { + for (const auto &entry : *biomePaletteData) { + const NBT::StringTag &paletteEntry = + *assertValue(dynamic_cast(entry.get())); + std::string name = paletteEntry.getValue(); + + auto it = Resource::Biome::Names.find(name); + uint8_t biome; + if (it != Resource::Biome::Names.end()) { + biome = it->second; + } else { + std::fprintf(stderr, "Warning: unknown biome: %s\n", name.c_str()); + biome = 0xff; + } + + biomePalette.push_back(biome); + } + } } const Resource::BlockType * PaletteSection::getBlockStateAt(block_idx_t x, block_idx_t y, block_idx_t z) const { @@ -141,5 +192,29 @@ const Resource::BlockType * PaletteSection::getBlockStateAt(block_idx_t x, block return palette.at((v >> shift) & mask); } +uint8_t PaletteSection::getBiomeAt(block_idx_t x, block_idx_t y, block_idx_t z) const { + if (!biomes) + return biomePalette.at(0); + + size_t index = getBiomeIndex(x, y, z); + + unsigned biomesPerWord = (64 / biomeBits); + size_t word = index / biomesPerWord; + size_t bitIndex = 64 * word + biomeBits * (index % biomesPerWord); + + size_t pos = bitIndex >> 3; + unsigned shift = bitIndex & 7; + uint16_t mask = (1u << biomeBits) - 1; + + uint32_t v = biomes->getPointer()[mangleByteIndex(pos)]; + + if (shift + biomeBits > 8) + v |= biomes->getPointer()[mangleByteIndex(pos + 1)] << 8; + /* We do not need to check for shift+bits > 16: biomeBits should never + be greater than 6, so our value will never span more than 2 bytes */ + + return biomePalette.at((v >> shift) & mask); +} + } } diff --git a/src/World/Section.hpp b/src/World/Section.hpp index d18f95f..9884a77 100644 --- a/src/World/Section.hpp +++ b/src/World/Section.hpp @@ -27,6 +27,13 @@ public: // Number of blocks in a section in each dimension static const uint32_t SIZE = 16; + // Since Minecraft 1.15, biome information is stored for + // 4x4x4 block groups + static const unsigned BSHIFT = 2; + // Number of biome values in a chunk in x/z dimensions + static const uint32_t BSIZE = SIZE >> BSHIFT; + + private: section_idx_t Y; std::shared_ptr blockLight; @@ -34,11 +41,18 @@ private: protected: static size_t getIndex(block_idx_t x, block_idx_t y, block_idx_t z) { if (x >= SIZE || y >= SIZE || z >= SIZE) - throw std::range_error("Chunk::getIndex(): bad coordinates"); + throw std::range_error("Section::getIndex(): bad coordinates"); return SIZE*SIZE*y + SIZE*z + x; } + static size_t getBiomeIndex(block_idx_t x, block_idx_t y, block_idx_t z) { + if (x >= SIZE || y >= SIZE || z >= SIZE) + throw std::range_error("Section::getBiomeIndex(): bad coordinates"); + + return BSIZE*BSIZE*(y>>BSHIFT) + BSIZE*(z>>BSHIFT) + (x>>BSHIFT); + } + static uint8_t getHalf(const uint8_t *v, block_idx_t x, block_idx_t y, block_idx_t z) { size_t i = getIndex(x, y, z); @@ -56,6 +70,7 @@ public: section_idx_t getY() const { return Y; }; virtual const Resource::BlockType * getBlockStateAt(block_idx_t x, block_idx_t y, block_idx_t z) const; + virtual uint8_t getBiomeAt(block_idx_t x, block_idx_t y, block_idx_t z) const; uint8_t getBlockLightAt(block_idx_t x, block_idx_t y, block_idx_t z) const { if (!blockLight) @@ -95,9 +110,13 @@ class PaletteSection : public Section { private: std::shared_ptr blockStates; std::vector palette; - uint32_t dataVersion; unsigned bits; + std::shared_ptr biomes; + std::vector biomePalette; + unsigned biomeBits; + + uint32_t dataVersion; static const Resource::BlockType * lookup(const std::string &name, uint32_t dataVersion); @@ -110,10 +129,13 @@ public: const std::shared_ptr §ion, std::shared_ptr &&blockStates0, const std::shared_ptr &paletteData, + std::shared_ptr &&biomes0, + const std::shared_ptr &biomePaletteData, uint32_t dataVersion0 ); virtual const Resource::BlockType * getBlockStateAt(block_idx_t x, block_idx_t y, block_idx_t z) const; + virtual uint8_t getBiomeAt(block_idx_t x, block_idx_t y, block_idx_t z) const; }; }