Compare commits

...

29 Commits

14 changed files with 790 additions and 45 deletions
+5
View File
@@ -7,6 +7,11 @@ jobs:
build: build:
runs-on: windows-latest runs-on: windows-latest
steps: steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
submodules: recursive
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: xmake-io/github-action-setup-xmake@v1 - uses: xmake-io/github-action-setup-xmake@v1
+58
View File
@@ -0,0 +1,58 @@
const PAPIgetValueAPI = ll.import("BEPlaceholderAPI", "GetValue")
const PAPIgetValueByPlayerAPI = ll.import("BEPlaceholderAPI", "GetValueWithPlayer")
const PAPIregisterPlayerPlaceholderAPI = ll.import("BEPlaceholderAPI", "registerPlayerPlaceholder")
const PAPIregisterServerPlaceholderAPI = ll.import("BEPlaceholderAPI", "registerServerPlaceholder")
const PAPIregisterStaticPlaceholderAPI = ll.import("BEPlaceholderAPI", "registerStaticPlaceholder")
const PAPItranslateStringAPI = ll.import("BEPlaceholderAPI", "translateString")
const PAPIunRegisterPlaceholderAPI = ll.import("BEPlaceholderAPI", "unRegisterPlaceholder")
const PAPIgetAllPAPI = ll.import("BEPlaceholderAPI", "getAllPAPI")
Function.prototype.getName = function () {
return this.name || this.toString().match(/function\s*([^(]*)\(/)[1]
}
class PAPI {
constructor() {
throw new Error("Static class cannot be instantiated");
}
static registerPlayerPlaceholder(func, PluginName, PAPIName) {
ll.export(func, PluginName, func.getName())
PAPIregisterPlayerPlaceholderAPI(PluginName, func.getName(), PAPIName)
}
static registerServerPlaceholder(func, PluginName, PAPIName) {
ll.export(func, PluginName, func.getName())
PAPIregisterServerPlaceholderAPI(PluginName, func.getName(), PAPIName)
}
static registerStaticPlaceholder(func, PluginName, PAPIName, UpdateInterval = 50) {
ll.export(func, PluginName, func.getName())
PAPIregisterStaticPlaceholderAPI(PluginName, func.getName(), PAPIName, UpdateInterval)
}
static getValue(key) {
return PAPIgetValueAPI(key)
}
static getValueByPlayer(key, xuid) {
return PAPIgetValueByPlayerAPI(key, xuid)
}
static translateString(str, xuid = "") {
return PAPItranslateStringAPI(str, xuid)
}
static unRegisterPlaceholder(str) {
return PAPIunRegisterPlaceholderAPI(str)
}
static getAllPAPI() {
return PAPIgetAllPAPI();
}
}
module.exports = {
PAPI
};
+370
View File
@@ -0,0 +1,370 @@
const GMLIB_API = {
createFloatingText: ll.import("GMLIB_API", "createFloatingText"),
deleteFloatingText: ll.import("GMLIB_API", "deleteFloatingText"),
setFloatingTextData: ll.import("GMLIB_API", "setFloatingTextData"),
sendFloatingTextToPlayer: ll.import("GMLIB_API", "sendFloatingTextToPlayer"),
sendFloatingText: ll.import("GMLIB_API", "sendFloatingText"),
removeFloatingTextFromPlayer: ll.import("GMLIB_API", "removeFloatingTextFromPlayer"),
removeFloatingText: ll.import("GMLIB_API", "removeFloatingText"),
getServerMspt: ll.import("GMLIB_API", "getServerMspt"),
getServerCurrentTps: ll.import("GMLIB_API", "getServerCurrentTps"),
getServerAverageTps: ll.import("GMLIB_API", "getServerAverageTps"),
getAllPlayerUuids: ll.import("GMLIB_API", "getAllPlayerUuids"),
setEducationFeatureEnabled: ll.import("GMLib_ServerAPI", "setEducationFeatureEnabled"),
registerAbilityCommand: ll.import("GMLib_ServerAPI", "registerAbilityCommand"),
setEnableAchievement: ll.import("GMLib_ServerAPI", "setEnableAchievement"),
setForceTrustSkins: ll.import("GMLib_ServerAPI", "setForceTrustSkins"),
enableCoResourcePack: ll.import("GMLib_ServerAPI", "enableCoResourcePack"),
getLevelName: ll.import("GMLib_ServerAPI", "getLevelName"),
setLevelName: ll.import("GMLib_ServerAPI", "setLevelName"),
setFakeSeed: ll.import("GMLib_ServerAPI", "setFakeSeed"),
spawnEntity: ll.import("GMLib_ServerAPI", "spawnEntity"),
shootProjectile: ll.import("GMLib_ServerAPI", "shootProjectile"),
throwEntity: ll.import("GMLib_ServerAPI", "throwEntity"),
PlayerToEntity: ll.import("GMLib_ServerAPI", "PlayerToEntity"),
setUnknownBlockCleaner: ll.import("GMLib_ModAPI", "setUnknownBlockCleaner"),
getAllExperiments: ll.import("GMLIB_API", "getAllExperiments"),
getExperimentTranslatedName: ll.import("GMLIB_API", "getExperimentTranslatedName"),
getExperimentEnabled: ll.import("GMLib_ModAPI", "getExperimentEnabled"),
setExperimentEnabled: ll.import("GMLib_ModAPI", "setExperimentEnabled"),
registerExperimentsRequire: ll.import("GMLib_ModAPI", "registerExperimentsRequire"),
registerStoneCutterRecipe: ll.import("GMLib_ModAPI", "registerStoneCutterRecipe"),
registerSmithingTrimRecipe: ll.import("GMLib_ModAPI", "registerSmithingTrimRecipe"),
registerSmithingTransformRecipe: ll.import("GMLib_ModAPI", "registerSmithingTransformRecipe"),
registerBrewingContainerRecipe: ll.import("GMLib_ModAPI", "registerBrewingContainerRecipe"),
registerBrewingMixRecipe: ll.import("GMLib_ModAPI", "registerBrewingMixRecipe"),
registerFurnaceRecipe: ll.import("GMLib_ModAPI", "registerFurnaceRecipe"),
registerShapedRecipe: ll.import("GMLib_ModAPI", "registerShapedRecipe"),
registerShapelessRecipe: ll.import("GMLib_ModAPI", "registerShapelessRecipe"),
isVersionMatched: ll.import("GMLIB_API", "isVersionMatched"),
getVersion_LRCA: ll.import("GMLIB_API", "getVersion_LRCA"),
getVersion_GMLIB: ll.import("GMLIB_API", "getVersion_GMLIB")
}
const FloatingTextList = [];
class StaticFloatingText {
constructor(pos, text, papi = true) {
this.mPosition = pos;
this.mText = text;
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) {
return GMLIB_API.sendFloatingTextToPlayer(this.mRuntimeId, player);
}
sendToClients() {
return GMLIB_API.sendFloatingText(this.mRuntimeId);
}
removeFromClient(player) {
return GMLIB_API.removeFloatingTextFromPlayer(this.mRuntimeId, player);
}
removeFromClients() {
return GMLIB_API.removeFloatingText(this.mRuntimeId);
}
getRuntimeId() {
return this.mRuntimeId;
}
getText() {
return this.mText;
}
setText(newText) {
this.mText = newText;
}
update() {
GMLIB_API.setFloatingTextData(this.mRuntimeId, this.mText);
return this.sendToClients();
}
updateText(newText) {
this.setText(newText);
return this.update();
}
getPos() {
return this.mPosition;
}
destroy() {
let size_t = FloatingTextList.indexOf(this);
FloatingTextList.splice(size_t, 1);
return GMLIB_API.deleteFloatingText(this.mRuntimeId);
}
isDynamic() {
return false;
}
static getFloatingText(runtimeId) {
FloatingTextList.forEach((ft) => {
if (ft.getRuntimeId() == runtimeId) {
if (!ft.isDynamic()) {
return ft;
}
}
});
return null;
}
static getAllFloatingTexts() {
let result = [];
FloatingTextList.forEach((ft) => {
if (!ft.isDynamic()) {
result.push(ft);
}
});
return result;
}
}
class DynamicFloatingText extends StaticFloatingText {
constructor(pos, text, updateRate = 1, papi = true) {
super(pos, text, papi);
this.mUpdateRate = updateRate;
this.mTaskId = null;
this.startUpdate();
}
getUpdateRate() {
return this.mUpdateRate;
}
setUpdateRate(updateRate = 1) {
this.stopUpdate();
this.mUpdateRate = updateRate;
this.startUpdate();
}
startUpdate() {
if (this.mTaskId == null) {
this.mTaskId = setInterval(() => {
this.update();
}, this.mUpdateRate * 1000);
return true;
}
return false;
}
stopUpdate() {
if (this.mTaskId != null) {
clearInterval(this.mTaskId);
this.mTaskId = null;
return true;
}
return false;
}
destroy() {
let size_t = FloatingTextList.indexOf(this);
FloatingTextList.splice(size_t, 1);
return GMLIB_API.deleteFloatingText(this.mRuntimeId);
}
isDynamic() {
return true;
}
static getFloatingText(runtimeId) {
FloatingTextList.forEach((ft) => {
if (ft.getRuntimeId() == runtimeId) {
if (ft.isDynamic()) {
return ft;
}
}
});
return null;
}
static getAllFloatingTexts() {
let result = [];
FloatingTextList.forEach((ft) => {
if (ft.isDynamic()) {
result.push(ft);
}
});
return result;
}
}
class Minecraft {
constructor() {
throw new Error("Static class cannot be instantiated");
}
static getServerAverageTps() {
return GMLIB_API.getServerAverageTps();
}
static getServerCurrentTps() {
return GMLIB_API.getServerCurrentTps();
}
static getServerMspt() {
return GMLIB_API.getServerMspt();
}
static getAllPlayerUuids() {
return GMLIB_API.getAllPlayerUuids();
}
static setEducationFeatureEnabled() {
return GMLIB_API.setEducationFeatureEnabled();
}
static registerAbilityCommand() {
return GMLIB_API.registerAbilityCommand();
}
static setEnableAchievement() {
return GMLIB_API.setEnableAchievement();
}
static setForceTrustSkins() {
return GMLIB_API.setForceTrustSkins();
}
static enableCoResourcePack() {
return GMLIB_API.enableCoResourcePack();
}
static getWorldName() {
return GMLIB_API.getLevelName();
}
static setWorldName(name) {
return GMLIB_API.setLevelName(name);
}
static setFakeSeed(seed = 114514) {
return GMLIB_API.setFakeSeed(seed);
}
static setUnknownBlockCleaner() {
return GMLIB_API.setUnknownBlockCleaner();
}
static playerToEntity(player) {
return GMLIB_API.PlayerToEntity(player);
}
static spawnEntity(pos, name) {
return GMLIB_API.spawnEntity(pos, name);
}
static shootProjectile(entity, proj, speed = 2, offset = 3) {
return GMLIB_API.shootProjectile(entity, proj, speed, offset);
}
static throwEntity(entity, proj, speed = 2, offset = 3) {
return GMLIB_API.throwEntity(entity, proj, speed = 2, offset = 3);
}
}
class Recipes {
constructor() {
throw new Error("Static class cannot be instantiated");
}
static registerStoneCutterRecipe(recipeId, inputName, inputAux, outputName, outputAux, outputCount) {
return GMLIB_API.registerStoneCutterRecipe(recipeId, inputName, inputAux, outputName, outputAux, outputCount);
}
static registerSmithingTrimRecipe(recipeId, template, base, addition) {
return GMLIB_API.registerSmithingTrimRecipe(recipeId, template, base, addition);
}
static registerSmithingTransformRecipe(recipeId, template, base, addition, result) {
return GMLIB_API.registerSmithingTransformRecipe(recipeId, template, base, addition, result);
}
static registerBrewingContainerRecipe(recipeId, input, output, reagent) {
return GMLIB_API.registerBrewingContainerRecipe(recipeId, input, output, reagent);
}
static registerBrewingMixRecipe(recipeId, input, output, reagent) {
return GMLIB_API.registerBrewingMixRecipe(recipeId, input, output, reagent);
}
// tags ["furnace", "blast_furnace", "smoker", "campfire", "soul_campfire"]
static registerFurnaceRecipe(recipeId, input, output, tags = ["furnace"]) {
return GMLIB_API.registerFurnaceRecipe(recipeId, input, output, tags);
}
// unlock : "AlwaysUnlocked", "PlayerHasManyItems", "PlayerInWater", "None", Item ID
static registerShapedRecipe(recipeId, shape, ingredients, result, count = 1, unlock = "AlwaysUnlocked") {
return GMLIB_API.registerShapedRecipe(recipeId, shape, ingredients, result, count, unlock);
}
static registerShapelessRecipe(recipeId, ingredients, result, count = 1, unlock = "AlwaysUnlocked") {
return GMLIB_API.registerShapelessRecipe(recipeId, ingredients, result, count, unlock);
}
}
class Experiments {
constructor() {
throw new Error("Static class cannot be instantiated");
}
static getAllExperimentIds() {
return GMLIB_API.getAllExperiments();
}
static getExperimentTranslatedName(id) {
return GMLIB_API.getExperimentTranslatedName(id);
}
static getExperimentsMap() {
let ids = this.getAllExperimentIds();
let result = {};
for (let id in ids) {
let name = this.getExperimentTranslatedName(id);
result[id] = name;
}
return result;
}
static getExperimentEnabled(id) {
return GMLIB_API.getExperimentEnabled(id);
}
static setExperimentEnabled(id, value = true) {
return GMLIB_API.setExperimentEnabled(id, value);
}
static registerExperimentsRequire(id) {
return GMLIB_API.registerExperimentsRequire(id);
}
}
class GMLIB {
constructor() {
throw new Error("Static class cannot be instantiated");
}
static isVersionMatched(major, minor, patch) {
return GMLIB_API.isVersionMatched(major, minor, patch);
}
static getVersion_LRCA() {
return GMLIB_API.getVersion_LRCA();
}
static getVersion_GMLIB() {
return GMLIB_API.getVersion_GMLIB();
}
}
module.exports = { StaticFloatingText, DynamicFloatingText, Minecraft, Recipes, Experiments, GMLIB };
+2
View File
@@ -92,6 +92,7 @@ function pack_plugin(target,plugin_define)
local outputdir = path.join(bindir, plugin_define.pluginName) local outputdir = path.join(bindir, plugin_define.pluginName)
local targetfile = path.join(outputdir, plugin_define.pluginFile) local targetfile = path.join(outputdir, plugin_define.pluginFile)
local pdbfile = path.join(outputdir, path.basename(plugin_define.pluginFile) .. ".pdb") local pdbfile = path.join(outputdir, path.basename(plugin_define.pluginFile) .. ".pdb")
local libfile = path.join(os.projectdir(), "lib")
local manifestfile = path.join(outputdir, "manifest.json") local manifestfile = path.join(outputdir, "manifest.json")
local oritargetfile = target:targetfile() local oritargetfile = target:targetfile()
local oripdbfile = path.join(path.directory(oritargetfile), path.basename(oritargetfile) .. ".pdb") local oripdbfile = path.join(path.directory(oritargetfile), path.basename(oritargetfile) .. ".pdb")
@@ -101,6 +102,7 @@ function pack_plugin(target,plugin_define)
if os.isfile(oripdbfile) then if os.isfile(oripdbfile) then
os.cp(oripdbfile, pdbfile) os.cp(oripdbfile, pdbfile)
end end
os.cp(libfile, outputdir)
formattedmanifest = string_formatter(manifest, plugin_define) formattedmanifest = string_formatter(manifest, plugin_define)
io.writefile(manifestfile,formattedmanifest) io.writefile(manifestfile,formattedmanifest)
+89 -3
View File
@@ -2,15 +2,101 @@
void Export_Compatibility_API() { void Export_Compatibility_API() {
RemoteCall::exportAs("GMLIB_API", "getServerMspt", []() -> float { RemoteCall::exportAs("GMLIB_API", "getServerMspt", []() -> float {
return GMLIB_Level::getLevel()->getServerMspt(); auto level = GMLIB_Level::getLevel();
if (!level) {
return 0.0f;
}
return level->getServerMspt();
}); });
RemoteCall::exportAs("GMLIB_API", "getServerCurrentTps", []() -> float { RemoteCall::exportAs("GMLIB_API", "getServerCurrentTps", []() -> float {
return GMLIB_Level::getLevel()->getServerCurrentTps(); auto level = GMLIB_Level::getLevel();
if (!level) {
return 0.0f;
}
return level->getServerCurrentTps();
}); });
RemoteCall::exportAs("GMLIB_API", "getServerAverageTps", []() -> float { RemoteCall::exportAs("GMLIB_API", "getServerAverageTps", []() -> float {
return GMLIB_Level::getLevel()->getServerAverageTps(); auto level = GMLIB_Level::getLevel();
if (!level) {
return 0.0f;
}
return level->getServerAverageTps();
}); });
RemoteCall::exportAs("GMLIB_API", "getAllPlayerUuids", []() -> std::vector<std::string> { RemoteCall::exportAs("GMLIB_API", "getAllPlayerUuids", []() -> std::vector<std::string> {
return GMLIB_Player::getAllUuids(); return GMLIB_Player::getAllUuids();
}); });
RemoteCall::exportAs("GMLIB_API", "getAllExperiments", []() -> std::vector<int> {
auto map = GMLIB_Level::getAllExperiments();
std::vector<int> result;
for (auto& key : map) {
result.push_back(key.first);
}
return result;
});
RemoteCall::exportAs("GMLIB_API", "getExperimentTranslatedName", [](int id) -> std::string {
auto map = GMLIB_Level::getAllExperimentsTranslateKeys();
if (map.count(id)) {
return std::string(map[id]);
}
return "";
});
RemoteCall::exportAs(
"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);
return ft->getRuntimeID();
}
);
RemoteCall::exportAs("GMLIB_API", "setFloatingTextData", [](int id, std::string text) -> bool {
auto ft = GMLIB::Server::FloatingText::getFloatingText(id);
if (ft) {
ft->setText(text);
return true;
}
return false;
});
RemoteCall::exportAs("GMLIB_API", "deleteFloatingText", [](int id) -> bool {
return GMLIB::Server::FloatingText::deleteFloatingText(id);
});
RemoteCall::exportAs("GMLIB_API", "sendFloatingTextToPlayer", [](int id, Player* pl) -> bool {
auto ft = GMLIB::Server::FloatingText::getFloatingText(id);
if (ft) {
ft->sendToClient(pl);
return true;
}
return false;
});
RemoteCall::exportAs("GMLIB_API", "sendFloatingText", [](int id) -> bool {
auto ft = GMLIB::Server::FloatingText::getFloatingText(id);
if (ft) {
ft->sendToAllClients();
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);
return true;
}
return false;
});
RemoteCall::exportAs("GMLIB_API", "removeFloatingText", [](int id) -> bool {
auto ft = GMLIB::Server::FloatingText::getFloatingText(id);
if (ft) {
ft->removeFromAllClients();
return true;
}
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);
});
RemoteCall::exportAs("GMLIB_API", "getVersion_LRCA", []() -> std::string { return LIB_VERSION.asString(); });
RemoteCall::exportAs("GMLIB_API", "getVersion_GMLIB", []() -> std::string {
return GMLIB::Version::getLibVersionString();
});
} }
+3 -1
View File
@@ -1,11 +1,13 @@
#pragma once #pragma once
#include <include_all.h> #include <GMLIB/include_lib.h>
#include <RemoteCallAPI.h> #include <RemoteCallAPI.h>
#define PLUGIN_NAME "GMLIB-LRCA" #define PLUGIN_NAME "GMLIB-LRCA"
#define LIB_VERSION SemVersion(0, 8, 4, "", "")
extern ll::Logger logger; extern ll::Logger logger;
extern void Export_Legacy_GMLib_ModAPI(); extern void Export_Legacy_GMLib_ModAPI();
extern void Export_Legacy_GMLib_ServerAPI(); extern void Export_Legacy_GMLib_ServerAPI();
extern void Export_Compatibility_API(); extern void Export_Compatibility_API();
extern void ExportPAPI();
+47 -5
View File
@@ -1,7 +1,6 @@
#include "Global.h" #include "Global.h"
std::unordered_set<std::string> HardCodedKeys = {"AlwaysUnlocked", "PlayerHasManyItems", "PlayerInWater", "None"}; std::unordered_set<std::string> HardCodedKeys = {"AlwaysUnlocked", "PlayerHasManyItems", "PlayerInWater", "None"};
std::unordered_set<int> ExperimentsList = {6, 7, 8, 9, 10, 12, 15, 16};
std::variant<std::string, std::vector<RecipeIngredient>> makeRecipeUnlockingKey(std::string& key) { std::variant<std::string, std::vector<RecipeIngredient>> makeRecipeUnlockingKey(std::string& key) {
if (HardCodedKeys.count(key)) { if (HardCodedKeys.count(key)) {
@@ -23,6 +22,10 @@ void Export_Legacy_GMLib_ModAPI() {
std::string result, std::string result,
int count, int count,
std::string unlock) -> void { std::string unlock) -> void {
auto level = GMLIB_Level::getLevel();
if (!level) {
return;
}
std::vector<RecipeIngredient> types; std::vector<RecipeIngredient> types;
for (auto ing : ingredients) { for (auto ing : ingredients) {
auto key = RecipeIngredient(ing, 0, 1); auto key = RecipeIngredient(ing, 0, 1);
@@ -42,6 +45,10 @@ void Export_Legacy_GMLib_ModAPI() {
std::string result, std::string result,
int count, int count,
std::string unlock) -> void { std::string unlock) -> void {
auto level = GMLIB_Level::getLevel();
if (!level) {
return;
}
std::vector<RecipeIngredient> types; std::vector<RecipeIngredient> types;
for (auto ing : ingredients) { for (auto ing : ingredients) {
auto key = RecipeIngredient(ing, 0, 1); auto key = RecipeIngredient(ing, 0, 1);
@@ -56,6 +63,10 @@ void Export_Legacy_GMLib_ModAPI() {
"GMLib_ModAPI", "GMLib_ModAPI",
"registerFurnaceRecipe", "registerFurnaceRecipe",
[](std::string recipe_id, std::string input, std::string output, std::vector<std::string> tags) -> void { [](std::string recipe_id, std::string input, std::string output, std::vector<std::string> tags) -> void {
auto level = GMLIB_Level::getLevel();
if (!level) {
return;
}
auto inp = RecipeIngredient(input, 0, 1); auto inp = RecipeIngredient(input, 0, 1);
auto outp = RecipeIngredient(output, 0, 1); auto outp = RecipeIngredient(output, 0, 1);
GMLIB::Mod::CustomRecipe::registerFurnaceRecipe(recipe_id, inp, outp, tags); GMLIB::Mod::CustomRecipe::registerFurnaceRecipe(recipe_id, inp, outp, tags);
@@ -65,6 +76,10 @@ void Export_Legacy_GMLib_ModAPI() {
"GMLib_ModAPI", "GMLib_ModAPI",
"registerBrewingMixRecipe", "registerBrewingMixRecipe",
[](std::string recipe_id, std::string input, std::string output, std::string reagent) -> void { [](std::string recipe_id, std::string input, std::string output, std::string reagent) -> void {
auto level = GMLIB_Level::getLevel();
if (!level) {
return;
}
auto rea = RecipeIngredient(reagent, 0, 1); auto rea = RecipeIngredient(reagent, 0, 1);
GMLIB::Mod::CustomRecipe::registerBrewingMixRecipe(recipe_id, input, output, rea); GMLIB::Mod::CustomRecipe::registerBrewingMixRecipe(recipe_id, input, output, rea);
} }
@@ -73,6 +88,10 @@ void Export_Legacy_GMLib_ModAPI() {
"GMLib_ModAPI", "GMLib_ModAPI",
"registerBrewingContainerRecipe", "registerBrewingContainerRecipe",
[](std::string recipe_id, std::string input, std::string output, std::string reagent) -> void { [](std::string recipe_id, std::string input, std::string output, std::string reagent) -> void {
auto level = GMLIB_Level::getLevel();
if (!level) {
return;
}
auto inp = RecipeIngredient(input, 0, 1); auto inp = RecipeIngredient(input, 0, 1);
auto outp = RecipeIngredient(output, 0, 1); auto outp = RecipeIngredient(output, 0, 1);
auto rea = RecipeIngredient(reagent, 0, 1); auto rea = RecipeIngredient(reagent, 0, 1);
@@ -87,6 +106,10 @@ void Export_Legacy_GMLib_ModAPI() {
std::string base, std::string base,
std::string addition, std::string addition,
std::string result) -> void { std::string result) -> void {
auto level = GMLIB_Level::getLevel();
if (!level) {
return;
}
GMLIB::Mod::CustomRecipe::registerSmithingTransformRecipe( GMLIB::Mod::CustomRecipe::registerSmithingTransformRecipe(
recipe_id, recipe_id,
smithing_template, smithing_template,
@@ -100,6 +123,10 @@ void Export_Legacy_GMLib_ModAPI() {
"GMLib_ModAPI", "GMLib_ModAPI",
"registerSmithingTrimRecipe", "registerSmithingTrimRecipe",
[](std::string recipe_id, std::string smithing_template, std::string base, std::string addition) -> void { [](std::string recipe_id, std::string smithing_template, std::string base, std::string addition) -> void {
auto level = GMLIB_Level::getLevel();
if (!level) {
return;
}
GMLIB::Mod::CustomRecipe::registerSmithingTrimRecipe(recipe_id, smithing_template, base, addition); GMLIB::Mod::CustomRecipe::registerSmithingTrimRecipe(recipe_id, smithing_template, base, addition);
} }
); );
@@ -112,6 +139,10 @@ void Export_Legacy_GMLib_ModAPI() {
std::string output, std::string output,
int output_data, int output_data,
int output_count) -> void { int output_count) -> void {
auto level = GMLIB_Level::getLevel();
if (!level) {
return;
}
auto inp = RecipeIngredient(input, 0, 1); auto inp = RecipeIngredient(input, 0, 1);
auto outp = RecipeIngredient(output, 0, 1); auto outp = RecipeIngredient(output, 0, 1);
GMLIB::Mod::CustomRecipe::registerStoneCutterRecipe(recipe_id, inp, outp); GMLIB::Mod::CustomRecipe::registerStoneCutterRecipe(recipe_id, inp, outp);
@@ -123,19 +154,30 @@ void Export_Legacy_GMLib_ModAPI() {
}); });
// 实验性 // 实验性
RemoteCall::exportAs("GMLib_ModAPI", "registerExperimentsRequire", [](int experiment_id) -> void { RemoteCall::exportAs("GMLib_ModAPI", "registerExperimentsRequire", [](int experiment_id) -> void {
if (ExperimentsList.count(experiment_id)) { auto map = GMLIB_Level::getAllExperiments();
if (map.count(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 {
if (ExperimentsList.count(experiment_id)) { auto level = GMLIB_Level::getLevel();
if (!level) {
return;
}
auto map = GMLIB_Level::getAllExperiments();
if (map.count(experiment_id)) {
GMLIB_Level::getLevel()->setExperimentEnabled(((AllExperiments)experiment_id), value); GMLIB_Level::getLevel()->setExperimentEnabled(((AllExperiments)experiment_id), value);
} else ll::Logger("Server").error("Experiment ID '{}' does not exist!", experiment_id); } 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 {
if (ExperimentsList.count(experiment_id)) { auto level = GMLIB_Level::getLevel();
if (!level) {
return false;
}
auto map = GMLIB_Level::getAllExperiments();
if (map.count(experiment_id)) {
return GMLIB_Level::getLevel()->getExperimentEnabled(((AllExperiments)experiment_id)); return GMLIB_Level::getLevel()->getExperimentEnabled(((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);
+30 -27
View File
@@ -7,43 +7,46 @@ void Export_Legacy_GMLib_ServerAPI() {
RemoteCall::exportAs("GMLib_ServerAPI", "registerAbilityCommand", []() -> void { RemoteCall::exportAs("GMLib_ServerAPI", "registerAbilityCommand", []() -> void {
GMLIB_Level::forceEnableAbilityCommand(); GMLIB_Level::forceEnableAbilityCommand();
}); });
RemoteCall::exportAs("GMLib_ServerAPI", "addFloatingTextPacket", [](std::string text, std::pair<Vec3, int> pos, int dimid) -> int {
auto ft = new FloatingText(text, pos.first, pos.second);
return ft->mRuntimeId;
});
RemoteCall::exportAs("GMLib_ServerAPI", "deleteFloatingTextPacket", [](int id) -> void {
FloatingText::deleteFloatingText(id);
});
RemoteCall::exportAs("GMLib_ServerAPI", "setEnableAchievement", []() -> void { RemoteCall::exportAs("GMLib_ServerAPI", "setEnableAchievement", []() -> void {
GMLIB_Level::setForceAchievementsEnabled(); GMLIB_Level::setForceAchievementsEnabled();
}); });
RemoteCall::exportAs("GMLib_ServerAPI", "setForceTrustSkins", []() -> void { RemoteCall::exportAs("GMLib_ServerAPI", "setForceTrustSkins", []() -> void { GMLIB_Level::setForceTrustSkin(); });
GMLIB_Level::setForceTrustSkin(); RemoteCall::exportAs("GMLib_ServerAPI", "enableCoResourcePack", []() -> void { GMLIB_Level::setCoResourcePack(); });
});
RemoteCall::exportAs("GMLib_ServerAPI", "enableCoResourcePack", []() -> void {
GMLIB_Level::setCoResourcePack();
});
RemoteCall::exportAs("GMLib_ServerAPI", "getLevelName", []() -> std::string { RemoteCall::exportAs("GMLib_ServerAPI", "getLevelName", []() -> std::string {
return GMLIB_Level::getLevel()->getLevelName(); auto level = GMLIB_Level::getLevel();
if (!level) {
return "";
}
return level->getLevelName();
}); });
RemoteCall::exportAs("GMLib_ServerAPI", "setLevelName", [](std::string name) -> void { RemoteCall::exportAs("GMLib_ServerAPI", "setLevelName", [](std::string name) -> void {
GMLIB_Level::getLevel()->setLevelName(name); auto level = GMLIB_Level::getLevel();
if (!level) {
return;
}
return level->setLevelName(name);
}); });
RemoteCall::exportAs("GMLib_ServerAPI", "setFakeSeed", [](int64_t seed) -> void { RemoteCall::exportAs("GMLib_ServerAPI", "setFakeSeed", [](int64_t seed) -> void {
GMLIB_Level::getLevel()->setFakeSeed(seed); return GMLIB_Level::setFakeSeed(seed);
}); });
RemoteCall::exportAs("GMLib_ServerAPI", "spawnEntity", [](std::pair<Vec3, int> pos, std::string name) -> Actor* { RemoteCall::exportAs("GMLib_ServerAPI", "spawnEntity", [](std::pair<Vec3, int> pos, std::string name) -> Actor* {
return GMLIB_Spawner::spawnEntity(pos.first, pos.second, name); return GMLIB_Spawner::spawnEntity(pos.first, pos.second, name);
}); });
RemoteCall::exportAs("GMLib_ServerAPI", "shootProjectile", [](Actor* owner, std::string name, float speed, float offset) -> Actor* { RemoteCall::exportAs(
auto ac = (GMLIB_Actor*)owner; "GMLib_ServerAPI",
return ac->shootProjectile(name, speed, offset); "shootProjectile",
}); [](Actor* owner, std::string name, float speed, float offset) -> Actor* {
RemoteCall::exportAs("GMLib_ServerAPI", "throwEntity", [](Actor* owner, Actor* actor, float speed, float offset) -> bool { auto ac = (GMLIB_Actor*)owner;
auto ac = (GMLIB_Actor*)owner; return ac->shootProjectile(name, speed, offset);
return ac->throwEntity(actor, speed, offset); }
}); );
RemoteCall::exportAs("GMLib_ServerAPI", "PlayerToEntity", [](Player* player) -> Actor* { RemoteCall::exportAs(
return (Actor*)player; "GMLib_ServerAPI",
}); "throwEntity",
[](Actor* owner, Actor* actor, float speed, float offset) -> bool {
auto ac = (GMLIB_Actor*)owner;
return ac->throwEntity(actor, speed, offset);
}
);
RemoteCall::exportAs("GMLib_ServerAPI", "PlayerToEntity", [](Player* player) -> Actor* { return (Actor*)player; });
} }
+7
View File
@@ -0,0 +1,7 @@
// This file will make your plugin use LeviLamina's memory operators by default.
// This improves the memory management of your plugin and is recommended to use.
// You should not modify anything in this file.
#define LL_MEMORY_OPERATORS
#include <ll/api/memory/MemoryOperators.h>
+7
View File
@@ -0,0 +1,7 @@
// This file will make your plugin use LeviLamina's memory operators by default.
// This improves the memory management of your plugin and is recommended to use.
// You should not modify anything in this file.
#define LL_MEMORY_OPERATORS
#include <ll/api/memory/MemoryOperators.h>
+132
View File
@@ -0,0 +1,132 @@
#include "Global.h"
#include <regex>
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) {
return GMLIB::Server::PlaceholderAPI::getValue(a1, ll::service::bedrock::getLevel()->getPlayer(a2));
}
std::string
registerPlayerPlaceholder(std::string const& PluginName, std::string const& FuncName, std::string const& PAPIName) {
if (RemoteCall::hasFunc(PluginName, FuncName)) {
if (isParameters(PAPIName)) {
auto Call =
RemoteCall::importAs<std::string(std::string const& arg, 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->getXuid(), map);
},
PluginName
);
} else {
auto Call = RemoteCall::importAs<std::string(std::string const& arg)>(PluginName, FuncName);
GMLIB::Server::PlaceholderAPI::registerPlayerPlaceholder(
PAPIName,
[Call](Player* sp) { return Call(sp->getXuid()); },
PluginName
);
}
} else {
// logger.error("Function no find({}:{})", PluginName, FuncName);
return "Function no find";
}
return "Register Success";
}
std::string
registerServerPlaceholder(std::string const& PluginName, std::string const& FuncName, std::string const& PAPIName) {
if (RemoteCall::hasFunc(PluginName, FuncName)) {
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
);
}
} else {
// logger.error("Function no find({}:{})", PluginName, FuncName);
return "Function no find";
}
return "Register Success";
}
std::string registerStaticPlaceholder(
std::string const& PluginName,
std::string const& FuncName,
std::string const& PAPIName,
int num
) {
if (RemoteCall::hasFunc(PluginName, FuncName)) {
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
);
}
}
} else {
// logger.error("Function no find({}:{})", PluginName, FuncName);
return "Function no find";
}
return "Register Success";
}
std::string translateString(std::string const& str, std::string const& xuid) {
return GMLIB::Server::PlaceholderAPI::translate(str, ll::service::bedrock::getLevel()->getPlayerByXuid(xuid));
}
bool unRegisterPlaceholder(std::string const& str) { return GMLIB::Server::PlaceholderAPI::unRegisterPlaceholder(str); }
std::vector<std::string> getAllPAPI() { return GMLIB::Server::PlaceholderAPI::getAllPAPI(); }
} // namespace PAPIRemoteCall
#define EXPORTAPI(T) \
RemoteCall::exportAs("BEPlaceholderAPI", ll::utils::string_utils::replaceAll(#T, "PAPIRemoteCall::", ""), T);
void ExportPAPI() {
EXPORTAPI(PAPIRemoteCall::registerPlayerPlaceholder);
EXPORTAPI(PAPIRemoteCall::registerServerPlaceholder);
EXPORTAPI(PAPIRemoteCall::registerStaticPlaceholder);
EXPORTAPI(PAPIRemoteCall::GetValue);
EXPORTAPI(PAPIRemoteCall::GetValueWithPlayer);
EXPORTAPI(PAPIRemoteCall::translateString);
EXPORTAPI(PAPIRemoteCall::unRegisterPlaceholder);
EXPORTAPI(PAPIRemoteCall::getAllPAPI);
}
+2
View File
@@ -10,7 +10,9 @@ Plugin::Plugin(ll::plugin::NativePlugin& self) : mSelf(self) {
Export_Legacy_GMLib_ModAPI(); Export_Legacy_GMLib_ModAPI();
Export_Legacy_GMLib_ServerAPI(); Export_Legacy_GMLib_ServerAPI();
Export_Compatibility_API(); Export_Compatibility_API();
ExportPAPI();
logger.info("GMLIB-LegacyRemoteCallApi Loaded!"); logger.info("GMLIB-LegacyRemoteCallApi Loaded!");
logger.info("Version: {}", LIB_VERSION.asString());
logger.info("Author: GroupMountain"); logger.info("Author: GroupMountain");
logger.info("Repository: https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi"); logger.info("Repository: https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi");
} }
+29
View File
@@ -0,0 +1,29 @@
{
"format_version": 2,
"tooth": "github.com/GroupMountain/GMLIB-LegacyRemoteCallApi",
"version": "0.8.4",
"info": {
"name": "GMLIB-LegacyRemoteCallApi",
"description": "Legacy RemoteCall API for GMLIB",
"source": "github.com/GroupMountain/GMLIB-LegacyRemoteCallApi",
"author": "GroupMountain",
"tags": [
"levilamina",
"gmlib",
"lse",
"library"
]
},
"asset_url": "https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi/releases/download/v0.8.4/GMLIB-LegacyRemoteCallApi-windows-x64.zip",
"dependencies": {
"github.com/GroupMountain/GMLIB": ">=0.8.5"
},
"files": {
"place": [
{
"src": "GMLIB-LegacyRemoteCallApi/*",
"dest": "plugins/GMLIB-LegacyRemoteCallApi"
}
]
}
}