chore: prepare for release

.github/workflows/build.yml

@@ -11,12 +11,14 @@ jobs:
         uses: actions/checkout@v2
 
       - uses: xmake-io/github-action-setup-xmake@v1
+        with:
+          xmake-version: 3.0.0
       
       - run: |
           xmake repo -u
 
       - run: |
-          xmake f -a x64 -m release -p windows -v -y
+          xmake f -a x64 -m release -p windows -y
 
       - run: |
           xmake -w -y

.github/workflows/release.yml

@@ -11,12 +11,14 @@ jobs:
         uses: actions/checkout@v2
 
       - uses: xmake-io/github-action-setup-xmake@v1
+        with:
+          xmake-version: 3.0.0
       
       - run: |
           xmake repo -u
 
       - run: |
-          xmake f -a x64 -m release -p windows -v -y
+          xmake f -a x64 -m release -p windows -y
 
       - run: |
           xmake -w -y

lib/BEPlaceholderAPI-JS.js

@@ -1,47 +1,22 @@
 const PlaceholderAPI = {
     /** 获取一个服务器变量的值 @type {function(string):string} */
-    getValueAPI: ll.import("BEPlaceholderAPI", "GetValue"),
+    getValueAPI: ll.imports("BEPlaceholderAPI", "GetValue"),
     /** 获取一个玩家变量的值 @type {function(string,Player):string} */
-    getValueByPlayerAPI: ll.import("BEPlaceholderAPI", "GetValueWithPlayer"),
+    getValueByPlayerAPI: ll.imports("BEPlaceholderAPI", "GetValueWithPlayer"),
     /** 注册一个玩家变量 @type {function(string,string,string):boolean} */
-    registerPlayerPlaceholderAPI: ll.import("BEPlaceholderAPI", "registerPlayerPlaceholder"),
+    registerPlayerPlaceholderAPI: ll.imports("BEPlaceholderAPI", "registerPlayerPlaceholder"),
     /** 注册一个服务器变量 @type {function(string,string,string):boolean} */
-    registerServerPlaceholderAPI: ll.import("BEPlaceholderAPI", "registerServerPlaceholder"),
+    registerServerPlaceholderAPI: ll.imports("BEPlaceholderAPI", "registerServerPlaceholder"),
     /** 注册一个静态变量 @type {function(string,string,string,number):boolean} */
-    registerStaticPlaceholderAPI: ll.import("BEPlaceholderAPI", "registerStaticPlaceholder"),
+    registerStaticPlaceholderAPI: ll.imports("BEPlaceholderAPI", "registerStaticPlaceholder"),
     /** 翻译包含PAPI服务器变量的字符串 @type {function(string):string} */
-    translateStringAPI: ll.import("BEPlaceholderAPI", "translateString"),
+    translateStringAPI: ll.imports("BEPlaceholderAPI", "translateString"),
     /** 翻译包含PAPI玩家变量的字符串 @type {function(string,Player):string} */
-    translateStringWithPlayerAPI: ll.import("BEPlaceholderAPI", "translateStringWithPlayer"),
+    translateStringWithPlayerAPI: ll.imports("BEPlaceholderAPI", "translateStringWithPlayer"),
     /** 注销PAPI变量 @type {function(string):boolean} */
-    unRegisterPlaceholderAPI: ll.import("BEPlaceholderAPI", "unRegisterPlaceholder"),
+    unRegisterPlaceholderAPI: ll.imports("BEPlaceholderAPI", "unRegisterPlaceholder"),
     /** 获取所有已注册的PAPI变量 @type {function():Array.<string>} */
-    getAllPAPI: ll.import("BEPlaceholderAPI", "getAllPAPI")
-}
-
-Function.prototype.getName =
-    /**
-     * 获取函数名字
-     * @returns {string}
-     */
-    function () {
-        return this.name || this.toString().match(/function\s*([^(]*)\(/)?.[1] || getStringHashCode(this.toString()).toString(16);
-    }
-
-/**
- * 获取字符串哈希值
- * @param {string} str 字符串
- * @returns {number}
- */
-function getStringHashCode(str) {
-    let hash = 0, chr;
-    if (str.length === 0) return hash;
-    for (let i = 0; i < str.length; i++) {
-        chr = str.charCodeAt(i);
-        hash = ((hash << 5) - hash) + chr;
-        hash |= 0;
-    }
-    return hash;
+    getAllPAPI: ll.imports("BEPlaceholderAPI", "getAllPAPI")
 }
 
 /** PAPI变量类 */
@@ -58,8 +33,8 @@ class PAPI {
      * @returns {boolean} 是否注册成功
      */
     static registerPlayerPlaceholder(func, PluginName, PAPIName) {
-        ll.export(func, PluginName, func.getName());
-        PlaceholderAPI.registerPlayerPlaceholderAPI(PluginName, func.getName(), PAPIName);
+        ll.export(func, PluginName, `Placeholder_${PAPIName}`);
+        PlaceholderAPI.registerPlayerPlaceholderAPI(PluginName, `Placeholder_${PAPIName}`, PAPIName);
     }
 
     /**
@@ -70,8 +45,8 @@ class PAPI {
      * @returns {boolean} 是否注册成功
      */
     static registerServerPlaceholder(func, PluginName, PAPIName) {
-        ll.export(func, PluginName, func.getName());
-        PlaceholderAPI.registerServerPlaceholderAPI(PluginName, func.getName(), PAPIName);
+        ll.export(func, PluginName, `Placeholder_${PAPIName}`);
+        PlaceholderAPI.registerServerPlaceholderAPI(PluginName, `Placeholder_${PAPIName}`, PAPIName);
     }
 
     /**
@@ -83,8 +58,8 @@ class PAPI {
      * @returns {boolean} 是否注册成功
      */
     static registerStaticPlaceholder(func, PluginName, PAPIName, UpdateInterval = 50) {
-        ll.export(func, PluginName, func.getName());
-        PlaceholderAPI.registerStaticPlaceholderAPI(PluginName, func.getName(), PAPIName, UpdateInterval);
+        ll.export(func, PluginName, `Placeholder_${PAPIName}`);
+        PlaceholderAPI.registerStaticPlaceholderAPI(PluginName, `Placeholder_${PAPIName}`, PAPIName, UpdateInterval);
     }
 
     /**

lib/EventAPI-JS.js

@@ -1,14 +1,54 @@
-/**
- * @returns {string}
- */
 const getPluginName = () => {
-    try {
-        throw new Error("getPluginName");
-    } catch (error) {
-        return error.stack.trim().match(/plugins\\(.*)\\.*\.js:[0-9]+\)$/i)?.[1]
-            || error.stack.trim().match(/at <anonymous> \(([^\\|/]+)(.*?):\d+:\d+\)$/i)?.[1]
-            || "Unknown";
-    }
+    if (getPluginName.PluginNameCache) return getPluginName.PluginNameCache;
+
+    return getPluginName.PluginNameCache = (() => {
+        if (ll.getCurrentPluginInfo) return ll.getCurrentPluginInfo().name;
+
+        const error = new Error("getPluginName");
+        switch (ll.scriptEngineVersion) {
+            case "QuickJS": {
+                if (!error.stack) break;
+                const /** @type {string} */ line = error.stack.trim().split("\n").pop().trim();
+                if (line.includes("<anonymous>")) {
+                    return line.slice(
+                        line.indexOf("(") + 1,
+                        line.indexOf("\\")
+                    );
+                }
+                if (line.includes("<eval>")) {
+                    return line.slice(
+                        line.indexOf("/", line.indexOf("/") + 1) + 1,
+                        line.indexOf("\\")
+                    );
+                }
+                break;
+            }
+            case "V8 12.4.254.21-node.21": {
+                try {
+                    const selfFileName = require('path').basename(__filename);
+                    const pluginDirectory = Object.entries(
+                        require('module')._pathCache
+                    ).find(
+                        ([key, _]) => key.includes(selfFileName)
+                    )[0].split("\u0000")[1];
+                    const directories = pluginDirectory.split("\\");
+                    const pluginName = directories[directories.findIndex(value => value === "plugins") + 1].trim();
+                    if (pluginName) return pluginName;
+                } catch { }
+
+                if (!error.stack) break;
+                const /** @type {string} */ line = error.stack.trim().split("\n").pop().trim();
+                if (line.includes(".js") && /:\d+:\d+$/.test(line)) {
+                    const directories = line.split("\\");
+                    const pluginName = directories[directories.findIndex(value => value === "plugins") + 1].trim();
+                    if (pluginName) return pluginName;
+                }
+                break;
+            }
+            default: break;
+        }
+        return "Unknown";
+    })();
 };
 
 module.exports = {

lib/FormAPI-JS.js

@@ -1,4 +1,4 @@
-// // const getNextCallbackId = ll.import("GMLIB_FormAPI", "getNextFormCallbackId");
+// // const getNextCallbackId = ll.imports("GMLIB_FormAPI", "getNextFormCallbackId");
 
 // class ServerSettingForm {
 //     constructor() {
@@ -6,35 +6,35 @@
 //     }
 
 //     static getDefaultPriority() {
-//         return ll.import("GMLIB_ServerSettingForm", "getDefaultPriority")();
+//         return ll.imports("GMLIB_ServerSettingForm", "getDefaultPriority")();
 //     }
 
 //     static hasTitle() {
-//         return ll.import("GMLIB_ServerSettingForm", "hasTitle")();
+//         return ll.imports("GMLIB_ServerSettingForm", "hasTitle")();
 //     }
 
 //     static getTitle() {
-//         return ll.import("GMLIB_ServerSettingForm", "getTitle")();
+//         return ll.imports("GMLIB_ServerSettingForm", "getTitle")();
 //     }
 
 //     static setTitle(title, forceModify = false) {
-//         return ll.import("GMLIB_ServerSettingForm", "setTitle")(title, forceModify);
+//         return ll.imports("GMLIB_ServerSettingForm", "setTitle")(title, forceModify);
 //     }
 
 //     static hasIcon() {
-//         return ll.import("GMLIB_ServerSettingForm", "hasIcon")();
+//         return ll.imports("GMLIB_ServerSettingForm", "hasIcon")();
 //     }
 
 //     static getIconData() {
-//         return hasIcon() ? ll.import("GMLIB_ServerSettingForm", "getIconData")() : null;
+//         return hasIcon() ? ll.imports("GMLIB_ServerSettingForm", "getIconData")() : null;
 //     }
 
 //     static getIconType() {
-//         return ll.import("GMLIB_ServerSettingForm", "getIconType")();
+//         return ll.imports("GMLIB_ServerSettingForm", "getIconType")();
 //     }
 
 //     static setIcon(data, type = 0, forceModify = false) {
-//         return ll.import("GMLIB_ServerSettingForm", "setIcon")(data, type, forceModify);
+//         return ll.imports("GMLIB_ServerSettingForm", "setIcon")(data, type, forceModify);
 //     }
 
 //     static addLabel(
@@ -44,7 +44,7 @@
 //     ) {
 //         let detectorId = getNextCallbackId();
 //         ll.export(playerDetector, "GMLIB_FORM_CALLBACK", detectorId);
-//         return ll.import("GMLIB_ServerSettingForm", "addLabel")(text, detectorId, priority);
+//         return ll.imports("GMLIB_ServerSettingForm", "addLabel")(text, detectorId, priority);
 //     }
 
 
@@ -60,7 +60,7 @@
 //         ll.export(callback, "GMLIB_FORM_CALLBACK", callbackId);
 //         let detectorId = getNextCallbackId();
 //         ll.export(playerDetector, "GMLIB_FORM_CALLBACK", detectorId);
-//         return ll.import("GMLIB_ServerSettingForm", "addInput")(text, placeholder, defaultVal, callbackId, detectorId, priority);
+//         return ll.imports("GMLIB_ServerSettingForm", "addInput")(text, placeholder, defaultVal, callbackId, detectorId, priority);
 //     }
 
 //     static addToggle(
@@ -74,7 +74,7 @@
 //         ll.export(callback, "GMLIB_FORM_CALLBACK", callbackId);
 //         let detectorId = getNextCallbackId();
 //         ll.export(playerDetector, "GMLIB_FORM_CALLBACK", detectorId);
-//         return ll.import("GMLIB_ServerSettingForm", "addToggle")(text, defaultVal, callbackId, detectorId, priority);
+//         return ll.imports("GMLIB_ServerSettingForm", "addToggle")(text, defaultVal, callbackId, detectorId, priority);
 //     }
 
 //     static addDropdown(
@@ -89,7 +89,7 @@
 //         ll.export(callback, "GMLIB_FORM_CALLBACK", callbackId);
 //         let detectorId = getNextCallbackId();
 //         ll.export(playerDetector, "GMLIB_FORM_CALLBACK", detectorId);
-//         return ll.import("GMLIB_ServerSettingForm", "addDropdown")(text, options, defaultVal, callbackId, detectorId, priority);
+//         return ll.imports("GMLIB_ServerSettingForm", "addDropdown")(text, options, defaultVal, callbackId, detectorId, priority);
 //     }
 
 //     static addSlider(
@@ -106,7 +106,7 @@
 //         ll.export(callback, "GMLIB_FORM_CALLBACK", callbackId);
 //         let detectorId = getNextCallbackId();
 //         ll.export(playerDetector, "GMLIB_FORM_CALLBACK", detectorId);
-//         return ll.import("GMLIB_ServerSettingForm", "addSlider")(text, min, max, step, defaultVal, callbackId, detectorId, priority);
+//         return ll.imports("GMLIB_ServerSettingForm", "addSlider")(text, min, max, step, defaultVal, callbackId, detectorId, priority);
 //     }
 
 //     static addStepSlider(
@@ -121,57 +121,57 @@
 //         ll.export(callback, "GMLIB_FORM_CALLBACK", callbackId);
 //         let detectorId = getNextCallbackId();
 //         ll.export(playerDetector, "GMLIB_FORM_CALLBACK", detectorId);
-//         return ll.import("GMLIB_ServerSettingForm", "addStepSlider")(text, steps, defaultVal, callbackId, detectorId, priority);
+//         return ll.imports("GMLIB_ServerSettingForm", "addStepSlider")(text, steps, defaultVal, callbackId, detectorId, priority);
 //     }
 
 //     static removeElement(id) {
-//         return ll.import("GMLIB_ServerSettingForm", "removeElement")(id);
+//         return ll.imports("GMLIB_ServerSettingForm", "removeElement")(id);
 //     }
 // }
 
 // class NpcDialogueForm {
 //     constructor(npcName, sceneName, dialogue) {
-//         this.mFormId = ll.import("GMLIB_NpcDialogueForm", "createForm")(npcName, sceneName, dialogue);
+//         this.mFormId = ll.imports("GMLIB_NpcDialogueForm", "createForm")(npcName, sceneName, dialogue);
 //     }
 
 //     addButton(button) {
-//         return ll.import("GMLIB_NpcDialogueForm", "addButton")(this.mFormId, button);
+//         return ll.imports("GMLIB_NpcDialogueForm", "addButton")(this.mFormId, button);
 //     }
 
 //     sendTo(pl, callback = (pl, index, type) => { }, free = true) {
 //         let callbackId = getNextCallbackId();
 //         ll.export(callback, "GMLIB_FORM_CALLBACK", callbackId);
-//         ll.import("GMLIB_NpcDialogueForm", "sendTo")(this.mFormId, pl, callbackId);
+//         ll.imports("GMLIB_NpcDialogueForm", "sendTo")(this.mFormId, pl, callbackId);
 //         if (free) {
 //             this.destroy();
 //         }
 //     }
 
 //     destroy() {
-//         ll.import("GMLIB_NpcDialogueForm", "destroyForm")(this.mFormId);
+//         ll.imports("GMLIB_NpcDialogueForm", "destroyForm")(this.mFormId);
 //     }
 // }
 
 // class ChestForm {
 //     constructor(npcName, sceneName, dialogue) {
-//         this.mFormId = ll.import("GMLIB_NpcDialogueForm", "createForm")(npcName, sceneName, dialogue);
+//         this.mFormId = ll.imports("GMLIB_NpcDialogueForm", "createForm")(npcName, sceneName, dialogue);
 //     }
 
 //     addButton(button) {
-//         return ll.import("GMLIB_NpcDialogueForm", "addButton")(this.mFormId, button);
+//         return ll.imports("GMLIB_NpcDialogueForm", "addButton")(this.mFormId, button);
 //     }
 
 //     sendTo(pl, free = true) {
 //         //let callbackId = getNextCallbackId();
 //         //ll.export(callback, "GMLIB_FORM_CALLBACK", callbackId);
-//         //ll.import("GMLIB_NpcDialogueForm", "sendTo")(this.mFormId, pl, callbackId);
+//         //ll.imports("GMLIB_NpcDialogueForm", "sendTo")(this.mFormId, pl, callbackId);
 //         //if (free) {
 //         //    this.destroy();
 //         //}
 //     }
 
 //     destroy() {
-//         //ll.import("GMLIB_NpcDialogueForm", "destroyForm")(this.mFormId);
+//         //ll.imports("GMLIB_NpcDialogueForm", "destroyForm")(this.mFormId);
 //     }
 // }
 

lib/GMLIB_API-JS.d.ts

@@ -183,19 +183,34 @@ export class Minecraft {
         pos: IntPos
     ): void;
 
-    /** 启用教育版内容 */
+    /** 
+     * @deprecated 已删
+     * 启用教育版内容
+     */
     static setEducationFeatureEnabled(): void;
 
-    /** 注册Ability命令 */
+    /** 
+     * @deprecated 已删
+     * 注册Ability命令
+     */
     static registerAbilityCommand(): void;
 
-    /** 启用Xbox成就 */
+    /**
+     * @deprecated 已删
+     * 启用Xbox成就
+     */
     static setEnableAchievement(): void;
 
-    /** 信任所有玩家皮肤 */
+    /** 
+     * @deprecated 已删
+     * 信任所有玩家皮肤
+     */
     static setForceTrustSkins(): void;
 
-    /** 启用资源包双端共存 */
+    /**
+     * @deprecated 已删
+     * 启用资源包双端共存
+     */
     static enableCoResourcePack(): void;
 
     /** 获取存档名称 */
@@ -206,13 +221,19 @@ export class Minecraft {
         name: string
     ): boolean;
 
-    /** 设置假种子 */
+    /**
+     * @deprecated 已删
+     * 设置假种子
+     */
     static setFakeSeed(
         /** 要设置的假种子 */
         seed: number | undefined
     ): void;
 
-    /** 启用错误方块清理 */
+    /**
+     * @deprecated 已删
+     * 启用错误方块清理
+     */
     static setUnknownBlockCleaner(): void;
 
     /** 强制生成实体 */
@@ -309,7 +330,10 @@ export class Minecraft {
     /** 移除所有虚假列表玩家 */
     static removeAllFakeLists(): boolean;
 
-    /** 启用I18n修复 */
+    /**
+     * @deprecated 已删
+     * 启用I18n修复
+     */
     static setFixI18nEnabled(): void;
 
     /** 保存NBT至文件 */
@@ -359,7 +383,7 @@ export class Minecraft {
     ): string;
 
     /** 通过附魔ID获取附魔命名空间ID */
-    static getMaxPlayers(
+    static getEnchantTypeNameFromId(
         /** 附魔ID */
         id: number
     ): string | null;
@@ -367,6 +391,14 @@ export class Minecraft {
     /** 获取最大玩家数 */
     static getMaxPlayers(): number;
 
+    /** 设置最大玩家数 */
+    static setMaxPlayers(
+        /** 最大玩家数 */
+        count: number,
+        /** 是否忽略原版限制 */
+        ignoreVanillaLimit?: boolean
+    ): void;
+
     /** 玩家是否拥有NBT */
     static hasPlayerNbt(
         /** 玩家的uuid */
@@ -1046,12 +1078,12 @@ export class UserCache {
 
     /** 获取玩家信息 */
     static getPlayerInfo(
-        /** 玩家名 或 xuid 或 uuid */
+        /** 玩家名 或 xuid 或 uuid 或 serverId 或 uniqueId */
         playerIdentifier: string
-    ): { Xuid: String, Uuid: string, Name: string } | null;
+    ): { Xuid: string, Uuid: string, Name: string, ServerId: string, ActorUniqueID: string } | null;
 
     /** 获取所有玩家信息 */
-    static getAllPlayerInfo(): { Xuid: String; Uuid: string; Name: string; }[]
+    static getAllPlayerInfo(): { Xuid: string, Uuid: string, Name: string, ServerId: string, ActorUniqueID: string }[]
 }
 
 type PacketDataItem = (
@@ -1349,161 +1381,158 @@ export class 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
+    TypeMask = 255,
+    Mob = 256,
+    PathfinderMob = 768,
+    Monster = 2816,
+    Animal = 4864,
+    TamableAnimal = 21248,
+    Ambient = 33024,
+    UndeadMob = 68352,
+    ZombieMonster = 199424,
+    Arthropod = 264960,
+    Minecart = 524288,
+    SkeletonMonster = 1116928,
+    EquineAnimal = 2118400,
+    Projectile = 4194304,
+    AbstractArrow = 8388608,
+    WaterAnimal = 8960,
+    VillagerBase = 16777984,
+    Chicken = 4874,
+    Cow = 4875,
+    Pig = 4876,
+    Sheep = 4877,
+    Wolf = 21262,
+    Villager = 16777999,
+    MushroomCow = 4880,
+    Squid = 8977,
+    Rabbit = 4882,
+    Bat = 33043,
+    IronGolem = 788,
+    SnowGolem = 789,
+    Ocelot = 21270,
+    Horse = 2118423,
+    PolarBear = 4892,
+    Llama = 4893,
+    Parrot = 21278,
+    Dolphin = 8991,
+    Donkey = 2118424,
+    Mule = 2118425,
+    SkeletonHorse = 2186010,
+    ZombieHorse = 2186011,
+    Zombie = 199456,
+    Creeper = 2849,
+    Skeleton = 1116962,
+    Spider = 264995,
+    PigZombie = 68388,
+    Slime = 2853,
+    EnderMan = 2854,
+    Silverfish = 264999,
+    CaveSpider = 265000,
+    Ghast = 2857,
+    LavaSlime = 2858,
+    Blaze = 2859,
+    ZombieVillager = 199468,
+    Witch = 2861,
+    Stray = 1116974,
+    Husk = 199471,
+    WitherSkeleton = 1116976,
+    Guardian = 2865,
+    ElderGuardian = 2866,
+    Npc = 307,
+    WitherBoss = 68404,
+    Dragon = 2869,
+    Shulker = 2870,
+    Endermite = 265015,
+    Agent = 312,
+    Vindicator = 2873,
+    Phantom = 68410,
+    IllagerBeast = 2875,
+    ArmorStand = 317,
+    TripodCamera = 318,
+    Player = 319,
+    ItemEntity = 64,
+    PrimedTnt = 65,
+    FallingBlock = 66,
+    MovingBlock = 67,
+    ExperiencePotion = 4194372,
+    Experience = 69,
+    EyeOfEnder = 70,
+    EnderCrystal = 71,
+    FireworksRocket = 72,
+    Trident = 12582985,
+    Turtle = 4938,
+    Cat = 21323,
+    ShulkerBullet = 4194380,
+    FishingHook = 77,
+    Chalkboard = 78,
+    DragonFireball = 4194383,
+    Arrow = 12582992,
+    Snowball = 4194385,
+    ThrownEgg = 4194386,
+    Painting = 83,
+    LargeFireball = 4194389,
+    ThrownPotion = 4194390,
+    Enderpearl = 4194391,
+    LeashKnot = 88,
+    WitherSkull = 4194393,
+    BoatRideable = 90,
+    WitherSkullDangerous = 4194395,
+    LightningBolt = 93,
+    SmallFireball = 4194398,
+    AreaEffectCloud = 95,
+    LingeringPotion = 4194405,
+    LlamaSpit = 4194406,
+    EvocationFang = 4194407,
+    EvocationIllager = 2920,
+    Vex = 2921,
+    MinecartRideable = 524372,
+    MinecartHopper = 524384,
+    MinecartTNT = 524385,
+    MinecartChest = 524386,
+    MinecartFurnace = 524387,
+    MinecartCommandBlock = 524388,
+    IceBomb = 4194410,
+    Balloon = 107,
+    Pufferfish = 9068,
+    Salmon = 9069,
+    Drowned = 199534,
+    Tropicalfish = 9071,
+    Fish = 9072,
+    Panda = 4977,
+    Pillager = 2930,
+    VillagerV2 = 16778099,
+    ZombieVillagerV2 = 199540,
+    Shield = 117,
+    WanderingTrader = 886,
+    Lectern = 119,
+    ElderGuardianGhost = 2936,
+    Fox = 4985,
+    Bee = 378,
+    Piglin = 379,
+    Hoglin = 4988,
+    Strider = 4989,
+    Zoglin = 68478,
+    PiglinBrute = 383,
+    Goat = 4992,
+    GlowSquid = 9089,
+    Axolotl = 4994,
+    Warden = 2947,
+    Frog = 4996,
+    Tadpole = 9093,
+    Allay = 390,
+    ChestBoatRideable = 218,
+    TraderLlama = 5021,
+    Camel = 5002,
+    Sniffer = 5003,
+    Breeze = 2956,
+    BreezeWindChargeProjectile = 4194445,
+    Armadillo = 5006,
+    WindChargeProjectile = 4194447,
+    Bogged = 1117072,
+    OminousItemSpawner = 145,
+    Creaking = 2962,
+    HappyGhast = 5011,
 }
 
 interface Player {
@@ -1556,6 +1585,9 @@ interface Player {
         slot: number
     ): Item;
 
+    /** (GMLIB & Glacie)获取客户端版本协议*/
+    getNetworkProtocolVersion(): number
+
     /** (GMLIB)发送更新更新物品数据包 */
     sendInventorySlotPacket(
         /** 容器ID */

lib/PlaceholderAPI.js

@@ -1,40 +1,58 @@
 /// <reference path='d:/dts/dts/helperlib/src/index.d.ts'/> 
 
 const getPluginName = () => {
-    try {
-        throw new Error("getPluginName");
-    } catch (error) {
-        return error.stack.trim().match(/plugins\\(.*)\\.*\.js:[0-9]+\)$/i)?.[1]
-            || error.stack.trim().match(/at <anonymous> \(([^\\|/]+)(.*?):\d+:\d+\)$/i)?.[1]
-            || "Unknown";
-    }
+    if (getPluginName.PluginNameCache) return getPluginName.PluginNameCache;
+
+    return getPluginName.PluginNameCache = (() => {
+        if (ll.getCurrentPluginInfo) return ll.getCurrentPluginInfo().name;
+
+        const error = new Error("getPluginName");
+        switch (ll.scriptEngineVersion) {
+            case "QuickJS": {
+                if (!error.stack) break;
+                const /** @type {string} */ line = error.stack.trim().split("\n").pop().trim();
+                if (line.includes("<anonymous>")) {
+                    return line.slice(
+                        line.indexOf("(") + 1,
+                        line.indexOf("\\")
+                    );
+                }
+                if (line.includes("<eval>")) {
+                    return line.slice(
+                        line.indexOf("/", line.indexOf("/") + 1) + 1,
+                        line.indexOf("\\")
+                    );
+                }
+                break;
+            }
+            case "V8 12.4.254.21-node.21": {
+                try {
+                    const selfFileName = require('path').basename(__filename);
+                    const pluginDirectory = Object.entries(
+                        require('module')._pathCache
+                    ).find(
+                        ([key, _]) => key.includes(selfFileName)
+                    )[0].split("\u0000")[1];
+                    const directories = pluginDirectory.split("\\");
+                    const pluginName = directories[directories.findIndex(value => value === "plugins") + 1].trim();
+                    if (pluginName) return pluginName;
+                } catch { }
+
+                if (!error.stack) break;
+                const /** @type {string} */ line = error.stack.trim().split("\n").pop().trim();
+                if (line.includes(".js") && /:\d+:\d+$/.test(line)) {
+                    const directories = line.split("\\");
+                    const pluginName = directories[directories.findIndex(value => value === "plugins") + 1].trim();
+                    if (pluginName) return pluginName;
+                }
+                break;
+            }
+            default: break;
+        }
+        return "Unknown";
+    })();
 };
 
-Function.prototype.getName =
-    /**
-     * 获取函数名字
-     * @returns {string}
-     */
-    function () {
-        return this.name || this.toString().match(/function\s*([^(]*)\(/)?.[1] || getStringHashCode(this.toString()).toString(16);
-    };
-
-/**
- * 获取字符串哈希值
- * @param {string} str 字符串
- * @returns {number}
- */
-function getStringHashCode(str) {
-    let hash = 0, chr;
-    if (str.length === 0) return hash;
-    for (let i = 0; i < str.length; i++) {
-        chr = str.charCodeAt(i);
-        hash = ((hash << 5) - hash) + chr;
-        hash |= 0;
-    }
-    return hash;
-}
-
 module.exports = {
     translate(value, actor = undefined, language = "") {
         return actor instanceof LLSE_Entity
@@ -46,8 +64,8 @@ module.exports = {
         ll.exports((...args) => {
             if(!args[0].uniqueId) args[0] = undefined;
             return callback(...args) ?? "<std::nullopt>";
-        }, pluginName, callback.getName());
-        ll.imports("PlaceholderAPI", "registerPlaceholder")(placeholder, callback.getName(), pluginName);
+        }, pluginName, `Placeholder_${placeholder}`);
+        ll.imports("PlaceholderAPI", "registerPlaceholder")(placeholder, `Placeholder_${placeholder}`, pluginName);
     },
     unregisterPlaceholder(placeholder) {
         return ll.imports("PlaceholderAPI", "unregisterPlaceholder")(placeholder);
@@ -56,7 +74,7 @@ module.exports = {
         return ll.imports("PlaceholderAPI", "unregisterPlaceholderFromModName")(placeholder);
     },
     getValue(placeholder, actor = undefined, params = {}, language = "") {
-        if (actor instanceof LLSE_Player) actor = ll.import("GMLib_ServerAPI", "PlayerToEntity")(actor);
+        if (actor instanceof LLSE_Player) actor = ll.imports("GMLib_ServerAPI", "PlayerToEntity")(actor);
         const result = actor instanceof LLSE_Entity
             ? ll.imports("PlaceholderAPI", "getValueFromActor")(placeholder, actor, params, language)
             : ll.imports("PlaceholderAPI", "getValue")(placeholder, params, language);

manifest.json

@@ -1,7 +1,7 @@
 {
-    "name": "${pluginName}",
-    "entry": "${pluginFile}",
-    "version": "1.0.0-rc.1",
+    "name": "${modName}",
+    "entry": "${modFile}",
+    "version": "${modVersion}",
     "author": "GroupMountain",
     "type": "native",
     "passive": true,
@@ -11,6 +11,12 @@
         },
         {
             "name": "LegacyRemoteCall"
+        },
+        {
+            "name": "iListenAttentively"
+        },
+        {
+            "name": "ModAPI"
         }
     ]
 }

scripts/after_build.lua

@@ -1,121 +0,0 @@
-function beautify_json(value, indent)
-    import("core.base.json")
-    local json_text = ""
-    local stack = {}
-
-    local function escape_str(s)
-        return string.gsub(s, '[%c\\"]', function(c)
-            local replacements = {['\b'] = '\\b', ['\f'] = '\\f', ['\n'] = '\\n', ['\r'] = '\\r', ['\t'] = '\\t', ['"'] = '\\"', ['\\'] = '\\\\'}
-            return replacements[c] or string.format('\\u%04x', c:byte())
-        end)
-    end
-
-    local function is_null(v)
-        return v == json.null
-    end
-
-    local function is_empty_table(t)
-        if type(t) ~= 'table' then return false end
-        for _ in pairs(t) do
-            return false
-        end
-        return true
-    end
-
-    local function is_array(t)
-        return type(t) == 'table' and json.is_marked_as_array(t) or #t > 0
-    end
-
-    local function serialize(val, level)
-        local spaces = string.rep(" ", level * indent)
-
-        if type(val) == "table" and not stack[val] then
-            if is_empty_table(val) then
-                json_text = json_text .. (is_array(val) and "[]" or "{}")
-                return
-            end
-
-            stack[val] = true
-            local isArray = is_array(val)
-            json_text = json_text .. (isArray and "[\n" or "{\n")
-
-            local keys = isArray and {} or {}
-            for k in pairs(val) do
-                table.insert(keys, k)
-            end
-            if not isArray then
-                table.sort(keys)
-            end
-
-            for _, k in ipairs(keys) do
-                local v = val[k]
-                json_text = json_text .. spaces .. (isArray and "" or '"' .. escape_str(tostring(k)) .. '": ')
-                serialize(v, level + 1)
-                json_text = json_text .. ",\n"
-            end
-
-            json_text = string.sub(json_text, 1, -3) .. "\n" .. string.rep(" ", (level - 1) * indent) .. (isArray and "]" or "}")
-            stack[val] = nil
-        elseif type(val) == "string" then
-            json_text = json_text .. '"' .. escape_str(val) .. '"'
-        elseif type(val) == "number" then
-            if val % 1 == 0 then
-                json_text = json_text .. tostring(math.floor(val))
-            else
-                json_text = json_text .. tostring(val)
-            end
-        elseif type(val) == "boolean" then
-            json_text = json_text .. tostring(val)
-        elseif is_null(val) then
-            json_text = json_text .. "null"
-        else
-            error("Invalid value type: " .. type(val))
-        end
-    end
-    serialize(value, 1)
-    return json_text
-end
-
-function string_formatter(str, variables)
-    return str:gsub("%${(.-)}", function(var)
-        return variables[var] or "${" .. var .. "}"
-    end)
-end
-
-function pack_plugin(target,plugin_define)
-    import("lib.detect.find_file")
-
-    local manifest_path = find_file("manifest.json", os.projectdir())
-    if manifest_path then
-        local manifest = io.readfile(manifest_path)
-        local bindir = path.join(os.projectdir(), "bin/DLL")
-        local pdbdir = path.join(os.projectdir(), "bin/PDB")
-        local outputdir = path.join(bindir, plugin_define.pluginName)
-        local targetfile = path.join(outputdir, plugin_define.pluginFile)
-        local pdbfile = path.join(pdbdir, path.basename(plugin_define.pluginFile) .. ".pdb")
-        local libfile = path.join(os.projectdir(), "lib")
-        local manifestfile = path.join(outputdir, "manifest.json")
-        local oritargetfile = target:targetfile()
-        local oripdbfile = path.join(path.directory(oritargetfile), path.basename(oritargetfile) .. ".pdb")
-
-        os.mkdir(outputdir)
-        os.cp(oritargetfile, targetfile)
-        if os.isfile(oripdbfile) then
-            os.cp(oripdbfile, pdbfile)
-        end
-        os.cp(libfile, outputdir)
-
-        formattedmanifest = string_formatter(manifest, plugin_define)
-        io.writefile(manifestfile,formattedmanifest)
-        cprint("${bright green}[Plugin Packer]: ${reset}plugin already generated to " .. outputdir)
-    else
-        cprint("${bright yellow}warn: ${reset}not found manifest.json in root dir!")
-    end
-end
-
-
-return {
-    pack_plugin = pack_plugin,
-    beautify_json = beautify_json,
-    string_formatter = string_formatter
-}

src/BinaryStreamApi.cpp

@@ -1,10 +1,8 @@
 #include "Global.h"
-#include <gmlib/mc/network/BinaryStream.h>
-#include <mc/world/item/NetworkItemStackDescriptor.h>
 
 class LegacyScriptBinaryStreamManager {
 private:
-    int64                                                           mNextBinaryStreamId = 0;
+    int64                                                       mNextBinaryStreamId = 0;
     std::unordered_map<uint64, std::shared_ptr<GMBinaryStream>> mBinaryStream;
 
 public:
@@ -15,7 +13,7 @@ public:
     uint64 copyBinaryStream(uint id) {
         auto nextId = getNextId();
         cretateBinaryStream(nextId);
-        if(auto bs = getBinaryStream(nextId); bs !=nullptr){
+        if (auto bs = getBinaryStream(nextId); bs != nullptr) {
             getBinaryStream(nextId)->mBuffer = getBinaryStream(id)->mBuffer;
         }
         return nextId;
@@ -80,6 +78,7 @@ void Export_BinaryStream_API() {
     EXPORTAPI("writeItem", ItemStack*, bs->writeNetworkItemStackDescriptor(NetworkItemStackDescriptor(*value)));
     EXPORTAPI("writeString", std::string const&, bs->writeString(value));
     EXPORTAPI("writeCompoundTag", CompoundTag*, bs->writeCompoundTag(*value));
+    EXPORTAPI("writeUnsignedChar", uchar, bs->writeUnsignedChar(value));
     EXPORTAPI2(writeBool);
     EXPORTAPI2(writeByte);
     EXPORTAPI2(writeDouble);
@@ -88,7 +87,6 @@ void Export_BinaryStream_API() {
     EXPORTAPI2(writeSignedInt);
     EXPORTAPI2(writeSignedInt64);
     EXPORTAPI2(writeSignedShort);
-    EXPORTAPI2(writeUnsignedChar);
     EXPORTAPI2(writeUnsignedInt);
     EXPORTAPI2(writeUnsignedInt64);
     EXPORTAPI2(writeUnsignedShort);

src/CompatibilityApi.cpp

@@ -1,32 +1,29 @@
 #include "Global.h"
+#include "gmlib/mc/world/actor/Player.h"
+#include "mc/platform/UUID.h"
 #include <regex>
 
 ActorUniqueID parseScriptUniqueID(std::string const& uniqueId) {
-    return StringUtils::isInteger(uniqueId) ? ActorUniqueID(std::stoll(uniqueId)) : ActorUniqueID::INVALID_ID();
+    return string_utils::isInteger(uniqueId) ? ActorUniqueID(std::stoll(uniqueId)) : ActorUniqueID::INVALID_ID();
 }
 
 void Export_Compatibility_API() {
     RemoteCall::exportAs("GMLIB_API", "unregisterRecipe", [](std::string const& id) -> bool {
-        // return GMLevel::getInstance().has_value() ? GMLIB::Mod::CustomRecipe::unregisterRecipe(id) : false;
-        throw std::runtime_error("GMLIB_API::unregisterRecipe is not implemented");
+        return CustomRecipeRegistry::getInstance().unregisterRecipe(id, true);
     });
     RemoteCall::exportAs("GMLIB_API", "setCustomPackPath", [](std::string const& path) -> void {
-        AddonsLoaderUtils::addCustomPackPath(path);
+        AddonsLoader::getInstance().addCustomPackPath(path);
     });
     RemoteCall::exportAs("GMLIB_API", "getServerMspt", []() -> double {
         return GMLevel::getInstance().transform(
-                                             [](GMLevel& level) -> double { return level.getServerMspt(); }
+                                         [](GMLevel& level) -> double { return level.getServerMspt(); }
         ).value_or(0.0);
     });
     RemoteCall::exportAs("GMLIB_API", "getServerCurrentTps", []() -> float {
-        return GMLevel::getInstance()
-            .transform([](GMLevel& level) -> float { return level.getServerCurrentTps(); })
-            .value_or(0.0);
+        return TpsStatus::getInstance().getLevelCurrentTps();
     });
     RemoteCall::exportAs("GMLIB_API", "getServerAverageTps", []() -> double {
-        return GMLevel::getInstance()
-            .transform([](GMLevel& level) -> double { return level.getServerAverageTps(); })
-            .value_or(0.0);
+        return TpsStatus::getInstance().getLevelAverageTps();
     });
     RemoteCall::exportAs("GMLIB_API", "getAllPlayerUuids", []() -> std::vector<std::string> {
         std::vector<std::string> result;
@@ -36,7 +33,7 @@ void Export_Compatibility_API() {
         return result;
     });
     RemoteCall::exportAs("GMLIB_API", "getPlayerNbt", [](std::string const& uuid) -> std::unique_ptr<CompoundTag> {
-        if (auto player = OfflinePlayer::getOfflinePlayer(mce::UUID::fromString(uuid))) {
+        if (auto player = OfflinePlayer::fromUuid(mce::UUID::fromString(uuid))) {
             return std::make_unique<CompoundTag>(*player->getNbt());
         }
         return nullptr;
@@ -45,7 +42,8 @@ void Export_Compatibility_API() {
         "GMLIB_API",
         "setPlayerNbt",
         [](std::string const& uuid, CompoundTag* nbt, bool forceCreate) -> bool {
-            if (auto player = OfflinePlayer::getOfflinePlayer(mce::UUID::fromString(uuid))) return player->setNbt(*nbt);
+            auto player = OfflinePlayer::fromUuid(mce::UUID::fromString(uuid));
+            if (player&&player->hasNbt()) return player->setNbt(*nbt);
             return forceCreate ? OfflinePlayer::createNewPlayerNbt(mce::UUID::fromString(uuid), *nbt).has_value()
                                : false;
         }
@@ -54,7 +52,7 @@ void Export_Compatibility_API() {
         "GMLIB_API",
         "setPlayerNbtTags",
         [](std::string const& uuid, CompoundTag* nbt, std::vector<std::string> tags) -> bool {
-            if (auto player = OfflinePlayer::getOfflinePlayer(mce::UUID::fromString(uuid))) {
+            if (auto player = OfflinePlayer::fromUuid(mce::UUID::fromString(uuid))) {
                 auto nbt2 = *player->getNbt();
                 GMCompoundTag::writeNbtTags(nbt2, *nbt, tags);
                 return player->setNbt(nbt2);
@@ -66,20 +64,21 @@ void Export_Compatibility_API() {
         return OfflinePlayer::deletePlayerNbt(mce::UUID::fromString(uuid));
     });
     RemoteCall::exportAs("GMLIB_API", "getAllExperiments", []() -> std::vector<int> {
-        // std::vector<int> result;
-        // for (auto& key : GMLevel::getAllExperiments()) {
-        //     result.push_back((int)key);
-        // }
-        // return result;
-        throw std::runtime_error("GMLIB_API::getAllExperiments is not implemented");
+        return {36, 45, 38, 48, 47, 53, 56, 45, 40};
     });
     RemoteCall::exportAs("GMLIB_API", "getExperimentTranslateKey", [](int id) -> std::string {
-        // std::string result;
-        // try {
-        //     result = Experiments::getExperimentTextID(AllExperiments(id));
-        // } catch (...) {}
-        // return result;
-        throw std::runtime_error("GMLIB_API::getExperimentTranslateKey is not implemented");
+        static std::unordered_map<int, std::string> mMap = {
+            {36, "createWorldScreen.experimentalbiomes"                    },
+            {45, "createWorldScreen.experimentalCreatorFeatures"           },
+            {38, "createWorldScreen.experimentalGameTest"                  },
+            {48, "createWorldScreen.experimentalThirdPersonCameras"        },
+            {47, "createWorldScreen.experimentalFocusTargetCamera"         },
+            {53, "createWorldScreen.experimentalVillagerTradesRebalance"   },
+            {56, "createWorldScreen.experimentalDataDrivenJigsawStructures"},
+            {45, "createWorldScreen.experimentalCameraAimAssist"           },
+            {40, "createWorldScreen.experimentalY2025Drop1"                }
+        };
+        return mMap.contains(id) ? mMap[id] : "";
     });
     RemoteCall::exportAs(
         "GMLIB_API",
@@ -116,7 +115,7 @@ void Export_Compatibility_API() {
         return false;
     });
     RemoteCall::exportAs("GMLIB_API", "removeFloatingTextFromPlayer", [](uint64 id, Player* pl) -> bool {
-        if (auto ft = FloatingTextManager::getInstance().get(id); !ft.expired()){
+        if (auto ft = FloatingTextManager::getInstance().get(id); !ft.expired()) {
             ft.lock()->removeFrom((GMPlayer&)*pl);
             return true;
         }
@@ -143,12 +142,17 @@ void Export_Compatibility_API() {
         }
         return false;
     });
-    RemoteCall::exportAs("GMLIB_API", "isVersionMatched", [](std::uint16_t a, std::uint16_t b, std::uint16_t c) -> bool {
-        return LIB_VERSION >= ll::data::Version(a, b, c, "", "");
-    });
+    RemoteCall::exportAs(
+        "GMLIB_API",
+        "isVersionMatched",
+        [](std::uint16_t a, std::uint16_t b, std::uint16_t c) -> bool {
+            return LIB_VERSION >= ll::data::Version(a, b, c, "", "");
+        }
+    );
     RemoteCall::exportAs("GMLIB_API", "getVersion_LRCA", []() -> std::string { return LIB_VERSION.to_string(); });
     RemoteCall::exportAs("GMLIB_API", "getVersion_GMLIB", []() -> std::string {
-        return GMLIB_VERSION_TO_STRING(GMLIB_VERSION_MAJOR) "." GMLIB_VERSION_TO_STRING(GMLIB_VERSION_MINOR
+        return GMLIB_VERSION_TO_STRING(GMLIB_VERSION_MAJOR) "." GMLIB_VERSION_TO_STRING(
+            GMLIB_VERSION_MINOR
         ) "." GMLIB_VERSION_TO_STRING(GMLIB_VERSION_PATCH);
     });
     RemoteCall::exportAs(
@@ -182,8 +186,9 @@ void Export_Compatibility_API() {
     RemoteCall::exportAs(
         "GMLIB_API",
         "updateOrCreateLanguageFile",
-        [](std::string const& code, std::unordered_map<std::string, std::string> lang, std::string const& path
-        ) -> void {
+        [](std::string const&                           code,
+           std::unordered_map<std::string, std::string> lang,
+           std::string const&                           path) -> void {
             if (GMLevel::getInstance()) {
                 I18nAPI::updateOrCreateLanguageFile(path, code, lang);
             }
@@ -195,7 +200,7 @@ void Export_Compatibility_API() {
         }
     });
     RemoteCall::exportAs("GMLIB_API", "getPlayerPosition", [](std::string const& uuid) -> std::pair<BlockPos, int> {
-        if (auto player = OfflinePlayer::getOfflinePlayer(mce::UUID::fromString(uuid))) {
+        if (auto player = OfflinePlayer::fromUuid(mce::UUID::fromString(uuid))) {
             if (auto pos = player->getPlayerPosition()) {
                 return *pos;
             }
@@ -209,8 +214,10 @@ void Export_Compatibility_API() {
         "GMLIB_API",
         "setPlayerPosition",
         [](std::string const& uuid, std::pair<BlockPos, int> pos) -> bool {
-            // return GMPlayer::setPlayerPosition(mce::UUID::fromString(uuid), pos.first, pos.second);
-            throw std::runtime_error("GMLIB_API::setPlayerPosition is not implemented");
+            if (auto player = OfflinePlayer::fromUuid(mce::UUID::fromString(uuid))) {
+                return player->setPosition(pos.first, pos.second);
+            }
+            return false;
         }
     );
     RemoteCall::exportAs("GMLIB_API", "playerHasScore", [](std::string const& uuid, std::string const& obj) -> bool {
@@ -406,7 +413,7 @@ void Export_Compatibility_API() {
             std::vector<std::unordered_map<std::string, std::string>> result;
             for (auto& player : GMScoreboard::getInstance()->getAllPlayers()) {
                 result.push_back({
-                    {"Type", "Player"       },
+                    {"Type", "Player"                   },
                     {"Uuid", player.getUUID().asString()}
                 });
             }
@@ -418,7 +425,7 @@ void Export_Compatibility_API() {
             }
             for (auto& uniqueId : GMScoreboard::getInstance()->getAllEntities()) {
                 result.push_back({
-                    {"Type",     "Entity"                   },
+                    {"Type",     "Entity"                      },
                     {"UniqueId", std::to_string(uniqueId.rawID)}
                 });
             }
@@ -435,30 +442,50 @@ void Export_Compatibility_API() {
         return ll::service::getLevel()->fetchEntity(parseScriptUniqueID(uniqueId), false);
     });
     RemoteCall::exportAs("GMLIB_API", "getWorldSpawn", []() -> std::pair<BlockPos, int> {
-        return {GMLevel::getInstance()->getLevelData().getSpawnPos(), 0};
+        constexpr static HashedString SPAWN_POS{"spawnPos"};
+        using mUnkfc867e = std::variant<
+            int,
+            bool,
+            float,
+            std::string,
+            GeneratorType,
+            GameType,
+            BlockPos,
+            LevelSeed64,
+            LevelDataValue::Tag,
+            DaylightCycle>;
+        auto& levelData = GMLevel::getInstance()->getLevelData();
+        if (auto it = levelData.mValues->find(SPAWN_POS); it != levelData.mValues->end()) {
+            if (auto value = std::get_if<BlockPos>(&it->second.mUnkfc867e.as<mUnkfc867e>()); value) {
+                return {*value, 0};
+            }
+        }
+        if (auto it = levelData.mOverrides->find(SPAWN_POS); it != levelData.mOverrides->end()) {
+            if (auto value = std::get_if<BlockPos>(&it->second.mUnkfc867e.as<mUnkfc867e>()); value) {
+                return {*value, 0};
+            }
+        }
+        return {BlockPos::ZERO(), 1};
     });
     RemoteCall::exportAs("GMLIB_API", "setWorldSpawn", [](std::pair<BlockPos, int> pos) -> bool {
         if (pos.second != 0) return false;
         GMLevel::getInstance()->getLevelData().setSpawnPos(pos.first);
-        auto pkt = SetSpawnPositionPacket();
+        auto pkt           = SetSpawnPositionPacket();
         pkt.mSpawnBlockPos = NetworkBlockPosition(pos.first);
         pkt.mDimensionType = 0;
-        pkt.mSpawnPosType = SpawnPositionType::WorldSpawn;
+        pkt.mSpawnPosType  = SpawnPositionType::WorldSpawn;
         pkt.sendToClients();
         return true;
     });
     RemoteCall::exportAs("GMLIB_API", "getPlayerSpawnPoint", [](Player* pl) -> std::pair<BlockPos, int> {
-        // auto res = ((GMPlayer*)pl)->getSpawnPoint();
-        // return {res.first, res.second};
-        throw std::runtime_error("GMLIB_API::getPlayerSpawnPoint is not implemented");
+        return {pl->mPlayerRespawnPoint->mSpawnBlockPos, pl->mPlayerRespawnPoint->mDimension.get()};
     });
     RemoteCall::exportAs("GMLIB_API", "setPlayerSpawnPoint", [](Player* pl, std::pair<BlockPos, int> pos) -> void {
-        // ((GMPlayer*)pl)->setSpawnPoint(pos.first, pos.second);
-        throw std::runtime_error("GMLIB_API::setPlayerSpawnPoint is not implemented");
+        pl->setRespawnPosition(pos.first, pos.second);
     });
     RemoteCall::exportAs("GMLIB_API", "clearPlayerSpawnPoint", [](Player* pl) -> void {
-        // ((GMPlayer*)pl)->clearSpawnPoint();
-        throw std::runtime_error("GMLIB_API::clearPlayerSpawnPoint is not implemented");
+        pl->mPlayerRespawnPoint->mSpawnBlockPos = BlockPos::MIN();
+        pl->mPlayerRespawnPoint->mDimension     = VanillaDimensions::Undefined();
     });
     RemoteCall::exportAs(
         "GMLIB_API",
@@ -471,38 +498,81 @@ void Export_Compatibility_API() {
         }
     );
     RemoteCall::exportAs("GMLIB_API", "getXuidByUuid", [](std::string const& uuid) -> std::string {
-        return UserCache::getXuidByUuid(mce::UUID::fromString(uuid)).value_or("");
+        if (auto uce = UserCache::getInstance()->from(mce::UUID::fromString(uuid))) {
+            return uce->mXuid;
+        }
+        return "";
     });
     RemoteCall::exportAs("GMLIB_API", "getXuidByName", [](std::string const& name) -> std::string {
-        return UserCache::getXuidByName(name).value_or("");
+        if (auto uce = UserCache::getInstance()->from(name, UserCache::Name)) {
+            return uce->mXuid;
+        }
+        return "";
     });
     RemoteCall::exportAs("GMLIB_API", "getNameByUuid", [](std::string const& uuid) -> std::string {
-        return UserCache::getNameByUuid(mce::UUID::fromString(uuid)).value_or("");
+        if (auto uce = UserCache::getInstance()->from(mce::UUID::fromString(uuid))) {
+            return uce->mName;
+        }
+        return "";
     });
     RemoteCall::exportAs("GMLIB_API", "getNameByXuid", [](std::string const& xuid) -> std::string {
-        return UserCache::getNameByXuid(xuid).value_or("");
+        if (auto uce = UserCache::getInstance()->from(xuid, UserCache::Xuid)) {
+            return uce->mName;
+        }
+        return "";
     });
     RemoteCall::exportAs("GMLIB_API", "getUuidByXuid", [](std::string const& xuid) -> std::string {
-        return UserCache::getUuidByXuid(xuid)
-            .transform([](mce::UUID&& uuid) -> std::string { return uuid.asString(); })
-            .value_or("");
+        if (auto uce = UserCache::getInstance()->from(xuid, UserCache::Xuid)) {
+            return uce->mUuid.asString();
+        }
+        return "";
     });
     RemoteCall::exportAs("GMLIB_API", "getUuidByName", [](std::string const& name) -> std::string {
-        return UserCache::getUuidByName(name)
-            .transform([](mce::UUID&& uuid) -> std::string { return uuid.asString(); })
-            .value_or("");
+        if (auto uce = UserCache::getInstance()->from(name, UserCache::Name)) {
+            return uce->mUuid.asString();
+        }
+        return "";
     });
+    RemoteCall::exportAs(
+        "GMLIB_API",
+        "getPlayerInfo",
+        [](std::string const& info) -> std::unordered_map<std::string, std::string> {
+            // TODO: 下个GMLIB更新直接改成from(info, UserCache::QueryType::All)
+            std::unordered_map<std::string, std::string> result;
+            if (auto uce = UserCache::getInstance()->from(mce::UUID::fromString(info))) {
+                ll::reflection::forEachMember(*uce, [&](std::string_view name, auto&& member) {
+                    result[std::string{name.substr(1)}] = fmt::to_string(member);
+                });
+                return result;
+            }
+            if (auto uniqeuId = ll::string_utils::svtoll(info); uniqeuId) {
+                if (auto uce = UserCache::getInstance()->from(ActorUniqueID{*uniqeuId})) {
+                    ll::reflection::forEachMember(*uce, [&](std::string_view name, auto&& member) {
+                        result[std::string{name.substr(1)}] = fmt::to_string(member);
+                    });
+                    return result;
+                }
+            }
+            if (auto uce = UserCache::getInstance()->from(info, UserCache::Default)) {
+                ll::reflection::forEachMember(*uce, [&](std::string_view name, auto&& member) {
+                    result[std::string{name.substr(1)}] = fmt::to_string(member);
+                });
+                return result;
+            }
+            return result;
+        }
+    );
     RemoteCall::exportAs(
         "GMLIB_API",
         "getAllPlayerInfo",
         []() -> std::vector<std::unordered_map<std::string, std::string>> {
             std::vector<std::unordered_map<std::string, std::string>> result;
-            for (auto entry : UserCache::entries()){
-                result.push_back({
-                    {"Name", entry.mName           },
-                    {"Xuid", entry.mXuid           },
-                    {"Uuid", entry.mUuid.asString()}
+            for (auto& entry : UserCache::getInstance()->entries()) {
+                std::unordered_map<std::string, std::string> item;
+                ll::reflection::forEachMember(entry, [&](std::string_view name, auto&& member) {
+                    item[std::string{name.substr(1)}] = fmt::to_string(member);
                 });
+                result.emplace_back(std::move(item));
             }
             return result;
         }
@@ -513,7 +583,7 @@ void Export_Compatibility_API() {
             .value_or(0);
     });
     RemoteCall::exportAs("GMLIB_API", "getBlockTranslateKey", [](Block const* block) -> std::string {
-        return block->getLegacyBlock().mDescriptionId;
+        return block->mBlockType->mDescriptionId.get() + ".name";
     });
     RemoteCall::exportAs("GMLIB_API", "getItemTranslateKey", [](ItemStack* item) -> std::string {
         return item->getDescriptionId();
@@ -539,11 +609,10 @@ void Export_Compatibility_API() {
         }
     );
     RemoteCall::exportAs("GMLIB_API", "getBlockDestroySpeed", [](Block const* block) -> float {
-        return block->mDirectData->mUnkc08fbd.as<float>();
+        return block->mDirectData->mDestroySpeed;
     });
     RemoteCall::exportAs("GMLIB_API", "getDestroyBlockSpeed", [](ItemStack const* item, Block const* block) -> float {
-        // return item->getDestroySpeed(*block);
-        throw std::runtime_error("GMLIB_API::getDestroyBlockSpeed is not implemented");
+        return item->getItem()->getDestroySpeed(*item, *block);
     });
     RemoteCall::exportAs(
         "GMLIB_API",
@@ -553,8 +622,8 @@ void Export_Compatibility_API() {
         }
     );
     RemoteCall::exportAs("GMLIB_API", "itemCanDestroyBlock", [](ItemStack const* item, Block const* block) -> bool {
-        return std::ranges::any_of(item->mCanDestroy, [block](BlockLegacy const* blockLegacy) {
-            return block->getTypeName() == blockLegacy->getTypeName();
+        return std::ranges::any_of(item->mCanDestroy, [block](BlockType const* blockLegacy) {
+            return blockLegacy && block->getTypeName() == blockLegacy->getTypeName();
         });
     });
     RemoteCall::exportAs("GMLIB_API", "itemCanDestroyInCreative", [](ItemStack const* item) -> bool {
@@ -564,25 +633,28 @@ void Export_Compatibility_API() {
         return false;
     });
     RemoteCall::exportAs("GMLIB_API", "itemCanDestroySpecial", [](ItemStack const* item, Block const* block) -> bool {
-        // return item->canDestroySpecial(*block);
-        throw std::runtime_error("GMLIB_API::itemCanDestroySpecial is not implemented");
+        if (auto itemDef = item->getItem(); itemDef) {
+            return itemDef->canDestroySpecial(*block);
+        }
+        return false;
     });
     RemoteCall::exportAs("GMLIB_API", "blockCanDropWithAnyTool", [](Block const* block) -> bool {
-        return !block->getLegacyBlock().mRequiresCorrectToolForDrops;
+        return !block->mBlockType->mRequiresCorrectToolForDrops;
     });
     RemoteCall::exportAs(
         "GMLIB_API",
         "blockPlayerWillDestroy",
         [](Block const* block, Player* player, std::pair<BlockPos, int> pos) -> bool {
-            return block->getLegacyBlock().playerWillDestroy(*player, pos.first, *block);
+            return block->mBlockType->playerWillDestroy(*player, pos.first, *block);
         }
     );
     RemoteCall::exportAs("GMLIB_API", "playerAttack", [](Player* player, Actor* entity) -> bool {
         return player->attack(*entity, SharedTypes::Legacy::ActorDamageCause::EntityAttack);
     });
-    RemoteCall::exportAs("GMLIB_API", "playerPullInEntity", [](Player* player, Actor* entity) -> bool {
-        // return player->pullInEntity(*entity);
-        throw std::runtime_error("GMLIB_API::playerPullInEntity is not implemented");
+    RemoteCall::exportAs("GMLIB_API", "playerPullInEntity", [](Player* player, Actor* entity) -> void {
+        if (auto component = player->getEntityContext().tryGetComponent<RideableComponent>()) {
+            component->pullInEntity(*player, *entity);
+        }
     });
     RemoteCall::exportAs("GMLIB_API", "getBlockTranslateKeyFromName", [](std::string const& blockName) -> std::string {
         return Block::tryGetFromRegistry(blockName)
@@ -594,7 +666,7 @@ void Export_Compatibility_API() {
         "getBlockLightEmission",
         [](std::string const& blockName, short legacyData) -> char {
             return Block::tryGetFromRegistry(blockName)
-                .transform([](const Block& block) -> char { return block.mDirectData->mUnkda4e0e.as<char>(); })
+                .transform([](const Block& block) -> char { return block.mDirectData->mLightEmission->mValue; })
                 .value_or(-1);
         }
     );
@@ -607,23 +679,23 @@ void Export_Compatibility_API() {
                 switch (gameRule.mType) {
                 case GameRule::Type::Bool:
                     result.push_back({
-                        {"Name",  gameRule.mName                },
-                        {"Type",  "Bool"                            },
-                        {"Value", std::to_string(gameRule.mValue->mUnk29fff1.as<bool>())}
+                        {"Name",  gameRule.mName                                 },
+                        {"Type",  "Bool"                                         },
+                        {"Value", std::to_string(std::get<bool>(*gameRule.mValue))}
                     });
                     break;
                 case GameRule::Type::Float:
                     result.push_back({
-                        {"Name",  gameRule.mName                 },
-                        {"Type",  "Float"                            },
-                        {"Value", std::to_string(gameRule.mValue->mUnk768db5.as<float>())}
+                        {"Name",  gameRule.mName                                  },
+                        {"Type",  "Float"                                         },
+                        {"Value", std::to_string(std::get<float>(*gameRule.mValue))}
                     });
                     break;
                 case GameRule::Type::Int:
                     result.push_back({
-                        {"Name",  gameRule.mName               },
-                        {"Type",  "Int"                            },
-                        {"Value", std::to_string(gameRule.mValue->mUnk2ab4f3.as<int>())}
+                        {"Name",  gameRule.mName                                },
+                        {"Type",  "Int"                                         },
+                        {"Value", std::to_string(std::get<int>(*gameRule.mValue))}
                     });
                     break;
                 case GameRule::Type::Invalid:
@@ -634,7 +706,7 @@ void Export_Compatibility_API() {
         }
     );
     RemoteCall::exportAs("GMLIB_API", "getEnchantTypeNameFromId", [](size_t id) -> std::string {
-        if (id < Enchant::mEnchants().size()){
+        if (id < Enchant::mEnchants().size()) {
             return Enchant::mEnchants()[id]->mStringId->getString();
         }
         return "";
@@ -651,9 +723,7 @@ void Export_Compatibility_API() {
             );
         }
     );
-    RemoteCall::exportAs("GMLIB_API", "removeEnchants", [](ItemStack* item) -> void {
-        item->removeEnchants();
-    });
+    RemoteCall::exportAs("GMLIB_API", "removeEnchants", [](ItemStack* item) -> void { (void)item->removeEnchants(); });
     RemoteCall::exportAs("GMLIB_API", "hasEnchant", [](ItemStack* item, std::string const& typeName) -> bool {
         return EnchantUtils::hasEnchant(Enchant::mEnchantNameToType()[HashedString(typeName)], *item);
     });
@@ -693,10 +763,10 @@ void Export_Compatibility_API() {
     RemoteCall::exportAs("GMLIB_API", "setItemShouldKeepOnDeath", [](ItemStack const* item, bool value) -> void {
         auto nbt = ((GMItemStack*)item)->getNbt();
         if (value) {
-            (*nbt)["tags"]["minecraft:keep_on_death"] = true;
-        }else{
-            if (nbt->contains("tags") && (*nbt)["tags"].contains("minecraft:keep_on_death")){
-                (*nbt)["tags"].get<CompoundTag>().erase("minecraft:keep_on_death");
+            (*nbt)["tag"]["minecraft:keep_on_death"] = true;
+        } else {
+            if (nbt->contains("tag") && (*nbt)["tag"].contains("minecraft:keep_on_death")) {
+                (*nbt)["tag"].get<CompoundTag>().erase("minecraft:keep_on_death");
             }
         }
         ((GMItemStack*)item)->setNbt(*nbt);
@@ -724,9 +794,9 @@ void Export_Compatibility_API() {
         "GMLIB_API",
         "setItemCanDestroy",
         [](ItemStack const* item, std::vector<std::string> blocks) -> void {
-            std::vector<const BlockLegacy*> data;
+            std::vector<const BlockType*> data;
             for (auto& name : blocks) {
-                if (auto block = BlockLegacy::tryGetFromRegistry(name)) {
+                if (auto block = BlockType::tryGetFromRegistry(name)) {
                     data.push_back(block.as_ptr());
                 }
             }
@@ -744,9 +814,9 @@ void Export_Compatibility_API() {
         "GMLIB_API",
         "setItemCanPlaceOn",
         [](ItemStack const* item, std::vector<std::string> blocks) -> void {
-            std::vector<const BlockLegacy*> data;
+            std::vector<const BlockType*> data;
             for (auto& name : blocks) {
-                if (auto block = BlockLegacy::tryGetFromRegistry(name)) {
+                if (auto block = BlockType::tryGetFromRegistry(name)) {
                     data.push_back(block.as_ptr());
                 }
             }
@@ -754,7 +824,7 @@ void Export_Compatibility_API() {
         }
     );
     RemoteCall::exportAs("GMLIB_API", "getPlayerHungry", [](Player* player) -> float {
-        return player->getMutableAttribute(Player::HUNGER()).mInstance->mCurrentValue;
+        return player->getAttribute(Player::HUNGER()).mPtr->mCurrentValue;
     });
     RemoteCall::exportAs("GMLIB_API", "getPlayerArmorCoverPercentage", [](Player* player) -> float {
         return player->getArmorCoverPercentage();
@@ -766,7 +836,7 @@ void Export_Compatibility_API() {
         return entity->getOwnerId().rawID;
     });
     RemoteCall::exportAs("GMLIB_API", "getItemCategoryName", [](ItemStack const* item) -> std::string {
-        if (auto item2 = item->mItem){
+        if (auto item2 = item->mItem) {
             return item2->buildCategoryDescriptionName();
         }
         return "";
@@ -774,9 +844,9 @@ void Export_Compatibility_API() {
     RemoteCall::exportAs("GMLIB_API", "getItemCustomName", [](ItemStack const* item) -> std::string {
         return item->getCustomName();
     });
-    RemoteCall::exportAs("GMLIB_API", "getItemEffecName", [](ItemStack const* item) -> std::string {
-        if (auto item2 = item->mItem){
-            return item2->buildEffectDescriptionName(*item);
+    RemoteCall::exportAs("GMLIB_API", "getItemEffecName", [](ItemStack const* item, bool playerIsCreative) -> std::string {
+        if (auto item2 = item->mItem) {
+            return item2->buildEffectDescriptionName(*item, playerIsCreative);
         }
         return "";
     });
@@ -803,7 +873,9 @@ void Export_Compatibility_API() {
         return magic_enum::enum_name(container->mContainerType).data();
     });
     RemoteCall::exportAs("GMLIB_API", "hasPlayerNbt", [](std::string const& uuid) -> bool {
-        return OfflinePlayer::getOfflinePlayer(mce::UUID::fromString(uuid)).transform([&](auto&& player) -> bool { return player.hasNbt(); }).value_or(false);
+        return OfflinePlayer::fromUuid(mce::UUID::fromString(uuid))
+            .transform([&](auto&& player) -> bool { return player.hasNbt(); })
+            .value_or(false);
     });
     RemoteCall::exportAs("GMLIB_API", "getItemMaxCount", [](ItemStack const* item) -> int {
         return item->getMaxStackSize();
@@ -814,36 +886,39 @@ void Export_Compatibility_API() {
     RemoteCall::exportAs("GMLIB_API", "getPlayerDestroyBlockProgress", [](Player* player, Block const* block) -> float {
         return player->getDestroyProgress(*block);
     });
+
+    static constexpr size_t effectMaxCount = 36;
+
     RemoteCall::exportAs("GMLIB_API", "getEntityEffectVisible", [](Actor* entity, int effectId) -> bool {
-        if (effectId < 0 || !MobEffect::mMobEffects()[effectId]) return false;
+        if (effectId <= 0 || effectId > effectMaxCount || !MobEffect::mMobEffects()[effectId]) return false;
         if (auto effect = entity->getEffect(*MobEffect::mMobEffects()[effectId])) {
             return effect->mEffectVisible;
         }
-        return 0;
+        return false;
     });
     RemoteCall::exportAs("GMLIB_API", "getEntityEffectDuration", [](Actor* entity, int effectId) -> int {
-        if (effectId < 0 || !MobEffect::mMobEffects()[effectId]) return false;
+        if (effectId <= 0  || effectId > effectMaxCount|| !MobEffect::mMobEffects()[effectId]) return false;
         if (auto effect = entity->getEffect(*MobEffect::mMobEffects()[effectId])) {
             return effect->mDuration->mValue;
         }
         return 0;
     });
     RemoteCall::exportAs("GMLIB_API", "getEntityEffectDurationEasy", [](Actor* entity, int effectId) -> int {
-        if (effectId < 0 || !MobEffect::mMobEffects()[effectId]) return false;
+        if (effectId <= 0 || effectId > effectMaxCount || !MobEffect::mMobEffects()[effectId]) return false;
         if (auto effect = entity->getEffect(*MobEffect::mMobEffects()[effectId])) {
             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 (effectId < 0 || !MobEffect::mMobEffects()[effectId]) return false;
+        if (effectId <= 0 || effectId > effectMaxCount || !MobEffect::mMobEffects()[effectId]) return false;
         if (auto effect = entity->getEffect(*MobEffect::mMobEffects()[effectId])) {
             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 (effectId < 0 || !MobEffect::mMobEffects()[effectId]) return false;
+        if (effectId <= 0  || effectId > effectMaxCount|| !MobEffect::mMobEffects()[effectId]) return false;
         if (auto effect = entity->getEffect(*MobEffect::mMobEffects()[effectId])) {
             return effect->mDurationNormal->transform(
                                               [](auto&& duration) -> int { return duration.mValue; }
@@ -852,21 +927,23 @@ void Export_Compatibility_API() {
         return 0;
     });
     RemoteCall::exportAs("GMLIB_API", "getEntityEffectAmplifier", [](Actor* entity, int effectId) -> int {
-        if (effectId < 0 || !MobEffect::mMobEffects()[effectId]) return false;
+        if (effectId <= 0 || effectId > effectMaxCount || !MobEffect::mMobEffects()[effectId]) return false;
         if (auto effect = entity->getEffect(*MobEffect::mMobEffects()[effectId])) {
             return effect->mAmplifier;
         }
         return 0;
     });
     RemoteCall::exportAs("GMLIB_API", "getEntityEffectAmbient", [](Actor* entity, int effectId) -> bool {
-        if (effectId < 0 || !MobEffect::mMobEffects()[effectId]) return false;
+        if (effectId <= 0 || effectId > effectMaxCount || !MobEffect::mMobEffects()[effectId]) return false;
         if (auto effect = entity->getEffect(*MobEffect::mMobEffects()[effectId])) {
             return effect->mAmbient;
         }
-        return 0;
+        return false;
     });
     RemoteCall::exportAs("GMLIB_API", "entityHasEffect", [](Actor* entity, int effectId) -> bool {
-        return effectId > 0x24 ? false : entity->hasEffect(*MobEffect::mMobEffects()[effectId]);
+        return effectId <= 0 || effectId > effectMaxCount || !MobEffect::mMobEffects()[effectId]
+                 ? false
+                 : entity->hasEffect(*MobEffect::mMobEffects()[effectId]);
     });
     RemoteCall::exportAs("GMLIB_API", "getGameDifficulty", []() -> int {
         return ll::service::getLevel().transform(
@@ -892,20 +969,16 @@ void Export_Compatibility_API() {
         "GMLIB_API",
         "registerCustomShapelessRecipe",
         [](std::string const& recipe_id, std::vector<std::string> ingredients, ItemStack* result) -> void {
-            // if (!GMLevel::getInstance().has_value()) return;
-            // std::vector<Recipes::Type> types;
-            // char                       rt = 'A';
-            // for (auto& ing : ingredients) {
-            //     auto ingredient = RecipeIngredient{ing, 0,1};
-            //     types.push_back(Recipes::Type{
-            //         (Item*)ingredient.getItem(),
-            //         ingredient.getBlock(),
-            //         ingredient,
-            //         rt++
-            //     });
-            // }
-            // GMLIB::Mod::CustomRecipe::registerShapelessCraftingTableRecipe(recipe_id, types, *result);
-            throw std::runtime_error("GMLIB_API::registerCustomShapelessRecipe is not implemented");
+            if (!GMLevel::getInstance().has_value()) return;
+            std::vector<ICustomRecipe::Ingredient> types;
+            for (auto& ing : ingredients) {
+                types.push_back(ICustomRecipe::Ingredient{ing});
+            }
+            CustomRecipeRegistry::getInstance().registerShapelessRecipe(
+                recipe_id,
+                types,
+                ItemInstance(*result->getItem(), result->mCount, result->mAuxValue, result->mUserData.get())
+            );
         }
     );
     RemoteCall::exportAs(
@@ -948,9 +1021,15 @@ void Export_Compatibility_API() {
         return entity->isType((ActorType)type);
     });
     RemoteCall::exportAs("GMLIB_API", "entityHasType", [](Actor* entity, int type) -> bool {
-        return entity->hasType((ActorType)type);
+        if (auto component = entity->mEntityContext->tryGetComponent<ActorTypeComponent>(); component) {
+            return (type & std::to_underlying(component->mType)) == type;
+        }
+        return false;
     });
     RemoteCall::exportAs("GMLIB_API", "getEntityTypeId", [](Actor* entity) -> int {
         return (int)entity->getEntityTypeId();
     });
+    RemoteCall::exportAs("GMLIB_API", "getPlayerProtocolVersion", [](Player* player) -> int {
+        return ((GMPlayer*)player)->getNetworkProtocolVersion();
+    });
 }

src/Entry.cpp

@@ -9,11 +9,12 @@ LegacyRemoteCallApi& LegacyRemoteCallApi::getInstance() {
 }
 
 bool LegacyRemoteCallApi::load() {
+    (void)CustomRecipeRegistry::getInstance();
     Export_Legacy_GMLib_ModAPI();
     Export_Legacy_GMLib_ServerAPI();
     Export_Compatibility_API();
     ExportPAPI();
-    // Export_Event_API();
+    Export_Event_API();
     Export_BinaryStream_API();
     // Export_Form_API();
     auto logger = ll::io::LoggerRegistry::getInstance().getOrCreate(PLUGIN_NAME);
@@ -21,7 +22,7 @@ bool LegacyRemoteCallApi::load() {
     logger->info(
         "Loaded Version: {} with {}",
         fmt::format(fg(fmt::color::pink), "GMLIB-" GMLIB_FILE_VERSION_STRING),
-        fmt::format(fg(fmt::color::light_green), "GMLIB-LegacyRemoteCallApi-" + LIB_VERSION.to_string())
+        fmt::format(fg(fmt::color::light_green), "GMLIB-LegacyRemoteCallApi-{}", LIB_VERSION.to_string())
     );
     logger->info("Author: GroupMountain");
     logger->info("Repository: https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi");
@@ -40,3 +41,5 @@ LL_REGISTER_MOD(gmlib::LegacyRemoteCallApi, gmlib::LegacyRemoteCallApi::getInsta
 ll::thread::ThreadPoolExecutor const& getThreadPoolExecutor() {
     return gmlib::LegacyRemoteCallApi::getInstance().getThreadPoolExecutor();
 }
+
+ll::io::Logger& getLogger() { return gmlib::LegacyRemoteCallApi::getInstance().getSelf().getLogger(); }

src/EventAPI.cpp

@@ -88,10 +88,7 @@ void Export_Event_API() {
                      std::string const& uuid,
                      std::string const& serverXuid,
                      std::string const& clientXuid),
-                    (event.realName(),
-                     event.uuid().asString(),
-                     event.serverAuthXuid(),
-                     event.clientAuthXuid()),
+                    (event.realName(), event.uuid().asString(), event.serverAuthXuid(), event.clientAuthXuid()),
                     if (result) event.disConnectClient();
                 );
             }
@@ -116,12 +113,10 @@ void Export_Event_API() {
                 );
             }
             case doHash("gmlib::MobPickupItemBeforeEvent"): {
-                REGISTER_EVENT_LISTEN(
-                    ila::mc::ActorPickupItemBeforeEvent,
-                    (Actor * mob, Actor * item, bool isCancelled),
-                    (&event.self(), (Actor*)&event.itemActor(), event.isCancelled()),
-                    event.setCancelled(result);
-                );
+                REGISTER_EVENT_LISTEN(ila::mc::ActorPickupItemBeforeEvent,
+                                      (Actor * mob, Actor * item, bool isCancelled),
+                                      (&event.self(), (Actor*)&event.itemActor(), event.isCancelled()),
+                                      event.setCancelled(result););
             }
             case doHash("gmlib::MobPickupItemAfterEvent"): {
                 REGISTER_EVENT_LISTEN(
@@ -146,19 +141,17 @@ void Export_Event_API() {
                 REGISTER_EVENT_LISTEN(
                     ila::mc::SpawnItemActorAfterEvent,
                     (Actor * item, std::pair<Vec3, int> position, int64 spawnerUniqueId),
-                    (event.itemActor(),
+                    (&event.itemActor(),
                      {event.pos(), event.blockSource().getDimensionId().id},
                      event.spawner() ? event.spawner()->getOrCreateUniqueID().rawID : -1),
                     ,
                 );
             }
             case doHash("gmlib::ActorChangeDimensionBeforeEvent"): {
-                REGISTER_EVENT_LISTEN(
-                    ila::mc::ActorChangeDimensionBeforeEvent,
-                    (Actor * entity, int toDimId, bool isCancelled),
-                    (&event.self(), event.toDimensionId(), event.isCancelled()),
-                    event.setCancelled(result);
-                );
+                REGISTER_EVENT_LISTEN(ila::mc::ActorChangeDimensionBeforeEvent,
+                                      (Actor * entity, int toDimId, bool isCancelled),
+                                      (&event.self(), event.toDimensionId(), event.isCancelled()),
+                                      event.setCancelled(result););
             }
             case doHash("gmlib::ActorChangeDimensionAfterEvent"): {
                 REGISTER_EVENT_LISTEN(
@@ -168,38 +161,36 @@ void Export_Event_API() {
                     ,
                 );
             }
-            // case doHash("gmlib::PlayerStartSleepBeforeEvent"): {
-            //     REGISTER_EVENT_LISTEN(
-            //         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::PlayerStartSleepBeforeEvent"): {
+                REGISTER_EVENT_LISTEN(ila::mc::PlayerStartSleepBeforeEvent,
+                                      (Player * entity, BlockPos pos, bool isCancelled),
+                                      (&event.self(), event.pos(), event.isCancelled()),
+                                      event.setCancelled(result););
+            }
+            case doHash("gmlib::PlayerStartSleepAfterEvent"): {
+                REGISTER_EVENT_LISTEN(
+                    ila::mc::PlayerStartSleepAfterEvent,
+                    (Player * entity, BlockPos pos, int result),
+                    (&event.self(), event.pos(), (int)event.result()),
+                    ,
+                );
+            }
+            case doHash("gmlib::PlayerStopSleepBeforeEvent"): {
+                REGISTER_EVENT_LISTEN(
+                    ila::mc::PlayerStopSleepBeforeEvent,
+                    (Player * entity, bool forcefulWakeUp, bool updateLevelList, bool isCancelled),
+                    (&event.self(), event.forcefulWakeUp(), event.updateLevelList(), false),
+
+                );
+            }
+            case doHash("gmlib::PlayerStopSleepAfterEvent"): {
+                REGISTER_EVENT_LISTEN(
+                    ila::mc::PlayerStopSleepAfterEvent,
+                    (Player * entity, bool forcefulWakeUp, bool updateLevelList, bool),
+                    (&event.self(), event.forcefulWakeUp(), event.updateLevelList(), false),
+                    ,
+                );
+            }
             case doHash("gmlib::DeathMessageAfterEvent"): {
                 REGISTER_EVENT_LISTEN(
                     ila::mc::DeathMessageAfterEvent,
@@ -208,144 +199,119 @@ void Export_Event_API() {
                     ,
                 );
             }
-            // case doHash("gmlib::MobHurtAfterEvent"): {
-            //     REGISTER_EVENT_LISTEN(
-            //         GMLIB::Event::EntityEvent::MobHurtAfterEvent,
-            //         (Actor * mob, Actor * source, float damage, int cause),
-            //         (&event.self(), source, -event.getDamage(), (int)damageSource.getCause()),
-            //         ,
-            //         auto& damageSource = event.getSource();
-            //         Actor* source      = nullptr;
-            //         if (damageSource.isEntitySource()) {
-            //             auto uniqueId = damageSource.getDamagingEntityUniqueID();
-            //             source        = ll::service::getLevel()->fetchEntity(uniqueId, false);
-            //             if (source->getOwner()) source = source->getOwner();
-            //         }
-            //     );
-            // }
-            case doHash("gmlib::EndermanTakeBlockBeforeEvent"): {
+            case doHash("gmlib::MobHurtAfterEvent"): {
                 REGISTER_EVENT_LISTEN(
-                    ila::mc::EndermanTakeBlockBeforeEvent,
-                    (Actor * mob, bool isCancelled),
-                    (&event.self(), event.isCancelled()),
-                    event.setCancelled(result);
+                    ila::mc::MobHealthChangeAfterEvent,
+                    (Actor * mob, Actor * source, float damage, int cause),
+                    (&event.self(), source, event.oldValue() - event.newValue(), (int)damageSource->mCause),
+                    ,
+                    if (event.newValue() > event.oldValue()) return;
+                    auto& damageSource = event.buff().mSource;
+                    Actor* source      = nullptr;
+                    if (damageSource->isEntitySource()) {
+                        auto uniqueId = damageSource->getDamagingEntityUniqueID();
+                        source        = ll::service::getLevel()->fetchEntity(uniqueId, false);
+                        if (source->getOwner()) source = source->getOwner();
+                    }
                 );
             }
+            case doHash("gmlib::EndermanTakeBlockBeforeEvent"): {
+                REGISTER_EVENT_LISTEN(ila::mc::MobTakeBlockBeforeEvent,
+                                      (Actor * mob, bool isCancelled),
+                                      (&event.self(), event.isCancelled()),
+                                      event.setCancelled(result);
+                                      , if (!event.self().isType(ActorType::EnderMan)) return;);
+            }
             case doHash("gmlib::DragonRespawnBeforeEvent"): {
-                REGISTER_EVENT_LISTEN(
-                    ila::mc::DragonRespawnBeforeEvent,
-                    (bool isCancelled),
-                    (event.isCancelled()),
-                    event.setCancelled(result);
-                );
+                REGISTER_EVENT_LISTEN(ila::mc::DragonRespawnBeforeEvent,
+                                      (bool isCancelled),
+                                      (event.isCancelled()),
+                                      event.setCancelled(result););
             }
             case doHash("gmlib::DragonRespawnAfterEvent"): {
+                REGISTER_EVENT_LISTEN(ila::mc::DragonRespawnAfterEvent, (Actor * mob), (&event.self()), );
+            }
+            case doHash("gmlib::ProjectileCreateBeforeEvent"): {
+                REGISTER_EVENT_LISTEN(ila::mc::ProjectileCreateBeforeEvent,
+                                      (Actor * mob, int64 uniqueId, bool isCancelled),
+                                      (&event.self(), event.self().getOwnerId().rawID, event.isCancelled()),
+                                      event.setCancelled(result););
+            }
+            case doHash("gmlib::ProjectileCreateAfterEvent"): {
                 REGISTER_EVENT_LISTEN(
-                    ila::mc::DragonRespawnAfterEvent,
-                    (Actor * mob),
-                    (&event.self()),
+                    ila::mc::ProjectileCreateAfterEvent,
+                    (Actor * mob, int64 uniqueId),
+                    (&event.self(), event.self().getOwnerId().rawID),
                 );
             }
-            // case doHash("gmlib::ProjectileCreateBeforeEvent"): {
-            //     REGISTER_EVENT_LISTEN(
-            //         ila::mc::ProjectileCreateBeforeEvent,
-            //         (Actor * mob, int64 uniqueId, bool isCancelled),
-            //         (&event.self(),
-            //          event.getShooter() ? event.getShooter()->getOrCreateUniqueID().rawID : -1,
-            //          event.isCancelled()),
-            //         event.setCancelled(result);
-            //     );
-            // }
-            // case doHash("gmlib::ProjectileCreateAfterEvent"): {
-            //     REGISTER_EVENT_LISTEN(
-            //         GMLIB::Event::EntityEvent::ProjectileCreateAfterEvent,
-            //         (Actor * mob, int64 uniqueId),
-            //         (&event.self(), event.getShooter() ? event.getShooter()->getOrCreateUniqueID().rawID : -1),
-            //     );
-            // }
             case doHash("gmlib::SpawnWanderingTraderBeforeEvent"): {
+                REGISTER_EVENT_LISTEN(ila::mc::SpawnWanderingTraderBeforeEvent,
+                                      (std::pair<BlockPos, int> pos, bool isCancelled),
+                                      ({event.pos(), event.blockSource().getDimensionId()}, event.isCancelled()),
+                                      event.setCancelled(result););
+            }
+            case doHash("gmlib::HandleRequestActionBeforeEvent"): {
+                // clang-format off
+                    REGISTER_EVENT_LISTEN(
+                        ila::mc::PlayerRequestItemActionBeforeEvent,
+                        (
+                            Player *           player,
+                            std::string const& actionType,
+                            int                count,
+                            std::string const& sourceContainerNetId,
+                            int                sourceSlot,
+                            std::string const& destinationContainerNetId,
+                            int                destinationSlot,
+                            bool               isCancelled
+                        ),
+                        (
+                            (Player*)&event.self(),
+                            magic_enum::enum_name(event.actionType()).data(),
+                            event.amount(),
+                            magic_enum::enum_name(event.src().mFullContainerName.mName).data(),
+                            (int)event.src().mSlot,
+                            magic_enum::enum_name(event.dst().mFullContainerName.mName).data(),
+                            (int)event.dst().mSlot,
+                            event.isCancelled()
+                        ),
+                        event.setCancelled(result);,
+                    );
+                // clang-format on
+            }
+            case doHash("gmlib::HandleRequestActionAfterEvent"): {
+                // clang-format off
+                        REGISTER_EVENT_LISTEN(
+                            ila::mc::PlayerRequestItemActionAfterEvent,
+                            (
+                                Player *           player,
+                                std::string const& actionType,
+                                int                count,
+                                std::string const& sourceContainerNetId,
+                                int                sourceSlot,
+                                std::string const& destinationContainerNetId,
+                                int                destinationSlot
+                            ),
+                            (
+                                (Player*)&event.self(),
+                                magic_enum::enum_name(event.actionType()).data(),
+                                event.amount(),
+                                magic_enum::enum_name(event.src().mFullContainerName.mName).data(),
+                                (int)event.src().mSlot,
+                                magic_enum::enum_name(event.dst().mFullContainerName.mName).data(),
+                                (int)event.dst().mSlot
+                            ),
+                            ,
+                        );
+                // clang-format on
+            }
+            case doHash("gmlib::ContainerClosePacketSendAfterEvent"): {
                 REGISTER_EVENT_LISTEN(
-                    ila::mc::SpawnWanderingTraderBeforeEvent,
-                    (std::pair<BlockPos, int> pos, bool isCancelled),
-                    ({event.pos(), event.blockSource().getDimensionId()}, event.isCancelled()),
-                    event.setCancelled(result);
+                    ila::mc::PlayerCloseContainerAfterEvent,
+                    (Player * player, int containerId, bool serverInitiatedClose, bool),
+                    (&event.self(), (int)event.containerId(), event.serverInitiatedClose(), false),
+                    ,
                 );
             }
-            case doHash("gmlib::SpawnWanderingTraderAfterEvent"): {
-                REGISTER_EVENT_LISTEN(
-                    ila::mc::SpawnWanderingTraderAfterEvent,
-                    (std::pair<BlockPos, int> pos),
-                    ({event.pos(), event.blockSource().getDimensionId()}),
-                );
-            }
-            // case doHash("gmlib::HandleRequestActionBeforeEvent"): {
-            //     // clang-format off
-            //         REGISTER_EVENT_LISTEN(
-            //             GMLIB::Event::PlayerEvent::HandleRequestActionBeforeEvent,
-            //             (
-            //                 Player *           player,
-            //                 std::string const& actionType,
-            //                 int                count,
-            //                 std::string const& sourceContainerNetId,
-            //                 int                sourceSlot,
-            //                 std::string const& destinationContainerNetId,
-            //                 int                destinationSlot,
-            //                 bool               isCancelled
-            //             ),
-            //             (
-            //                 (Player*)&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,
-            //                 event.isCancelled()
-            //             ),
-            //             event.setCancelled(result);,
-            //             auto& requestAction = (ItemStackRequestActionTransferBase&)event.getRequestAction();
-            //         );
-            //     // clang-format on
-            // }
-            // 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
-            //             ),
-            //             (
-            //                 (Player*)&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::PacketEvent::ContainerClosePacketSendAfterEvent,
-            //         (Player * player, int containerId, bool serverInitiatedClose, bool),
-            //         (event.getServerNetworkHandler()
-            //              ._getServerPlayer(event.getNetworkIdentifier(), event.getPacket().mClientSubId),
-            //          (int)event.getPacket().mContainerId,
-            //          event.getPacket().mServerInitiatedClose,
-            //          false),
-            //         ,
-            //     );
-            // }
             }
             return -1;
         }

src/Global.h

@@ -1,18 +1,30 @@
 #pragma once
 // clang-format off
-#define GMLIB_Gloabl_Using
-#include <gmlib/GlobalUsing.h>
-#include <gmlib/include_all.h>
+#pragma warning(push)
+#pragma warning(disable : 4996)
+#pragma include_alias("mc/world/item/HumanoidArmorItem.h", "modapi/item/types/mc/HumanoidArmorItem.h")
+#include <gmlib/include_ll.h>
+#include <gmlib/include_lib.h>
+#include <gmlib/include_mc.h>
 #include <ila/include_all.h>
+#include <modapi/addons/AddonsLoader.h>
+#include <modapi/recipe/CustomRecipeRegistry.h>
+#include <modapi/item/CustomItemRegistry.h>
 #include <RemoteCallAPI.h>
+using namespace gmlib;
+using namespace gmlib::ui;
+using namespace gmlib::i18n;
+using namespace gmlib::memory;
+using namespace modapi;
+#pragma warning(pop)
 // clang-format on
 
 #define PLUGIN_NAME fmt::format(fg(fmt::color::light_green), "GMLIB-LRCA")
 
 #define LIB_VERSION_MAJOR    1
-#define LIB_VERSION_MINOR    0
-#define LIB_VERSION_PATCH    0
-#define LIB_VERSION_PRERELEASE "rc.1"
+#define LIB_VERSION_MINOR    7
+#define LIB_VERSION_PATCH    1
+#define LIB_VERSION_PRERELEASE std::nullopt
 
 #ifdef LIB_VERSION_PRERELEASE
 #define LIB_VERSION ll::data::Version(LIB_VERSION_MAJOR, LIB_VERSION_MINOR, LIB_VERSION_PATCH, LIB_VERSION_PRERELEASE)
@@ -27,4 +39,21 @@ extern void                                  ExportPAPI();
 extern void                                  Export_Event_API();
 extern void                                  Export_BinaryStream_API();
 extern ll::thread::ThreadPoolExecutor const& getThreadPoolExecutor();
+extern ll::io::Logger&                       getLogger();
 // extern void Export_Form_API();
+
+
+template <>
+struct fmt::formatter<ActorUniqueID> : fmt::formatter<int64> {
+    template <class FormatContext>
+    auto format(ActorUniqueID const& t, FormatContext& ctx) const {
+        return formatter<int64>::format(t.rawID, ctx);
+    }
+};
+template <>
+struct fmt::formatter<mce::UUID> : fmt::formatter<std::string> {
+    template <class FormatContext>
+    auto format(mce::UUID const& t, FormatContext& ctx) const {
+        return formatter<std::string>::format(t.asString(), ctx);
+    }
+};

src/LegacyModApi.cpp

@@ -1,12 +1,10 @@
 #include "Global.h"
-#include <gmlib/mc/world/Level.h>
-#include <mc/world/item/crafting/RecipeIngredient.h>
 
-std::unordered_set<std::string> HardCodedKeys = {"AlwaysUnlocked", "PlayerHasManyItems", "PlayerInWater", "None"};
-
-std::variant<std::string, std::vector<RecipeIngredient>> makeRecipeUnlockingKey(std::string const& key) {
-    if (HardCodedKeys.count(key)) return key;
-    return std::vector<RecipeIngredient>({RecipeIngredient(key, 0, 1)});
+ICustomRecipe::UnlockingRequirement makeRecipeUnlockingKey(std::string const& key) {
+    if (auto context = magic_enum::enum_cast<RecipeUnlockingContext>(key)) {
+        return ICustomRecipe::UnlockingRequirement(*context);
+    }
+    return ICustomRecipe::UnlockingRequirement({ICustomRecipe::Ingredient(key)});
 }
 
 void Export_Legacy_GMLib_ModAPI() {
@@ -19,18 +17,13 @@ void Export_Legacy_GMLib_ModAPI() {
            std::string const&       result,
            int                      count,
            std::string const&       unlock) -> void {
-            // if (!GMLIB_Level::getInstance().has_value()) return;
-            // std::vector<RecipeIngredient> types;
-            // for (auto ing : ingredients) {
-            //     types.emplace_back(ing, 0, 1);
-            // }
-            // GMLIB::Mod::JsonRecipe::registerShapelessCraftingTableRecipe(
-            //     recipe_id,
-            //     types,
-            //     RecipeIngredient(result, 0, count),
-            //     makeRecipeUnlockingKey(unlock)
-            // );
-            throw std::runtime_error("GMLib_ModAPI::registerShapelessRecipe is not implemented");
+            if (!GMLevel::getInstance().has_value()) return;
+            std::vector<ICustomRecipe::Ingredient> types;
+            for (auto& ing : ingredients) {
+                types.emplace_back(ICustomRecipe::Ingredient{ing, 1});
+            }
+            CustomRecipeRegistry::getInstance()
+                .registerShapelessRecipe(recipe_id, types, ItemInstance(result, count), makeRecipeUnlockingKey(unlock));
         }
     );
     RemoteCall::exportAs(
@@ -42,19 +35,19 @@ void Export_Legacy_GMLib_ModAPI() {
            std::string const&       result,
            int                      count,
            std::string const&       unlock) -> void {
-            // if (!GMLIB_Level::getInstance().has_value()) return;
-            // std::vector<RecipeIngredient> types;
-            // for (auto ing : ingredients) {
-            //     types.push_back(RecipeIngredient(ing, 0, 1));
-            // }
-            // GMLIB::Mod::JsonRecipe::registerShapedCraftingTableRecipe(
-            //     recipe_id,
-            //     shape,
-            //     types,
-            //     RecipeIngredient(result, 0, count),
-            //     makeRecipeUnlockingKey(unlock)
-            // );
-            throw std::runtime_error("GMLib_ModAPI::registerShapedRecipe is not implemented");
+            if (!GMLevel::getInstance().has_value()) return;
+            ICustomShapedRecipe::ShapedIngredients types;
+            char                                   index = 'A';
+            for (auto& ing : ingredients) {
+                types.add(std::string(1, index++), ICustomRecipe::Ingredient{ing});
+            }
+            CustomRecipeRegistry::getInstance().registerShapedRecipe(
+                recipe_id,
+                shape,
+                types,
+                ItemInstance(result, count),
+                makeRecipeUnlockingKey(unlock)
+            );
         }
     );
     RemoteCall::exportAs(
@@ -64,14 +57,9 @@ void Export_Legacy_GMLib_ModAPI() {
            std::string const&       input,
            std::string const&       output,
            std::vector<std::string> tags) -> void {
-            // if (!GMLIB_Level::getInstance().has_value()) return;
-            // GMLIB::Mod::JsonRecipe::registerFurnaceRecipe(
-            //     recipe_id,
-            //     RecipeIngredient(input, 0, 1),
-            //     RecipeIngredient(output, 0, 1),
-            //     tags
-            // );
-            throw std::runtime_error("GMLib_ModAPI::registerFurnaceRecipe is not implemented");
+            if (!GMLevel::getInstance().has_value()) return;
+            CustomRecipeRegistry::getInstance()
+                .registerFurnaceRecipe(ICustomRecipe::Ingredient{input}, ItemInstance{output}, tags);
         }
     );
     RemoteCall::exportAs(
@@ -79,10 +67,12 @@ 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_Level::getInstance().has_value()) return;
-            // GMLIB::Mod::JsonRecipe::registerBrewingMixRecipe(recipe_id, input, output, RecipeIngredient(reagent, 0,
-            // 1));
-            throw std::runtime_error("GMLib_ModAPI::registerBrewingMixRecipe is not implemented");
+            if (!GMLevel::getInstance().has_value()) return;
+            CustomRecipeRegistry::getInstance().registerBrewingRecipe(
+                ICustomRecipe::Ingredient{input},
+                ICustomRecipe::Ingredient{reagent},
+                ICustomRecipe::Ingredient{output}
+            );
         }
     );
     RemoteCall::exportAs(
@@ -90,14 +80,12 @@ 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_Level::getInstance().has_value()) return;
-            // GMLIB::Mod::JsonRecipe::registerBrewingContainerRecipe(
-            //     recipe_id,
-            //     RecipeIngredient(input, 0, 1),
-            //     RecipeIngredient(output, 0, 1),
-            //     RecipeIngredient(reagent, 0, 1)
-            // );
-            throw std::runtime_error("GMLib_ModAPI::registerBrewingContainerRecipe is not implemented");
+            if (!GMLevel::getInstance().has_value()) return;
+            CustomRecipeRegistry::getInstance().registerBrewingRecipe(
+                ICustomRecipe::Ingredient{input},
+                ICustomRecipe::Ingredient{reagent},
+                ICustomRecipe::Ingredient{output}
+            );
         }
     );
     RemoteCall::exportAs(
@@ -108,15 +96,14 @@ void Export_Legacy_GMLib_ModAPI() {
            std::string const& base,
            std::string const& addition,
            std::string const& result) -> void {
-            // if (!GMLIB_Level::getInstance().has_value()) return;
-            // GMLIB::Mod::JsonRecipe::registerSmithingTransformRecipe(
-            //     recipe_id,
-            //     smithing_template,
-            //     base,
-            //     addition,
-            //     result
-            // );
-            throw std::runtime_error("GMLib_ModAPI::registerSmithingTransformRecipe is not implemented");
+            if (!GMLevel::getInstance().has_value()) return;
+            CustomRecipeRegistry::getInstance().registerSmithingTransformRecipe(
+                recipe_id,
+                ICustomRecipe::Ingredient{smithing_template},
+                ICustomRecipe::Ingredient{base},
+                ICustomRecipe::Ingredient{addition},
+                ItemInstance{result}
+            );
         }
     );
     RemoteCall::exportAs(
@@ -126,9 +113,13 @@ void Export_Legacy_GMLib_ModAPI() {
            std::string const& smithing_template,
            std::string const& base,
            std::string const& addition) -> void {
-            // if (!GMLIB_Level::getInstance().has_value()) return;
-            // GMLIB::Mod::JsonRecipe::registerSmithingTrimRecipe(recipe_id, smithing_template, base, addition);
-            throw std::runtime_error("GMLib_ModAPI::registerSmithingTrimRecipe is not implemented");
+            if (!GMLevel::getInstance().has_value()) return;
+            CustomRecipeRegistry::getInstance().registerSmithingTrimRecipe(
+                recipe_id,
+                ICustomRecipe::Ingredient{smithing_template},
+                ICustomRecipe::Ingredient{base},
+                ICustomRecipe::Ingredient{addition}
+            );
         }
     );
     RemoteCall::exportAs(
@@ -140,19 +131,17 @@ void Export_Legacy_GMLib_ModAPI() {
            std::string const& output,
            int                output_data,
            int                output_count) -> void {
-            // if (!GMLIB_Level::getInstance().has_value()) return;
-            // GMLIB::Mod::JsonRecipe::registerStoneCutterRecipe(
-            //     recipe_id,
-            //     RecipeIngredient(input, 0, 1),
-            //     RecipeIngredient(output, 0, 1)
-            // );
-            throw std::runtime_error("GMLib_ModAPI::registerStoneCutterRecipe is not implemented");
+            if (!GMLevel::getInstance().has_value()) return;
+            CustomRecipeRegistry::getInstance().registerStoneCutterRecipe(
+                recipe_id,
+                ICustomRecipe::Ingredient{input, 1, input_data},
+                {output, output_count, output_data}
+            );
         }
     );
     // 错误方块清理
     RemoteCall::exportAs("GMLib_ModAPI", "setUnknownBlockCleaner", []() -> void {
-        // GMLIB::Mod::VanillaFix::setAutoCleanUnknownBlockEnabled();
-        throw std::runtime_error("GMLib_ModAPI::setUnknownBlockCleaner is not implemented");
+        getLogger().error("setUnknownBlockCleaner is not implemented");
     });
     // 实验性
     RemoteCall::exportAs("GMLib_ModAPI", "registerExperimentsRequire", [](int experiment_id) -> void {
@@ -172,8 +161,5 @@ void Export_Legacy_GMLib_ModAPI() {
             .transform([&](GMLevel& level) { return level.getExperimentEnabled((AllExperiments)experiment_id); })
             .value_or(false);
     });
-    RemoteCall::exportAs("GMLib_ModAPI", "setFixI18nEnabled", []() -> void {
-        // GMLIB::Mod::VanillaFix::setFixI18nEnabled();
-        throw std::runtime_error("GMLib_ModAPI::setFixI18nEnabled is not implemented");
-    });
+    RemoteCall::exportAs("GMLib_ModAPI", "setFixI18nEnabled", []() -> void {});
 }

src/LegacyServerApi.cpp

@@ -2,24 +2,19 @@
 
 void Export_Legacy_GMLib_ServerAPI() {
     RemoteCall::exportAs("GMLib_ServerAPI", "setEducationFeatureEnabled", []() -> void {
-        // GMLIB_Level::tryEnableEducationEdition();
-        throw std::runtime_error("GMLib_ServerAPI::setEducationFeatureEnabled is not implemented");
+        getLogger().error("GMLib_ServerAPI::setEducationFeatureEnabled is not implemented");
     });
     RemoteCall::exportAs("GMLib_ServerAPI", "registerAbilityCommand", []() -> void {
-        // GMLIB_Level::tryRegisterAbilityCommand();
-        throw std::runtime_error("GMLib_ServerAPI::registerAbilityCommand is not implemented");
+        getLogger().error("GMLib_ServerAPI::registerAbilityCommand is not implemented");
     });
     RemoteCall::exportAs("GMLib_ServerAPI", "setEnableAchievement", []() -> void {
-        // GMLIB_Level::setForceAchievementsEnabled();
-        throw std::runtime_error("GMLib_ServerAPI::setEnableAchievement is not implemented");
+        getLogger().error("GMLib_ServerAPI::setEnableAchievement is not implemented");
     });
     RemoteCall::exportAs("GMLib_ServerAPI", "setForceTrustSkins", []() -> void {
-        // GMLIB_Level::trustAllSkins();
-        throw std::runtime_error("GMLib_ServerAPI::setForceTrustSkins is not implemented");
+        getLogger().error("GMLib_ServerAPI::setForceTrustSkins is not implemented");
     });
     RemoteCall::exportAs("GMLib_ServerAPI", "enableCoResourcePack", []() -> void {
-        // GMLIB_Level::requireServerResourcePackAndAllowClientResourcePack();
-        throw std::runtime_error("GMLib_ServerAPI::enableCoResourcePack is not implemented");
+        getLogger().error("GMLib_ServerAPI::enableCoResourcePack is not implemented");
     });
     RemoteCall::exportAs("GMLib_ServerAPI", "getLevelName", []() -> std::string {
         return GMLevel::getInstance().transform(
@@ -37,8 +32,7 @@ void Export_Legacy_GMLib_ServerAPI() {
             .value_or("");
     });
     RemoteCall::exportAs("GMLib_ServerAPI", "setFakeSeed", [](int64_t seed) -> void {
-        // return GMLIB_Level::setFakeSeed(seed);
-        throw std::runtime_error("GMLib_ServerAPI::setFakeSeed is not implemented");
+        getLogger().error("GMLib_ServerAPI::setFakeSeed is not implemented");
     });
     RemoteCall::exportAs(
         "GMLib_ServerAPI",
@@ -76,7 +70,7 @@ void Export_Legacy_GMLib_ServerAPI() {
         }
     );
     RemoteCall::exportAs("GMLib_ServerAPI", "removeFakeList", [](const std::string& nameOrXuid) -> bool {
-        PlayerListAPI::resetListName(nameOrXuid);
+        PlayerListAPI::erase(nameOrXuid);
         return true;
     });
     RemoteCall::exportAs("GMLib_ServerAPI", "removeAllFakeList", []() -> void { PlayerListAPI::clear(); });
@@ -85,4 +79,9 @@ void Export_Legacy_GMLib_ServerAPI() {
                                          [](GMLevel& level) -> int { return level.getMaxPlayerCount(); }
         ).value_or(0);
     });
+    RemoteCall::exportAs("GMLib_ServerAPI", "setMaxPlayers", [&](int count, bool ignoreVanillaLimit) {
+        if (auto level = GMLevel::getInstance(); level) {
+            level->setMaxPlayerCount(count, ignoreVanillaLimit);
+        }
+    });
 }

src/PlaceholderApi.cpp

@@ -2,10 +2,12 @@
 #include <regex>
 
 namespace PAPIRemoteCall {
-std::string GetValue(std::string const& from) { return PlaceholderAPI::getValue(from, std::nullopt).value_or(""); }
+std::string GetValue(std::string const& from) {
+    return PlaceholderAPI::getInstance().getValue(from, std::nullopt).value_or("");
+}
 
 std::string GetValueWithPlayer(std::string const& key, Player* player) {
-    return PlaceholderAPI::getValue(key, (GMActor*)player).value_or("");
+    return PlaceholderAPI::getInstance().getValue(key, (GMActor*)player).value_or("");
 }
 
 void registerPlayerPlaceholder(
@@ -15,21 +17,26 @@ void registerPlayerPlaceholder(
 ) {
     if (!RemoteCall::hasFunc(PluginName, FuncName)) return;
     auto func = [=]() -> void {
-        PlaceholderAPI::unregisterPlaceholder(PAPIName);
+        PlaceholderAPI::getInstance().unregisterPlaceholder(PAPIName);
         std::weak_ptr mod = ll::mod::ModManagerRegistry::getInstance().getMod(PluginName);
         if (mod.expired()) return;
-        PlaceholderAPI::registerPlaceholder(
+        PlaceholderAPI::getInstance().registerPlaceholder(
             PAPIName,
             [Call = RemoteCall::importAs<std::string(Player * pl, std::unordered_map<std::string, std::string>)>(
                  PluginName,
                  FuncName
-             )](optional_ref<GMActor> actor, std::unordered_map<std::string, std::string> const& params, auto&&...
+             )](optional_ref<Actor> actor, ll::SmallStringMap<std::string> const& params, auto&&...
             ) -> std::optional<std::string> {
                 if (actor.has_value() && ((Actor*)actor.as_ptr())->isPlayer()) {
-                    return Call((Player*)actor.as_ptr(), params);
+                    std::unordered_map<std::string, std::string> paramMap;
+                    for (auto& [key, val] : params) {
+                        paramMap[key] = val;
+                    }
+                    return Call((Player*)actor.as_ptr(), paramMap);
                 }
                 return std::nullopt;
             },
+            false,
             mod
         );
     };
@@ -47,16 +54,22 @@ void registerServerPlaceholder(
 ) {
     if (!RemoteCall::hasFunc(PluginName, FuncName)) return;
     auto func = [=]() -> void {
-        PlaceholderAPI::unregisterPlaceholder(PAPIName);
+        PlaceholderAPI::getInstance().unregisterPlaceholder(PAPIName);
         std::weak_ptr mod = ll::mod::ModManagerRegistry::getInstance().getMod(PluginName);
         if (mod.expired()) return;
-        PlaceholderAPI::registerPlaceholder(
+        PlaceholderAPI::getInstance().registerPlaceholder(
             PAPIName,
             [Call = RemoteCall::importAs<std::string(std::unordered_map<std::string, std::string>)>(
                  PluginName,
                  FuncName
-             )](auto, std::unordered_map<std::string, std::string> const& params, auto&&...
-            ) -> std::optional<std::string> { return Call(params); },
+             )](auto, ll::SmallStringMap<std::string> const& params, auto&&...) -> std::optional<std::string> {
+                std::unordered_map<std::string, std::string> paramMap;
+                for (auto& [key, val] : params) {
+                    paramMap[key] = val;
+                }
+                return Call(paramMap);
+            },
+            false,
             mod
         );
     };
@@ -75,13 +88,14 @@ void registerStaticPlaceholder(
 ) {
     if (!RemoteCall::hasFunc(PluginName, FuncName)) return;
     auto func = [=]() -> void {
-        PlaceholderAPI::unregisterPlaceholder(PAPIName);
+        PlaceholderAPI::getInstance().unregisterPlaceholder(PAPIName);
         std::weak_ptr mod = ll::mod::ModManagerRegistry::getInstance().getMod(PluginName);
         if (mod.expired()) return;
-        PlaceholderAPI::registerPlaceholder(
+        PlaceholderAPI::getInstance().registerPlaceholder(
             PAPIName,
             [Call = RemoteCall::importAs<std::string()>(PluginName, FuncName)](auto&&...
             ) -> std::optional<std::string> { return Call(); },
+            false,
             mod
         );
     };
@@ -93,16 +107,18 @@ void registerStaticPlaceholder(
 }
 
 std::string translateStringWithPlayer(std::string const& str, Player* pl) {
-    return PlaceholderAPI::translate(str, (GMActor*)pl);
+    return PlaceholderAPI::getInstance().translate(str, (GMActor*)pl);
 }
 
-std::string translateString(std::string const& str) { return PlaceholderAPI::translate(str, std::nullopt); }
+std::string translateString(std::string const& str) {
+    return PlaceholderAPI::getInstance().translate(str, std::nullopt);
+}
 
-bool unRegisterPlaceholder(std::string const& str) { return PlaceholderAPI::unregisterPlaceholder(str); }
+bool unRegisterPlaceholder(std::string const& str) { return PlaceholderAPI::getInstance().unregisterPlaceholder(str); }
 
 std::vector<std::string> getAllPAPI() {
     std::vector<std::string> result;
-    for (auto& papi : PlaceholderAPI::getAllPlaceholderData()) {
+    for (auto& papi : PlaceholderAPI::getInstance().getAllPlaceholderData()) {
         result.push_back(papi.first);
     }
     return result;
@@ -112,28 +128,32 @@ std::vector<std::string> getAllPAPI() {
 
 namespace NewPapiRemoteCall {
 std::string translate(std::string const& value, std::string const& language) {
-    return PlaceholderAPI::translate(value, std::nullopt, language);
+    return PlaceholderAPI::getInstance().translate(value, std::nullopt, language);
 }
 std::string translateFromActor(std::string const& value, Actor* actor, std::string const& language) {
-    return PlaceholderAPI::translate(value, (GMActor*)actor, language);
+    return PlaceholderAPI::getInstance().translate(value, (GMActor*)actor, language);
 }
 void registerPlaceholder(std::string const& placeholder, std::string const& funcName, std::string const& pluginName) {
     if (!RemoteCall::hasFunc(pluginName, funcName)) return;
     auto func = [=]() -> void {
         if (std::weak_ptr mod = ll::mod::ModManagerRegistry::getInstance().getMod(pluginName); !mod.expired()) {
-            PlaceholderAPI::unregisterPlaceholder(placeholder);
-            PlaceholderAPI::registerPlaceholder(
+            PlaceholderAPI::getInstance().unregisterPlaceholder(placeholder);
+            PlaceholderAPI::getInstance().registerPlaceholder(
                 placeholder,
                 [Call = RemoteCall::importAs<
                      std::string(Actor*, std::unordered_map<std::string, std::string>, std::string)>(
                      pluginName,
                      funcName
-                 )](optional_ref<GMActor>                               actor,
-                    std::unordered_map<std::string, std::string> const& params,
-                    std::string const&                                  language) -> std::optional<std::string> {
-                    auto result = Call((Actor*)actor.as_ptr(), params, language);
+                 )](optional_ref<Actor> actor, ll::SmallStringMap<std::string> const& params, std::string const& language
+                ) -> std::optional<std::string> {
+                    std::unordered_map<std::string, std::string> paramMap;
+                    for (auto& [key, val] : params) {
+                        paramMap[key] = val;
+                    }
+                    auto result = Call((Actor*)actor.as_ptr(), paramMap, language);
                     return result == "<std::nullopt>" ? std::nullopt : std::optional(result);
                 },
+                false,
                 mod
             );
         }
@@ -145,19 +165,25 @@ void registerPlaceholder(std::string const& placeholder, std::string const& func
     }
 }
 bool unregisterPlaceholder(std::string const& placeholder) {
-    return PlaceholderAPI::unregisterPlaceholder(placeholder);
+    return PlaceholderAPI::getInstance().unregisterPlaceholder(placeholder);
 }
 bool unregisterPlaceholderFromModName(std::string const& pluginName) {
     std::weak_ptr plugin = ll::mod::ModManagerRegistry::getInstance().getMod(pluginName);
     if (plugin.expired()) return false;
-    return PlaceholderAPI::unregisterPlaceholder(plugin);
+    return PlaceholderAPI::getInstance().unregisterPlaceholder(plugin);
 }
 std::string getValue(
     std::string const&                           placeholder,
     std::unordered_map<std::string, std::string> params,
     std::string const&                           language
 ) {
-    return PlaceholderAPI::getValue(placeholder, std::nullopt, params, language).value_or("<std::nullopt>");
+    ll::SmallStringMap<std::string> paramMap;
+    for (auto& [key, val] : params) {
+        paramMap[key] = val;
+    }
+    return PlaceholderAPI::getInstance()
+        .getValue(placeholder, std::nullopt, paramMap, language)
+        .value_or("<std::nullopt>");
 }
 std::string getValueFromActor(
     std::string const&                           placeholder,
@@ -165,7 +191,13 @@ std::string getValueFromActor(
     std::unordered_map<std::string, std::string> params,
     std::string const&                           language
 ) {
-    return PlaceholderAPI::getValue(placeholder, (GMActor*)actor, params, language).value_or("<std::nullopt>");
+    ll::SmallStringMap<std::string> paramMap;
+    for (auto& [key, val] : params) {
+        paramMap[key] = val;
+    }
+    return PlaceholderAPI::getInstance()
+        .getValue(placeholder, (GMActor*)actor, paramMap, language)
+        .value_or("<std::nullopt>");
 }
 } // namespace NewPapiRemoteCall
 

tooth.json

@@ -2,7 +2,7 @@
     "format_version": 3,
     "format_uuid": "289f771f-2c9a-4d73-9f3f-8492495a924d",
     "tooth": "github.com/GroupMountain/GMLIB-LegacyRemoteCallApi",
-    "version": "1.0.0-rc.1",
+    "version": "1.9.0",
     "info": {
         "name": "GMLIB-LegacyRemoteCallApi",
         "description": "Legacy RemoteCall API for GMLIB",
@@ -19,14 +19,16 @@
         {
             "platform": "win-x64",
             "dependencies": {
-                "github.com/LiteLDev/LeviLamina": ">=1.1.1",
-                "github.com/GroupMountain/GMLIB-Release": ">=1.0.0-rc.3"
+                "github.com/LiteLDev/LeviLamina": ">=1.7.0",
+                "github.com/GroupMountain/GMLIB-Release": ">=1.7.0",
+                "github.com/GroupMountain/ModAPI-Release": ">=0.3.0",
+                "github.com/MiracleForest/iListenAttentively-Release": ">=0.10.0"
             },
             "assets": [
                 {
                     "type": "zip",
                     "urls": [
-                        "https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi/releases/download/v$(version)/GMLIB-LegacyRemoteCallApi-windows-x64.zip"
+                        "https://{{tooth}}/releases/download/v{{version}}/GMLIB-LegacyRemoteCallApi-windows-x64.zip"
                     ],
                     "placements": [
                         {

xmake.lua

@@ -8,22 +8,25 @@ if not has_config("vs_runtime") then
     set_runtimes("MD")
 end
 
-add_requires("levilamina", {configs = {target_type = "server"}})
+add_requires("levilamina 050b392575227db10340075328e833c1a0f41e27", {configs = {target_type = "server"}})
 add_requires("legacyremotecall")
-add_requires("gmlib")
-add_requires("levibuildscript")
-add_requires("ilistenattentively")
+add_requires("levibuildscript 0.6.0")
+add_requires("ilistenattentively 0.11.0")
+add_requires("gmlib 1.9.0")
+add_requires("modapi 0.4.0")
 
 target("GMLIB-LegacyRemoteCallApi")
     add_cxflags(
         "/EHa",
-        "/utf-8"
+        "/utf-8",
+        "/bigobj"
     )
     add_defines(
         "NOMINMAX",
         "UNICODE", 
         "_HAS_CXX23=1"
     )
+    add_defines("LL_PLAT_S")  --TODO: check client compatibility
     add_files(
         "src/**.cpp"
     )
@@ -33,22 +36,20 @@ target("GMLIB-LegacyRemoteCallApi")
     add_packages(
         "levilamina",
         "legacyremotecall",
+        "ilistenattentively",
         "gmlib",
-        "ilistenattentively"
+        "modapi"
     )
     add_rules("@levibuildscript/linkrule")
+    add_rules("@levibuildscript/modpacker")
     set_exceptions("none")
     set_kind("shared")
     set_languages("cxx20")
     set_symbols("debug")
-
     after_build(function (target)
-        local plugin_packer = import("scripts.after_build")
-
-        local plugin_define = {
-            pluginName = target:name(),
-            pluginFile = path.filename(target:targetfile()),
-        }
-        
-        plugin_packer.pack_plugin(target,plugin_define)
+        local target_path = path.join("bin", target:name(), "lib")
+        if os.exists(target_path) then 
+            os.rm(target_path)
+        end
+        os.cp("lib", target_path)
     end)