fix: fix gmlib::ContainerClosePacketSendAfterEvent event

This reverts commit 87b0f6c4da.

.github/workflows/build.yml

@@ -11,8 +11,6 @@ jobs:
         uses: actions/checkout@v2
 
       - uses: xmake-io/github-action-setup-xmake@v1
-        with:
-          xmake-version: "2.9.3"
       
       - run: |
           xmake repo -u
@@ -23,14 +21,8 @@ jobs:
       - run: |
           xmake -w -y
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ github.event.repository.name }}-windows-x64-${{ github.sha }}
           path: |
-            bin/DLL/
+            bin/
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: PDB
-          path: |
-            bin/PDB/

.github/workflows/release.yml

@@ -11,8 +11,6 @@ jobs:
         uses: actions/checkout@v2
 
       - uses: xmake-io/github-action-setup-xmake@v1
-        with:
-          xmake-version: "2.9.3"
       
       - run: |
           xmake repo -u
@@ -23,17 +21,11 @@ jobs:
       - run: |
           xmake -w -y
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ github.event.repository.name }}-windows-x64-${{ github.sha }}
           path: |
-            bin/DLL/
+            bin/
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: PDB
-          path: |
-            bin/PDB/
 
   upload-to-release:
     needs:
@@ -45,32 +37,23 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Download Plugin
+      - name: Download Mod
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ github.event.repository.name }}-windows-x64-${{ github.sha }}
-          path: release/Plugin/
+          path: artifact
-
-      - 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/
+          cp -v LICENSE README.md artifact/
 
       - name: Archive release
         run: |
-          cd release/Plugin
           zip -r ../${{ github.event.repository.name }}-windows-x64.zip *
-          cd ..
+        working-directory: artifact
 
       - name: Create GitHub Release
-        id: create_release
         uses: softprops/action-gh-release@v1
         with:
           files: |
-            release/${{ github.event.repository.name }}-windows-x64.zip
+            ${{ github.event.repository.name }}-windows-x64.zip
-            release/PDB/${{ github.event.repository.name }}.pdb 

lib/BEPlaceholderAPI-JS.d.ts

