chore: update version

添加注释和导出接口跟事件

.github/workflows/build.yml

@@ -9,12 +9,10 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
-        with:
-          submodules: recursive
-
-      - uses: actions/checkout@v4
 
       - uses: xmake-io/github-action-setup-xmake@v1
+        with:
+          xmake-version: "2.9.3"
       
       - run: |
           xmake repo -u
@@ -29,4 +27,10 @@ jobs:
         with:
           name: ${{ github.event.repository.name }}-windows-x64-${{ github.sha }}
           path: |
-            bin/
+            bin/DLL/
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: PDB
+          path: |
+            bin/PDB/

.github/workflows/release.yml

@@ -9,12 +9,10 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
-        with:
-          submodules: recursive
-          
-      - uses: actions/checkout@v4
 
       - uses: xmake-io/github-action-setup-xmake@v1
+        with:
+          xmake-version: "2.9.3"
       
       - run: |
           xmake repo -u
@@ -29,7 +27,13 @@ jobs:
         with:
           name: ${{ github.event.repository.name }}-windows-x64-${{ github.sha }}
           path: |
-            bin/
+            bin/DLL/
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: PDB
+          path: |
+            bin/PDB/
 
   upload-to-release:
     needs:
@@ -38,24 +42,35 @@ jobs:
       contents: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout code
+        uses: actions/checkout@v4
 
-      - uses: actions/download-artifact@v3
+      - name: Download Plugin
+        uses: actions/download-artifact@v3
         with:
           name: ${{ github.event.repository.name }}-windows-x64-${{ github.sha }}
-          path: release/
+          path: release/Plugin/
 
-      - run: |
-          cp LICENSE README.md release/
+      - name: Download PDB
+        uses: actions/download-artifact@v3
+        with:
+          name: PDB
+          path: release/PDB/
+
+      - name: Copy additional files
+        run: |
+          cp LICENSE README.md release/Plugin/
 
       - name: Archive release
         run: |
-          cd release
+          cd release/Plugin
           zip -r ../${{ github.event.repository.name }}-windows-x64.zip *
           cd ..
 
-      - uses: softprops/action-gh-release@v1
+      - name: Create GitHub Release
+        id: create_release
+        uses: softprops/action-gh-release@v1
         with:
-          append_body: true
           files: |
-            ${{ github.event.repository.name }}-windows-x64.zip
+            release/${{ github.event.repository.name }}-windows-x64.zip
+            release/PDB/${{ github.event.repository.name }}.pdb 

.gitignore

@@ -15,3 +15,4 @@ build/
 /.xmake
 /CMakeLists.txt
 /bin
+.cache/clangd/index

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "SDK-GMLIB"]
-	path = SDK-GMLIB
-	url = https://github.com/GroupMountain/SDK-GMLIB.git

README.md

@@ -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/

lib/BEPlaceholderAPI-JS.d.ts

@@ -0,0 +1,72 @@
+declare class PAPI {
+    /** 注册一个玩家PAPI变量 */
+    static registerPlayerPlaceholder(
+        /** PAPI调用函数 */
+        func: (
+            /** 玩家对象 */
+            player: Player,
+            /** 变量参数 */
+            param: null | object.<string, string>
+        ) => string,
+        /** 插件名字 */
+        pluginsName: string,
+        /** PAPI变量 */
+        PAPIName: string
+    ): boolean;
+
+    /** 注册一个服务器PAPI变量 */
+    static registerServerPlaceholder(
+        /** PAPI调用函数 */
+        func: (
+            /** 变量参数 */
+            param: null | object.<string, string>
+        ) => string,
+        /** 插件名字 */
+        pluginsName: string,
+        /** PAPI变量 */
+        PAPIName: string
+    ): boolean;
+
+    /** 注册一个静态PAPI变量 */
+    static registerStaticPlaceholder(
+        /** PAPI调用函数 */
+        func: () => string,
+        /** 插件名字 */
+        pluginsName: string,
+        /** PAPI变量 */
+        PAPIName: string,
+        /** 更新时间 */
+        UpdateInterval: number
+    ): boolean;
+
+    /** 获取一个服务器变量的值 */
+    static getValue(
+        /** PAPI名 */
+        key: string
+    ): string;
+
+    /** 获取一个玩家变量的值 */
+    static getValueByPlayer(
+        /** PAPI名 */
+        key: string,
+        /** 玩家对象 */
+        pl: Player
+    ): string;
+
+    /** 翻译带PAPI变量的字符串 */
+    static translateString(
+        /** 要翻译的字符串 */
+        str: string,
+        /** 玩家对象 */
+        pl: Player | undefined
+    ): string;
+
+    /** 注销一个PAPI变量 */
+    static unRegisterPlaceholder(
+        /** PAPI名 */
+        str: string
+    ): boolean;
+
+    /** 获取所有已注册的PAPI变量 */
+    static getAllPAPI(): string[];
+}

lib/BEPlaceholderAPI-JS.js

@@ -1,54 +1,139 @@
-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]
+const PlaceholderAPI = {
+    /** 获取一个服务器变量的值 @type {function(string):string} */
+    getValueAPI: ll.import("BEPlaceholderAPI", "GetValue"),
+    /** 获取一个玩家变量的值 @type {function(string,Player):string} */
+    getValueByPlayerAPI: ll.import("BEPlaceholderAPI", "GetValueWithPlayer"),
+    /** 注册一个玩家变量 @type {function(string,string,string):boolean} */
+    registerPlayerPlaceholderAPI: ll.import("BEPlaceholderAPI", "registerPlayerPlaceholder"),
+    /** 注册一个服务器变量 @type {function(string,string,string):boolean} */
+    registerServerPlaceholderAPI: ll.import("BEPlaceholderAPI", "registerServerPlaceholder"),
+    /** 注册一个静态变量 @type {function(string,string,string,number):boolean} */
+    registerStaticPlaceholderAPI: ll.import("BEPlaceholderAPI", "registerStaticPlaceholder"),
+    /** 翻译包含PAPI服务器变量的字符串 @type {function(string):string} */
+    translateStringAPI: ll.import("BEPlaceholderAPI", "translateString"),
+    /** 翻译包含PAPI玩家变量的字符串 @type {function(string,Player):string} */
+    translateStringWithPlayerAPI: ll.import("BEPlaceholderAPI", "translateStringWithPlayer"),
+    /** 注销PAPI变量 @type {function(string):boolean} */
+    unRegisterPlaceholderAPI: ll.import("BEPlaceholderAPI", "unRegisterPlaceholder"),
+    /** 获取所有已注册的PAPI变量 @type {function():Array.<string>} */
+    getAllPAPI: ll.import("BEPlaceholderAPI", "getAllPAPI")
 }
 
