chore: update version

lib/GMLIB_API-JS.js

@@ -280,22 +280,15 @@ class Minecraft {
     }
 
     static getPlayerNbt(uuid) {
-        let snbt = GMLIB_API.getPlayerNbt(uuid);
-        if (snbt == "null") {
-            return null;
-        }
-        let nbt = NBT.parseSNBT(snbt);
-        return nbt;
+        return GMLIB_API.getPlayerNbt(uuid);
     }
 
     static setPlayerNbt(uuid, nbt, forceCreate = true) {
-        let snbt = nbt.toSNBT();
-        return GMLIB_API.setPlayerNbt(uuid, snbt, forceCreate);
+        return GMLIB_API.setPlayerNbt(uuid, nbt, forceCreate);
     }
 
     static setPlayerNbtTags(uuid, nbt, tags) {
-        let snbt = nbt.toSNBT();
-        return GMLIB_API.setPlayerNbtTags(uuid, snbt, tags);
+        return GMLIB_API.setPlayerNbtTags(uuid, nbt, tags);
     }
 
     static getPlayerPosition(uuid) {

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,21 @@ 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);
-        if (nbt) {
-            return nbt->toSnbt();
-        }
-        return "null";
+        return std::move(GMLIB_Player::getPlayerNbt(uid));
     });
-    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);
+        logger.warn(nbt->toSnbt());
         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);
+            logger.warn(nbt->toSnbt());
             return GMLIB_Player::setPlayerNbtTags(uid, *nbt, tags);
         }
     );
@@ -112,7 +108,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 +124,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 +140,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;
@@ -176,8 +172,8 @@ void Export_Compatibility_API() {
         }
     });
     RemoteCall::exportAs("GMLIB_API", "getResourcePackI18nLanguage", []() -> std::string {
-        if (auto result = I18nAPI::getCurrentLanguageCode()) {
-            return result.value();
+        if (GMLIB_Level::getInstance()) {
+            return I18nAPI::getCurrentLanguageCode();
         }
         return "unknown";
     });

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 LIB_VERSION GMLIB::Version(0, 12, 0)
+#define PLUGIN_NAME fmt::format(fg(fmt::color::light_green), "GMLIB-LRCA")
+
+#define LIB_VERSION GMLIB::Version(0, 12, 2)
 
 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", "enableCoResourcePack", []() -> void { GMLIB_Level::setCoResourcePack(); });
+    RemoteCall::exportAs("GMLib_ServerAPI", "setForceTrustSkins", []() -> void { GMLIB_Level::trustAllSkins(); });
+    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)) {
+        if (isParameters(PAPIName)) {
+            auto Call = RemoteCall::importAs<std::string(Player * pl, std::unordered_map<std::string, std::string>)>(
+                PluginName,
+                FuncName
+            );
+            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)) {
+        if (isParameters(PAPIName)) {
+            auto Call =
+                RemoteCall::importAs<std::string(std::unordered_map<std::string, std::string>)>(PluginName, FuncName);
+            GMLIB::Server::PlaceholderAPI::registerServerPlaceholder(
+                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,6 +82,7 @@ bool registerStaticPlaceholder(
     int                num
 ) {
     if (RemoteCall::hasFunc(PluginName, FuncName)) {
+        if (isParameters(PAPIName)) {
             auto Call = RemoteCall::importAs<std::string()>(PluginName, FuncName);
             if (num == -1) {
                 GMLIB::Server::PlaceholderAPI::registerStaticPlaceholder(
@@ -65,6 +98,7 @@ bool registerStaticPlaceholder(
                     PluginName
                 );
             }
+        }
         return true;
     }
     return false;

tooth.json

@@ -1,7 +1,7 @@
 {
     "format_version": 2,
     "tooth": "github.com/GroupMountain/GMLIB-LegacyRemoteCallApi",
-    "version": "0.12.0",
+    "version": "0.12.2",
     "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.2/GMLIB-LegacyRemoteCallApi-windows-x64.zip",
     "dependencies": {
-        "github.com/GroupMountain/GMLIB": ">=0.12.0"
+        "github.com/GroupMountain/GMLIB": ">=0.12.4"
     },
     "files": {
         "place": [