fix: (mostly) fixed infdev writing

Author: DexrnZacAttack

.clang-format

@@ -116,7 +116,7 @@ BreakFunctionDefinitionParameters: false
 BreakInheritanceList: BeforeColon
 BreakStringLiterals: true
 BreakTemplateDeclarations: MultiLine
-ColumnLimit: 80
+ColumnLimit: 150
 CommentPragmas: "^ IWYU pragma:"
 CompactNamespaces: false
 ConstructorInitializerIndentWidth: 4

projects/Converters/Minecraft/CMakeLists.txt

@@ -2,12 +2,14 @@ cmake_minimum_required(VERSION 3.30)
 project(Lodestone.Minecraft)
 
 set(NBT_BUILD_TESTS OFF CACHE BOOL "" FORCE)
-FetchContent_Declare(
-        nbt++
-        GIT_REPOSITORY https://github.com/Team-Lodestone/libnbtplusplus.git
-        GIT_TAG master
-)
-FetchContent_MakeAvailable(nbt++)
+if (NOT TARGET nbt++)
+    FetchContent_Declare(
+            nbt++
+            GIT_REPOSITORY https://github.com/Team-Lodestone/libnbtplusplus.git
+            GIT_TAG master
+    )
+    FetchContent_MakeAvailable(nbt++)
+endif()
 
 # PROJECTS
 add_subdirectory(Common)

projects/Converters/Minecraft/Common/include/Lodestone.Minecraft.Common/world/data/LevelData.h

@@ -14,7 +14,7 @@ namespace lodestone::minecraft::common::world::data {
         int64_t lastPlayed;
         int64_t time;
 
-        LevelData(const int64_t seed = 0, const int64_t lastPlayed = 0, const int64_t time = 0) : seed(seed), lastPlayed(lastPlayed), time(time) {}
+        explicit LevelData(const int64_t seed = 0, const int64_t lastPlayed = 0, const int64_t time = 0) : seed(seed), lastPlayed(lastPlayed), time(time) {}
     };
 }
 

projects/Converters/Minecraft/Java/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION VERSION 3.30)
-project(Lodestone.Minecraft.Java VERSION 1.2.4)
+project(Lodestone.Minecraft.Java VERSION 1.2.5)
 set(PROJECT_VERSION_DEV) # used for dev versions, otherwise blank
 
 set(CMAKE_CXX_STANDARD 20)

projects/Converters/Minecraft/Java/include/Lodestone.Minecraft.Java/conversion/infdev/InfdevChunkIo.h

@@ -10,6 +10,8 @@
 */
 #ifndef LODESTONE_INFDEVCHUNKIO_H
 #define LODESTONE_INFDEVCHUNKIO_H
+#include <BinaryIO/io/Serializable.h>
+
 #include <memory>
 
 #include <Lodestone.Conversion/io/ObjectIOs.h>
@@ -21,13 +23,52 @@ namespace lodestone::minecraft::java::infdev::chunk {
     class InfdevChunkIO : public conversion::io::ChunkIO<&identifiers::INF_624_CHUNK_IO, const common::conversion::io::options::OptionPresets::CommonReadOptions, const common::conversion::io::options::OptionPresets::CommonChunkWriteOptions>
     {
     public:
-        static constexpr int CHUNK_WIDTH = 16;
-        static constexpr int CHUNK_DEPTH = 16;
-        static constexpr int CHUNK_HEIGHT = 128;
+        struct Properties {
+            using Deserializer = bio::io::Deserializable<Properties, void>;
+            using Serializer = bio::io::Serializable<Properties, void>;
+
+            const bool terrainPopulated;
+
+            constexpr int64_t serialize() const {
+                return 0
+                    | (this->terrainPopulated ? 0b0000000000000001 : 0L);
+            }
+
+            constexpr static Properties fromSerialized(const int64_t value) {
+                return {
+                    .terrainPopulated = (value & 0b0000000000000001) == 1
+                };
+            }
+        };
 
         std::unique_ptr<level::chunk::Chunk> read(const common::conversion::io::options::OptionPresets::CommonReadOptions &options) const override;
         void write(level::chunk::Chunk *c, const common::conversion::io::options::OptionPresets::CommonChunkWriteOptions &options) const override;
     };
 }
 
