Release 0.8.2

.github/workflows/release.yml

@@ -7,6 +7,11 @@ jobs:
   build:
     runs-on: windows-latest
     steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+          
       - uses: actions/checkout@v4
 
       - uses: xmake-io/github-action-setup-xmake@v1

src/CompatibilityApi.cpp

@@ -2,15 +2,89 @@
 
 void Export_Compatibility_API() {
     RemoteCall::exportAs("GMLIB_API", "getServerMspt", []() -> float {
-        return GMLIB_Level::getLevel()->getServerMspt();
+        auto level = GMLIB_Level::getLevel();
+        if (!level) {
+            return 0.0f;
+        }
+        return level->getServerMspt();
     });
     RemoteCall::exportAs("GMLIB_API", "getServerCurrentTps", []() -> float {
-        return GMLIB_Level::getLevel()->getServerCurrentTps();
+        auto level = GMLIB_Level::getLevel();
+        if (!level) {
+            return 0.0f;
+        }
+        return level->getServerCurrentTps();
     });
     RemoteCall::exportAs("GMLIB_API", "getServerAverageTps", []() -> float {
-        return GMLIB_Level::getLevel()->getServerAverageTps();
+        auto level = GMLIB_Level::getLevel();
+        if (!level) {
+            return 0.0f;
+        }
+        return level->getServerAverageTps();
     });
     RemoteCall::exportAs("GMLIB_API", "getAllPlayerUuids", []() -> std::vector<std::string> {
         return GMLIB_Player::getAllUuids();
     });
+    RemoteCall::exportAs("GMLIB_API", "getAllExperiments", []() -> std::vector<int> {
+        auto             map = GMLIB_Level::getAllExperiments();
+        std::vector<int> result;
+        for (auto& key : map) {
+            result.push_back(key.first);
+        }
+        return result;
+    });
+    RemoteCall::exportAs("GMLIB_API", "getExperimentTranslatedName", [](int id) -> std::string {
+        auto map = GMLIB_Level::getAllExperimentsTranslateKeys();
+        if (map.count(id)) {
+            return map[id];
+        }
+        return "";
+    });
+    RemoteCall::exportAs("GMLIB_API", "createFloatingText", [](std::pair<Vec3, int> pos, std::string text) -> int {
+        auto ft = new GMLIB::Server::FloatingText(text, pos.first, pos.second);
+        return ft->getRuntimeID();
+    });
+    RemoteCall::exportAs("GMLIB_API", "setFloatingTextData", [](int id, std::string text) -> bool {
+        auto ft = GMLIB::Server::FloatingText::getFloatingText(id);
+        if (ft) {
+            ft->setText(text);
+            return true;
+        }
+        return false;
+    });
+    RemoteCall::exportAs("GMLIB_API", "deleteFloatingText", [](int id) -> bool {
+        return GMLIB::Server::FloatingText::deleteFloatingText(id);
+    });
+    RemoteCall::exportAs("GMLIB_API", "sendFloatingTextToPlayer", [](int id, Player* pl) -> bool {
+        auto ft = GMLIB::Server::FloatingText::getFloatingText(id);
+        if (ft) {
+            ft->sendToClient(pl);
+            return true;
+        }
+        return false;
+    });
+    RemoteCall::exportAs("GMLIB_API", "sendFloatingText", [](int id) -> bool {
+        auto ft = GMLIB::Server::FloatingText::getFloatingText(id);
+        if (ft) {
+            ft->sendToAllClients();
+            return true;
+        }
+        return false;
+    });
+    RemoteCall::exportAs("GMLIB_API", "removeFloatingTextFromPlayer", [](int id, Player* pl) -> bool {
+        auto ft = GMLIB::Server::FloatingText::getFloatingText(id);
+        if (ft) {
+            ft->removeFromClient(pl);
+            return true;
+        }
+        return false;
+    });
+    RemoteCall::exportAs("GMLIB_API", "removeFloatingText", [](int id) -> bool {
+        auto ft = GMLIB::Server::FloatingText::getFloatingText(id);
+        if (ft) {
+            ft->removeFromAllClients();
+            return true;
+        }
+        return false;
+    });
 }