@@ -1,4 +1,4 @@
-declare class PAPI {
+export class PAPI {
     /** 注册一个玩家PAPI变量 */
     static registerPlayerPlaceholder(
         /** PAPI调用函数 */

lib/EventAPI-JS.js

@@ -1,28 +1,170 @@
-/** 事件创建函数 @type {function(string,string):boolean} */
+/**
-const CallEvent = ll.import("GMLIB_Event_API", "callCustomEvent");
+ * @returns {string}
-/** 获取事件ID函数 @type {function():string} */
+ */
-const getNextEventId = ll.import("GMLIB_Event_API", "getNextScriptEventId");
+const getPluginName = () => {
-
+    try {
-/** 事件类 */
+        throw new Error("getPluginName");
-class Event {
+    } catch (error) {
-    constructor() { throw new Error("Static class cannot be instantiated"); }
+        return error.stack.trim().match(/plugins\\(.*)\\.*\.js:[0-9]+\)$/i)?.[1] || "Unknown";
-
-    /**
-     * 监听事件
-     * @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 };
+module.exports = {
+    Event: {
+        /**
+         * 事件订阅记录   
+         * 例如: {事件名: [事件ID, ...], ...}
+         * @type {Object.<string, number[]>}
+         */
+        mEventData: {},
+        /**
+         * 事件异常处理回调
+         * @param {Error} error
+         * @param {string} eventName
+         * @param {number} eventID
+         * @param {string} pluginName
+         * @returns {void}
+         */
+        mErrorHanlerCallback: (error, eventName, eventID, pluginName) => {
+            logger.error(`Info: ${pluginName}-${eventName}-${eventID}   Exception: ${error.message}\n${error.stack}`);
+        },
+
+        /**
+         * 监听事件(兼容旧版)
+         * @param {string} eventName
+         * @param {function} callback
+         * @param {boolean}
+         */
+        listen: function (eventName, callback) {
+            try {
+                if (typeof callback !== "function") return false;
+                const eventReflection = {
+                    onServerStopping: "ll::ServerStoppingEvent",
+                    onClientLogin: "gmlib::ClientLoginAfterEvent",
+                    onWeatherChange: "gmlib::WeatherUpdateBeforeEvent",
+                    onMobPick: "gmlib::MobPickupItemBeforeEvent",
+                    onItemTrySpawn: "gmlib::ItemActorSpawnBeforeEvent",
+                    onItemSpawned: "gmlib::ItemActorSpawnAfterEvent",
+                    onEntityTryChangeDim: "gmlib::ActorChangeDimensionBeforeEvent",
+                    onLeaveBed: "gmlib::PlayerStopSleepBeforeEvent",
+                    onDeathMessage: "gmlib::DeathMessageAfterEvent",
+                    onMobHurted: "gmlib::MobHurtAfterEvent",
+                    onEndermanTake: "gmlib::EndermanTakeBlockBeforeEvent",
+                    onEntityChangeDim: "gmlib::ActorChangeDimensionAfterEvent",
+                    onDragonRespawn: "gmlib::DragonRespawnBeforeEvent",
+                    onProjectileTryCreate: "gmlib::ProjectileCreateBeforeEvent",
+                    onProjectileCreate: "gmlib::ProjectileCreateAfterEvent",
+                    onSpawnWanderingTrader: "gmlib::SpawnWanderingTraderBeforeEvent",
+                    onHandleRequestAction: "gmlib::HandleRequestActionBeforeEvent",
+                    onSendContainerClosePacket: "gmlib::ContainerClosePacketSendAfterEvent"
+                };
+                this.emplaceListener(eventReflection[eventName] ?? eventName, event => {
+                    const result = callback(...event.params);
+                    if (typeof (result) === "boolean" && !result) event.cancel();
+                });
+                return true;
+            } catch { }
+            return false;
+        },
+
+        /**
+         * 订阅事件
+         * @param {string} eventName
+         * @param {function} callback
+         * @param {number?} priority
+         * @param {string?} pluginName
+         * @returns {number}
+         */
+        emplaceListener: function (eventName, callback, priority = this.EventPriority.Normal, pluginName = getPluginName()) {
+            if (typeof callback !== "function") throw new Error("callback must be a function!");
+            const /** @type {number} */ eventId = ll.imports("GMLIB_Event_API", "emplaceListener")(pluginName, eventName, priority);
+            if (eventId === -1) throw new Error(`Event ${eventName} creation failed!`);
+            ll.exports((...data) => {
+                let /** @type {boolean} */ result = typeof (data.slice(-1)[0]) === "boolean" ? data.pop() : false;
+                try {
+                    callback({
+                        params: data,
+                        cancel: () => result = true,
+                        setCancelled: (/** @type {boolean} */value) => { result = value; },
+                        isCancelled: () => result,
+                        getId: () => eventId,
+                        getEventType: () => eventName
+                    });
+                } catch (error) {
+                    try {
+                        this.mErrorHanlerCallback(error, eventName, eventId, pluginName);
+                    } catch { }
+                }
+                return result;
+            }, pluginName, eventName + "_" + eventId);
+            (this.mEventData[eventName] ??= []).push(eventId);
+            return eventId;
+        },
+
+        /**
+         * 取消事件订阅
+         * @param {number} eventId
+         * @param {boolean}
+         */
+        removeListener: function (eventId) {
+            const result = ll.imports("GMLIB_Event_API", "removeListener")(eventId);
+            if (result) {
+                for (let [eventName, eventIds] of Object.entries(this.mEventData)) {
+                    this.mEventData[eventName] = eventIds.filter(id => id !== eventId);
+                    if (this.mEventData[eventName].length === 0) delete this.mEventData[eventName];
+                }
+            }
+            return result;
+        },
+
+        /**
+         * 判断事件订阅是否存在
+         * @param {number} eventId
+         * @returns {boolean}
+         */
+        hasListener: function (eventId) {
+            return ll.imports("GMLIB_Event_API", "hasListener")(eventId);
+        },
+
+        /**
+         * 获取订阅事件优先级
+         * @param {number} eventId
+         * @returns {number?}
+         */
+        getListenerPriority: function (eventId) {
+            const priority = ll.imports("GMLIB_Event_API", "getListenerPriority")(eventId);
+            return priority === -1 ? undefined : priority;
+        },
+
+        /**
+         * 获取订阅事件列表
+         * @param {string | undefined} eventName
+         * @returns {number[] | Object.<string, number[]>}
+         */
+        getListener: function (eventName) {
+            return eventName === undefined ? this.mEventData : this.mEventData[eventName] ?? [];
+        },
+
+        /**
+         * 设置异常处理回调
+         * @param {function(Error, string, number, string): void} callback
+         * @returns {boolean}
+         */
+        setErrorHanlerCallback: function (callback) {
+            if (callback === undefined || typeof callback !== "function") return false;
+            this.mErrorHanlerCallback = callback;
+            return true;
+        },
+
+        /**
+         * 事件优先级
+         */
+        EventPriority: {
+            Highest: 0,
+            High: 100,
+            Normal: 200,
+            Low: 300,
+            Lowest: 400
+        }
+    }
+};

lib/FormAPI-JS.js

@@ -1,182 +1,182 @@
-// const getNextCallbackId = ll.import("GMLIB_FormAPI", "getNextFormCallbackId");
+// // const getNextCallbackId = ll.import("GMLIB_FormAPI", "getNextFormCallbackId");
 
-class ServerSettingForm {
+// class ServerSettingForm {
-    constructor() {
+//     constructor() {
-        throw new Error("Static class cannot be instantiated");
+//         throw new Error("Static class cannot be instantiated");
-    }
+//     }
 
-    static getDefaultPriority() {
+//     static getDefaultPriority() {
-        return ll.import("GMLIB_ServerSettingForm", "getDefaultPriority")();
+//         return ll.import("GMLIB_ServerSettingForm", "getDefaultPriority")();
-    }
+//     }
 
-    static hasTitle() {
+//     static hasTitle() {
-        return ll.import("GMLIB_ServerSettingForm", "hasTitle")();
+//         return ll.import("GMLIB_ServerSettingForm", "hasTitle")();
-    }
+//     }
 
-    static getTitle() {
+//     static getTitle() {
-        return ll.import("GMLIB_ServerSettingForm", "getTitle")();
+//         return ll.import("GMLIB_ServerSettingForm", "getTitle")();
-    }
+//     }
 
-    static setTitle(title, forceModify = false) {
+//     static setTitle(title, forceModify = false) {
-        return ll.import("GMLIB_ServerSettingForm", "setTitle")(title, forceModify);
+//         return ll.import("GMLIB_ServerSettingForm", "setTitle")(title, forceModify);
-    }
+//     }
 
-    static hasIcon() {
+//     static hasIcon() {
-        return ll.import("GMLIB_ServerSettingForm", "hasIcon")();
+//         return ll.import("GMLIB_ServerSettingForm", "hasIcon")();
-    }
+//     }
 
-    static getIconData() {
+//     static getIconData() {
-        return hasIcon() ? ll.import("GMLIB_ServerSettingForm", "getIconData")() : null;
+//         return hasIcon() ? ll.import("GMLIB_ServerSettingForm", "getIconData")() : null;
-    }
+//     }
 
-    static getIconType() {
+//     static getIconType() {
-        return ll.import("GMLIB_ServerSettingForm", "getIconType")();
+//         return ll.import("GMLIB_ServerSettingForm", "getIconType")();
-    }
+//     }
 
-    static setIcon(data, type = 0, forceModify = false) {
+//     static setIcon(data, type = 0, forceModify = false) {
-        return ll.import("GMLIB_ServerSettingForm", "setIcon")(data, type, forceModify);
+//         return ll.import("GMLIB_ServerSettingForm", "setIcon")(data, type, forceModify);
-    }
+//     }
 
-    static addLabel(
+//     static addLabel(
-        text,
+//         text,
-        playerDetector = (pl) => { return true; },
+//         playerDetector = (pl) => { return true; },
-        priority = this.getDefaultPriority()
+//         priority = this.getDefaultPriority()
-    ) {
+//     ) {
-        let detectorId = getNextCallbackId();
+//         let detectorId = getNextCallbackId();
-        ll.export(playerDetector, "GMLIB_FORM_CALLBACK", detectorId);
+//         ll.export(playerDetector, "GMLIB_FORM_CALLBACK", detectorId);
-        return ll.import("GMLIB_ServerSettingForm", "addLabel")(text, detectorId, priority);
+//         return ll.import("GMLIB_ServerSettingForm", "addLabel")(text, detectorId, priority);
-    }
+//     }
 
 
-    static addInput(
+//     static addInput(
-        text,
+//         text,
-        placeholder,
+//         placeholder,
-        defaultVal,
+//         defaultVal,
-        callback = (pl, input) => { },
+//         callback = (pl, input) => { },
-        playerDetector = (pl) => { return true; },
+//         playerDetector = (pl) => { return true; },
-        priority = this.getDefaultPriority()
+//         priority = this.getDefaultPriority()
-    ) {
+//     ) {
-        let callbackId = getNextCallbackId();
+//         let callbackId = getNextCallbackId();
-        ll.export(callback, "GMLIB_FORM_CALLBACK", callbackId);
+//         ll.export(callback, "GMLIB_FORM_CALLBACK", callbackId);
-        let detectorId = getNextCallbackId();
+//         let detectorId = getNextCallbackId();
-        ll.export(playerDetector, "GMLIB_FORM_CALLBACK", detectorId);
+//         ll.export(playerDetector, "GMLIB_FORM_CALLBACK", detectorId);
-        return ll.import("GMLIB_ServerSettingForm", "addInput")(text, placeholder, defaultVal, callbackId, detectorId, priority);
+//         return ll.import("GMLIB_ServerSettingForm", "addInput")(text, placeholder, defaultVal, callbackId, detectorId, priority);
-    }
+//     }
 
-    static addToggle(
+//     static addToggle(
-        text,
+//         text,
-        defaultVal = false,
+//         defaultVal = false,
-        callback = (pl, input) => { },
+//         callback = (pl, input) => { },
-        playerDetector = (pl) => { return true; },
+//         playerDetector = (pl) => { return true; },
-        priority = this.getDefaultPriority()
+//         priority = this.getDefaultPriority()
-    ) {
+//     ) {
-        let callbackId = getNextCallbackId();
+//         let callbackId = getNextCallbackId();
-        ll.export(callback, "GMLIB_FORM_CALLBACK", callbackId);
+//         ll.export(callback, "GMLIB_FORM_CALLBACK", callbackId);
-        let detectorId = getNextCallbackId();
+//         let detectorId = getNextCallbackId();
-        ll.export(playerDetector, "GMLIB_FORM_CALLBACK", detectorId);
+//         ll.export(playerDetector, "GMLIB_FORM_CALLBACK", detectorId);
-        return ll.import("GMLIB_ServerSettingForm", "addToggle")(text, defaultVal, callbackId, detectorId, priority);
+//         return ll.import("GMLIB_ServerSettingForm", "addToggle")(text, defaultVal, callbackId, detectorId, priority);
-    }
+//     }
 
-    static addDropdown(
+//     static addDropdown(
-        text,
+//         text,
-        options,
+//         options,
-        defaultVal = 0,
+//         defaultVal = 0,
-        callback = (pl, input) => { },
+//         callback = (pl, input) => { },
-        playerDetector = (pl) => { return true; },
+//         playerDetector = (pl) => { return true; },
-        priority = this.getDefaultPriority()
+//         priority = this.getDefaultPriority()
-    ) {
+//     ) {
-        let callbackId = getNextCallbackId();
+//         let callbackId = getNextCallbackId();
-        ll.export(callback, "GMLIB_FORM_CALLBACK", callbackId);
+//         ll.export(callback, "GMLIB_FORM_CALLBACK", callbackId);
-        let detectorId = getNextCallbackId();
+//         let detectorId = getNextCallbackId();
-        ll.export(playerDetector, "GMLIB_FORM_CALLBACK", detectorId);
+//         ll.export(playerDetector, "GMLIB_FORM_CALLBACK", detectorId);
-        return ll.import("GMLIB_ServerSettingForm", "addDropdown")(text, options, defaultVal, callbackId, detectorId, priority);
+//         return ll.import("GMLIB_ServerSettingForm", "addDropdown")(text, options, defaultVal, callbackId, detectorId, priority);
-    }
+//     }
 
-    static addSlider(
+//     static addSlider(
-        text,
+//         text,
-        min,
+//         min,
-        max,
+//         max,
-        step = 0.0,
+//         step = 0.0,
-        defaultVal = 0.0,
+//         defaultVal = 0.0,
-        callback = (pl, input) => { },
+//         callback = (pl, input) => { },
-        playerDetector = (pl) => { return true; },
+//         playerDetector = (pl) => { return true; },
-        priority = this.getDefaultPriority()
+//         priority = this.getDefaultPriority()
-    ) {
+//     ) {
-        let callbackId = getNextCallbackId();
+//         let callbackId = getNextCallbackId();
-        ll.export(callback, "GMLIB_FORM_CALLBACK", callbackId);
+//         ll.export(callback, "GMLIB_FORM_CALLBACK", callbackId);
-        let detectorId = getNextCallbackId();
+//         let detectorId = getNextCallbackId();
-        ll.export(playerDetector, "GMLIB_FORM_CALLBACK", detectorId);
+//         ll.export(playerDetector, "GMLIB_FORM_CALLBACK", detectorId);
-        return ll.import("GMLIB_ServerSettingForm", "addSlider")(text, min, max, step, defaultVal, callbackId, detectorId, priority);
+//         return ll.import("GMLIB_ServerSettingForm", "addSlider")(text, min, max, step, defaultVal, callbackId, detectorId, priority);
-    }
+//     }
 
-    static addStepSlider(
+//     static addStepSlider(
-        text,
+//         text,
-        steps,
+//         steps,
-        defaultVal = 0,
+//         defaultVal = 0,
-        callback = (pl, input) => { },
+//         callback = (pl, input) => { },
-        playerDetector = (pl) => { return true; },
+//         playerDetector = (pl) => { return true; },
-        priority = this.getDefaultPriority()
+//         priority = this.getDefaultPriority()
-    ) {
+//     ) {
-        let callbackId = getNextCallbackId();
+//         let callbackId = getNextCallbackId();
-        ll.export(callback, "GMLIB_FORM_CALLBACK", callbackId);
+//         ll.export(callback, "GMLIB_FORM_CALLBACK", callbackId);
-        let detectorId = getNextCallbackId();
+//         let detectorId = getNextCallbackId();
-        ll.export(playerDetector, "GMLIB_FORM_CALLBACK", detectorId);
+//         ll.export(playerDetector, "GMLIB_FORM_CALLBACK", detectorId);
-        return ll.import("GMLIB_ServerSettingForm", "addStepSlider")(text, steps, defaultVal, callbackId, detectorId, priority);
+//         return ll.import("GMLIB_ServerSettingForm", "addStepSlider")(text, steps, defaultVal, callbackId, detectorId, priority);
-    }
+//     }
 
-    static removeElement(id) {
+//     static removeElement(id) {
-        return ll.import("GMLIB_ServerSettingForm", "removeElement")(id);
+//         return ll.import("GMLIB_ServerSettingForm", "removeElement")(id);
-    }
+//     }
-}
+// }
 
-class NpcDialogueForm {
+// class NpcDialogueForm {
-    constructor(npcName, sceneName, dialogue) {
+//     constructor(npcName, sceneName, dialogue) {
-        this.mFormId = ll.import("GMLIB_NpcDialogueForm", "createForm")(npcName, sceneName, dialogue);
+//         this.mFormId = ll.import("GMLIB_NpcDialogueForm", "createForm")(npcName, sceneName, dialogue);
-    }
+//     }
 
-    addButton(button) {
+//     addButton(button) {
-        return ll.import("GMLIB_NpcDialogueForm", "addButton")(this.mFormId, button);
+//         return ll.import("GMLIB_NpcDialogueForm", "addButton")(this.mFormId, button);
-    }
+//     }
 
-    sendTo(pl, callback = (pl, index, type) => { }, free = true) {
+//     sendTo(pl, callback = (pl, index, type) => { }, free = true) {
-        let callbackId = getNextCallbackId();
+//         let callbackId = getNextCallbackId();
-        ll.export(callback, "GMLIB_FORM_CALLBACK", callbackId);
+//         ll.export(callback, "GMLIB_FORM_CALLBACK", callbackId);
-        ll.import("GMLIB_NpcDialogueForm", "sendTo")(this.mFormId, pl, callbackId);
+//         ll.import("GMLIB_NpcDialogueForm", "sendTo")(this.mFormId, pl, callbackId);
-        if (free) {
+//         if (free) {
-            this.destroy();
+//             this.destroy();
-        }
+//         }
-    }
+//     }
 
-    destroy() {
+//     destroy() {
-        ll.import("GMLIB_NpcDialogueForm", "destroyForm")(this.mFormId);
+//         ll.import("GMLIB_NpcDialogueForm", "destroyForm")(this.mFormId);
-    }
+//     }
-}
+// }
 
-class ChestForm {
+// class ChestForm {
-    constructor(npcName, sceneName, dialogue) {
+//     constructor(npcName, sceneName, dialogue) {
-        this.mFormId = ll.import("GMLIB_NpcDialogueForm", "createForm")(npcName, sceneName, dialogue);
+//         this.mFormId = ll.import("GMLIB_NpcDialogueForm", "createForm")(npcName, sceneName, dialogue);
-    }
+//     }
 
-    addButton(button) {
+//     addButton(button) {
-        return ll.import("GMLIB_NpcDialogueForm", "addButton")(this.mFormId, button);
+//         return ll.import("GMLIB_NpcDialogueForm", "addButton")(this.mFormId, button);
-    }
+//     }
 
-    sendTo(pl, free = true) {
+//     sendTo(pl, free = true) {
-        //let callbackId = getNextCallbackId();
+//         //let callbackId = getNextCallbackId();
-        //ll.export(callback, "GMLIB_FORM_CALLBACK", callbackId);
+//         //ll.export(callback, "GMLIB_FORM_CALLBACK", callbackId);
-        //ll.import("GMLIB_NpcDialogueForm", "sendTo")(this.mFormId, pl, callbackId);
+//         //ll.import("GMLIB_NpcDialogueForm", "sendTo")(this.mFormId, pl, callbackId);
-        //if (free) {
+//         //if (free) {
-        //    this.destroy();
+//         //    this.destroy();
-        //}
+//         //}
-    }
+//     }
 
-    destroy() {
+//     destroy() {
-        //ll.import("GMLIB_NpcDialogueForm", "destroyForm")(this.mFormId);
+//         //ll.import("GMLIB_NpcDialogueForm", "destroyForm")(this.mFormId);
-    }
+//     }
-}
+// }
 
-module.exports = {
+// module.exports = {
-    ServerSettingForm,
+//     ServerSettingForm,
-    NpcDialogueForm,
+//     NpcDialogueForm,
-    ChestForm
+//     ChestForm
-};
+// };

lib/GMLIB_API-JS.d.ts

@@ -1,5 +1,5 @@
 /** 静态悬浮字类 */
-declare class StaticFloatingText {
+export class StaticFloatingText {
     constructor(
         /** 生成的坐标 */
         pos: FloatPos,
@@ -73,7 +73,7 @@ declare class StaticFloatingText {
 }
 
 /** 动态悬浮字类 */
-declare class DynamicFloatingText extends StaticFloatingText {
+export class DynamicFloatingText extends StaticFloatingText {
     constructor(
         /** 生成的坐标 */
         pos: FloatPos,
@@ -113,7 +113,7 @@ declare class DynamicFloatingText extends StaticFloatingText {
 }
 
 /** 基础游戏API类 */
-declare class Minecraft {
+export class Minecraft {
     private constructor();
 
     /** 获取服务器平均tps */
@@ -393,7 +393,7 @@ declare class Minecraft {
 }
 
 /** 合成表类 */
-declare class Recipes {
+export class Recipes {
     private constructor();
 
     /** 注销合成表 */
@@ -534,7 +534,7 @@ declare class Recipes {
 }
 
 /** 实验性功能类 */
-declare class Experiments {
+export class Experiments {
     private constructor();
 
     /** 获取所有实验的id */
@@ -568,7 +568,7 @@ declare class Experiments {
 }
 
 /** 计分板类 */
-declare class Scoreboard {
+export class Scoreboard {
     private constructor();
 
     /** 获取所有跟踪实体 */
@@ -788,7 +788,7 @@ declare class Scoreboard {
 }
 
 /** 仿LSE的JsonConfigFile类 */
-declare class JsonConfig {
+export class JsonConfig {
     constructor(
         /** 文件路径 */
         path: string,
@@ -832,7 +832,7 @@ declare class JsonConfig {
 }
 
 /** JSON语言文件 */
-declare class JsonLanguage extends JsonConfig {
+export class JsonLanguage extends JsonConfig {
     /** 创建或打开一个 Json 语言文件 */
     constructor(
         /** 文件路径 */
@@ -851,7 +851,7 @@ declare class JsonLanguage extends JsonConfig {
 }
 
 /** JSON版翻译类 */
-declare class JsonI18n {
+export class JsonI18n {
     /** 加载翻译数据目录 */
     constructor(
         /** 目录 */
@@ -895,7 +895,7 @@ declare class JsonI18n {
 }
 
 /** 版本类 */
-declare class Version {
+export class Version {
     /** 创建版本对象 */
     constructor(
         /** 主版本号 */
@@ -944,7 +944,7 @@ declare class Version {
 }
 
 /** 翻译API类 */
-declare class I18nAPI {
+export class I18nAPI {
     private constructor();
 
     /** 获取键翻译 */
@@ -1005,7 +1005,7 @@ declare class I18nAPI {
 }
 
 /** 玩家信息存储类 */
-declare class UserCache {
+export class UserCache {
     private constructor();
 
     /** 根据uuid查xuid */
@@ -1122,21 +1122,31 @@ type PacketData = (
 );
 
 /** 二进制流数据包类 */
-declare class GMLIB_BinaryStream {
+export class GMLIB_BinaryStream {
     /** 数据包ID */
     #id: number;
     /** 数据包是否被销毁 */
     #destroy: boolean;
 
+    /** 构造二进流数据包 */
     constructor(
         /** 数据包数据 */
         data: PacketData[]?
     );
 
+    /** 拷贝二进制流数据包 */
+    constructor(
+        /** 要拷贝的二进制流数据包 */
+        stream: GMLIB_BinaryStream
+    );
+
+    /** 获取数据包的ID */
+    getId(): number;
+
     /** 发送数据包 */
     sendTo(
         /** 要发送数据包的玩家对象 */
-        player: Player,
+        player: Player | Entity,
         /** 数据包发送后是否销毁 */
         free: boolean = true
     ): GMLIB_BinaryStream;
@@ -1144,7 +1154,7 @@ declare class GMLIB_BinaryStream {
     /** 发送数据包到玩家数组 */
     sendToPlayers(
         /** 要发送数据包的玩家对象数组 */
-        players: Player[],
+        players: Player[] | Entity[],
         /** 数据包发送后是否销毁 */
         free: boolean = true
     ): GMLIB_BinaryStream;
@@ -1337,6 +1347,165 @@ declare class GMLIB_BinaryStream {
     ): GMLIB_BinaryStream;
 }
 
+export enum ActorType {
+    Undefined = 1,
+    TypeMask = 0b11111111,
+    None = 0,
+    Mob = 1 << 8,
+    PathfinderMob = 1 << 9 | Mob,
+    UnknownType = 1 << 10,
+    Monster = 1 << 11 | PathfinderMob,
+    Animal = 1 << 12 | PathfinderMob,
+    WaterAnimal = 1 << 13 | PathfinderMob,
+    TamableAnimal = 1 << 14 | Animal,
+    Ambient = 1 << 15 | Mob,
+    UndeadMob = 1 << 16 | Monster,
+    ZombieMonster = 1 << 17 | UndeadMob,
+    Arthropod = 1 << 18 | Monster,
+    Minecart = 1 << 19,
+    SkeletonMonster = 1 << 20 | UndeadMob,
+    EquineAnimal = 1 << 21 | TamableAnimal,
+    Projectile = 1 << 22,
+    AbstractArrow = 1 << 23,
+    VillagerBase = 1 << 24 | PathfinderMob,
+
+    Chicken = 10 | Animal,
+    Cow = 11 | Animal,
+    Pig = 12 | Animal,
+    Sheep = 13 | Animal,
+    Wolf = 14 | TamableAnimal,
+    Villager = 15 | VillagerBase,
+    MushroomCow = 16 | Animal,
+    Squid = 17 | WaterAnimal,
+    Rabbit = 18 | Animal,
+    Bat = 19 | Ambient,
+    IronGolem = 20 | PathfinderMob,
+    SnowGolem = 21 | PathfinderMob,
+    Ocelot = 22 | TamableAnimal,
+    Horse = 23 | EquineAnimal,
+    Donkey = 24 | EquineAnimal,
+    Mule = 25 | EquineAnimal,
+    SkeletonHorse = 26 | EquineAnimal | UndeadMob,
+    ZombieHorse = 27 | EquineAnimal | UndeadMob,
+    PolarBear = 28 | Animal,
+    Llama = 29 | Animal,
+    Parrot = 30 | TamableAnimal,
+    Dolphin = 31 | WaterAnimal,
+    Zombie = 32 | ZombieMonster,
+    Creeper = 33 | Monster,
+    Skeleton = 34 | SkeletonMonster,
+    Spider = 35 | Arthropod,
+    PigZombie = 36 | UndeadMob,
+    Slime = 37 | Monster,
+    EnderMan = 38 | Monster,
+    Silverfish = 39 | Arthropod,
+    CaveSpider = 40 | Arthropod,
+    Ghast = 41 | Monster,
+    LavaSlime = 42 | Monster,
+    Blaze = 43 | Monster,
+    ZombieVillager = 44 | ZombieMonster,
+    Witch = 45 | Monster,
+    Stray = 46 | SkeletonMonster,
+    Husk = 47 | ZombieMonster,
+    WitherSkeleton = 48 | SkeletonMonster,
+    Guardian = 49 | Monster,
+    ElderGuardian = 50 | Monster,
+    Npc = 51 | Mob,
+    WitherBoss = 52 | UndeadMob,
+    Dragon = 53 | Monster,
+    Shulker = 54 | Monster,
+    Endermite = 55 | Arthropod,
+    Agent = 56 | Mob,
+    Vindicator = 57 | Monster,
+    Phantom = 58 | UndeadMob,
+    IllagerBeast = 59 | Monster,
+    UNUSED60 = 60,
+    ArmorStand = 61 | Mob,
+    TripodCamera = 62 | Mob,
+    Player = 63 | Mob,
+    ItemEntity = 64 | None,
+    PrimedTnt = 65 | None,
+    FallingBlock = 66 | None,
+    MovingBlock = 67 | None,
+    ExperiencePotion = 68 | Projectile,
+    Experience = 69 | None,
+    EyeOfEnder = 70 | None,
+    EnderCrystal = 71 | None,
+    FireworksRocket = 72 | None,
+    Trident = 73 | Projectile | AbstractArrow,
+    Turtle = 74 | Animal,
+    Cat = 75 | TamableAnimal,
+    ShulkerBullet = 76 | Projectile,
+    FishingHook = 77 | None,
+    Chalkboard = 78 | None,
+    DragonFireball = 79 | Projectile,
+    Arrow = 80 | Projectile | AbstractArrow,
+    Snowball = 81 | Projectile,
+    ThrownEgg = 82 | Projectile,
+    Painting = 83 | None,
+    MinecartRideable = 84 | Minecart,
+    LargeFireball = 85 | Projectile,
+    ThrownPotion = 86 | Projectile,
+    Enderpearl = 87 | Projectile,
+    LeashKnot = 88 | None,
+    WitherSkull = 89 | Projectile,
+    BoatRideable = 90 | None,
+    WitherSkullDangerous = 91 | Projectile,
+    UNUSED92 = 92,
+    LightningBolt = 93 | None,
+    SmallFireball = 94 | Projectile,
+    AreaEffectCloud = 95 | None,
+    MinecartHopper = 96 | Minecart,
+    MinecartTNT = 97 | Minecart,
+    MinecartChest = 98 | Minecart,
+    MinecartFurnace = 99 | Minecart,
+    MinecartCommandBlock = 100 | Minecart,
+    LingeringPotion = 101 | Projectile,
+    LlamaSpit = 102 | Projectile,
+    EvocationFang = 103 | Projectile,
+    EvocationIllager = 104 | Monster,
+    Vex = 105 | Monster,
+    IceBomb = 106 | Projectile,
+    Balloon = 107 | None,
+    Pufferfish = 108 | WaterAnimal,
+    Salmon = 109 | WaterAnimal,
+    Drowned = 110 | ZombieMonster,
+    Tropicalfish = 111 | WaterAnimal,
+    Fish = 112 | WaterAnimal,
+    Panda = 113 | Animal,
+    Pillager = 114 | Monster,
+    VillagerV2 = 115 | VillagerBase,
+    ZombieVillagerV2 = 116 | ZombieMonster,
+    Shield = 117 | None,
+    WanderingTrader = 118 | PathfinderMob,
+    Lectern = 119 | None,
+    ElderGuardianGhost = 120 | Monster,
+    Fox = 121 | Animal,
+    Bee = 122 | Mob,
+    Piglin = 123 | Mob,
+    Hoglin = 124 | Animal,
+    Strider = 125 | Animal,
+    Zoglin = 126 | UndeadMob,
+    PiglinBrute = 127 | Mob,
+    Goat = 128 | Animal,
+    GlowSquid = 129 | WaterAnimal,
+    Axolotl = 130 | Animal,
+    Warden = 131 | Monster,
+    Frog = 132 | Animal,
+    Tadpole = 133 | WaterAnimal,
+    Allay = 134 | Mob,
+    ChestBoatRideable = 136 | BoatRideable,
+    TraderLlama = 137 | Llama,
+    Camel = 138 | Animal,
+    Sniffer = 139 | Animal,
+    Breeze = 140 | Monster,
+    BreezeWindChargeProjectile = 141 | Projectile,
+    Armadillo = 142 | Animal,
+    WindChargeProjectile = 143 | Projectile,
+    Bogged = 144 | SkeletonMonster,
+    OminousItemSpawner = 145
+}
+
 interface Player {
     /** (GMLIB)转换成实体对象 */
     toEntity(): Entity;
@@ -1509,6 +1678,21 @@ interface Entity {
         /** 是否显示粒子效果 */
         ShowParticles: boolean
     }[];
+
+    /** 实体是否为某类型 */
+    isType(
+        /** 实体类型 */
+        type: ActorType
+    ): boolean;
+
+    /** 实体是否包含某类型 */
+    hasType(
+        /** 实体类型 */
+        type: ActorType
+    ): boolean;
+
+    /** 获取实体类型ID */
+    getEntityTypeId(): ActorType;
 }
 
 interface Block {
@@ -1533,9 +1717,6 @@ interface Block {
     /** (GMLIB) */
     canDropWithAnyTool(): boolean;
 
-    /** (GMLIB)方块是否不需要工具采集 */
-    isAlwaysDestroyable(): boolean;
-
     /** (GMLIB)检测方块是否能被玩家挖掘(比如插件拦截) */
     playerWillDestroy(
         /** 挖掘的玩家对象 */
@@ -1574,9 +1755,6 @@ interface Item {
         block: Block
     ): boolean;
 
-    /** (GMLIB)获取物品可以拥有的附魔 */
-    getLegalEnchants(): string[]
-
     /** (GMLIB)添加附魔 */
     applyEnchant(
         /** 附魔的命名空间ID */

lib/GMLIB_API-JS.js

@@ -252,8 +252,6 @@ const GMLIB_API = {
     itemCanDestroySpecial: ll.import("GMLIB_API", "itemCanDestroySpecial"),
     /** @type {function(Block):boolean} */
     blockCanDropWithAnyTool: ll.import("GMLIB_API", "blockCanDropWithAnyTool"),
-    /** 方块是否不需要工具采集 @type {function(Block):boolean} */
-    blockIsAlwaysDestroyable: ll.import("GMLIB_API", "blockIsAlwaysDestroyable"),
     /** @type {function(Block,Player,IntPos):boolean} */
     blockPlayerWillDestroy: ll.import("GMLIB_API", "blockPlayerWillDestroy"),
     /** 使玩家攻击实体 @type {function(Entity,Player):boolean} */
@@ -268,8 +266,6 @@ const GMLIB_API = {
     getBlockLightEmission: ll.import("GMLIB_API", "getBlockLightEmission"),
     /** 获取游戏规则列表 @type {function():Array.<{Name:string,Value:string,Type:"Bool"|"Float"|"Int"}>} */
     getGameRules: ll.import("GMLIB_API", "getGameRules"),
-    /** 获取物品可以拥有的附魔 @type {function(Item):Array.<string>} */
-    getLegalEnchants: ll.import("GMLIB_API", "getLegalEnchants"),
     /** 给物品添加附魔 @type {function(Item,string,number,boolean):boolean} */
     applyEnchant: ll.import("GMLIB_API", "applyEnchant"),
     /** 删除物品所有附魔 @type {function(Item):void} */
@@ -374,12 +370,20 @@ const GMLIB_API = {
     getDefaultGameMode: ll.import("GMLIB_API", "getDefaultGameMode"),
     /** 设置默认游戏模式 @type {function(mode):void} */
     setDefaultGameMode: ll.import("GMLIB_API", "setDefaultGameMode"),
+    /** 实体是否为某类型 @type {function(Entity, number):boolean} */
+    entityIsType: ll.import("GMLIB_API", "entityIsType"),
+    /** 实体是包含某类型 @type {function(Entity, number):boolean} */
+    entityHasType: ll.import("GMLIB_API", "entityHasType"),
+    /** 获取实体类型ID @type {function(Entity):number} */
+    getEntityTypeId: ll.import("GMLIB_API", "getEntityTypeId"),
 };
 
 /** LRCA的二进制流数据包导出接口 */
 const GMLIB_BinaryStream_API = {
     /** 创建二进制流数据包 @type {function():number} */
     create: ll.import("GMLIB_BinaryStream_API", "create"),
+    /** 拷贝二进制流数据包 @type {function(number):number} */
+    copy: ll.import("GMLIB_BinaryStream_API", "copy"),
     /** 发送二进制流数据包 @type {function(number,player):void} */
     sendTo: ll.import("GMLIB_BinaryStream_API", "sendTo"),
     /** 销毁二进制流数据包 @type {function(number):void} */
@@ -1053,7 +1057,7 @@ class Minecraft {
      * @returns {number} 方块的亮度(-1为不存在)
      */
     static getBlockLightEmission(block, legacyData = 0) {
-        return GMLIB_API.getBlockLightEmission(block, legacyData)
+        return GMLIB_API.getBlockLightEmission(block, legacyData);
     }
 
     /**
@@ -2116,30 +2120,39 @@ class GMLIB_BinaryStream {
 
     /**
      * 创建二进制流数据包
-     * @param {{"type":string,"value":any}[]?} value 写入数据
+     * @param {({"type":string,"value":any}[]|GMLIB_BinaryStream)?} value 写入数据
      * @returns {GMLIB_BinaryStream}
      */
     constructor(value) {
-        this.#id = GMLIB_BinaryStream_API.create();
+        this.#id = value instanceof GMLIB_BinaryStream ? GMLIB_BinaryStream_API.copy(value.getId()) : GMLIB_BinaryStream_API.create();
         if (Array.isArray(value)) this.write(value);
     }
 
+    /**
+     * 获取数据包的ID
+     * @returns {number}
+     */
+    getId() {
+        return this.#id;
+    }
+
     /**
      * 发送数据包
-     * @param {Player} player 玩家
+     * @param {Player|Entity} player 玩家
      * @param {boolean} [free=true] 发送后销毁数据包
      * @returns {GMLIB_BinaryStream}
      */
     sendTo(player, free = true) {
         if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
-        GMLIB_BinaryStream_API.sendTo(this.#id, player);
+        if (player instanceof LLSE_Entity && player.isPlayer()) player = player.toPlayer();
+        if (player instanceof LLSE_Player && !player.isSimulatedPlayer()) GMLIB_BinaryStream_API.sendTo(this.#id, player);
         if (free) this.destroy();
         return this;
     }
 
     /**
      * 发送数据包到玩家
-     * @param {Player[]} players 玩家对象数组
+     * @param {Player[]|Entity[]} players 玩家对象数组
      * @param {boolean} free 发送后销毁数据包
      * @returns {GMLIB_BinaryStream}
      */
@@ -2207,8 +2220,8 @@ class GMLIB_BinaryStream {
      * 转换成字符串
      * @returns {string} 字符串
      */
-    toString(){
+    toString() {
-        return `<GMLIB_BinaryStream#${this.#id}>`
+        return `<GMLIB_BinaryStream#${this.#id}>`;
     }
 
     /**
@@ -2324,7 +2337,7 @@ class GMLIB_BinaryStream {
      */
     writeBool(value) {
         if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
-        GMLIB_BinaryStream_API.writeBool(this.#id, value);
+        GMLIB_BinaryStream_API.writeBool(this.#id, Boolean(value));
         return this;
     }
 
@@ -2335,7 +2348,7 @@ class GMLIB_BinaryStream {
      */
     writeByte(value) {
         if (this.#destroy) throw new Error("The BinaryStream has been destroyed");
-        GMLIB_BinaryStream_API.writeByte(this.#id, value);
+        GMLIB_BinaryStream_API.writeByte(this.#id, Number(value));
         return this;
     }
 
@@ -2527,7 +2540,7 @@ LLSE_Player.prototype.toEntity =
      */
     function () {
         return GMLIB_API.PlayerToEntity(this);
-    }
+    };
 
 LLSE_Player.prototype.getSpawnPoint =
     /**
@@ -2536,7 +2549,7 @@ LLSE_Player.prototype.getSpawnPoint =
      */
     function () {
         return GMLIB_API.getPlayerSpawnPoint(this);
-    }
+    };
 
 LLSE_Player.prototype.setSpawnPoint =
     /**
@@ -2545,7 +2558,7 @@ LLSE_Player.prototype.setSpawnPoint =
      */
     function (pos) {
         GMLIB_API.setPlayerSpawnPoint(this, pos);
-    }
+    };
 
 LLSE_Player.prototype.clearSpawnPoint =
     /**
@@ -2553,7 +2566,7 @@ LLSE_Player.prototype.clearSpawnPoint =
      */
     function () {
         GMLIB_API.clearPlayerSpawnPoint(this);
-    }
+    };
 
 LLSE_Entity.prototype.shootProjectile =
     /**
@@ -2565,7 +2578,7 @@ LLSE_Entity.prototype.shootProjectile =
      */
     function (proj, speed = 2, offset = 3) {
         return GMLIB_API.shootProjectile(this, proj, speed, offset);
-    }
+    };
 
 LLSE_Entity.prototype.throwEntity =
     /**
@@ -2577,7 +2590,7 @@ LLSE_Entity.prototype.throwEntity =
      */
     function (proj, speed = 2, offset = 3) {
         return GMLIB_API.throwEntity(this, proj, speed, offset);
-    }
+    };
 
 LLSE_Entity.prototype.getTranslateKey =
     /**
@@ -2586,7 +2599,7 @@ LLSE_Entity.prototype.getTranslateKey =
      */
     function () {
         return GMLIB_API.getEntityTranslateKey(this);
-    }
+    };
 
 LLSE_Entity.prototype.getTranslateName =
     /**
@@ -2596,7 +2609,7 @@ LLSE_Entity.prototype.getTranslateName =
      */
     function (language) {
         return I18nAPI.get(this.getTranslateKey(), [], language);
-    }
+    };
 
 LLSE_Block.prototype.getTranslateKey =
     /**
@@ -2605,7 +2618,7 @@ LLSE_Block.prototype.getTranslateKey =
      */
     function () {
         return GMLIB_API.getBlockTranslateKey(this);
-    }
+    };
 
 LLSE_Block.prototype.getTranslateName =
     /**
@@ -2615,7 +2628,7 @@ LLSE_Block.prototype.getTranslateName =
      */
     function (language) {
         return I18nAPI.get(this.getTranslateKey(), [], language);
-    }
+    };
 
 LLSE_Item.prototype.getTranslateKey =
     /**
@@ -2624,7 +2637,7 @@ LLSE_Item.prototype.getTranslateKey =
      */
     function () {
         return GMLIB_API.getItemTranslateKey(this);
-    }
+    };
 
 LLSE_Item.prototype.getTranslateName =
     /**
@@ -2634,7 +2647,7 @@ LLSE_Item.prototype.getTranslateName =
      */
     function (language) {
         return I18nAPI.get(this.getTranslateKey(), [], language);
-    }
+    };
 
 LLSE_Block.prototype.getBlockDestroySpeed =
     /**
@@ -2643,7 +2656,7 @@ LLSE_Block.prototype.getBlockDestroySpeed =
      */
     function () {
         return GMLIB_API.getBlockDestroySpeed(this);
-    }
+    };
 
 LLSE_Item.prototype.getDestroyBlockSpeed =
     /**
@@ -2653,7 +2666,7 @@ LLSE_Item.prototype.getDestroyBlockSpeed =
      */
     function (block) {
         return GMLIB_API.getDestroyBlockSpeed(this, block);
-    }
+    };
 
 LLSE_Block.prototype.playerDestroy =
     /**
@@ -2662,7 +2675,7 @@ LLSE_Block.prototype.playerDestroy =
      */
     function (player) {
         GMLIB_API.playerDestroyBlock(this, this.pos, player);
-    }
+    };
 
 LLSE_Item.prototype.canDestroy =
     /**
@@ -2672,7 +2685,7 @@ LLSE_Item.prototype.canDestroy =
      */
     function (block) {
         return GMLIB_API.itemCanDestroyBlock(this, block);
-    }
+    };
 
 LLSE_Item.prototype.canDestroyInCreative =
     /**
@@ -2681,7 +2694,7 @@ LLSE_Item.prototype.canDestroyInCreative =
      */
     function () {
         return GMLIB_API.itemCanDestroyInCreative(this);
-    }
+    };
 
 LLSE_Item.prototype.canDestroySpecial =
     /**
@@ -2691,7 +2704,7 @@ LLSE_Item.prototype.canDestroySpecial =
      */
     function (block) {
         return GMLIB_API.itemCanDestroySpecial(this, block);
-    }
+    };
 
 LLSE_Block.prototype.canDropWithAnyTool =
     /**
@@ -2700,16 +2713,7 @@ LLSE_Block.prototype.canDropWithAnyTool =
      */
     function () {
         return GMLIB_API.blockCanDropWithAnyTool(this);
-    }
+    };
-
-LLSE_Block.prototype.isAlwaysDestroyable =
-    /**
-     * 方块是否不需要工具采集
-     * @returns {boolean} 方块是否不需要工具采集
-     */
-    function () {
-        return GMLIB_API.blockIsAlwaysDestroyable(this);
-    }
 
 LLSE_Block.prototype.playerWillDestroy =
     /**
@@ -2719,7 +2723,7 @@ LLSE_Block.prototype.playerWillDestroy =
      */
     function (player) {
         return GMLIB_API.blockPlayerWillDestroy(this, player, this.pos);
-    }
+    };
 
 LLSE_Player.prototype.attack =
     /**
@@ -2729,7 +2733,7 @@ LLSE_Player.prototype.attack =
      */
     function (entity) {
         return GMLIB_API.playerAttack(this, entity);
-    }
+    };
 
 LLSE_Player.prototype.pullInEntity =
     /**
@@ -2739,16 +2743,7 @@ LLSE_Player.prototype.pullInEntity =
      */
     function (entity) {
         return GMLIB_API.playerPullInEntity(this, entity);
-    }
+    };
-
-LLSE_Item.prototype.getLegalEnchants =
-    /**
-     * 获取物品可以拥有的合法附魔
-     * @returns {Array.<string>} 附魔ID列表
-     */
-    function () {
-        return GMLIB_API.getLegalEnchants(this);
-    }
 
 LLSE_Item.prototype.applyEnchant =
     /**
@@ -2760,7 +2755,7 @@ LLSE_Item.prototype.applyEnchant =
      */
     function (typeName, level, allowNonVanilla = true) {
         return GMLIB_API.applyEnchant(this, typeName, level, allowNonVanilla);
-    }
+    };
 
 LLSE_Item.prototype.removeEnchants =
     /**
@@ -2768,7 +2763,7 @@ LLSE_Item.prototype.removeEnchants =
      */
     function () {
         GMLIB_API.removeEnchants(this);
-    }
+    };
 
 LLSE_Item.prototype.hasEnchant =
     /**
@@ -2778,7 +2773,7 @@ LLSE_Item.prototype.hasEnchant =
      */
     function (typeName) {
         return GMLIB_API.hasEnchant(this, typeName);
-    }
+    };
 
 LLSE_Item.prototype.getEnchantLevel =
     /**
@@ -2788,7 +2783,7 @@ LLSE_Item.prototype.getEnchantLevel =
      */
     function (typeName) {
         return GMLIB_API.getEnchantLevel(this, typeName);
-    }
+    };
 
 LLSE_Player.prototype.dropItem =
     /**
@@ -2799,7 +2794,7 @@ LLSE_Player.prototype.dropItem =
      */
     function (item, randomly = false) {
         return GMLIB_API.dropPlayerItem(this, item, randomly);
-    }
+    };
 
 LLSE_Player.prototype.getRuntimeId =
     /**
@@ -2808,7 +2803,7 @@ LLSE_Player.prototype.getRuntimeId =
      */
     function () {
         return GMLIB_API.getPlayerRuntimeId(this);
-    }
+    };
 
 LLSE_Entity.prototype.getRuntimeId =
     /**
@@ -2817,7 +2812,7 @@ LLSE_Entity.prototype.getRuntimeId =
      */
     function () {
         return GMLIB_API.getEntityRuntimeId(this);
-    }
+    };
 
 LLSE_Entity.prototype.getNameTag =
     /**
@@ -2826,7 +2821,7 @@ LLSE_Entity.prototype.getNameTag =
      */
     function () {
         return GMLIB_API.getEntityNameTag(this);
-    }
+    };
 
 LLSE_Item.prototype.isUnbreakable =
     /**
@@ -2835,7 +2830,7 @@ LLSE_Item.prototype.isUnbreakable =
      */
     function () {
         return GMLIB_API.ItemisUnbreakable(this);
-    }
+    };
 
 LLSE_Item.prototype.setUnbreakable =
     /**
@@ -2844,7 +2839,7 @@ LLSE_Item.prototype.setUnbreakable =
      */
     function (value) {
         GMLIB_API.setItemUnbreakable(this, value);
-    }
+    };
 
 LLSE_Item.prototype.getShouldKeepOnDeath =
     /**
@@ -2853,7 +2848,7 @@ LLSE_Item.prototype.getShouldKeepOnDeath =
      */
     function () {
         return GMLIB_API.getItemShouldKeepOnDeath(this);
-    }
+    };
 
 LLSE_Item.prototype.setShouldKeepOnDeath =
     /**
@@ -2862,7 +2857,7 @@ LLSE_Item.prototype.setShouldKeepOnDeath =
      */
     function (value) {
         GMLIB_API.setItemShouldKeepOnDeath(this, value);
-    }
+    };
 
 LLSE_Item.prototype.getItemLockMode =
     /**
@@ -2870,8 +2865,8 @@ LLSE_Item.prototype.getItemLockMode =
      * @returns {0|1|2} 锁定的模式 0:无 1:锁定在格子里 2:锁定在背包里
      */
     function () {
-        return GMLIB_API.getItemLockMode(this)
+        return GMLIB_API.getItemLockMode(this);
-    }
+    };
 
 LLSE_Item.prototype.setItemLockMode =
     /**
@@ -2880,7 +2875,7 @@ LLSE_Item.prototype.setItemLockMode =
      */
     function (mode) {
         GMLIB_API.setItemLockMode(this, mode);
-    }
+    };
 
 LLSE_Item.prototype.getRepairCost =
     /**
@@ -2889,7 +2884,7 @@ LLSE_Item.prototype.getRepairCost =
      */
     function () {
         return GMLIB_API.getItemRepairCost(this);
-    }
+    };
 
 LLSE_Item.prototype.setRepairCost =
     /**
@@ -2898,7 +2893,7 @@ LLSE_Item.prototype.setRepairCost =
      */
     function (cost) {
         return GMLIB_API.setItemRepairCost(this, cost);
-    }
+    };
 
 LLSE_Item.prototype.getCanDestroy =
     /**
@@ -2907,7 +2902,7 @@ LLSE_Item.prototype.getCanDestroy =
      */
     function () {
         return GMLIB_API.getItemCanDestroy(this);
-    }
+    };
 
 LLSE_Item.prototype.setCanDestroy =
     /**
@@ -2916,7 +2911,7 @@ LLSE_Item.prototype.setCanDestroy =
      */
     function (blocks) {
         GMLIB_API.setItemCanDestroy(this, blocks);
-    }
+    };
 
 LLSE_Item.prototype.getCanPlaceOn =
     /**
@@ -2925,7 +2920,7 @@ LLSE_Item.prototype.getCanPlaceOn =
      */
     function () {
         return GMLIB_API.getItemCanPlaceOn(this);
-    }
+    };
 
 LLSE_Item.prototype.setCanPlaceOn =
     /**
@@ -2934,7 +2929,7 @@ LLSE_Item.prototype.setCanPlaceOn =
      */
     function (blocks) {
         GMLIB_API.setItemCanPlaceOn(this, blocks);
-    }
+    };
 
 LLSE_Player.prototype.getHungry =
     /**
@@ -2943,7 +2938,7 @@ LLSE_Player.prototype.getHungry =
      */
     function () {
         return GMLIB_API.getPlayerHungry(this);
-    }
+    };
 
 LLSE_Player.prototype.getArmorCoverPercentage =
     /**
@@ -2952,7 +2947,7 @@ LLSE_Player.prototype.getArmorCoverPercentage =
      */
     function () {
         return GMLIB_API.getPlayerArmorCoverPercentage(this);
-    }
+    };
 
 LLSE_Player.prototype.getArmorValue =
     /**
@@ -2961,7 +2956,7 @@ LLSE_Player.prototype.getArmorValue =
      */
     function () {
         return GMLIB_API.getPlayerArmorValue(this);
-    }
+    };
 
 LLSE_Entity.prototype.getEntityOwner =
     /**
@@ -2971,7 +2966,7 @@ LLSE_Entity.prototype.getEntityOwner =
     function () {
         const uniqueId = GMLIB_API.getEntityOwnerUniqueId(this);
         return uniqueId === -1 ? null : Minecraft.getEntityFromUniqueId(uniqueId);
-    }
+    };
 
 LLSE_Item.prototype.getCategoryName =
     /**
@@ -2980,7 +2975,7 @@ LLSE_Item.prototype.getCategoryName =
      */
     function () {
         return GMLIB_API.getItemCategoryName(this);
-    }
+    };
 
 LLSE_Item.prototype.getCustomName =
     /**
@@ -2989,7 +2984,7 @@ LLSE_Item.prototype.getCustomName =
      */
     function () {
         return GMLIB_API.getItemCustomName(this);
-    }
+    };
 
 LLSE_Item.prototype.getEffecName =
     /**
@@ -2998,7 +2993,7 @@ LLSE_Item.prototype.getEffecName =
      */
     function () {
         return GMLIB_API.getItemEffecName(this);
-    }
+    };
 
 LLSE_Item.prototype.isFood =
     /**
@@ -3007,7 +3002,7 @@ LLSE_Item.prototype.isFood =
      */
     function () {
         return GMLIB_API.itemIsFood(this);
-    }
+    };
 
 LLSE_Player.prototype.setPlayerUIItem =
     /**
@@ -3017,7 +3012,7 @@ LLSE_Player.prototype.setPlayerUIItem =
      */
     function (slot, item) {
         GMLIB_API.setPlayerUIItem(this, slot, item);
-    }
+    };
 
 LLSE_Player.prototype.getPlayerUIItem =
     /**
@@ -3027,7 +3022,7 @@ LLSE_Player.prototype.getPlayerUIItem =
      */
     function (slot) {
         return GMLIB_API.getPlayerUIItem(this, slot);
-    }
+    };
 
 LLSE_Player.prototype.sendInventorySlotPacket =
     /**
@@ -3038,7 +3033,7 @@ LLSE_Player.prototype.sendInventorySlotPacket =
      */
     function (containerId, slot, item) {
         GMLIB_API.sendInventorySlotPacket(this, containerId, slot, item);
-    }
+    };
 
 LLSE_Container.prototype.getContainerType =
     /**
@@ -3047,7 +3042,7 @@ LLSE_Container.prototype.getContainerType =
      */
     function () {
         return GMLIB_API.getContainerType(this);
-    }
+    };
 
 LLSE_Item.prototype.getMaxCount =
     /**
@@ -3056,7 +3051,7 @@ LLSE_Item.prototype.getMaxCount =
      */
     function () {
         return GMLIB_API.getItemMaxCount(this);
-    }
+    };
 
 LLSE_Entity.prototype.hasFamily =
     /**
@@ -3066,7 +3061,7 @@ LLSE_Entity.prototype.hasFamily =
      */
     function (family) {
         return GMLIB_API.entityHasFamily(this, family);
-    }
+    };
 
 LLSE_Player.prototype.getDestroyProgress =
     /**
@@ -3076,7 +3071,7 @@ LLSE_Player.prototype.getDestroyProgress =
      */
     function (block) {
         return GMLIB_API.getPlayerDestroyBlockProgress(this, block);
-    }
+    };
 
 LLSE_Entity.prototype.hasEffect =
     /**
@@ -3086,7 +3081,7 @@ LLSE_Entity.prototype.hasEffect =
      */
     function (effectId) {
         return GMLIB_API.entityHasEffect(this, effectId);
-    }
+    };
 
 LLSE_Entity.prototype.getEffectInfo =
     /**
@@ -3105,8 +3100,8 @@ LLSE_Entity.prototype.getEffectInfo =
             DurationHard: GMLIB_API.getEntityEffectDurationHard(this, effectId),
             Ambient: GMLIB_API.getEntityEffectAmbient(this, effectId),
             ShowParticles: GMLIB_API.getEntityEffectVisible(this, effectId),
-        }
+        };
-    }
+    };
 
 LLSE_Entity.prototype.getAllEffectsInfo =
     /**
@@ -3115,7 +3110,195 @@ LLSE_Entity.prototype.getAllEffectsInfo =
      */
     function () {
         return this.getAllEffects().map(effectId => this.getEffectInfo(effectId));
-    }
+    };
+
+LLSE_Entity.prototype.isType =
+    /**
+     * 是否为某类型
+     * @param {number} type 类型
+     * @returns {boolean}
+     */
+    function (type) {
+        return GMLIB_API.entityIsType(this, type);
+    };
+
+LLSE_Entity.prototype.hasType =
+    /**
+     * 是否包含某类型
+     * @param {number} type 类型
+     * @returns {boolean}
+     */
+    function (type) {
+        return GMLIB_API.entityHasType(this, type);
+    };
+
+LLSE_Entity.prototype.getEntityTypeId =
+    /**
+     * 获取实体类型ID
+     * @returns {number}
+     */
+    function () {
+        return GMLIB_API.getEntityTypeId(this);
+    };
+
+const ActorType = Object.freeze({
+    Undefined: 1,
+    TypeMask: 0b11111111,
+    None: 0,
+    Mob: 1 << 8,
+    PathfinderMob: 1 << 9 | this.Mob,
+    UnknownType: 1 << 10,
+    Monster: 1 << 11 | this.PathfinderMob,
+    Animal: 1 << 12 | this.PathfinderMob,
+    WaterAnimal: 1 << 13 | this.PathfinderMob,
+    TamableAnimal: 1 << 14 | this.Animal,
+    Ambient: 1 << 15 | this.Mob,
+    UndeadMob: 1 << 16 | this.Monster,
+    ZombieMonster: 1 << 17 | this.UndeadMob,
+    Arthropod: 1 << 18 | this.Monster,
+    Minecart: 1 << 19,
+    SkeletonMonster: 1 << 20 | this.UndeadMob,
+    EquineAnimal: 1 << 21 | this.TamableAnimal,
+    Projectile: 1 << 22,
+    AbstractArrow: 1 << 23,
+    VillagerBase: 1 << 24 | this.PathfinderMob,
+
+    Chicken: 10 | this.Animal,
+    Cow: 11 | this.Animal,
+    Pig: 12 | this.Animal,
+    Sheep: 13 | this.Animal,
+    Wolf: 14 | this.TamableAnimal,
+    Villager: 15 | this.VillagerBase,
+    MushroomCow: 16 | this.Animal,
+    Squid: 17 | this.WaterAnimal,
+    Rabbit: 18 | this.Animal,
+    Bat: 19 | this.Ambient,
+    IronGolem: 20 | this.PathfinderMob,
+    SnowGolem: 21 | this.PathfinderMob,
+    Ocelot: 22 | this.TamableAnimal,
+    Horse: 23 | this.EquineAnimal,
+    Donkey: 24 | this.EquineAnimal,
+    Mule: 25 | this.EquineAnimal,
+    SkeletonHorse: 26 | this.EquineAnimal | this.UndeadMob,
+    ZombieHorse: 27 | this.EquineAnimal | this.UndeadMob,
+    PolarBear: 28 | this.Animal,
+    Llama: 29 | this.Animal,
+    Parrot: 30 | this.TamableAnimal,
+    Dolphin: 31 | this.WaterAnimal,
+    Zombie: 32 | this.ZombieMonster,
+    Creeper: 33 | this.Monster,
+    Skeleton: 34 | this.SkeletonMonster,
+    Spider: 35 | this.Arthropod,
+    PigZombie: 36 | this.UndeadMob,
+    Slime: 37 | this.Monster,
+    EnderMan: 38 | this.Monster,
+    Silverfish: 39 | this.Arthropod,
+    CaveSpider: 40 | this.Arthropod,
+    Ghast: 41 | this.Monster,
+    LavaSlime: 42 | this.Monster,
+    Blaze: 43 | this.Monster,
+    ZombieVillager: 44 | this.ZombieMonster,
+    Witch: 45 | this.Monster,
+    Stray: 46 | this.SkeletonMonster,
+    Husk: 47 | this.ZombieMonster,
+    WitherSkeleton: 48 | this.SkeletonMonster,
+    Guardian: 49 | this.Monster,
+    ElderGuardian: 50 | this.Monster,
+    Npc: 51 | this.Mob,
+    WitherBoss: 52 | this.UndeadMob,
+    Dragon: 53 | this.Monster,
+    Shulker: 54 | this.Monster,
+    Endermite: 55 | this.Arthropod,
+    Agent: 56 | this.Mob,
+    Vindicator: 57 | this.Monster,
+    Phantom: 58 | this.UndeadMob,
+    IllagerBeast: 59 | this.Monster,
+    UNUSED60: 60,
+    ArmorStand: 61 | this.Mob,
+    TripodCamera: 62 | this.Mob,
+    Player: 63 | this.Mob,
+    ItemEntity: 64 | this.None,
+    PrimedTnt: 65 | this.None,
+    FallingBlock: 66 | this.None,
+    MovingBlock: 67 | this.None,
+    ExperiencePotion: 68 | this.Projectile,
+    Experience: 69 | this.None,
+    EyeOfEnder: 70 | this.None,
+    EnderCrystal: 71 | this.None,
+    FireworksRocket: 72 | this.None,
+    Trident: 73 | this.Projectile | this.AbstractArrow,
+    Turtle: 74 | this.Animal,
+    Cat: 75 | this.TamableAnimal,
+    ShulkerBullet: 76 | this.Projectile,
+    FishingHook: 77 | this.None,
+    Chalkboard: 78 | this.None,
+    DragonFireball: 79 | this.Projectile,
+    Arrow: 80 | this.Projectile | this.AbstractArrow,
+    Snowball: 81 | this.Projectile,
+    ThrownEgg: 82 | this.Projectile,
+    Painting: 83 | this.None,
+    MinecartRideable: 84 | this.Minecart,
+    LargeFireball: 85 | this.Projectile,
+    ThrownPotion: 86 | this.Projectile,
+    Enderpearl: 87 | this.Projectile,
+    LeashKnot: 88 | this.None,
+    WitherSkull: 89 | this.Projectile,
+    BoatRideable: 90 | this.None,
+    WitherSkullDangerous: 91 | this.Projectile,
+    UNUSED92: 92,
+    LightningBolt: 93 | this.None,
+    SmallFireball: 94 | this.Projectile,
+    AreaEffectCloud: 95 | this.None,
+    MinecartHopper: 96 | this.Minecart,
+    MinecartTNT: 97 | this.Minecart,
+    MinecartChest: 98 | this.Minecart,
+    MinecartFurnace: 99 | this.Minecart,
+    MinecartCommandBlock: 100 | this.Minecart,
+    LingeringPotion: 101 | this.Projectile,
+    LlamaSpit: 102 | this.Projectile,
+    EvocationFang: 103 | this.Projectile,
+    EvocationIllager: 104 | this.Monster,
+    Vex: 105 | this.Monster,
+    IceBomb: 106 | this.Projectile,
+    Balloon: 107 | this.None,
+    Pufferfish: 108 | this.WaterAnimal,
+    Salmon: 109 | this.WaterAnimal,
+    Drowned: 110 | this.ZombieMonster,
+    Tropicalfish: 111 | this.WaterAnimal,
+    Fish: 112 | this.WaterAnimal,
+    Panda: 113 | this.Animal,
+    Pillager: 114 | this.Monster,
+    VillagerV2: 115 | this.VillagerBase,
+    ZombieVillagerV2: 116 | this.ZombieMonster,
+    Shield: 117 | this.None,
+    WanderingTrader: 118 | this.PathfinderMob,
+    Lectern: 119 | this.None,
+    ElderGuardianGhost: 120 | this.Monster,
+    Fox: 121 | this.Animal,
+    Bee: 122 | this.Mob,
+    Piglin: 123 | this.Mob,
+    Hoglin: 124 | this.Animal,
+    Strider: 125 | this.Animal,
+    Zoglin: 126 | this.UndeadMob,
+    PiglinBrute: 127 | this.Mob,
+    Goat: 128 | this.Animal,
+    GlowSquid: 129 | this.WaterAnimal,
+    Axolotl: 130 | this.Animal,
+    Warden: 131 | this.Monster,
+    Frog: 132 | this.Animal,
+    Tadpole: 133 | this.WaterAnimal,
+    Allay: 134 | this.Mob,
+    ChestBoatRideable: 136 | this.BoatRideable,
+    TraderLlama: 137 | this.Llama,
+    Camel: 138 | this.Animal,
+    Sniffer: 139 | this.Animal,
+    Breeze: 140 | this.Monster,
+    BreezeWindChargeProjectile: 141 | this.Projectile,
+    Armadillo: 142 | this.Animal,
+    WindChargeProjectile: 143 | this.Projectile,
+    Bogged: 144 | this.SkeletonMonster,
+    OminousItemSpawner: 145,
+});
 
 module.exports = {
     StaticFloatingText,
@@ -3130,5 +3313,6 @@ module.exports = {
     Version,
     I18nAPI,
     UserCache,
-    GMLIB_BinaryStream
+    GMLIB_BinaryStream,
+    ActorType
 };

manifest.json

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

src/BinaryStreamApi.cpp

@@ -4,16 +4,25 @@ using namespace ll::hash_utils;
 class LegacyScriptBinaryStreamManager {
 private:
     int64                                                           mNextBinaryStreamId = 0;
-    std::unordered_map<uint64, std::shared_ptr<gmlib::network::BinaryStream>> mBinaryStream;
+    std::unordered_map<uint64, std::shared_ptr<GMLIB_BinaryStream>> mBinaryStream;
 
 public:
     uint getNextId() { return mNextBinaryStreamId++; }
 
-    void cretateBinaryStream(uint id) { mBinaryStream[id] = std::make_shared<gmlib::network::BinaryStream>(); }
+    void cretateBinaryStream(uint id) { mBinaryStream[id] = std::make_shared<GMLIB_BinaryStream>(); }
+
+    uint64 copyBinaryStream(uint id) {
+        auto nextId = getNextId();
+        cretateBinaryStream(nextId);
+        if(auto bs = getBinaryStream(nextId); bs !=nullptr){
+            getBinaryStream(nextId)->mBuffer = getBinaryStream(id)->mBuffer;
+        }
+        return nextId;
+    }
 
     void removeBinaryStream(uint64 id) { mBinaryStream.erase(id); }
 
-    std::shared_ptr<gmlib::network::BinaryStream> getBinaryStream(uint64 id) {
+    std::shared_ptr<GMLIB_BinaryStream> getBinaryStream(uint64 id) {
         return mBinaryStream.contains(id) ? mBinaryStream.at(id) : nullptr;
     }
 
@@ -38,7 +47,7 @@ template <typename T, typename R, typename A, typename... AS>
 struct Info<R (T::*)(A, AS...)> {
     using ArgT = A;
 };
-#define EXPORTAPI2(T) EXPORTAPI(#T, Info<decltype(&gmlib::network::BinaryStream::T)>::ArgT, bs->T(value))
+#define EXPORTAPI2(T) EXPORTAPI(#T, Info<decltype(&GMLIB_BinaryStream::T)>::ArgT, bs->T(value))
 
 void Export_BinaryStream_API() {
     RemoteCall::exportAs("GMLIB_BinaryStream_API", "create", []() -> uint64 {
@@ -46,6 +55,9 @@ void Export_BinaryStream_API() {
         BinaryStreamManager.cretateBinaryStream(id);
         return id;
     });
+    RemoteCall::exportAs("GMLIB_BinaryStream_API", "copy", [](uint64 id) -> uint64 {
+        return BinaryStreamManager.copyBinaryStream(id);
+    });
     RemoteCall::exportAs("GMLIB_BinaryStream_API", "reset", [](uint64 id) -> void {
         if (BinaryStreamManager.getBinaryStream(id) == nullptr) BinaryStreamManager.cretateBinaryStream(id);
         else BinaryStreamManager.getBinaryStream(id)->reset();

src/CompatibilityApi.cpp

@@ -1,3 +1,4 @@
+#include "GMLIB/Mod/CustomRecipe/CustomRecipe.h"
 #include "Global.h"
 #include <regex>
 
@@ -7,69 +8,61 @@ bool isInteger(const std::string& str) {
 }
 
 ActorUniqueID parseScriptUniqueID(std::string const& uniqueId) {
-    return isInteger(uniqueId) ? ActorUniqueID(std::stoll(uniqueId)) : ActorUniqueID::INVALID_ID;
+    return isInteger(uniqueId) ? ActorUniqueID(std::stoll(uniqueId)) : ActorUniqueID::INVALID_ID();
 }
 
 void Export_Compatibility_API() {
     RemoteCall::exportAs("GMLIB_API", "unregisterRecipe", [](std::string const& id) -> bool {
-        return gmlib::world::Level::getInstance().has_value() ? gmlib::mod::recipe::RecipeRegistry::unregisterRecipe(id) : false;
+        return GMLIB_Level::getInstance().has_value() ? GMLIB::Mod::CustomRecipe::unregisterRecipe(id) : false;
     });
     RemoteCall::exportAs("GMLIB_API", "setCustomPackPath", [](std::string const& path) -> void {
-        gmlib::tools::AddonsLoader::addCustomPackPath(path);
+        GMLIB::Mod::CustomPacks::addCustomPackPath(path);
     });
     RemoteCall::exportAs("GMLIB_API", "getServerMspt", []() -> double {
-        return gmlib::world::Level::getInstance()
+        return GMLIB_Level::getInstance().transform(
-            .transform([](gmlib::world::Level& level) -> double { return level.getServerMspt(); })
+                                             [](GMLIB_Level& level) -> double { return level.getServerMspt(); }
-            .value_or(0.0);
+        ).value_or(0.0);
     });
     RemoteCall::exportAs("GMLIB_API", "getServerCurrentTps", []() -> float {
-        return gmlib::world::Level::getInstance()
+        return GMLIB_Level::getInstance()
-            .transform([](gmlib::world::Level& level) -> float { return level.getServerCurrentTps(); })
+            .transform([](GMLIB_Level& level) -> float { return level.getServerCurrentTps(); })
             .value_or(0.0);
     });
     RemoteCall::exportAs("GMLIB_API", "getServerAverageTps", []() -> double {
-        return gmlib::world::Level::getInstance()
+        return GMLIB_Level::getInstance()
-            .transform([](gmlib::world::Level& level) -> double { return level.getServerAverageTps(); })
+            .transform([](GMLIB_Level& level) -> double { return level.getServerAverageTps(); })
             .value_or(0.0);
     });
     RemoteCall::exportAs("GMLIB_API", "getAllPlayerUuids", []() -> std::vector<std::string> {
         std::vector<std::string> result;
-        for (auto& uuid : gmlib::world::Player::getAllUuids()) {
+        for (auto& uuid : GMLIB_Player::getAllUuids()) {
             result.push_back(uuid.asString());
         }
         return result;
     });
     RemoteCall::exportAs("GMLIB_API", "getPlayerNbt", [](std::string const& uuid) -> std::unique_ptr<CompoundTag> {
-        return std::move(gmlib::world::Player::getPlayerNbt(mce::UUID::fromString(uuid)));
+        return std::move(GMLIB_Player::getPlayerNbt(mce::UUID::fromString(uuid)));
     });
     RemoteCall::exportAs(
         "GMLIB_API",
         "setPlayerNbt",
         [](std::string const& uuid, CompoundTag* nbt, bool forceCreate) -> bool {
-            return gmlib::world::Player::setPlayerNbt(
+            return GMLIB_Player::setPlayerNbt(mce::UUID::fromString(uuid), (GMLIB_CompoundTag&)*nbt, forceCreate);
-                mce::UUID::fromString(uuid),
-                (gmlib::world::CompoundTag&)*nbt,
-                forceCreate
-            );
         }
     );
     RemoteCall::exportAs(
         "GMLIB_API",
         "setPlayerNbtTags",
         [](std::string const& uuid, CompoundTag* nbt, std::vector<std::string> tags) -> bool {
-            return gmlib::world::Player::setPlayerNbtTags(
+            return GMLIB_Player::setPlayerNbtTags(mce::UUID::fromString(uuid), (GMLIB_CompoundTag&)*nbt, tags);
-                mce::UUID::fromString(uuid),
-                (gmlib::world::CompoundTag&)*nbt,
-                tags
-            );
         }
     );
     RemoteCall::exportAs("GMLIB_API", "deletePlayerNbt", [](std::string const& uuid) -> bool {
-        return gmlib::world::Player::deletePlayerNbt(mce::UUID::fromString(uuid));
+        return GMLIB_Player::deletePlayerNbt(mce::UUID::fromString(uuid));
     });
     RemoteCall::exportAs("GMLIB_API", "getAllExperiments", []() -> std::vector<int> {
         std::vector<int> result;
-        for (auto& key : gmlib::world::Level::getAllExperiments()) {
+        for (auto& key : GMLIB_Level::getAllExperiments()) {
             result.push_back((int)key);
         }
         return result;
@@ -85,113 +78,110 @@ void Export_Compatibility_API() {
         "GMLIB_API",
         "createFloatingText",
         [](std::pair<Vec3, int> pos, std::string const& text, bool papi) -> int {
-            auto ft = gmlib::tools::FloatingTextManager::createStatic(text, pos.first, pos.second, papi);
+            auto ft = GMLIB::Server::FloatingTextManager::createStatic(text, pos.first, pos.second, papi);
-            gmlib::tools::FloatingTextManager::getInstance().add(ft);
+            GMLIB::Server::FloatingTextManager::getInstance().add(ft);
             return ft->getRuntimeID();
         }
     );
     RemoteCall::exportAs("GMLIB_API", "setFloatingTextData", [](int id, std::string const& text) -> bool {
-        return gmlib::tools::FloatingTextManager::getInstance()
+        return GMLIB::Server::FloatingTextManager::getInstance()
             .getFloatingText(id)
-            .transform([&text](gmlib::tools::FloatingTextBase& ft) -> bool {
+            .transform([&text](GMLIB::Server::FloatingTextBase& ft) -> bool {
                 ft.setText(text);
                 return true;
             })
             .has_value();
     });
     RemoteCall::exportAs("GMLIB_API", "deleteFloatingText", [](int id) -> bool {
-        return gmlib::tools::FloatingTextManager::getInstance().remove(id);
+        return GMLIB::Server::FloatingTextManager::getInstance().remove(id);
     });
     RemoteCall::exportAs("GMLIB_API", "sendFloatingTextToPlayer", [](int id, Player* pl) -> bool {
-        return gmlib::tools::FloatingTextManager::getInstance()
+        return GMLIB::Server::FloatingTextManager::getInstance()
             .getFloatingText(id)
-            .transform([&pl](gmlib::tools::FloatingTextBase& ft) -> bool {
+            .transform([&pl](GMLIB::Server::FloatingTextBase& ft) -> bool {
                 ft.sendTo(*pl);
                 return true;
             })
             .has_value();
     });
     RemoteCall::exportAs("GMLIB_API", "sendFloatingText", [](int id) -> bool {
-        return gmlib::tools::FloatingTextManager::getInstance()
+        return GMLIB::Server::FloatingTextManager::getInstance()
             .getFloatingText(id)
-            .transform([](gmlib::tools::FloatingTextBase& ft) -> bool {
+            .transform([](GMLIB::Server::FloatingTextBase& ft) -> bool {
                 ft.sendToClients();
                 return true;
             })
             .has_value();
     });
     RemoteCall::exportAs("GMLIB_API", "removeFloatingTextFromPlayer", [](int id, Player* pl) -> bool {
-        return gmlib::tools::FloatingTextManager::getInstance()
+        return GMLIB::Server::FloatingTextManager::getInstance()
             .getFloatingText(id)
-            .transform([&pl](gmlib::tools::FloatingTextBase& ft) -> bool {
+            .transform([&pl](GMLIB::Server::FloatingTextBase& ft) -> bool {
                 ft.removeFrom(*pl);
                 return true;
             })
             .has_value();
     });
     RemoteCall::exportAs("GMLIB_API", "removeFloatingText", [](int id) -> bool {
-        return gmlib::tools::FloatingTextManager::getInstance()
+        return GMLIB::Server::FloatingTextManager::getInstance()
             .getFloatingText(id)
-            .transform([](gmlib::tools::FloatingTextBase& ft) -> bool {
+            .transform([](GMLIB::Server::FloatingTextBase& ft) -> bool {
                 ft.removeFromClients();
                 return true;
             })
             .has_value();
     });
     RemoteCall::exportAs("GMLIB_API", "updateClientFloatingTextData", [](int id, Player* pl) -> bool {
-        return gmlib::tools::FloatingTextManager::getInstance()
+        return GMLIB::Server::FloatingTextManager::getInstance()
             .getFloatingText(id)
-            .transform([&pl](gmlib::tools::FloatingTextBase& ft) -> bool {
+            .transform([&pl](GMLIB::Server::FloatingTextBase& ft) -> bool {
                 ft.update(*pl);
                 return true;
             })
             .has_value();
     });
     RemoteCall::exportAs("GMLIB_API", "updateAllClientsFloatingTextData", [](int id) -> bool {
-        return gmlib::tools::FloatingTextManager::getInstance()
+        return GMLIB::Server::FloatingTextManager::getInstance()
             .getFloatingText(id)
-            .transform([](gmlib::tools::FloatingTextBase& ft) -> bool {
+            .transform([](GMLIB::Server::FloatingTextBase& ft) -> bool {
                 ft.updateClients();
                 return true;
             })
             .has_value();
     });
     RemoteCall::exportAs("GMLIB_API", "isVersionMatched", [](int a, int b, int c) -> bool {
-        return LIB_VERSION >= gmlib::Version(a, b, c, "", "");
+        return LIB_VERSION >= GMLIB::Version(a, b, c, "", "");
     });
     RemoteCall::exportAs("GMLIB_API", "getVersion_LRCA", []() -> std::string { return LIB_VERSION.asString(); });
     RemoteCall::exportAs("GMLIB_API", "getVersion_GMLIB", []() -> std::string {
-        return gmlib::Version::getLibVersionString();
+        return GMLIB::Version::getLibVersionString();
     });
     RemoteCall::exportAs(
         "GMLIB_API",
         "resourcePackDefaultTranslate",
-        [](std::string const& key, std::vector<std::string> params) -> std::string {
+        [](std::string const& key, std::vector<std::string> params) -> std::string { return I18nAPI::get(key, params); }
-            return gmlib::world::I18nAPI::get(key, params);
-        }
     );
     RemoteCall::exportAs(
         "GMLIB_API",
         "resourcePackTranslate",
         [](std::string const& key, std::vector<std::string> params, std::string const& code) -> std::string {
-            return gmlib::world::I18nAPI::get(key, params, code);
+            return I18nAPI::get(key, params, code);
         }
     );
     RemoteCall::exportAs("GMLIB_API", "chooseResourcePackI18nLanguage", [](std::string const& code) -> void {
-        if (gmlib::world::Level::getInstance()) {
+        if (GMLIB_Level::getInstance()) {
-            gmlib::world::I18nAPI::chooseLanguage(code);
+            I18nAPI::chooseLanguage(code);
         }
     });
     RemoteCall::exportAs("GMLIB_API", "getResourcePackI18nLanguage", []() -> std::string {
-        return gmlib::world::Level::getInstance().has_value() ? gmlib::world::I18nAPI::getCurrentLanguageCode() : "unknown";
+        return GMLIB_Level::getInstance().has_value() ? I18nAPI::getCurrentLanguageCode() : "unknown";
     });
     RemoteCall::exportAs("GMLIB_API", "getSupportedLanguages", []() -> std::vector<std::string> {
-        return gmlib::world::Level::getInstance() ? gmlib::world::I18nAPI::getSupportedLanguageCodes()
+        return GMLIB_Level::getInstance() ? I18nAPI::getSupportedLanguageCodes() : std::vector<std::string>();
-                                                  : std::vector<std::string>();
     });
     RemoteCall::exportAs("GMLIB_API", "loadLanguage", [](std::string const& code, std::string const& lang) -> void {
-        if (gmlib::world::Level::getInstance()) {
+        if (GMLIB_Level::getInstance()) {
-            gmlib::world::I18nAPI::loadLanguage(code, lang);
+            I18nAPI::loadLanguage(code, lang);
         }
     });
     RemoteCall::exportAs(
@@ -199,43 +189,38 @@ void Export_Compatibility_API() {
         "updateOrCreateLanguageFile",
         [](std::string const& code, std::unordered_map<std::string, std::string> lang, std::string const& path
         ) -> void {
-            if (gmlib::world::Level::getInstance()) {
+            if (GMLIB_Level::getInstance()) {
-                gmlib::world::I18nAPI::updateOrCreateLanguageFile(path, code, lang);
+                I18nAPI::updateOrCreateLanguageFile(path, code, lang);
             }
         }
     );
     RemoteCall::exportAs("GMLIB_API", "loadLanguagePath", [](std::string const& path) -> void {
-        if (gmlib::world::Level::getInstance()) {
+        if (GMLIB_Level::getInstance()) {
-            gmlib::world::I18nAPI::loadLanguagesFromDirectory(path);
+            I18nAPI::loadLanguagesFromDirectory(path);
         }
     });
     RemoteCall::exportAs("GMLIB_API", "getPlayerPosition", [](std::string const& uuid) -> std::pair<BlockPos, int> {
-        return gmlib::world::Player::getPlayerPosition(mce::UUID::fromString(uuid))
+        return GMLIB_Player::getPlayerPosition(mce::UUID::fromString(uuid))
             .value_or(std::pair<BlockPos, int>({0, 0, 0}, -1));
     });
     RemoteCall::exportAs(
         "GMLIB_API",
         "setPlayerPosition",
         [](std::string const& uuid, std::pair<BlockPos, int> pos) -> bool {
-            return gmlib::world::Player::setPlayerPosition(mce::UUID::fromString(uuid), pos.first, pos.second);
+            return GMLIB_Player::setPlayerPosition(mce::UUID::fromString(uuid), pos.first, pos.second);
         }
     );
     RemoteCall::exportAs("GMLIB_API", "playerHasScore", [](std::string const& uuid, std::string const& obj) -> bool {
-        return gmlib::world::Player::getPlayerScore(mce::UUID::fromString(uuid), obj).has_value();
+        return GMLIB_Player::getPlayerScore(mce::UUID::fromString(uuid), obj).has_value();
     });
     RemoteCall::exportAs("GMLIB_API", "getPlayerScore", [](std::string const& uuid, std::string const& obj) -> int {
-        return gmlib::world::Player::getPlayerScore(mce::UUID::fromString(uuid), obj).value_or(0);
+        return GMLIB_Player::getPlayerScore(mce::UUID::fromString(uuid), obj).value_or(0);
     });
     RemoteCall::exportAs(
         "GMLIB_API",
         "addPlayerScore",
         [](std::string const& uuid, std::string const& obj, int value) -> bool {
-            return gmlib::world::Player::setPlayerScore(
+            return GMLIB_Player::setPlayerScore(mce::UUID::fromString(uuid), obj, value, PlayerScoreSetFunction::Add)
-                       mce::UUID::fromString(uuid),
-                       obj,
-                       value,
-                       PlayerScoreSetFunction::Add
-            )
                 .has_value();
         }
     );
@@ -243,37 +228,43 @@ void Export_Compatibility_API() {
         "GMLIB_API",
         "reducePlayerScore",
         [](std::string const& uuid, std::string const& obj, int value) -> bool {
-            return gmlib::world::Player::setPlayerScore(mce::UUID::fromString(uuid), obj, value, PlayerScoreSetFunction::Subtract).has_value();
+            return GMLIB_Player::setPlayerScore(
+                       mce::UUID::fromString(uuid),
+                       obj,
+                       value,
+                       PlayerScoreSetFunction::Subtract
+            )
+                .has_value();
         }
     );
     RemoteCall::exportAs(
         "GMLIB_API",
         "setPlayerScore",
         [](std::string const& uuid, std::string const& obj, int value) -> bool {
-            return gmlib::world::Player::setPlayerScore(mce::UUID::fromString(uuid), obj, value).has_value();
+            return GMLIB_Player::setPlayerScore(mce::UUID::fromString(uuid), obj, value).has_value();
         }
     );
     RemoteCall::exportAs("GMLIB_API", "resetPlayerScore", [](std::string const& uuid, std::string const& obj) -> bool {
-        return gmlib::world::Player::resetPlayerScore(mce::UUID::fromString(uuid), obj);
+        return GMLIB_Player::resetPlayerScore(mce::UUID::fromString(uuid), obj);
     });
     RemoteCall::exportAs("GMLIB_API", "resetPlayerScores", [](std::string const& uuid) -> bool {
-        return gmlib::world::Player::resetPlayerScore(mce::UUID::fromString(uuid));
+        return GMLIB_Player::resetPlayerScore(mce::UUID::fromString(uuid));
     });
     RemoteCall::exportAs(
         "GMLIB_API",
         "entityHasScore",
         [](std::string const& uniqueId, std::string const& obj) -> bool {
-            return gmlib::world::Scoreboard::getInstance()->getScore(obj, parseScriptUniqueID(uniqueId)).has_value();
+            return GMLIB_Scoreboard::getInstance()->getScore(obj, parseScriptUniqueID(uniqueId)).has_value();
         }
     );
     RemoteCall::exportAs("GMLIB_API", "getEntityScore", [](std::string const& uniqueId, std::string const& obj) -> int {
-        return gmlib::world::Scoreboard::getInstance()->getScore(obj, parseScriptUniqueID(uniqueId)).value_or(0);
+        return GMLIB_Scoreboard::getInstance()->getScore(obj, parseScriptUniqueID(uniqueId)).value_or(0);
     });
     RemoteCall::exportAs(
         "GMLIB_API",
         "addEntityScore",
         [](std::string const& uniqueId, std::string const& obj, int value) -> bool {
-            return gmlib::world::Scoreboard::getInstance()
+            return GMLIB_Scoreboard::getInstance()
                 ->setScore(obj, parseScriptUniqueID(uniqueId), value, PlayerScoreSetFunction::Add)
                 .has_value();
         }
@@ -282,7 +273,7 @@ void Export_Compatibility_API() {
         "GMLIB_API",
         "reduceEntityScore",
         [](std::string const& uniqueId, std::string const& obj, int value) -> bool {
-            return gmlib::world::Scoreboard::getInstance()
+            return GMLIB_Scoreboard::getInstance()
                 ->setScore(obj, parseScriptUniqueID(uniqueId), value, PlayerScoreSetFunction::Subtract)
                 .has_value();
         }
@@ -291,41 +282,41 @@ void Export_Compatibility_API() {
         "GMLIB_API",
         "setEntityScore",
         [](std::string const& uniqueId, std::string const& obj, int value) -> bool {
-            return gmlib::world::Scoreboard::getInstance()->setScore(obj, parseScriptUniqueID(uniqueId), value).has_value();
+            return GMLIB_Scoreboard::getInstance()->setScore(obj, parseScriptUniqueID(uniqueId), value).has_value();
         }
     );
     RemoteCall::exportAs(
         "GMLIB_API",
         "resetEntityScore",
         [](std::string const& uniqueId, std::string const& obj) -> bool {
-            return gmlib::world::Scoreboard::getInstance()->resetScore(obj, parseScriptUniqueID(uniqueId));
+            return GMLIB_Scoreboard::getInstance()->resetScore(obj, parseScriptUniqueID(uniqueId));
         }
     );
     RemoteCall::exportAs("GMLIB_API", "resetEntityScores", [](std::string const& uniqueId) -> bool {
-        return gmlib::world::Scoreboard::getInstance()->resetScore(parseScriptUniqueID(uniqueId));
+        return GMLIB_Scoreboard::getInstance()->resetScore(parseScriptUniqueID(uniqueId));
     });
     RemoteCall::exportAs(
         "GMLIB_API",
         "fakePlayerHasScore",
         [](std::string const& name, std::string const& obj) -> bool {
-            return gmlib::world::Scoreboard::getInstance()->getScore(obj, name).has_value();
+            return GMLIB_Scoreboard::getInstance()->getScore(obj, name).has_value();
         }
     );
     RemoteCall::exportAs("GMLIB_API", "getFakePlayerScore", [](std::string const& name, std::string const& obj) -> int {
-        return gmlib::world::Scoreboard::getInstance()->getScore(obj, name).value_or(0);
+        return GMLIB_Scoreboard::getInstance()->getScore(obj, name).value_or(0);
     });
     RemoteCall::exportAs(
         "GMLIB_API",
         "addFakePlayerScore",
         [](std::string const& name, std::string const& obj, int value) -> bool {
-            return gmlib::world::Scoreboard::getInstance()->setScore(obj, name, value, PlayerScoreSetFunction::Add).has_value();
+            return GMLIB_Scoreboard::getInstance()->setScore(obj, name, value, PlayerScoreSetFunction::Add).has_value();
         }
     );
     RemoteCall::exportAs(
         "GMLIB_API",
         "reduceFakePlayerScore",
         [](std::string const& name, std::string const& obj, int value) -> bool {
-            return gmlib::world::Scoreboard::getInstance()
+            return GMLIB_Scoreboard::getInstance()
                 ->setScore(obj, name, value, PlayerScoreSetFunction::Subtract)
                 .has_value();
         }
@@ -334,77 +325,77 @@ void Export_Compatibility_API() {
         "GMLIB_API",
         "setFakePlayerScore",
         [](std::string const& name, std::string const& obj, int value) -> bool {
-            return gmlib::world::Scoreboard::getInstance()->setScore(obj, name, value).has_value();
+            return GMLIB_Scoreboard::getInstance()->setScore(obj, name, value).has_value();
         }
     );
     RemoteCall::exportAs(
         "GMLIB_API",
         "resetFakePlayerScore",
         [](std::string const& name, std::string const& obj) -> bool {
-            return gmlib::world::Scoreboard::getInstance()->resetScore(obj, name);
+            return GMLIB_Scoreboard::getInstance()->resetScore(obj, name);
         }
     );
     RemoteCall::exportAs("GMLIB_API", "resetFakePlayerScores", [](std::string const& name) -> bool {
-        return gmlib::world::Scoreboard::getInstance()->resetScore(name);
+        return GMLIB_Scoreboard::getInstance()->resetScore(name);
     });
     RemoteCall::exportAs("GMLIB_API", "addObjective", [](std::string const& obj) -> bool {
-        return gmlib::world::Scoreboard::getInstance()->addObjective(obj).has_value();
+        return GMLIB_Scoreboard::getInstance()->addObjective(obj).has_value();
     });
     RemoteCall::exportAs(
         "GMLIB_API",
         "addObjectiveWithDisplayName",
         [](std::string const& obj, std::string const& displayName) -> bool {
-            return gmlib::world::Scoreboard::getInstance()->addObjective(obj, displayName).has_value();
+            return GMLIB_Scoreboard::getInstance()->addObjective(obj, displayName).has_value();
         }
     );
     RemoteCall::exportAs("GMLIB_API", "getDisplayName", [](std::string const& obj) -> std::string {
-        return gmlib::world::Scoreboard::getInstance()->getObjectiveDisplayName(obj).value_or("");
+        return GMLIB_Scoreboard::getInstance()->getObjectiveDisplayName(obj).value_or("");
     });
     RemoteCall::exportAs(
         "GMLIB_API",
         "setDisplayName",
         [](std::string const& obj, std::string const& displayName) -> bool {
-            return gmlib::world::Scoreboard::getInstance()->setObjectiveDisplayName(obj, displayName);
+            return GMLIB_Scoreboard::getInstance()->setObjectiveDisplayName(obj, displayName);
         }
     );
     RemoteCall::exportAs("GMLIB_API", "removeObjective", [](std::string const& obj) -> bool {
-        return gmlib::world::Scoreboard::getInstance()->removeObjective(obj);
+        return GMLIB_Scoreboard::getInstance()->removeObjective(obj);
     });
     RemoteCall::exportAs(
         "GMLIB_API",
         "setDisplayObjective",
         [](std::string const& obj, std::string const& slot, int order) -> void {
-            return gmlib::world::Scoreboard::getInstance()->setObjectiveDisplay(obj, slot, (ObjectiveSortOrder)order);
+            return GMLIB_Scoreboard::getInstance()->setObjectiveDisplay(obj, slot, (ObjectiveSortOrder)order);
         }
     );
     RemoteCall::exportAs("GMLIB_API", "clearDisplayObjective", [](std::string const& slot) -> void {
-        return gmlib::world::Scoreboard::getInstance()->clearObjectiveDisplay(slot);
+        return GMLIB_Scoreboard::getInstance()->clearObjectiveDisplay(slot);
     });
     RemoteCall::exportAs("GMLIB_API", "getAllObjectives", []() -> std::vector<std::string> {
         std::vector<std::string> result;
-        for (auto& obj : gmlib::world::Scoreboard::getInstance()->getObjectives()) {
+        for (auto& obj : GMLIB_Scoreboard::getInstance()->getObjectives()) {
             result.push_back(obj->getName());
         }
         return result;
     });
     RemoteCall::exportAs("GMLIB_API", "getAllScoreboardPlayers", []() -> std::vector<std::string> {
         std::vector<std::string> result;
-        for (auto& uuid : gmlib::world::Scoreboard::getInstance()->getAllPlayerUuids()) {
+        for (auto& uuid : GMLIB_Scoreboard::getInstance()->getAllPlayerUuids()) {
             result.push_back(uuid.asString());
         }
         return result;
     });
     RemoteCall::exportAs("GMLIB_API", "getAllScoreboardFakePlayers", []() -> std::vector<std::string> {
         std::vector<std::string> result;
-        for (auto& name : gmlib::world::Scoreboard::getInstance()->getAllFakePlayers()) {
+        for (auto& name : GMLIB_Scoreboard::getInstance()->getAllFakePlayers()) {
             result.push_back(name);
         }
         return result;
     });
     RemoteCall::exportAs("GMLIB_API", "getAllScoreboardEntities", []() -> std::vector<std::string> {
         std::vector<std::string> result;
-        for (auto& uniqueId : gmlib::world::Scoreboard::getInstance()->getAllEntities()) {
+        for (auto& uniqueId : GMLIB_Scoreboard::getInstance()->getAllEntities()) {
-            result.push_back(std::to_string(uniqueId.id));
+            result.push_back(std::to_string(uniqueId.rawID));
         }
         return result;
     });
@@ -413,22 +404,22 @@ void Export_Compatibility_API() {
         "getAllTrackedTargets",
         []() -> std::vector<std::unordered_map<std::string, std::string>> {
             std::vector<std::unordered_map<std::string, std::string>> result;
-            for (auto& uuid : gmlib::world::Scoreboard::getInstance()->getAllPlayerUuids()) {
+            for (auto& uuid : GMLIB_Scoreboard::getInstance()->getAllPlayerUuids()) {
                 result.push_back({
                     {"Type", "Player"       },
                     {"Uuid", uuid.asString()}
                 });
             }
-            for (auto& name : gmlib::world::Scoreboard::getInstance()->getAllFakePlayers()) {
+            for (auto& name : GMLIB_Scoreboard::getInstance()->getAllFakePlayers()) {
                 result.push_back({
                     {"Type", "FakePlayer"},
                     {"Name", name        }
                 });
             }
-            for (auto& uniqueId : gmlib::world::Scoreboard::getInstance()->getAllEntities()) {
+            for (auto& uniqueId : GMLIB_Scoreboard::getInstance()->getAllEntities()) {
                 result.push_back({
                     {"Type",     "Entity"                   },
-                    {"UniqueId", std::to_string(uniqueId.id)}
+                    {"UniqueId", std::to_string(uniqueId.rawID)}
                 });
             }
             return result;
@@ -441,25 +432,25 @@ void Export_Compatibility_API() {
         return ll::service::getLevel()->getPlayer(parseScriptUniqueID(uniqueId));
     });
     RemoteCall::exportAs("GMLIB_API", "getEntityFromUniqueId", [](std::string const& uniqueId) -> Actor* {
-        return ll::service::getLevel()->fetchEntity(parseScriptUniqueID(uniqueId));
+        return ll::service::getLevel()->fetchEntity(parseScriptUniqueID(uniqueId), false);
     });
     RemoteCall::exportAs("GMLIB_API", "getWorldSpawn", []() -> std::pair<BlockPos, int> {
-        return {gmlib::world::Level::getInstance()->getWorldSpawn(), 0};
+        return {GMLIB_Level::getInstance()->getWorldSpawn(), 0};
     });
     RemoteCall::exportAs("GMLIB_API", "setWorldSpawn", [](std::pair<BlockPos, int> pos) -> bool {
         if (pos.second != 0) return false;
-        gmlib::world::Level::getInstance()->setWorldSpawn(pos.first);
+        GMLIB_Level::getInstance()->setWorldSpawn(pos.first);
         return true;
     });
     RemoteCall::exportAs("GMLIB_API", "getPlayerSpawnPoint", [](Player* pl) -> std::pair<BlockPos, int> {
-        auto res = ((gmlib::world::Player*)pl)->getSpawnPoint();
+        auto res = ((GMLIB_Player*)pl)->getSpawnPoint();
         return {res.first, res.second};
     });
     RemoteCall::exportAs("GMLIB_API", "setPlayerSpawnPoint", [](Player* pl, std::pair<BlockPos, int> pos) -> void {
-        ((gmlib::world::Player*)pl)->setSpawnPoint(pos.first, pos.second);
+        ((GMLIB_Player*)pl)->setSpawnPoint(pos.first, pos.second);
     });
     RemoteCall::exportAs("GMLIB_API", "clearPlayerSpawnPoint", [](Player* pl) -> void {
-        ((gmlib::world::Player*)pl)->clearSpawnPoint();
+        ((GMLIB_Player*)pl)->clearSpawnPoint();
     });
     RemoteCall::exportAs(
         "GMLIB_API",
@@ -472,24 +463,24 @@ void Export_Compatibility_API() {
         }
     );
     RemoteCall::exportAs("GMLIB_API", "getXuidByUuid", [](std::string const& uuid) -> std::string {
-        return gmlib::tools::UserCache::getXuidByUuid(mce::UUID::fromString(uuid)).value_or("");
+        return GMLIB::UserCache::getXuidByUuid(mce::UUID::fromString(uuid)).value_or("");
     });
     RemoteCall::exportAs("GMLIB_API", "getXuidByName", [](std::string const& name) -> std::string {
-        return gmlib::tools::UserCache::getXuidByName(name).value_or("");
+        return GMLIB::UserCache::getXuidByName(name).value_or("");
     });
     RemoteCall::exportAs("GMLIB_API", "getNameByUuid", [](std::string const& uuid) -> std::string {
-        return gmlib::tools::UserCache::getNameByUuid(mce::UUID::fromString(uuid)).value_or("");
+        return GMLIB::UserCache::getNameByUuid(mce::UUID::fromString(uuid)).value_or("");
     });
     RemoteCall::exportAs("GMLIB_API", "getNameByXuid", [](std::string const& xuid) -> std::string {
-        return gmlib::tools::UserCache::getNameByXuid(xuid).value_or("");
+        return GMLIB::UserCache::getNameByXuid(xuid).value_or("");
     });
     RemoteCall::exportAs("GMLIB_API", "getUuidByXuid", [](std::string const& xuid) -> std::string {
-        return gmlib::tools::UserCache::getUuidByXuid(xuid)
+        return GMLIB::UserCache::getUuidByXuid(xuid)
             .transform([](mce::UUID&& uuid) -> std::string { return uuid.asString(); })
             .value_or("");
     });
     RemoteCall::exportAs("GMLIB_API", "getUuidByName", [](std::string const& name) -> std::string {
-        return gmlib::tools::UserCache::getUuidByName(name)
+        return GMLIB::UserCache::getUuidByName(name)
             .transform([](mce::UUID&& uuid) -> std::string { return uuid.asString(); })
             .value_or("");
     });
@@ -498,7 +489,7 @@ void Export_Compatibility_API() {
         "getAllPlayerInfo",
         []() -> std::vector<std::unordered_map<std::string, std::string>> {
             std::vector<std::unordered_map<std::string, std::string>> result;
-            gmlib::tools::UserCache::forEach([&result](const gmlib::tools::UserCache::UserCacheEntry& entry) -> void {
+            GMLIB::UserCache::forEach([&result](const GMLIB::UserCache::UserCacheEntry& entry) -> void {
                 result.push_back({
                     {"Name", entry.mName           },
                     {"Xuid", entry.mXuid           },
@@ -526,7 +517,7 @@ void Export_Compatibility_API() {
         "GMLIB_API",
         "readNbtFromFile",
         [](std::string const& path, bool isBinary) -> std::unique_ptr<CompoundTag> {
-            if (auto nbt = gmlib::world::CompoundTag::readFromFile(path, isBinary)) {
+            if (auto nbt = GMLIB_CompoundTag::readFromFile(path, isBinary)) {
                 return std::make_unique<CompoundTag>(nbt.value());
             }
             return nullptr;
@@ -536,7 +527,7 @@ void Export_Compatibility_API() {
         "GMLIB_API",
         "saveNbtToFile",
         [](std::string const& path, CompoundTag* nbt, bool isBinary) -> bool {
-            return gmlib::world::CompoundTag::saveToFile(path, *nbt, isBinary);
+            return GMLIB_CompoundTag::saveToFile(path, *nbt, isBinary);
         }
     );
     RemoteCall::exportAs("GMLIB_API", "getBlockDestroySpeed", [](Block const* block) -> float {
@@ -565,10 +556,7 @@ void Export_Compatibility_API() {
         return item->canDestroySpecial(*block);
     });
     RemoteCall::exportAs("GMLIB_API", "blockCanDropWithAnyTool", [](Block const* block) -> bool {
-        return block->canDropWithAnyTool();
+        return !block->requiresCorrectToolForDrops();
-    });
-    RemoteCall::exportAs("GMLIB_API", "blockIsAlwaysDestroyable", [](Block const* block) -> bool {
-        return block->getMaterial().isAlwaysDestroyable();
     });
     RemoteCall::exportAs(
         "GMLIB_API",
@@ -593,7 +581,7 @@ void Export_Compatibility_API() {
         "getBlockLightEmission",
         [](std::string const& blockName, short legacyData) -> char {
             return Block::tryGetFromRegistry(blockName)
-                .transform([](const Block& block) -> char { return (char)block.getLightEmission().value; })
+                .transform([](const Block& block) -> char { return (char)block.getLightEmission().mValue; })
                 .value_or(-1);
         }
     );
@@ -632,13 +620,6 @@ void Export_Compatibility_API() {
             return result;
         }
     );
-    RemoteCall::exportAs("GMLIB_API", "getLegalEnchants", [](ItemStack const* item) -> std::vector<std::string> {
-        std::vector<std::string> result;
-        for (auto& enchant : EnchantUtils::getLegalEnchants(item->getItem())) {
-            result.push_back(Enchant::getEnchant((Enchant::Type)enchant)->getStringId());
-        }
-        return result;
-    });
     RemoteCall::exportAs("GMLIB_API", "getEnchantTypeNameFromId", [](int id) -> std::string {
         if (auto enchant = Enchant::getEnchant((Enchant::Type)id)) {
             return std::string(enchant->getStringId());
@@ -679,31 +660,31 @@ void Export_Compatibility_API() {
         [](Player* player, ItemStack const* item, bool randomly) -> bool { return player->drop(*item, randomly); }
     );
     RemoteCall::exportAs("GMLIB_API", "getPlayerRuntimeId", [](Player* player) -> uint64 {
-        return player->getRuntimeID().id;
+        return player->getRuntimeID().rawID;
     });
     RemoteCall::exportAs("GMLIB_API", "getEntityRuntimeId", [](Actor* entity) -> uint64 {
-        return entity->getRuntimeID().id;
+        return entity->getRuntimeID().rawID;
     });
     RemoteCall::exportAs("GMLIB_API", "getEntityNameTag", [](Actor* entity) -> std::string {
         return entity->getNameTag();
     });
     RemoteCall::exportAs("GMLIB_API", "ItemisUnbreakable", [](ItemStack const* item) -> bool {
-        return ((gmlib::world::ItemStack*)item)->isUnbreakable();
+        return ((GMLIB_ItemStack*)item)->isUnbreakable();
     });
     RemoteCall::exportAs("GMLIB_API", "setItemUnbreakable", [](ItemStack const* item, bool value) -> void {
-        ((gmlib::world::ItemStack*)item)->setUnbreakable(value);
+        ((GMLIB_ItemStack*)item)->setUnbreakable(value);
     });
     RemoteCall::exportAs("GMLIB_API", "getItemShouldKeepOnDeath", [](ItemStack const* item) -> bool {
-        return ((gmlib::world::ItemStack*)item)->getShouldKeepOnDeath();
+        return ((GMLIB_ItemStack*)item)->getShouldKeepOnDeath();
     });
     RemoteCall::exportAs("GMLIB_API", "setItemShouldKeepOnDeath", [](ItemStack const* item, bool value) -> void {
-        ((gmlib::world::ItemStack*)item)->setShouldKeepOnDeath(value);
+        ((GMLIB_ItemStack*)item)->setShouldKeepOnDeath(value);
     });
     RemoteCall::exportAs("GMLIB_API", "getItemLockMode", [](ItemStack const* item) -> int {
-        return (int)((gmlib::world::ItemStack*)item)->getItemLockMode();
+        return (int)((GMLIB_ItemStack*)item)->getItemLockMode();
     });
     RemoteCall::exportAs("GMLIB_API", "setItemLockMode", [](ItemStack const* item, int value) -> void {
-        ((gmlib::world::ItemStack*)item)->setItemLockMode((ItemLockMode)value);
+        ((GMLIB_ItemStack*)item)->setItemLockMode((ItemLockMode)value);
     });
     RemoteCall::exportAs("GMLIB_API", "getItemRepairCost", [](ItemStack const* item) -> int {
         return item->getBaseRepairCost();
@@ -713,7 +694,7 @@ void Export_Compatibility_API() {
     });
     RemoteCall::exportAs("GMLIB_API", "getItemCanDestroy", [](ItemStack const* item) -> std::vector<std::string> {
         std::vector<std::string> result = {};
-        for (auto& block : ((gmlib::world::ItemStack*)item)->getCanDestroy()) {
+        for (auto& block : ((GMLIB_ItemStack*)item)->getCanDestroy()) {
             result.push_back(block->getTypeName());
         }
         return result;
@@ -722,12 +703,12 @@ void Export_Compatibility_API() {
         "GMLIB_API",
         "setItemCanDestroy",
         [](ItemStack const* item, std::vector<std::string> blocks) -> void {
-            ((gmlib::world::ItemStack*)item)->setCanDestroy(blocks);
+            ((GMLIB_ItemStack*)item)->setCanDestroy(blocks);
         }
     );
     RemoteCall::exportAs("GMLIB_API", "getItemCanPlaceOn", [](ItemStack const* item) -> std::vector<std::string> {
         std::vector<std::string> result = {};
-        for (auto& block : ((gmlib::world::ItemStack*)item)->getCanPlaceOn()) {
+        for (auto& block : ((GMLIB_ItemStack*)item)->getCanPlaceOn()) {
             result.push_back(block->getTypeName());
         }
         return result;
@@ -736,11 +717,11 @@ void Export_Compatibility_API() {
         "GMLIB_API",
         "setItemCanPlaceOn",
         [](ItemStack const* item, std::vector<std::string> blocks) -> void {
-            ((gmlib::world::ItemStack*)item)->setCanPlaceOn(blocks);
+            ((GMLIB_ItemStack*)item)->setCanPlaceOn(blocks);
         }
     );
     RemoteCall::exportAs("GMLIB_API", "getPlayerHungry", [](Player* player) -> float {
-        return player->getMutableAttribute(Player::HUNGER)->getCurrentValue();
+        return player->getMutableAttribute(Player::HUNGER())->getCurrentValue();
     });
     RemoteCall::exportAs("GMLIB_API", "getPlayerArmorCoverPercentage", [](Player* player) -> float {
         return player->getArmorCoverPercentage();
@@ -749,7 +730,7 @@ void Export_Compatibility_API() {
         return player->getArmorValue();
     });
     RemoteCall::exportAs("GMLIB_API", "getEntityOwnerUniqueId", [](Actor* entity) -> int64 {
-        return entity->getOwnerId().id;
+        return entity->getOwnerId().rawID;
     });
     RemoteCall::exportAs("GMLIB_API", "getItemCategoryName", [](ItemStack const* item) -> std::string {
         return item->getCategoryName();
@@ -767,7 +748,7 @@ void Export_Compatibility_API() {
         return false;
     });
     RemoteCall::exportAs("GMLIB_API", "setPlayerUIItem", [](Player* player, int slot, ItemStack const* item) -> void {
-        player->setPlayerUIItem((PlayerUISlot)slot, *item);
+        player->setPlayerUIItem((PlayerUISlot)slot, *item, false);
     });
     RemoteCall::exportAs("GMLIB_API", "getPlayerUIItem", [](Player* player, int slot) -> ItemStack* {
         return const_cast<ItemStack*>(&player->getPlayerUIItem((PlayerUISlot)slot));
@@ -783,7 +764,7 @@ void Export_Compatibility_API() {
         return magic_enum::enum_name(container->getContainerType()).data();
     });
     RemoteCall::exportAs("GMLIB_API", "hasPlayerNbt", [](std::string const& uuid) -> bool {
-        return gmlib::world::Player::getPlayerNbt(mce::UUID::fromString(uuid)) != nullptr;
+        return GMLIB_Player::getPlayerNbt(mce::UUID::fromString(uuid)) != nullptr;
     });
     RemoteCall::exportAs("GMLIB_API", "getItemMaxCount", [](ItemStack const* item) -> int {
         return item->getMaxStackSize();
@@ -802,25 +783,25 @@ void Export_Compatibility_API() {
     });
     RemoteCall::exportAs("GMLIB_API", "getEntityEffectDuration", [](Actor* entity, int effectId) -> int {
         if (auto effect = entity->getEffect(effectId)) {
-            return effect->mDuration;
+            return effect->mDuration->mValue;
         }
         return 0;
     });
     RemoteCall::exportAs("GMLIB_API", "getEntityEffectDurationEasy", [](Actor* entity, int effectId) -> int {
         if (auto effect = entity->getEffect(effectId)) {
-            return effect->mDurationEasy;
+            return effect->mDurationEasy->transform([](auto&& duration) -> int { return duration.mValue; }).value_or(0);
         }
         return 0;
     });
     RemoteCall::exportAs("GMLIB_API", "getEntityEffectDurationHard", [](Actor* entity, int effectId) -> int {
         if (auto effect = entity->getEffect(effectId)) {
-            return effect->mDurationHard;
+            return effect->mDurationHard->transform([](auto&& duration) -> int { return duration.mValue; }).value_or(0);
         }
         return 0;
     });
     RemoteCall::exportAs("GMLIB_API", "getEntityEffectDurationNormal", [](Actor* entity, int effectId) -> int {
         if (auto effect = entity->getEffect(effectId)) {
-            return effect->mDurationNormal;
+            return effect->mDurationNormal->transform([](auto&& duration) -> int { return duration.mValue; }).value_or(0);
         }
         return 0;
     });
@@ -850,7 +831,9 @@ void Export_Compatibility_API() {
         }
     });
     RemoteCall::exportAs("GMLIB_API", "getDefaultGameMode", []() -> int {
-        return ll::service::getLevel().transform([](Level& level) -> int { return (int)level.getDefaultGameType(); }).value_or(-1);
+        return ll::service::getLevel().transform(
+                                          [](Level& level) -> int { return (int)level.getDefaultGameType(); }
+        ).value_or(-1);
     });
     RemoteCall::exportAs("GMLIB_API", "setDefaultGameMode", [](int gameMode) -> void {
         if (auto level = ll::service::getLevel()) {
@@ -861,13 +844,19 @@ void Export_Compatibility_API() {
         "GMLIB_API",
         "registerCustomShapelessRecipe",
         [](std::string const& recipe_id, std::vector<std::string> ingredients, ItemStack* result) -> void {
-            if (!gmlib::world::Level::getInstance().has_value()) return;
+            if (!GMLIB_Level::getInstance().has_value()) return;
             std::vector<Recipes::Type> types;
             char                       rt = 'A';
             for (auto& ing : ingredients) {
-                types.emplace_back(ing, rt++, 1, 0);
+                auto ingredient = RecipeIngredient{ing, 0,1};
+                types.push_back(Recipes::Type{
+                    (Item*)ingredient.getItem(),
+                    ingredient.getBlock(),
+                    ingredient,
+                    rt++
+                });
             }
-            gmlib::mod::recipe::RecipeRegistry::registerShapelessCraftingTableRecipe(recipe_id, types, *result);
+            GMLIB::Mod::CustomRecipe::registerShapelessCraftingTableRecipe(recipe_id, types, *result);
         }
     );
     RemoteCall::exportAs(
@@ -877,13 +866,36 @@ void Export_Compatibility_API() {
            std::vector<std::string> shape,
            std::vector<std::string> ingredients,
            ItemStack*               result) -> void {
-            if (!gmlib::world::Level::getInstance().has_value()) return;
+            if (!GMLIB_Level::getInstance().has_value()) return;
             std::vector<Recipes::Type> types;
             char                       rt = 'A';
             for (auto& ing : ingredients) {
-                types.emplace_back(ing, rt++, 1, 0);
+                auto ingredient = RecipeIngredient{ing, 0, 1};
+                types.push_back(Recipes::Type{(Item*)ingredient.getItem(), ingredient.getBlock(), ingredient, rt++});
             }
-            gmlib::mod::recipe::RecipeRegistry::registerShapedCraftingTableRecipe(recipe_id, shape, types, *result);
+            auto tmp     = RecipeUnlockingRequirement();
+            tmp.mContext = RecipeUnlockingRequirement::UnlockingContext::AlwaysUnlocked;
+            ll::service::bedrock::getLevel()->getRecipes().addShapedRecipe(
+                recipe_id,
+                ItemInstance(*result),
+                shape,
+                types,
+                {"crafting_table"},
+                50,
+                nullptr,
+                tmp,
+                SemVersion(1, 20, 80, "", ""),
+                true
+            );
         }
     );
+    RemoteCall::exportAs("GMLIB_API", "entityIsType", [](Actor* entity, int type) -> bool {
+        return entity->isType((ActorType)type);
+    });
+    RemoteCall::exportAs("GMLIB_API", "entityHasType", [](Actor* entity, int type) -> bool {
+        return entity->hasType((ActorType)type);
+    });
+    RemoteCall::exportAs("GMLIB_API", "getEntityTypeId", [](Actor* entity) -> int {
+        return (int)entity->getEntityTypeId();
+    });
 }

src/Entry.cpp

@@ -1,12 +1,10 @@
 #include "Entry.h"
 #include "Global.h"
 
-ll::Logger logger(PLUGIN_NAME);
-
 namespace gmlib {
 
-std::unique_ptr<LegacyRemoteCallApi>& LegacyRemoteCallApi::getInstance() {
+LegacyRemoteCallApi& LegacyRemoteCallApi::getInstance() {
-    static std::unique_ptr<LegacyRemoteCallApi> instance;
+    static LegacyRemoteCallApi instance;
     return instance;
 }
 
@@ -17,15 +15,16 @@ bool LegacyRemoteCallApi::load() {
     ExportPAPI();
     Export_Event_API();
     Export_BinaryStream_API();
-    Export_Form_API();
+    // Export_Form_API();
-    logger.info("GMLIB-LegacyRemoteCallApi Loaded!");
+    auto logger = ll::io::LoggerRegistry::getInstance().getOrCreate(PLUGIN_NAME);
-    logger.info(
+    logger->info("GMLIB-LegacyRemoteCallApi Loaded!");
+    logger->info(
         "Loaded Version: {} with {}",
-        fmt::format(fg(fmt::color::pink), "GMLIB-" + gmlib::Version::getLibVersionString()),
+        fmt::format(fg(fmt::color::pink), "GMLIB-" + GMLIB::Version::getLibVersionString()),
         fmt::format(fg(fmt::color::light_green), "GMLIB-LegacyRemoteCallApi-" + LIB_VERSION.asString())
     );
-    logger.info("Author: GroupMountain");
+    logger->info("Author: GroupMountain");
-    logger.info("Repository: https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi");
+    logger->info("Repository: https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi");
     return true;
 }
 

src/Entry.h

@@ -7,9 +7,9 @@ namespace gmlib {
 class LegacyRemoteCallApi {
 
 public:
-    static std::unique_ptr<LegacyRemoteCallApi>& getInstance();
+    static LegacyRemoteCallApi& getInstance();
 
-    LegacyRemoteCallApi(ll::mod::NativeMod& self) : mSelf(self) {}
+    LegacyRemoteCallApi() : mSelf(*ll::mod::NativeMod::current()) {}
 
     [[nodiscard]] ll::mod::NativeMod& getSelf() const { return mSelf; }
 

src/EventAPI.cpp

@@ -1,249 +1,359 @@
 #include "Global.h"
+#include "ll/api/service/Bedrock.h"
+#include "ll/api/utils/ErrorUtils.h"
 using namespace ll::hash_utils;
 
-class LegacyScriptEventManager {
+class EventManager {
 private:
-    int64                                              mNextEventId = 0;
+    std::unordered_map<ullong, ll::event::ListenerPtr> mEventIds;
-    std::unordered_map<uint64, ll::event::ListenerPtr> mEventListeners;
 
 public:
-    std::string getNextEventId() {
+    static EventManager& getInstance() {
-        mNextEventId++;
+        static std::unique_ptr<EventManager> instance;
-        return "GMLIB_EVENT_" + std::to_string(mNextEventId);
+        if (!instance) instance = std::make_unique<EventManager>();
-    }
-
-    void emplaceListener(std::string const& scriptEventId, ll::event::ListenerPtr listenerPtr) {
-        mEventListeners[doHash(scriptEventId)] = std::move(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;
     }
+
+    ullong getNextId() {
+        auto id = mEventIds.size();
+        mEventIds.emplace(id, nullptr);
+        return id;
+    }
+
+    bool addListener(ullong id, ll::event::ListenerPtr const& listener) {
+        if (mEventIds.contains(id) && mEventIds[id]) return false;
+        mEventIds[id] = listener;
+        return true;
+    }
+
+    bool removeListener(ullong id) {
+        if (ll::event::EventBus::getInstance().removeListener(mEventIds[id])) {
+            ll::mod::NativeMod::current()->getLogger().warn("Removed listener with id {}", id);
+            mEventIds[id] = nullptr;
+            return true;
+        }
+        return false;
+    }
+
+    bool hasListener(ullong id) { return mEventIds.contains(id) && mEventIds[id]; }
+
+    ll::event::ListenerPtr getListener(ullong id) { return mEventIds.contains(id) ? mEventIds[id] : nullptr; }
 };
 
-#define REGISTER_EVENT_LISTEN(eventType, callFunction, eventParams, cancelFunction, otherFunction)                     \
+#define REGISTER_EVENT_LISTEN(eventType, paramType, params, cancelFun, ...)                                            \
-    eventManager.emplaceListener(                                                                                      \
+    auto eventPtr = ll::event::EventBus::getInstance().emplaceListener<eventType>(                                     \
-        eventId,                                                                                                       \
+        [pluginName, eventName, eventId](eventType& event) -> void {                                                   \
-        eventBus.emplaceListener<eventType>([eventName, eventId, &eventBus, &eventManager](eventType& ev) -> void {    \
+            if (!RemoteCall::hasFunc(pluginName, eventName + "_" + std::to_string(eventId))) {                         \
-            if (!RemoteCall::hasFunc(eventName, eventId)) {                                                            \
+                EventManager::getInstance().removeListener(eventId);                                                   \
-                eventManager.removeListener(eventId);                                                                  \
                 return;                                                                                                \
             }                                                                                                          \
-            bool result = true;                                                                                        \
             try {                                                                                                      \
-                otherFunction;                                                                                         \
+                __VA_ARGS__                                                                                            \
-                result = RemoteCall::importAs<bool callFunction>(eventName, eventId) eventParams;                      \
+                auto result =                                                                                          \
+                    RemoteCall::importAs<bool paramType>(pluginName, eventName + "_" + std::to_string(eventId))        \
+                        params;                                                                                        \
+                cancelFun                                                                                              \
             } catch (...) {}                                                                                           \
-            if (!result) cancelFunction;                                                                               \
+        },                                                                                                             \
-        })                                                                                                             \
+        ll::event::EventPriority(priority)                                                                             \
     );                                                                                                                 \
-    return true;
+    return eventId
 
 void Export_Event_API() {
-    RemoteCall::exportAs("GMLIB_Event_API", "getNextScriptEventId", []() -> std::string {
+    RemoteCall::exportAs("GMLIB_Event_API", "removeListener", [](ll::event::ListenerId eventId) -> bool {
-        return LegacyScriptEventManager::getInstance().getNextEventId();
+        return EventManager::getInstance().removeListener(eventId);
     });
-    auto& eventBus     = ll::event::EventBus::getInstance();
+
-    auto& eventManager = LegacyScriptEventManager::getInstance();
+    RemoteCall::exportAs("GMLIB_Event_API", "hasListener", [](ll::event::ListenerId eventId) -> bool {
+        return EventManager::getInstance().hasListener(eventId);
+    });
+
+    RemoteCall::exportAs("GMLIB_Event_API", "getListenerPriority", [](ll::event::ListenerId eventId) -> int {
+        if (auto event = EventManager::getInstance().getListener(eventId); event != nullptr) {
+            return (int)event->getPriority();
+        }
+        return -1;
+    });
+
     RemoteCall::exportAs(
         "GMLIB_Event_API",
-        "callCustomEvent",
+        "emplaceListener",
-        [&eventBus, &eventManager](std::string const& eventName, std::string const& eventId) -> bool {
+        [](std::string const& pluginName, std::string const& eventName, int priority) -> llong {
-            if (!RemoteCall::hasFunc(eventName, eventId)) return false;
+            auto eventId = EventManager::getInstance().getNextId();
             switch (doHash(eventName)) {
-            case doHash("onClientLogin"): {
+            case doHash("ll::ServerStoppingEvent"): {
+                REGISTER_EVENT_LISTEN(ll::event::ServerStoppingEvent, (), (), , );
+            }
+            case doHash("gmlib::ClientLoginAfterEvent"): {
                 REGISTER_EVENT_LISTEN(
-                    gmlib::event::packet::ClientLoginAfterEvent,
+                    GMLIB::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()),
+                    (event.getRealName(),
-                    logger.error("Event \"onClientLogin\" cannot be intercepted"),
+                     event.getUuid().asString(),
-                )
+                     event.getServerAuthXuid(),
+                     event.getClientAuthXuid()),
+                    if (result) event.disConnectClient();
+                );
             }
-            case doHash("onWeatherChange"): {
+            case doHash("gmlib::WeatherUpdateBeforeEvent"): {
                 REGISTER_EVENT_LISTEN(
-                    gmlib::event::level::WeatherUpdateBeforeEvent,
+                    GMLIB::Event::LevelEvent::WeatherUpdateBeforeEvent,
-                    (int lightningLevel, int rainLevel, int lightningLast, int rainLast),
+                    (float rainLevel, int rainTime, float lightningLevel, int lightningTime, bool isCancelled),
-                    (ev.getLightningLevel(), ev.getRainLevel(), ev.getLightningLastTick(), ev.getRainingLastTick()),
+                    (event.getRainLevel(),
-                    ev.cancel(),
+                     event.getRainingLastTick(),
-                )
+                     event.getLightningLevel(),
+                     event.getLightningLastTick(),
+                     event.isCancelled()),
+                    event.setCancelled(result);
+                );
             }
-            case doHash("onMobPick"): {
+            case doHash("gmlib::WeatherUpdateAfterEvent"): {
                 REGISTER_EVENT_LISTEN(
-                    gmlib::event::entity::MobPickupItemBeforeEvent,
+                    GMLIB::Event::LevelEvent::WeatherUpdateAfterEvent,
+                    (float rainLevel, int rainTime, float lightningLevel, int lightningTime),
+                    (event.getRainLevel(),
+                     event.getRainingLastTick(),
+                     event.getLightningLevel(),
+                     event.getLightningLastTick()),
+                    ,
+                );
+            }
+            case doHash("gmlib::MobPickupItemBeforeEvent"): {
+                REGISTER_EVENT_LISTEN(
+                    GMLIB::Event::EntityEvent::MobPickupItemBeforeEvent,
+                    (Actor * mob, Actor * item, bool isCancelled),
+                    (&event.self(), (Actor*)&event.getItemActor(), event.isCancelled()),
+                    event.setCancelled(result);
+                );
+            }
+            case doHash("gmlib::MobPickupItemAfterEvent"): {
+                REGISTER_EVENT_LISTEN(
+                    GMLIB::Event::EntityEvent::MobPickupItemAfterEvent,
                     (Actor * mob, Actor * item),
-                    (&ev.self(), (Actor*)&ev.getItemActor()),
+                    (&event.self(), (Actor*)&event.getItemActor()),
-                    ev.cancel(),
+                    ,
-                )
+                );
             }
-            case doHash("onItemTrySpawn"): {
+            case doHash("gmlib::ItemActorSpawnBeforeEvent"): {
                 REGISTER_EVENT_LISTEN(
-                    gmlib::event::entity::ItemActorSpawnBeforeEvent,
+                    GMLIB::Event::EntityEvent::ItemActorSpawnBeforeEvent,
-                    (const ItemStack* item, std::pair<Vec3, int> position, int64 spawnerUniqueId),
+                    (ItemStack * item, std::pair<Vec3, int> position, int64 spawnerUniqueId, bool isCancelled),
-                    (&ev.getItem(),
+                    (&event.getItem(),
-                     {ev.getPosition(), ev.getBlockSource().getDimensionId().id},
+                     {event.getPosition(), event.getBlockSource().getDimensionId().id},
-                     ev.getSpawner().has_value() ? ev.getSpawner()->getOrCreateUniqueID().id : -1),
+                     event.getSpawner().has_value() ? event.getSpawner()->getOrCreateUniqueID().rawID : -1,
-                    ev.cancel(),
+                     event.isCancelled()),
-                )
+                    event.setCancelled(result);
+                );
             }
-            case doHash("onItemSpawned"): {
+            case doHash("gmlib::ItemActorSpawnAfterEvent"): {
                 REGISTER_EVENT_LISTEN(
-                    gmlib::event::entity::ItemActorSpawnAfterEvent,
+                    GMLIB::Event::EntityEvent::ItemActorSpawnAfterEvent,
-                    (const ItemStack* item, Actor* itemActor, std::pair<Vec3, int> position, int64 spawnerUniqueId),
+                    (Actor * item, std::pair<Vec3, int> position, int64 spawnerUniqueId),
-                    (&ev.getItem(),
+                    (&event.self(),
-                     (Actor*)&ev.getItemActor(),
+                     {event.getPosition(), event.getBlockSource().getDimensionId().id},
-                     {ev.getPosition(), ev.getBlockSource().getDimensionId().id},
+                     event.getSpawner().has_value() ? event.getSpawner()->getOrCreateUniqueID().rawID : -1),
-                     ev.getSpawner().has_value() ? ev.getSpawner()->getOrCreateUniqueID().id : -1),
+                    ,
-                    logger.error("Event \"onItemSpawned\" cannot be intercepted"),
+                );
-                )
             }
-            case doHash("onEntityTryChangeDim"): {
+            case doHash("gmlib::ActorChangeDimensionBeforeEvent"): {
                 REGISTER_EVENT_LISTEN(
-                    gmlib::event::entity::ActorChangeDimensionBeforeEvent,
+                    GMLIB::Event::EntityEvent::ActorChangeDimensionBeforeEvent,
-                    (Actor * entity, int toDimId),
+                    (Actor * entity, int toDimId, bool isCancelled),
-                    (&ev.self(), ev.getToDimensionId()),
+                    (&event.self(), event.getToDimensionId(), event.isCancelled()),
-                    ev.cancel(),
+                    event.setCancelled(result);
-                )
+                );
             }
-            case doHash("onLeaveBed"): {
+            case doHash("gmlib::ActorChangeDimensionAfterEvent"): {
                 REGISTER_EVENT_LISTEN(
-                    gmlib::event::player::PlayerStopSleepBeforeEvent,
+                    GMLIB::Event::EntityEvent::ActorChangeDimensionAfterEvent,
-                    (Player * pl),
+                    (Actor * entity, int fromDimId, int toDimId),
-                    (&ev.self()),
+                    (&event.self(), event.getFromDimensionId(), event.getToDimensionId()),
-                    ev.cancel(),
+                    ,
-                )
+                );
             }
-            case doHash("onDeathMessage"): {
+            case doHash("gmlib::PlayerStartSleepBeforeEvent"): {
                 REGISTER_EVENT_LISTEN(
-                    gmlib::event::entity::DeathMessageAfterEvent,
+                    GMLIB::Event::PlayerEvent::PlayerStartSleepBeforeEvent,
+                    (Player * entity, BlockPos pos, bool isCancelled),
+                    (&event.self(), event.getPosition(), event.isCancelled()),
+                    event.setCancelled(result);
+                );
+            }
+            case doHash("gmlib::PlayerStartSleepAfterEvent"): {
+                REGISTER_EVENT_LISTEN(
+                    GMLIB::Event::PlayerEvent::PlayerStartSleepAfterEvent,
+                    (Player * entity, BlockPos pos, int result),
+                    (&event.self(), event.getPosition(), (int)event.getResult()),
+                    ,
+                );
+            }
+            case doHash("gmlib::PlayerStopSleepBeforeEvent"): {
+                REGISTER_EVENT_LISTEN(
+                    GMLIB::Event::PlayerEvent::PlayerStopSleepBeforeEvent,
+                    (Player * entity, bool forcefulWakeUp, bool updateLevelList, bool isCancelled),
+                    (&event.self(), event.isForcefulWakeUp(), event.isUpdateLevelList(), event.isCancelled()),
+                    event.setCancelled(result);
+                );
+            }
+            case doHash("gmlib::PlayerStopSleepAfterEvent"): {
+                REGISTER_EVENT_LISTEN(
+                    GMLIB::Event::PlayerEvent::PlayerStopSleepAfterEvent,
+                    (Player * entity, bool forcefulWakeUp, bool updateLevelList, bool),
+                    (&event.self(), event.isForcefulWakeUp(), event.isUpdateLevelList(), false),
+                    ,
+                );
+            }
+            case doHash("gmlib::DeathMessageAfterEvent"): {
+                REGISTER_EVENT_LISTEN(
+                    GMLIB::Event::EntityEvent::DeathMessageAfterEvent,
                     (std::string const& message, std::vector<std::string>, Actor* dead),
-                    (ev.getDeathMessage().first, ev.getDeathMessage().second, &ev.self()),
+                    (event.getDeathMessage().first, event.getDeathMessage().second, &event.self()),
-                    logger.error("Event \"onDeathMessage\" cannot be intercepted"),
+                    ,
-                )
+                );
             }
-            case doHash("onMobHurted"): {
+            case doHash("gmlib::MobHurtAfterEvent"): {
                 REGISTER_EVENT_LISTEN(
-                    gmlib::event::entity::MobHurtAfterEvent,
+                    GMLIB::Event::EntityEvent::MobHurtAfterEvent,
                     (Actor * mob, Actor * source, float damage, int cause),
-                    (&ev.self(), source, ev.getDamage(), (int)damageSource.getCause()),
+                    (&event.self(), source, -event.getDamage(), (int)damageSource.getCause()),
-                    logger.error("Event \"onMobHurted\" cannot be intercepted"),
+                    ,
-                    auto& damageSource = ev.getSource();
+                    auto& damageSource = event.getSource();
                     Actor* source      = nullptr;
                     if (damageSource.isEntitySource()) {
                         auto uniqueId = damageSource.getDamagingEntityUniqueID();
-                        source        = ll::service::getLevel()->fetchEntity(uniqueId);
+                        source        = ll::service::getLevel()->fetchEntity(uniqueId, false);
                         if (source->getOwner()) source = source->getOwner();
                     }
-                )
+                );
             }
-            case doHash("onEndermanTake"): {
+            case doHash("gmlib::EndermanTakeBlockBeforeEvent"): {
                 REGISTER_EVENT_LISTEN(
-                    gmlib::event::entity::EndermanTakeBlockBeforeEvent,
+                    GMLIB::Event::EntityEvent::EndermanTakeBlockBeforeEvent,
+                    (Actor * mob, bool isCancelled),
+                    (&event.self(), event.isCancelled()),
+                    event.setCancelled(result);
+                );
+            }
+            case doHash("gmlib::DragonRespawnBeforeEvent"): {
+                REGISTER_EVENT_LISTEN(
+                    GMLIB::Event::EntityEvent::DragonRespawnBeforeEvent,
+                    (bool isCancelled),
+                    (event.isCancelled()),
+                    event.setCancelled(result);
+                );
+            }
+            case doHash("gmlib::DragonRespawnAfterEvent"): {
+                REGISTER_EVENT_LISTEN(
+                    GMLIB::Event::EntityEvent::DragonRespawnAfterEvent,
                     (Actor * mob),
-                    (&ev.self()),
+                    (event.getEnderDragon()),
-                    ev.cancel(),
+                );
-                )
             }
-            case doHash("onEntityChangeDim"): {
+            case doHash("gmlib::ProjectileCreateBeforeEvent"): {
                 REGISTER_EVENT_LISTEN(
-                    gmlib::event::entity::ActorChangeDimensionAfterEvent,
+                    GMLIB::Event::EntityEvent::ProjectileCreateBeforeEvent,
-                    (Actor * mob, int fromDimId),
+                    (Actor * mob, int64 uniqueId, bool isCancelled),
-                    (&ev.self(), ev.getFromDimensionId()),
+                    (&event.self(),
-                    logger.error("Event \"onEntityChangeDim\" cannot be intercepted"),
+                     event.getShooter() ? event.getShooter()->getOrCreateUniqueID().rawID : -1,
-                )
+                     event.isCancelled()),
+                    event.setCancelled(result);
+                );
             }
-            case doHash("onDragonRespawn"): {
+            case doHash("gmlib::ProjectileCreateAfterEvent"): {
                 REGISTER_EVENT_LISTEN(
-                    gmlib::event::entity::DragonRespawnBeforeEvent,
+                    GMLIB::Event::EntityEvent::ProjectileCreateAfterEvent,
-                    (int64 enderDragonUniqueID),
-                    (ev.getEnderDragon().id),
-                    ev.cancel(),
-                )
-            }
-            case doHash("onProjectileTryCreate"): {
-                REGISTER_EVENT_LISTEN(
-                    gmlib::event::entity::ProjectileCreateBeforeEvent,
                     (Actor * mob, int64 uniqueId),
-                    (&ev.self(), ev.getShooter() ? ev.getShooter()->getOrCreateUniqueID().id : -1),
+                    (&event.self(), event.getShooter() ? event.getShooter()->getOrCreateUniqueID().rawID : -1),
-                    ev.cancel(),
+                );
-                )
             }
-            case doHash("onProjectileCreate"): {
+            case doHash("gmlib::SpawnWanderingTraderBeforeEvent"): {
                 REGISTER_EVENT_LISTEN(
-                    gmlib::event::entity::ProjectileCreateAfterEvent,
+                    GMLIB::Event::EntityEvent::SpawnWanderingTraderBeforeEvent,
-                    (Actor * mob, int64 uniqueId),
+                    (std::pair<BlockPos, int> pos, bool isCancelled),
-                    (&ev.self(), ev.getShooter() ? ev.getShooter()->getOrCreateUniqueID().id : -1),
+                    ({event.getPos(), event.getRegion().getDimensionId()}, event.isCancelled()),
-                    logger.error("Event \"onProjectileCreate\" cannot be intercepted"),
+                    event.setCancelled(result);
-                )
+                );
             }
-            case doHash("onSpawnWanderingTrader"): {
+            case doHash("gmlib::SpawnWanderingTraderAfterEvent"): {
                 REGISTER_EVENT_LISTEN(
-                    gmlib::event::entity::SpawnWanderingTraderBeforeEvent,
+                    GMLIB::Event::EntityEvent::SpawnWanderingTraderAfterEvent,
                     (std::pair<BlockPos, int> pos),
-                    ({ev.getPos(), ev.getRegion().getDimensionId()}),
+                    ({event.getPos(), event.getRegion().getDimensionId()}),
-                    ev.cancel(),
+                );
-                )
             }
-            case doHash("onHandleRequestAction"): {
+            case doHash("gmlib::HandleRequestActionBeforeEvent"): {
                 // clang-format off
-                REGISTER_EVENT_LISTEN(
+                    REGISTER_EVENT_LISTEN(
-                    gmlib::event::player::HandleRequestActionBeforeEvent,
+                        GMLIB::Event::PlayerEvent::HandleRequestActionBeforeEvent,
-                    (
+                        (
-                        Player * player,
+                            Player *           player,
-                        std::string const& actionType,
+                            std::string const& actionType,
-                        int                count,
+                            int                count,
-                        std::string const& sourceContainerNetId,
+                            std::string const& sourceContainerNetId,
-                        int                sourceSlot,
+                            int                sourceSlot,
-                        std::string const& destinationContainerNetId,
+                            std::string const& destinationContainerNetId,
-                        int                destinationSlot
+                            int                destinationSlot,
-                    ),
+                            bool               isCancelled
-                    (
+                        ),
-                        (Player*)&ev.self(),
+                        (
-                        magic_enum::enum_name(requestAction.mActionType).data(),
+                            &event.self(),
-                        (int)requestAction.mAmount,
+                            magic_enum::enum_name(requestAction.mActionType).data(),
-                        magic_enum::enum_name(requestAction.mSrc.mOpenContainerNetId).data(),
+                            (int)requestAction.mAmount,
-                        (int)requestAction.mSrc.mSlot,
+                            magic_enum::enum_name(requestAction.mSrc->mFullContainerName.mName).data(),
-                        magic_enum::enum_name(requestAction.mDst.mOpenContainerNetId).data(),
+                            (int)requestAction.mSrc->mSlot,
-                        (int)requestAction.mDst.mSlot
+                            magic_enum::enum_name(requestAction.mDst->mFullContainerName.mName).data(),
-                    ),
+                            (int)requestAction.mDst->mSlot,
-                    ev.cancel(),
+                            event.isCancelled()
-                    auto& requestAction = (ItemStackRequestActionTransferBase&)ev.getRequestAction();
+                        ),
-                )
+                        event.setCancelled(result);,
+                        auto& requestAction = (ItemStackRequestActionTransferBase&)event.getRequestAction();
+                    );
                 // clang-format on
             }
-            case doHash("onSendContainerClosePacket"): {
+            case doHash("gmlib::HandleRequestActionAfterEvent"): {
+                // clang-format off
+                    REGISTER_EVENT_LISTEN(
+                        GMLIB::Event::PlayerEvent::HandleRequestActionAfterEvent,
+                        (
+                            Player *           player,
+                            std::string const& actionType,
+                            int                count,
+                            std::string const& sourceContainerNetId,
+                            int                sourceSlot,
+                            std::string const& destinationContainerNetId,
+                            int                destinationSlot
+                        ),
+                        (
+                            &event.self(),
+                            magic_enum::enum_name(requestAction.mActionType).data(),
+                            (int)requestAction.mAmount,
+                            magic_enum::enum_name(requestAction.mSrc->mFullContainerName.mName).data(),
+                            (int)requestAction.mSrc->mSlot,
+                            magic_enum::enum_name(requestAction.mDst->mFullContainerName.mName).data(),
+                            (int)requestAction.mDst->mSlot
+                        ),
+                        ,
+                        auto& requestAction = (ItemStackRequestActionTransferBase&)event.getRequestAction();
+                    );
+                // clang-format on
+            }
+            case doHash("gmlib::ContainerClosePacketSendAfterEvent"): {
                 REGISTER_EVENT_LISTEN(
-                    gmlib::event::packet::ContainerClosePacketSendAfterEvent,
+                    GMLIB::Event::PacketEvent::ContainerClosePacketSendAfterEvent,
-                    (Player * player, int ContainerNetId),
+                    (Player * player, int containerId, bool serverInitiatedClose, bool),
-                    (ev.getServerNetworkHandler()
+                    (ll::service::getServerNetworkHandler()
-                         .getServerPlayer(ev.getNetworkIdentifier(), ev.getPacket().mClientSubId),
+                         ->_getServerPlayer(event.getNetworkIdentifier(), event.getPacket().mClientSubId),
-                     (int)ev.getPacket().mContainerId),
+                     (int)event.getPacket().mContainerId,
-                    logger.error("Event \"onSendContainerClosePacket\" cannot be intercepted"),
+                     event.getPacket().mServerInitiatedClose,
-                )
+                     false),
+                    ,
+                );
             }
-            case doHash("onServerStopping"): {
-                REGISTER_EVENT_LISTEN(
-                    ll::event::server::ServerStoppingEvent,
-                    (),
-                    (),
-                    logger.error("Event \"onServerStopping\" cannot be intercepted"),
-                )
-            }
-            default:
-                return false;
             }
+            return -1;
         }
     );
 }

src/FormAPI.cpp

@@ -1,288 +1,288 @@
-#include "Global.h"
+// #include "Global.h"
 
-using namespace ll::hash_utils;
+// using namespace ll::hash_utils;
 
-class LegacyScriptFormManager {
+// class LegacyScriptFormManager {
-private:
+// private:
-    int64                                                       mNextFormCallbackId = 0;
+//     int64                                                       mNextFormCallbackId = 0;
-    int64                                                       mNextFormId         = 0;
+//     int64                                                       mNextFormId         = 0;
-    std::unordered_map<int64, std::unique_ptr<gmlib::form::NpcDialogueForm>> mNpcDialogueForms;
+//     std::unordered_map<int64, std::unique_ptr<gmlib::form::NpcDialogueForm>> mNpcDialogueForms;
-    // std::unordered_map<int64, std::unique_ptr<ChestForm>>       mChestForms;
+//     // std::unordered_map<int64, std::unique_ptr<ChestForm>>       mChestForms;
 
-public:
+// public:
-    //     std::string getNextFormCallbackId() {
+//     //     std::string getNextFormCallbackId() {
-    //         return "GMLIB_FormApi_" + std::to_string(mNextFormCallbackId++);
+//     //         return "GMLIB_FormApi_" + std::to_string(mNextFormCallbackId++);
-    //     }
+//     //     }
 
-    int64 getNextFormId() {
+//     int64 getNextFormId() {
-        mNextFormId++;
+//         mNextFormId++;
-        return mNextFormId;
+//         return mNextFormId;
-    }
+//     }
 
-    int64 createNpcDialogueForm(std::string const& npcName, std::string const& sceneName, std::string const& dialogue) {
+//     int64 createNpcDialogueForm(std::string const& npcName, std::string const& sceneName, std::string const& dialogue) {
-        auto formId               = LegacyScriptFormManager::getInstance().getNextFormId();
+//         auto formId               = LegacyScriptFormManager::getInstance().getNextFormId();
-        auto formPtr              = std::make_unique<gmlib::form::NpcDialogueForm>(npcName, sceneName, dialogue);
+//         auto formPtr              = std::make_unique<gmlib::form::NpcDialogueForm>(npcName, sceneName, dialogue);
-        mNpcDialogueForms[formId] = std::move(formPtr);
+//         mNpcDialogueForms[formId] = std::move(formPtr);
-        return formId;
+//         return formId;
-    }
+//     }
 
-    bool destroyNpcDialogueForm(int64 formId) {
+//     bool destroyNpcDialogueForm(int64 formId) {
-        if (mNpcDialogueForms.contains(formId)) {
+//         if (mNpcDialogueForms.contains(formId)) {
-            mNpcDialogueForms.erase(formId);
+//             mNpcDialogueForms.erase(formId);
-            return true;
+//             return true;
-        }
+//         }
-        return false;
+//         return false;
-    }
+//     }
 
-    optional_ref<gmlib::form::NpcDialogueForm> getNpcDialogueForm(int64 formId) {
+//     optional_ref<gmlib::form::NpcDialogueForm> getNpcDialogueForm(int64 formId) {
-        if (mNpcDialogueForms.contains(formId)) {
+//         if (mNpcDialogueForms.contains(formId)) {
-            return mNpcDialogueForms[formId].get();
+//             return mNpcDialogueForms[formId].get();
-        }
+//         }
-        return {};
+//         return {};
-    }
+//     }
 
-    /*
+//     /*
-    int64 createChestForm(std::string const& npcName, std::string const& sceneName, std::string const& dialogue) {
+//     int64 createChestForm(std::string const& npcName, std::string const& sceneName, std::string const& dialogue) {
-        auto formId         = LegacyScriptFormManager::getInstance().getNextFormId();
+//         auto formId         = LegacyScriptFormManager::getInstance().getNextFormId();
-        auto formPtr        = std::make_unique<ChestForm>(npcName, sceneName, dialogue);
+//         auto formPtr        = std::make_unique<ChestForm>(npcName, sceneName, dialogue);
-        mChestForms[formId] = std::move(formPtr);
+//         mChestForms[formId] = std::move(formPtr);
-        return formId;
+//         return formId;
-    }
+//     }
 
-    bool destroyChestForm(int64 formId) {
+//     bool destroyChestForm(int64 formId) {
-        if (mChestForms.contains(formId)) {
+//         if (mChestForms.contains(formId)) {
-            mChestForms.erase(formId);
+//             mChestForms.erase(formId);
-            return true;
+//             return true;
-        }
+//         }
-        return false;
+//         return false;
-    }
+//     }
 
-    optional_ref<ChestForm> getChestForm(int64 formId) {
+//     optional_ref<ChestForm> getChestForm(int64 formId) {
-        if (mChestForms.contains(formId)) {
+//         if (mChestForms.contains(formId)) {
-            return mChestForms[formId].get();
+//             return mChestForms[formId].get();
-        }
+//         }
-        return {};
+//         return {};
-    }
+//     }
 
-    */
+//     */
-public:
+// public:
-    static LegacyScriptFormManager& getInstance() {
+//     static LegacyScriptFormManager& getInstance() {
-        static std::unique_ptr<LegacyScriptFormManager> instance;
+//         static std::unique_ptr<LegacyScriptFormManager> instance;
-        if (!instance) {
+//         if (!instance) {
-            instance = std::make_unique<LegacyScriptFormManager>();
+//             instance = std::make_unique<LegacyScriptFormManager>();
-        }
+//         }
-        return *instance;
+//         return *instance;
-    }
+//     }
-};
+// };
 
-#define PLAYER_DETECROR                                                                                                \
+// #define PLAYER_DETECROR                                                                                                \
-    [detectorId, result](::Player& pl) -> bool {                                                                       \
+//     [detectorId, result](::Player& pl) -> bool {                                                                       \
-        try {                                                                                                          \
+//         try {                                                                                                          \
-            if (RemoteCall::hasFunc("GMLIB_FORM_CALLBACK", detectorId)) {                                              \
+//             if (RemoteCall::hasFunc("GMLIB_FORM_CALLBACK", detectorId)) {                                              \
-                auto const& detector = RemoteCall::importAs<bool(::Player*)>("GMLIB_FORM_CALLBACK", detectorId);       \
+//                 auto const& detector = RemoteCall::importAs<bool(::Player*)>("GMLIB_FORM_CALLBACK", detectorId);       \
-                return detector(&pl);                                                                                  \
+//                 return detector(&pl);                                                                                  \
-            } else {                                                                                                   \
+//             } else {                                                                                                   \
-                gmlib::form::ServerSettingForm::removeElement(result);                                                 \
+//                 gmlib::form::ServerSettingForm::removeElement(result);                                                 \
-            }                                                                                                          \
+//             }                                                                                                          \
-        } catch (...) {}                                                                                               \
+//         } catch (...) {}                                                                                               \
-        return false;                                                                                                  \
+//         return false;                                                                                                  \
-    }
+//     }
 
-#define CALLBACK_TYPE(type)                                                                                            \
+// #define CALLBACK_TYPE(type)                                                                                            \
-    [callbackId, result](Player& pl, type data) {                                                                      \
+//     [callbackId, result](Player& pl, type data) {                                                                      \
-        try {                                                                                                          \
+//         try {                                                                                                          \
-            if (RemoteCall::hasFunc("GMLIB_FORM_CALLBACK", callbackId)) {                                              \
+//             if (RemoteCall::hasFunc("GMLIB_FORM_CALLBACK", callbackId)) {                                              \
-                auto const& callback = RemoteCall::importAs<void(Player*, type)>("GMLIB_FORM_CALLBACK", callbackId);   \
+//                 auto const& callback = RemoteCall::importAs<void(Player*, type)>("GMLIB_FORM_CALLBACK", callbackId);   \
-                callback(&pl, data);                                                                                   \
+//                 callback(&pl, data);                                                                                   \
-            } else {                                                                                                   \
+//             } else {                                                                                                   \
-                gmlib::form::ServerSettingForm::removeElement(result);                                                 \
+//                 gmlib::form::ServerSettingForm::removeElement(result);                                                 \
-            }                                                                                                          \
+//             }                                                                                                          \
-        } catch (...) {}                                                                                               \
+//         } catch (...) {}                                                                                               \
-    }
+//     }
 
-#define CALLBACK_TYPE_NORMAL                                                                                           \
+// #define CALLBACK_TYPE_NORMAL                                                                                           \
-    [callbackId](::Player& pl) {                                                                                       \
+//     [callbackId](::Player& pl) {                                                                                       \
-        try {                                                                                                          \
+//         try {                                                                                                          \
-            if (RemoteCall::hasFunc("GMLIB_FORM_CALLBACK", callbackId)) {                                              \
+//             if (RemoteCall::hasFunc("GMLIB_FORM_CALLBACK", callbackId)) {                                              \
-                auto const& callback = RemoteCall::importAs<void(::Player*)>("GMLIB_FORM_CALLBACK", callbackId);       \
+//                 auto const& callback = RemoteCall::importAs<void(::Player*)>("GMLIB_FORM_CALLBACK", callbackId);       \
-                callback(&pl);                                                                                         \
+//                 callback(&pl);                                                                                         \
-            }                                                                                                          \
+//             }                                                                                                          \
-        } catch (...) {}                                                                                               \
+//         } catch (...) {}                                                                                               \
-    }
+//     }
 
 
-void Export_Form_API() {
+// void Export_Form_API() {
-    ////////////////////////////////   Form Manager   /////////////////////////////////
+//     ////////////////////////////////   Form Manager   /////////////////////////////////
-    // RemoteCall::exportAs("GMLIB_FormAPI", "getNextFormCallbackId", []() -> std::string {
+//     // RemoteCall::exportAs("GMLIB_FormAPI", "getNextFormCallbackId", []() -> std::string {
-    //     return LegacyScriptFormManager::getInstance().getNextFormCallbackId();
+//     //     return LegacyScriptFormManager::getInstance().getNextFormCallbackId();
-    // });
+//     // });
-    //////////////////////////////   ServerSettingForm   //////////////////////////////
+//     //////////////////////////////   ServerSettingForm   //////////////////////////////
-    RemoteCall::exportAs("GMLIB_ServerSettingForm", "getDefaultPriority", []() -> int {
+//     RemoteCall::exportAs("GMLIB_ServerSettingForm", "getDefaultPriority", []() -> int {
-        return gmlib::form::ServerSettingForm::getDefaultPriority();
+//         return gmlib::form::ServerSettingForm::getDefaultPriority();
-    });
+//     });
-    RemoteCall::exportAs("GMLIB_ServerSettingForm", "hasTitle", []() -> bool { return gmlib::form::ServerSettingForm::hasTitle(); });
+//     RemoteCall::exportAs("GMLIB_ServerSettingForm", "hasTitle", []() -> bool { return gmlib::form::ServerSettingForm::hasTitle(); });
-    RemoteCall::exportAs("GMLIB_ServerSettingForm", "getTitle", []() -> std::string {
+//     RemoteCall::exportAs("GMLIB_ServerSettingForm", "getTitle", []() -> std::string {
-        return gmlib::form::ServerSettingForm::getTitle();
+//         return gmlib::form::ServerSettingForm::getTitle();
-    });
+//     });
-    RemoteCall::exportAs("GMLIB_gmlib::form::ServerSettingForm", "setTitle", [](std::string const& title, bool forceModify) -> bool {
+//     RemoteCall::exportAs("GMLIB_gmlib::form::ServerSettingForm", "setTitle", [](std::string const& title, bool forceModify) -> bool {
-        return gmlib::form::ServerSettingForm::setTitle(title, forceModify);
+//         return gmlib::form::ServerSettingForm::setTitle(title, forceModify);
-    });
+//     });
-    RemoteCall::exportAs("GMLIB_gmlib::form::ServerSettingForm", "hasIcon", []() -> bool { return gmlib::form::ServerSettingForm::hasIcon(); });
+//     RemoteCall::exportAs("GMLIB_gmlib::form::ServerSettingForm", "hasIcon", []() -> bool { return gmlib::form::ServerSettingForm::hasIcon(); });
-    RemoteCall::exportAs("GMLIB_gmlib::form::ServerSettingForm", "getIconData", []() -> std::string {
+//     RemoteCall::exportAs("GMLIB_gmlib::form::ServerSettingForm", "getIconData", []() -> std::string {
-        return gmlib::form::ServerSettingForm::getIconData().value_or("");
+//         return gmlib::form::ServerSettingForm::getIconData().value_or("");
-    });
+//     });
-    RemoteCall::exportAs("GMLIB_gmlib::form::ServerSettingForm", "getIconType", []() -> int {
+//     RemoteCall::exportAs("GMLIB_gmlib::form::ServerSettingForm", "getIconType", []() -> int {
-        return gmlib::form::ServerSettingForm::getIconType()
+//         return gmlib::form::ServerSettingForm::getIconType()
-            .transform([](gmlib::form::IconType&& type) -> int { return (int)type; })
+//             .transform([](gmlib::form::IconType&& type) -> int { return (int)type; })
-            .value_or(-1);
+//             .value_or(-1);
-    });
+//     });
-    RemoteCall::exportAs(
+//     RemoteCall::exportAs(
-        "GMLIB_gmlib::form::ServerSettingForm",
+//         "GMLIB_gmlib::form::ServerSettingForm",
-        "setIcon",
+//         "setIcon",
-        [](std::string const& title, uchar type, bool forceModify) -> bool {
+//         [](std::string const& title, uchar type, bool forceModify) -> bool {
-            return gmlib::form::ServerSettingForm::setIcon(title, gmlib::form::IconType(type), forceModify);
+//             return gmlib::form::ServerSettingForm::setIcon(title, gmlib::form::IconType(type), forceModify);
-        }
+//         }
-    );
+//     );
-    RemoteCall::exportAs(
+//     RemoteCall::exportAs(
-        "GMLIB_gmlib::form::ServerSettingForm",
+//         "GMLIB_gmlib::form::ServerSettingForm",
-        "addLabel",
+//         "addLabel",
-        [](std::string const& text, std::string const& detectorId, int priority) -> uint {
+//         [](std::string const& text, std::string const& detectorId, int priority) -> uint {
-            uint result = gmlib::form::ServerSettingForm::addLabel(text, PLAYER_DETECROR, priority);
+//             uint result = gmlib::form::ServerSettingForm::addLabel(text, PLAYER_DETECROR, priority);
-            return result;
+//             return result;
-        }
+//         }
-    );
+//     );
-    RemoteCall::exportAs(
+//     RemoteCall::exportAs(
-        "GMLIB_gmlib::form::ServerSettingForm",
+//         "GMLIB_gmlib::form::ServerSettingForm",
-        "addInput",
+//         "addInput",
-        [](std::string const& text,
+//         [](std::string const& text,
-           std::string const& placeholder,
+//            std::string const& placeholder,
-           std::string const& defaultVal,
+//            std::string const& defaultVal,
-           std::string const& callbackId,
+//            std::string const& callbackId,
-           std::string const& detectorId,
+//            std::string const& detectorId,
-           int                priority) -> uint {
+//            int                priority) -> uint {
-            uint result = gmlib::form::ServerSettingForm::addInput(
+//             uint result = gmlib::form::ServerSettingForm::addInput(
-                text,
+//                 text,
-                placeholder,
+//                 placeholder,
-                defaultVal,
+//                 defaultVal,
-                CALLBACK_TYPE(std::string const&),
+//                 CALLBACK_TYPE(std::string const&),
-                PLAYER_DETECROR,
+//                 PLAYER_DETECROR,
-                priority
+//                 priority
-            );
+//             );
-            return result;
+//             return result;
-        }
+//         }
-    );
+//     );
-    RemoteCall::exportAs(
+//     RemoteCall::exportAs(
-        "GMLIB_gmlib::form::ServerSettingForm",
+//         "GMLIB_gmlib::form::ServerSettingForm",
-        "addToggle",
+//         "addToggle",
-        [](std::string const& text,
+//         [](std::string const& text,
-           bool               defaultVal,
+//            bool               defaultVal,
-           std::string const& callbackId,
+//            std::string const& callbackId,
-           std::string const& detectorId,
+//            std::string const& detectorId,
-           int                priority) -> uint {
+//            int                priority) -> uint {
-            uint result = gmlib::form::ServerSettingForm::addToggle(text, defaultVal, CALLBACK_TYPE(bool), PLAYER_DETECROR, priority);
+//             uint result = gmlib::form::ServerSettingForm::addToggle(text, defaultVal, CALLBACK_TYPE(bool), PLAYER_DETECROR, priority);
-            return result;
+//             return result;
-        }
+//         }
-    );
+//     );
-    RemoteCall::exportAs(
+//     RemoteCall::exportAs(
-        "GMLIB_gmlib::form::ServerSettingForm",
+//         "GMLIB_gmlib::form::ServerSettingForm",
-        "addDropdown",
+//         "addDropdown",
-        [](std::string const&       text,
+//         [](std::string const&       text,
-           std::vector<std::string> options,
+//            std::vector<std::string> options,
-           int64                    defaultVal,
+//            int64                    defaultVal,
-           std::string const&       callbackId,
+//            std::string const&       callbackId,
-           std::string const&       detectorId,
+//            std::string const&       detectorId,
-           int                      priority) -> uint {
+//            int                      priority) -> uint {
-            uint result = gmlib::form::ServerSettingForm::addDropdown(
+//             uint result = gmlib::form::ServerSettingForm::addDropdown(
-                text,
+//                 text,
-                options,
+//                 options,
-                defaultVal,
+//                 defaultVal,
-                CALLBACK_TYPE(int64),
+//                 CALLBACK_TYPE(int64),
-                PLAYER_DETECROR,
+//                 PLAYER_DETECROR,
-                priority
+//                 priority
-            );
+//             );
-            return result;
+//             return result;
-        }
+//         }
-    );
+//     );
-    RemoteCall::exportAs(
+//     RemoteCall::exportAs(
-        "GMLIB_gmlib::form::ServerSettingForm",
+//         "GMLIB_gmlib::form::ServerSettingForm",
-        "addSlider",
+//         "addSlider",
-        [](std::string const& text,
+//         [](std::string const& text,
-           double             min,
+//            double             min,
-           double             max,
+//            double             max,
-           double             step,
+//            double             step,
-           double             defaultVal,
+//            double             defaultVal,
-           std::string const& callbackId,
+//            std::string const& callbackId,
-           std::string const& detectorId,
+//            std::string const& detectorId,
-           int                priority) -> uint {
+//            int                priority) -> uint {
-            uint result = gmlib::form::ServerSettingForm::addSlider(
+//             uint result = gmlib::form::ServerSettingForm::addSlider(
-                text,
+//                 text,
-                min,
+//                 min,
-                max,
+//                 max,
-                step,
+//                 step,
-                defaultVal,
+//                 defaultVal,
-                CALLBACK_TYPE(double),
+//                 CALLBACK_TYPE(double),
-                PLAYER_DETECROR,
+//                 PLAYER_DETECROR,
-                priority
+//                 priority
-            );
+//             );
-            return result;
+//             return result;
-        }
+//         }
-    );
+//     );
-    RemoteCall::exportAs(
+//     RemoteCall::exportAs(
-        "GMLIB_gmlib::form::ServerSettingForm",
+//         "GMLIB_gmlib::form::ServerSettingForm",
-        "addStepSlider",
+//         "addStepSlider",
-        [](std::string const&       text,
+//         [](std::string const&       text,
-           std::vector<std::string> steps,
+//            std::vector<std::string> steps,
-           int64                    defaultVal,
+//            int64                    defaultVal,
-           std::string const&       callbackId,
+//            std::string const&       callbackId,
-           std::string const&       detectorId,
+//            std::string const&       detectorId,
-           int                      priority) -> uint {
+//            int                      priority) -> uint {
-            uint result = gmlib::form::ServerSettingForm::addStepSlider(
+//             uint result = gmlib::form::ServerSettingForm::addStepSlider(
-                text,
+//                 text,
-                steps,
+//                 steps,
-                defaultVal,
+//                 defaultVal,
-                CALLBACK_TYPE(int64),
+//                 CALLBACK_TYPE(int64),
-                PLAYER_DETECROR,
+//                 PLAYER_DETECROR,
-                priority
+//                 priority
-            );
+//             );
-            return result;
+//             return result;
-        }
+//         }
-    );
+//     );
-    RemoteCall::exportAs("GMLIB_gmlib::form::ServerSettingForm", "removeElement", [](uint id) -> bool {
+//     RemoteCall::exportAs("GMLIB_gmlib::form::ServerSettingForm", "removeElement", [](uint id) -> bool {
-        return gmlib::form::ServerSettingForm::removeElement(id);
+//         return gmlib::form::ServerSettingForm::removeElement(id);
-    });
+//     });
-    //////////////////////////////   NpcDialogueForm   //////////////////////////////
+//     //////////////////////////////   NpcDialogueForm   //////////////////////////////
-    RemoteCall::exportAs(
+//     RemoteCall::exportAs(
-        "GMLIB_NpcDialogueForm",
+//         "GMLIB_NpcDialogueForm",
-        "createForm",
+//         "createForm",
-        [](std::string const& npcName, std::string const& sceneName, std::string const& dialogue) -> int64 {
+//         [](std::string const& npcName, std::string const& sceneName, std::string const& dialogue) -> int64 {
-            return LegacyScriptFormManager::getInstance().createNpcDialogueForm(npcName, sceneName, dialogue);
+//             return LegacyScriptFormManager::getInstance().createNpcDialogueForm(npcName, sceneName, dialogue);
-        }
+//         }
-    );
+//     );
-    RemoteCall::exportAs("GMLIB_NpcDialogueForm", "destroyForm", [](int64 formId) -> bool {
+//     RemoteCall::exportAs("GMLIB_NpcDialogueForm", "destroyForm", [](int64 formId) -> bool {
-        return LegacyScriptFormManager::getInstance().destroyNpcDialogueForm(formId);
+//         return LegacyScriptFormManager::getInstance().destroyNpcDialogueForm(formId);
-    });
+//     });
-    RemoteCall::exportAs(
+//     RemoteCall::exportAs(
-        "GMLIB_NpcDialogueForm",
+//         "GMLIB_NpcDialogueForm",
-        "addButton",
+//         "addButton",
-        [](int64 formId, std::string const& button, std::string const& callbackId) -> void {
+//         [](int64 formId, std::string const& button, std::string const& callbackId) -> void {
-            if (auto formPtr = LegacyScriptFormManager::getInstance().getNpcDialogueForm(formId)) {
+//             if (auto formPtr = LegacyScriptFormManager::getInstance().getNpcDialogueForm(formId)) {
-                formPtr->addButton(button, CALLBACK_TYPE_NORMAL);
+//                 formPtr->addButton(button, CALLBACK_TYPE_NORMAL);
-            }
+//             }
-        }
+//         }
-    );
+//     );
-    RemoteCall::exportAs(
+//     RemoteCall::exportAs(
-        "GMLIB_NpcDialogueForm",
+//         "GMLIB_NpcDialogueForm",
-        "onPlayerClose",
+//         "onPlayerClose",
-        [](int64 formId, std::string const& callbackId) -> void {
+//         [](int64 formId, std::string const& callbackId) -> void {
-            if (auto formPtr = LegacyScriptFormManager::getInstance().getNpcDialogueForm(formId)) {
+//             if (auto formPtr = LegacyScriptFormManager::getInstance().getNpcDialogueForm(formId)) {
-                formPtr->onPlayerClose(CALLBACK_TYPE_NORMAL);
+//                 formPtr->onPlayerClose(CALLBACK_TYPE_NORMAL);
-            }
+//             }
-        }
+//         }
-    );
+//     );
-    RemoteCall::exportAs("GMLIB_NpcDialogueForm", "sendTo", [](int64 formId, ::Player* pl) -> void {
+//     RemoteCall::exportAs("GMLIB_NpcDialogueForm", "sendTo", [](int64 formId, ::Player* pl) -> void {
-        if (auto formPtr = LegacyScriptFormManager::getInstance().getNpcDialogueForm(formId)) {
+//         if (auto formPtr = LegacyScriptFormManager::getInstance().getNpcDialogueForm(formId)) {
-            formPtr->sendTo(*pl);
+//             formPtr->sendTo(*pl);
-        }
+//         }
-    });
+//     });
-    //////////////////////////////   ChestForm   //////////////////////////////
+//     //////////////////////////////   ChestForm   //////////////////////////////
-}
+// }

src/Global.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <headers/include_all.h>
+#include <include_all.h>
 
 #include <RemoteCallAPI.h>
 
@@ -7,11 +7,9 @@
 
 #define LIB_VERSION_MAJOR 0
 #define LIB_VERSION_MINOR 13
-#define LIB_VERSION_PATCH 3
+#define LIB_VERSION_PATCH 6
 
-#define LIB_VERSION gmlib::Version(LIB_VERSION_MAJOR, LIB_VERSION_MINOR, LIB_VERSION_PATCH)
+#define LIB_VERSION GMLIB::Version(LIB_VERSION_MAJOR, LIB_VERSION_MINOR, LIB_VERSION_PATCH)
-
-extern ll::Logger logger;
 
 extern void Export_Legacy_GMLib_ModAPI();
 extern void Export_Legacy_GMLib_ServerAPI();
@@ -19,4 +17,4 @@ extern void Export_Compatibility_API();
 extern void ExportPAPI();
 extern void Export_Event_API();
 extern void Export_BinaryStream_API();
-extern void Export_Form_API();
+// extern void Export_Form_API();

src/LegacyModApi.cpp

@@ -17,12 +17,12 @@ void Export_Legacy_GMLib_ModAPI() {
            std::string const&       result,
            int                      count,
            std::string const&       unlock) -> void {
-            if (!gmlib::world::Level::getInstance().has_value()) return;
+            if (!GMLIB_Level::getInstance().has_value()) return;
             std::vector<RecipeIngredient> types;
             for (auto ing : ingredients) {
                 types.emplace_back(ing, 0, 1);
             }
-            gmlib::mod::recipe::JsonRecipeRegistry::registerShapelessCraftingTableRecipe(
+            GMLIB::Mod::JsonRecipe::registerShapelessCraftingTableRecipe(
                 recipe_id,
                 types,
                 RecipeIngredient(result, 0, count),
@@ -39,12 +39,12 @@ void Export_Legacy_GMLib_ModAPI() {
            std::string const&       result,
            int                      count,
            std::string const&       unlock) -> void {
-            if (!gmlib::world::Level::getInstance().has_value()) return;
+            if (!GMLIB_Level::getInstance().has_value()) return;
             std::vector<RecipeIngredient> types;
             for (auto ing : ingredients) {
                 types.push_back(RecipeIngredient(ing, 0, 1));
             }
-            gmlib::mod::recipe::JsonRecipeRegistry::registerShapedCraftingTableRecipe(
+            GMLIB::Mod::JsonRecipe::registerShapedCraftingTableRecipe(
                 recipe_id,
                 shape,
                 types,
@@ -60,8 +60,8 @@ void Export_Legacy_GMLib_ModAPI() {
            std::string const&       input,
            std::string const&       output,
            std::vector<std::string> tags) -> void {
-            if (!gmlib::world::Level::getInstance().has_value()) return;
+            if (!GMLIB_Level::getInstance().has_value()) return;
-            gmlib::mod::recipe::JsonRecipeRegistry::registerFurnaceRecipe(
+            GMLIB::Mod::JsonRecipe::registerFurnaceRecipe(
                 recipe_id,
                 RecipeIngredient(input, 0, 1),
                 RecipeIngredient(output, 0, 1),
@@ -74,13 +74,8 @@ void Export_Legacy_GMLib_ModAPI() {
         "registerBrewingMixRecipe",
         [](std::string const& recipe_id, std::string const& input, std::string const& output, std::string const& reagent
         ) -> void {
-            if (!gmlib::world::Level::getInstance().has_value()) return;
+            if (!GMLIB_Level::getInstance().has_value()) return;
-            gmlib::mod::recipe::JsonRecipeRegistry::registerBrewingMixRecipe(
+            GMLIB::Mod::JsonRecipe::registerBrewingMixRecipe(recipe_id, input, output, RecipeIngredient(reagent, 0, 1));
-                recipe_id,
-                input,
-                output,
-                RecipeIngredient(reagent, 0, 1)
-            );
         }
     );
     RemoteCall::exportAs(
@@ -88,8 +83,8 @@ void Export_Legacy_GMLib_ModAPI() {
         "registerBrewingContainerRecipe",
         [](std::string const& recipe_id, std::string const& input, std::string const& output, std::string const& reagent
         ) -> void {
-            if (!gmlib::world::Level::getInstance().has_value()) return;
+            if (!GMLIB_Level::getInstance().has_value()) return;
-            gmlib::mod::recipe::JsonRecipeRegistry::registerBrewingContainerRecipe(
+            GMLIB::Mod::JsonRecipe::registerBrewingContainerRecipe(
                 recipe_id,
                 RecipeIngredient(input, 0, 1),
                 RecipeIngredient(output, 0, 1),
@@ -105,8 +100,8 @@ void Export_Legacy_GMLib_ModAPI() {
            std::string const& base,
            std::string const& addition,
            std::string const& result) -> void {
-            if (!gmlib::world::Level::getInstance().has_value()) return;
+            if (!GMLIB_Level::getInstance().has_value()) return;
-            gmlib::mod::recipe::JsonRecipeRegistry::registerSmithingTransformRecipe(
+            GMLIB::Mod::JsonRecipe::registerSmithingTransformRecipe(
                 recipe_id,
                 smithing_template,
                 base,
@@ -122,13 +117,8 @@ void Export_Legacy_GMLib_ModAPI() {
            std::string const& smithing_template,
            std::string const& base,
            std::string const& addition) -> void {
-            if (!gmlib::world::Level::getInstance().has_value()) return;
+            if (!GMLIB_Level::getInstance().has_value()) return;
-            gmlib::mod::recipe::JsonRecipeRegistry::registerSmithingTrimRecipe(
+            GMLIB::Mod::JsonRecipe::registerSmithingTrimRecipe(recipe_id, smithing_template, base, addition);
-                recipe_id,
-                smithing_template,
-                base,
-                addition
-            );
         }
     );
     RemoteCall::exportAs(
@@ -140,8 +130,8 @@ void Export_Legacy_GMLib_ModAPI() {
            std::string const& output,
            int                output_data,
            int                output_count) -> void {
-            if (!gmlib::world::Level::getInstance().has_value()) return;
+            if (!GMLIB_Level::getInstance().has_value()) return;
-            gmlib::mod::recipe::JsonRecipeRegistry::registerStoneCutterRecipe(
+            GMLIB::Mod::JsonRecipe::registerStoneCutterRecipe(
                 recipe_id,
                 RecipeIngredient(input, 0, 1),
                 RecipeIngredient(output, 0, 1)
@@ -150,39 +140,39 @@ void Export_Legacy_GMLib_ModAPI() {
     );
     // 错误方块清理
     RemoteCall::exportAs("GMLib_ModAPI", "setUnknownBlockCleaner", []() -> void {
-        gmlib::tools::VanillaFix::setAutoCleanUnknownBlockEnabled();
+        GMLIB::Mod::VanillaFix::setAutoCleanUnknownBlockEnabled();
     });
     // 实验性
     RemoteCall::exportAs("GMLib_ModAPI", "registerExperimentsRequire", [](int experiment_id) -> void {
-        auto                               list = gmlib::world::Level::getAllExperiments();
+        auto                               list = GMLIB_Level::getAllExperiments();
         std::unordered_set<AllExperiments> set(list.begin(), list.end());
         if (set.contains((AllExperiments)experiment_id)) {
-            gmlib::world::Level::addExperimentsRequire((AllExperiments)experiment_id);
+            GMLIB_Level::addExperimentsRequire((AllExperiments)experiment_id);
         } else {
-            ll::Logger("Server").error("Experiment ID '{}' does not exist!", experiment_id);
+            ll::io::LoggerRegistry::getInstance().getOrCreate("Server")->error("Experiment ID '{}' does not exist!", experiment_id);
         }
     });
     RemoteCall::exportAs("GMLib_ModAPI", "setExperimentEnabled", [](int experiment_id, bool value) -> void {
-        if (gmlib::world::Level::getInstance()) {
+        if (GMLIB_Level::getInstance()) {
-            auto                               list = gmlib::world::Level::getAllExperiments();
+            auto                               list = GMLIB_Level::getAllExperiments();
             std::unordered_set<AllExperiments> set(list.begin(), list.end());
             if (set.contains((AllExperiments)experiment_id)) {
-                gmlib::world::Level::getInstance()->setExperimentEnabled(((AllExperiments)experiment_id), value);
+                GMLIB_Level::getInstance()->setExperimentEnabled(((AllExperiments)experiment_id), value);
-            } else ll::Logger("Server").error("Experiment ID '{}' does not exist!", experiment_id);
+            } else ll::io::LoggerRegistry::getInstance().getOrCreate("Server")->error("Experiment ID '{}' does not exist!", experiment_id);
         }
     });
     RemoteCall::exportAs("GMLib_ModAPI", "getExperimentEnabled", [](int experiment_id) -> bool {
-        if (gmlib::world::Level::getInstance()) {
+        if (GMLIB_Level::getInstance()) {
-            auto                               list = gmlib::world::Level::getAllExperiments();
+            auto                               list = GMLIB_Level::getAllExperiments();
             std::unordered_set<AllExperiments> set(list.begin(), list.end());
             if (set.contains((AllExperiments)experiment_id)) {
-                return gmlib::world::Level::getInstance()->getExperimentEnabled(((AllExperiments)experiment_id));
+                return GMLIB_Level::getInstance()->getExperimentEnabled(((AllExperiments)experiment_id));
             }
-            ll::Logger("Server").error("Experiment ID '{}' does not exist!", experiment_id);
+            ll::io::LoggerRegistry::getInstance().getOrCreate("Server")->error("Experiment ID '{}' does not exist!", experiment_id);
         }
         return false;
     });
     RemoteCall::exportAs("GMLib_ModAPI", "setFixI18nEnabled", []() -> void {
-        gmlib::tools::VanillaFix::setFixI18nEnabled();
+        GMLIB::Mod::VanillaFix::setFixI18nEnabled();
     });
 }

src/LegacyServerApi.cpp

@@ -2,50 +2,48 @@
 
 void Export_Legacy_GMLib_ServerAPI() {
     RemoteCall::exportAs("GMLib_ServerAPI", "setEducationFeatureEnabled", []() -> void {
-        gmlib::world::Level::tryEnableEducationEdition();
+        GMLIB_Level::tryEnableEducationEdition();
     });
     RemoteCall::exportAs("GMLib_ServerAPI", "registerAbilityCommand", []() -> void {
-        gmlib::world::Level::tryRegisterAbilityCommand();
+        GMLIB_Level::tryRegisterAbilityCommand();
     });
     RemoteCall::exportAs("GMLib_ServerAPI", "setEnableAchievement", []() -> void {
-        gmlib::world::Level::setForceAchievementsEnabled();
+        GMLIB_Level::setForceAchievementsEnabled();
-    });
-    RemoteCall::exportAs("GMLib_ServerAPI", "setForceTrustSkins", []() -> void {
-        gmlib::world::Level::trustAllSkins();
     });
+    RemoteCall::exportAs("GMLib_ServerAPI", "setForceTrustSkins", []() -> void { GMLIB_Level::trustAllSkins(); });
     RemoteCall::exportAs("GMLib_ServerAPI", "enableCoResourcePack", []() -> void {
-        gmlib::world::Level::requireServerResourcePackAndAllowClientResourcePack();
+        GMLIB_Level::requireServerResourcePackAndAllowClientResourcePack();
     });
     RemoteCall::exportAs("GMLib_ServerAPI", "getLevelName", []() -> std::string {
-        return gmlib::world::Level::getInstance()
+        return GMLIB_Level::getInstance()
-            .transform([](gmlib::world::Level& level) -> std::string { return level.getLevelName(); })
+            .transform([](GMLIB_Level& level) -> std::string { return level.getLevelName(); })
             .value_or("");
     });
     RemoteCall::exportAs("GMLib_ServerAPI", "setLevelName", [](std::string const& name) -> void {
-        if (auto level = gmlib::world::Level::getInstance()) {
+        if (auto level = GMLIB_Level::getInstance()) {
             level->setLevelName(name);
         }
     });
     RemoteCall::exportAs("GMLib_ServerAPI", "getLevelSeed", []() -> std::string {
-        return gmlib::world::Level::getInstance()
+        return GMLIB_Level::getInstance()
-            .transform([](gmlib::world::Level& level) -> std::string { return std::to_string(level.getSeed()); })
+            .transform([](GMLIB_Level& level) -> std::string { return std::to_string(level.getSeed()); })
             .value_or("");
     });
     RemoteCall::exportAs("GMLib_ServerAPI", "setFakeSeed", [](int64_t seed) -> void {
-        return gmlib::world::Level::setFakeSeed(seed);
+        return GMLIB_Level::setFakeSeed(seed);
     });
     RemoteCall::exportAs(
         "GMLib_ServerAPI",
         "spawnEntity",
         [](std::pair<Vec3, int> pos, std::string const& name) -> Actor* {
-            return gmlib::world::Spawner::spawnEntity(pos.first, pos.second, name).as_ptr();
+            return GMLIB_Spawner::spawnEntity(pos.first, pos.second, name).as_ptr();
         }
     );
     RemoteCall::exportAs(
         "GMLib_ServerAPI",
         "shootProjectile",
         [](Actor* owner, std::string const& name, float speed, float offset) -> Actor* {
-            auto ac = (gmlib::world::Actor*)owner;
+            auto ac = (GMLIB_Actor*)owner;
             return ac->shootProjectile(name, speed, offset).as_ptr();
         }
     );
@@ -53,7 +51,7 @@ void Export_Legacy_GMLib_ServerAPI() {
         "GMLib_ServerAPI",
         "throwEntity",
         [](Actor* owner, Actor* actor, float speed, float offset) -> bool {
-            auto ac = (gmlib::world::Actor*)owner;
+            auto ac = (GMLIB_Actor*)owner;
             return ac->throwEntity(*actor, speed, offset);
         }
     );
@@ -62,18 +60,18 @@ void Export_Legacy_GMLib_ServerAPI() {
         "GMLib_ServerAPI",
         "addFakeList",
         [](const std::string& name, const std::string& xuid) -> bool {
-            return gmlib::tools::FakeList::addFakeList(name, xuid, ActorUniqueID(-1));
+            return GMLIB::Server::FakeList::addFakeList(name, xuid, ActorUniqueID(-1));
         }
     );
     RemoteCall::exportAs("GMLib_ServerAPI", "removeFakeList", [](const std::string& nameOrXuid) -> bool {
-        return gmlib::tools::FakeList::removeFakeList(nameOrXuid);
+        return GMLIB::Server::FakeList::removeFakeList(nameOrXuid);
     });
     RemoteCall::exportAs("GMLib_ServerAPI", "removeAllFakeList", []() -> void {
-        return gmlib::tools::FakeList::removeAllFakeLists();
+        return GMLIB::Server::FakeList::removeAllFakeLists();
     });
     RemoteCall::exportAs("GMLib_ServerAPI", "getMaxPlayers", []() -> int {
-        return gmlib::world::Level::getInstance()
+        return GMLIB_Level::getInstance().transform(
-            .transform([](gmlib::world::Level& level) -> int { return level.getMaxPlayerCount(); })
+                                             [](GMLIB_Level& level) -> int { return level.getMaxPlayerCount(); }
-            .value_or(0);
+        ).value_or(0);
     });
 }

src/PlaceholderApi.cpp

@@ -13,10 +13,10 @@ bool isParameters(std::string const& str) {
     return std::regex_search(removeBrackets(str), reg);
 }
 
-std::string GetValue(std::string const& from) { return gmlib::tools::PlaceholderAPI::getValue(from); }
+std::string GetValue(std::string const& from) { return GMLIB::Server::PlaceholderAPI::getValue(from); }
 
 std::string GetValueWithPlayer(std::string const& key, Player* player) {
-    return gmlib::tools::PlaceholderAPI::getValue(key, player);
+    return GMLIB::Server::PlaceholderAPI::getValue(key, player);
 }
 
 bool registerPlayerPlaceholder(
@@ -25,20 +25,20 @@ bool registerPlayerPlaceholder(
     std::string const& PAPIName
 ) {
     if (RemoteCall::hasFunc(PluginName, FuncName)) {
-        gmlib::tools::PlaceholderAPI::unregisterPlaceholder(PAPIName);
+        GMLIB::Server::PlaceholderAPI::unregisterPlaceholder(PAPIName);
         if (isParameters(PAPIName)) {
             auto Call = RemoteCall::importAs<std::string(Player * pl, std::unordered_map<std::string, std::string>)>(
                 PluginName,
                 FuncName
             );
-            gmlib::tools::PlaceholderAPI::registerPlayerPlaceholder(
+            GMLIB::Server::PlaceholderAPI::registerPlayerPlaceholder(
                 PAPIName,
                 [Call](Player* sp, std::unordered_map<std::string, std::string> map) { return Call(sp, map); },
                 PluginName
             );
         } else {
             auto Call = RemoteCall::importAs<std::string(Player * pl)>(PluginName, FuncName);
-            gmlib::tools::PlaceholderAPI::registerPlayerPlaceholder(
+            GMLIB::Server::PlaceholderAPI::registerPlayerPlaceholder(
                 PAPIName,
                 [Call](Player* sp) { return Call(sp); },
                 PluginName
@@ -55,18 +55,18 @@ bool registerServerPlaceholder(
     std::string const& PAPIName
 ) {
     if (RemoteCall::hasFunc(PluginName, FuncName)) {
-        gmlib::tools::PlaceholderAPI::unregisterPlaceholder(PAPIName);
+        GMLIB::Server::PlaceholderAPI::unregisterPlaceholder(PAPIName);
         if (isParameters(PAPIName)) {
             auto Call =
                 RemoteCall::importAs<std::string(std::unordered_map<std::string, std::string>)>(PluginName, FuncName);
-            gmlib::tools::PlaceholderAPI::registerServerPlaceholder(
+            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::tools::PlaceholderAPI::registerServerPlaceholder(PAPIName, [Call]() { return Call(); }, PluginName);
+            GMLIB::Server::PlaceholderAPI::registerServerPlaceholder(PAPIName, [Call]() { return Call(); }, PluginName);
         }
         return true;
     }
@@ -80,17 +80,17 @@ bool registerStaticPlaceholder(
     int                num
 ) {
     if (RemoteCall::hasFunc(PluginName, FuncName)) {
-        gmlib::tools::PlaceholderAPI::unregisterPlaceholder(PAPIName);
+        GMLIB::Server::PlaceholderAPI::unregisterPlaceholder(PAPIName);
         if (isParameters(PAPIName)) {
             auto Call = RemoteCall::importAs<std::string()>(PluginName, FuncName);
             if (num == -1) {
-                gmlib::tools::PlaceholderAPI::registerStaticPlaceholder(
+                GMLIB::Server::PlaceholderAPI::registerStaticPlaceholder(
                     PAPIName,
                     [Call] { return Call(); },
                     PluginName
                 );
             } else {
-                gmlib::tools::PlaceholderAPI::registerStaticPlaceholder(
+                GMLIB::Server::PlaceholderAPI::registerStaticPlaceholder(
                     PAPIName,
                     num,
                     [Call] { return Call(); },
@@ -104,14 +104,14 @@ bool registerStaticPlaceholder(
 }
 
 std::string translateStringWithPlayer(std::string const& str, Player* pl) {
-    return gmlib::tools::PlaceholderAPI::translateString(str, pl);
+    return GMLIB::Server::PlaceholderAPI::translateString(str, pl);
 }
 
-std::string translateString(std::string const& str) { return gmlib::tools::PlaceholderAPI::translateString(str); }
+std::string translateString(std::string const& str) { return GMLIB::Server::PlaceholderAPI::translateString(str); }
 
-bool unRegisterPlaceholder(std::string const& str) { return gmlib::tools::PlaceholderAPI::unregisterPlaceholder(str); }
+bool unRegisterPlaceholder(std::string const& str) { return GMLIB::Server::PlaceholderAPI::unregisterPlaceholder(str); }
 
-std::vector<std::string> getAllPAPI() { return gmlib::tools::PlaceholderAPI::getAllPAPI(); }
+std::vector<std::string> getAllPAPI() { return GMLIB::Server::PlaceholderAPI::getAllPAPI(); }
 
 } // namespace PAPIRemoteCall
 

tooth.json

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

xmake.lua

@@ -7,50 +7,22 @@ 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 1.0.0-rc.3", {configs = {target_type = "server"}})
-add_requires("levilaminalibrary")
+add_requires("legacyremotecall 0.9.0-rc.1")
-add_requires("legacyremotecall")
+add_requires("gmlib 0.13.10")
-add_requires("gmlib")
+add_requires("levibuildscript 0.3.0")
 
--- Option 2: Use a specific version of LeviLamina released on GitHub.
+target("GMLIB-LegacyRemoteCallApi")
--- add_requires("levilamina x.x.x")
-
--- Option 3: Use the latest commit of LeviLamina on GitHub.
--- -- Here, "develop" is the branch name. You can change it to any branch name you want.
--- add_requires("levilamina develop")
--- -- You can also use debug build of LeviLamina.
--- -- add_requires("levilamina develop", {debug = true})
--- package("levilamina")
---     add_urls("https://github.com/LiteLDev/LeviLamina.git")
-
---     add_deps("ctre 3.8.1")
---     add_deps("entt 3.12.2")
---     add_deps("fmt 10.1.1")
---     add_deps("gsl 4.0.0")
---     add_deps("leveldb 1.23")
---     add_deps("magic_enum 0.9.0")
---     add_deps("nlohmann_json 3.11.2")
---     add_deps("rapidjson 1.1.0")
---     add_deps("pcg_cpp 1.0.0")
---     add_deps("pfr 2.1.1")
---     add_deps("preloader 1.4.0")
---     add_deps("symbolprovider 1.1.0")
-
---     -- You may need to change this to the target BDS version of your choice.
---     add_deps("bdslibrary 1.20.50.03")
-
---     on_install(function (package)
---         import("package.tools.xmake").install(package)
---     end)
-
-target("GMLIB-LegacyRemoteCallApi") -- Change this to your plugin name.
     add_cxflags(
         "/EHa",
         "/utf-8"
     )
     add_defines(
         "NOMINMAX",
-        "UNICODE"
+        "UNICODE",
+        "_HAS_CXX17",
+        "_HAS_CXX20",
+        "_HAS_CXX23"
     )
     add_files(
         "src/**.cpp"
@@ -59,16 +31,14 @@ target("GMLIB-LegacyRemoteCallApi") -- Change this to your plugin name.
         "src"
     )
     add_packages(
-        "levilaminalibrary",
+        "levilamina",
         "legacyremotecall",
         "gmlib"
     )
-    add_shflags(
+    add_rules("@levibuildscript/linkrule")
-        "/DELAYLOAD:bedrock_server.dll" -- Magic to import symbols from BDS
+    set_exceptions("none")
-    )
-    set_exceptions("none") -- To avoid conflicts with /EHa
     set_kind("shared")
-    set_languages("c++23")
+    set_languages("cxx20")
     set_symbols("debug")
 
     after_build(function (target)