+using namespace lodestone::minecraft::java::infdev::chunk;
+
+template <>
+class bio::io::Deserializable<InfdevChunkIO::Properties, void> {
+public:
+    using Type = InfdevChunkIO::Properties;
+    using Options = void;
+
+    static std::unique_ptr<InfdevChunkIO::Properties> deserialize(ReadableBufferLike auto &readable) {
+        const int64_t props = readable.template readBE<int64_t>();
+        return std::make_unique<InfdevChunkIO::Properties>(InfdevChunkIO::Properties::fromSerialized(props));
+    }
+};
+
+template<>
+class bio::io::Serializable<InfdevChunkIO::Properties, void> {
+public:
+    using Type = InfdevChunkIO::Properties;
+    using Options = void; // allows us to call serialize without an options arg.
+
+    static void serialize(const InfdevChunkIO::Properties& properties, WritableBufferLike auto &writable) {
+        writable.template writeBE<int64_t>(properties.serialize());
+    }
+};
+
 #endif //LODESTONE_INFDEVCHUNKIO_H

projects/Converters/Minecraft/Java/include/Lodestone.Minecraft.Java/infdev/InfdevChunk.h

@@ -10,23 +10,59 @@
 */
 #ifndef LODESTONE_INFDEVCHUNK_H
 #define LODESTONE_INFDEVCHUNK_H
