wed150/GMLIB-LegacyRemoteCallApi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adapt: adapt GMLIB v0.12.6

Browse Source
This commit is contained in:
Tsubasa6848
2024-05-25 22:46:53 +08:00
Unverified
parent 7420396418
commit bd29c9b9a2
5 changed files with 52 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SDK-GMLIB
+1 -1
Submodule SDK-GMLIB updated: 7206bf0c10...710cc6e4c3
src/CompatibilityApi.cpp
+19 -25
View File
@@ -78,10 +78,10 @@ void Export_Compatibility_API() {
return GMLIB_Player::deletePlayerNbt(uid); return GMLIB_Player::deletePlayerNbt(uid);
}); });
RemoteCall::exportAs("GMLIB_API", "getAllExperiments", []() -> std::vector<int> { RemoteCall::exportAs("GMLIB_API", "getAllExperiments", []() -> std::vector<int> {
auto map = GMLIB_Level::getAllExperiments(); auto list = GMLIB_Level::getAllExperiments();
std::vector<int> result; std::vector<int> result;
for (auto& key : map) { for (auto& key : list) {
result.push_back(key.first); result.push_back((int)key);
} }
return result; return result;
}); });
@@ -96,65 +96,59 @@ void Export_Compatibility_API() {
"GMLIB_API", "GMLIB_API",
"createFloatingText", "createFloatingText",
[](std::pair<Vec3, int> pos, std::string const& text, bool papi) -> int { [](std::pair<Vec3, int> pos, std::string const& text, bool papi) -> int {
auto ft = new GMLIB::Server::StaticFloatingText(text, pos.first, pos.second, papi); auto ft = std::make_shared<GMLIB::Server::StaticFloatingText>(text, pos.first, pos.second, papi);
GMLIB::Server::FloatingTextManager::getInstance().add(ft);
return ft->getRuntimeID(); return ft->getRuntimeID();
} }
); );
RemoteCall::exportAs("GMLIB_API", "setFloatingTextData", [](int id, std::string const& text) -> bool { RemoteCall::exportAs("GMLIB_API", "setFloatingTextData", [](int id, std::string const& text) -> bool {
auto ft = GMLIB::Server::FloatingText::getFloatingText(id); if (auto ft = GMLIB::Server::FloatingTextManager::getInstance().getFloatingText(id)) {
if (ft) {
ft->setText(text); ft->setText(text);
return true; return true;
} }
return false; return false;
}); });
RemoteCall::exportAs("GMLIB_API", "deleteFloatingText", [](int id) -> bool { RemoteCall::exportAs("GMLIB_API", "deleteFloatingText", [](int id) -> bool {
return GMLIB::Server::FloatingText::deleteFloatingText(id); return GMLIB::Server::FloatingTextManager::getInstance().remove(id);
}); });
RemoteCall::exportAs("GMLIB_API", "sendFloatingTextToPlayer", [](int id, Player* pl) -> bool { RemoteCall::exportAs("GMLIB_API", "sendFloatingTextToPlayer", [](int id, Player* pl) -> bool {
auto ft = GMLIB::Server::FloatingText::getFloatingText(id); if (auto ft = GMLIB::Server::FloatingTextManager::getInstance().getFloatingText(id)) {
if (ft) { ft->sendTo(*pl);
ft->sendToClient(*pl);
return true; return true;
} }
return false; return false;
}); });
RemoteCall::exportAs("GMLIB_API", "sendFloatingText", [](int id) -> bool { RemoteCall::exportAs("GMLIB_API", "sendFloatingText", [](int id) -> bool {
auto ft = GMLIB::Server::FloatingText::getFloatingText(id); if (auto ft = GMLIB::Server::FloatingTextManager::getInstance().getFloatingText(id)) {
if (ft) { ft->sendToClients();
ft->sendToAllClients();
return true; return true;
} }
return false; return false;
}); });
RemoteCall::exportAs("GMLIB_API", "removeFloatingTextFromPlayer", [](int id, Player* pl) -> bool { RemoteCall::exportAs("GMLIB_API", "removeFloatingTextFromPlayer", [](int id, Player* pl) -> bool {
auto ft = GMLIB::Server::FloatingText::getFloatingText(id); if (auto ft = GMLIB::Server::FloatingTextManager::getInstance().getFloatingText(id)) {
if (ft) { ft->removeFrom(*pl);
ft->removeFromClient(*pl);
return true; return true;
} }
return false; return false;
}); });
RemoteCall::exportAs("GMLIB_API", "removeFloatingText", [](int id) -> bool { RemoteCall::exportAs("GMLIB_API", "removeFloatingText", [](int id) -> bool {
auto ft = GMLIB::Server::FloatingText::getFloatingText(id); if (auto ft = GMLIB::Server::FloatingTextManager::getInstance().getFloatingText(id)) {
if (ft) { ft->removeFromClients();
ft->removeFromAllClients();
return true; return true;
} }
return false; return false;
}); });
RemoteCall::exportAs("GMLIB_API", "updateClientFloatingTextData", [](int id, Player* pl) -> bool { RemoteCall::exportAs("GMLIB_API", "updateClientFloatingTextData", [](int id, Player* pl) -> bool {
auto ft = GMLIB::Server::FloatingText::getFloatingText(id); if (auto ft = GMLIB::Server::FloatingTextManager::getInstance().getFloatingText(id)) {
if (ft) { ft->update(*pl);
ft->updateClient(*pl);
return true; return true;
} }
return false; return false;
}); });
RemoteCall::exportAs("GMLIB_API", "updateAllClientsFloatingTextData", [](int id) -> bool { RemoteCall::exportAs("GMLIB_API", "updateAllClientsFloatingTextData", [](int id) -> bool {
auto ft = GMLIB::Server::FloatingText::getFloatingText(id); if (auto ft = GMLIB::Server::FloatingTextManager::getInstance().getFloatingText(id)) {
if (ft) { ft->updateClients();
ft->updateAllClients();
return true; return true;
} }
return false; return false;
src/LegacyModApi.cpp
+19 -19
View File
@@ -162,35 +162,35 @@ void Export_Legacy_GMLib_ModAPI() {
}); });
// 实验性 // 实验性
RemoteCall::exportAs("GMLib_ModAPI", "registerExperimentsRequire", [](int experiment_id) -> void { RemoteCall::exportAs("GMLib_ModAPI", "registerExperimentsRequire", [](int experiment_id) -> void {
auto map = GMLIB_Level::getAllExperiments(); auto list = GMLIB_Level::getAllExperiments();
if (map.count(experiment_id)) { std::unordered_set<AllExperiments> set(list.begin(), list.end());
if (set.contains((AllExperiments)experiment_id)) {
GMLIB_Level::addExperimentsRequire((AllExperiments)experiment_id); GMLIB_Level::addExperimentsRequire((AllExperiments)experiment_id);
} else { } else {
ll::Logger("Server").error("Experiment ID '{}' does not exist!", experiment_id); ll::Logger("Server").error("Experiment ID '{}' does not exist!", experiment_id);
} }
}); });
RemoteCall::exportAs("GMLib_ModAPI", "setExperimentEnabled", [](int experiment_id, bool value) -> void { RemoteCall::exportAs("GMLib_ModAPI", "setExperimentEnabled", [](int experiment_id, bool value) -> void {
auto level = GMLIB_Level::getInstance(); if (GMLIB_Level::getInstance()) {
if (!level) { auto list = GMLIB_Level::getAllExperiments();
return; std::unordered_set<AllExperiments> set(list.begin(), list.end());
if (set.contains((AllExperiments)experiment_id)) {
GMLIB_Level::getInstance()->setExperimentEnabled(((AllExperiments)experiment_id), value);
} else ll::Logger("Server").error("Experiment ID '{}' does not exist!", experiment_id);
} }
auto map = GMLIB_Level::getAllExperiments();
if (map.count(experiment_id)) {
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 { RemoteCall::exportAs("GMLib_ModAPI", "getExperimentEnabled", [](int experiment_id) -> bool {
auto level = GMLIB_Level::getInstance(); if (GMLIB_Level::getInstance()) {
if (!level) { auto list = GMLIB_Level::getAllExperiments();
return false; std::unordered_set<AllExperiments> set(list.begin(), list.end());
} if (set.contains((AllExperiments)experiment_id)) {
auto map = GMLIB_Level::getAllExperiments(); return GMLIB_Level::getInstance()->getExperimentEnabled(((AllExperiments)experiment_id));
if (map.count(experiment_id)) { } else {
return GMLIB_Level::getInstance()->getExperimentEnabled(((AllExperiments)experiment_id)); ll::Logger("Server").error("Experiment ID '{}' does not exist!", experiment_id);
} else { return false;
ll::Logger("Server").error("Experiment ID '{}' does not exist!", experiment_id); }
return false;
} }
return false;
}); });
RemoteCall::exportAs("GMLib_ModAPI", "setFixI18nEnabled", []() -> void { RemoteCall::exportAs("GMLib_ModAPI", "setFixI18nEnabled", []() -> void {
GMLIB::Mod::VanillaFix::setFixI18nEnabled(); GMLIB::Mod::VanillaFix::setFixI18nEnabled();
src/LegacyServerApi.cpp
+12 -9
View File
@@ -17,18 +17,21 @@ void Export_Legacy_GMLib_ServerAPI() {
GMLIB_Level::requireServerResourcePackAndAllowClientResourcePack(); GMLIB_Level::requireServerResourcePackAndAllowClientResourcePack();
}); });
RemoteCall::exportAs("GMLib_ServerAPI", "getLevelName", []() -> std::string { RemoteCall::exportAs("GMLib_ServerAPI", "getLevelName", []() -> std::string {
auto level = GMLIB_Level::getInstance(); if (auto level = GMLIB_Level::getInstance()) {
if (!level) { return level->getLevelName();
return "";
} }
return level->getLevelName(); return {};
}); });
RemoteCall::exportAs("GMLib_ServerAPI", "setLevelName", [](std::string const& name) -> void { RemoteCall::exportAs("GMLib_ServerAPI", "setLevelName", [](std::string const& name) -> void {
auto level = GMLIB_Level::getInstance(); if (auto level = GMLIB_Level::getInstance()) {
if (!level) { level->setLevelName(name);
return;
} }
return level->setLevelName(name); });
RemoteCall::exportAs("GMLib_ServerAPI", "getLevelSeed", []() -> std::string {
if (auto level = GMLIB_Level::getInstance()) {
return std::to_string(level->getSeed());
}
return {};
}); });
RemoteCall::exportAs("GMLib_ServerAPI", "setFakeSeed", [](int64_t seed) -> void { RemoteCall::exportAs("GMLib_ServerAPI", "setFakeSeed", [](int64_t seed) -> void {
return GMLIB_Level::setFakeSeed(seed); return GMLIB_Level::setFakeSeed(seed);
@@ -53,7 +56,7 @@ void Export_Legacy_GMLib_ServerAPI() {
"throwEntity", "throwEntity",
[](Actor* owner, Actor* actor, float speed, float offset) -> bool { [](Actor* owner, Actor* actor, float speed, float offset) -> bool {
auto ac = (GMLIB_Actor*)owner; auto ac = (GMLIB_Actor*)owner;
return ac->throwEntity(actor, speed, offset); return ac->throwEntity(*actor, speed, offset);
} }
); );
RemoteCall::exportAs("GMLib_ServerAPI", "PlayerToEntity", [](Player* player) -> Actor* { return (Actor*)player; }); RemoteCall::exportAs("GMLib_ServerAPI", "PlayerToEntity", [](Player* player) -> Actor* { return (Actor*)player; });
src/PlaceholderApi.cpp
+1 -1
View File
@@ -106,7 +106,7 @@ std::string translateStringWithPlayer(std::string const& str, Player* pl) {
std::string translateString(std::string const& str) { return GMLIB::Server::PlaceholderAPI::translateString(str); } std::string translateString(std::string const& str) { return GMLIB::Server::PlaceholderAPI::translateString(str); }
bool unRegisterPlaceholder(std::string const& str) { return GMLIB::Server::PlaceholderAPI::unRegisterPlaceholder(str); } bool unRegisterPlaceholder(std::string const& str) { return GMLIB::Server::PlaceholderAPI::unregisterPlaceholder(str); }
std::vector<std::string> getAllPAPI() { return GMLIB::Server::PlaceholderAPI::getAllPAPI(); } std::vector<std::string> getAllPAPI() { return GMLIB::Server::PlaceholderAPI::getAllPAPI(); }