Compare commits

..

15 Commits

10 changed files with 281 additions and 96 deletions
+137 -38
View File
@@ -1,3 +1,6 @@
// LiteLoader-AIDS automatic generated
/// <reference path="D:\LiteLoader\VSCode/dts/HelperLib-master/src/index.d.ts"/>
const GMLIB_API = {
createFloatingText: ll.import("GMLIB_API", "createFloatingText"),
deleteFloatingText: ll.import("GMLIB_API", "deleteFloatingText"),
@@ -90,7 +93,12 @@ const GMLIB_API = {
getPlayerSpawnPoint: ll.import("GMLIB_API", "getPlayerSpawnPoint"),
setPlayerSpawnPoint: ll.import("GMLIB_API", "setPlayerSpawnPoint"),
clearPlayerSpawnPoint: ll.import("GMLIB_API", "clearPlayerSpawnPoint"),
setCustomPackPath: ll.import("GMLIB_API", "setCustomPackPath")
setCustomPackPath: ll.import("GMLIB_API", "setCustomPackPath"),
getSupportedLanguages: ll.import("GMLIB_API", "getSupportedLanguages"),
loadLanguage: ll.import("GMLIB_API", "loadLanguage"),
updateOrCreateLanguageFile: ll.import("GMLIB_API", "updateOrCreateLanguageFile"),
loadLanguagePath: ll.import("GMLIB_API", "loadLanguagePath"),
mergePatchJson: ll.import("GMLIB_API", "mergePatchJson")
}
const FloatingTextList = [];
@@ -102,10 +110,6 @@ class StaticFloatingText {
this.mPlaceholderAPI = papi;
this.mRuntimeId = GMLIB_API.createFloatingText(this.mPosition, this.mText, this.mPlaceholderAPI);
FloatingTextList.push(this);
this.sendToClients();
mc.listen("onJoin", (pl) => {
this.sendToClient(pl);
});
}
sendToClient(player) {
@@ -281,22 +285,15 @@ class Minecraft {
}
static getPlayerNbt(uuid) {
let snbt = GMLIB_API.getPlayerNbt(uuid);
if (snbt == "null") {
return null;
}
let nbt = NBT.parseSNBT(snbt);
return nbt;
return GMLIB_API.getPlayerNbt(uuid);
}
static setPlayerNbt(uuid, nbt, forceCreate = true) {
let snbt = nbt.toSNBT();
return GMLIB_API.setPlayerNbt(uuid, snbt, forceCreate);
return GMLIB_API.setPlayerNbt(uuid, nbt, forceCreate);
}
static setPlayerNbtTags(uuid, nbt, tags) {
let snbt = nbt.toSNBT();
return GMLIB_API.setPlayerNbtTags(uuid, snbt, tags);
return GMLIB_API.setPlayerNbtTags(uuid, nbt, tags);
}
static getPlayerPosition(uuid) {
@@ -319,18 +316,6 @@ class Minecraft {
return GMLIB_API.setWorldSpawn(pos);
}
static getPlayerSpawnPoint() {
return GMLIB_API.getPlayerSpawnPoint();
}
static setPlayerSpawnPoint(pos) {
GMLIB_API.setPlayerSpawnPoint(pos);
}
static clearPlayerSpawnPoint() {
GMLIB_API.clearPlayerSpawnPoint();
}
static setEducationFeatureEnabled() {
return GMLIB_API.setEducationFeatureEnabled();
}
@@ -367,10 +352,6 @@ class Minecraft {
return GMLIB_API.setUnknownBlockCleaner();
}
static playerToEntity(player) {
return GMLIB_API.PlayerToEntity(player);
}
static spawnEntity(pos, name) {
return GMLIB_API.spawnEntity(pos, name);
}
@@ -384,11 +365,11 @@ class Minecraft {
}
static getServerLanguage() {
return GMLIB_API.getResourcePackI18nLanguage(language);
return I18nAPI.getCurrentLanguage();
}
static setServerLanguage(language) {
return GMLIB_API.chooseResourcePackI18nLanguage(language);
return I18nAPI.chooseLanguage(language);
}
static setCustomPackPath(path) {
@@ -396,7 +377,7 @@ class Minecraft {
}
static resourcePackTranslate(key, params = []) {
return GMLIB_API.resourcePackTranslate(key, params);
return I18nAPI.get(key, params);
}
}
@@ -480,6 +461,53 @@ class Experiments {
}
}
class Version {
constructor(major, minor, patch) {
this.mMajor = major;
this.mMinor = minor;
this.mPatch = patch;
}
toString(prefix = true) {
let result = `${this.mMajor}.${this.mMinor}.${this.mPatch}`;
if (prefix) {
result = "v" + result;
}
return result;
}
toArray() {
return [this.mMajor, this.mMinor, this.mPatch];
}
valueOf() {
return 100000000 * this.mMajor + 10000 * this.mMinor + this.mPatch;
}
static fromString(string) {
if (typeof string === 'string' || string instanceof String) {
let pattern = /^v?\d+\.\d+\.\d+$/;
if (pattern.test(string)) {
let regex = /\d+/g;
let numbers = string.match(regex);
let array = numbers.slice(0, 3).map(Number);
return new Version(array[0], array[1], array[2]);
}
}
return null;
}
static fromArray(array) {
if (Array.isArray(array) && array.length == 3) {
let isNumber = array.every(element => typeof element == "number");
if (isNumber) {
return new Version(array[0], array[1], array[2])
}
}
return null;
}
}
class GMLIB {
constructor() {
throw new Error("Static class cannot be instantiated");
@@ -670,7 +698,14 @@ class JsonConfig {
init() {
if (File.exists(this.mPath)) {
let existDataStr = File.readFrom(this.mPath);
this.mData = Object.assign({}, this.mData, JSON.parse(existDataStr));
existDataStr = existDataStr.replace(/\/\/.*|\/\*[^]*?\*\//g, "");
try {
let result = GMLIB_API.mergePatchJson(JSON.stringify(this.mData), existDataStr);
this.mData = JSON.parse(result);
} catch {
let newPath = this.mPath + "_old";
File.rename(this.mPath, newPath);
}
}
this.save();
}
@@ -684,9 +719,9 @@ class JsonConfig {
return this.mData;
}
get(key, defultValue = null) {
get(key, defultValue = undefined) {
let result = this.getData()[key];
if (!result && defultValue != null) {
if (!result && defultValue != undefined) {
this.set(key, defultValue);
return defultValue;
}
@@ -772,6 +807,68 @@ class JsonI18n {
}
};
class I18nAPI {
constructor() {
throw new Error("Static class cannot be instantiated");
}
static get(key, params = []) {
GMLIB_API.resourcePackTranslate(key, params);
}
static translate(key, params = []) {
return I18nAPI.get(key, params);
}
static getSupportedLanguages() {
return GMLIB_API.getSupportedLanguages();
}
static getCurrentLanguage() {
return GMLIB_API.getResourcePackI18nLanguage(language);
}
static chooseLanguage(language) {
GMLIB_API.chooseResourcePackI18nLanguage(language);
}
static loadLanguage(code, language) {
GMLIB_API.loadLanguage(code, language);
}
static updateOrCreateLanguageFile(code, lang, path) {
GMLIB_API.updateOrCreateLanguageFile(code, lang, path);
}
static loadLanguagePath(path) {
GMLIB_API.loadLanguagePath(path);
}
};
LLSE_Player.prototype.toEntity = function () {
return GMLIB_API.PlayerToEntity(this);
}
LLSE_Player.prototype.getSpawnPoint = function () {
return GMLIB_API.getPlayerSpawnPoint(this);
}
LLSE_Player.prototype.setSpawnPoint = function (pos) {
return GMLIB_API.setPlayerSpawnPoint(this, pos);
}
LLSE_Player.prototype.clearSpawnPoint = function () {
return GMLIB_API.clearPlayerSpawnPoint(this);
}
LLSE_Entity.prototype.shootProjectile = function (proj, speed = 2, offset = 3) {
return GMLIB_API.shootProjectile(this, proj, speed, offset);
}
LLSE_Entity.prototype.throwEntity = function (proj, speed = 2, offset = 3) {
return GMLIB_API.throwEntity(this, proj, speed, offset);
}
module.exports = {
StaticFloatingText,
DynamicFloatingText,
@@ -782,5 +879,7 @@ module.exports = {
Scoreboard,
JsonConfig,
JsonLanguage,
JsonI18n
JsonI18n,
Version,
I18nAPI
};
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "${pluginName}",
"entry": "${pluginFile}",
"version": "0.9.5",
"version": "0.12.3",
"author": "GroupMountain",
"type": "native",
"dependencies": [
+50 -20
View File
@@ -53,25 +53,19 @@ void Export_Compatibility_API() {
}
return result;
});
RemoteCall::exportAs("GMLIB_API", "getPlayerNbt", [](std::string uuid) -> std::string {
RemoteCall::exportAs("GMLIB_API", "getPlayerNbt", [](std::string uuid) -> std::unique_ptr<CompoundTag> {
auto uid = mce::UUID::fromString(uuid);
auto nbt = GMLIB_Player::getPlayerNbt(uid);
if (nbt) {
return nbt->toSnbt();
}
return "null";
return std::move(GMLIB_Player::getPlayerNbt(uid));
});
RemoteCall::exportAs("GMLIB_API", "setPlayerNbt", [](std::string uuid, std::string snbt, bool forceCreate) -> bool {
RemoteCall::exportAs("GMLIB_API", "setPlayerNbt", [](std::string uuid, CompoundTag* nbt, bool forceCreate) -> bool {
auto uid = mce::UUID::fromString(uuid);
auto nbt = CompoundTag::fromSnbt(snbt);
return GMLIB_Player::setPlayerNbt(uid, *nbt, forceCreate);
});
RemoteCall::exportAs(
"GMLIB_API",
"setPlayerNbtTags",
[](std::string uuid, std::string snbt, std::vector<std::string> tags) -> bool {
[](std::string uuid, CompoundTag* nbt, std::vector<std::string> tags) -> bool {
auto uid = mce::UUID::fromString(uuid);
auto nbt = CompoundTag::fromSnbt(snbt);
return GMLIB_Player::setPlayerNbtTags(uid, *nbt, tags);
}
);
@@ -94,7 +88,7 @@ void Export_Compatibility_API() {
"GMLIB_API",
"createFloatingText",
[](std::pair<Vec3, int> pos, std::string text, bool papi) -> int {
auto ft = new GMLIB::Server::FloatingText(text, pos.first, pos.second, papi);
auto ft = new GMLIB::Server::StaticFloatingText(text, pos.first, pos.second, papi);
return ft->getRuntimeID();
}
);
@@ -112,7 +106,7 @@ void Export_Compatibility_API() {
RemoteCall::exportAs("GMLIB_API", "sendFloatingTextToPlayer", [](int id, Player* pl) -> bool {
auto ft = GMLIB::Server::FloatingText::getFloatingText(id);
if (ft) {
ft->sendToClient(pl);
ft->sendToClient(*pl);
return true;
}
return false;
@@ -128,7 +122,7 @@ void Export_Compatibility_API() {
RemoteCall::exportAs("GMLIB_API", "removeFloatingTextFromPlayer", [](int id, Player* pl) -> bool {
auto ft = GMLIB::Server::FloatingText::getFloatingText(id);
if (ft) {
ft->removeFromClient(pl);
ft->removeFromClient(*pl);
return true;
}
return false;
@@ -144,7 +138,7 @@ void Export_Compatibility_API() {
RemoteCall::exportAs("GMLIB_API", "updateClientFloatingTextData", [](int id, Player* pl) -> bool {
auto ft = GMLIB::Server::FloatingText::getFloatingText(id);
if (ft) {
ft->updateClient(pl);
ft->updateClient(*pl);
return true;
}
return false;
@@ -158,8 +152,8 @@ void Export_Compatibility_API() {
return false;
});
RemoteCall::exportAs("GMLIB_API", "isVersionMatched", [](int a, int b, int c) -> bool {
auto version = SemVersion(a, b, c, "", "");
return LIB_VERSION.satisfies(version);
auto version = GMLIB::Version(a, b, c, "", "");
return version >= LIB_VERSION;
});
RemoteCall::exportAs("GMLIB_API", "getVersion_LRCA", []() -> std::string { return LIB_VERSION.asString(); });
RemoteCall::exportAs("GMLIB_API", "getVersion_GMLIB", []() -> std::string {
@@ -168,13 +162,43 @@ void Export_Compatibility_API() {
RemoteCall::exportAs(
"GMLIB_API",
"resourcePackTranslate",
[](std::string key, std::vector<std::string> params) -> std::string { return I18n::get(key, params); }
[](std::string key, std::vector<std::string> params) -> std::string { return I18nAPI::get(key, params); }
);
RemoteCall::exportAs("GMLIB_API", "chooseResourcePackI18nLanguage", [](std::string code) -> void {
I18n::chooseLanguage(code);
if (GMLIB_Level::getInstance()) {
I18nAPI::chooseLanguage(code);
}
});
RemoteCall::exportAs("GMLIB_API", "getResourcePackI18nLanguage", []() -> std::string {
return I18n::getCurrentLanguage()->getFullLanguageCode();
if (GMLIB_Level::getInstance()) {
return I18nAPI::getCurrentLanguageCode();
}
return "unknown";
});
RemoteCall::exportAs("GMLIB_API", "getSupportedLanguages", []() -> std::vector<std::string> {
if (GMLIB_Level::getInstance()) {
return I18nAPI::getSupportedLanguageCodes();
}
return {};
});
RemoteCall::exportAs("GMLIB_API", "loadLanguage", [](std::string code, std::string lang) -> void {
if (GMLIB_Level::getInstance()) {
I18nAPI::loadLanguage(code, lang);
}
});
RemoteCall::exportAs(
"GMLIB_API",
"updateOrCreateLanguageFile",
[](std::string code, std::string lang, std::string path) -> void {
if (GMLIB_Level::getInstance()) {
I18nAPI::updateOrCreateLanguageFile(path, code, lang);
}
}
);
RemoteCall::exportAs("GMLIB_API", "loadLanguagePath", [](std::string path) -> void {
if (GMLIB_Level::getInstance()) {
I18nAPI::loadLanguagesFromDirectory(path);
}
});
RemoteCall::exportAs("GMLIB_API", "getPlayerPosition", [](std::string uuid) -> std::pair<BlockPos, int> {
auto uid = mce::UUID::fromString(uuid);
@@ -389,7 +413,7 @@ void Export_Compatibility_API() {
auto auids = GMLIB_Scoreboard::getInstance()->getInstance()->getAllEntities();
std::vector<std::string> result;
for (auto auid : auids) {
result.push_back(std::to_string(auid.get()));
result.push_back(std::to_string(auid.id));
}
return result;
});
@@ -428,4 +452,10 @@ 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();
});
}
+5 -1
View File
@@ -17,7 +17,11 @@ bool LRCA::load() {
ExportPAPI();
Export_Event_API();
logger.info("GMLIB-LegacyRemoteCallApi Loaded!");
logger.info("Version: {}", LIB_VERSION.asString());
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())
);
logger.info("Author: GroupMountain");
logger.info("Repository: https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi");
return true;
+15
View File
@@ -174,6 +174,21 @@ void Export_Event_API() {
);
return true;
}
case doHash("onEndermanTake"): {
auto Call = RemoteCall::importAs<bool(Actor * mob)>(eventName, eventId);
eventBus->emplaceListener<GMLIB::Event::EntityEvent::EndermanTakeBlockBeforeEvent>(
[Call](GMLIB::Event::EntityEvent::EndermanTakeBlockBeforeEvent& ev) {
bool result = true;
try {
result = Call(&ev.self());
} catch (...) {}
if (!result) {
ev.cancel();
}
}
);
return true;
}
default:
return false;
}
+3 -2
View File
@@ -3,8 +3,9 @@
#include <RemoteCallAPI.h>
#define PLUGIN_NAME "GMLIB-LRCA"
#define LIB_VERSION SemVersion(0, 9, 4, "", "")
#define PLUGIN_NAME fmt::format(fg(fmt::color::light_green), "GMLIB-LRCA")
#define LIB_VERSION GMLIB::Version(0, 12, 3)
extern ll::Logger logger;
+6 -4
View File
@@ -2,16 +2,18 @@
void Export_Legacy_GMLib_ServerAPI() {
RemoteCall::exportAs("GMLib_ServerAPI", "setEducationFeatureEnabled", []() -> void {
GMLIB_Level::addEducationEditionRequired();
GMLIB_Level::tryEnableEducationEdition();
});
RemoteCall::exportAs("GMLib_ServerAPI", "registerAbilityCommand", []() -> void {
GMLIB_Level::forceEnableAbilityCommand();
GMLIB_Level::tryRegisterAbilityCommand();
});
RemoteCall::exportAs("GMLib_ServerAPI", "setEnableAchievement", []() -> void {
GMLIB_Level::setForceAchievementsEnabled();
});
RemoteCall::exportAs("GMLib_ServerAPI", "setForceTrustSkins", []() -> void { GMLIB_Level::setForceTrustSkin(); });
RemoteCall::exportAs("GMLib_ServerAPI", "enableCoResourcePack", []() -> void { GMLIB_Level::setCoResourcePack(); });
RemoteCall::exportAs("GMLib_ServerAPI", "setForceTrustSkins", []() -> void { GMLIB_Level::trustAllSkins(); });
RemoteCall::exportAs("GMLib_ServerAPI", "enableCoResourcePack", []() -> void {
GMLIB_Level::requireServerResourcePackAndAllowClientResourcePack();
});
RemoteCall::exportAs("GMLib_ServerAPI", "getLevelName", []() -> std::string {
auto level = GMLIB_Level::getInstance();
if (!level) {
+60 -26
View File
@@ -3,6 +3,16 @@
namespace PAPIRemoteCall {
std::string removeBrackets(std::string a1) {
a1.erase(a1.find_last_not_of("%") + 1);
return a1;
}
bool isParameters(std::string str) {
std::regex reg("[<]([^<>]+)[>]");
return std::regex_search(removeBrackets(str), reg);
}
std::string GetValue(std::string const& from) { return GMLIB::Server::PlaceholderAPI::getValue(from); }
std::string GetValueWithPlayer(std::string const& a1, std::string const& a2) {
@@ -15,12 +25,24 @@ bool registerPlayerPlaceholder(
std::string const& PAPIName
) {
if (RemoteCall::hasFunc(PluginName, FuncName)) {
auto Call = RemoteCall::importAs<std::string(Player * pl)>(PluginName, FuncName);
GMLIB::Server::PlaceholderAPI::registerPlayerPlaceholder(
PAPIName,
[Call](Player* sp) { return Call(sp); },
PluginName
);
if (isParameters(PAPIName)) {
auto Call = RemoteCall::importAs<std::string(Player * pl, std::unordered_map<std::string, std::string>)>(
PluginName,
FuncName
);
GMLIB::Server::PlaceholderAPI::registerPlayerPlaceholder(
PAPIName,
[Call](Player* sp, std::unordered_map<std::string, std::string> map) { return Call(sp, map); },
PluginName
);
} else {
auto Call = RemoteCall::importAs<std::string(Player * pl)>(PluginName, FuncName);
GMLIB::Server::PlaceholderAPI::registerPlayerPlaceholder(
PAPIName,
[Call](Player* sp) { return Call(sp); },
PluginName
);
}
return true;
}
return false;
@@ -32,12 +54,22 @@ bool registerServerPlaceholder(
std::string const& PAPIName
) {
if (RemoteCall::hasFunc(PluginName, FuncName)) {
auto Call = RemoteCall::importAs<std::string()>(PluginName, FuncName);
GMLIB::Server::PlaceholderAPI::registerServerPlaceholder(
PAPIName,
[Call]() { return Call(); },
PluginName
);
if (isParameters(PAPIName)) {
auto Call =
RemoteCall::importAs<std::string(std::unordered_map<std::string, std::string>)>(PluginName, FuncName);
GMLIB::Server::PlaceholderAPI::registerServerPlaceholder(
PAPIName,
[Call](std::unordered_map<std::string, std::string> map) { return Call(map); },
PluginName
);
} else {
auto Call = RemoteCall::importAs<std::string()>(PluginName, FuncName);
GMLIB::Server::PlaceholderAPI::registerServerPlaceholder(
PAPIName,
[Call]() { return Call(); },
PluginName
);
}
return true;
}
return false;
@@ -50,20 +82,22 @@ bool registerStaticPlaceholder(
int num
) {
if (RemoteCall::hasFunc(PluginName, FuncName)) {
auto Call = RemoteCall::importAs<std::string()>(PluginName, FuncName);
if (num == -1) {
GMLIB::Server::PlaceholderAPI::registerStaticPlaceholder(
PAPIName,
[Call] { return Call(); },
PluginName
);
} else {
GMLIB::Server::PlaceholderAPI::registerStaticPlaceholder(
PAPIName,
num,
[Call] { return Call(); },
PluginName
);
if (isParameters(PAPIName)) {
auto Call = RemoteCall::importAs<std::string()>(PluginName, FuncName);
if (num == -1) {
GMLIB::Server::PlaceholderAPI::registerStaticPlaceholder(
PAPIName,
[Call] { return Call(); },
PluginName
);
} else {
GMLIB::Server::PlaceholderAPI::registerStaticPlaceholder(
PAPIName,
num,
[Call] { return Call(); },
PluginName
);
}
}
return true;
}
+3 -3
View File
@@ -1,7 +1,7 @@
{
"format_version": 2,
"tooth": "github.com/GroupMountain/GMLIB-LegacyRemoteCallApi",
"version": "0.9.5",
"version": "0.12.3",
"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.9.5/GMLIB-LegacyRemoteCallApi-windows-x64.zip",
"asset_url": "https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi/releases/download/v0.12.3/GMLIB-LegacyRemoteCallApi-windows-x64.zip",
"dependencies": {
"github.com/GroupMountain/GMLIB": ">=0.9.8"
"github.com/GroupMountain/GMLIB": ">=0.12.4"
},
"files": {
"place": [