+Function.prototype.getName =
+    /**
+     * 获取函数名字
+     * @returns {string}
+     */
+    function () {
+        return this.name || this.toString().match(/function\s*([^(]*)\(/)?.[1] || getStringHashCode(this.toString()).toString(16);
+    }
+
+/**
+ * 获取字符串哈希值
+ * @param {string} str 字符串
+ * @returns {number}
+ */
+function getStringHashCode(str) {
+    let hash = 0, chr;
+    if (str.length === 0) return hash;
+    for (let i = 0; i < str.length; i++) {
+        chr = str.charCodeAt(i);
+        hash = ((hash << 5) - hash) + chr;
+        hash |= 0;
+    }
+    return hash;
+}
+
+/** PAPI变量类 */
 class PAPI {
     constructor() {
         throw new Error("Static class cannot be instantiated");
     }
 
+    /**
+     * 注册一个玩家PAPI变量
+     * @param {function} func 变量调用的函数
+     * @param {string} PluginName 插件名字
+     * @param {string} PAPIName PAPI变量名
+     * @returns {boolean} 是否注册成功
+     */
     static registerPlayerPlaceholder(func, PluginName, PAPIName) {
-        ll.export(func, PluginName, func.getName())
-        PAPIregisterPlayerPlaceholderAPI(PluginName, func.getName(), PAPIName)
+        ll.export(func, PluginName, func.getName());
+        return PlaceholderAPI.registerPlayerPlaceholderAPI(PluginName, func.getName(), PAPIName);
     }
 
+    /**
+     * 注册一个服务器PAPI变量
+     * @param {function} func 变量调用的函数
+     * @param {string} PluginName 插件名字
+     * @param {string} PAPIName PAPI变量名
+     * @returns {boolean} 是否注册成功
+     */
     static registerServerPlaceholder(func, PluginName, PAPIName) {
-        ll.export(func, PluginName, func.getName())
-        PAPIregisterServerPlaceholderAPI(PluginName, func.getName(), PAPIName)
+        ll.export(func, PluginName, func.getName());
+        return PlaceholderAPI.registerServerPlaceholderAPI(PluginName, func.getName(), PAPIName);
     }
 
+    /**
+     * 注册一个静态PAPI变量
+     * @param {function} func 变量调用的函数
+     * @param {string} PluginName 插件名字
+     * @param {string} PAPIName PAPI变量名
+     * @param {number} [UpdateInterval=50] 更新间隔
+     * @returns {boolean} 是否注册成功
+     */
     static registerStaticPlaceholder(func, PluginName, PAPIName, UpdateInterval = 50) {
-        ll.export(func, PluginName, func.getName())
-        PAPIregisterStaticPlaceholderAPI(PluginName, func.getName(), PAPIName, UpdateInterval)
+        ll.export(func, PluginName, func.getName());
+        return PlaceholderAPI.registerStaticPlaceholderAPI(PluginName, func.getName(), PAPIName, UpdateInterval);
     }
 
+    /**
+     * 获取一个服务器变量的值
+     * @param {string} key PAPI变量名
+     * @returns {string} 值
+     */
     static getValue(key) {
-        return PAPIgetValueAPI(key)
+        return PlaceholderAPI.getValueAPI(key);
     }
 
-    static getValueByPlayer(key, xuid) {
-        return PAPIgetValueByPlayerAPI(key, xuid)
+    /**
+     * 获取一个玩家变量的值
+     * @param {string} key PAPI变量名
+     * @param {Player} pl 玩家对象
+     * @returns {string} 值
+     */
+    static getValueByPlayer(key, pl) {
+        return PlaceholderAPI.getValueByPlayerAPI(key, pl);
     }
 
-    static translateString(str, xuid = "") {
-        return PAPItranslateStringAPI(str, xuid)
+    /**
+     * 翻译带PAPI变量的字符串
+     * @param {string} str 字符串
+     * @param {Player} pl 玩家对象
+     * @returns {string} 翻译结果
+     */
+    static translateString(str, pl = null) {
+        if (pl) {
+            return PlaceholderAPI.translateStringWithPlayerAPI(str, pl);
+        }
+        return PlaceholderAPI.translateStringAPI(str);
     }
 
+    /**
+     * 注销一个PAPI变量
+     * @param {string} str PAPI变量名
+     * @returns {boolean} 是否注销成功
+     */
     static unRegisterPlaceholder(str) {
-        return PAPIunRegisterPlaceholderAPI(str)
+        return PlaceholderAPI.unRegisterPlaceholderAPI(str);
     }
 
+    /**
+     * 获取所有已注册的PAPI变量
+     * @returns {Array.<string>} 已注册的PAPI变量数组
+     */
     static getAllPAPI() {
-        return PAPIgetAllPAPI();
+        return PlaceholderAPI.getAllPAPI();
     }
 
 }

lib/EventAPI-JS.d.ts

@@ -0,0 +1,251 @@
+/** 事件监听接口 */
+declare class Event {
+    /** 生物捡起物品 */
+    static listen(
+        /** 事件名 */
+        event: "onMobDie",
+        /** 监听函数 */
+        listener: (
+            /** 尝试捡起物品的实体对象 */
+            entity: Entity,
+            /** 掉落物实体对象 */
+            itemEntity: Entity
+        ) => boolean | void
+    ): boolean;
+
+    /** 客户端登录后事件(不可以拦截) */
+    static listen(
+        /** 事件名 */
+        event: "onClientLogin",
+        /** 监听函数 */
+        listener: (
+            /** 玩家的游戏名字 */
+            realName: string,
+            /** 玩家的uuid */
+            uuid: string,
+            /** 玩家在服务端的xuid */
+            serverXuid: string,
+            /** 玩家在客户端的xuid */
+            clientXuid: string
+        ) => void
+    ): boolean;
+
+    /** 天气改变事件事件 */
+    static listen(
+        /** 事件名 */
+        event: "onWeatherChange",
+        /** 监听函数 */
+        listener: (
+            /** 雷暴天气等级 */
+            lightningLevel: number,
+            /** 雨天天气等级 */
+            rainLevel: number,
+            /** 雷暴持续时间（刻） */
+            lightningLastTick: number,
+            /** 雨天持续时间(刻) */
+            rainingLastTick: number
+        ) => boolean | void
+    ): boolean;
+
+    /** 掉落物尝试生成 */
+    static listen(
+        event: "onItemTrySpawn",
+        listener: (
+            /** 物品对象 */
+            item: Item,
+            /** 尝试生成的坐标对象 */
+            pos: FloatPos,
+            /** 创建掉落物的实体uniqueId */
+            spawnerUniqueId: number
+        ) => boolean | void
+    ): boolean;
+
+    /** 掉落物生成完毕(不可以拦截) */
+    static listen(
+        /** 事件名 */
+        event: "onItemSpawned",
+        /** 回调函数 */
+        listener: (
+            /** 物品对象 */
+            item: Item,
+            /** 掉落物实体对象 */
+            entity: Entity,
+            /** 实体生成的坐标 */
+            pos: FloatPos,
+            /** 创建掉落物的实体uniqueId */
+            spawnerUniqueId: number
+        ) => void
+    ): boolean;
+
+    /** 实体切换维度 */
+    static listen(
+        /** 事件名 */
+        event: "onEntityTryChangeDim",
+        /** 回调函数 */
+        listener: (
+            /** 切换维度的实体对象 */
+            entity: Entity,
+            /** 前往到的维度ID */
+            dimid: number
+        ) => boolean | void
+    ): boolean;
+
+    /** 实体切换维度后(不可拦截) */
+    static listen(
+        /** 事件名 */
+        event: "onEntityChangeDim",
+        /** 回调函数 */
+        listener: (
+            /** 切换维度的实体对象 */
+            entity: Entity,
+            /** 前往到的维度ID */
+            fromDimid: number
+        ) => void
+    ): boolean;
+
+    /** 玩家下床 */
+    static listen(
+        /** 事件名 */
+        event: "onLeaveBed",
+        /** 回调函数 */
+        listener: (
+            /** 下床的玩家对象 */
+            player: Player
+        ) => boolean | void
+    ): boolean;
+
+    /** 触发死亡信息(不可以拦截) */
+    static listen(
+        /** 事件名 */
+        event: "onDeathMessage",
+        /** 回调函数 */
+        listener: (
+            /** 死亡信息键名 */
+            deathMsgKey: string,
+            /** 死亡信息翻译参数 */
+            deathMsgParams: string[],
+            /** 死亡实体的实体对象 */
+            entity: Entity
+        ) => void
+    ): boolean;
+
+    /** 实体受伤后事件 */
+    static listen(
+        /** 事件名 */
+        event: "onMobHurted",
+        /** 回调函数 */
+        listener: (
+            /** 受伤的实体对象 */
+            entity: Entity,
+            /** 造成伤害的实体对象 */
+            source: Entity,
+            /** 伤害值 */
+            damage: number,
+            /** 伤害类型 */
+            cause: number
+        ) => void
+    ): boolean;
+
+    /** 末影人搬起方块 */
+    static listen(
+        /** 事件名 */
+        event: "onEndermanTake",
+        /** 回调函数 */
+        listener: (
+            /** 末影人实体对象 */
+            entity: Entity
+        ) => boolean | void
+    ): boolean;
+
+    /** 末影龙重生事件 */
+    static listen(
+        /** 事件名 */
+        event: "onDragonRespawn",
+        /** 回调函数 */
+        listener: (
+            /** 末影龙重生后的UniqueID */
+            uniqueID: number
+        ) => boolean | void
+    ): boolean;
+
+    /** 弹射物实体尝试创建 */
+    static listen(
+        /** 事件名 */
+        event: "onProjectileTryCreate",
+        /** 回调函数 */
+        listener: (
+            /** 弹射物实体对象 */
+            entity: Entity,
+            /** 创建弹射的实体的uniqueID */
+            uniqueId: number
+        ) => boolean | void
+    ): boolean;
+
+    /** 弹射物实体成功后(不可拦截) */
+    static listen(
+        /** 事件名 */
+        event: "onProjectileCreate",
+        /** 回调函数 */
+        listener: (
+            /** 弹射物实体对象 */
+            entity: Entity,
+            /** 创建弹射的实体的uniqueID */
+            uniqueId: number
+        ) => void
+    ): boolean;
+
+    /** 生成流浪商人 */
+    static listen(
+        /** 事件名 */
+        event: "onSpawnWanderingTrader",
+        /** 回调函数 */
+        listener: (
+            /** 生成的坐标 */
+            pos: IntPos
+        ) => boolean | void
+    ): boolean;
+
+    /** 处理物品请求 */
+    static listen(
+        /** 事件名 */
+        event: "onHandleRequestAction",
+        /** 回调函数 */
+        listener: (
+            /** 请求玩家 */
+            player: Player,
+            /** 请求类型 */
+            actionType: string,
+            /** 请求数量 */
+            count: number,
+            /** 第一个格子的容器类型 */
+            sourceContainerNetId: string,
+            /** 第一个格子的槽位 */
+            sourceSlot: number,
+            /** 第二个格子的容器类型 */
+            destinationContainerNetId: string,
+            /** 第二个格子的槽位 */
+            destinationSlot: number
+        ) => boolean | void
+    ): boolean;
+
+    /** 发送容器关闭数据包后(不可拦截) */
+    static listen(
+        /** 事件名 */
+        event: "onSendContainerClosePacket",
+        /** 回调函数 */
+        listener: (
+            /** 要被关闭的玩家 */
+            player: Player,
+            /** 容器ID */
+            containerId: number
+        ) => void
+    ): boolean;
+
+    /** 关闭服务器(不可拦截) */
+    static listen(
+        /** 事件名 */
+        event: "onServerStopping",
+        /** 回调函数 */
+        listener: () => void
+    ): boolean;
+}

lib/EventAPI-JS.js

@@ -0,0 +1,28 @@
+/** 事件创建函数 @type {function(string,string):boolean} */
+const CallEvent = ll.import("GMLIB_Event_API", "callCustomEvent");
+/** 获取事件ID函数 @type {function():string} */
+const getNextEventId = ll.import("GMLIB_Event_API", "getNextScriptEventId");
+
+/** 事件类 */
+class Event {
+    constructor() { throw new Error("Static class cannot be instantiated"); }
+
+    /**
+     * 监听事件
+     * @param {string} event 事件名称
+     * @param {function} callback 回调
+     * @returns {boolean} 是否创建成功
+     */
+    static listen(event, callback) {
+        let eventId = getNextEventId();
+        ll.export(callback, event, eventId);
+        let result = CallEvent(event, eventId);
+        if (!result) {
+            logger.error(`Cannot listen event "${event}" !`);
+            logger.error(`GMLIB Script Event "${event}" does not exist !`);
+        }
+        return result;
+    }
+}
+
+module.exports = { Event };

manifest.json

@@ -1,7 +1,10 @@
 {
     "name": "${pluginName}",
     "entry": "${pluginFile}",
+    "version": "0.13.3",
+    "author": "GroupMountain",
     "type": "native",
+    "passive": true,
     "dependencies": [
         {
             "name": "GMLIB"

scripts/after_build.lua

@@ -88,10 +88,11 @@ function pack_plugin(target,plugin_define)
     local manifest_path = find_file("manifest.json", os.projectdir())
     if manifest_path then
         local manifest = io.readfile(manifest_path)
-        local bindir = path.join(os.projectdir(), "bin")
+        local bindir = path.join(os.projectdir(), "bin/DLL")
+        local pdbdir = path.join(os.projectdir(), "bin/PDB")
         local outputdir = path.join(bindir, plugin_define.pluginName)
         local targetfile = path.join(outputdir, plugin_define.pluginFile)
-        local pdbfile = path.join(outputdir, path.basename(plugin_define.pluginFile) .. ".pdb")
+        local pdbfile = path.join(pdbdir, path.basename(plugin_define.pluginFile) .. ".pdb")
         local libfile = path.join(os.projectdir(), "lib")
         local manifestfile = path.join(outputdir, "manifest.json")
         local oritargetfile = target:targetfile()

src/Entry.cpp

@@ -3,55 +3,34 @@
 
 ll::Logger logger(PLUGIN_NAME);
 
-namespace GMLIB_LegacyRemoteCallApi {
+namespace GMLIB {
 
-namespace {
+std::unique_ptr<LegacyRemoteCallApi>& LegacyRemoteCallApi::getInstance() {
+    static std::unique_ptr<LegacyRemoteCallApi> instance;
+    return instance;
+}
 
-std::unique_ptr<std::reference_wrapper<ll::plugin::NativePlugin>>
-    selfPluginInstance; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
-
-auto disable(ll::plugin::NativePlugin& /*self*/) -> bool { return false; }
-
-auto enable(ll::plugin::NativePlugin& /*self*/) -> bool { return true; }
-
-auto load(ll::plugin::NativePlugin& self) -> bool {
-    selfPluginInstance = std::make_unique<std::reference_wrapper<ll::plugin::NativePlugin>>(self);
+bool LegacyRemoteCallApi::load() {
     Export_Legacy_GMLib_ModAPI();
     Export_Legacy_GMLib_ServerAPI();
     Export_Compatibility_API();
     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-" + 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;
 }
 
-auto unload(ll::plugin::NativePlugin& self) -> bool { return false; }
+bool LegacyRemoteCallApi::enable() { return true; }
 
-} // namespace
+bool LegacyRemoteCallApi::disable() { return true; }
 
-auto getSelfPluginInstance() -> ll::plugin::NativePlugin& {
-    if (!selfPluginInstance) {
-        throw std::runtime_error("selfPluginInstance is null");
-    }
+} // namespace GMLIB
 
-    return *selfPluginInstance;
-}
-
-} // namespace GMLIB_LegacyRemoteCallApi
-
-extern "C" {
-_declspec(dllexport) auto ll_plugin_disable(ll::plugin::NativePlugin& self) -> bool {
-    return GMLIB_LegacyRemoteCallApi::disable(self);
-}
-_declspec(dllexport) auto ll_plugin_enable(ll::plugin::NativePlugin& self) -> bool {
-    return GMLIB_LegacyRemoteCallApi::enable(self);
-}
-_declspec(dllexport) auto ll_plugin_load(ll::plugin::NativePlugin& self) -> bool {
-    return GMLIB_LegacyRemoteCallApi::load(self);
-}
-_declspec(dllexport) auto ll_plugin_unload(ll::plugin::NativePlugin& self) -> bool {
-    return GMLIB_LegacyRemoteCallApi::unload(self);
-}
-}
+LL_REGISTER_MOD(LegacyRemoteCallApi, LegacyRemoteCallApi::getInstance());

src/Entry.h

@@ -1,9 +1,33 @@
 #pragma once
+#include <ll/api/mod/NativeMod.h>
+#include <ll/api/mod/RegisterHelper.h>
 
-#include <ll/api/plugin/NativePlugin.h>
+namespace GMLIB {
 
-namespace GMLIB_LegacyRemoteCallApi {
+class LegacyRemoteCallApi {
 
-[[nodiscard]] auto getSelfPluginInstance() -> ll::plugin::NativePlugin&;
+public:
+    static std::unique_ptr<LegacyRemoteCallApi>& getInstance();
 
-} // namespace GMLIB_LegacyRemoteCallApi
+    LegacyRemoteCallApi(ll::mod::NativeMod& self) : mSelf(self) {}
+
+    [[nodiscard]] ll::mod::NativeMod& getSelf() const { return mSelf; }
+
+    /// @return True if the plugin is loaded successfully.
+    bool load();
+
+    /// @return True if the plugin is enabled successfully.
+    bool enable();
+
+    /// @return True if the plugin is disabled successfully.
+    bool disable();
+
+    // TODO: Implement this method if you need to unload the plugin.
+    // /// @return True if the plugin is unloaded successfully.
+    // bool unload();
+
+private:
+    ll::mod::NativeMod& mSelf;
+};
+
+} // namespace GMLIB

src/EventAPI.cpp

@@ -0,0 +1,242 @@
+#include "Global.h"
+using namespace ll::hash_utils;
+
+class LegacyScriptEventManager {
+private:
+    int64                                             mNextEventId = 0;
+    std::unordered_map<int64, ll::event::ListenerPtr> mEventListeners;
+
+public:
+    std::string getNextEventId() {
+        mNextEventId++;
+        return "GMLIB_EVENT_" + std::to_string(mNextEventId);
+    }
+
+    void emplaceListener(std::string const& scriptEventId, ll::event::ListenerPtr listenerPtr) {
+        mEventListeners[doHash(scriptEventId)] = listenerPtr;
+    }
+
+    void removeListener(std::string const& scriptEventId) {
+        ll::event::EventBus::getInstance().removeListener(mEventListeners[doHash(scriptEventId)]);
+        mEventListeners.erase(doHash(scriptEventId));
+    }
+
+public:
+    static LegacyScriptEventManager& getInstance() {
+        static std::unique_ptr<LegacyScriptEventManager> instance;
+        if (!instance) {
+            instance = std::make_unique<LegacyScriptEventManager>();
+        }
+        return *instance;
+    }
+};
+
+#define REGISTER_EVENT_LISTEN(eventType, callFunction, eventParams, cancelFunction, otherFunction)                     \
+    eventManager.emplaceListener(                                                                                      \
+        eventId,                                                                                                       \
+        eventBus.emplaceListener<eventType>([eventName, eventId, &eventBus, &eventManager](eventType& ev) -> void {    \
+            if (!RemoteCall::hasFunc(eventName, eventId)) {                                                            \
+                eventManager.removeListener(eventId);                                                                  \
+                return;                                                                                                \
+            }                                                                                                          \
+            bool result = true;                                                                                        \
+            try {                                                                                                      \
+                otherFunction;                                                                                         \
+                result = RemoteCall::importAs<bool callFunction>(eventName, eventId) eventParams;                      \
+            } catch (...) {}                                                                                           \
+            if (!result) cancelFunction;                                                                               \
+        })                                                                                                             \
+    );                                                                                                                 \
+    return true;
+
+void Export_Event_API() {
+    RemoteCall::exportAs("GMLIB_Event_API", "getNextScriptEventId", []() -> std::string {
+        return LegacyScriptEventManager::getInstance().getNextEventId();
+    });
+    auto& eventBus     = ll::event::EventBus::getInstance();
+    auto& eventManager = LegacyScriptEventManager::getInstance();
+    RemoteCall::exportAs(
+        "GMLIB_Event_API",
+        "callCustomEvent",
+        [&eventBus, &eventManager](std::string const& eventName, std::string const& eventId) -> bool {
+            if (!RemoteCall::hasFunc(eventName, eventId)) return false;
+            switch (doHash(eventName)) {
+            case doHash("onClientLogin"): {
+                REGISTER_EVENT_LISTEN(
+                    Event::PacketEvent::ClientLoginAfterEvent,
+                    (std::string const& realName,
+                     std::string const& uuid,
+                     std::string const& serverXuid,
+                     std::string const& clientXuid),
+                    (ev.getRealName(), ev.getUuid().asString(), ev.getServerAuthXuid(), ev.getClientAuthXuid()),
+                    logger.error("Event \"onClientLogin\" cannot be intercepted"),
+                );
+            }
+            case doHash("onWeatherChange"): {
+                REGISTER_EVENT_LISTEN(
+                    Event::LevelEvent::WeatherUpdateBeforeEvent,
+                    (int lightningLevel, int rainLevel, int lightningLast, int rainLast),
+                    (ev.getLightningLevel(), ev.getRainLevel(), ev.getLightningLastTick(), ev.getRainingLastTick()),
+                    ev.cancel(),
+                );
+            }
+            case doHash("onMobPick"): {
+                REGISTER_EVENT_LISTEN(
+                    Event::EntityEvent::MobPickupItemBeforeEvent,
+                    (Actor * mob, Actor * item),
+                    (&ev.self(), (Actor*)&ev.getItemActor()),
+                    ev.cancel(),
+                );
+            }
+            case doHash("onItemTrySpawn"): {
+                REGISTER_EVENT_LISTEN(
+                    Event::EntityEvent::ItemActorSpawnBeforeEvent,
+                    (const ItemStack* item, std::pair<Vec3, int> position, int64 spawnerUniqueId),
+                    (&ev.getItem(),
+                     {ev.getPosition(), ev.getBlockSource().getDimensionId().id},
+                     ev.getSpawner().has_value() ? ev.getSpawner()->getOrCreateUniqueID().id : -1),
+                    ev.cancel(),
+                );
+            }
+            case doHash("onItemSpawned"): {
+                REGISTER_EVENT_LISTEN(
+                    Event::EntityEvent::ItemActorSpawnAfterEvent,
+                    (const ItemStack* item, Actor* itemActor, std::pair<Vec3, int> position, int64 spawnerUniqueId),
+                    (&ev.getItem(),
+                     (Actor*)&ev.getItemActor(),
+                     {ev.getPosition(), ev.getBlockSource().getDimensionId().id},
+                     ev.getSpawner().has_value() ? ev.getSpawner()->getOrCreateUniqueID().id : -1),
+                    logger.error("Event \"onItemSpawned\" cannot be intercepted"),
+                );
+            }
+            case doHash("onEntityTryChangeDim"): {
+                REGISTER_EVENT_LISTEN(
+                    Event::EntityEvent::ActorChangeDimensionBeforeEvent,
+                    (Actor * entity, int toDimId),
+                    (&ev.self(), ev.getToDimensionId()),
+                    ev.cancel(),
+                );
+            }
+            case doHash("onLeaveBed"): {
+                REGISTER_EVENT_LISTEN(
+                    Event::PlayerEvent::PlayerStopSleepBeforeEvent,
+                    (Player * pl),
+                    (&ev.self()),
+                    ev.cancel(),
+                );
+            }
+            case doHash("onDeathMessage"): {
+                REGISTER_EVENT_LISTEN(
+                    Event::EntityEvent::DeathMessageAfterEvent,
+                    (std::string const& message, std::vector<std::string>, Actor* dead),
+                    (ev.getDeathMessage().first, ev.getDeathMessage().second, &ev.self()),
+                    logger.error("Event \"onDeathMessage\" cannot be intercepted"),
+                );
+            }
+            case doHash("onMobHurted"): {
+                REGISTER_EVENT_LISTEN(
+                    Event::EntityEvent::MobHurtAfterEvent,
+                    (Actor * mob, Actor * source, float damage, int cause),
+                    (&ev.self(), source, ev.getDamage(), (int)damageSource.getCause()),
+                    logger.error("Event \"onMobHurted\" cannot be intercepted"),
+                    auto& damageSource = ev.getSource();
+                    Actor* source      = nullptr;
+                    if (damageSource.isEntitySource()) {
+                        auto uniqueId = damageSource.getDamagingEntityUniqueID();
+                        source        = ll::service::getLevel()->fetchEntity(uniqueId);
+                        if (source->getOwner()) source = source->getOwner();
+                    }
+                );
+            }
+            case doHash("onEndermanTake"): {
+                REGISTER_EVENT_LISTEN(
+                    Event::EntityEvent::EndermanTakeBlockBeforeEvent,
+                    (Actor * mob),
+                    (&ev.self()),
+                    ev.cancel(),
+                );
+            }
+            case doHash("onEntityChangeDim"): {
+                REGISTER_EVENT_LISTEN(
+                    Event::EntityEvent::ActorChangeDimensionAfterEvent,
+                    (Actor * mob, int fromDimId),
+                    (&ev.self(), ev.getFromDimensionId()),
+                    logger.error("Event \"onEntityChangeDim\" cannot be intercepted"),
+                );
+            }
+            case doHash("onDragonRespawn"): {
+                REGISTER_EVENT_LISTEN(
+                    Event::EntityEvent::DragonRespawnBeforeEvent,
+                    (int64 enderDragonUniqueID),
+                    (ev.getEnderDragon().id),
+                    ev.cancel(),
+                )
+            }
+            case doHash("onProjectileTryCreate"): {
+                REGISTER_EVENT_LISTEN(
+                    Event::EntityEvent::ProjectileCreateBeforeEvent,
+                    (Actor * mob, int64 uniqueId),
+                    (&ev.self(), ev.getShooter() ? ev.getShooter()->getOrCreateUniqueID().id : -1),
+                    ev.cancel(),
+                );
+            }
+            case doHash("onProjectileCreate"): {
+                REGISTER_EVENT_LISTEN(
+                    Event::EntityEvent::ProjectileCreateAfterEvent,
+                    (Actor * mob, int64 uniqueId),
+                    (&ev.self(), ev.getShooter() ? ev.getShooter()->getOrCreateUniqueID().id : -1),
+                    logger.error("Event \"onProjectileCreate\" cannot be intercepted"),
+                );
+            }
+            case doHash("onSpawnWanderingTrader"): {
+                REGISTER_EVENT_LISTEN(
+                    Event::EntityEvent::SpawnWanderingTraderBeforeEvent,
+                    (std::pair<BlockPos, int> pos),
+                    ({ev.getPos(), ev.getRegion().getDimensionId()}),
+                    ev.cancel(),
+                );
+            }
+            case doHash("onHandleRequestAction"): {
+                REGISTER_EVENT_LISTEN(Event::PlayerEvent::HandleRequestActionBeforeEvent,
+                                      (Player * player,
+                                       std::string const& actionType,
+                                       int                count,
+                                       std::string const& sourceContainerNetId,
+                                       int                sourceSlot,
+                                       std::string const& destinationContainerNetId,
+                                       int                destinationSlot),
+                                      ((Player*)&ev.self(),
+                                       magic_enum::enum_name(requestAction->mActionType).data(),
+                                       (int)requestAction->mAmount,
+                                       magic_enum::enum_name(requestAction->mSrc.mOpenContainerNetId).data(),
+                                       (int)requestAction->mSrc.mSlot,
+                                       magic_enum::enum_name(requestAction->mDst.mOpenContainerNetId).data(),
+                                       (int)requestAction->mDst.mSlot),
+                                      ev.cancel(),
+                                      auto requestAction = (ItemStackRequestActionTransferBase*)&ev.getRequestAction();
+                );
+            }
+            case doHash("onSendContainerClosePacket"): {
+                REGISTER_EVENT_LISTEN(
+                    Event::PacketEvent::ContainerClosePacketSendAfterEvent,
+                    (Player * player, int ContainerNetId),
+                    (ev.getServerNetworkHandler()
+                         .getServerPlayer(ev.getNetworkIdentifier(), ev.getPacket().mClientSubId),
+                     (int)ev.getPacket().mContainerId),
+                    logger.error("Event \"onSendContainerClosePacket\" cannot be intercepted"),
+                )
+            }
+            case doHash("onServerStopping"): {
+                REGISTER_EVENT_LISTEN(
+                    ll::event::server::ServerStoppingEvent,
+                    (),
+                    (),
+                    logger.error("Event \"onServerStopping\" cannot be intercepted"),
+                );
+            }
+            default:
+                return false;
+            }
+        }
+    );
+}

src/Global.h

@@ -1,9 +1,19 @@
 #pragma once
 #include <include_all.h>
+
 #include <RemoteCallAPI.h>
 
-#define PLUGIN_NAME "GMLIB-LRCA"
-#define LIB_VERSION SemVersion(0, 9, 0, "", "")
+using namespace GMLIB;
+using namespace Server;
+using namespace Mod;
+
+#define PLUGIN_NAME fmt::format(fg(fmt::color::light_green), "GMLIB-LRCA")
+
+#define LIB_VERSION_MAJOR 0
+#define LIB_VERSION_MINOR 13
+#define LIB_VERSION_PATCH 3
+
+#define LIB_VERSION Version(LIB_VERSION_MAJOR, LIB_VERSION_MINOR, LIB_VERSION_PATCH)
 
 extern ll::Logger logger;
 
@@ -11,3 +21,4 @@ extern void Export_Legacy_GMLib_ModAPI();
 extern void Export_Legacy_GMLib_ServerAPI();
 extern void Export_Compatibility_API();
 extern void ExportPAPI();
+extern void Export_Event_API();

src/LegacyModApi.cpp

@@ -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,12 +17,12 @@ 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 {
-            auto level = GMLIB_Level::getLevel();
+           std::string const&       unlock) -> void {
+            auto level = GMLIB_Level::getInstance();
             if (!level) {
                 return;
             }
@@ -33,19 +33,19 @@ void Export_Legacy_GMLib_ModAPI() {
             }
             auto res = RecipeIngredient(result, 0, count);
             auto unl = makeRecipeUnlockingKey(unlock);
-            GMLIB::Mod::CustomRecipe::registerShapelessCraftingTableRecipe(recipe_id, types, res, unl);
+            JsonRecipe::registerShapelessCraftingTableRecipe(recipe_id, types, res, unl);
         }
     );
     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 {
-            auto level = GMLIB_Level::getLevel();
+           std::string const&       unlock) -> void {
+            auto level = GMLIB_Level::getInstance();
             if (!level) {
                 return;
             }
@@ -56,132 +56,135 @@ void Export_Legacy_GMLib_ModAPI() {
             }
             auto res = RecipeIngredient(result, 0, count);
             auto unl = makeRecipeUnlockingKey(unlock);
-            GMLIB::Mod::CustomRecipe::registerShapedCraftingTableRecipe(recipe_id, shape, types, res, unl);
+            JsonRecipe::registerShapedCraftingTableRecipe(recipe_id, shape, types, res, unl);
         }
     );
     RemoteCall::exportAs(
         "GMLib_ModAPI",
         "registerFurnaceRecipe",
-        [](std::string recipe_id, std::string input, std::string output, std::vector<std::string> tags) -> void {
-            auto level = GMLIB_Level::getLevel();
+        [](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;
             }
             auto inp  = RecipeIngredient(input, 0, 1);
             auto outp = RecipeIngredient(output, 0, 1);
-            GMLIB::Mod::CustomRecipe::registerFurnaceRecipe(recipe_id, inp, outp, tags);
+            JsonRecipe::registerFurnaceRecipe(recipe_id, inp, outp, tags);
         }
     );
     RemoteCall::exportAs(
         "GMLib_ModAPI",
         "registerBrewingMixRecipe",
-        [](std::string recipe_id, std::string input, std::string output, std::string reagent) -> void {
-            auto level = GMLIB_Level::getLevel();
+        [](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;
             }
             auto rea = RecipeIngredient(reagent, 0, 1);
-            GMLIB::Mod::CustomRecipe::registerBrewingMixRecipe(recipe_id, input, output, rea);
+            JsonRecipe::registerBrewingMixRecipe(recipe_id, input, output, rea);
         }
     );
     RemoteCall::exportAs(
         "GMLib_ModAPI",
         "registerBrewingContainerRecipe",
-        [](std::string recipe_id, std::string input, std::string output, std::string reagent) -> void {
-            auto level = GMLIB_Level::getLevel();
+        [](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;
             }
             auto inp  = RecipeIngredient(input, 0, 1);
             auto outp = RecipeIngredient(output, 0, 1);
             auto rea  = RecipeIngredient(reagent, 0, 1);
-            GMLIB::Mod::CustomRecipe::registerBrewingContainerRecipe(recipe_id, inp, outp, rea);
+            JsonRecipe::registerBrewingContainerRecipe(recipe_id, inp, outp, rea);
         }
     );
     RemoteCall::exportAs(
         "GMLib_ModAPI",
         "registerSmithingTransformRecipe",
-        [](std::string recipe_id,
-           std::string smithing_template,
-           std::string base,
-           std::string addition,
-           std::string result) -> void {
-            auto level = GMLIB_Level::getLevel();
+        [](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;
             }
-            GMLIB::Mod::CustomRecipe::registerSmithingTransformRecipe(
-                recipe_id,
-                smithing_template,
-                base,
-                addition,
-                result
-            );
+            JsonRecipe::registerSmithingTransformRecipe(recipe_id, smithing_template, base, addition, result);
         }
     );
     RemoteCall::exportAs(
         "GMLib_ModAPI",
         "registerSmithingTrimRecipe",
-        [](std::string recipe_id, std::string smithing_template, std::string base, std::string addition) -> void {
-            auto level = GMLIB_Level::getLevel();
+        [](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;
             }
-            GMLIB::Mod::CustomRecipe::registerSmithingTrimRecipe(recipe_id, smithing_template, base, addition);
+            JsonRecipe::registerSmithingTrimRecipe(recipe_id, smithing_template, base, addition);
         }
     );
     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 {
-            auto level = GMLIB_Level::getLevel();
+        [](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;
             }
             auto inp  = RecipeIngredient(input, 0, 1);
             auto outp = RecipeIngredient(output, 0, 1);
-            GMLIB::Mod::CustomRecipe::registerStoneCutterRecipe(recipe_id, inp, outp);
+            JsonRecipe::registerStoneCutterRecipe(recipe_id, inp, outp);
         }
     );
     // 错误方块清理
     RemoteCall::exportAs("GMLib_ModAPI", "setUnknownBlockCleaner", []() -> void {
-        GMLIB::Mod::VanillaFix::setAutoCleanUnknownBlockEnabled();
+        VanillaFix::setAutoCleanUnknownBlockEnabled();
     });
     // 实验性
     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::getLevel();
-        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::getLevel()->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::getLevel();
-        if (!level) {
-            return false;
-        }
-        auto map = GMLIB_Level::getAllExperiments();
-        if (map.count(experiment_id)) {
-            return GMLIB_Level::getLevel()->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 { VanillaFix::setFixI18nEnabled(); });
 }

src/LegacyServerApi.cpp

@@ -2,42 +2,51 @@
 
 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", "getLevelName", []() -> std::string {
-        auto level = GMLIB_Level::getLevel();
-        if (!level) {
-            return "";
-        }
-        return level->getLevelName();
+    RemoteCall::exportAs("GMLib_ServerAPI", "setForceTrustSkins", []() -> void { GMLIB_Level::trustAllSkins(); });
+    RemoteCall::exportAs("GMLib_ServerAPI", "enableCoResourcePack", []() -> void {
+        GMLIB_Level::requireServerResourcePackAndAllowClientResourcePack();
     });
-    RemoteCall::exportAs("GMLib_ServerAPI", "setLevelName", [](std::string name) -> void {
-        auto level = GMLIB_Level::getLevel();
-        if (!level) {
-            return;
+    RemoteCall::exportAs("GMLib_ServerAPI", "getLevelName", []() -> std::string {
+        if (auto level = GMLIB_Level::getInstance()) {
+            return level->getLevelName();
         }
-        return level->setLevelName(name);
+        return {};
+    });
+    RemoteCall::exportAs("GMLib_ServerAPI", "setLevelName", [](std::string const& name) -> void {
+        if (auto level = GMLIB_Level::getInstance()) {
+            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).as_ptr();
+        }
+    );
     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);
+            return ac->shootProjectile(name, speed, offset).as_ptr();
         }
     );
     RemoteCall::exportAs(
@@ -45,8 +54,27 @@ 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 FakeList::addFakeList(name, xuid, ActorUniqueID(-1));
+        }
+    );
+    RemoteCall::exportAs("GMLib_ServerAPI", "removeFakeList", [](const std::string& nameOrXuid) -> bool {
+        return FakeList::removeFakeList(nameOrXuid);
+    });
+    RemoteCall::exportAs("GMLib_ServerAPI", "removeAllFakeList", []() -> void {
+        return FakeList::removeAllFakeLists();
+    });
+    RemoteCall::exportAs("GMLib_ServerAPI", "getMaxPlayers", []() -> int {
+        if (auto level = GMLIB_Level::getInstance()) {
+            return level->getMaxPlayerCount();
+        }
+        return {};
+    });
 }

src/PlaceholderApi.cpp

@@ -8,112 +8,95 @@ 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);
 }
 