+#include "Lodestone.Minecraft.Java/infdev/InfdevZone.h"
+
 #include <Lodestone.Level/chunk/LevelChunk.h>
 
 namespace lodestone::minecraft::java::infdev::chunk {
 
     class InfdevChunk final : public level::chunk::LevelChunk {
     public:
-        explicit InfdevChunk(const int64_t lastUpdate = 0)
-            : LevelChunk(128), m_lastUpdate(lastUpdate) {}
+        static constexpr int CHUNK_WIDTH = 16;
+        static constexpr int CHUNK_DEPTH = 16;
+        static constexpr int CHUNK_HEIGHT = 128;
+
+        /** Size of the chunk header in bytes */
+        static constexpr int CHUNK_HEADER_SIZE = sizeof(int32_t) // chunk x coord
+                                               + sizeof(int32_t) // chunk z coord
+                                               + sizeof(int64_t) // inhabited time
+                                               + sizeof(int64_t) // properties
+                                               + 232;            // extra padding/reserved
+
+        /** Size of the chunk heightmap in bytes */
+        static constexpr int CHUNK_HEIGHTMAP_SIZE = CHUNK_WIDTH * CHUNK_DEPTH;
+        /** Size of the chunk block array in bytes */
+        static constexpr int CHUNK_TOTAL_BLOCKS = CHUNK_WIDTH * CHUNK_DEPTH * CHUNK_HEIGHT;
+        /** Size of the chunk layer in bytes (used for metadata, skylight, blocklight) */
+        static constexpr int CHUNK_LAYER_SIZE = CHUNK_TOTAL_BLOCKS / 2;
+
+        /** Amount of layers stored in the chunk (DataLayer)
+         *
+         * - Metadata
+         * - Sky light
+         * - Block light
+         */
+        static constexpr int CHUNK_LAYERS = 3;
+
+        /** Incorrect chunk size in bytes, used for getting the zone offset
+         *
+         * The calculation is incorrect, please use CHUNK_SIZE_BYTES for the actual size in bytes
+         */
+        static constexpr int CHUNK_SIZE_SLOT_OFFSET = CHUNK_TOTAL_BLOCKS * CHUNK_LAYERS + CHUNK_HEADER_SIZE; // not the true size tho??? I mean technically it works since it will be bigger than the real size...
+        /** Chunk size in bytes */
+        static constexpr int CHUNK_BYTES = /*header*/CHUNK_HEADER_SIZE + /*block array*/CHUNK_TOTAL_BLOCKS + /*metadata, skylight, blocklight*/(CHUNK_LAYER_SIZE * CHUNK_LAYERS) + /*heightmap*/CHUNK_HEIGHTMAP_SIZE;
+
+        explicit InfdevChunk(const int64_t lastUpdate = 0, const bool isPopulated = true)
+            : LevelChunk(128), m_lastUpdate(lastUpdate), m_terrainPopulated(isPopulated) {}
 
         explicit InfdevChunk(const level::types::Vec2i &coords,
-                               const int64_t lastUpdate = 0)
-            : LevelChunk(128, coords), m_lastUpdate(lastUpdate) {}
+                               const int64_t lastUpdate = 0, const bool isPopulated = true)
+            : LevelChunk(128, coords), m_lastUpdate(lastUpdate), m_terrainPopulated(isPopulated) {}
 
         InfdevChunk(level::chunk::ChunkContainer *container,
                       const level::types::Vec2i &coords,
-                      const int64_t lastUpdate = 0)
-            : LevelChunk(128, container, coords), m_lastUpdate(lastUpdate) {}
+                      const int64_t lastUpdate = 0, const bool isPopulated = true)
+            : LevelChunk(128, container, coords), m_lastUpdate(lastUpdate), m_terrainPopulated(isPopulated) {}
 
         std::string toString() const override {
             if (this->m_coords.has_value())
@@ -36,8 +72,22 @@ namespace lodestone::minecraft::java::infdev::chunk {
             return std::format("InfdevChunk");
         };
 
+        constexpr static int getSlotIndex(const int chunkX, const int chunkZ) {
+            const int zoneX = chunkX >> zone::InfdevZone::CHUNKS_PER_ZONE_BITS;
+            const int zoneZ = chunkZ >> zone::InfdevZone::CHUNKS_PER_ZONE_BITS;
+
+            const int offsetX = chunkX - (zoneX << zone::InfdevZone::CHUNKS_PER_ZONE_BITS);
+            const int offsetZ = chunkZ - (zoneZ << zone::InfdevZone::CHUNKS_PER_ZONE_BITS);
+
+            return offsetX + offsetZ * zone::InfdevZone::CHUNKS_PER_ZONE;
+        }
+
+        constexpr static int getSlotOffset(int slotIndex) {
+            return (slotIndex - 1) * CHUNK_SIZE_SLOT_OFFSET + zone::InfdevZone::HEADER_SIZE;
+        }
     private:
         int64_t m_lastUpdate = 0;
+        bool m_terrainPopulated = true;
     };
 
 }

projects/Converters/Minecraft/Java/include/Lodestone.Minecraft.Java/infdev/InfdevZone.h

@@ -16,11 +16,20 @@
 namespace lodestone::minecraft::java::infdev::zone {
     class InfdevZone : public level::Level {
     public:
+        static constexpr int HEADER_SIZE = 4096;
+        static constexpr int MAGIC_NUMBER = 0x13737000;
+        static constexpr short VERSION = 0;
+
+        static constexpr int CHUNKS_PER_ZONE_BITS = 5;
+	static constexpr int CHUNKS_PER_ZONE = 1 << CHUNKS_PER_ZONE_BITS;
+
         explicit InfdevZone(const level::types::Vec2i &coords) : m_coords(coords) {}
 
         std::string getFilename() const;
         static level::types::Vec2i
         getCoordsFromFilename(const std::string &name);
+
+        static signed int getSlot(int cx, int cz);
     private:
         const level::types::Vec2i m_coords;
     };

projects/Converters/Minecraft/Java/src/infdev/chunk/InfdevChunk.cpp

@@ -10,5 +10,8 @@
 */
 #include "Lodestone.Minecraft.Java/infdev/InfdevChunk.h"
 
+#include "Lodestone.Minecraft.Java/infdev/InfdevZone.h"
+
 namespace lodestone::minecraft::java::infdev::chunk {
+
 }