fix: fix I18nAPI.get

lib/GMLIB_API-JS.js

@@ -19,6 +19,7 @@ const GMLIB_API = {
     setPlayerNbt: ll.import("GMLIB_API", "setPlayerNbt"),
     setPlayerNbtTags: ll.import("GMLIB_API", "setPlayerNbtTags"),
     resourcePackTranslate: ll.import("GMLIB_API", "resourcePackTranslate"),
+    resourcePackDefaultTranslate: ll.import("GMLIB_API", "resourcePackDefaultTranslate"),
     getResourcePackI18nLanguage: ll.import("GMLIB_API", "getResourcePackI18nLanguage"),
     chooseResourcePackI18nLanguage: ll.import("GMLIB_API", "chooseResourcePackI18nLanguage"),
     setEducationFeatureEnabled: ll.import("GMLib_ServerAPI", "setEducationFeatureEnabled"),
@@ -93,7 +94,12 @@ const GMLIB_API = {
     getPlayerSpawnPoint: ll.import("GMLIB_API", "getPlayerSpawnPoint"),
     setPlayerSpawnPoint: ll.import("GMLIB_API", "setPlayerSpawnPoint"),
     clearPlayerSpawnPoint: ll.import("GMLIB_API", "clearPlayerSpawnPoint"),
-    setCustomPackPath: ll.import("GMLIB_API", "setCustomPackPath")
+    setCustomPackPath: ll.import("GMLIB_API", "setCustomPackPath"),
+    getSupportedLanguages: ll.import("GMLIB_API", "getSupportedLanguages"),
+    loadLanguage: ll.import("GMLIB_API", "loadLanguage"),
+    updateOrCreateLanguageFile: ll.import("GMLIB_API", "updateOrCreateLanguageFile"),
+    loadLanguagePath: ll.import("GMLIB_API", "loadLanguagePath"),
+    mergePatchJson: ll.import("GMLIB_API", "mergePatchJson")
 }
 
 const FloatingTextList = [];
@@ -280,22 +286,15 @@ class Minecraft {
     }
 
     static getPlayerNbt(uuid) {
-        let snbt = GMLIB_API.getPlayerNbt(uuid);
+        return GMLIB_API.getPlayerNbt(uuid);
-        if (snbt == "null") {
-            return null;
-        }
-        let nbt = NBT.parseSNBT(snbt);
-        return nbt;
     }
 
     static setPlayerNbt(uuid, nbt, forceCreate = true) {
-        let snbt = nbt.toSNBT();
+        return GMLIB_API.setPlayerNbt(uuid, nbt, forceCreate);
-        return GMLIB_API.setPlayerNbt(uuid, snbt, forceCreate);
     }
 
     static setPlayerNbtTags(uuid, nbt, tags) {
-        let snbt = nbt.toSNBT();
+        return GMLIB_API.setPlayerNbtTags(uuid, nbt, tags);
-        return GMLIB_API.setPlayerNbtTags(uuid, snbt, tags);
     }
 
     static getPlayerPosition(uuid) {
@@ -367,11 +366,11 @@ class Minecraft {
     }
 
     static getServerLanguage() {
-        return GMLIB_API.getResourcePackI18nLanguage(language);
+        return I18nAPI.getCurrentLanguage();
     }
 
     static setServerLanguage(language) {
-        return GMLIB_API.chooseResourcePackI18nLanguage(language);
+        return I18nAPI.chooseLanguage(language);
     }
 
     static setCustomPackPath(path) {
@@ -379,7 +378,7 @@ class Minecraft {
     }
 
     static resourcePackTranslate(key, params = []) {
-        return GMLIB_API.resourcePackTranslate(key, params);
+        return I18nAPI.get(key, params);
     }
 }
 
@@ -700,7 +699,14 @@ class JsonConfig {
     init() {
         if (File.exists(this.mPath)) {
             let existDataStr = File.readFrom(this.mPath);
-            this.mData = Object.assign({}, this.mData, JSON.parse(existDataStr));
+            existDataStr = existDataStr.replace(/\/\/.*|\/\*[^]*?\*\//g, "");
+            try {
+                let result = GMLIB_API.mergePatchJson(JSON.stringify(this.mData), existDataStr);
+                this.mData = JSON.parse(result);
+            } catch {
+                let newPath = this.mPath + "_old";
+                File.rename(this.mPath, newPath);
+            }
         }
         this.save();
     }
@@ -714,9 +720,9 @@ class JsonConfig {
         return this.mData;
     }
 
-    get(key, defultValue = null) {
+    get(key, defultValue = undefined) {
         let result = this.getData()[key];
-        if (!result && defultValue != null) {
+        if (!result && defultValue != undefined) {
             this.set(key, defultValue);
             return defultValue;
         }
@@ -802,6 +808,47 @@ class JsonI18n {
     }
 };
 
+class I18nAPI {
+    constructor() {
+        throw new Error("Static class cannot be instantiated");
+    }
+
+    static get(key, params = [], langCode = undefined) {
+        if (langCode) {
+            return GMLIB_API.resourcePackTranslate(key, params, langCode);
+        }
+        return GMLIB_API.resourcePackDefaultTranslate(key, params);
+    }
+
+    static translate(key, params = []) {
+        return I18nAPI.get(key, params);
+    }
+
+    static getSupportedLanguages() {
+        return GMLIB_API.getSupportedLanguages();
+    }
+
+    static getCurrentLanguage() {
+        return GMLIB_API.getResourcePackI18nLanguage(language);
+    }
+
+    static chooseLanguage(language) {
+        GMLIB_API.chooseResourcePackI18nLanguage(language);
+    }
+
+    static loadLanguage(code, language) {
+        GMLIB_API.loadLanguage(code, language);
+    }
+
+    static updateOrCreateLanguageFile(code, lang, path) {
+        GMLIB_API.updateOrCreateLanguageFile(code, lang, path);
+    }
+
+    static loadLanguageDirectory(path) {
+        GMLIB_API.loadLanguagePath(path);
+    }
+};
+
 LLSE_Player.prototype.toEntity = function () {
     return GMLIB_API.PlayerToEntity(this);
 }
@@ -826,7 +873,6 @@ LLSE_Entity.prototype.throwEntity = function (proj, speed = 2, offset = 3) {
     return GMLIB_API.throwEntity(this, proj, speed, offset);
 }
 
-
 module.exports = {
     StaticFloatingText,
     DynamicFloatingText,
@@ -838,11 +884,6 @@ module.exports = {
     JsonConfig,
     JsonLanguage,
     JsonI18n,
-    Version
+    Version,
+    I18nAPI
 };
-
-
-
-
-
-

manifest.json

@@ -1,7 +1,7 @@
 {
     "name": "${pluginName}",
     "entry": "${pluginFile}",
-    "version": "0.12.0",
+    "version": "0.12.4",
     "author": "GroupMountain",
     "type": "native",
     "dependencies": [

src/CompatibilityApi.cpp

@@ -53,25 +53,19 @@ void Export_Compatibility_API() {
         }
         return result;
     });
-    RemoteCall::exportAs("GMLIB_API", "getPlayerNbt", [](std::string uuid) -> std::string {
+    RemoteCall::exportAs("GMLIB_API", "getPlayerNbt", [](std::string uuid) -> std::unique_ptr<CompoundTag> {
         auto uid = mce::UUID::fromString(uuid);
-        auto nbt = GMLIB_Player::getPlayerNbt(uid);
+        return std::move(GMLIB_Player::getPlayerNbt(uid));
-        if (nbt) {
-            return nbt->toSnbt();
-        }
-        return "null";
     });
-    RemoteCall::exportAs("GMLIB_API", "setPlayerNbt", [](std::string uuid, std::string snbt, bool forceCreate) -> bool {
+    RemoteCall::exportAs("GMLIB_API", "setPlayerNbt", [](std::string uuid, CompoundTag* nbt, bool forceCreate) -> bool {
         auto uid = mce::UUID::fromString(uuid);
-        auto nbt = CompoundTag::fromSnbt(snbt);
         return GMLIB_Player::setPlayerNbt(uid, *nbt, forceCreate);
     });
     RemoteCall::exportAs(
         "GMLIB_API",
         "setPlayerNbtTags",
-        [](std::string uuid, std::string snbt, std::vector<std::string> tags) -> bool {
+        [](std::string uuid, CompoundTag* nbt, std::vector<std::string> tags) -> bool {
             auto uid = mce::UUID::fromString(uuid);
-            auto nbt = CompoundTag::fromSnbt(snbt);
             return GMLIB_Player::setPlayerNbtTags(uid, *nbt, tags);
         }
     );
@@ -112,7 +106,7 @@ void Export_Compatibility_API() {
     RemoteCall::exportAs("GMLIB_API", "sendFloatingTextToPlayer", [](int id, Player* pl) -> bool {
         auto ft = GMLIB::Server::FloatingText::getFloatingText(id);
         if (ft) {
-            ft->sendToClient(pl);
+            ft->sendToClient(*pl);
             return true;
         }
         return false;
@@ -128,7 +122,7 @@ void Export_Compatibility_API() {
     RemoteCall::exportAs("GMLIB_API", "removeFloatingTextFromPlayer", [](int id, Player* pl) -> bool {
         auto ft = GMLIB::Server::FloatingText::getFloatingText(id);
         if (ft) {
-            ft->removeFromClient(pl);
+            ft->removeFromClient(*pl);
             return true;
         }
         return false;
@@ -144,7 +138,7 @@ void Export_Compatibility_API() {
     RemoteCall::exportAs("GMLIB_API", "updateClientFloatingTextData", [](int id, Player* pl) -> bool {
         auto ft = GMLIB::Server::FloatingText::getFloatingText(id);
         if (ft) {
-            ft->updateClient(pl);
+            ft->updateClient(*pl);
             return true;
         }
         return false;
@@ -167,20 +161,52 @@ void Export_Compatibility_API() {
     });
     RemoteCall::exportAs(
         "GMLIB_API",
-        "resourcePackTranslate",
+        "resourcePackDefaultTranslate",
         [](std::string key, std::vector<std::string> params) -> std::string { return I18nAPI::get(key, params); }
     );
+    RemoteCall::exportAs(
+        "GMLIB_API",
+        "resourcePackTranslate",
+        [](std::string key, std::vector<std::string> params, std::string code) -> std::string {
+            return I18nAPI::get(key, params, code);
+        }
+    );
     RemoteCall::exportAs("GMLIB_API", "chooseResourcePackI18nLanguage", [](std::string code) -> void {
         if (GMLIB_Level::getInstance()) {
             I18nAPI::chooseLanguage(code);
         }
     });
     RemoteCall::exportAs("GMLIB_API", "getResourcePackI18nLanguage", []() -> std::string {
-        if (auto result = I18nAPI::getCurrentLanguageCode()) {
+        if (GMLIB_Level::getInstance()) {
-            return result.value();
+            return I18nAPI::getCurrentLanguageCode();
         }
         return "unknown";
     });
+    RemoteCall::exportAs("GMLIB_API", "getSupportedLanguages", []() -> std::vector<std::string> {
+        if (GMLIB_Level::getInstance()) {
+            return I18nAPI::getSupportedLanguageCodes();
+        }
+        return {};
+    });
+    RemoteCall::exportAs("GMLIB_API", "loadLanguage", [](std::string code, std::string lang) -> void {
+        if (GMLIB_Level::getInstance()) {
+            I18nAPI::loadLanguage(code, lang);
+        }
+    });
+    RemoteCall::exportAs(
+        "GMLIB_API",
+        "updateOrCreateLanguageFile",
+        [](std::string code, std::string lang, std::string path) -> void {
+            if (GMLIB_Level::getInstance()) {
+                I18nAPI::updateOrCreateLanguageFile(path, code, lang);
+            }
+        }
+    );
+    RemoteCall::exportAs("GMLIB_API", "loadLanguagePath", [](std::string path) -> void {
+        if (GMLIB_Level::getInstance()) {
+            I18nAPI::loadLanguagesFromDirectory(path);
+        }
+    });
     RemoteCall::exportAs("GMLIB_API", "getPlayerPosition", [](std::string uuid) -> std::pair<BlockPos, int> {
         auto uid = mce::UUID::fromString(uuid);
         auto pos = GMLIB_Player::getPlayerPosition(uid);
@@ -433,4 +459,10 @@ void Export_Compatibility_API() {
         auto player = (GMLIB_Player*)pl;
         player->clearSpawnPoint();
     });
+    RemoteCall::exportAs("GMLIB_API", "mergePatchJson", [](std::string oldJson, std::string patchJson) -> std::string {
+        auto oldData = nlohmann::ordered_json::parse(oldJson);
+        auto newData = nlohmann::ordered_json::parse(patchJson);
+        oldData.merge_patch(newData);
+        return oldData.dump();
+    });
 }

src/Entry.cpp

@@ -17,7 +17,11 @@ bool LRCA::load() {
     ExportPAPI();
     Export_Event_API();
     logger.info("GMLIB-LegacyRemoteCallApi Loaded!");
-    logger.info("Version: {}", LIB_VERSION.asString());
+    logger.info(
+        "Loaded Version: {} with {}",
+        fmt::format(fg(fmt::color::pink), "GMLIB-" + GMLIB::Version::getLibVersionString()),
+        fmt::format(fg(fmt::color::light_green), "GMLIB-LegacyRemoteCallApi-"+LIB_VERSION.asString())
+    );
     logger.info("Author: GroupMountain");
     logger.info("Repository: https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi");
     return true;

src/Global.h

@@ -3,8 +3,9 @@
 
 #include <RemoteCallAPI.h>
 
-#define PLUGIN_NAME "GMLIB-LRCA"
+#define PLUGIN_NAME fmt::format(fg(fmt::color::light_green), "GMLIB-LRCA")
-#define LIB_VERSION GMLIB::Version(0, 12, 0)
+
+#define LIB_VERSION GMLIB::Version(0, 12, 4)
 
 extern ll::Logger logger;
 

src/LegacyServerApi.cpp

@@ -2,16 +2,18 @@
 
 void Export_Legacy_GMLib_ServerAPI() {
     RemoteCall::exportAs("GMLib_ServerAPI", "setEducationFeatureEnabled", []() -> void {
-        GMLIB_Level::addEducationEditionRequired();
+        GMLIB_Level::tryEnableEducationEdition();
     });
     RemoteCall::exportAs("GMLib_ServerAPI", "registerAbilityCommand", []() -> void {
-        GMLIB_Level::forceEnableAbilityCommand();
+        GMLIB_Level::tryRegisterAbilityCommand();
     });
     RemoteCall::exportAs("GMLib_ServerAPI", "setEnableAchievement", []() -> void {
         GMLIB_Level::setForceAchievementsEnabled();
     });
-    RemoteCall::exportAs("GMLib_ServerAPI", "setForceTrustSkins", []() -> void { GMLIB_Level::setForceTrustSkin(); });
+    RemoteCall::exportAs("GMLib_ServerAPI", "setForceTrustSkins", []() -> void { GMLIB_Level::trustAllSkins(); });
-    RemoteCall::exportAs("GMLib_ServerAPI", "enableCoResourcePack", []() -> void { GMLIB_Level::setCoResourcePack(); });
+    RemoteCall::exportAs("GMLib_ServerAPI", "enableCoResourcePack", []() -> void {
+        GMLIB_Level::requireServerResourcePackAndAllowClientResourcePack();
+    });
     RemoteCall::exportAs("GMLib_ServerAPI", "getLevelName", []() -> std::string {
         auto level = GMLIB_Level::getInstance();
         if (!level) {

src/PlaceholderApi.cpp

@@ -3,6 +3,16 @@
 
 namespace PAPIRemoteCall {
 
+std::string removeBrackets(std::string a1) {
+    a1.erase(a1.find_last_not_of("%") + 1);
+    return a1;
+}
+
+bool isParameters(std::string str) {
+    std::regex reg("[<]([^<>]+)[>]");
+    return std::regex_search(removeBrackets(str), reg);
+}
+
 std::string GetValue(std::string const& from) { return GMLIB::Server::PlaceholderAPI::getValue(from); }
 
 std::string GetValueWithPlayer(std::string const& a1, std::string const& a2) {
@@ -15,12 +25,24 @@ bool registerPlayerPlaceholder(
     std::string const& PAPIName
 ) {
     if (RemoteCall::hasFunc(PluginName, FuncName)) {
-        auto Call = RemoteCall::importAs<std::string(Player * pl)>(PluginName, FuncName);
+        if (isParameters(PAPIName)) {
-        GMLIB::Server::PlaceholderAPI::registerPlayerPlaceholder(
+            auto Call = RemoteCall::importAs<std::string(Player * pl, std::unordered_map<std::string, std::string>)>(
-            PAPIName,
+                PluginName,
-            [Call](Player* sp) { return Call(sp); },
+                FuncName
-            PluginName
+            );
-        );
+            GMLIB::Server::PlaceholderAPI::registerPlayerPlaceholder(
+                PAPIName,
+                [Call](Player* sp, std::unordered_map<std::string, std::string> map) { return Call(sp, map); },
+                PluginName
+            );
+        } else {
+            auto Call = RemoteCall::importAs<std::string(Player * pl)>(PluginName, FuncName);
+            GMLIB::Server::PlaceholderAPI::registerPlayerPlaceholder(
+                PAPIName,
+                [Call](Player* sp) { return Call(sp); },
+                PluginName
+            );
+        }
         return true;
     }
     return false;
@@ -32,12 +54,22 @@ bool registerServerPlaceholder(
     std::string const& PAPIName
 ) {
     if (RemoteCall::hasFunc(PluginName, FuncName)) {
-        auto Call = RemoteCall::importAs<std::string()>(PluginName, FuncName);
+        if (isParameters(PAPIName)) {
-        GMLIB::Server::PlaceholderAPI::registerServerPlaceholder(
+            auto Call =
-            PAPIName,
+                RemoteCall::importAs<std::string(std::unordered_map<std::string, std::string>)>(PluginName, FuncName);
-            [Call]() { return Call(); },
+            GMLIB::Server::PlaceholderAPI::registerServerPlaceholder(
-            PluginName
+                PAPIName,
-        );
+                [Call](std::unordered_map<std::string, std::string> map) { return Call(map); },
+                PluginName
+            );
+        } else {
+            auto Call = RemoteCall::importAs<std::string()>(PluginName, FuncName);
+            GMLIB::Server::PlaceholderAPI::registerServerPlaceholder(
+                PAPIName,
+                [Call]() { return Call(); },
+                PluginName
+            );
+        }
         return true;
     }
     return false;
@@ -50,20 +82,22 @@ bool registerStaticPlaceholder(
     int                num
 ) {
     if (RemoteCall::hasFunc(PluginName, FuncName)) {
-        auto Call = RemoteCall::importAs<std::string()>(PluginName, FuncName);
+        if (isParameters(PAPIName)) {
-        if (num == -1) {
+            auto Call = RemoteCall::importAs<std::string()>(PluginName, FuncName);
-            GMLIB::Server::PlaceholderAPI::registerStaticPlaceholder(
+            if (num == -1) {
-                PAPIName,
+                GMLIB::Server::PlaceholderAPI::registerStaticPlaceholder(
-                [Call] { return Call(); },
+                    PAPIName,
-                PluginName
+                    [Call] { return Call(); },
-            );
+                    PluginName
-        } else {
+                );
-            GMLIB::Server::PlaceholderAPI::registerStaticPlaceholder(
+            } else {
-                PAPIName,
+                GMLIB::Server::PlaceholderAPI::registerStaticPlaceholder(
-                num,
+                    PAPIName,
-                [Call] { return Call(); },
+                    num,
-                PluginName
+                    [Call] { return Call(); },
-            );
+                    PluginName
+                );
+            }
         }
         return true;
     }

tooth.json

@@ -1,7 +1,7 @@
 {
     "format_version": 2,
     "tooth": "github.com/GroupMountain/GMLIB-LegacyRemoteCallApi",
-    "version": "0.12.0",
+    "version": "0.12.4",
     "info": {
         "name": "GMLIB-LegacyRemoteCallApi",
         "description": "Legacy RemoteCall API for GMLIB",
@@ -14,9 +14,9 @@
             "library"
         ]
     },
-    "asset_url": "https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi/releases/download/v0.12.0/GMLIB-LegacyRemoteCallApi-windows-x64.zip",
+    "asset_url": "https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi/releases/download/v0.12.4/GMLIB-LegacyRemoteCallApi-windows-x64.zip",
     "dependencies": {
-        "github.com/GroupMountain/GMLIB": ">=0.12.0"
+        "github.com/GroupMountain/GMLIB": ">=0.12.4"
     },
     "files": {
         "place": [