Merge branch 'develop' of https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi

lib/BEPlaceholderAPI-JS.js

@@ -8,9 +8,7 @@ const PAPIunRegisterPlaceholderAPI = ll.import("BEPlaceholderAPI", "unRegisterPl
 const PAPIgetAllPAPI = ll.import("BEPlaceholderAPI", "getAllPAPI")
 
 Function.prototype.getName = function () {
-
     return this.name || this.toString().match(/function\s*([^(]*)\(/)[1]
-
 }
 
 class PAPI {
@@ -19,7 +17,6 @@ class PAPI {
     }
 
     static registerPlayerPlaceholder(func, PluginName, PAPIName) {
-
         ll.export(func, PluginName, func.getName())
         PAPIregisterPlayerPlaceholderAPI(PluginName, func.getName(), PAPIName)
     }

lib/GMLIB_API-JS.js

@@ -6,10 +6,15 @@ const GMLIB_API = {
     sendFloatingText: ll.import("GMLIB_API", "sendFloatingText"),
     removeFloatingTextFromPlayer: ll.import("GMLIB_API", "removeFloatingTextFromPlayer"),
     removeFloatingText: ll.import("GMLIB_API", "removeFloatingText"),
+    updateClientFloatingTextData: ll.import("GMLIB_API", "updateClientFloatingTextData"),
+    updateAllClientsFloatingTextData: ll.import("GMLIB_API", "updateAllClientsFloatingTextData"),
     getServerMspt: ll.import("GMLIB_API", "getServerMspt"),
     getServerCurrentTps: ll.import("GMLIB_API", "getServerCurrentTps"),
     getServerAverageTps: ll.import("GMLIB_API", "getServerAverageTps"),
     getAllPlayerUuids: ll.import("GMLIB_API", "getAllPlayerUuids"),
+    getPlayerNbt: ll.import("GMLIB_API", "getPlayerNbt"),
+    setPlayerNbt: ll.import("GMLIB_API", "setPlayerNbt"),
+    setPlayerNbtTags: ll.import("GMLIB_API", "setPlayerNbtTags"),
     setEducationFeatureEnabled: ll.import("GMLib_ServerAPI", "setEducationFeatureEnabled"),
     registerAbilityCommand: ll.import("GMLib_ServerAPI", "registerAbilityCommand"),
     setEnableAchievement: ll.import("GMLib_ServerAPI", "setEnableAchievement"),
@@ -28,14 +33,17 @@ const GMLIB_API = {
     getExperimentEnabled: ll.import("GMLib_ModAPI", "getExperimentEnabled"),
     setExperimentEnabled: ll.import("GMLib_ModAPI", "setExperimentEnabled"),
     registerExperimentsRequire: ll.import("GMLib_ModAPI", "registerExperimentsRequire"),
-    registerExperimentsRequire: ll.import("GMLib_ModAPI", "registerStoneCutterRecipe"),
+    registerStoneCutterRecipe: ll.import("GMLib_ModAPI", "registerStoneCutterRecipe"),
-    registerExperimentsRequire: ll.import("GMLib_ModAPI", "registerSmithingTrimRecipe"),
+    registerSmithingTrimRecipe: ll.import("GMLib_ModAPI", "registerSmithingTrimRecipe"),
-    registerExperimentsRequire: ll.import("GMLib_ModAPI", "registerSmithingTransformRecipe"),
+    registerSmithingTransformRecipe: ll.import("GMLib_ModAPI", "registerSmithingTransformRecipe"),
-    registerExperimentsRequire: ll.import("GMLib_ModAPI", "registerBrewingContainerRecipe"),
+    registerBrewingContainerRecipe: ll.import("GMLib_ModAPI", "registerBrewingContainerRecipe"),
-    registerExperimentsRequire: ll.import("GMLib_ModAPI", "registerBrewingMixRecipe"),
+    registerBrewingMixRecipe: ll.import("GMLib_ModAPI", "registerBrewingMixRecipe"),
-    registerExperimentsRequire: ll.import("GMLib_ModAPI", "registerFurnaceRecipe"),
+    registerFurnaceRecipe: ll.import("GMLib_ModAPI", "registerFurnaceRecipe"),
-    registerExperimentsRequire: ll.import("GMLib_ModAPI", "registerShapedRecipe"),
+    registerShapedRecipe: ll.import("GMLib_ModAPI", "registerShapedRecipe"),
-    registerExperimentsRequire: ll.import("GMLib_ModAPI", "registerShapelessRecipe")
+    registerShapelessRecipe: ll.import("GMLib_ModAPI", "registerShapelessRecipe"),
+    isVersionMatched: ll.import("GMLIB_API", "isVersionMatched"),
+    getVersion_LRCA: ll.import("GMLIB_API", "getVersion_LRCA"),
+    getVersion_GMLIB: ll.import("GMLIB_API", "getVersion_GMLIB")
 }
 
 const FloatingTextList = [];
@@ -69,6 +77,14 @@ class StaticFloatingText {
         return GMLIB_API.removeFloatingText(this.mRuntimeId);
     }
 
+    updateClient(player) {
+        return GMLIB_API.updateClientFloatingTextData(this.mRuntimeId, player);
+    }
+
+    updateClients() {
+        return GMLIB_API.updateAllClientsFloatingTextData(this.mRuntimeId);
+    }
+
     getRuntimeId() {
         return this.mRuntimeId;
     }
@@ -83,7 +99,7 @@ class StaticFloatingText {
 
     update() {
         GMLIB_API.setFloatingTextData(this.mRuntimeId, this.mText);
-        return this.sendToClients();
+        return this.updateClients();
     }
 
     updateText(newText) {
@@ -106,13 +122,13 @@ class StaticFloatingText {
     }
 
     static getFloatingText(runtimeId) {
-        FloatingTextList.forEach((ft) => {
+        for (const ft of FloatingTextList) {
             if (ft.getRuntimeId() == runtimeId) {
                 if (!ft.isDynamic()) {
                     return ft;
                 }
             }
-        });
+        }
         return null;
     }
 
@@ -175,13 +191,13 @@ class DynamicFloatingText extends StaticFloatingText {
     }
 
     static getFloatingText(runtimeId) {
-        FloatingTextList.forEach((ft) => {
+        for (const ft of FloatingTextList) {
             if (ft.getRuntimeId() == runtimeId) {
                 if (ft.isDynamic()) {
                     return ft;
                 }
             }
-        });
+        }
         return null;
     }
 
@@ -217,6 +233,22 @@ class Minecraft {
         return GMLIB_API.getAllPlayerUuids();
     }
 
+    static getPlayerNbt(uuid) {
+        let snbt = GMLIB_API.getPlayerNbt(uuid);
+        let nbt = NBT.parseSNBT(snbt);
+        return nbt;
+    }
+
+    static setPlayerNbt(uuid, nbt) {
+        let snbt = nbt.toSNBT();
+        return GMLIB_API.setPlayerNbt(uuid, snbt);
+    }
+
+    static setPlayerNbtTags(uuid, nbt, tags) {
+        let snbt = nbt.toSNBT();
+        return GMLIB_API.setPlayerNbtTags(uuid, snbt, tags);
+    }
+
     static setEducationFeatureEnabled() {
         return GMLIB_API.setEducationFeatureEnabled();
     }
@@ -346,4 +378,22 @@ class Experiments {
     }
 }
 
-module.exports = { StaticFloatingText, DynamicFloatingText, Minecraft, Recipes, Experiments };
+class GMLIB {
+    constructor() {
+        throw new Error("Static class cannot be instantiated");
+    }
+
+    static isVersionMatched(major, minor, patch) {
+        return GMLIB_API.isVersionMatched(major, minor, patch);
+    }
+
+    static getVersion_LRCA() {
+        return GMLIB_API.getVersion_LRCA();
+    }
+
+    static getVersion_GMLIB() {
+        return GMLIB_API.getVersion_GMLIB();
+    }
+}
+
+module.exports = { StaticFloatingText, DynamicFloatingText, Minecraft, Recipes, Experiments, GMLIB };

src/CompatibilityApi.cpp

@@ -25,6 +25,24 @@ void Export_Compatibility_API() {
     RemoteCall::exportAs("GMLIB_API", "getAllPlayerUuids", []() -> std::vector<std::string> {
         return GMLIB_Player::getAllUuids();
     });
+    RemoteCall::exportAs("GMLIB_API", "getPlayerNbt", [](std::string uuid) -> std::string {
+        auto uid = mce::UUID::fromString(uuid);
+        return GMLIB_Player::getPlayerNbt(uid)->toSnbt();
+    });
+    RemoteCall::exportAs("GMLIB_API", "setPlayerNbt", [](std::string uuid, std::string snbt) -> bool {
+        auto uid = mce::UUID::fromString(uuid);
+        auto nbt = CompoundTag::fromSnbt(snbt);
+        return GMLIB_Player::setPlayerNbt(uid, *nbt);
+    });
+    RemoteCall::exportAs(
+        "GMLIB_API",
+        "setPlayerNbtTags",
+        [](std::string uuid, std::string snbt, std::vector<std::string> tags) -> bool {
+            auto uid = mce::UUID::fromString(uuid);
+            auto nbt = CompoundTag::fromSnbt(snbt);
+            return GMLIB_Player::setPlayerNbtTags(uid, *nbt, tags);
+        }
+    );
     RemoteCall::exportAs("GMLIB_API", "getAllExperiments", []() -> std::vector<int> {
         auto             map = GMLIB_Level::getAllExperiments();
         std::vector<int> result;
@@ -91,4 +109,28 @@ void Export_Compatibility_API() {
         }
         return false;
     });
+    RemoteCall::exportAs("GMLIB_API", "updateClientFloatingTextData", [](int id, Player* pl) -> bool {
+        auto ft = GMLIB::Server::FloatingText::getFloatingText(id);
+        if (ft) {
+            ft->updateClient(pl);
+            return true;
+        }
+        return false;
+    });
+    RemoteCall::exportAs("GMLIB_API", "updateAllClientsFloatingTextData", [](int id) -> bool {
+        auto ft = GMLIB::Server::FloatingText::getFloatingText(id);
+        if (ft) {
+            ft->updateAllClients();
+            return true;
+        }
+        return false;
+    });
+    RemoteCall::exportAs("GMLIB_API", "isVersionMatched", [](int a, int b, int c) -> bool {
+        auto version = SemVersion(a, b, c, "", "");
+        return LIB_VERSION.satisfies(version);
+    });
+    RemoteCall::exportAs("GMLIB_API", "getVersion_LRCA", []() -> std::string { return LIB_VERSION.asString(); });
+    RemoteCall::exportAs("GMLIB_API", "getVersion_GMLIB", []() -> std::string {
+        return GMLIB::Version::getLibVersionString();
+    });
 }

src/DllMain.cpp

@@ -1,32 +0,0 @@
-#include <memory>
-
-#include <ll/api/plugin/NativePlugin.h>
-
-#include "Plugin.h"
-
-namespace plugin {
-
-// The global plugin instance.
-std::unique_ptr<Plugin> plugin = nullptr;
-
-extern "C" {
-_declspec(dllexport) bool ll_plugin_load(ll::plugin::NativePlugin& self) {
-    plugin = std::make_unique<plugin::Plugin>(self);
-
-    return true;
-}
-
-/// @warning Unloading the plugin may cause a crash if the plugin has not released all of its
-/// resources. If you are unsure, keep this function commented out.
-// _declspec(dllexport) bool ll_plugin_unload(ll::plugin::Plugin&) {
-//     plugin.reset();
-//
-//     return true;
-// }
-
-_declspec(dllexport) bool ll_plugin_enable(ll::plugin::NativePlugin&) { return plugin->enable(); }
-
-_declspec(dllexport) bool ll_plugin_disable(ll::plugin::NativePlugin&) { return plugin->disable(); }
-}
-
-} // namespace plugin

src/Entry.cpp

@@ -0,0 +1,57 @@
+#include "Entry.h"
+#include "Global.h"
+
+ll::Logger logger(PLUGIN_NAME);
+
+namespace GMLIB_LegacyRemoteCallApi {
+
+namespace {
+
+std::unique_ptr<std::reference_wrapper<ll::plugin::NativePlugin>>
+    selfPluginInstance; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
+
+auto disable(ll::plugin::NativePlugin& /*self*/) -> bool { return false; }
+
+auto enable(ll::plugin::NativePlugin& /*self*/) -> bool { return true; }
+
+auto load(ll::plugin::NativePlugin& self) -> bool {
+    selfPluginInstance = std::make_unique<std::reference_wrapper<ll::plugin::NativePlugin>>(self);
+    Export_Legacy_GMLib_ModAPI();
+    Export_Legacy_GMLib_ServerAPI();
+    Export_Compatibility_API();
+    ExportPAPI();
+    logger.info("GMLIB-LegacyRemoteCallApi Loaded!");
+    logger.info("Version: {}", LIB_VERSION.asString());
+    logger.info("Author: GroupMountain");
+    logger.info("Repository: https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi");
+    return true;
+}
+
+auto unload(ll::plugin::NativePlugin& self) -> bool { return false; }
+
+} // namespace
+
+auto getSelfPluginInstance() -> ll::plugin::NativePlugin& {
+    if (!selfPluginInstance) {
+        throw std::runtime_error("selfPluginInstance is null");
+    }
+
+    return *selfPluginInstance;
+}
+
+} // namespace GMLIB_LegacyRemoteCallApi
+
+extern "C" {
+_declspec(dllexport) auto ll_plugin_disable(ll::plugin::NativePlugin& self) -> bool {
+    return GMLIB_LegacyRemoteCallApi::disable(self);
+}
+_declspec(dllexport) auto ll_plugin_enable(ll::plugin::NativePlugin& self) -> bool {
+    return GMLIB_LegacyRemoteCallApi::enable(self);
+}
+_declspec(dllexport) auto ll_plugin_load(ll::plugin::NativePlugin& self) -> bool {
+    return GMLIB_LegacyRemoteCallApi::load(self);
+}
+_declspec(dllexport) auto ll_plugin_unload(ll::plugin::NativePlugin& self) -> bool {
+    return GMLIB_LegacyRemoteCallApi::unload(self);
+}
+}

src/Entry.h

@@ -0,0 +1,9 @@
+#pragma once
+
+#include <ll/api/plugin/NativePlugin.h>
+
+namespace GMLIB_LegacyRemoteCallApi {
+
+[[nodiscard]] auto getSelfPluginInstance() -> ll::plugin::NativePlugin&;
+
+} // namespace GMLIB_LegacyRemoteCallApi

src/Global.h

@@ -1,8 +1,9 @@
 #pragma once
-#include <GMLIB/include_lib.h>
+#include <include_all.h>
 #include <RemoteCallAPI.h>
 
 #define PLUGIN_NAME "GMLIB-LRCA"
+#define LIB_VERSION SemVersion(0, 9, 0, "", "")
 
 extern ll::Logger logger;
 

src/LegacyServerApi.cpp

@@ -27,11 +27,7 @@ void Export_Legacy_GMLib_ServerAPI() {
         return level->setLevelName(name);
     });
     RemoteCall::exportAs("GMLib_ServerAPI", "setFakeSeed", [](int64_t seed) -> void {
-        auto level = GMLIB_Level::getLevel();
+        return GMLIB_Level::setFakeSeed(seed);
-        if (!level) {
-            return;
-        }
-        return level->setFakeSeed(seed);
     });
     RemoteCall::exportAs("GMLib_ServerAPI", "spawnEntity", [](std::pair<Vec3, int> pos, std::string name) -> Actor* {
         return GMLIB_Spawner::spawnEntity(pos.first, pos.second, name);

src/Plugin.cpp

@@ -1,29 +0,0 @@
-#include "Plugin.h"
-#include "Global.h"
-
-ll::Logger logger(PLUGIN_NAME);
-
-namespace plugin {
-
-Plugin::Plugin(ll::plugin::NativePlugin& self) : mSelf(self) {
-    // Code for loading the plugin goes here.
-    Export_Legacy_GMLib_ModAPI();
-    Export_Legacy_GMLib_ServerAPI();
-    Export_Compatibility_API();
-    ExportPAPI();
-    logger.info("GMLIB-LegacyRemoteCallApi Loaded!");
-    logger.info("Author: GroupMountain");
-    logger.info("Repository: https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi");
-}
-
-bool Plugin::enable() {
-    // Code for enabling the plugin goes here.
-    return true;
-}
-
-bool Plugin::disable() {
-    // Code for disabling the plugin goes here.
-    return true;
-}
-
-} // namespace plugin

src/Plugin.h

@@ -1,27 +0,0 @@
-#pragma once
-#include <ll/api/plugin/NativePlugin.h>
-
-namespace plugin {
-
-class Plugin {
-public:
-    explicit Plugin(ll::plugin::NativePlugin& self);
-
-    Plugin(Plugin&&)                 = delete;
-    Plugin(const Plugin&)            = delete;
-    Plugin& operator=(Plugin&&)      = delete;
-    Plugin& operator=(const Plugin&) = delete;
-
-    ~Plugin() = default;
-
-    /// @return True if the plugin is enabled successfully.
-    bool enable();
-
-    /// @return True if the plugin is disabled successfully.
-    bool disable();
-
-private:
-    ll::plugin::NativePlugin& mSelf;
-};
-
-} // namespace plugin

tooth.json

@@ -1,21 +1,22 @@
 {
     "format_version": 2,
     "tooth": "github.com/GroupMountain/GMLIB-LegacyRemoteCallApi",
-    "version": "0.8.2",
+    "version": "0.9.0",
     "info": {
         "name": "GMLIB-LegacyRemoteCallApi",
         "description": "Legacy RemoteCall API for GMLIB",
+        "source": "github.com/GroupMountain/GMLIB-LegacyRemoteCallApi",
         "author": "GroupMountain",
         "tags": [
-            "LeviLamina",
+            "levilamina",
-            "GMLIB",
+            "gmlib",
-            "GMLIB-LegacyRemoteCallApi",
+            "lse",
-            "Library"
+            "library"
         ]
     },
-    "asset_url": "https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi/releases/download/v0.8.2/GMLIB-LegacyRemoteCallApi-windows-x64.zip",
+    "asset_url": "https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi/releases/download/v0.9.0/GMLIB-LegacyRemoteCallApi-windows-x64.zip",
     "dependencies": {
-        "github.com/GroupMountain/GMLIB": ">=0.8.1"
+        "github.com/GroupMountain/GMLIB": ">=0.9.0"
     },
     "files": {
         "place": [