fix: fix shit

manifest.json

@@ -1,7 +1,7 @@
 {
     "name": "${pluginName}",
     "entry": "${pluginFile}",
-    "version": "1.0.1",
+    "version": "1.1.2",
     "author": "GroupMountain",
     "type": "native",
     "passive": true,

src/CompatibilityApi.cpp

@@ -1,4 +1,5 @@
 #include "Global.h"
+#include "mc/platform/UUID.h"
 #include <regex>
 
 ActorUniqueID parseScriptUniqueID(std::string const& uniqueId) {
@@ -35,7 +36,7 @@ void Export_Compatibility_API() {
         return result;
     });
     RemoteCall::exportAs("GMLIB_API", "getPlayerNbt", [](std::string const& uuid) -> std::unique_ptr<CompoundTag> {
-        if (auto player = OfflinePlayer::getOfflinePlayer(mce::UUID::fromString(uuid))) {
+        if (auto player = OfflinePlayer::fromUuid(mce::UUID::fromString(uuid))) {
             return std::make_unique<CompoundTag>(*player->getNbt());
         }
         return nullptr;
@@ -44,7 +45,7 @@ void Export_Compatibility_API() {
         "GMLIB_API",
         "setPlayerNbt",
         [](std::string const& uuid, CompoundTag* nbt, bool forceCreate) -> bool {
-            if (auto player = OfflinePlayer::getOfflinePlayer(mce::UUID::fromString(uuid))) return player->setNbt(*nbt);
+            if (auto player = OfflinePlayer::fromUuid(mce::UUID::fromString(uuid))) return player->setNbt(*nbt);
             return forceCreate ? OfflinePlayer::createNewPlayerNbt(mce::UUID::fromString(uuid), *nbt).has_value()
                                : false;
         }
@@ -53,7 +54,7 @@ void Export_Compatibility_API() {
         "GMLIB_API",
         "setPlayerNbtTags",
         [](std::string const& uuid, CompoundTag* nbt, std::vector<std::string> tags) -> bool {
-            if (auto player = OfflinePlayer::getOfflinePlayer(mce::UUID::fromString(uuid))) {
+            if (auto player = OfflinePlayer::fromUuid(mce::UUID::fromString(uuid))) {
                 auto nbt2 = *player->getNbt();
                 GMCompoundTag::writeNbtTags(nbt2, *nbt, tags);
                 return player->setNbt(nbt2);
@@ -187,8 +188,9 @@ void Export_Compatibility_API() {
     RemoteCall::exportAs(
         "GMLIB_API",
         "updateOrCreateLanguageFile",
-        [](std::string const& code, std::unordered_map<std::string, std::string> lang, std::string const& path
-        ) -> void {
+        [](std::string const&                           code,
+           std::unordered_map<std::string, std::string> lang,
+           std::string const&                           path) -> void {
             if (GMLevel::getInstance()) {
                 I18nAPI::updateOrCreateLanguageFile(path, code, lang);
             }
@@ -200,7 +202,7 @@ void Export_Compatibility_API() {
         }
     });
     RemoteCall::exportAs("GMLIB_API", "getPlayerPosition", [](std::string const& uuid) -> std::pair<BlockPos, int> {
-        if (auto player = OfflinePlayer::getOfflinePlayer(mce::UUID::fromString(uuid))) {
+        if (auto player = OfflinePlayer::fromUuid(mce::UUID::fromString(uuid))) {
             if (auto pos = player->getPlayerPosition()) {
                 return *pos;
             }
@@ -214,7 +216,7 @@ void Export_Compatibility_API() {
         "GMLIB_API",
         "setPlayerPosition",
         [](std::string const& uuid, std::pair<BlockPos, int> pos) -> bool {
-            if (auto player = OfflinePlayer::getOfflinePlayer(mce::UUID::fromString(uuid))) {
+            if (auto player = OfflinePlayer::fromUuid(mce::UUID::fromString(uuid))) {
                 return player->setPosition(pos.first, pos.second);
             }
             return false;
@@ -475,33 +477,46 @@ void Export_Compatibility_API() {
         }
     );
     RemoteCall::exportAs("GMLIB_API", "getXuidByUuid", [](std::string const& uuid) -> std::string {
-        return UserCache::getXuidByUuid(mce::UUID::fromString(uuid)).value_or("");
+        if (auto uce = UserCache::getInstance()->from(mce::UUID::fromString(uuid))) {
+            return uce->mXuid;
+        }
+        return "";
     });
     RemoteCall::exportAs("GMLIB_API", "getXuidByName", [](std::string const& name) -> std::string {
-        return UserCache::getXuidByName(name).value_or("");
+        if (auto uce = UserCache::getInstance()->from(name, UserCache::QueryType::Name)) {
+            return uce->mXuid;
+        }
+        return "";
     });
     RemoteCall::exportAs("GMLIB_API", "getNameByUuid", [](std::string const& uuid) -> std::string {
-        return UserCache::getNameByUuid(mce::UUID::fromString(uuid)).value_or("");
+        if (auto uce = UserCache::getInstance()->from(mce::UUID::fromString(uuid))) {
+            return uce->mName;
+        }
     });
     RemoteCall::exportAs("GMLIB_API", "getNameByXuid", [](std::string const& xuid) -> std::string {
-        return UserCache::getNameByXuid(xuid).value_or("");
+        if (auto uce = UserCache::getInstance()->from(xuid, UserCache::QueryType::Xuid)) {
+            return uce->mName;
+        }
+        return "";
     });
     RemoteCall::exportAs("GMLIB_API", "getUuidByXuid", [](std::string const& xuid) -> std::string {
-        return UserCache::getUuidByXuid(xuid).transform(
-                                                 [](mce::UUID&& uuid) -> std::string { return uuid.asString(); }
-        ).value_or("");
+        if (auto uce = UserCache::getInstance()->from(xuid, UserCache::QueryType::Xuid)) {
+            return uce->mUuid.asString();
+        }
+        return "";
     });
     RemoteCall::exportAs("GMLIB_API", "getUuidByName", [](std::string const& name) -> std::string {
-        return UserCache::getUuidByName(name).transform(
-                                                 [](mce::UUID&& uuid) -> std::string { return uuid.asString(); }
-        ).value_or("");
+        if (auto uce = UserCache::getInstance()->from(name, UserCache::QueryType::Name)) {
+            return uce->mUuid.asString();
+        }
+        return "";
     });
     RemoteCall::exportAs(
         "GMLIB_API",
         "getAllPlayerInfo",
         []() -> std::vector<std::unordered_map<std::string, std::string>> {
             std::vector<std::unordered_map<std::string, std::string>> result;
-            for (auto entry : UserCache::entries()) {
+            for (auto entry : UserCache::getInstance()->entries()) {
                 result.push_back({
                     {"Name", entry.mName           },
                     {"Xuid", entry.mXuid           },
@@ -610,23 +625,23 @@ void Export_Compatibility_API() {
                 switch (gameRule.mType) {
                 case GameRule::Type::Bool:
                     result.push_back({
-                        {"Name",  gameRule.mName                                        },
-                        {"Type",  "Bool"                                                },
-                        {"Value", std::to_string(gameRule.mValue->mUnk29fff1.as<bool>())}
+                        {"Name",  gameRule.mName                          },
+                        {"Type",  "Bool"                                  },
+                        {"Value", std::to_string(gameRule.mValue->boolVal)}
                     });
                     break;
                 case GameRule::Type::Float:
                     result.push_back({
-                        {"Name",  gameRule.mName                                         },
-                        {"Type",  "Float"                                                },
-                        {"Value", std::to_string(gameRule.mValue->mUnk768db5.as<float>())}
+                        {"Name",  gameRule.mName                           },
+                        {"Type",  "Float"                                  },
+                        {"Value", std::to_string(gameRule.mValue->floatVal)}
                     });
                     break;
                 case GameRule::Type::Int:
                     result.push_back({
-                        {"Name",  gameRule.mName                                       },
-                        {"Type",  "Int"                                                },
-                        {"Value", std::to_string(gameRule.mValue->mUnk2ab4f3.as<int>())}
+                        {"Name",  gameRule.mName                         },
+                        {"Type",  "Int"                                  },
+                        {"Value", std::to_string(gameRule.mValue->intVal)}
                     });
                     break;
                 case GameRule::Type::Invalid:
@@ -804,7 +819,7 @@ void Export_Compatibility_API() {
         return magic_enum::enum_name(container->mContainerType).data();
     });
     RemoteCall::exportAs("GMLIB_API", "hasPlayerNbt", [](std::string const& uuid) -> bool {
-        return OfflinePlayer::getOfflinePlayer(mce::UUID::fromString(uuid))
+        return OfflinePlayer::fromUuid(mce::UUID::fromString(uuid))
             .transform([&](auto&& player) -> bool { return player.hasNbt(); })
             .value_or(false);
     });

tooth.json

@@ -2,7 +2,7 @@
     "format_version": 3,
     "format_uuid": "289f771f-2c9a-4d73-9f3f-8492495a924d",
     "tooth": "github.com/GroupMountain/GMLIB-LegacyRemoteCallApi",
-    "version": "1.0.1",
+    "version": "1.1.2",
     "info": {
         "name": "GMLIB-LegacyRemoteCallApi",
         "description": "Legacy RemoteCall API for GMLIB",
@@ -19,9 +19,9 @@
         {
             "platform": "win-x64",
             "dependencies": {
-                "github.com/LiteLDev/LeviLamina": ">=1.1.1",
-                "github.com/GroupMountain/GMLIB-Release": ">=1.0.0",
-                "github.com/MiracleForest/iListenAttentively-Release": ">=0.4.1"
+                "github.com/LiteLDev/LeviLamina": ">=1.2.0",
+                "github.com/GroupMountain/GMLIB-Release": ">=1.2.0-rc.1",
+                "github.com/MiracleForest/iListenAttentively-Release": ">=0.5.0-rc.1"
             },
             "assets": [
                 {

xmake.lua

@@ -8,11 +8,11 @@ if not has_config("vs_runtime") then
     set_runtimes("MD")
 end
 
-add_requires("levilamina 1.1.1", {configs = {target_type = "server"}})
+add_requires("levilamina 1.2.0", {configs = {target_type = "server"}})
 add_requires("legacyremotecall")
 add_requires("levibuildscript")
-add_requires("ilistenattentively")
-add_requires("gmlib")
+add_requires("ilistenattentively 0.5.0-rc.1")
+add_requires("gmlib 1.2.0-rc.1")
 
 target("GMLIB-LegacyRemoteCallApi")
     add_cxflags(