refactor: compress dim nbt data

LiteLDev · Jan 20, 2024 · 521e491 · 521e491
1 parent 46f101b
commit 521e491
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 21 deletions.
diff --git a/src/ll/api/dimension/CustomDimensionManager.cpp b/src/ll/api/dimension/CustomDimensionManager.cpp
@@ -120,12 +120,16 @@ struct CustomDimensionManager::Impl {
 
 CustomDimensionManager::CustomDimensionManager() : impl(std::make_unique<Impl>()) {
     std::lock_guard lock{impl->mMapMutex};
+    CustomDimensionConfig::setDimensionConfigPath();
     CustomDimensionConfig::loadConfigFile();
     if (!CustomDimensionConfig::dimConfig.dimensionList.empty()) {
         for (auto& [name, info] : CustomDimensionConfig::dimConfig.dimensionList) {
             impl->customDimensionMap.emplace(
                 name,
-                Impl::DimensionInfo{info.dimId, *CompoundTag::fromBinaryNbt(base64_utils::decode(info.base64Nbt))}
+                Impl::DimensionInfo{
+                    info.dimId,
+                    *CompoundTag::fromBinaryNbt(string_utils::decompress(base64_utils::decode(info.base64Nbt)))
+                }
             );
         }
         impl->mNewDimensionId += static_cast<int>(impl->customDimensionMap.size());
@@ -150,12 +154,19 @@ DimensionType CustomDimensionManager::addDimension(
     bool                newDim{};
     if (impl->customDimensionMap.contains(dimName)) {
         info = impl->customDimensionMap.at(dimName);
-        loggerMoreDimMag.debug("The dimension already registry. use old id, name: {}, id: {}", dimName, info.id.id);
+        loggerMoreDimMag.debug(
+            "The dimension already registry. use old id, name: {}, id: {}, \ndata: {}",
+            dimName,
+            info.id.id,
+            info.nbt.toSnbt()
+        );
     } else {
         // Assign new id
         info.id  = impl->mNewDimensionId++;
         info.nbt = data();
         newDim   = true;
+        loggerMoreDimMag
+            .debug("registry new dimension, name: {}, id: {}, \ndata: {}", dimName, info.id.id, info.nbt.toSnbt());
     };
 
     // registry create dimension function
@@ -191,7 +202,10 @@ DimensionType CustomDimensionManager::addDimension(
         impl->customDimensionMap.emplace(dimName, info);
         CustomDimensionConfig::dimConfig.dimensionList.emplace(
             dimName,
-            CustomDimensionConfig::Config::Info{info.id, base64_utils::encode(info.nbt.toBinaryNbt())}
+            CustomDimensionConfig::Config::Info{
+                info.id,
+                base64_utils::encode(string_utils::compress(info.nbt.toBinaryNbt()))
+            }
         );
         CustomDimensionConfig::saveConfigFile();
     }

diff --git a/src/ll/core/dimension/CustomDimensionConfig.cpp b/src/ll/core/dimension/CustomDimensionConfig.cpp
@@ -11,20 +11,19 @@
 
 namespace ll::dimension::CustomDimensionConfig {
 
-static ll::Logger  logger("CustomDimensionConfig");
-static std::string dimensionConfigPath{R"(worlds\Bedrock level\dimension_config.json)"};
-Config             dimConfig{};
+static ll::Logger            logger("CustomDimensionConfig");
+static std::filesystem::path dimensionConfigPath{u8"./worlds"};
+Config                       dimConfig{};
 
 void setDimensionConfigPath() {
     if (!ll::service::getLevel()) {
-        return;
+        throw std::runtime_error("Level nullptr");
     }
-    auto levelName = ll::service::getLevel()->getLevelData().getLevelName();
-    dimensionConfigPath.replace(dimensionConfigPath.find("Bedrock level"), 13, levelName);
+    dimensionConfigPath /= string_utils::str2u8str(ll::service::getLevel()->getLevelName());
+    dimensionConfigPath /= u8"dimension_config.json";
 }
 
 bool loadConfigFile() {
-    setDimensionConfigPath(); // set real world path
     if (!ll::config::loadConfig(dimConfig, dimensionConfigPath, [](auto&, auto&) -> bool { return false; })) {
         if (ll::config::saveConfig(dimConfig, dimensionConfigPath)) {
             logger.warn("Config file rewrite success!");

diff --git a/src/ll/core/dimension/CustomDimensionConfig.h b/src/ll/core/dimension/CustomDimensionConfig.h
@@ -12,7 +12,7 @@ struct Config {
         int         dimId{};
         std::string base64Nbt;
     };
-    int                                   version = 2;
+    int                                   version = 3;
     std::unordered_map<std::string, Info> dimensionList{};
 };
 extern Config dimConfig;

diff --git a/src/ll/test/customWorldGenerator/MyFlatWorldGenerator.hpp b/src/ll/test/customWorldGenerator/MyFlatWorldGenerator.hpp
@@ -1,4 +1,7 @@
 #pragma once
+
+#include "ll/api/utils/RandomUtils.h"
+
 #include "mc/common/wrapper/FeatureRefTraits.h"
 #include "mc/common/wrapper/WeakRefT.h"
 #include "mc/deps/core/debug/log/ContentLog.h"
@@ -70,19 +73,15 @@ class MyFlatWorldGenerator : public FlatWorldGenerator {
 
         // r->place(blockSource, {14, -60, 14}, random);
 
-        srand(time(0));
-
-        XoroshiroPositionalRandomFactory wxoroshiroPositionalRandomFactory(rand(), rand());
         LakeFeature wlakeFeature(
             BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Water, 1),
-            wxoroshiroPositionalRandomFactory
+            XoroshiroPositionalRandomFactory{ll::random_utils::rand<uint64>(), ll::random_utils::rand<uint64>()}
         );
         wlakeFeature.place(blockSource, {14, 0, 14}, random);
 
-        XoroshiroPositionalRandomFactory lxoroshiroPositionalRandomFactory(rand(), rand());
         LakeFeature llakeFeature(
             BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Lava, 1),
-            lxoroshiroPositionalRandomFactory
+            XoroshiroPositionalRandomFactory{ll::random_utils::rand<uint64>(), ll::random_utils::rand<uint64>()}
         );
         llakeFeature.place(blockSource, {-14, 0, -14}, random);
 

diff --git a/src/mc/util/random/XoroshiroPositionalRandomFactory.h b/src/mc/util/random/XoroshiroPositionalRandomFactory.h
@@ -13,11 +13,11 @@ namespace Crypto::Hash { class md5; }
 
 class XoroshiroPositionalRandomFactory : public ::IPositionalRandomFactory {
 public:
-    uint64_t mSeedLo; // this+0x8
-    uint64_t mSeedHi; // this+0x10
+    uint64 mSeedLo; // this+0x8
+    uint64 mSeedHi; // this+0x10
 
 public:
-    XoroshiroPositionalRandomFactory(uint64_t seedLo, uint64_t seedHi) : mSeedLo(seedLo), mSeedHi(seedHi) {}
+    XoroshiroPositionalRandomFactory(uint64 seedLo, uint64 seedHi) : mSeedLo(seedLo), mSeedHi(seedHi) {}
 
 public:
     // NOLINTBEGIN

diff --git a/src/mc/world/level/Level.h b/src/mc/world/level/Level.h
@@ -52,7 +52,6 @@ class ServerLevel;
 class Level : public ILevel, public BlockSourceListener, public IWorldRegistriesProvider {
 public:
     [[nodiscard]] std::string const& getLevelName() const { return getLevelData().getLevelName(); }
-    [[nodiscard]] std::string        getLevelPath() const { return "./worlds/" + getLevelName(); }
 
     [[nodiscard]] ServerLevel& asServer() { return *reinterpret_cast<ServerLevel*>(this); }
 

diff --git a/src/mc/world/level/levelgen/feature/IFeature.h b/src/mc/world/level/levelgen/feature/IFeature.h
@@ -2,6 +2,11 @@
 
 #include "mc/_HeaderOutputPredefine.h"
 
+class IBlockWorldGenAPI;
+class BlockPos;
+class Random;
+class RenderParams;
+
 class IFeature {
 public:
     // prevent constructor by default