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

refactor: remove some shit

Browse Source
This commit is contained in:
Tsubasa6848
2024-05-15 19:34:01 +08:00
Unverified
parent b29c717d6a
commit 819d64ad86
2 changed files with 82 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/GMLIB_API-JS.js
+26 -44
View File
@@ -84,9 +84,7 @@ const GMLIB_API = {
setDisplayObjective: ll.import("GMLIB_API", "setDisplayObjective"), setDisplayObjective: ll.import("GMLIB_API", "setDisplayObjective"),
clearDisplayObjective: ll.import("GMLIB_API", "clearDisplayObjective"), clearDisplayObjective: ll.import("GMLIB_API", "clearDisplayObjective"),
getAllObjectives: ll.import("GMLIB_API", "getAllObjectives"), getAllObjectives: ll.import("GMLIB_API", "getAllObjectives"),
getAllScoreboardPlayers: ll.import("GMLIB_API", "getAllScoreboardPlayers"), getAllTrackedTargets: ll.import("GMLIB_API", "getAllTrackedTargets"),
getAllScoreboardFakePlayers: ll.import("GMLIB_API", "getAllScoreboardFakePlayers"),
getAllScoreboardEntities: ll.import("GMLIB_API", "getAllScoreboardEntities"),
getPlayerFromUuid: ll.import("GMLIB_API", "getPlayerFromUuid"), getPlayerFromUuid: ll.import("GMLIB_API", "getPlayerFromUuid"),
getPlayerFromUniqueId: ll.import("GMLIB_API", "getPlayerFromUniqueId"), getPlayerFromUniqueId: ll.import("GMLIB_API", "getPlayerFromUniqueId"),
getEntityFromUniqueId: ll.import("GMLIB_API", "getEntityFromUniqueId"), getEntityFromUniqueId: ll.import("GMLIB_API", "getEntityFromUniqueId"),
@@ -101,12 +99,12 @@ const GMLIB_API = {
updateOrCreateLanguageFile: ll.import("GMLIB_API", "updateOrCreateLanguageFile"), updateOrCreateLanguageFile: ll.import("GMLIB_API", "updateOrCreateLanguageFile"),
loadLanguagePath: ll.import("GMLIB_API", "loadLanguagePath"), loadLanguagePath: ll.import("GMLIB_API", "loadLanguagePath"),
mergePatchJson: ll.import("GMLIB_API", "mergePatchJson"), mergePatchJson: ll.import("GMLIB_API", "mergePatchJson"),
getXuidByUuid: ll.import("GMLIB_API","getXuidByUuid"), getXuidByUuid: ll.import("GMLIB_API", "getXuidByUuid"),
getNameByUuid: ll.import("GMLIB_API","getNameByUuid"), getNameByUuid: ll.import("GMLIB_API", "getNameByUuid"),
getUuidByXuid: ll.import("GMLIB_API","getUuidByXuid"), getUuidByXuid: ll.import("GMLIB_API", "getUuidByXuid"),
getNameByXuid: ll.import("GMLIB_API","getNameByXuid"), getNameByXuid: ll.import("GMLIB_API", "getNameByXuid"),
getXuidByName: ll.import("GMLIB_API","getXuidByName"), getXuidByName: ll.import("GMLIB_API", "getXuidByName"),
getUuidByName: ll.import("GMLIB_API","getUuidByName"), getUuidByName: ll.import("GMLIB_API", "getUuidByName"),
} }
const FloatingTextList = []; const FloatingTextList = [];
@@ -553,29 +551,7 @@ class Scoreboard {
} }
static getAllTrackedTargets() { static getAllTrackedTargets() {
let result = []; return GMLIB_API.getAllTrackedTargets();
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 // Objectives
@@ -861,28 +837,34 @@ class UserCache {
throw new Error("Static class cannot be instantiated"); throw new Error("Static class cannot be instantiated");
} }
static getXuidByUuid(uuid){ static getXuidByUuid(uuid) {
return GMLIB_API.getXuidByUuid(uuid); let result = GMLIB_API.getXuidByUuid(uuid);
return result == "" ? null : result;
} }
static getUuidByXuid(xuid){ static getUuidByXuid(xuid) {
return GMLIB_API.getUuidByXuid(xuid); let result = GMLIB_API.getUuidByXuid(xuid);
return result == "" ? null : result;
} }
static getNameByUuid(uuid){ static getNameByUuid(uuid) {
return GMLIB_API.getNameByUuid(uuid); let result = GMLIB_API.getNameByUuid(uuid);
return result == "" ? null : result;
} }
static getNameByXuid(xuid){ static getNameByXuid(xuid) {
return GMLIB_API.getNameByXuid(xuid); let result = GMLIB_API.getNameByXuid(xuid);
return result == "" ? null : result;
} }
static getXuidByName(name){ static getXuidByName(name) {
return GMLIB_API.getXuidByName(name); let result = GMLIB_API.getXuidByName(name);
return result == "" ? null : result;
} }
static getUuidByName(name){ static getUuidByName(name) {
return GMLIB_API.getUuidByName(name); let result = GMLIB_API.getUuidByName(name);
return result == "" ? null : result;
} }
}; };
src/CompatibilityApi.cpp
+54 -43
View File
@@ -359,7 +359,7 @@ void Export_Compatibility_API() {
return GMLIB_Scoreboard::getInstance()->resetScore(name); return GMLIB_Scoreboard::getInstance()->resetScore(name);
}); });
RemoteCall::exportAs("GMLIB_API", "addObjective", [](std::string obj) -> bool { RemoteCall::exportAs("GMLIB_API", "addObjective", [](std::string obj) -> bool {
if (auto res = GMLIB_Scoreboard::getInstance()->getInstance()->addObjective(obj)) { if (auto res = GMLIB_Scoreboard::getInstance()->addObjective(obj)) {
return true; return true;
} }
return false; return false;
@@ -368,66 +368,67 @@ void Export_Compatibility_API() {
"GMLIB_API", "GMLIB_API",
"addObjectiveWithDisplayName", "addObjectiveWithDisplayName",
[](std::string obj, std::string displayName) -> bool { [](std::string obj, std::string displayName) -> bool {
if (auto res = GMLIB_Scoreboard::getInstance()->getInstance()->addObjective(obj, displayName)) { if (auto res = GMLIB_Scoreboard::getInstance()->addObjective(obj, displayName)) {
return true; return true;
} }
return false; return false;
} }
); );
RemoteCall::exportAs("GMLIB_API", "getDisplayName", [](std::string obj) -> std::string { RemoteCall::exportAs("GMLIB_API", "getDisplayName", [](std::string obj) -> std::string {
if (auto result = GMLIB_Scoreboard::getInstance()->getInstance()->getObjectiveDisplayName(obj)) { if (auto result = GMLIB_Scoreboard::getInstance()->getObjectiveDisplayName(obj)) {
return result.value(); return result.value();
} }
return ""; return "";
}); });
RemoteCall::exportAs("GMLIB_API", "setDisplayName", [](std::string obj, std::string displayName) -> bool { RemoteCall::exportAs("GMLIB_API", "setDisplayName", [](std::string obj, std::string displayName) -> bool {
return GMLIB_Scoreboard::getInstance()->getInstance()->setObjectiveDisplayName(obj, displayName); return GMLIB_Scoreboard::getInstance()->setObjectiveDisplayName(obj, displayName);
}); });
RemoteCall::exportAs("GMLIB_API", "removeObjective", [](std::string obj) -> bool { RemoteCall::exportAs("GMLIB_API", "removeObjective", [](std::string obj) -> bool {
return GMLIB_Scoreboard::getInstance()->getInstance()->removeObjective(obj); return GMLIB_Scoreboard::getInstance()->removeObjective(obj);
}); });
RemoteCall::exportAs("GMLIB_API", "setDisplayObjective", [](std::string obj, std::string slot, int order) -> void { RemoteCall::exportAs("GMLIB_API", "setDisplayObjective", [](std::string obj, std::string slot, int order) -> void {
return GMLIB_Scoreboard::getInstance()->getInstance()->setObjectiveDisplay( return GMLIB_Scoreboard::getInstance()->setObjectiveDisplay(obj, slot, (ObjectiveSortOrder)order);
obj,
slot,
(ObjectiveSortOrder)order
);
}); });
RemoteCall::exportAs("GMLIB_API", "clearDisplayObjective", [](std::string slot) -> void { RemoteCall::exportAs("GMLIB_API", "clearDisplayObjective", [](std::string slot) -> void {
return GMLIB_Scoreboard::getInstance()->getInstance()->clearObjectiveDisplay(slot); return GMLIB_Scoreboard::getInstance()->clearObjectiveDisplay(slot);
}); });
RemoteCall::exportAs("GMLIB_API", "getAllObjectives", []() -> std::vector<std::string> { RemoteCall::exportAs("GMLIB_API", "getAllObjectives", []() -> std::vector<std::string> {
auto objs = GMLIB_Scoreboard::getInstance()->getInstance()->getObjectives(); auto objs = GMLIB_Scoreboard::getInstance()->getObjectives();
std::vector<std::string> result; std::vector<std::string> result;
for (auto obj : objs) { for (auto obj : objs) {
result.push_back(obj->getName()); result.push_back(obj->getName());
} }
return result; return result;
}); });
RemoteCall::exportAs("GMLIB_API", "getAllScoreboardPlayers", []() -> std::vector<std::string> { RemoteCall::exportAs(
auto uuids = GMLIB_Scoreboard::getInstance()->getInstance()->getAllPlayerUuids(); "GMLIB_API",
std::vector<std::string> result; "getAllTrackedTargets",
for (auto& uuid : uuids) { []() -> std::vector<std::unordered_map<std::string, std::string>> {
result.push_back(uuid.asString()); std::vector<std::unordered_map<std::string, std::string>> result;
auto uuids = GMLIB_Scoreboard::getInstance()->getAllPlayerUuids();
for (auto uuid : uuids) {
std::unordered_map<std::string, std::string> data;
data["Type"] = "Player";
data["Uuid"] = uuid.asString();
result.push_back(data);
}
auto names = GMLIB_Scoreboard::getInstance()->getAllFakePlayers();
for (auto name : names) {
std::unordered_map<std::string, std::string> data;
data["Type"] = "FakePlayer";
data["Name"] = name;
result.push_back(data);
}
auto uniqueIds = GMLIB_Scoreboard::getInstance()->getAllEntities();
for (auto uniqueId : uniqueIds) {
std::unordered_map<std::string, std::string> data;
data["Type"] = "Entity";
data["UniqueId"] = std::to_string(uniqueId.id);
result.push_back(data);
}
return result;
} }
return result; );
});
RemoteCall::exportAs("GMLIB_API", "getAllScoreboardFakePlayers", []() -> std::vector<std::string> {
auto names = GMLIB_Scoreboard::getInstance()->getInstance()->getAllFakePlayers();
std::vector<std::string> result;
for (auto name : names) {
result.push_back(name);
}
return result;
});
RemoteCall::exportAs("GMLIB_API", "getAllScoreboardEntities", []() -> std::vector<std::string> {
auto auids = GMLIB_Scoreboard::getInstance()->getInstance()->getAllEntities();
std::vector<std::string> result;
for (auto auid : auids) {
result.push_back(std::to_string(auid.id));
}
return result;
});
RemoteCall::exportAs("GMLIB_API", "getPlayerFromUuid", [](std::string uuid) -> Player* { RemoteCall::exportAs("GMLIB_API", "getPlayerFromUuid", [](std::string uuid) -> Player* {
auto uid = mce::UUID::fromString(uuid); auto uid = mce::UUID::fromString(uuid);
return ll::service::getLevel()->getPlayer(uuid); return ll::service::getLevel()->getPlayer(uuid);
@@ -470,23 +471,33 @@ void Export_Compatibility_API() {
return oldData.dump(); return oldData.dump();
}); });
RemoteCall::exportAs("GMLIB_API", "getXuidByUuid", [](std::string uuid) -> std::string { RemoteCall::exportAs("GMLIB_API", "getXuidByUuid", [](std::string uuid) -> std::string {
auto uid = mce::UUID::fromString(uuid); auto uid = mce::UUID::fromString(uuid);
return GMLIB::UserCache::getXuidByUuid(uid).value(); auto result = GMLIB::UserCache::getXuidByUuid(uid);
return result ? result.value() : "";
}); });
RemoteCall::exportAs("GMLIB_API", "getNameByUuid", [](std::string uuid) -> std::string { RemoteCall::exportAs("GMLIB_API", "getNameByUuid", [](std::string uuid) -> std::string {
auto uid = mce::UUID::fromString(uuid); auto uid = mce::UUID::fromString(uuid);
return GMLIB::UserCache::getNameByUuid(uid).value(); auto result = GMLIB::UserCache::getNameByUuid(uid);
return result ? result.value() : "";
}); });
RemoteCall::exportAs("GMLIB_API", "getUuidByXuid", [](std::string xuid) -> std::string { RemoteCall::exportAs("GMLIB_API", "getUuidByXuid", [](std::string xuid) -> std::string {
return GMLIB::UserCache::getUuidByXuid(xuid).value().asString(); auto result = GMLIB::UserCache::getUuidByXuid(xuid);
return result ? result.value().asString() : "";
}); });
RemoteCall::exportAs("GMLIB_API", "getNameByXuid", [](std::string xuid) -> std::string { RemoteCall::exportAs("GMLIB_API", "getNameByXuid", [](std::string xuid) -> std::string {
return GMLIB::UserCache::getNameByXuid(xuid).value(); auto result = GMLIB::UserCache::getNameByXuid(xuid);
return result ? result.value() : "";
}); });
RemoteCall::exportAs("GMLIB_API", "getXuidByName", [](std::string name) -> std::string { RemoteCall::exportAs("GMLIB_API", "getXuidByName", [](std::string name) -> std::string {
return GMLIB::UserCache::getXuidByName(name).value(); auto result = GMLIB::UserCache::getXuidByName(name);
return result ? result.value() : "";
}); });
RemoteCall::exportAs("GMLIB_API", "getUuidByName", [](std::string name) -> std::string { RemoteCall::exportAs("GMLIB_API", "getUuidByName", [](std::string name) -> std::string {
return GMLIB::UserCache::getUuidByName(name).value().asString(); auto result = GMLIB::UserCache::getUuidByName(name);
return result ? result.value().asString() : "";
});
RemoteCall::exportAs("GMLIB_API", "getUuidByName", [](std::string name) -> std::string {
auto result = GMLIB::UserCache::getUuidByName(name);
return result ? result.value().asString() : "";
}); });
} }