refactor: remove some shit

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
+28 -46
View File
@@ -84,9 +84,7 @@ const GMLIB_API = {
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"),
getAllTrackedTargets: ll.import("GMLIB_API", "getAllTrackedTargets"),
getPlayerFromUuid: ll.import("GMLIB_API", "getPlayerFromUuid"),
getPlayerFromUniqueId: ll.import("GMLIB_API", "getPlayerFromUniqueId"),
getEntityFromUniqueId: ll.import("GMLIB_API", "getEntityFromUniqueId"),
@@ -101,12 +99,12 @@ const GMLIB_API = {
updateOrCreateLanguageFile: ll.import("GMLIB_API", "updateOrCreateLanguageFile"),
loadLanguagePath: ll.import("GMLIB_API", "loadLanguagePath"),
mergePatchJson: ll.import("GMLIB_API", "mergePatchJson"),
getXuidByUuid: ll.import("GMLIB_API","getXuidByUuid"),
getNameByUuid: ll.import("GMLIB_API","getNameByUuid"),
getUuidByXuid: ll.import("GMLIB_API","getUuidByXuid"),
getNameByXuid: ll.import("GMLIB_API","getNameByXuid"),
getXuidByName: ll.import("GMLIB_API","getXuidByName"),
getUuidByName: ll.import("GMLIB_API","getUuidByName"),
getXuidByUuid: ll.import("GMLIB_API", "getXuidByUuid"),
getNameByUuid: ll.import("GMLIB_API", "getNameByUuid"),
getUuidByXuid: ll.import("GMLIB_API", "getUuidByXuid"),
getNameByXuid: ll.import("GMLIB_API", "getNameByXuid"),
getXuidByName: ll.import("GMLIB_API", "getXuidByName"),
getUuidByName: ll.import("GMLIB_API", "getUuidByName"),
}
const FloatingTextList = [];
@@ -553,29 +551,7 @@ class Scoreboard {
}
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;
return GMLIB_API.getAllTrackedTargets();
}
// Objectives
@@ -861,28 +837,34 @@ class UserCache {
throw new Error("Static class cannot be instantiated");
}
static getXuidByUuid(uuid){
return GMLIB_API.getXuidByUuid(uuid);
}
static getUuidByXuid(xuid){
return GMLIB_API.getUuidByXuid(xuid);
static getXuidByUuid(uuid) {
let result = GMLIB_API.getXuidByUuid(uuid);
return result == "" ? null : result;
}
static getNameByUuid(uuid){
return GMLIB_API.getNameByUuid(uuid);
static getUuidByXuid(xuid) {
let result = GMLIB_API.getUuidByXuid(xuid);
return result == "" ? null : result;
}
static getNameByXuid(xuid){
return GMLIB_API.getNameByXuid(xuid);
static getNameByUuid(uuid) {
let result = GMLIB_API.getNameByUuid(uuid);
return result == "" ? null : result;
}
static getXuidByName(name){
return GMLIB_API.getXuidByName(name);
static getNameByXuid(xuid) {
let result = GMLIB_API.getNameByXuid(xuid);
return result == "" ? null : result;
}
static getUuidByName(name){
return GMLIB_API.getUuidByName(name);
static getXuidByName(name) {
let result = GMLIB_API.getXuidByName(name);
return result == "" ? null : result;
}
static getUuidByName(name) {
let result = GMLIB_API.getUuidByName(name);
return result == "" ? null : result;
}
};