Merge branch 'main' into develop

Author: ShrBox

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.5.4] - 2024-04-08
+
+### Fixed
+
+- Fix getPlayerNbt [#94]
+- Fix offline setPlayerNbt
+
 ## [0.5.3] - 2024-04-05
 
 ### Fixed
@@ -240,7 +247,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#82]: https://github.com/LiteLDev/LegacyScriptEngine/issues/82
 [#91]: https://github.com/LiteLDev/LegacyScriptEngine/issues/91
 [#92]: https://github.com/LiteLDev/LegacyScriptEngine/issues/92
+[#94]: https://github.com/LiteLDev/LegacyScriptEngine/issues/94
 
+[0.5.4]: https://github.com/LiteLDev/LegacyScriptEngine/compare/v0.5.3...v0.5.4
 [0.5.3]: https://github.com/LiteLDev/LegacyScriptEngine/compare/v0.5.2...v0.5.3
 [0.5.2]: https://github.com/LiteLDev/LegacyScriptEngine/compare/v0.5.1...v0.5.2
 [0.5.1]: https://github.com/LiteLDev/LegacyScriptEngine/compare/v0.4.15...v0.5.1

manifest.json

@@ -4,7 +4,7 @@
     "type": "native",
     "description": "A plugin engine for running LLSE plugins on LeviLamina",
     "author": "LiteLDev",
-    "version": "0.5.3",
+    "version": "0.5.4",
     "dependencies": [
         {
             "name": "LegacyMoney"

src/legacy/api/MoreGlobal.cpp

@@ -4,20 +4,20 @@
 #include "mc/world/level/storage/DBStorage.h"
 #include "mc/world/level/storage/DBStorageConfig.h"
 
+DBStorage* MoreGlobal::db;
+
 LL_TYPE_INSTANCE_HOOK(
     DBStorageHook,
     HookPriority::Normal,
     DBStorage,
     "??0DBStorage@@QEAA@UDBStorageConfig@@V?$not_null@V?$NonOwnerPointer@VLevelDbEnv@@@Bedrock@@@gsl@@@Z",
-    DBStorage,
+    DBStorage*,
     struct DBStorageConfig&                        cfg,
     Bedrock::NotNullNonOwnerPtr<class LevelDbEnv>& dbEnv
 ) {
-    DBStorage ori = origin(cfg, dbEnv);
-    MoreGlobal::setDBStorage(&ori);
+    DBStorage* ori = origin(cfg, dbEnv);
+    MoreGlobal::db = ori;
     return ori;
 };
 
 void MoreGlobal::Init() { DBStorageHook::hook(); }
-
-DBStorage* MoreGlobal::db = nullptr;

src/legacy/api/MoreGlobal.h

@@ -1,10 +1,5 @@
 class DBStorage;
-class MoreGlobal {
-private:
-    static DBStorage* db;
-
-public:
-    static void       Init();
-    static DBStorage* getDBStorage() { return db; };
-    static void       setDBStorage(DBStorage* dbs) { db = dbs; };
-};
+namespace MoreGlobal {
+extern DBStorage* db;
+extern void       Init();
+}; // namespace MoreGlobal

src/legacy/api/PlayerAPI.cpp

@@ -37,6 +37,7 @@
 #include "mc/enums/MinecraftPacketIds.h"
 #include "mc/enums/ScorePacketType.h"
 #include "mc/enums/TextPacketType.h"
+#include "mc/enums/d_b_helpers/Category.h"
 #include "mc/nbt/ListTag.h"
 #include "mc/network/ConnectionRequest.h"
 #include "mc/network/MinecraftPackets.h"
@@ -330,28 +331,32 @@ Local<Value> McClass::getPlayerNbt(const Arguments& args) {
     CHECK_ARGS_COUNT(args, 1);
     CHECK_ARG_TYPE(args[0], ValueKind::kString);
     try {
-        auto         uuid   = mce::UUID::fromString(args[0].asString().toString());
-        CompoundTag* tag    = new CompoundTag();
-        Player*      player = ll::service::getLevel()->getPlayer(uuid);
+        auto                         uuid   = mce::UUID::fromString(args[0].asString().toString());
+        std::unique_ptr<CompoundTag> tag    = std::make_unique<CompoundTag>();
+        Player*                      player = ll::service::getLevel()->getPlayer(uuid);
         if (player) {
             player->save(*tag);
         } else {
-            DBStorage* db = MoreGlobal::getDBStorage();
+            DBStorage* db = MoreGlobal::db;
             if (db) {
-                auto tagPtr = db->loadPlayerDataFromTag(uuid.asString());
-                if (tagPtr) {
-                    tag = std::move(tagPtr.get());
+                if (db->hasKey("player_" + uuid.asString(), DBHelpers::Category::Player)) {
+                    std::unique_ptr<CompoundTag> playerTag =
+                        db->getCompoundTag("player_" + uuid.asString(), DBHelpers::Category::Player);
+                    if (playerTag) {
+                        std::string serverId = playerTag->at("ServerId");
+                        if (!serverId.empty()) {
+                            if (db->hasKey(serverId, DBHelpers::Category::Player)) {
+                                tag = db->getCompoundTag(serverId, DBHelpers::Category::Player);
+                            }
+                        }
+                    }
                 }
-            } else {
-                return Local<Value>();
             }
         }
-
-        if (!tag->isEmpty()) {
-            return NbtCompoundClass::pack(tag);
-        } else {
-            return Local<Value>();
+        if (tag && !tag->isEmpty()) {
+            return NbtCompoundClass::pack(std::move(tag));
         }
+        return Local<Value>();
     }
     CATCH("Fail in getPlayerNbt!")
 }
@@ -365,8 +370,24 @@ Local<Value> McClass::setPlayerNbt(const Arguments& args) {
         Player* player = ll::service::getLevel()->getPlayer(uuid);
         if (player) {
             player->load(*tag);
+            return Boolean::newBoolean(true);
+        } else {
+            DBStorage* db = MoreGlobal::db;
+            if (db) {
+                if (db->hasKey("player_" + uuid.asString(), DBHelpers::Category::Player)) {
+                    std::unique_ptr<CompoundTag> playerTag =
+                        db->getCompoundTag("player_" + uuid.asString(), DBHelpers::Category::Player);
+                    if (playerTag) {
+                        std::string serverId = playerTag->at("ServerId");
+                        if (!serverId.empty()) {
+                            db->saveData(serverId, tag->toBinaryNbt(), DBHelpers::Category::Player);
+                            return Boolean::newBoolean(true);
+                        }
+                    }
+                }
+            }
         }
-        return Boolean::newBoolean(true);
+        return Boolean::newBoolean(false);
     }
     CATCH("Fail in setPlayerNbt!")
 }

tooth.json

@@ -1,7 +1,7 @@
 {
     "format_version": 2,
     "tooth": "github.com/LiteLDev/LegacyScriptEngine",
-    "version": "0.5.3",
+    "version": "0.5.4",
     "info": {
         "name": "LegacyScriptEngine",
         "description": "A plugin engine for running LLSE plugins on LeviLamina",
@@ -12,7 +12,7 @@
         ]
     },
     "dependencies": {
-        "gitea.litebds.com/LiteLDev/legacy-script-engine-lua": "0.5.3",
-        "gitea.litebds.com/LiteLDev/legacy-script-engine-quickjs": "0.5.3"
+        "gitea.litebds.com/LiteLDev/legacy-script-engine-lua": "0.5.4",
+        "gitea.litebds.com/LiteLDev/legacy-script-engine-quickjs": "0.5.4"
     }
 }

tooth.lua.json

@@ -1,7 +1,7 @@
 {
     "format_version": 2,
     "tooth": "gitea.litebds.com/LiteLDev/legacy-script-engine-lua",
-    "version": "0.5.3",
+    "version": "0.5.4",
     "info": {
         "name": "LegacyScriptEngine with Lua backend",
         "description": "A plugin engine for running LLSE plugins on LeviLamina",

tooth.nodejs.json

@@ -1,7 +1,7 @@
 {
     "format_version": 2,
     "tooth": "gitea.litebds.com/LiteLDev/legacy-script-engine-nodejs",
-    "version": "0.5.3",
+    "version": "0.5.4",
     "info": {
         "name": "LegacyScriptEngine with NodeJs backend",
         "description": "A plugin engine for running LLSE plugins on LeviLamina",

tooth.python.json

@@ -1,7 +1,7 @@
 {
     "format_version": 2,
     "tooth": "gitea.litebds.com/LiteLDev/legacy-script-engine-python",
-    "version": "0.5.3",
+    "version": "0.5.4",
     "info": {
         "name": "LegacyScriptEngine with Python backend",
         "description": "A plugin engine for running LLSE plugins on LeviLamina",

tooth.quickjs.json

@@ -1,7 +1,7 @@
 {
     "format_version": 2,
     "tooth": "gitea.litebds.com/LiteLDev/legacy-script-engine-quickjs",
-    "version": "0.5.3",
+    "version": "0.5.4",
     "info": {
         "name": "LegacyScriptEngine with QuickJs backend",
         "description": "A plugin engine for running LLSE plugins on LeviLamina",