src/LegacyModApi.cpp

@@ -1,7 +1,6 @@
 #include "Global.h"
 
-std::unordered_set<std::string> HardCodedKeys   = {"AlwaysUnlocked", "PlayerHasManyItems", "PlayerInWater", "None"};
+std::unordered_set<std::string> HardCodedKeys = {"AlwaysUnlocked", "PlayerHasManyItems", "PlayerInWater", "None"};
-std::unordered_set<int>         ExperimentsList = {6, 7, 8, 9, 10, 12, 15, 16};
 
 std::variant<std::string, std::vector<RecipeIngredient>> makeRecipeUnlockingKey(std::string& key) {
     if (HardCodedKeys.count(key)) {
@@ -23,6 +22,10 @@ void Export_Legacy_GMLib_ModAPI() {
            std::string              result,
            int                      count,
            std::string              unlock) -> void {
+            auto level = GMLIB_Level::getLevel();
+            if (!level) {
+                return;
+            }
             std::vector<RecipeIngredient> types;
             for (auto ing : ingredients) {
                 auto key = RecipeIngredient(ing, 0, 1);
@@ -42,6 +45,10 @@ void Export_Legacy_GMLib_ModAPI() {
            std::string              result,
            int                      count,
            std::string              unlock) -> void {
+            auto level = GMLIB_Level::getLevel();
+            if (!level) {
+                return;
+            }
             std::vector<RecipeIngredient> types;
             for (auto ing : ingredients) {
                 auto key = RecipeIngredient(ing, 0, 1);
@@ -56,6 +63,10 @@ void Export_Legacy_GMLib_ModAPI() {
         "GMLib_ModAPI",
         "registerFurnaceRecipe",
         [](std::string recipe_id, std::string input, std::string output, std::vector<std::string> tags) -> void {
+            auto level = GMLIB_Level::getLevel();
+            if (!level) {
+                return;
+            }
             auto inp  = RecipeIngredient(input, 0, 1);
             auto outp = RecipeIngredient(output, 0, 1);
             GMLIB::Mod::CustomRecipe::registerFurnaceRecipe(recipe_id, inp, outp, tags);
@@ -65,6 +76,10 @@ void Export_Legacy_GMLib_ModAPI() {
         "GMLib_ModAPI",
         "registerBrewingMixRecipe",
         [](std::string recipe_id, std::string input, std::string output, std::string reagent) -> void {
+            auto level = GMLIB_Level::getLevel();
+            if (!level) {
+                return;
+            }
             auto rea = RecipeIngredient(reagent, 0, 1);
             GMLIB::Mod::CustomRecipe::registerBrewingMixRecipe(recipe_id, input, output, rea);
         }
@@ -73,6 +88,10 @@ void Export_Legacy_GMLib_ModAPI() {
         "GMLib_ModAPI",
         "registerBrewingContainerRecipe",
         [](std::string recipe_id, std::string input, std::string output, std::string reagent) -> void {
+            auto level = GMLIB_Level::getLevel();
+            if (!level) {
+                return;
+            }
             auto inp  = RecipeIngredient(input, 0, 1);
             auto outp = RecipeIngredient(output, 0, 1);
             auto rea  = RecipeIngredient(reagent, 0, 1);
@@ -87,6 +106,10 @@ void Export_Legacy_GMLib_ModAPI() {
            std::string base,
            std::string addition,
            std::string result) -> void {
+            auto level = GMLIB_Level::getLevel();
+            if (!level) {
+                return;
+            }
             GMLIB::Mod::CustomRecipe::registerSmithingTransformRecipe(
                 recipe_id,
                 smithing_template,
@@ -100,6 +123,10 @@ void Export_Legacy_GMLib_ModAPI() {
         "GMLib_ModAPI",
         "registerSmithingTrimRecipe",
         [](std::string recipe_id, std::string smithing_template, std::string base, std::string addition) -> void {
+            auto level = GMLIB_Level::getLevel();
+            if (!level) {
+                return;
+            }
             GMLIB::Mod::CustomRecipe::registerSmithingTrimRecipe(recipe_id, smithing_template, base, addition);
         }
     );
@@ -112,6 +139,10 @@ void Export_Legacy_GMLib_ModAPI() {
            std::string output,
            int         output_data,
            int         output_count) -> void {
+            auto level = GMLIB_Level::getLevel();
+            if (!level) {
+                return;
+            }
             auto inp  = RecipeIngredient(input, 0, 1);
             auto outp = RecipeIngredient(output, 0, 1);
             GMLIB::Mod::CustomRecipe::registerStoneCutterRecipe(recipe_id, inp, outp);
@@ -123,19 +154,30 @@ void Export_Legacy_GMLib_ModAPI() {
     });
     // 实验性
     RemoteCall::exportAs("GMLib_ModAPI", "registerExperimentsRequire", [](int experiment_id) -> void {
-        if (ExperimentsList.count(experiment_id)) {
+        auto map = GMLIB_Level::getAllExperiments();
+        if (map.count(experiment_id)) {
             GMLIB_Level::addExperimentsRequire((AllExperiments)experiment_id);
         } else {
             ll::Logger("Server").error("Experiment ID '{}' does not exist!", experiment_id);
         }
     });
     RemoteCall::exportAs("GMLib_ModAPI", "setExperimentEnabled", [](int experiment_id, bool value) -> void {
-        if (ExperimentsList.count(experiment_id)) {
+        auto level = GMLIB_Level::getLevel();
+        if (!level) {
+            return;
+        }
+        auto map = GMLIB_Level::getAllExperiments();
+        if (map.count(experiment_id)) {
             GMLIB_Level::getLevel()->setExperimentEnabled(((AllExperiments)experiment_id), value);
         } else ll::Logger("Server").error("Experiment ID '{}' does not exist!", experiment_id);
     });
     RemoteCall::exportAs("GMLib_ModAPI", "getExperimentEnabled", [](int experiment_id) -> bool {
-        if (ExperimentsList.count(experiment_id)) {
+        auto level = GMLIB_Level::getLevel();
+        if (!level) {
+            return false;
+        }
+        auto map = GMLIB_Level::getAllExperiments();
+        if (map.count(experiment_id)) {
             return GMLIB_Level::getLevel()->getExperimentEnabled(((AllExperiments)experiment_id));
         } else {
             ll::Logger("Server").error("Experiment ID '{}' does not exist!", experiment_id);

src/LegacyServerApi.cpp

@@ -7,43 +7,50 @@ void Export_Legacy_GMLib_ServerAPI() {
     RemoteCall::exportAs("GMLib_ServerAPI", "registerAbilityCommand", []() -> void {
         GMLIB_Level::forceEnableAbilityCommand();
     });
-    RemoteCall::exportAs("GMLib_ServerAPI", "addFloatingTextPacket", [](std::string text, std::pair<Vec3, int> pos, int dimid) -> int {
-        auto ft = new FloatingText(text, pos.first, pos.second);
-        return ft->mRuntimeId;
-    });
-    RemoteCall::exportAs("GMLib_ServerAPI", "deleteFloatingTextPacket", [](int id) -> void { 
-        FloatingText::deleteFloatingText(id);
-    });
     RemoteCall::exportAs("GMLib_ServerAPI", "setEnableAchievement", []() -> void {
         GMLIB_Level::setForceAchievementsEnabled();
     });
-    RemoteCall::exportAs("GMLib_ServerAPI", "setForceTrustSkins", []() -> void { 
+    RemoteCall::exportAs("GMLib_ServerAPI", "setForceTrustSkins", []() -> void { GMLIB_Level::setForceTrustSkin(); });
-        GMLIB_Level::setForceTrustSkin();
+    RemoteCall::exportAs("GMLib_ServerAPI", "enableCoResourcePack", []() -> void { GMLIB_Level::setCoResourcePack(); });
-    });
-    RemoteCall::exportAs("GMLib_ServerAPI", "enableCoResourcePack", []() -> void { 
-        GMLIB_Level::setCoResourcePack();
-    });
     RemoteCall::exportAs("GMLib_ServerAPI", "getLevelName", []() -> std::string {
-        return GMLIB_Level::getLevel()->getLevelName();
+        auto level = GMLIB_Level::getLevel();
+        if (!level) {
+            return "";
+        }
+        return level->getLevelName();
     });
     RemoteCall::exportAs("GMLib_ServerAPI", "setLevelName", [](std::string name) -> void {
-        GMLIB_Level::getLevel()->setLevelName(name);
+        auto level = GMLIB_Level::getLevel();
+        if (!level) {
+            return;
+        }
+        return level->setLevelName(name);
     });
     RemoteCall::exportAs("GMLib_ServerAPI", "setFakeSeed", [](int64_t seed) -> void {
-        GMLIB_Level::getLevel()->setFakeSeed(seed);
+        auto level = GMLIB_Level::getLevel();
+        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);
     });
-    RemoteCall::exportAs("GMLib_ServerAPI", "shootProjectile", [](Actor* owner, std::string name, float speed, float offset) -> Actor* { 
+    RemoteCall::exportAs(
-        auto ac = (GMLIB_Actor*)owner;
+        "GMLib_ServerAPI",
-        return ac->shootProjectile(name, speed, offset);
+        "shootProjectile",
-    });
+        [](Actor* owner, std::string name, float speed, float offset) -> Actor* {
-    RemoteCall::exportAs("GMLib_ServerAPI", "throwEntity", [](Actor* owner, Actor* actor, float speed, float offset) -> bool {
+            auto ac = (GMLIB_Actor*)owner;
-        auto ac = (GMLIB_Actor*)owner;
+            return ac->shootProjectile(name, speed, offset);
-        return ac->throwEntity(actor, speed, offset);
+        }
-    });
+    );
-    RemoteCall::exportAs("GMLib_ServerAPI", "PlayerToEntity", [](Player* player) -> Actor* { 
+    RemoteCall::exportAs(
-        return (Actor*)player;
+        "GMLib_ServerAPI",
-    });
+        "throwEntity",
+        [](Actor* owner, Actor* actor, float speed, float offset) -> bool {
+            auto ac = (GMLIB_Actor*)owner;
+            return ac->throwEntity(actor, speed, offset);
+        }
+    );
+    RemoteCall::exportAs("GMLib_ServerAPI", "PlayerToEntity", [](Player* player) -> Actor* { return (Actor*)player; });
 }

tooth.json

@@ -0,0 +1,28 @@
+{
+    "format_version": 2,
+    "tooth": "github.com/GroupMountain/GMLIB-LegacyRemoteCallApi",
+    "version": "0.8.2",
+    "info": {
+        "name": "GMLIB-LegacyRemoteCallApi",
+        "description": "Legacy RemoteCall API for GMLIB",
+        "author": "GroupMountain",
+        "tags": [
+            "LeviLamina",
+            "GMLIB",
+            "GMLIB-LegacyRemoteCallApi",
+            "Library"
+        ]
+    },
+    "asset_url": "https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi/releases/download/v0.8.2/GMLIB-LegacyRemoteCallApi-windows-x64.zip",
+    "dependencies": {
+        "github.com/GroupMountain/GMLIB": ">=0.8.1"
+    },
+    "files": {
+        "place": [
+            {
+                "src": "GMLIB-LegacyRemoteCallApi/*",
+                "dest": "plugins/GMLIB-LegacyRemoteCallApi"
+            }
+        ]
+    }
+}