Compare commits

...

25 Commits

18 changed files with 603 additions and 306 deletions
-4
View File
@@ -9,10 +9,6 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
submodules: recursive
- uses: actions/checkout@v4
- uses: xmake-io/github-action-setup-xmake@v1
-4
View File
@@ -9,10 +9,6 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
submodules: recursive
- uses: actions/checkout@v4
- uses: xmake-io/github-action-setup-xmake@v1
+2 -1
View File
@@ -14,4 +14,5 @@ CMakeSettings.json
build/
/.xmake
/CMakeLists.txt
/bin
/bin
.cache/clangd/index
-3
View File
@@ -1,3 +0,0 @@
[submodule "SDK-GMLIB"]
path = SDK-GMLIB
url = https://github.com/GroupMountain/SDK-GMLIB.git
+2 -3
View File
@@ -5,6 +5,5 @@ Legacy RemoteCall API for GMLIB. Only for legacy LSE plugin compatibility.
- 本模块是 `GMLIB``Legacy RemoteCall API` 模块,是为LL2的LLSE插件的兼容性保留。
- 通过本模块,可以使LSE插件调用 `GMLIB` 内部的API。
# 注意事项
- 本模块仅为兼容性保留模块,仅保留过去的接口以保留兼容性。
- 本模块不会提供 `GMLIB` 在迁移到 `LeviLamina` 后新开发的接口。
# 开发文档
- https://groupmountain.github.io/Documentation/
Submodule SDK-GMLIB deleted from 7206bf0c10
+135 -25
View File
@@ -15,6 +15,7 @@ const GMLIB_API = {
getPlayerNbt: ll.import("GMLIB_API", "getPlayerNbt"),
setPlayerNbt: ll.import("GMLIB_API", "setPlayerNbt"),
setPlayerNbtTags: ll.import("GMLIB_API", "setPlayerNbtTags"),
deletePlayerNbt: ll.import("GMLIB_API", "deletePlayerNbt"),
resourcePackTranslate: ll.import("GMLIB_API", "resourcePackTranslate"),
resourcePackDefaultTranslate: ll.import("GMLIB_API", "resourcePackDefaultTranslate"),
getResourcePackI18nLanguage: ll.import("GMLIB_API", "getResourcePackI18nLanguage"),
@@ -80,6 +81,7 @@ const GMLIB_API = {
setDisplayObjective: ll.import("GMLIB_API", "setDisplayObjective"),
clearDisplayObjective: ll.import("GMLIB_API", "clearDisplayObjective"),
getAllObjectives: ll.import("GMLIB_API", "getAllObjectives"),
getAllTrackedTargets: ll.import("GMLIB_API", "getAllTrackedTargets"),
getAllScoreboardPlayers: ll.import("GMLIB_API", "getAllScoreboardPlayers"),
getAllScoreboardFakePlayers: ll.import("GMLIB_API", "getAllScoreboardFakePlayers"),
getAllScoreboardEntities: ll.import("GMLIB_API", "getAllScoreboardEntities"),
@@ -96,7 +98,24 @@ const GMLIB_API = {
loadLanguage: ll.import("GMLIB_API", "loadLanguage"),
updateOrCreateLanguageFile: ll.import("GMLIB_API", "updateOrCreateLanguageFile"),
loadLanguagePath: ll.import("GMLIB_API", "loadLanguagePath"),
mergePatchJson: ll.import("GMLIB_API", "mergePatchJson")
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"),
getAllPlayerInfo: ll.import("GMLIB_API", "getAllPlayerInfo"),
getBlockRuntimeId: ll.import("GMLIB_API", "getBlockRuntimeId"),
addFakeList: ll.import("GMLIB_API", "addFakeList"),
removeFakeList: ll.import("GMLIB_API", "removeFakeList"),
removeAllFakeLists: ll.import("GMLIB_API", "removeAllFakeList"),
setFixI18nEnabled: ll.import("GMLib_ModAPI", "setFixI18nEnabled"),
getBlockTranslateKey: ll.import("GMLIB_API", "getBlockTranslateKey"),
getItemTranslateKey: ll.import("GMLIB_API", "getItemTranslateKey"),
getEntityTranslateKey: ll.import("GMLIB_API", "getEntityTranslateKey"),
readNbtFromFile: ll.import("GMLIB_API", "readNbtFromFile"),
saveNbtToFile: ll.import("GMLIB_API", "saveNbtToFile")
}
const FloatingTextList = [];
@@ -294,6 +313,10 @@ class Minecraft {
return GMLIB_API.setPlayerNbtTags(uuid, nbt, tags);
}
static deletePlayerNbt(uuid) {
return GMLIB_API.deletePlayerNbt(uuid);
}
static getPlayerPosition(uuid) {
let pos = GMLIB_API.getPlayerPosition(uuid);
if (pos.dimid == -1) {
@@ -377,6 +400,46 @@ class Minecraft {
static resourcePackTranslate(key, params = []) {
return I18nAPI.get(key, params);
}
static getPlayerFromUuid(uuid) {
return GMLIB_API.getPlayerFromUuid(uuid);
}
static getPlayerFromUniqueId(uniqueId) {
return GMLIB_API.getPlayerFromUniqueId(uniqueId);
}
static getEntityFromUniqueId(uniqueId) {
return GMLIB_API.getFromUniqueId(uniqueId);
}
static getBlockRuntimeId(block) {
return GMLIB_API.getBlockRuntimeId(block);
}
static addFakeList(name, xuid) {
return GMLIB_API.addFakeList(xuid, name);
}
static removeFakeList(nameOrXuid) {
return GMLIB_API.removeFakeList(nameOrXuid);
}
static removeAllFakeLists() {
return GMLIB_API.removeAllFakeLists();
}
static setFixI18nEnabled() {
GMLIB_API.setFixI18nEnabled();
}
static saveNbtToFile(path, nbt, isBinary = true) {
return GMLIB_API.saveNbtToFile(path, nbt, isBinary);
}
static readNbtFromFile(path, isBinary = true) {
return GMLIB_API.readNbtFromFile(path, isBinary);
}
}
class Recipes {
@@ -527,29 +590,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
@@ -830,6 +871,50 @@ class I18nAPI {
}
};
class UserCache {
constructor() {
throw new Error("Static class cannot be instantiated");
}
static getXuidByUuid(uuid) {
let result = GMLIB_API.getXuidByUuid(uuid);
return result == "" ? null : result;
}
static getUuidByXuid(xuid) {
let result = GMLIB_API.getUuidByXuid(xuid);
return result == "" ? null : result;
}
static getNameByUuid(uuid) {
let result = GMLIB_API.getNameByUuid(uuid);
return result == "" ? null : result;
}
static getNameByXuid(xuid) {
let result = GMLIB_API.getNameByXuid(xuid);
return result == "" ? null : result;
}
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;
}
static getPlayerInfo(playerIdentifier) {
return GMLIB_API.getAllPlayerInfo().find(Info => Object.keys(Info).some(InfoKey => Info[InfoKey] === playerIdentifier));
}
static getAllPlayerInfo() {
return GMLIB_API.getAllPlayerInfo();
}
};
LLSE_Player.prototype.toEntity = function () {
return GMLIB_API.PlayerToEntity(this);
}
@@ -854,6 +939,30 @@ LLSE_Entity.prototype.throwEntity = function (proj, speed = 2, offset = 3) {
return GMLIB_API.throwEntity(this, proj, speed, offset);
}
LLSE_Entity.prototype.getTranslateKey = function () {
return GMLIB_API.getEntityTranslateKey(this);
}
LLSE_Entity.prototype.getTranslateName = function (language) {
return I18nAPI.get(this.getTranslateKey(), [], language);
}
LLSE_Block.prototype.getTranslateKey = function () {
return GMLIB_API.getBlockTranslateKey(this);
}
LLSE_Block.prototype.getTranslateName = function (language) {
return I18nAPI.get(this.getTranslateKey(), [], language);
}
LLSE_Item.prototype.getTranslateKey = function () {
return GMLIB_API.getItemTranslateKey(this);
}
LLSE_Item.prototype.getTranslateName = function (language) {
return I18nAPI.get(this.getTranslateKey(), [], language);
}
module.exports = {
StaticFloatingText,
DynamicFloatingText,
@@ -865,5 +974,6 @@ module.exports = {
JsonLanguage,
JsonI18n,
Version,
I18nAPI
I18nAPI,
UserCache
};
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "${pluginName}",
"entry": "${pluginFile}",
"version": "0.12.5",
"version": "0.12.7",
"author": "GroupMountain",
"type": "native",
"dependencies": [
+333 -168
View File
@@ -6,7 +6,7 @@ bool isInteger(const std::string& str) {
return std::regex_match(str, pattern);
}
ActorUniqueID parseScriptUniqueID(std::string uniqueId) {
ActorUniqueID parseScriptUniqueID(std::string const& uniqueId) {
if (!isInteger(uniqueId)) {
return ActorUniqueID::INVALID_ID;
}
@@ -14,14 +14,14 @@ ActorUniqueID parseScriptUniqueID(std::string uniqueId) {
}
void Export_Compatibility_API() {
RemoteCall::exportAs("GMLIB_API", "unregisterRecipe", [](std::string id) -> bool {
RemoteCall::exportAs("GMLIB_API", "unregisterRecipe", [](std::string const& id) -> bool {
auto level = GMLIB_Level::getInstance();
if (!level) {
return false;
}
return GMLIB::Mod::CustomRecipe::unregisterRecipe(id);
});
RemoteCall::exportAs("GMLIB_API", "setCustomPackPath", [](std::string path) -> void {
RemoteCall::exportAs("GMLIB_API", "setCustomPackPath", [](std::string const& path) -> void {
GMLIB::Mod::CustomPacks::addCustomPackPath(path);
});
RemoteCall::exportAs("GMLIB_API", "getServerMspt", []() -> float {
@@ -53,27 +53,35 @@ void Export_Compatibility_API() {
}
return result;
});
RemoteCall::exportAs("GMLIB_API", "getPlayerNbt", [](std::string uuid) -> std::unique_ptr<CompoundTag> {
RemoteCall::exportAs("GMLIB_API", "getPlayerNbt", [](std::string const& uuid) -> std::unique_ptr<CompoundTag> {
auto uid = mce::UUID::fromString(uuid);
return std::move(GMLIB_Player::getPlayerNbt(uid));
});
RemoteCall::exportAs("GMLIB_API", "setPlayerNbt", [](std::string uuid, CompoundTag* nbt, bool forceCreate) -> bool {
auto uid = mce::UUID::fromString(uuid);
return GMLIB_Player::setPlayerNbt(uid, *nbt, forceCreate);
});
RemoteCall::exportAs(
"GMLIB_API",
"setPlayerNbt",
[](std::string const& uuid, CompoundTag* nbt, bool forceCreate) -> bool {
auto uid = mce::UUID::fromString(uuid);
return GMLIB_Player::setPlayerNbt(uid, *nbt, forceCreate);
}
);
RemoteCall::exportAs(
"GMLIB_API",
"setPlayerNbtTags",
[](std::string uuid, CompoundTag* nbt, std::vector<std::string> tags) -> bool {
[](std::string const& uuid, CompoundTag* nbt, std::vector<std::string> tags) -> bool {
auto uid = mce::UUID::fromString(uuid);
return GMLIB_Player::setPlayerNbtTags(uid, *nbt, tags);
}
);
RemoteCall::exportAs("GMLIB_API", "deletePlayerNbt", [](std::string const& uuid) -> bool {
auto uid = mce::UUID::fromString(uuid);
return GMLIB_Player::deletePlayerNbt(uid);
});
RemoteCall::exportAs("GMLIB_API", "getAllExperiments", []() -> std::vector<int> {
auto map = GMLIB_Level::getAllExperiments();
auto list = GMLIB_Level::getAllExperiments();
std::vector<int> result;
for (auto& key : map) {
result.push_back(key.first);
for (auto& key : list) {
result.push_back((int)key);
}
return result;
});
@@ -87,66 +95,60 @@ void Export_Compatibility_API() {
RemoteCall::exportAs(
"GMLIB_API",
"createFloatingText",
[](std::pair<Vec3, int> pos, std::string text, bool papi) -> int {
auto ft = new GMLIB::Server::StaticFloatingText(text, pos.first, pos.second, papi);
[](std::pair<Vec3, int> pos, std::string const& text, bool papi) -> int {
auto ft = std::make_shared<GMLIB::Server::StaticFloatingText>(text, pos.first, pos.second, papi);
GMLIB::Server::FloatingTextManager::getInstance().add(ft);
return ft->getRuntimeID();
}
);
RemoteCall::exportAs("GMLIB_API", "setFloatingTextData", [](int id, std::string text) -> bool {
auto ft = GMLIB::Server::FloatingText::getFloatingText(id);
if (ft) {
RemoteCall::exportAs("GMLIB_API", "setFloatingTextData", [](int id, std::string const& text) -> bool {
if (auto ft = GMLIB::Server::FloatingTextManager::getInstance().getFloatingText(id)) {
ft->setText(text);
return true;
}
return false;
});
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 {
auto ft = GMLIB::Server::FloatingText::getFloatingText(id);
if (ft) {
ft->sendToClient(*pl);
if (auto ft = GMLIB::Server::FloatingTextManager::getInstance().getFloatingText(id)) {
ft->sendTo(*pl);
return true;
}
return false;
});
RemoteCall::exportAs("GMLIB_API", "sendFloatingText", [](int id) -> bool {
auto ft = GMLIB::Server::FloatingText::getFloatingText(id);
if (ft) {
ft->sendToAllClients();
if (auto ft = GMLIB::Server::FloatingTextManager::getInstance().getFloatingText(id)) {
ft->sendToClients();
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);
if (auto ft = GMLIB::Server::FloatingTextManager::getInstance().getFloatingText(id)) {
ft->removeFrom(*pl);
return true;
}
return false;
});
RemoteCall::exportAs("GMLIB_API", "removeFloatingText", [](int id) -> bool {
auto ft = GMLIB::Server::FloatingText::getFloatingText(id);
if (ft) {
ft->removeFromAllClients();
if (auto ft = GMLIB::Server::FloatingTextManager::getInstance().getFloatingText(id)) {
ft->removeFromClients();
return true;
}
return false;
});
RemoteCall::exportAs("GMLIB_API", "updateClientFloatingTextData", [](int id, Player* pl) -> bool {
auto ft = GMLIB::Server::FloatingText::getFloatingText(id);
if (ft) {
ft->updateClient(*pl);
if (auto ft = GMLIB::Server::FloatingTextManager::getInstance().getFloatingText(id)) {
ft->update(*pl);
return true;
}
return false;
});
RemoteCall::exportAs("GMLIB_API", "updateAllClientsFloatingTextData", [](int id) -> bool {
auto ft = GMLIB::Server::FloatingText::getFloatingText(id);
if (ft) {
ft->updateAllClients();
if (auto ft = GMLIB::Server::FloatingTextManager::getInstance().getFloatingText(id)) {
ft->updateClients();
return true;
}
return false;
@@ -162,16 +164,16 @@ void Export_Compatibility_API() {
RemoteCall::exportAs(
"GMLIB_API",
"resourcePackDefaultTranslate",
[](std::string key, std::vector<std::string> params) -> std::string { return I18nAPI::get(key, params); }
[](std::string const& key, std::vector<std::string> params) -> std::string { return I18nAPI::get(key, params); }
);
RemoteCall::exportAs(
"GMLIB_API",
"resourcePackTranslate",
[](std::string key, std::vector<std::string> params, std::string code) -> std::string {
[](std::string const& key, std::vector<std::string> params, std::string const& code) -> std::string {
return I18nAPI::get(key, params, code);
}
);
RemoteCall::exportAs("GMLIB_API", "chooseResourcePackI18nLanguage", [](std::string code) -> void {
RemoteCall::exportAs("GMLIB_API", "chooseResourcePackI18nLanguage", [](std::string const& code) -> void {
if (GMLIB_Level::getInstance()) {
I18nAPI::chooseLanguage(code);
}
@@ -188,7 +190,7 @@ void Export_Compatibility_API() {
}
return {};
});
RemoteCall::exportAs("GMLIB_API", "loadLanguage", [](std::string code, std::string lang) -> void {
RemoteCall::exportAs("GMLIB_API", "loadLanguage", [](std::string const& code, std::string const& lang) -> void {
if (GMLIB_Level::getInstance()) {
I18nAPI::loadLanguage(code, lang);
}
@@ -196,18 +198,19 @@ void Export_Compatibility_API() {
RemoteCall::exportAs(
"GMLIB_API",
"updateOrCreateLanguageFile",
[](std::string code, std::string lang, std::string path) -> void {
[](std::string const& code, std::unordered_map<std::string, std::string> lang, std::string const& path
) -> void {
if (GMLIB_Level::getInstance()) {
I18nAPI::updateOrCreateLanguageFile(path, code, lang);
}
}
);
RemoteCall::exportAs("GMLIB_API", "loadLanguagePath", [](std::string path) -> void {
RemoteCall::exportAs("GMLIB_API", "loadLanguagePath", [](std::string const& path) -> void {
if (GMLIB_Level::getInstance()) {
I18nAPI::loadLanguagesFromDirectory(path);
}
});
RemoteCall::exportAs("GMLIB_API", "getPlayerPosition", [](std::string uuid) -> std::pair<BlockPos, int> {
RemoteCall::exportAs("GMLIB_API", "getPlayerPosition", [](std::string const& uuid) -> std::pair<BlockPos, int> {
auto uid = mce::UUID::fromString(uuid);
auto pos = GMLIB_Player::getPlayerPosition(uid);
if (pos.has_value()) {
@@ -218,78 +221,102 @@ void Export_Compatibility_API() {
-1
};
});
RemoteCall::exportAs("GMLIB_API", "setPlayerPosition", [](std::string uuid, std::pair<BlockPos, int> 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 {
RemoteCall::exportAs(
"GMLIB_API",
"setPlayerPosition",
[](std::string const& uuid, std::pair<BlockPos, int> pos) -> bool {
auto uid = mce::UUID::fromString(uuid);
return GMLIB_Player::setPlayerPosition(uid, pos.first, pos.second);
}
);
RemoteCall::exportAs("GMLIB_API", "playerHasScore", [](std::string const& uuid, std::string const& 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 {
RemoteCall::exportAs("GMLIB_API", "getPlayerScore", [](std::string const& uuid, std::string const& 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",
"addPlayerScore",
[](std::string const& uuid, std::string const& 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 const& uuid, std::string const& 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 const& uuid, std::string const& 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 const& uuid, std::string const& obj) -> bool {
auto uid = mce::UUID::fromString(uuid);
return GMLIB_Player::resetPlayerScore(uid, obj);
});
RemoteCall::exportAs("GMLIB_API", "resetPlayerScores", [](std::string const& uuid) -> bool {
auto uid = mce::UUID::fromString(uuid);
return GMLIB_Player::resetPlayerScore(uid);
});
RemoteCall::exportAs(
"GMLIB_API",
"entityHasScore",
[](std::string const& uniqueId, std::string const& 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 const& uniqueId, std::string const& 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 const& uniqueId, std::string const& 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 {
[](std::string const& uniqueId, std::string const& obj, int value) -> bool {
auto auid = parseScriptUniqueID(uniqueId);
if (auto res =
GMLIB_Scoreboard::getInstance()->setScore(obj, auid, value, PlayerScoreSetFunction::Subtract)) {
@@ -298,43 +325,59 @@ void Export_Compatibility_API() {
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;
RemoteCall::exportAs(
"GMLIB_API",
"setEntityScore",
[](std::string const& uniqueId, std::string const& obj, int value) -> bool {
auto auid = parseScriptUniqueID(uniqueId);
if (auto res = GMLIB_Scoreboard::getInstance()->setScore(obj, auid, value)) {
return true;
}
return false;
}
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 {
);
RemoteCall::exportAs(
"GMLIB_API",
"resetEntityScore",
[](std::string const& uniqueId, std::string const& obj) -> bool {
auto auid = parseScriptUniqueID(uniqueId);
return GMLIB_Scoreboard::getInstance()->resetScore(obj, auid);
}
);
RemoteCall::exportAs("GMLIB_API", "resetEntityScores", [](std::string const& uniqueId) -> bool {
auto auid = parseScriptUniqueID(uniqueId);
return GMLIB_Scoreboard::getInstance()->resetScore(auid);
});
RemoteCall::exportAs("GMLIB_API", "fakePlayerHasScore", [](std::string name, std::string obj) -> bool {
if (auto result = GMLIB_Scoreboard::getInstance()->getScore(obj, name)) {
return true;
RemoteCall::exportAs(
"GMLIB_API",
"fakePlayerHasScore",
[](std::string const& name, std::string const& obj) -> bool {
if (auto result = GMLIB_Scoreboard::getInstance()->getScore(obj, name)) {
return true;
}
return false;
}
return false;
});
RemoteCall::exportAs("GMLIB_API", "getFakePlayerScore", [](std::string name, std::string obj) -> int {
);
RemoteCall::exportAs("GMLIB_API", "getFakePlayerScore", [](std::string const& name, std::string const& 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;
RemoteCall::exportAs(
"GMLIB_API",
"addFakePlayerScore",
[](std::string const& name, std::string const& obj, int value) -> bool {
if (auto res = GMLIB_Scoreboard::getInstance()->setScore(obj, name, value, PlayerScoreSetFunction::Add)) {
return true;
}
return false;
}
return false;
});
);
RemoteCall::exportAs(
"GMLIB_API",
"reduceFakePlayerScore",
[](std::string name, std::string obj, int value) -> bool {
[](std::string const& name, std::string const& obj, int value) -> bool {
if (auto res =
GMLIB_Scoreboard::getInstance()->setScore(obj, name, value, PlayerScoreSetFunction::Subtract)) {
return true;
@@ -342,20 +385,28 @@ void Export_Compatibility_API() {
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;
RemoteCall::exportAs(
"GMLIB_API",
"setFakePlayerScore",
[](std::string const& name, std::string const& obj, int value) -> bool {
if (auto res = GMLIB_Scoreboard::getInstance()->setScore(obj, name, value)) {
return true;
}
return false;
}
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 {
);
RemoteCall::exportAs(
"GMLIB_API",
"resetFakePlayerScore",
[](std::string const& name, std::string const& obj) -> bool {
return GMLIB_Scoreboard::getInstance()->resetScore(obj, name);
}
);
RemoteCall::exportAs("GMLIB_API", "resetFakePlayerScores", [](std::string const& name) -> bool {
return GMLIB_Scoreboard::getInstance()->resetScore(name);
});
RemoteCall::exportAs("GMLIB_API", "addObjective", [](std::string obj) -> bool {
if (auto res = GMLIB_Scoreboard::getInstance()->getInstance()->addObjective(obj)) {
RemoteCall::exportAs("GMLIB_API", "addObjective", [](std::string const& obj) -> bool {
if (auto res = GMLIB_Scoreboard::getInstance()->addObjective(obj)) {
return true;
}
return false;
@@ -363,45 +414,49 @@ void Export_Compatibility_API() {
RemoteCall::exportAs(
"GMLIB_API",
"addObjectiveWithDisplayName",
[](std::string obj, std::string displayName) -> bool {
if (auto res = GMLIB_Scoreboard::getInstance()->getInstance()->addObjective(obj, displayName)) {
[](std::string const& obj, std::string const& displayName) -> bool {
if (auto res = GMLIB_Scoreboard::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)) {
RemoteCall::exportAs("GMLIB_API", "getDisplayName", [](std::string const& obj) -> std::string {
if (auto result = GMLIB_Scoreboard::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",
"setDisplayName",
[](std::string const& obj, std::string const& displayName) -> bool {
return GMLIB_Scoreboard::getInstance()->setObjectiveDisplayName(obj, displayName);
}
);
RemoteCall::exportAs("GMLIB_API", "removeObjective", [](std::string const& obj) -> bool {
return GMLIB_Scoreboard::getInstance()->removeObjective(obj);
});
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",
"setDisplayObjective",
[](std::string const& obj, std::string const& slot, int order) -> void {
return GMLIB_Scoreboard::getInstance()->setObjectiveDisplay(obj, slot, (ObjectiveSortOrder)order);
}
);
RemoteCall::exportAs("GMLIB_API", "clearDisplayObjective", [](std::string const& slot) -> void {
return GMLIB_Scoreboard::getInstance()->clearObjectiveDisplay(slot);
});
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;
for (auto obj : objs) {
for (auto& obj : objs) {
result.push_back(obj->getName());
}
return result;
});
RemoteCall::exportAs("GMLIB_API", "getAllScoreboardPlayers", []() -> std::vector<std::string> {
auto uuids = GMLIB_Scoreboard::getInstance()->getInstance()->getAllPlayerUuids();
auto uuids = GMLIB_Scoreboard::getInstance()->getAllPlayerUuids();
std::vector<std::string> result;
for (auto& uuid : uuids) {
result.push_back(uuid.asString());
@@ -409,30 +464,59 @@ void Export_Compatibility_API() {
return result;
});
RemoteCall::exportAs("GMLIB_API", "getAllScoreboardFakePlayers", []() -> std::vector<std::string> {
auto names = GMLIB_Scoreboard::getInstance()->getInstance()->getAllFakePlayers();
auto names = GMLIB_Scoreboard::getInstance()->getAllFakePlayers();
std::vector<std::string> result;
for (auto name : names) {
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();
auto uniqueIds = GMLIB_Scoreboard::getInstance()->getAllEntities();
std::vector<std::string> result;
for (auto auid : auids) {
result.push_back(std::to_string(auid.id));
for (auto& uniqueId : uniqueIds) {
result.push_back(std::to_string(uniqueId.id));
}
return result;
});
RemoteCall::exportAs("GMLIB_API", "getPlayerFromUuid", [](std::string uuid) -> Player* {
RemoteCall::exportAs(
"GMLIB_API",
"getAllTrackedTargets",
[]() -> std::vector<std::unordered_map<std::string, std::string>> {
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;
}
);
RemoteCall::exportAs("GMLIB_API", "getPlayerFromUuid", [](std::string const& uuid) -> Player* {
auto uid = mce::UUID::fromString(uuid);
return ll::service::getLevel()->getPlayer(uuid);
});
RemoteCall::exportAs("GMLIB_API", "getPlayerFromUniqueId", [](std::string uniqueId) -> Actor* {
RemoteCall::exportAs("GMLIB_API", "getPlayerFromUniqueId", [](std::string const& uniqueId) -> Actor* {
auto auid = parseScriptUniqueID(uniqueId);
return ll::service::getLevel()->getPlayer(auid);
});
RemoteCall::exportAs("GMLIB_API", "getEntityFromUniqueId", [](std::string uniqueId) -> Actor* {
RemoteCall::exportAs("GMLIB_API", "getEntityFromUniqueId", [](std::string const& uniqueId) -> Actor* {
auto auid = parseScriptUniqueID(uniqueId);
return ll::service::getLevel()->fetchEntity(auid);
});
@@ -459,10 +543,91 @@ void Export_Compatibility_API() {
auto player = (GMLIB_Player*)pl;
player->clearSpawnPoint();
});
RemoteCall::exportAs("GMLIB_API", "mergePatchJson", [](std::string oldJson, std::string patchJson) -> std::string {
auto oldData = nlohmann::ordered_json::parse(oldJson);
auto newData = nlohmann::ordered_json::parse(patchJson);
oldData.merge_patch(newData);
return oldData.dump();
RemoteCall::exportAs(
"GMLIB_API",
"mergePatchJson",
[](std::string const& oldJson, std::string const& patchJson) -> std::string {
auto oldData = nlohmann::ordered_json::parse(oldJson);
auto newData = nlohmann::ordered_json::parse(patchJson);
oldData.merge_patch(newData);
return oldData.dump();
}
);
RemoteCall::exportAs("GMLIB_API", "getXuidByUuid", [](std::string const& uuid) -> std::string {
auto uid = mce::UUID::fromString(uuid);
auto result = GMLIB::UserCache::getXuidByUuid(uid);
return result ? result.value() : "";
});
RemoteCall::exportAs("GMLIB_API", "getNameByUuid", [](std::string const& uuid) -> std::string {
auto uid = mce::UUID::fromString(uuid);
auto result = GMLIB::UserCache::getNameByUuid(uid);
return result ? result.value() : "";
});
RemoteCall::exportAs("GMLIB_API", "getUuidByXuid", [](std::string const& xuid) -> std::string {
auto result = GMLIB::UserCache::getUuidByXuid(xuid);
return result ? result.value().asString() : "";
});
RemoteCall::exportAs("GMLIB_API", "getNameByXuid", [](std::string const& xuid) -> std::string {
auto result = GMLIB::UserCache::getNameByXuid(xuid);
return result ? result.value() : "";
});
RemoteCall::exportAs("GMLIB_API", "getXuidByName", [](std::string const& name) -> std::string {
auto result = GMLIB::UserCache::getXuidByName(name);
return result ? result.value() : "";
});
RemoteCall::exportAs("GMLIB_API", "getUuidByName", [](std::string const& name) -> std::string {
auto result = GMLIB::UserCache::getUuidByName(name);
return result ? result.value().asString() : "";
});
RemoteCall::exportAs("GMLIB_API", "getUuidByName", [](std::string const& name) -> std::string {
auto result = GMLIB::UserCache::getUuidByName(name);
return result ? result.value().asString() : "";
});
RemoteCall::exportAs(
"GMLIB_API",
"getAllPlayerInfo",
[]() -> std::vector<std::unordered_map<std::string, std::string>> {
std::vector<std::unordered_map<std::string, std::string>> result;
GMLIB::UserCache::forEach([&result](const GMLIB::UserCache::UserCacheEntry& entry) {
std::unordered_map<std::string, std::string> info;
info["Name"] = entry.mName;
info["Xuid"] = entry.mXuid;
info["Uuid"] = entry.mUuid.asString();
result.push_back(info);
});
return result;
}
);
RemoteCall::exportAs("GMLIB_API", "getBlockRuntimeId", [](std::string const& blockName) -> uint {
if (auto block = Block::tryGetFromRegistry(blockName)) {
return block->getRuntimeId();
}
return 0;
});
RemoteCall::exportAs("GMLIB_API", "getBlockTranslateKey", [](Block const* block) -> std::string {
return block->buildDescriptionId();
});
RemoteCall::exportAs("GMLIB_API", "getItemTranslateKey", [](ItemStack* item) -> std::string {
return item->getDescriptionId();
});
RemoteCall::exportAs("GMLIB_API", "getEntityTranslateKey", [](Actor* entity) -> std::string {
return entity->getEntityLocNameString();
});
RemoteCall::exportAs(
"GMLIB_API",
"readNbtFromFile",
[](std::string const& path, bool isBinary) -> std::unique_ptr<CompoundTag> {
if (auto nbt = GMLIB_CompoundTag::readFromFile(path, isBinary)) {
return std::make_unique<CompoundTag>(nbt.value());
}
return nullptr;
}
);
RemoteCall::exportAs(
"GMLIB_API",
"saveNbtToFile",
[](std::string const& path, CompoundTag* nbt, bool isBinary) -> bool {
return GMLIB_CompoundTag::saveToFile(path, *nbt, isBinary);
}
);
}
+9 -9
View File
@@ -3,14 +3,14 @@
ll::Logger logger(PLUGIN_NAME);
namespace GMLIB_LegacyRemoteCallApi {
namespace GMLIB {
std::unique_ptr<LRCA>& LRCA::getInstance() {
static std::unique_ptr<LRCA> instance;
std::unique_ptr<LegacyRemoteCallApi>& LegacyRemoteCallApi::getInstance() {
static std::unique_ptr<LegacyRemoteCallApi> instance;
return instance;
}
bool LRCA::load() {
bool LegacyRemoteCallApi::load() {
Export_Legacy_GMLib_ModAPI();
Export_Legacy_GMLib_ServerAPI();
Export_Compatibility_API();
@@ -20,17 +20,17 @@ bool LRCA::load() {
logger.info(
"Loaded Version: {} with {}",
fmt::format(fg(fmt::color::pink), "GMLIB-" + GMLIB::Version::getLibVersionString()),
fmt::format(fg(fmt::color::light_green), "GMLIB-LegacyRemoteCallApi-"+LIB_VERSION.asString())
fmt::format(fg(fmt::color::light_green), "GMLIB-LegacyRemoteCallApi-" + LIB_VERSION.asString())
);
logger.info("Author: GroupMountain");
logger.info("Repository: https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi");
return true;
}
bool LRCA::enable() { return true; }
bool LegacyRemoteCallApi::enable() { return true; }
bool LRCA::disable() { return true; }
bool LegacyRemoteCallApi::disable() { return true; }
} // namespace GMLIB_LegacyRemoteCallApi
} // namespace GMLIB
LL_REGISTER_PLUGIN(GMLIB_LegacyRemoteCallApi::LRCA, GMLIB_LegacyRemoteCallApi::LRCA::getInstance());
LL_REGISTER_PLUGIN(GMLIB::LegacyRemoteCallApi, GMLIB::LegacyRemoteCallApi::getInstance());
+5 -5
View File
@@ -2,14 +2,14 @@
#include <ll/api/plugin/NativePlugin.h>
#include <ll/api/plugin/RegisterHelper.h>
namespace GMLIB_LegacyRemoteCallApi {
namespace GMLIB {
class LRCA {
class LegacyRemoteCallApi {
public:
static std::unique_ptr<LRCA>& getInstance();
static std::unique_ptr<LegacyRemoteCallApi>& getInstance();
LRCA(ll::plugin::NativePlugin& self) : mSelf(self) {}
LegacyRemoteCallApi(ll::plugin::NativePlugin& self) : mSelf(self) {}
[[nodiscard]] ll::plugin::NativePlugin& getSelf() const { return mSelf; }
@@ -30,4 +30,4 @@ private:
ll::plugin::NativePlugin& mSelf;
};
} // namespace GMLIB_LegacyRemoteCallApi
} // namespace GMLIB
+12 -10
View File
@@ -6,15 +6,16 @@ void Export_Event_API() {
RemoteCall::exportAs(
"GMLIB_API",
"callCustomEvent",
[eventBus](std::string eventName, std::string eventId) -> bool {
[eventBus](std::string const& eventName, std::string const& eventId) -> bool {
if (RemoteCall::hasFunc(eventName, eventId)) {
switch (doHash(eventName)) {
case doHash("onClientLogin"): {
auto Call = RemoteCall::importAs<
bool(std::string realName, std::string uuid, std::string serverXuid, std::string clientXuid)>(
eventName,
eventId
);
auto Call = RemoteCall::importAs<bool(
std::string const& realName,
std::string const& uuid,
std::string const& serverXuid,
std::string const& clientXuid
)>(eventName, eventId);
eventBus->emplaceListener<GMLIB::Event::PacketEvent::ClientLoginAfterEvent>(
[Call](GMLIB::Event::PacketEvent::ClientLoginAfterEvent& ev) {
try {
@@ -136,10 +137,11 @@ void Export_Event_API() {
return true;
}
case doHash("onDeathMessage"): {
auto Call = RemoteCall::importAs<bool(std::string message, std::vector<std::string>, Actor * dead)>(
eventName,
eventId
);
auto Call =
RemoteCall::importAs<bool(std::string const& message, std::vector<std::string>, Actor* dead)>(
eventName,
eventId
);
eventBus->emplaceListener<GMLIB::Event::EntityEvent::DeathMessageAfterEvent>(
[Call](GMLIB::Event::EntityEvent::DeathMessageAfterEvent& ev) {
auto msg = ev.getDeathMessage();
+5 -1
View File
@@ -5,7 +5,11 @@
#define PLUGIN_NAME fmt::format(fg(fmt::color::light_green), "GMLIB-LRCA")
#define LIB_VERSION GMLIB::Version(0, 12, 5)
#define LIB_VERSION_MAJOR 0
#define LIB_VERSION_MINOR 12
#define LIB_VERSION_PATCH 7
#define LIB_VERSION GMLIB::Version(LIB_VERSION_MAJOR, LIB_VERSION_MINOR, LIB_VERSION_PATCH)
extern ll::Logger logger;
+52 -41
View File
@@ -2,7 +2,7 @@
std::unordered_set<std::string> HardCodedKeys = {"AlwaysUnlocked", "PlayerHasManyItems", "PlayerInWater", "None"};
std::variant<std::string, std::vector<RecipeIngredient>> makeRecipeUnlockingKey(std::string& key) {
std::variant<std::string, std::vector<RecipeIngredient>> makeRecipeUnlockingKey(std::string const& key) {
if (HardCodedKeys.count(key)) {
return key;
}
@@ -17,11 +17,11 @@ void Export_Legacy_GMLib_ModAPI() {
RemoteCall::exportAs(
"GMLib_ModAPI",
"registerShapelessRecipe",
[](std::string recipe_id,
[](std::string const& recipe_id,
std::vector<std::string> ingredients,
std::string result,
std::string const& result,
int count,
std::string unlock) -> void {
std::string const& unlock) -> void {
auto level = GMLIB_Level::getInstance();
if (!level) {
return;
@@ -39,12 +39,12 @@ void Export_Legacy_GMLib_ModAPI() {
RemoteCall::exportAs(
"GMLib_ModAPI",
"registerShapedRecipe",
[](std::string recipe_id,
[](std::string const& recipe_id,
std::vector<std::string> shape,
std::vector<std::string> ingredients,
std::string result,
std::string const& result,
int count,
std::string unlock) -> void {
std::string const& unlock) -> void {
auto level = GMLIB_Level::getInstance();
if (!level) {
return;
@@ -62,7 +62,10 @@ void Export_Legacy_GMLib_ModAPI() {
RemoteCall::exportAs(
"GMLib_ModAPI",
"registerFurnaceRecipe",
[](std::string recipe_id, std::string input, std::string output, std::vector<std::string> tags) -> void {
[](std::string const& recipe_id,
std::string const& input,
std::string const& output,
std::vector<std::string> tags) -> void {
auto level = GMLIB_Level::getInstance();
if (!level) {
return;
@@ -75,7 +78,8 @@ void Export_Legacy_GMLib_ModAPI() {
RemoteCall::exportAs(
"GMLib_ModAPI",
"registerBrewingMixRecipe",
[](std::string recipe_id, std::string input, std::string output, std::string reagent) -> void {
[](std::string const& recipe_id, std::string const& input, std::string const& output, std::string const& reagent
) -> void {
auto level = GMLIB_Level::getInstance();
if (!level) {
return;
@@ -87,7 +91,8 @@ void Export_Legacy_GMLib_ModAPI() {
RemoteCall::exportAs(
"GMLib_ModAPI",
"registerBrewingContainerRecipe",
[](std::string recipe_id, std::string input, std::string output, std::string reagent) -> void {
[](std::string const& recipe_id, std::string const& input, std::string const& output, std::string const& reagent
) -> void {
auto level = GMLIB_Level::getInstance();
if (!level) {
return;
@@ -101,11 +106,11 @@ void Export_Legacy_GMLib_ModAPI() {
RemoteCall::exportAs(
"GMLib_ModAPI",
"registerSmithingTransformRecipe",
[](std::string recipe_id,
std::string smithing_template,
std::string base,
std::string addition,
std::string result) -> void {
[](std::string const& recipe_id,
std::string const& smithing_template,
std::string const& base,
std::string const& addition,
std::string const& result) -> void {
auto level = GMLIB_Level::getInstance();
if (!level) {
return;
@@ -122,7 +127,10 @@ void Export_Legacy_GMLib_ModAPI() {
RemoteCall::exportAs(
"GMLib_ModAPI",
"registerSmithingTrimRecipe",
[](std::string recipe_id, std::string smithing_template, std::string base, std::string addition) -> void {
[](std::string const& recipe_id,
std::string const& smithing_template,
std::string const& base,
std::string const& addition) -> void {
auto level = GMLIB_Level::getInstance();
if (!level) {
return;
@@ -133,12 +141,12 @@ void Export_Legacy_GMLib_ModAPI() {
RemoteCall::exportAs(
"GMLib_ModAPI",
"registerStoneCutterRecipe",
[](std::string recipe_id,
std::string input,
int input_data,
std::string output,
int output_data,
int output_count) -> void {
[](std::string const& recipe_id,
std::string const& input,
int input_data,
std::string const& output,
int output_data,
int output_count) -> void {
auto level = GMLIB_Level::getInstance();
if (!level) {
return;
@@ -154,34 +162,37 @@ void Export_Legacy_GMLib_ModAPI() {
});
// 实验性
RemoteCall::exportAs("GMLib_ModAPI", "registerExperimentsRequire", [](int experiment_id) -> void {
auto map = GMLIB_Level::getAllExperiments();
if (map.count(experiment_id)) {
auto list = GMLIB_Level::getAllExperiments();
std::unordered_set<AllExperiments> set(list.begin(), list.end());
if (set.contains((AllExperiments)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 {
auto level = GMLIB_Level::getInstance();
if (!level) {
return;
if (GMLIB_Level::getInstance()) {
auto list = GMLIB_Level::getAllExperiments();
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 {
auto level = GMLIB_Level::getInstance();
if (!level) {
return false;
}
auto map = GMLIB_Level::getAllExperiments();
if (map.count(experiment_id)) {
return GMLIB_Level::getInstance()->getExperimentEnabled(((AllExperiments)experiment_id));
} else {
ll::Logger("Server").error("Experiment ID '{}' does not exist!", experiment_id);
return false;
if (GMLIB_Level::getInstance()) {
auto list = GMLIB_Level::getAllExperiments();
std::unordered_set<AllExperiments> set(list.begin(), list.end());
if (set.contains((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;
}
}
return false;
});
RemoteCall::exportAs("GMLib_ModAPI", "setFixI18nEnabled", []() -> void {
GMLIB::Mod::VanillaFix::setFixI18nEnabled();
});
}
+37 -15
View File
@@ -1,4 +1,6 @@
#include "GMLIB/Server/FakeListAPI.h"
#include "Global.h"
#include "mc/world/ActorUniqueID.h"
void Export_Legacy_GMLib_ServerAPI() {
RemoteCall::exportAs("GMLib_ServerAPI", "setEducationFeatureEnabled", []() -> void {
@@ -15,29 +17,36 @@ void Export_Legacy_GMLib_ServerAPI() {
GMLIB_Level::requireServerResourcePackAndAllowClientResourcePack();
});
RemoteCall::exportAs("GMLib_ServerAPI", "getLevelName", []() -> std::string {
auto level = GMLIB_Level::getInstance();
if (!level) {
return "";
if (auto level = GMLIB_Level::getInstance()) {
return level->getLevelName();
}
return level->getLevelName();
return {};
});
RemoteCall::exportAs("GMLib_ServerAPI", "setLevelName", [](std::string name) -> void {
auto level = GMLIB_Level::getInstance();
if (!level) {
return;
RemoteCall::exportAs("GMLib_ServerAPI", "setLevelName", [](std::string const& name) -> void {
if (auto level = GMLIB_Level::getInstance()) {
level->setLevelName(name);
}
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 {
return GMLIB_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",
"spawnEntity",
[](std::pair<Vec3, int> pos, std::string const& 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* {
[](Actor* owner, std::string const& name, float speed, float offset) -> Actor* {
auto ac = (GMLIB_Actor*)owner;
return ac->shootProjectile(name, speed, offset);
}
@@ -47,8 +56,21 @@ void Export_Legacy_GMLib_ServerAPI() {
"throwEntity",
[](Actor* owner, Actor* actor, float speed, float offset) -> bool {
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",
"addFakeList",
[](const std::string& name, const std::string& xuid) -> bool {
return GMLIB::Server::FakeList::addFakeList(name, xuid, ActorUniqueID(-1));
}
);
RemoteCall::exportAs("GMLib_ServerAPI", "removeFakeList", [](const std::string& nameOrXuid) -> bool {
return GMLIB::Server::FakeList::removeFakeList(nameOrXuid);
});
RemoteCall::exportAs("GMLib_ServerAPI", "removeAllFakeList", []() -> void {
return GMLIB::Server::FakeList::removeAllFakeLists();
});
}
+3 -7
View File
@@ -8,7 +8,7 @@ std::string removeBrackets(std::string a1) {
return a1;
}
bool isParameters(std::string str) {
bool isParameters(std::string const& str) {
std::regex reg("[<]([^<>]+)[>]");
return std::regex_search(removeBrackets(str), reg);
}
@@ -64,11 +64,7 @@ bool registerServerPlaceholder(
);
} else {
auto Call = RemoteCall::importAs<std::string()>(PluginName, FuncName);
GMLIB::Server::PlaceholderAPI::registerServerPlaceholder(
PAPIName,
[Call]() { return Call(); },
PluginName
);
GMLIB::Server::PlaceholderAPI::registerServerPlaceholder(PAPIName, [Call]() { return Call(); }, PluginName);
}
return true;
}
@@ -110,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); }
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(); }
+3 -3
View File
@@ -1,7 +1,7 @@
{
"format_version": 2,
"tooth": "github.com/GroupMountain/GMLIB-LegacyRemoteCallApi",
"version": "0.12.5",
"version": "0.12.7",
"info": {
"name": "GMLIB-LegacyRemoteCallApi",
"description": "Legacy RemoteCall API for GMLIB",
@@ -14,9 +14,9 @@
"library"
]
},
"asset_url": "https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi/releases/download/v0.12.5/GMLIB-LegacyRemoteCallApi-windows-x64.zip",
"asset_url": "https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi/releases/download/v0.12.7/GMLIB-LegacyRemoteCallApi-windows-x64.zip",
"dependencies": {
"github.com/GroupMountain/GMLIB": ">=0.12.4"
"github.com/GroupMountain/GMLIB": ">=0.12.7"
},
"files": {
"place": [
+4 -5
View File
@@ -1,6 +1,7 @@
add_rules("mode.debug", "mode.release")
add_repositories("liteldev-repo https://github.com/LiteLDev/xmake-repo.git")
add_repositories("groupmountain-repo https://github.com/GroupMountain/xmake-repo.git")
if not has_config("vs_runtime") then
set_runtimes("MD")
@@ -9,6 +10,7 @@ end
-- Option 1: Use the latest version of LeviLamina released on GitHub.
add_requires("levilamina")
add_requires("legacyremotecall")
add_requires("gmlib")
-- Option 2: Use a specific version of LeviLamina released on GitHub.
-- add_requires("levilamina x.x.x")
@@ -53,16 +55,13 @@ target("GMLIB-LegacyRemoteCallApi") -- Change this to your plugin name.
add_files(
"src/**.cpp"
)
add_links(
"SDK-GMLIB/Lib/GMLIB"
)
add_includedirs(
"SDK-GMLIB",
"src"
)
add_packages(
"levilamina",
"legacyremotecall"
"legacyremotecall",
"gmlib"
)
add_shflags(
"/DELAYLOAD:bedrock_server.dll" -- Magic to import symbols from BDS