-std::string GetValue(std::string const& from) { return GMLIB::Server::PlaceholderAPI::getValue(from); }
+std::string GetValue(std::string const& from) { return 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 GetValueWithPlayer(std::string const& key, Player* player) { return PlaceholderAPI::getValue(key, player); }
 
-std::string
-registerPlayerPlaceholder(std::string const& PluginName, std::string const& FuncName, std::string const& PAPIName) {
+bool registerPlayerPlaceholder(
+    std::string const& PluginName,
+    std::string const& FuncName,
+    std::string const& PAPIName
+) {
     if (RemoteCall::hasFunc(PluginName, FuncName)) {
+        PlaceholderAPI::unregisterPlaceholder(PAPIName);
         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(
+            auto Call = RemoteCall::importAs<std::string(Player * pl, std::unordered_map<std::string, std::string>)>(
+                PluginName,
+                FuncName
+            );
+            PlaceholderAPI::registerPlayerPlaceholder(
                 PAPIName,
-                [Call](Player* sp, std::unordered_map<std::string, std::string> map) {
-                    return Call(sp->getXuid(), map);
-                },
+                [Call](Player* sp, std::unordered_map<std::string, std::string> map) { return Call(sp, 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
-            );
+            auto Call = RemoteCall::importAs<std::string(Player * pl)>(PluginName, FuncName);
+            PlaceholderAPI::registerPlayerPlaceholder(PAPIName, [Call](Player* sp) { return Call(sp); }, PluginName);
         }
-    } else {
-        // logger.error("Function no find({}:{})", PluginName, FuncName);
-        return "Function no find";
+        return true;
     }
-    return "Register Success";
+    return false;
 }
 
-std::string
-registerServerPlaceholder(std::string const& PluginName, std::string const& FuncName, std::string const& PAPIName) {
+bool registerServerPlaceholder(
+    std::string const& PluginName,
+    std::string const& FuncName,
+    std::string const& PAPIName
+) {
     if (RemoteCall::hasFunc(PluginName, FuncName)) {
+        PlaceholderAPI::unregisterPlaceholder(PAPIName);
         if (isParameters(PAPIName)) {
             auto Call =
                 RemoteCall::importAs<std::string(std::unordered_map<std::string, std::string>)>(PluginName, FuncName);
-            GMLIB::Server::PlaceholderAPI::registerServerPlaceholder(
+            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
-            );
+            PlaceholderAPI::registerServerPlaceholder(PAPIName, [Call]() { return Call(); }, PluginName);
         }
-    } else {
-        // logger.error("Function no find({}:{})", PluginName, FuncName);
-        return "Function no find";
+        return true;
     }
-    return "Register Success";
+    return false;
 }
 
-std::string registerStaticPlaceholder(
+bool registerStaticPlaceholder(
     std::string const& PluginName,
     std::string const& FuncName,
     std::string const& PAPIName,
     int                num
 ) {
     if (RemoteCall::hasFunc(PluginName, FuncName)) {
+        PlaceholderAPI::unregisterPlaceholder(PAPIName);
         if (isParameters(PAPIName)) {
             auto Call = RemoteCall::importAs<std::string()>(PluginName, FuncName);
             if (num == -1) {
-                GMLIB::Server::PlaceholderAPI::registerStaticPlaceholder(
-                    PAPIName,
-                    [Call] { return Call(); },
-                    PluginName
-                );
+                PlaceholderAPI::registerStaticPlaceholder(PAPIName, [Call] { return Call(); }, PluginName);
             } else {
-                GMLIB::Server::PlaceholderAPI::registerStaticPlaceholder(
-                    PAPIName,
-                    num,
-                    [Call] { return Call(); },
-                    PluginName
-                );
+                PlaceholderAPI::registerStaticPlaceholder(PAPIName, num, [Call] { return Call(); }, PluginName);
             }
         }
-    } else {
-        // logger.error("Function no find({}:{})", PluginName, FuncName);
-        return "Function no find";
+        return true;
     }
-    return "Register Success";
+    return false;
 }
 
-std::string translateString(std::string const& str, std::string const& xuid) {
-    return GMLIB::Server::PlaceholderAPI::translate(str, ll::service::bedrock::getLevel()->getPlayerByXuid(xuid));
+std::string translateStringWithPlayer(std::string const& str, Player* pl) {
+    return PlaceholderAPI::translateString(str, pl);
 }
 
-bool unRegisterPlaceholder(std::string const& str) { return GMLIB::Server::PlaceholderAPI::unRegisterPlaceholder(str); }
+std::string translateString(std::string const& str) { return PlaceholderAPI::translateString(str); }
 
-std::vector<std::string> getAllPAPI() { return GMLIB::Server::PlaceholderAPI::getAllPAPI(); }
+bool unRegisterPlaceholder(std::string const& str) { return PlaceholderAPI::unregisterPlaceholder(str); }
+
+std::vector<std::string> getAllPAPI() { return PlaceholderAPI::getAllPAPI(); }
 
 } // namespace PAPIRemoteCall
 
@@ -127,6 +110,7 @@ void ExportPAPI() {
     EXPORTAPI(PAPIRemoteCall::GetValue);
     EXPORTAPI(PAPIRemoteCall::GetValueWithPlayer);
     EXPORTAPI(PAPIRemoteCall::translateString);
+    EXPORTAPI(PAPIRemoteCall::translateStringWithPlayer);
     EXPORTAPI(PAPIRemoteCall::unRegisterPlaceholder);
     EXPORTAPI(PAPIRemoteCall::getAllPAPI);
 }

tooth.json

@@ -1,7 +1,7 @@
 {
     "format_version": 2,
     "tooth": "github.com/GroupMountain/GMLIB-LegacyRemoteCallApi",
-    "version": "0.9.0",
+    "version": "0.13.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.0/GMLIB-LegacyRemoteCallApi-windows-x64.zip",
+    "asset_url": "https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi/releases/download/v0.13.3/GMLIB-LegacyRemoteCallApi-windows-x64.zip",
     "dependencies": {
-        "github.com/GroupMountain/GMLIB": ">=0.9.0"
+        "github.com/GroupMountain/GMLIB": ">=0.13.0"
     },
     "files": {
         "place": [

xmake.lua

@@ -1,14 +1,16 @@
-add_rules("mode.debug", "mode.release", "mode.releasedbg")
+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")
 end
 
 -- Option 1: Use the latest version of LeviLamina released on GitHub.
-add_requires("levilamina")
+add_requires("levilaminalibrary")
 add_requires("legacyremotecall")
+add_requires("gmlib")
 
 -- Option 2: Use a specific version of LeviLamina released on GitHub.
 -- add_requires("levilamina x.x.x")
@@ -47,28 +49,27 @@ target("GMLIB-LegacyRemoteCallApi") -- Change this to your plugin name.
         "/utf-8"
     )
     add_defines(
-        "_HAS_CXX23=1" -- To enable C++23 features
+        "NOMINMAX",
+        "UNICODE"
     )
     add_files(
         "src/**.cpp"
     )
-    add_links(
-        "SDK-GMLIB/Lib/GMLIB"
-    )
     add_includedirs(
-        "SDK-GMLIB",
         "src"
     )
     add_packages(
-        "levilamina",
-        "legacyremotecall"
+        "levilaminalibrary",
+        "legacyremotecall",
+        "gmlib"
     )
     add_shflags(
         "/DELAYLOAD:bedrock_server.dll" -- Magic to import symbols from BDS
     )
     set_exceptions("none") -- To avoid conflicts with /EHa
     set_kind("shared")
-    set_languages("cxx23")
+    set_languages("c++23")
+    set_symbols("debug")
 
     after_build(function (target)
         local plugin_packer = import("scripts.after_build")