feat: update configuration files and add files

Author: quizhizhe

CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.7.0] - 2025-06-02
+
+### Changed
+
+- Adapt to LeviLamina 1.2.0(BDS-1.21.70.04)
+- Deprecate `base64Nbt` in `dimension_config.json` files and add `sNbt` configuration. Improve the readability of configuration files
+
 ## [0.6.1] - 2025-03-05
 
 ### Fixed
@@ -89,7 +96,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Release the first version
 
-[Unreleased]: https://github.com/LiteLDev/MoreDimensions/compare/v0.6.1...HEAD
+[Unreleased]: https://github.com/LiteLDev/MoreDimensions/compare/v0.7.0...HEAD
+[0.7.0]: https://github.com/LiteLDev/MoreDimensions/compare/v0.6.1...v0.7.0
 [0.6.1]: https://github.com/LiteLDev/MoreDimensions/compare/v0.6.0...v0.6.1
 [0.6.0]: https://github.com/LiteLDev/MoreDimensions/compare/v0.5.0...v0.6.0
 [0.5.0]: https://github.com/LiteLDev/MoreDimensions/compare/v0.4.1...v0.5.0

src/more_dimensions/api/dimension/CustomDimensionManager.cpp

@@ -1,6 +1,7 @@
 
 #include "CustomDimensionManager.h"
 
+#include "mc/nbt/Tag.h"
 #include "more_dimensions/MoreDimenison.h"
 #include "more_dimensions/core/dimension/CustomDimensionConfig.h"
 #include "more_dimensions/core/dimension/FakeDimensionId.h"
@@ -183,7 +184,7 @@ CustomDimensionManager::CustomDimensionManager() : impl(std::make_unique<Impl>()
                 name,
                 Impl::DimensionInfo{
                     info.dimId,
-                    *CompoundTag::fromBinaryNbt(decompress(ll::base64_utils::decode(info.base64Nbt)))
+                    *CompoundTag::fromSnbt(info.sNbt)
                 }
             );
         }
@@ -261,7 +262,7 @@ DimensionType CustomDimensionManager::addDimension(
         impl->customDimensionMap.emplace(dimName, info);
         CustomDimensionConfig::getConfig().dimensionList.emplace(
             dimName,
-            CustomDimensionConfig::Config::Info{info.id, ll::base64_utils::encode(compress(info.nbt.toBinaryNbt()))}
+            CustomDimensionConfig::Config::Info{info.id, info.nbt.toSnbt(SnbtFormat::Minimize)}
         );
         CustomDimensionConfig::saveConfigFile();
     }

src/more_dimensions/api/dimension/CustomDimensionManager.h

@@ -2,9 +2,9 @@
 
 #include "more_dimensions/core/Macros.h"
 
+#include "mc/deps/core/utility/AutomaticID.h"
 #include "mc/nbt/CompoundTag.h"
 #include "mc/world/level/GeneratorType.h"
-#include <mc/deps/core/utility/AutomaticID.h>
 
 class Dimension;
 class ILevel;

src/more_dimensions/core/dimension/CustomDimensionConfig.cpp

@@ -1,19 +1,37 @@
 
 #include "CustomDimensionConfig.h"
 
+#include "mc/nbt/Tag.h"
 #include "more_dimensions/MoreDimenison.h"
 
+#include "snappy.h"
+
 #include "ll/api/Config.h"
 #include "ll/api/service/Bedrock.h"
+#include "ll/api/utils/Base64Utils.h"
 #include "ll/api/utils/ErrorUtils.h"
 
+#include "mc/nbt/CompoundTag.h"
 #include "mc/server/PropertiesSettings.h"
 
+
 namespace more_dimensions::CustomDimensionConfig {
 
 // static ll::Logger            logger("CustomDimensionConfig");
 auto& logger = MoreDimenison::getInstance().getSelf().getLogger();
 
+std::string compress(std::string_view sv) {
+    std::string res;
+    snappy::Compress(sv.data(), sv.size(), &res);
+    return res;
+}
+
+std::string decompress(std::string_view sv) {
+    std::string res;
+    snappy::Uncompress(sv.data(), sv.size(), &res);
+    return res;
+}
+
 static std::filesystem::path dimensionConfigPath{u8"./worlds"};
 
 void setDimensionConfigPath() {
@@ -27,7 +45,25 @@ void setDimensionConfigPath() {
 bool loadConfigFile() {
     if (std::ifstream(dimensionConfigPath).good()) {
         try {
-            if (ll::config::loadConfig(getConfig(), dimensionConfigPath)) {
+            if (ll::config::loadConfig(
+                    getConfig(),
+                    dimensionConfigPath,
+                    [](Config& config, nlohmann::ordered_json& data) {
+                        if (data["version"] < config.version) {
+                            for (auto& item : data["dimensionList"]) {
+                                item["sNbt"] =
+                                    CompoundTag::fromBinaryNbt(decompress(ll::base64_utils::decode(item["base64Nbt"])))
+                                        ->toSnbt(SnbtFormat::Minimize);
+                                item.erase("base64Nbt");
+                            }
+                        }
+                        data.erase("version");
+                        auto patch = ll::reflection::serialize<nlohmann::ordered_json>(config);
+                        patch.value().merge_patch(data);
+                        data = *std::move(patch);
+                        return true;
+                    }
+                )) {
                 logger.info("Config file load success!");
                 return true;
             }
@@ -51,7 +87,7 @@ bool loadConfigFile() {
 }
 
 bool saveConfigFile() {
-    bool result = false;
+    bool result{};
     try {
         result = ll::config::saveConfig(getConfig(), dimensionConfigPath);
     } catch (...) {
@@ -64,4 +100,17 @@ bool saveConfigFile() {
     }
     return true;
 }
+
+// void updateConfigVersion() {
+//     if (getConfig().version < 4) {
+//         logger.info("Config need update");
+//         auto config = getConfig();
+//         for (auto& item : config.dimensionList) {
+//             auto oldStrNbt        = item.second.base64Nbt;
+//             item.second.base64Nbt = CompoundTag::fromBinaryNbt(decompress(ll::base64_utils::decode(oldStrNbt)))
+//                                         ->toSnbt(SnbtFormat::Minimize);
+//         }
+//         saveConfigFile();
+//     }
+// }
 } // namespace more_dimensions::CustomDimensionConfig

src/more_dimensions/core/dimension/CustomDimensionConfig.h

@@ -1,9 +1,5 @@
 #pragma once
 
-#include "ll/api/base/StdInt.h"
-
-#include "mc/world/level/GeneratorType.h"
-
 #include <string>
 #include <unordered_map>
 
@@ -12,13 +8,13 @@ namespace more_dimensions::CustomDimensionConfig {
 struct Config {
     struct Info {
         int         dimId{};
-        std::string base64Nbt;
+        std::string sNbt;
     };
-    int                                   version = 3;
+    int                                   version = 4;
     std::unordered_map<std::string, Info> dimensionList{};
 };
 
-static Config& getConfig() {
+inline Config& getConfig() {
     static Config instance;
     return instance;
 }