diff --git a/lib/GMLIB_API-JS.js b/lib/GMLIB_API-JS.js index 877d7a0..e545489 100644 --- a/lib/GMLIB_API-JS.js +++ b/lib/GMLIB_API-JS.js @@ -45,7 +45,44 @@ const GMLIB_API = { 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") + getVersion_GMLIB: ll.import("GMLIB_API", "getVersion_GMLIB"), + getPlayerPosition: ll.import("GMLIB_API", "getPlayerPosition"), + setPlayerPosition: ll.import("GMLIB_API", "setPlayerPosition"), + playerHasScore: ll.import("GMLIB_API", "playerHasScore"), + getPlayerScore: ll.import("GMLIB_API", "getPlayerScore"), + addPlayerScore: ll.import("GMLIB_API", "addPlayerScore"), + reducePlayerScore: ll.import("GMLIB_API", "reducePlayerScore"), + setPlayerScore: ll.import("GMLIB_API", "setPlayerScore"), + resetPlayerScore: ll.import("GMLIB_API", "resetPlayerScore"), + resetPlayerScores: ll.import("GMLIB_API", "resetPlayerScores"), + entityHasScore: ll.import("GMLIB_API", "entityHasScore"), + getEntityScore: ll.import("GMLIB_API", "getEntityScore"), + addEntityScore: ll.import("GMLIB_API", "addEntityScore"), + reduceEntityScore: ll.import("GMLIB_API", "reduceEntityScore"), + setEntityScore: ll.import("GMLIB_API", "setEntityScore"), + resetEntityScore: ll.import("GMLIB_API", "resetEntityScore"), + resetEntityScores: ll.import("GMLIB_API", "resetEntityScores"), + fakePlayerHasScore: ll.import("GMLIB_API", "fakePlayerHasScore"), + getFakePlayerScore: ll.import("GMLIB_API", "getFakePlayerScore"), + addFakePlayerScore: ll.import("GMLIB_API", "addFakePlayerScore"), + reduceFakePlayerScore: ll.import("GMLIB_API", "reduceFakePlayerScore"), + setFakePlayerScore: ll.import("GMLIB_API", "setFakePlayerScore"), + resetFakePlayerScore: ll.import("GMLIB_API", "resetFakePlayerScore"), + resetFakePlayerScores: ll.import("GMLIB_API", "resetFakePlayerScores"), + addObjective: ll.import("GMLIB_API", "addObjective"), + addObjectiveWithDisplayName: ll.import("GMLIB_API", "addObjectiveWithDisplayName"), + getDisplayName: ll.import("GMLIB_API", "getDisplayName"), + setDisplayName: ll.import("GMLIB_API", "setDisplayName"), + removeObjective: ll.import("GMLIB_API", "removeObjective"), + setDisplayObjective: ll.import("GMLIB_API", "setDisplayObjective"), + clearDisplayObjective: ll.import("GMLIB_API", "clearDisplayObjective"), + getAllObjectives: ll.import("GMLIB_API", "getAllObjectives"), + getAllScoreboardPlayers: ll.import("GMLIB_API", "getAllScoreboardPlayers"), + getAllScoreboardFakePlayers: ll.import("GMLIB_API", "getAllScoreboardFakePlayers"), + getAllScoreboardEntities: ll.import("GMLIB_API", "getAllScoreboardEntities"), + getPlayerFromUuid: ll.import("GMLIB_API", "getPlayerFromUuid"), + getPlayerFromUniqueId: ll.import("GMLIB_API", "getPlayerFromUniqueId"), + getEntityFromUniqueId: ll.import("GMLIB_API", "getEntityFromUniqueId") } const FloatingTextList = []; @@ -254,6 +291,18 @@ class Minecraft { return GMLIB_API.setPlayerNbtTags(uuid, snbt, tags); } + static getPlayerPosition(uuid) { + let pos = GMLIB_API.getPlayerPosition(uuid); + if (pos.dimid == -1) { + return null; + } + return pos; + } + + static setPlayerPosition(uuid, pos) { + return GMLIB_API.setPlayerPosition(uuid, pos); + } + static setEducationFeatureEnabled() { return GMLIB_API.setEducationFeatureEnabled(); } @@ -409,4 +458,174 @@ class GMLIB { } } -module.exports = { StaticFloatingText, DynamicFloatingText, Minecraft, Recipes, Experiments, GMLIB }; \ No newline at end of file +class Scoreboard { + constructor() { + throw new Error("Static class cannot be instantiated"); + } + + // Targets + static getAllTrackedEntities() { + return GMLIB_API.getAllScoreboardEntities(); + } + + static getAllTrackedPlayers() { + return GMLIB_API.getAllScoreboardPlayers(); + } + + static getAllTrackedFakePlayers() { + return GMLIB_API.getAllScoreboardFakePlayers(); + } + + static getAllTrackedTargets() { + let result = []; + GMLIB_API.getAllScoreboardPlayers().forEach((uuid) => { + let key = { + "Type": "Player", + "Uuid": uuid + }; + result.push(key); + }); + GMLIB_API.getAllScoreboardEntities().forEach((uniqueId) => { + let key = { + "Type": "Entity", + "UniqueId": uniqueId + }; + result.push(key); + }); + GMLIB_API.getAllScoreboardFakePlayers().forEach((name) => { + let key = { + "Type": "FakePlayer", + "Name": name + }; + result.push(key); + }); + return result; + } + + // Objectives + static addObjective(name, displayName = "") { + if (displayName == "") { + return GMLIB_API.addObjective(name); + } + return GMLIB_API.addObjectiveWithDisplayName(name, displayName); + } + + static removeObjective(name) { + return GMLIB_API.removeObjective(name); + } + + static getAllObjectives() { + return GMLIB_API.getAllObjectives(); + } + + static getDisplayName(objective) { + return GMLIB_API.getDisplayName(objective); + } + + static setDisplayName(objective, displayName) { + return GMLIB_API.setDisplayName(objective, displayName); + } + + static setDisplay(objective, slot, order = 0) { + GMLIB_API.setDisplayObjective(objective, slot, order); + } + + static clearDisplay(slot) { + GMLIB_API.clearDisplayObjective(slot); + } + + // Player Score + static getPlayerScore(uuid, objective) { + if (GMLIB_API.playerHasScore(uuid, objective)) { + return GMLIB_API.getPlayerScore(uuid, objective); + } + return null; + } + + static addPlayerScore(uuid, objective, value) { + return GMLIB_API.addPlayerScore(uuid, objective, value); + } + + static reducePlayerScore(uuid, objective, value) { + return GMLIB_API.reducePlayerScore(uuid, objective, value); + } + + static setPlayerScore(uuid, objective, value) { + return GMLIB_API.setPlayerScore(uuid, objective, value); + } + + static resetPlayerScore(uuid, objective) { + return GMLIB_API.resetPlayerScore(uuid, objective); + } + + static resetPlayerScores(uuid) { + return GMLIB_API.resetPlayerScores(uuid); + } + + // FakePlayer Score + static getFakePlayerScore(name, objective) { + if (GMLIB_API.fakePlayerHasScore(name, objective)) { + return GMLIB_API.getFakePlayerScore(name, objective); + } + return null; + } + + static addFakePlayerScore(name, objective, value) { + return GMLIB_API.addFakePlayerScore(name, objective, value); + } + + static reduceFakePlayerScore(name, objective, value) { + return GMLIB_API.reduceFakePlayerScore(name, objective, value); + } + + static setFakePlayerScore(name, objective, value) { + return GMLIB_API.setFakePlayerScore(name, objective, value); + } + + static resetFakePlayerScore(name, objective) { + return GMLIB_API.resetFakePlayerScore(name, objective); + } + + static resetFakePlayerScores(name) { + return GMLIB_API.resetFakePlayerScores(name); + } + + // Entity Score + static getEntityScore(uniqueId, objective) { + if (GMLIB_API.entityHasScore(uniqueId, objective)) { + return GMLIB_API.getEntityScore(uniqueId, objective); + } + return null; + } + + static addEntityScore(uniqueId, objective, value) { + return GMLIB_API.addEntityScore(uniqueId, objective, value); + } + + static reduceEntityScore(uniqueId, objective, value) { + return GMLIB_API.reduceEntityScore(uniqueId, objective, value); + } + + static setEntityScore(uniqueId, objective, value) { + return GMLIB_API.setEntityScore(uniqueId, objective, value); + } + + static resetEntityScore(uniqueId, objective) { + return GMLIB_API.resetEntityScore(uniqueId, objective); + } + + static resetEntityScores(uniqueId) { + return GMLIB_API.resetEntityScores(uniqueId); + } + +} + +module.exports = { + StaticFloatingText, + DynamicFloatingText, + Minecraft, + Recipes, + Experiments, + GMLIB, + Scoreboard +}; \ No newline at end of file diff --git a/src/CompatibilityApi.cpp b/src/CompatibilityApi.cpp index 4464a2f..1756790 100644 --- a/src/CompatibilityApi.cpp +++ b/src/CompatibilityApi.cpp @@ -1,22 +1,35 @@ #include "Global.h" +#include + +bool isNumber(const std::string& str) { + std::regex pattern("[-+]?[0-9]*\\.?[0-9]+"); + return std::regex_match(str, pattern); +} + +ActorUniqueID parseScriptUniqueID(std::string uniqueId) { + if (!isNumber(uniqueId)) { + return ActorUniqueID::INVALID_ID; + } + return ActorUniqueID(std::stoll(uniqueId)); +} void Export_Compatibility_API() { RemoteCall::exportAs("GMLIB_API", "getServerMspt", []() -> float { - auto level = GMLIB_Level::getLevel(); + auto level = GMLIB_Level::getInstance(); if (!level) { return 0.0f; } return level->getServerMspt(); }); RemoteCall::exportAs("GMLIB_API", "getServerCurrentTps", []() -> float { - auto level = GMLIB_Level::getLevel(); + auto level = GMLIB_Level::getInstance(); if (!level) { return 0.0f; } return level->getServerCurrentTps(); }); RemoteCall::exportAs("GMLIB_API", "getServerAverageTps", []() -> float { - auto level = GMLIB_Level::getLevel(); + auto level = GMLIB_Level::getInstance(); if (!level) { return 0.0f; } @@ -145,4 +158,233 @@ void Export_Compatibility_API() { RemoteCall::exportAs("GMLIB_API", "chooseResourcePackI18nLanguage", [](std::string code) -> void { I18n::chooseLanguage(code); }); + RemoteCall::exportAs("GMLIB_API", "getPlayerPosition", [](std::string uuid) -> std::pair { + auto uid = mce::UUID::fromString(uuid); + auto pos = GMLIB_Player::getPlayerPosition(uid); + if (pos.has_value()) { + return pos.value(); + } + return { + {0, 0, 0}, + -1 + }; + }); + RemoteCall::exportAs("GMLIB_API", "setPlayerPosition", [](std::string uuid, std::pair pos) -> bool { + auto uid = mce::UUID::fromString(uuid); + return GMLIB_Player::setPlayerPosition(uid, pos.first, pos.second); + }); + RemoteCall::exportAs("GMLIB_API", "playerHasScore", [](std::string uuid, std::string obj) -> bool { + auto uid = mce::UUID::fromString(uuid); + if (auto result = GMLIB_Player::getPlayerScore(uid, obj)) { + return true; + } + return false; + }); + RemoteCall::exportAs("GMLIB_API", "getPlayerScore", [](std::string uuid, std::string obj) -> int { + auto uid = mce::UUID::fromString(uuid); + if (auto result = GMLIB_Player::getPlayerScore(uid, obj)) { + return result.value(); + } + return 0; + }); + RemoteCall::exportAs("GMLIB_API", "addPlayerScore", [](std::string uuid, std::string obj, int value) -> bool { + auto uid = mce::UUID::fromString(uuid); + if (auto res = GMLIB_Player::setPlayerScore(uid, obj, value, PlayerScoreSetFunction::Add)) { + return true; + } + return false; + }); + RemoteCall::exportAs("GMLIB_API", "reducePlayerScore", [](std::string uuid, std::string obj, int value) -> bool { + auto uid = mce::UUID::fromString(uuid); + if (auto res = GMLIB_Player::setPlayerScore(uid, obj, value, PlayerScoreSetFunction::Subtract)) { + return true; + } + return false; + }); + RemoteCall::exportAs("GMLIB_API", "setPlayerScore", [](std::string uuid, std::string obj, int value) -> bool { + auto uid = mce::UUID::fromString(uuid); + if (auto res = GMLIB_Player::setPlayerScore(uid, obj, value)) { + return true; + } + return false; + }); + RemoteCall::exportAs("GMLIB_API", "resetPlayerScore", [](std::string uuid, std::string obj) -> bool { + auto uid = mce::UUID::fromString(uuid); + return GMLIB_Player::resetPlayerScore(uid, obj); + }); + RemoteCall::exportAs("GMLIB_API", "resetPlayerScores", [](std::string uuid) -> bool { + auto uid = mce::UUID::fromString(uuid); + return GMLIB_Player::resetPlayerScore(uid); + }); + RemoteCall::exportAs("GMLIB_API", "entityHasScore", [](std::string uniqueId, std::string obj) -> bool { + auto auid = parseScriptUniqueID(uniqueId); + if (auto result = GMLIB_Scoreboard::getInstance()->getScore(obj, auid)) { + return true; + } + return false; + }); + RemoteCall::exportAs("GMLIB_API", "getEntityScore", [](std::string uniqueId, std::string obj) -> int { + auto auid = parseScriptUniqueID(uniqueId); + if (auto result = GMLIB_Scoreboard::getInstance()->getScore(obj, auid)) { + return result.value(); + } + return 0; + }); + RemoteCall::exportAs("GMLIB_API", "addEntityScore", [](std::string uniqueId, std::string obj, int value) -> bool { + auto auid = parseScriptUniqueID(uniqueId); + if (auto res = GMLIB_Scoreboard::getInstance()->setScore(obj, auid, value, PlayerScoreSetFunction::Add)) { + return true; + } + return false; + }); + RemoteCall::exportAs( + "GMLIB_API", + "reduceEntityScore", + [](std::string uniqueId, std::string obj, int value) -> bool { + auto auid = parseScriptUniqueID(uniqueId); + if (auto res = + GMLIB_Scoreboard::getInstance()->setScore(obj, auid, value, PlayerScoreSetFunction::Subtract)) { + return true; + } + return false; + } + ); + RemoteCall::exportAs("GMLIB_API", "setEntityScore", [](std::string uniqueId, std::string obj, int value) -> bool { + auto auid = parseScriptUniqueID(uniqueId); + if (auto res = GMLIB_Scoreboard::getInstance()->setScore(obj, auid, value)) { + return true; + } + return false; + }); + RemoteCall::exportAs("GMLIB_API", "resetEntityScore", [](std::string uniqueId, std::string obj) -> bool { + auto auid = parseScriptUniqueID(uniqueId); + return GMLIB_Scoreboard::getInstance()->resetScore(obj, auid); + }); + RemoteCall::exportAs("GMLIB_API", "resetEntityScores", [](std::string uniqueId) -> bool { + auto auid = parseScriptUniqueID(uniqueId); + return GMLIB_Scoreboard::getInstance()->resetAllScores(auid); + }); + RemoteCall::exportAs("GMLIB_API", "fakePlayerHasScore", [](std::string name, std::string obj) -> bool { + if (auto result = GMLIB_Scoreboard::getInstance()->getScore(obj, name)) { + return true; + } + return false; + }); + RemoteCall::exportAs("GMLIB_API", "getFakePlayerScore", [](std::string name, std::string obj) -> int { + if (auto result = GMLIB_Scoreboard::getInstance()->getScore(obj, name)) { + return result.value(); + } + return 0; + }); + RemoteCall::exportAs("GMLIB_API", "addFakePlayerScore", [](std::string name, std::string obj, int value) -> bool { + if (auto res = GMLIB_Scoreboard::getInstance()->setScore(obj, name, value, PlayerScoreSetFunction::Add)) { + return true; + } + return false; + }); + RemoteCall::exportAs( + "GMLIB_API", + "reduceFakePlayerScore", + [](std::string name, std::string obj, int value) -> bool { + if (auto res = + GMLIB_Scoreboard::getInstance()->setScore(obj, name, value, PlayerScoreSetFunction::Subtract)) { + return true; + } + return false; + } + ); + RemoteCall::exportAs("GMLIB_API", "setFakePlayerScore", [](std::string name, std::string obj, int value) -> bool { + if (auto res = GMLIB_Scoreboard::getInstance()->setScore(obj, name, value)) { + return true; + } + return false; + }); + RemoteCall::exportAs("GMLIB_API", "resetFakePlayerScore", [](std::string name, std::string obj) -> bool { + return GMLIB_Scoreboard::getInstance()->resetScore(obj, name); + }); + RemoteCall::exportAs("GMLIB_API", "resetFakePlayerScores", [](std::string name) -> bool { + return GMLIB_Scoreboard::getInstance()->resetAllScores(name); + }); + RemoteCall::exportAs("GMLIB_API", "addObjective", [](std::string obj) -> bool { + if (auto res = GMLIB_Scoreboard::getInstance()->getInstance()->addObjective(obj)) { + return true; + } + return false; + }); + RemoteCall::exportAs( + "GMLIB_API", + "addObjectiveWithDisplayName", + [](std::string obj, std::string displayName) -> bool { + if (auto res = GMLIB_Scoreboard::getInstance()->getInstance()->addObjective(obj, displayName)) { + return true; + } + return false; + } + ); + RemoteCall::exportAs("GMLIB_API", "getDisplayName", [](std::string obj) -> std::string { + if (auto result = GMLIB_Scoreboard::getInstance()->getInstance()->getObjectiveDisplayName(obj)) { + return result.value(); + } + return ""; + }); + RemoteCall::exportAs("GMLIB_API", "setDisplayName", [](std::string obj, std::string displayName) -> bool { + return GMLIB_Scoreboard::getInstance()->getInstance()->setObjectiveDisplayName(obj, displayName); + }); + RemoteCall::exportAs("GMLIB_API", "removeObjective", [](std::string obj) -> bool { + return GMLIB_Scoreboard::getInstance()->getInstance()->removeObjective(obj); + }); + RemoteCall::exportAs("GMLIB_API", "setDisplayObjective", [](std::string obj, std::string slot, int order) -> void { + return GMLIB_Scoreboard::getInstance()->getInstance()->setObjectiveDisplay( + obj, + slot, + (ObjectiveSortOrder)order + ); + }); + RemoteCall::exportAs("GMLIB_API", "clearDisplayObjective", [](std::string slot) -> void { + return GMLIB_Scoreboard::getInstance()->getInstance()->clearObjectiveDisplay(slot); + }); + RemoteCall::exportAs("GMLIB_API", "getAllObjectives", []() -> std::vector { + auto objs = GMLIB_Scoreboard::getInstance()->getInstance()->getObjectives(); + std::vector result; + for (auto obj : objs) { + result.push_back(obj->getName()); + } + return result; + }); + RemoteCall::exportAs("GMLIB_API", "getAllScoreboardPlayers", []() -> std::vector { + auto uuids = GMLIB_Scoreboard::getInstance()->getInstance()->getAllPlayerUuids(); + std::vector result; + for (auto& uuid : uuids) { + result.push_back(uuid.asString()); + } + return result; + }); + RemoteCall::exportAs("GMLIB_API", "getAllScoreboardFakePlayers", []() -> std::vector { + auto names = GMLIB_Scoreboard::getInstance()->getInstance()->getAllFakePlayers(); + std::vector result; + for (auto name : names) { + result.push_back(name); + } + return result; + }); + RemoteCall::exportAs("GMLIB_API", "getAllScoreboardEntities", []() -> std::vector { + auto auids = GMLIB_Scoreboard::getInstance()->getInstance()->getAllEntities(); + std::vector result; + for (auto auid : auids) { + result.push_back(std::to_string(auid.get())); + } + return result; + }); + RemoteCall::exportAs("GMLIB_API", "getPlayerFromUuid", [](std::string uuid) -> Player* { + auto uid = mce::UUID::fromString(uuid); + return ll::service::getLevel()->getPlayer(uuid); + }); + RemoteCall::exportAs("GMLIB_API", "getPlayerFromUniqueId", [](std::string uniqueId) -> Actor* { + auto auid = parseScriptUniqueID(uniqueId); + return ll::service::getLevel()->getPlayer(auid); + }); + RemoteCall::exportAs("GMLIB_API", "getEntityFromUniqueId", [](std::string uniqueId) -> Actor* { + auto auid = parseScriptUniqueID(uniqueId); + return ll::service::getLevel()->fetchEntity(auid); + }); } \ No newline at end of file diff --git a/src/Entry.cpp b/src/Entry.cpp index c786469..5db0e49 100644 --- a/src/Entry.cpp +++ b/src/Entry.cpp @@ -10,7 +10,7 @@ namespace { std::unique_ptr> selfPluginInstance; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables) -auto disable(ll::plugin::NativePlugin& /*self*/) -> bool { return false; } +auto disable(ll::plugin::NativePlugin& /*self*/) -> bool { return true; } auto enable(ll::plugin::NativePlugin& /*self*/) -> bool { return true; } diff --git a/src/LegacyModApi.cpp b/src/LegacyModApi.cpp index b9b5846..413b54e 100644 --- a/src/LegacyModApi.cpp +++ b/src/LegacyModApi.cpp @@ -22,7 +22,7 @@ void Export_Legacy_GMLib_ModAPI() { std::string result, int count, std::string unlock) -> void { - auto level = GMLIB_Level::getLevel(); + auto level = GMLIB_Level::getInstance(); if (!level) { return; } @@ -45,7 +45,7 @@ void Export_Legacy_GMLib_ModAPI() { std::string result, int count, std::string unlock) -> void { - auto level = GMLIB_Level::getLevel(); + auto level = GMLIB_Level::getInstance(); if (!level) { return; } @@ -63,7 +63,7 @@ void Export_Legacy_GMLib_ModAPI() { "GMLib_ModAPI", "registerFurnaceRecipe", [](std::string recipe_id, std::string input, std::string output, std::vector tags) -> void { - auto level = GMLIB_Level::getLevel(); + auto level = GMLIB_Level::getInstance(); if (!level) { return; } @@ -76,7 +76,7 @@ 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(); + auto level = GMLIB_Level::getInstance(); if (!level) { return; } @@ -88,7 +88,7 @@ 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(); + auto level = GMLIB_Level::getInstance(); if (!level) { return; } @@ -106,7 +106,7 @@ void Export_Legacy_GMLib_ModAPI() { std::string base, std::string addition, std::string result) -> void { - auto level = GMLIB_Level::getLevel(); + auto level = GMLIB_Level::getInstance(); if (!level) { return; } @@ -123,7 +123,7 @@ 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(); + auto level = GMLIB_Level::getInstance(); if (!level) { return; } @@ -139,7 +139,7 @@ void Export_Legacy_GMLib_ModAPI() { std::string output, int output_data, int output_count) -> void { - auto level = GMLIB_Level::getLevel(); + auto level = GMLIB_Level::getInstance(); if (!level) { return; } @@ -162,23 +162,23 @@ void Export_Legacy_GMLib_ModAPI() { } }); RemoteCall::exportAs("GMLib_ModAPI", "setExperimentEnabled", [](int experiment_id, bool value) -> void { - auto level = GMLIB_Level::getLevel(); + auto level = GMLIB_Level::getInstance(); if (!level) { return; } auto map = GMLIB_Level::getAllExperiments(); if (map.count(experiment_id)) { - GMLIB_Level::getLevel()->setExperimentEnabled(((AllExperiments)experiment_id), value); + GMLIB_Level::getInstance()->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 { - auto level = GMLIB_Level::getLevel(); + auto level = GMLIB_Level::getInstance(); if (!level) { return false; } auto map = GMLIB_Level::getAllExperiments(); if (map.count(experiment_id)) { - return GMLIB_Level::getLevel()->getExperimentEnabled(((AllExperiments)experiment_id)); + return GMLIB_Level::getInstance()->getExperimentEnabled(((AllExperiments)experiment_id)); } else { ll::Logger("Server").error("Experiment ID '{}' does not exist!", experiment_id); return false; diff --git a/src/LegacyServerApi.cpp b/src/LegacyServerApi.cpp index 41d617b..812579d 100644 --- a/src/LegacyServerApi.cpp +++ b/src/LegacyServerApi.cpp @@ -13,14 +13,14 @@ void Export_Legacy_GMLib_ServerAPI() { RemoteCall::exportAs("GMLib_ServerAPI", "setForceTrustSkins", []() -> void { GMLIB_Level::setForceTrustSkin(); }); RemoteCall::exportAs("GMLib_ServerAPI", "enableCoResourcePack", []() -> void { GMLIB_Level::setCoResourcePack(); }); RemoteCall::exportAs("GMLib_ServerAPI", "getLevelName", []() -> std::string { - auto level = GMLIB_Level::getLevel(); + auto level = GMLIB_Level::getInstance(); if (!level) { return ""; } return level->getLevelName(); }); RemoteCall::exportAs("GMLib_ServerAPI", "setLevelName", [](std::string name) -> void { - auto level = GMLIB_Level::getLevel(); + auto level = GMLIB_Level::getInstance(); if (!level) { return; }