feat: add entity management form

feat: adapt to gmlib 1.5.0

.clangd

@@ -1,5 +1,23 @@
 Diagnostics:
-  Suppress: ["-Wmicrosoft-enum-forward-reference", "-Wc++11-narrowing", "-Wc++2b-extensions", "-Wmicrosoft-cast"]
+  Suppress:
+    - "-Wmicrosoft-enum-forward-reference"
+    - "-Wc++11-narrowing"
+    - "-Wc++2b-extensions"
+    - "-Wmicrosoft-cast"
+    - "-Wcxx20_deducing_this"
+    - "-Wundefined_internal_type"
+    - "-Wincomplete_member_access"
+    - "-Wsizeof_alignof_incomplete_or_sizeless_type"
+    - "-Wexplicit_spec_non_template"
+    - "-Wovl_no_viable_function_in_init"
 CompileFlags:
-  Add: ["-ferror-limit=0", "-D__FUNCTION__=\"dummy\"", "-D_CRT_USE_BUILTIN_OFFSETOF", "-std:c++latest"]
-  Remove: ["/Yu_HeaderOutputPredefine.h", "/FI_HeaderOutputPredefine.h"]
+  Add:
+    - "-Xclang"
+    - "-triple=x86_64-windows-msvc"
+    - "-ferror-limit=0"
+    - '-D__FUNCTION__="dummy"'
+    - "-Dnsel_CONFIG_SELECT_EXPECTED=nsel_EXPECTED_NONSTD"
+    - "-Xclang"
+    - "-std=c++23"
+  Remove:
+    - "-std"

.github/workflows/build.yml

@@ -15,6 +15,8 @@ jobs:
       - uses: actions/checkout@v4
 
       - uses: xmake-io/github-action-setup-xmake@v1
+        with:
+          xmake-version: 3.0.0
           
       - run: |
           xmake repo -u
@@ -25,7 +27,7 @@ jobs:
       - run: |
           xmake -w -y
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ github.event.repository.name }}-windows-x64-${{ github.sha }}
           path: |

.github/workflows/release.yml

@@ -15,6 +15,8 @@ jobs:
       - uses: actions/checkout@v4
 
       - uses: xmake-io/github-action-setup-xmake@v1
+        with:
+          xmake-version: 3.0.0
           
       - run: |
           xmake repo -u
@@ -25,7 +27,7 @@ jobs:
       - run: |
           xmake -w -y
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ github.event.repository.name }}-windows-x64-${{ github.sha }}
           path: |
@@ -40,7 +42,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: ${{ github.event.repository.name }}-windows-x64-${{ github.sha }}
           path: release/

.gitignore

@@ -6,3 +6,5 @@
 /compile_commands.json
 /CMakeLists.txt
 /.vscode
+/.idea
+github_mirror.lua

README.md

@@ -1,6 +1,117 @@
 # Cleaner
 服务器实体清理插件
 
+## 配置文件
+```jsonc
+{
+    "version": 2, // 配置文件版本(勿动)
+    "language": "zh_CN", // 语言(目前支持zh_CN和en_US)
+    "Basic": { // 基础配置
+        "Command": "cleaner", // 清理命令
+        "Notice1": 20, // 提示1发送时间(剩余时间) (单位:秒)
+        "Notice2": 5, // 提示2发送时间(剩余时间) (单位:秒)
+        "ConsoleLog": true, // 是否在控制台输出清理日志
+        "SendBroadcast": true, // 是否发送广播
+        "SendToast": true // 是否发送Toast(屏幕上方)
+    },
+    "IgnoreTags": [ // 忽略的实体标签
+        "ignore",
+        "不清理"
+    ],
+    "AutoCleanCount": { // 自动清理数量配置
+        "Enabled": true, // 是否启用
+        "TriggerCount": 900 // 触发清理最低数量
+    },
+    "AutoCleanTPS": { // 自动清理TPS配置
+        "Enabled": true, // 是否启用
+        "TriggerTPS": 15 // 触发清理最低TPS
+    },
+    "ItemDespawn": { // 掉落物自然刷新配置
+        "Enabled": true, // 是否启用
+        "DespawnTime": 6000, // 刷新时间(单位:tick)
+        "WhiteList": [ // 白名单
+            "minecraft:elytra"
+        ]
+    },
+    "CleanInanimate": { // 非生物实体清理配置
+        "Enabled": true, // 是否启用
+        "Blacklist": [ // 黑名单
+            "minecraft:xp_orb",
+            "minecraft:arrow",
+            "minecraft:fireball",
+            "minecraft:small_fireball",
+            "minecraft:wither_skull",
+            "minecraft:wither_skull_dangerous",
+            "minecraft:dragon_fireball"
+        ]
+    },
+    "CleanItem": { // 掉落物清理配置
+        "Enabled": true, // 是否启用
+        "ExistTicks": 0, // 安全时间(掉落物存在时间小于这个时间则不会清理) 单位:tick
+        "Whitelist": [ // 白名单
+            "minecraft:netherite_helmet",
+            "minecraft:netherite_sword",
+            "minecraft:netherite_chestplate",
+            "minecraft:diamond_helmet",
+            "minecraft:netherite_leggings",
+            "minecraft:undyed_shulker_box",
+            "minecraft:netherite_boots",
+            "minecraft:shulker_box",
+            "minecraft:elytra",
+            "minecraft:dragon_egg",
+            "minecraft:nether_star",
+            "minecraft:diamond_sword",
+            "minecraft:diamond_chestplate",
+            "minecraft:diamond_boots",
+            "minecraft:diamond_leggings",
+            "minecraft:diamond_hoe",
+            "minecraft:netherite_hoe",
+            "minecraft:diamond_axe",
+            "minecraft:netherite_axe",
+            "minecraft:netherite_pickaxe",
+            "minecraft:diamond_pickaxe"
+        ]
+    },
+    "CleanMobs": { // 生物实体清理配置
+        "Enabled": true, // 是否启用
+        "CleanMonstors": true, // 是否清理怪物
+        "CleanPeacefulMobs": false, // 是否清理和平生物
+        "EnableAutoExclude": true, // 无用
+        "BlackList": [ // 黑名单
+            "minecraft:guardian",
+            "minecraft:zombie_pigman"
+        ],
+        "Whitelist": [ // 白名单
+            "minecraft:ender_dragon",
+            "minecraft:shulker",
+            "minecraft:wither",
+            "minecraft:elder_guardian",
+            "minecraft:piglin_brute",
+            "minecraft:ender_pearl",
+            "minecraft:phantom"
+        ]
+    },
+    "ScheduleClean": { // 定时清理配置
+        "Enabled": true, // 是否启用
+        "CleanInterval": 3600 // 清理间隔 单位:秒
+    },
+    "VoteClean": { // 投票清理配置
+        "Enabled": true, // 是否启用
+        "VoteCleanCommand": "voteclean", // 投票清理指令
+        "Cooldown": 120, // 投票冷却时间 单位:秒
+        "CheckDelay": 30, // 投票时长 单位:秒
+        "Percentage": 50 // 投票百分比(大于此值则清理)
+    },
+    "UnloadActorClean": { // 离线实体清理
+        "Enabled": false, // 是否启用
+        "CleanList": [ // 清理实体列表
+            "minecraft:iron_golem", // 铁傀儡
+            "minecraft:zombie_pigman" // 僵尸猪灵
+        ]
+    }
+}
+```
+
 # 开源许可
 ## 源代码可用性
 - 您可以自由地获取、使用和修改本插件的源代码，无论是个人使用还是商业目的。

manifest.json

@@ -1,13 +1,21 @@
 {
-    "name": "${pluginName}",
-    "entry": "${pluginFile}",
+    "name": "${modName}",
+    "entry": "${modFile}",
     "type": "native",
-    "version": "0.12.0",
+    "version": "0.16.1",
     "author": "GroupMountain",
     "description": "Clean Entities",
     "dependencies": [
         {
             "name": "GMLIB"
+        },
+        {
+            "name": "iListenAttentively"
+        }
+    ],
+    "optionalDependencies": [
+        {
+            "name": "ModAPI"
         }
     ]
 }

scripts/after_build.lua

@@ -82,16 +82,16 @@ function string_formatter(str, variables)
     end)
 end
 
-function pack_plugin(target,plugin_define)
+function pack_mod(target,mod_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")
-        local outputdir = path.join(bindir, plugin_define.pluginName)
-        local targetfile = path.join(outputdir, plugin_define.pluginFile)
-        local pdbfile = path.join(outputdir, path.basename(plugin_define.pluginFile) .. ".pdb")
+        local outputdir = path.join(bindir, mod_define.modName)
+        local targetfile = path.join(outputdir, mod_define.modFile)
+        local pdbfile = path.join(outputdir, path.basename(mod_define.modFile) .. ".pdb")
         local manifestfile = path.join(outputdir, "manifest.json")
         local oritargetfile = target:targetfile()
         local oripdbfile = path.join(path.directory(oritargetfile), path.basename(oritargetfile) .. ".pdb")
@@ -102,9 +102,9 @@ function pack_plugin(target,plugin_define)
             os.cp(oripdbfile, pdbfile)
         end
 
-        formattedmanifest = string_formatter(manifest, plugin_define)
+        formattedmanifest = string_formatter(manifest, mod_define)
         io.writefile(manifestfile,formattedmanifest)
-        cprint("${bright green}[Plugin Packer]: ${reset}plugin already generated to " .. outputdir)
+        cprint("${bright green}[Mod Packer]: ${reset}mod already generated to " .. outputdir)
     else
         cprint("${bright yellow}warn: ${reset}not found manifest.json in root dir!")
     end
@@ -112,7 +112,7 @@ end
 
 
 return {
-    pack_plugin = pack_plugin,
+    pack_mod = pack_mod,
     beautify_json = beautify_json,
     string_formatter = string_formatter
 }

src/Config.h

@@ -1,9 +1,12 @@
 #pragma once
-#include <iostream>
+#include <string>
 #include <vector>
 
+namespace Cleaner {
 struct Config {
-    int version = 1;
+    int version = 2;
+
+    std::string language = "zh_CN";
 
     struct basic {
         std::string Command       = "cleaner";
@@ -88,4 +91,10 @@ struct Config {
         int         CheckDelay       = 30;
         int         Percentage       = 50;
     } VoteClean;
+
+    struct Unload_Actor_Clean {
+        bool                     Enabled   = false;
+        std::vector<std::string> CleanList = {"minecraft:iron_golem", "minecraft:zombie_pigman"};
+    } UnloadActorClean;
 };
+} // namespace Cleaner

src/Features/Clean.cpp

@@ -1,5 +1,6 @@
 #include "Cleaner.h"
-
+#include "mc/world/actor/provider/SynchedActorDataAccess.h"
+#include "gmlib/mc/world/actor/Actor.h"
 namespace Cleaner {
 
 bool isMatch(std::string& A, std::string& B) {
@@ -15,9 +16,11 @@ bool isMatch(std::string& A, std::string& B) {
     return (A == B);
 }
 
-bool shouldIgnore(GMLIB_Actor* ac) {
-    if (ac->isMob() || ac->isItemActor()) {
-        if (ac->isTame() || ac->isTrusting() || ac->getNameTag() != "" || ac->hasTag("cleaner:ignore")) {
+bool isTrust(Actor* ac) { return SynchedActorDataAccess::getActorFlag(ac->getEntityContext(), ::ActorFlags::Trusting); }
+
+bool shouldIgnore(gmlib::GMActor* ac) {
+    if (ac->hasCategory(::ActorCategory::Mob) || ac->hasCategory(::ActorCategory::Item)) {
+        if (ac->isTame() || isTrust(ac) || ac->getNameTag() != "" || ac->hasTag("cleaner:ignore")) {
             return true;
         }
     }
@@ -27,7 +30,7 @@ bool shouldIgnore(GMLIB_Actor* ac) {
 bool ShouldClean(Actor* actor) {
     // Players
     auto& config = Cleaner::Entry::getInstance().getConfig();
-    auto  en     = (GMLIB_Actor*)actor;
+    auto  en     = (gmlib::GMActor*)actor;
     if (en->isPlayer() || shouldIgnore(en)) {
         return false;
     }
@@ -38,7 +41,7 @@ bool ShouldClean(Actor* actor) {
         }
     }
     // Items
-    if (en->isItemActor()) {
+    if (en->hasCategory(::ActorCategory::Item)) {
         if (config.CleanItem.Enabled) {
             auto itac = (ItemActor*)en;
             if (itac->age() <= config.CleanItem.ExistTicks) {
@@ -56,7 +59,7 @@ bool ShouldClean(Actor* actor) {
         return false;
     }
     // Mobs
-    else if (en->isMob()) {
+    else if (en->hasCategory(::ActorCategory::Mob)) {
         if (config.CleanMobs.Enabled) {
             auto blacklist = config.CleanMobs.BlackList;
             for (auto& key : blacklist) {
@@ -94,8 +97,9 @@ bool ShouldClean(Actor* actor) {
 }
 
 int ExecuteClean() {
+    auto level        = ll::service::getLevel();
     int  clean_count  = 0;
-    auto all_entities = GMLIB_Level::getLevel()->getAllEntities();
+    auto all_entities = level->getRuntimeActorList();
     for (auto entity : all_entities) {
         if (ShouldClean(entity)) {
             entity->despawn();
@@ -106,9 +110,10 @@ int ExecuteClean() {
 }
 
 int CountEntities() {
+    auto level        = ll::service::getLevel();
     int  clean_count  = 0;
-    auto all_entities = GMLIB_Level::getLevel()->getAllEntities();
-    for (auto entity : all_entities) {
+    auto all_entities = level->getRuntimeActorList();
+    for (auto* entity : all_entities) {
         if (ShouldClean(entity)) {
             clean_count++;
         }

src/Features/CleanTask.cpp

@@ -1,10 +1,12 @@
 #include "Cleaner.h"
-
+#include <memory>
+#include "gmlib/mc/world/Level.h"
+#include "gmlib/gm/data/TpsStatus.h"
 namespace Cleaner {
 
-static std::shared_ptr<ll::schedule::task::Task<ll::chrono::ServerClock>> mAutoCleanTask  = nullptr;
-static std::shared_ptr<ll::schedule::task::Task<ll::chrono::ServerClock>> mCleanTaskCount = nullptr;
-static std::shared_ptr<ll::schedule::task::Task<ll::chrono::ServerClock>> mCleanTaskTPS   = nullptr;
+static std::shared_ptr<bool> mAutoCleanTask  = std::make_shared<bool>(false);
+static std::shared_ptr<bool> mCleanTaskCount = std::make_shared<bool>(false);
+static std::shared_ptr<bool> mCleanTaskTPS   = std::make_shared<bool>(false);
 
 bool auto_clean_triggerred = false;
 
@@ -12,104 +14,133 @@ void CleanTask() {
     auto&                config        = Cleaner::Entry::getInstance().getConfig();
     auto                 time          = config.Basic.Notice1;
     auto                 announce_time = config.Basic.Notice2;
-    auto  time_1        = std::chrono::seconds::duration(time);
-    auto  time_2        = std::chrono::seconds::duration(time - announce_time);
+    std::chrono::seconds time_1(time);
+    std::chrono::seconds time_2(time - announce_time);
     if (config.Basic.ConsoleLog) {
-        logger.info(I18nAPI::get("cleaner.output.count1", {S(time_1.count())}));
+        ll::io::LoggerRegistry::getInstance().getOrCreate("Cleaner")->info(
+            tr("cleaner.output.count1", {S(time_1.count())})
+        );
     }
     if (config.Basic.SendBroadcast) {
-        Helper::broadcastMessage(I18nAPI::get("cleaner.output.count1", {S(time_1.count())}));
+        Helper::broadcastMessage(tr("cleaner.output.count1", {S(time_1.count())}));
     }
     if (config.Basic.SendToast) {
-        Helper::broadcastToast(I18nAPI::get("cleaner.output.count2", {S(announce_time)}));
+        Helper::broadcastToast(tr("cleaner.output.count2", {S(announce_time)}));
     }
-    Cleaner::Entry::getInstance().getScheduler().add<DelayTask>(time_2, [announce_time, &config] {
+    ll::coro::keepThis([announce_time, &config, time_2]() -> ll::coro::CoroTask<> {
+        co_await time_2;
         if (config.Basic.ConsoleLog) {
-            logger.info(I18nAPI::get("cleaner.output.count2", {S(announce_time)}));
+            ll::io::LoggerRegistry::getInstance().getOrCreate("Cleaner")->info(
+                tr("cleaner.output.count2", {S(announce_time)})
+            );
         }
         if (config.Basic.SendBroadcast) {
-            Helper::broadcastMessage(I18nAPI::get("cleaner.output.count2", {S(announce_time)}));
+            Helper::broadcastMessage(tr("cleaner.output.count2", {S(announce_time)}));
         }
         if (config.Basic.SendToast) {
-            Helper::broadcastToast(I18nAPI::get("cleaner.output.count2", {S(announce_time)}));
+            Helper::broadcastToast(tr("cleaner.output.count2", {S(announce_time)}));
         }
-    });
-    Cleaner::Entry::getInstance().getScheduler().add<DelayTask>(time_1, [&config] {
+        co_return;
+    }).launch(ll::thread::ServerThreadExecutor::getDefault());
+    ll::coro::keepThis([announce_time, &config, time_1]() -> ll::coro::CoroTask<> {
+        co_await time_1;
         auto count = ExecuteClean();
         if (config.Basic.ConsoleLog) {
-            logger.info(I18nAPI::get("cleaner.output.finish", {S(count)}));
+            ll::io::LoggerRegistry::getInstance().getOrCreate("Cleaner")->info(tr("cleaner.output.finish", {S(count)}));
         }
         if (config.Basic.SendBroadcast) {
-            Helper::broadcastMessage(I18nAPI::get("cleaner.output.finish", {S(count)}));
+            Helper::broadcastMessage(tr("cleaner.output.finish", {S(count)}));
         }
         if (config.Basic.SendToast) {
-            Helper::broadcastToast(I18nAPI::get("cleaner.output.finish", {S(count)}));
+            Helper::broadcastToast(tr("cleaner.output.finish", {S(count)}));
         }
         auto_clean_triggerred = false;
-    });
+        co_return;
+    }).launch(ll::thread::ServerThreadExecutor::getDefault());
 }
 
 void AutoCleanTask(int seconds) {
-    auto time      = std::chrono::seconds::duration(seconds);
-    mAutoCleanTask = Cleaner::Entry::getInstance().getScheduler().add<RepeatTask>(time, [] { CleanTask(); });
+    std::chrono::seconds time(seconds);
+    *mAutoCleanTask = true;
+    ll::coro::keepThis([time]() -> ll::coro::CoroTask<> {
+        while (true) {
+            co_await time;
+            if (*mAutoCleanTask == false) co_return;
+            CleanTask();
+        }
+        co_return;
+    }).launch(ll::thread::ServerThreadExecutor::getDefault());
 }
 
 void CleanTaskCount(int max_entities) {
     auto& config     = Cleaner::Entry::getInstance().getConfig();
-    mCleanTaskCount = Cleaner::Entry::getInstance().getScheduler().add<RepeatTask>(10s, [max_entities, &config] {
+    *mCleanTaskCount = true;
+    ll::coro::keepThis([max_entities, &config]() -> ll::coro::CoroTask<> {
+        while (true) {
+            co_await 10s;
+            if (*mCleanTaskCount == false) co_return;
             auto count = CountEntities();
             if (auto_clean_triggerred == false) {
                 if (count >= max_entities) {
                     auto_clean_triggerred = true;
                     if (config.Basic.ConsoleLog) {
-                    logger.warn(I18nAPI::get("cleaner.output.triggerAutoCleanCount", {S(count)}));
+                        ll::io::LoggerRegistry::getInstance().getOrCreate("Cleaner")->warn(
+                            tr("cleaner.output.triggerAutoCleanCount", {S(count)})
+                        );
                     }
                     if (config.Basic.SendBroadcast) {
-                    Helper::broadcastMessage(I18nAPI::get("cleaner.output.triggerAutoCleanCount", {S(count)}));
+                        Helper::broadcastMessage(tr("cleaner.output.triggerAutoCleanCount", {S(count)}));
                     }
                     if (config.Basic.SendToast) {
-                    Helper::broadcastToast(I18nAPI::get("cleaner.output.triggerAutoCleanCount", {S(count)}));
+                        Helper::broadcastToast(tr("cleaner.output.triggerAutoCleanCount", {S(count)}));
                     }
                     CleanTask();
                 }
             }
-    });
+        }
+        co_return;
+    }).launch(ll::thread::ServerThreadExecutor::getDefault());
 }
 
 void CleanTaskTPS(float min_tps) {
     auto& config   = Cleaner::Entry::getInstance().getConfig();
-    mCleanTaskTPS = Cleaner::Entry::getInstance().getScheduler().add<RepeatTask>(10s, [min_tps, &config] {
+    *mCleanTaskTPS = true;
+    ll::coro::keepThis([min_tps, &config]() -> ll::coro::CoroTask<> {
+        while (true) {
+            co_await 10s;
+            if (*mCleanTaskTPS == false) co_return;
             if (auto_clean_triggerred == false) {
-            if (GMLIB_Level::getLevel()->getServerAverageTps() <= min_tps) {
+                if (gmlib::TpsStatus::getInstance().getLevelAverageTps() <= min_tps) {
                     auto_clean_triggerred = true;
-                auto mspt             = S(GMLIB_Level::getLevel()->getServerAverageTps());
+                    auto mspt             = S(gmlib::TpsStatus::getInstance().getLevelAverageTps());
                     if (config.Basic.ConsoleLog) {
-                    logger.warn(I18nAPI::get("cleaner.output.triggerAutoCleanTps", {mspt}));
+                        ll::io::LoggerRegistry::getInstance().getOrCreate("Cleaner")->warn(
+                            tr("cleaner.output.triggerAutoCleanTps", {mspt})
+                        );
                     }
                     if (config.Basic.SendBroadcast) {
-                    Helper::broadcastMessage(I18nAPI::get("cleaner.output.triggerAutoCleanTps", {mspt}));
+                        Helper::broadcastMessage(tr("cleaner.output.triggerAutoCleanTps", {mspt}));
                     }
                     if (config.Basic.SendToast) {
-                    Helper::broadcastToast(I18nAPI::get("cleaner.output.triggerAutoCleanTps", {mspt}));
+                        Helper::broadcastToast(tr("cleaner.output.triggerAutoCleanTps", {mspt}));
                     }
                     CleanTask();
                 }
             }
-    });
+        }
+        co_return;
+    }).launch(ll::thread::ServerThreadExecutor::getDefault());
 }
 
 void stopAllTasks() {
     if (!mCleanTaskCount) {
-        mCleanTaskTPS->cancel();
-        Cleaner::Entry::getInstance().getScheduler().remove(mCleanTaskTPS);
+        *mCleanTaskTPS = false;
     }
     if (mCleanTaskCount) {
-        mCleanTaskCount->cancel();
-        Cleaner::Entry::getInstance().getScheduler().remove(mCleanTaskCount);
+        *mCleanTaskCount = false;
     }
     if (mAutoCleanTask) {
-        mAutoCleanTask->cancel();
-        Cleaner::Entry::getInstance().getScheduler().remove(mAutoCleanTask);
+        *mAutoCleanTask = false;
     }
 }
 } // namespace Cleaner

src/Features/Cleaner.cpp

@@ -4,6 +4,9 @@ namespace Cleaner {
 
 void loadCleaner() {
     auto& config = Cleaner::Entry::getInstance().getConfig();
+    if(config.UnloadActorClean.Enabled){
+        UnloadActorClean::cleanUnloadActor();
+    }
     if (config.ScheduleClean.Enabled) {
         Cleaner::AutoCleanTask(config.ScheduleClean.CleanInterval);
     }

src/Features/Cleaner.h

@@ -1,7 +1,9 @@
 #pragma once
 #include "Global.h"
 
-using namespace ll::schedule;
+#include <gmlib/mc/world/actor/UnloadedActor.h>
+extern void MainForm(Player* player);
+
 using namespace ll::chrono_literals;
 
 namespace Cleaner {
@@ -18,6 +20,7 @@ extern void CleanTask();
 extern void reloadCleaner();
 extern void loadCleaner();
 extern void unloadCleaner();
+extern bool shouldIgnore(gmlib::GMActor* ac);
 
 extern bool isMatch(std::string& A, std::string& B);
 
@@ -28,3 +31,9 @@ namespace VoteClean {
 extern void voteCommandExecute(Player* pl);
 
 }
+
+namespace UnloadActorClean {
+
+extern void cleanUnloadActor();
+
+}

src/Features/Events.cpp

@@ -1,26 +1,25 @@
 #include "Cleaner.h"
-
+#include "gmlib/mc/world/Level.h"
+#include "gmlib/mc/world/actor/Player.h"
 namespace Cleaner {
-
-void setShouldIgnore(GMLIB_Actor* ac) { ac->addTag("cleaner:ignore"); }
+void setShouldIgnore(gmlib::GMActor* ac) { ac->addTag("cleaner:ignore"); }
 
 void ListenEvents() {
     auto& eventBus = ll::event::EventBus::getInstance();
     auto& config   = Cleaner::Entry::getInstance().getConfig();
     // ItemSpawnEvent
-    eventBus.emplaceListener<GMLIB::Event::EntityEvent::ItemActorSpawnAfterEvent>(
-        [&config](GMLIB::Event::EntityEvent::ItemActorSpawnAfterEvent& event) {
-            auto& item = event.getItemActor();
-            if (event.getSpawner().has_value()) {
-                auto pl = (GMLIB_Player*)event.getSpawner().as_ptr();
+    eventBus.emplaceListener<ila::mc::SpawnItemActorAfterEvent>([&config](ila::mc::SpawnItemActorAfterEvent& event) {
+        auto& item = event.itemActor();
+        if (event.spawner()) {
+            auto pl = (gmlib::GMPlayer*)event.spawner();
             if (pl->isPlayer() && !pl->isAlive()) { // Death Drop
-                    auto ac = (GMLIB_Actor*)&item;
+                auto ac = (gmlib::GMActor*)&item;
                 setShouldIgnore(ac);
                 return;
             }
         }
         if (config.ItemDespawn.Enabled) {
-                item.lifeTime() = config.ItemDespawn.DespawnTime;
+            // item.lifeTime() = config.ItemDespawn.DespawnTime;
             auto list        = config.ItemDespawn.WhiteList;
             auto type        = item.item().getTypeName();
             for (auto& key : list) {
@@ -30,15 +29,12 @@ void ListenEvents() {
             }
             item.lifeTime() = config.ItemDespawn.DespawnTime;
         }
-        }
-    );
+    });
     // MobTakeItemEvent
-    eventBus.emplaceListener<GMLIB::Event::EntityEvent::MobPickupItemAfterEvent>(
-        [](GMLIB::Event::EntityEvent::MobPickupItemAfterEvent& event) {
-            auto mob = (GMLIB_Actor*)&event.self();
+    eventBus.emplaceListener<ila::mc::ActorPickupItemAfterEvent>([](ila::mc::ActorPickupItemAfterEvent& event) {
+        auto mob = (gmlib::GMActor*)&event.self();
         setShouldIgnore(mob);
-        }
-    );
+    });
 }
 
 } // namespace Cleaner

src/Features/Helper.cpp

@@ -1,9 +1,13 @@
 #include "Global.h"
-
+#include "gmlib/mc/world/Level.h"
 namespace Helper {
 
-void broadcastMessage(std::string_view msg) { GMLIB_Level::broadcast(I18nAPI::get("cleaner.info.prefix") + std::string(msg)); }
+void broadcastMessage(std::string_view msg) {
+    gmlib::GMLevel::getInstance()->broadcast(tr("cleaner.info.prefix") + std::string(msg));
+}
 
-void broadcastToast(std::string_view msg) { GMLIB_Level::broadcastToast(I18nAPI::get("cleaner.info.prefix"), msg); }
+void broadcastToast(std::string_view msg) {
+    gmlib::GMLevel::getInstance()->broadcastToast(tr("cleaner.info.prefix"), msg);
+}
 
 } // namespace Helper

src/Features/MobForm.cpp

@@ -0,0 +1,288 @@
+#include "Cleaner.h"
+#include "Global.h"
+#include "Mod.h"
+
+#include "ll/api/base/Containers.h"
+#include "ll/api/service/Bedrock.h"
+#include "mc/common/Globals.h"
+#include "mc/world/level/Level.h"
+#include <gmlib/mc/world/Level.h>
+#include <gmlib/mc/world/actor/UnloadedActor.h>
+#include <ll/api/form/CustomForm.h>
+#include <ll/api/form/ModalForm.h>
+#include <ll/api/form/SimpleForm.h>
+#include <string>
+#include <thread>
+#include <vector>
+#include <mutex>
+
+using UnloadEntityMap = std::unordered_map<std::string, std::vector<gmlib::UnloadedActor>>;
+
+struct {
+    std::chrono::system_clock::time_point lastUpdate{};
+    std::atomic_bool                      isUpdating{false};
+    UnloadEntityMap                       offlineEntities{};
+    ll::SmallDenseSet<ActorUniqueID>      waitedPlayers{};
+    std::atomic_bool                      requireUpdate{false};
+
+    std::mutex                            offlineEntitiesMutex; // ✅ 新增
+} OfflineEntity;
+
+auto typeNameToLocString(std::string const& typeName) {
+    return EntityTypeToLocString(
+        EntityTypeFromString(typeName),
+        ActorTypeNamespaceRules::ReturnWithoutNamespace
+    );
+}
+
+auto getAllEntityTypes() {
+    return std::ranges::to<ll::SmallDenseSet<std::string>>(
+        ll::service::getLevel()->getRuntimeActorList()
+        | std::views::transform(&Actor::getTypeName)
+    );
+}
+
+auto getEntityCountByType(std::string const& typeName) {
+    return std::ranges::count_if(
+        ll::service::getLevel()->getRuntimeActorList(),
+        [&](const Actor* a) { return a && a->getTypeName() == typeName; }
+    );
+}
+
+void ConfirmForm(Player& player, bool isOnline, const std::string& TypeName, bool needCondition) {
+    auto fm = ll::form::ModalForm(
+        tr("cleaner.form.confirm.title"),
+        tr(isOnline&&needCondition?"cleaner.form.confirm.important"
+            :"cleaner.form.confirm.warning",{
+            tr(typeNameToLocString(TypeName)),
+            TypeName,
+            std::to_string(
+            isOnline
+                ? getEntityCountByType(TypeName)
+                : OfflineEntity.offlineEntities[TypeName].size()
+        )
+        }),
+        tr("cleaner.form.confirm.confirm"),
+        tr("cleaner.form.confirm.cancel")
+    );
+
+    fm.sendTo(player, [isOnline, TypeName, needCondition](
+        const Player& player,
+        ll::form::ModalFormResult rst,
+        ll::form::FormCancelReason res
+    ) {
+        if (res) return;
+
+        if (!rst || rst.value() != ll::form::ModalFormSelectedButton::Upper)
+            return;
+
+        if (isOnline) {
+            for (auto en : ll::service::getLevel()->getRuntimeActorList()) {
+                auto  actor     = (gmlib::GMActor*)en;
+
+                if (en->getTypeName() == TypeName &&
+                    (!needCondition || !Cleaner::shouldIgnore(actor))) {
+                    en->despawn();
+                }
+            }
+        } else {
+            if (!OfflineEntity.isUpdating.exchange(true)) {
+                std::thread([TypeName]() {
+                    {
+                        std::lock_guard<std::mutex> lock(
+                            OfflineEntity.offlineEntitiesMutex
+                        );
+
+                        auto it = OfflineEntity.offlineEntities.find(TypeName);
+                        if (it != OfflineEntity.offlineEntities.end()) {
+                            for (auto& en : it->second) {
+                                if (en.isValid()) en.remove();
+                            }
+                            OfflineEntity.offlineEntities.erase(it);
+                        }
+                    }
+
+                    OfflineEntity.isUpdating.store(false);
+                }).detach();
+            } else {
+                player.sendMessage(tr(""));
+            }
+        }
+    });
+}
+
+void SettingCleanForm(Player& player, bool isOnline, const std::string& TypeName) {
+    if (!isOnline) {
+        ConfirmForm(player, isOnline, TypeName, false);
+        return;
+    }
+
+    auto fm = ll::form::CustomForm(tr("cleaner.form.setting.title"));
+    fm.appendLabel(
+        tr("cleaner.form.setting.content",{
+            tr(typeNameToLocString(TypeName)),
+            TypeName,
+            std::to_string(
+            isOnline
+                ? getEntityCountByType(TypeName)
+                : OfflineEntity.offlineEntities[TypeName].size()
+        )
+        })
+    );
+    fm.appendToggle(
+        "cleanIgnoreActor",
+        tr("cleaner.form.setting.cleanIgnore"),
+        false,
+        tr("cleaner.form.setting.cleanIgnore.tip")
+    );
+
+    fm.sendTo(player, [TypeName, isOnline](
+        Player& player,
+        const ll::form::CustomFormResult& rst,
+        ll::form::FormCancelReason res
+    ) {
+        if (!rst) return;
+
+        bool cleanIgnoreActor =
+            std::get<uint64>(rst->at("cleanIgnoreActor"));
+
+        ConfirmForm(player, isOnline, TypeName, !cleanIgnoreActor);
+    });
+}
+
+void OnlineEntityForm(Player& player) {
+    auto fm = ll::form::SimpleForm(tr("cleaner.form.runtime.title"), tr("cleaner.form.runtime.content"));
+
+    for (auto& entityID : getAllEntityTypes()) {
+        fm.appendButton(
+            typeNameToLocString(entityID),
+            [entityID](Player& player) {
+                SettingCleanForm(player, true, entityID);
+            }
+        );
+    }
+
+    fm.sendTo(player);
+}
+
+void updateUnloadEntityMap(const Player& player, bool notice = false) {
+    if (OfflineEntity.lastUpdate.time_since_epoch().count() == 0)
+        OfflineEntity.requireUpdate.store(true);
+
+    if (OfflineEntity.lastUpdate >=
+        std::chrono::system_clock::now() - std::chrono::minutes(10)) {
+
+        if (notice) player.sendMessage(tr("cleaner.unload.updated.warn"));
+
+        return;
+    }
+
+    if (!OfflineEntity.isUpdating.exchange(true) &&
+        OfflineEntity.requireUpdate) {
+
+        std::thread([]() {
+            UnloadEntityMap offlineEntityMap{};
+
+
+            gmlib::UnloadedActor::foreachUnloadedActor(
+                [&](gmlib::UnloadedActor& actor) -> bool {
+                    offlineEntityMap[actor.getTypeName()]
+                        .emplace_back(std::move(actor));
+                    return true;
+                }
+            );
+
+
+            {
+                std::lock_guard<std::mutex> lock(
+                    OfflineEntity.offlineEntitiesMutex
+                );
+
+                for (auto& playerID : OfflineEntity.waitedPlayers) {
+                    if (auto pl =
+                            ll::service::getLevel()->getPlayer(playerID))
+                        pl->sendMessage(tr("cleaner.unload.updated.msg"));
+                }
+
+                OfflineEntity.offlineEntities.swap(offlineEntityMap);
+
+            }
+
+            OfflineEntity.lastUpdate = std::chrono::system_clock::now();
+            OfflineEntity.isUpdating.store(false);
+        }).detach();
+
+    } else if (notice) {
+        player.sendMessage(tr("cleaner.unload.update.warn"));
+    }
+}
+
+void OfflineEntityForm(Player& player) {
+    Cleaner::Entry::getInstance().getSelf().getLogger().info("preload");
+    updateUnloadEntityMap(player);
+
+    auto fm = ll::form::SimpleForm(tr("cleaner.form.unload.title"), tr("cleaner.form.unload.content"));
+
+    if (OfflineEntity.lastUpdate !=
+        std::chrono::system_clock::time_point{}) {
+
+        fm.appendLabel(
+            tr("cleaner.form.unload.updated",{std::format("{:%Y-%m-%d %H:%M}", OfflineEntity.lastUpdate)})
+        );
+    }
+
+    if (OfflineEntity.isUpdating.load()) {
+        fm.appendLabel(
+            tr("cleaner.form.unload.updating")
+        );
+
+        {
+            std::lock_guard<std::mutex> lock(
+                OfflineEntity.offlineEntitiesMutex
+            );
+            OfflineEntity.waitedPlayers.insert(
+                player.getOrCreateUniqueID()
+            );
+        }
+
+        fm.appendButton(tr("cleaner.form.unload.refresh"), [](Player& player) {
+            OfflineEntityForm(player);
+        });
+    } else {
+        fm.appendButton(tr("cleaner.form.unload.refresh"), [](Player& player) {
+            OfflineEntity.requireUpdate.store(true);
+            updateUnloadEntityMap(player, true);
+        });
+    }
+
+    {
+        std::lock_guard<std::mutex> lock(
+            OfflineEntity.offlineEntitiesMutex
+        );
+
+        for (auto& entity : OfflineEntity.offlineEntities) {
+            fm.appendButton(
+                typeNameToLocString(entity.first),
+                [typeName = entity.first](Player& player) {
+                    SettingCleanForm(player, false, typeName);
+                }
+            );
+        }
+    }
+
+    fm.sendTo(player);
+}
+
+void MainForm(Player* player) {
+    auto fm = ll::form::SimpleForm(tr("cleaner.form.main.title"), tr("cleaner.form.main.context"));
+
+    fm.appendButton(tr("cleaner.form.main.runtime"), [](Player& player) {
+        OnlineEntityForm(player);
+    });
+
+    fm.appendButton(tr("cleaner.form.main.unload"), [](Player& player) {
+        OfflineEntityForm(player);
+    });
+
+    fm.sendTo(*player);
+}

src/Features/UnloadActorClean.cpp

@@ -0,0 +1,21 @@
+#include "Cleaner.h"
+#include "Global.h"
+#include "gmlib/mc/world/actor/UnloadedActor.h"
+
+namespace UnloadActorClean {
+void cleanUnloadActor() {
+    auto& config = Cleaner::Entry::getInstance().getConfig();
+    std::thread([config]() {
+        gmlib::UnloadedActor::foreachUnloadedActor(
+        [config](gmlib::UnloadedActor& actor) -> bool {
+            for (auto& actorname : config.UnloadActorClean.CleanList) {
+                if (actor.getTypeName() == actorname) {
+                    actor.remove();
+                }
+            }
+            return true;
+        }
+    );
+    }).detach();
+}
+} // namespace UnloadActorClean

src/Features/VoteClean.cpp

@@ -9,8 +9,6 @@ int  playerCount = 0;
 
 std::unordered_map<mce::UUID, bool> voteList;
 
-static std::shared_ptr<ll::schedule::task::Task<ll::chrono::ServerClock>> mAutoCleanTask;
-
 int getPlayerCount() {
     int result = 0;
     ll::service::getLevel()->forEachPlayer([&](Player& pl) -> bool {
@@ -24,10 +22,10 @@ int getPlayerCount() {
 
 void sendVoteForm(Player* pl) {
     auto fm = ll::form::ModalForm(
-        I18nAPI::get("cleaner.vote.title"),
-        I18nAPI::get("cleaner.vote.subtitle", {pl->getRealName()}),
-        I18nAPI::get("cleaner.vote.ok"),
-        I18nAPI::get("cleaner.vote.no")
+        tr("cleaner.vote.title"),
+        tr("cleaner.vote.subtitle", {pl->getRealName()}),
+        tr("cleaner.vote.ok"),
+        tr("cleaner.vote.no")
     );
     ll::service::getLevel()->forEachPlayer([&](Player& pl) -> bool {
         fm.sendTo(pl, [](Player& player, ll::form::ModalFormResult result, ll::form::FormCancelReason reason) {
@@ -35,12 +33,12 @@ void sendVoteForm(Player* pl) {
                 switch (result.value()) {
                 case ll::form::ModalFormSelectedButton::Upper: {
                     voteList[player.getUuid()] = true;
-                    player.sendMessage(I18nAPI::get("cleaner.vote.accept"));
+                    player.sendMessage(tr("cleaner.vote.accept"));
                     return;
                 }
                 case ll::form::ModalFormSelectedButton::Lower: {
                     voteList[player.getUuid()] = false;
-                    player.sendMessage(I18nAPI::get("cleaner.vote.deny"));
+                    player.sendMessage(tr("cleaner.vote.deny"));
                     return;
                 }
                 default:
@@ -64,18 +62,18 @@ void checkVote() {
     float result = ((float)voteCount) / ((float)playerCount);
     if (result >= percentage) {
         if (config.Basic.SendBroadcast) {
-            Helper::broadcastMessage(I18nAPI::get("cleaner.vote.succeed"));
+            Helper::broadcastMessage(tr("cleaner.vote.succeed"));
         }
         if (config.Basic.SendToast) {
-            Helper::broadcastToast(I18nAPI::get("cleaner.vote.succeed"));
+            Helper::broadcastToast(tr("cleaner.vote.succeed"));
         }
         Cleaner::CleanTask();
     } else {
         if (config.Basic.SendBroadcast) {
-            Helper::broadcastMessage(I18nAPI::get("cleaner.vote.failed"));
+            Helper::broadcastMessage(tr("cleaner.vote.failed"));
         }
         if (config.Basic.SendToast) {
-            Helper::broadcastToast(I18nAPI::get("cleaner.vote.failed"));
+            Helper::broadcastToast(tr("cleaner.vote.failed"));
         }
     }
     hasVote     = false;
@@ -89,24 +87,30 @@ void voteClean(Player* pl) {
     hasVote     = true;
     playerCount = getPlayerCount();
     if (config.Basic.SendBroadcast) {
-        Helper::broadcastMessage(I18nAPI::get("cleaner.vote.voteMessage", {pl->getRealName()}));
+        Helper::broadcastMessage(tr("cleaner.vote.voteMessage", {pl->getRealName()}));
     }
     if (config.Basic.SendToast) {
-        Helper::broadcastToast(I18nAPI::get("cleaner.vote.voteMessage", {pl->getRealName()}));
+        Helper::broadcastToast(tr("cleaner.vote.voteMessage", {pl->getRealName()}));
     }
     sendVoteForm(pl);
-    auto cooldown = std::chrono::seconds::duration(config.VoteClean.Cooldown);
-    auto waitTime = std::chrono::seconds::duration(config.VoteClean.CheckDelay);
-    Cleaner::Entry::getInstance().getScheduler().add<DelayTask>(cooldown, [] { canVote = false; });
-    Cleaner::Entry::getInstance().getScheduler().add<DelayTask>(waitTime, [] { checkVote(); });
+    ll::coro::keepThis([&config]() -> ll::coro::CoroTask<> {
+        co_await std::chrono::seconds(config.VoteClean.Cooldown);
+        canVote = true;
+        co_return;
+    }).launch(ll::thread::ServerThreadExecutor::getDefault());
+    ll::coro::keepThis([&config]() -> ll::coro::CoroTask<> {
+        co_await std::chrono::seconds(config.VoteClean.CheckDelay);
+        checkVote();
+        co_return;
+    }).launch(ll::thread::ServerThreadExecutor::getDefault());
 }
 
 void confirmForm(Player* pl) {
     auto fm = ll::form::ModalForm(
-        I18nAPI::get("cleaner.vote.title"),
-        I18nAPI::get("cleaner.vote.confirmTubtitle"),
-        I18nAPI::get("cleaner.vote.confirmOk"),
-        I18nAPI::get("cleaner.vote.confirmNo")
+        tr("cleaner.vote.title"),
+        tr("cleaner.vote.confirmTubtitle"),
+        tr("cleaner.vote.confirmOk"),
+        tr("cleaner.vote.confirmNo")
     );
     fm.sendTo(*pl, [](Player& player, ll::form::ModalFormResult result, ll::form::FormCancelReason reason) {
         if (result.has_value()) {
@@ -115,7 +119,7 @@ void confirmForm(Player* pl) {
                 return voteClean(&player);
             }
             case ll::form::ModalFormSelectedButton::Lower: {
-                return player.sendMessage(I18nAPI::get("cleaner.vote.cancel"));
+                return player.sendMessage(tr("cleaner.vote.cancel"));
             }
             default:
                 return;
@@ -129,14 +133,14 @@ void voteCommandExecute(Player* pl) {
         if (canVote) {
             confirmForm(pl);
         } else {
-            pl->sendMessage(I18nAPI::get("cleaner.vote.cooldown"));
+            pl->sendMessage(tr("cleaner.vote.cooldown"));
         }
     } else {
         if (voteList.count(pl->getUuid())) {
-            pl->sendMessage(I18nAPI::get("cleaner.vote.voted"));
+            pl->sendMessage(tr("cleaner.vote.voted"));
         } else {
             voteList[pl->getUuid()] = true;
-            pl->sendMessage(I18nAPI::get("cleaner.vote.accept"));
+            pl->sendMessage(tr("cleaner.vote.accept"));
         }
     }
 }

src/Global.h

@@ -1,15 +1,19 @@
 #pragma once
-#include "Plugin.h"
-#include <include_all.h>
+// IWYU pragma: begin_exports
+#include "Mod.h"
+
+#include "gmlib/include_ll.h"
+#include "ila/include_all.h"
 #include <regex>
+// IWYU pragma: end_exports
 
 #define S(x) std::to_string(x)
 
-extern ll::Logger logger;
-
 extern void RegisterCommands();
 
 namespace Helper {
 extern void broadcastMessage(std::string_view msg);
 extern void broadcastToast(std::string_view msg);
 } // namespace Helper
+
+extern std::string tr(std::string const& key, std::vector<std::string> const& params = {});

src/Language.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "Global.h"
 
-std::string en_US = R"({
+std::string en_US = R"(
     cleaner.info.prefix=§e§l[Cleaner] §r
     cleaner.command.cleaner=Cleaner admin command.
     cleaner.command.despawnSuccess=Successfully despawned %1$s entities.
@@ -16,7 +16,7 @@ std::string en_US = R"({
     cleaner.output.count2=Attention! The system will automatically clean server entities in %1$s seconds!
     cleaner.output.finish=Cleaning complete! A total of %1$s entities have been cleaned this time.
     cleaner.output.opClean=Admin has enabled server entity cleaning.
-    cleaner.output.reload=Cleaner plugin reloaded. Some configurations may require a server restart to take effect.
+    cleaner.output.reload=Cleaner mod reloaded. Some configurations may require a server restart to take effect.
     cleaner.output.triggerAutoCleanCount=Too many server entities detected! There are %1$s cleanable entities currently on the server. Auto-clean program has been activated.
     cleaner.output.triggerAutoCleanTps=Low TPS detected! Server average TPS %1$s\nClean program has been initiated.
     cleaner.vote.cooldown=Vote cleaning cooldown...
@@ -35,19 +35,43 @@ std::string en_US = R"({
     cleaner.vote.title=Vote Cleaning
     cleaner.vote.voted=You have been voted!
     cleaner.vote.voteMessage=%1$s lunched a clean vote. If you agree cleaning entities but did not received a form, please type command /voteclean to vote.
-})";
+    cleaner.form.main.title=§e§lCleaner§r - Main Menu
+    cleaner.form.main.context=Select entity category to clean:
+    cleaner.form.main.runtime=Loaded Entities
+    cleaner.form.main.unload=Unloaded Entities
+    cleaner.form.runtime.title=§e§lCleaner§r - Loaded Entity Manager
+    cleaner.form.runtime.content=Select loaded entity to clean:
+    cleaner.form.unload.title=§e§lCleaner§r - Unloaded Entity Manager
+    cleaner.form.unload.content=Select unloaded entity to clean:
+    cleaner.form.unload.updating=§2Updating...§r\nIf your world contains many entities, this may take §b a long time (~20k entities/min)§r. You can close this panel first; you'll be notified when the update finishes.
+    cleaner.form.unload.updated=Last updated: §b%1$s§r\n§eData may be out of sync. Click "Refresh" to update. Max 1 refresh per 10 minutes.\n§c§lWarning: Cleaning unloaded entities will force-remove ALL of them, including named, tamed, and ignored ones. Proceed with caution.
+    cleaner.form.unload.refresh=Refresh
+    cleaner.unload.updated.msg=§e§lUnloaded entity list§r has finished loading
+    cleaner.unload.update.warn=§g§lUnloaded entity list is already updating, cannot trigger again§r
+    cleaner.unload.updated.warn=§g§lUnloaded entity list refresh too frequent (max once per 10 min)§r
+    cleaner.form.setting.title=§e§lCleaner§r - Clean Options
+    cleaner.form.setting.content=Deleting entities\n§b%1$s (%2$s)\n§eTotal: %3$s
+    cleaner.form.setting.cleanIgnore=Force Clean All Entities
+    cleaner.form.setting.cleanIgnore.tip=§c§lDangerous: §r§gThis will clean ALL entities including named, tamed, and config-ignored ones
+    cleaner.form.confirm.title=Confirmation
+    cleaner.form.confirm.warning=§c§lConfirm dangerous operation:§r\nConfirm §c§lforce §rdeletion of\n§b%1$s (%2$s)\n§eTotal: %3$s ?
+    cleaner.form.confirm.important=§u§lConfirm operation:§r\nConfirm deletion of\n§b%1$s (%2$s)\n§eTotal: %3$s ? This will force-remove ALL including named, tamed, config-ignored, etc. Proceed with caution.
+    cleaner.form.confirm.confirm=Confirm
+    cleaner.form.confirm.cancel=Cancel
+    cleaner.confirm.unload.warn=Form is updating, deletion temporarily unavailable
+)";
 
-std::string zh_CN = R"({
+std::string zh_CN = R"(
     cleaner.info.prefix=§e§l[Cleaner] §r
     cleaner.command.cleaner=Cleaner管理员命令。
     cleaner.command.despawnSuccess=已成功清除了 %1$s 个实体
     cleaner.command.error.noTarget=没有与选择器匹配的目标
     cleaner.command.error.playerOnly=该命令只能由玩家执行！
     cleaner.command.tps.output=当前服务器实时TPS %1$s §r，平均TPS %2$s
-    cleaner.command.mspt.output=当前服务器实MSPT %1$s
+    cleaner.command.mspt.output=当前服务器实时MSPT %1$s
     cleaner.command.clean.output=已成功启动清理任务！
     cleaner.command.voteclean=发起实体清理投票。
-    cleaner.command.despawntime" : "已成功将物品消失时间设置为 %1$s 游戏刻
+    cleaner.command.despawntime=已成功将物品消失时间设置为 %1$s 游戏刻
     cleaner.output.count1=系统将在 %1$s 秒后自动清理服务器实体！
     cleaner.output.count2=请注意！系统将在 %1$s 秒后自动清理服务器实体！
     cleaner.output.finish=清理完成！本次总共清理了 %1$s 个实体。
@@ -71,4 +95,28 @@ std::string zh_CN = R"({
     cleaner.vote.title=投票清理
     cleaner.vote.voted=你已经投过票了！
     cleaner.vote.voteMessage=%1$s 发起了服务器实体清理投票！如果同意清理但是未收到表单，请输入命令 /voteclean 投票。拒绝清理请忽略此信息。
-})";
+    cleaner.form.main.title=§e§lCleaner§r 主菜单
+    cleaner.form.main.context=选择你要清理的生物种类:
+    cleaner.form.main.runtime=已加载生物
+    cleaner.form.main.unload=未加载生物
+    cleaner.form.runtime.title=§e§lCleaner§r-已加载生物管理
+    cleaner.form.runtime.content=选择你要清理的已加载生物:
+    cleaner.form.unload.title=§e§lCleaner-未加载生物管理
+    cleaner.form.unload.content=选择你要清理的未加载生物:
+    cleaner.form.unload.updating=§2正在更新中...§r\n如果您存档中有较多实体，这可能花费§b较长时间(大约2w个生物/分钟)§r。你可以先关闭这个面板, 更新完成后将会通知您。
+    cleaner.form.unload.updated=数据最后更新时间:§b %1$s \n§e数据有时不同步，你可以点击刷新按钮进行刷新。每10分钟最多进行一次刷新\n§c§l注意, 清理未加载生物会全部强制清除, 包过有命名, 被驯服等, 请谨慎操作
+    cleaner.form.unload.refresh=刷新
+    cleaner.unload.updated.msg=§e§l离线生物列表§r已完成加载
+    cleaner.unload.update.warn=§g§l离线生物列表正在更新，不能重复触发§r
+    cleaner.unload.updated.warn=§g§l离线生物列表更新过频繁，每10分钟最多一次
+    cleaner.form.setting.title=§e§lCleaner-清理选项
+    cleaner.form.setting.content=正在删除生物\n§b%1$s (%2$s)\n§e共计: %3$s 个
+    cleaner.form.setting.cleanIgnore=强制清理全部生物
+    cleaner.form.setting.cleanIgnore.tip=§c§l危险操作: §r§g这会清理包过有命名, 被驯服, 配置忽略的所有生物
+    cleaner.form.confirm.title=确认消息
+    cleaner.form.confirm.warning=§c§l确认危险操作:§r\n确认§c§l强制§r删除生物\n§b%1$s (%2$s)\n§e共计: %3$s 个?
+    cleaner.form.confirm.important=§u§l确认操作:§r\n确认删除生物\n§b%1$s (%2$s)\n§e共计: %3$s 个?这会强制全部清除, 包过有命名, 被驯服, 配置忽略等, 请谨慎操作
+    cleaner.form.confirm.confirm=确认
+    cleaner.form.confirm.cancel=取消
+    cleaner.confirm.unload.warn=表单正在更新, 暂时无法删除
+)";

src/MemoryOperators.cpp

@@ -1,5 +1,5 @@
-// This file will make your plugin use LeviLamina's memory operators by default.
-// This improves the memory management of your plugin and is recommended to use.
+// This file will make your mod use LeviLamina's memory operators by default.
+// This improves the memory management of your mod and is recommended to use.
 // You should not modify anything in this file.
 
 #define LL_MEMORY_OPERATORS

src/Mod.cpp

@@ -0,0 +1,64 @@
+#include "Mod.h"
+#include "Features/Cleaner.h"
+#include "Global.h"
+#include "Language.h"
+#include "ll/api/utils/ErrorUtils.h"
+#include "ll/api/memory/Hook.h"
+#include "mc/world/actor/Actor.h"
+#include "gmlib/mc/locale/I18nAPI.h"
+#include "gmlib/gm/data/TpsStatus.h"
+
+namespace Cleaner {
+
+Entry& Entry::getInstance() {
+    static Entry instance;
+    return instance;
+}
+
+bool Entry::load() { return true; }
+
+bool Entry::enable() {
+    (void)gmlib::TpsStatus::getInstance();
+    mConfig.emplace();
+    try {
+        ll::config::loadConfig(*mConfig, getSelf().getConfigDir() / "config.json");
+    } catch (...) {
+        ll::error_utils::printCurrentException(getSelf().getLogger());
+    }
+    saveConfig();
+    gmlib::I18nAPI::updateOrCreateLanguageFile(getSelf().getLangDir(), "en_US", en_US);
+    gmlib::I18nAPI::updateOrCreateLanguageFile(getSelf().getLangDir(), "zh_CN", zh_CN);
+    gmlib::I18nAPI::loadLanguagesFromDirectory(getSelf().getLangDir());
+    gmlib::I18nAPI::chooseLanguage(Cleaner::Entry::getInstance().getConfig().language);
+    Cleaner::ListenEvents();
+    RegisterCommands();
+    Cleaner::loadCleaner();
+    getSelf().getLogger().info("Cleaner Loaded!");
+    getSelf().getLogger().info("Author: GroupMountain");
+    getSelf().getLogger().info("Repository: https://github.com/GroupMountain/Cleaner");
+
+    return true;
+}
+
+bool Entry::disable() {
+    mConfig.reset();
+    Cleaner::unloadCleaner();
+    return true;
+}
+
+bool Entry::unload() {
+
+    return true;
+}
+
+Config& Entry::getConfig() { return mConfig.value(); }
+
+void Entry::saveConfig() { ll::config::saveConfig(*mConfig, getSelf().getConfigDir() / "config.json"); }
+
+} // namespace Cleaner
+
+LL_REGISTER_MOD(Cleaner::Entry, Cleaner::Entry::getInstance());
+
+std::string tr(std::string const& key, std::vector<std::string> const& params) {
+    return gmlib::I18nAPI::get(key, params);
+}

src/Mod.h

@@ -0,0 +1,39 @@
+#pragma once
+
+#include "Config.h"
+#include <ll/api/mod/NativeMod.h>
+
+namespace Cleaner {
+
+class Entry {
+
+public:
+    static Entry& getInstance();
+
+    Entry() : mSelf(*ll::mod::NativeMod::current()) {}
+
+    [[nodiscard]] ll::mod::NativeMod& getSelf() const { return mSelf; }
+
+    /// @return True if the mod is loaded successfully.
+    bool load();
+
+    /// @return True if the mod is enabled successfully.
+    bool enable();
+
+    /// @return True if the mod is disabled successfully.
+    bool disable();
+
+    // TODO: Implement this method if you need to unload the mod.
+    // /// @return True if the mod is unloaded successfully.
+    bool unload();
+
+    Config& getConfig();
+
+    void saveConfig();
+
+private:
+    ll::mod::NativeMod&   mSelf;
+    std::optional<Config> mConfig;
+};
+
+} // namespace Cleaner

src/Plugin.cpp

@@ -1,47 +0,0 @@
-#include "Features/Cleaner.h"
-#include "Global.h"
-#include "Language.h"
-
-ll::Logger logger("Cleaner");
-
-namespace Cleaner {
-
-static std::unique_ptr<Entry> instance;
-
-Entry& Entry::getInstance() { return *instance; }
-
-bool Entry::load() { return true; }
-
-bool Entry::enable() {
-    mConfig.emplace();
-    mScheduler.emplace();
-    ll::config::loadConfig(*mConfig, getSelf().getConfigDir() / "config.json");
-    saveConfig();
-    I18nAPI::updateOrCreateLanguageFile(getSelf().getLangDir(), "en_US", en_US);
-    I18nAPI::updateOrCreateLanguageFile(getSelf().getLangDir(), "zh_CN", zh_CN);
-    I18nAPI::loadLanguagesFromDirectory(getSelf().getLangDir());
-    Cleaner::ListenEvents();
-    RegisterCommands();
-    Cleaner::loadCleaner();
-    logger.info("Cleaner Loaded!");
-    logger.info("Author: GroupMountain");
-    logger.info("Repository: https://github.com/GroupMountain/Cleaner");
-    return true;
-}
-
-bool Entry::disable() {
-    mConfig.reset();
-    Cleaner::unloadCleaner();
-    mScheduler.reset();
-    return true;
-}
-
-Config& Entry::getConfig() { return mConfig.value(); }
-
-void Entry::saveConfig() { ll::config::saveConfig(*mConfig, getSelf().getConfigDir() / "config.json"); }
-
-ServerTimeScheduler& Entry::getScheduler() { return mScheduler.value(); }
-
-} // namespace Cleaner
-
-LL_REGISTER_PLUGIN(Cleaner::Entry, Cleaner::instance);

src/Plugin.h

@@ -1,45 +0,0 @@
-#pragma once
-
-#include "Config.h"
-#include <ll/api/plugin/NativePlugin.h>
-#include <ll/api/schedule/Scheduler.h>
-
-namespace Cleaner {
-
-using namespace ll::schedule;
-
-class Entry {
-
-public:
-    static Entry& getInstance();
-
-    Entry(ll::plugin::NativePlugin& self) : mSelf(self) {}
-
-    [[nodiscard]] ll::plugin::NativePlugin& getSelf() const { return mSelf; }
-
-    /// @return True if the plugin is loaded successfully.
-    bool load();
-
-    /// @return True if the plugin is enabled successfully.
-    bool enable();
-
-    /// @return True if the plugin is disabled successfully.
-    bool disable();
-
-    // TODO: Implement this method if you need to unload the plugin.
-    // /// @return True if the plugin is unloaded successfully.
-    // bool unload();
-
-    Config& getConfig();
-
-    void saveConfig();
-
-    ServerTimeScheduler& getScheduler();
-
-private:
-    ll::plugin::NativePlugin&          mSelf;
-    std::optional<Config>              mConfig;
-    std::optional<ServerTimeScheduler> mScheduler;
-};
-
-} // namespace Cleaner

src/RegisterCommand.cpp

@@ -1,9 +1,10 @@
 #include "Features/Cleaner.h"
-#include "Plugin.h"
-
+#include "gmlib/mc/world/Level.h"
+#include "gmlib/gm/data/TpsStatus.h"
+#include "mc/server/commands/CommandOutput.h"
 struct CleanerParam {
     enum class Despawn { despawn } despawn;
-    enum class Action { tps, clean, reload, mspt } action;
+    enum class Action { gui ,tps, clean, reload, mspt } action;
     enum class DespawnTime { despawntime } despawntime;
     int                    ticks;
     CommandSelector<Actor> entity;
@@ -11,82 +12,93 @@ struct CleanerParam {
 
 void RegCleanerCommand() {
     auto& config = Cleaner::Entry::getInstance().getConfig();
-    auto& cmd    = ll::command::CommandRegistrar::getInstance().getOrCreateCommand(
+    auto& cmd    = ll::command::CommandRegistrar::getInstance(false).getOrCreateCommand(
         config.Basic.Command,
-        I18nAPI::get("cleaner.command.cleaner"),
+        tr("cleaner.command.cleaner"),
         CommandPermissionLevel::GameDirectors
     );
-    cmd.overload<CleanerParam>()
-        .required("despawn")
-        .required("entity")
-        .execute<[&](CommandOrigin const& origin, CommandOutput& output, CleanerParam const& param) {
+    cmd.overload<CleanerParam>().required("despawn").required("entity").execute(
+        [&](CommandOrigin const& origin, CommandOutput& output, CleanerParam const& param) {
             auto ens = param.entity.results(origin);
             if (ens.empty()) {
-                return output.error(I18nAPI::get("cleaner.command.error.noTarget"));
+                return output.error(tr("cleaner.command.error.noTarget"));
             }
             for (auto en : ens) {
+                /*NO NEED
+                 *Tip: Player don't exit through normal logic when despawn player
+                 *That may cause other plugins crash,causing Levilamina crash
+                 *if (en->hasCategory(ActorCategory::Player)) {
+                    auto pl=(Player*)en;
+                    pl->disconnect("You've been despawn by Cleaner");
+                    continue;
+                }*/
                 en->despawn();
             }
-            return output.success(I18nAPI::get("cleaner.command.despawnSuccess", {S(ens.size())}));
-        }>();
-    cmd.overload<CleanerParam>()
-        .required("action")
-        .execute<[&](CommandOrigin const& origin, CommandOutput& output, CleanerParam const& param) {
+            return output.success(tr("cleaner.command.despawnSuccess", {S(ens.size())}));
+        }
+    );
+    cmd.overload<CleanerParam>().required("action").execute(
+        [&](CommandOrigin const& origin, CommandOutput& output, CleanerParam const& param) {
             switch (param.action) {
             case CleanerParam::Action::clean: {
                 Cleaner::CleanTask();
                 if (Cleaner::Entry::getInstance().getConfig().Basic.ConsoleLog) {
-                    logger.info(I18nAPI::get("cleaner.output.opClean"));
+                    ll::io::LoggerRegistry::getInstance().getOrCreate("Cleaner")->info(tr("cleaner.output.opClean"));
                 }
                 if (Cleaner::Entry::getInstance().getConfig().Basic.SendBroadcast) {
-                    Helper::broadcastMessage(I18nAPI::get("cleaner.output.opClean"));
+                    Helper::broadcastMessage(tr("cleaner.output.opClean"));
                 }
                 if (Cleaner::Entry::getInstance().getConfig().Basic.SendToast) {
-                    Helper::broadcastToast(I18nAPI::get("cleaner.output.opClean"));
+                    Helper::broadcastToast(tr("cleaner.output.opClean"));
                 }
-                return output.success(I18nAPI::get("cleaner.command.clean.output"));
+                return output.success(tr("cleaner.command.clean.output"));
             }
             case CleanerParam::Action::tps: {
-                return output.success(I18nAPI::get(
-                    "cleaner.command.tps.output",
-                    {S(GMLIB_Level::getLevel()->getServerCurrentTps()),
-                     S(GMLIB_Level::getLevel()->getServerAverageTps())}
-                ));
+                return output.success(
+                    tr("cleaner.command.tps.output",
+                       {S(gmlib::GMLevel::getInstance()->getServerCurrentTps()),
+                        S(gmlib::TpsStatus::getInstance().getLevelAverageTps())})
+                );
             }
             case CleanerParam::Action::mspt: {
                 return output.success(
-                    I18nAPI::get("cleaner.command.mspt.output", {S(GMLIB_Level::getLevel()->getServerMspt())})
+                    tr("cleaner.command.mspt.output", {S(gmlib::GMLevel::getInstance()->getServerMspt())})
                 );
             }
             case CleanerParam::Action::reload: {
                 Cleaner::reloadCleaner();
-                return output.success(I18nAPI::get("cleaner.output.reload"));
+                return output.success(tr("cleaner.output.reload"));
+            }
+            case CleanerParam::Action::gui:
+                if (origin.getOriginType()==CommandOriginType::Player)
+                    MainForm((Player*)origin.getEntity());
+                break;
             }
         }
-        }>();
+    );
     cmd.overload<CleanerParam>()
         .required("despawntime")
         .required("ticks")
-        .execute<[&](CommandOrigin const& origin, CommandOutput& output, CleanerParam const& param) {
+        .execute([&](CommandOrigin const& origin, CommandOutput& output, CleanerParam const& param) {
             Cleaner::Entry::getInstance().getConfig().ItemDespawn.DespawnTime = param.ticks;
             Cleaner::Entry::getInstance().saveConfig();
-            return output.success(I18nAPI::get("cleaner.command.despawntime", {S(param.ticks)}));
-        }>();
+            return output.success(tr("cleaner.command.despawntime", {S(param.ticks)}));
+        });
 };
 
 void RegVoteCommand() {
-    auto& cmd = ll::command::CommandRegistrar::getInstance().getOrCreateCommand(
+    auto& cmd = ll::command::CommandRegistrar::getInstance(false).getOrCreateCommand(
         Cleaner::Entry::getInstance().getConfig().VoteClean.VoteCleanCommand,
-        I18nAPI::get("cleaner.command.voteclean"),
+        tr("cleaner.command.voteclean"),
         CommandPermissionLevel::Any
     );
-    cmd.overload().execute<[&](CommandOrigin const& origin, CommandOutput& output) {
+    cmd.overload().execute([&](CommandOrigin const& origin, CommandOutput& output) {
         if (origin.getOriginType() == CommandOriginType::Player) {
             auto pl = (Player*)origin.getEntity();
             return VoteClean::voteCommandExecute(pl);
         }
-        return output.error(I18nAPI::get("cleaner.command.error.playerOnly"));
-    }>();
+        return output.error(tr("cleaner.command.error.playerOnly"));
+    });
 }
 
 void RegisterCommands() {

tooth.json

@@ -1,28 +1,54 @@
 {
-    "format_version": 2,
+  "format_version": 3,
+  "format_uuid": "289f771f-2c9a-4d73-9f3f-8492495a924d",
   "tooth": "github.com/GroupMountain/Cleaner",
-    "version": "0.12.0",
+  "version": "0.16.1",
   "info": {
     "name": "Cleaner",
-        "description": "A Powerful Entities Cleaning up Plugin for BDS",
-        "author": "GroupMountain",
-        "source": "github.com/GroupMountain/Cleaner",
+    "description": "A Powerful Entities Cleaning up Mod for BDS",
     "tags": [
       "levilamina",
       "cleaner",
       "gmlib"
-        ]
+    ],
+    "avatar_url": ""
   },
-    "asset_url": "https://github.com/GroupMountain/Cleaner/releases/download/v0.12.0/Cleaner-windows-x64.zip",
-    "dependencies": {
-        "github.com/GroupMountain/GMLIB": ">=0.12.1"
-    },
-    "files": {
-        "place": [
+  "variants": [
     {
-                "src": "Cleaner/*",
+      "label": "",
+      "platform": "win-x64",
+      "dependencies": {
+        "github.com/GroupMountain/GMLIB-Release": ">=1.9.0",
+        "github.com/GroupMountain/ModAPI-Release": ">=0.4.0",
+        "github.com/MiracleForest/iListenAttentively-Release": ">=0.11.0"
+      },
+      "assets": [
+        {
+          "type": "zip",
+          "urls": [
+            "https://github.com/GroupMountain/Cleaner/releases/download/v{{version}}/Cleaner-windows-x64.zip"
+          ],
+          "placements": [
+            {
+              "type": "dir",
+              "src": "Cleaner/",
               "dest": "plugins/Cleaner"
             }
           ]
         }
+      ],
+      "preserve_files": [],
+      "remove_files": [],
+      "scripts": {
+        "pre_install": [],
+        "install": [],
+        "post_install": [],
+        "pre_pack": [],
+        "post_pack": [],
+        "pre_uninstall": [],
+        "uninstall": [],
+        "post_uninstall": []
+      }
+    }
+  ]
 }

xmake.lua

@@ -1,15 +1,20 @@
 add_rules("mode.debug", "mode.release", "mode.releasedbg")
 
 add_repositories("liteldev-repo https://github.com/LiteLDev/xmake-repo.git")
+add_repositories("groupmountain-repo https://github.com/GroupMountain/xmake-repo.git")
+add_repositories("miracleforest https://github.com/MiracleForest/xmake-repo")
 
 if not has_config("vs_runtime") then
     set_runtimes("MD")
 end
 
 -- Option 1: Use the latest version of LeviLamina released on GitHub.
-add_requires("levilamina")
+add_requires("levilamina 26.10.5", {configs = {target_type = "server"}})
+add_requires("levibuildscript")
+add_requires("gmlib 26.10.0")
+add_requires("ilistenattentively 0.12.0")
 
-target("Cleaner") -- Change this to your plugin name.
+target("Cleaner") -- Change this to your mod name.
     add_cxflags(
         "/EHa",
         "/utf-8"
@@ -17,30 +22,33 @@ target("Cleaner") -- Change this to your plugin name.
     add_files(
         "src/**.cpp"
     )
-    add_links(
-        "SDK-GMLIB/Lib/GMLIB"
-    )
     add_includedirs(
-        "SDK-GMLIB",
         "src"
     )
     add_packages(
-        "levilamina"
+        "levilamina",
+        "gmlib",
+        "ilistenattentively"
     )
-    add_shflags(
-        "/DELAYLOAD:bedrock_server.dll"
+    add_defines(
+        "NOMINMAX",
+        "UNICODE",
+        "_HAS_CXX23=1"
     )
+    add_defines("LL_PLAT_S")  --TODO: check client compatibility
+    add_rules("@levibuildscript/linkrule")
     set_exceptions("none")
     set_kind("shared")
-    set_languages("cxx23")
+    set_languages("cxx20")
+    set_symbols("debug")
 
     after_build(function (target)
-        local plugin_packer = import("scripts.after_build")
+        local mod_packer = import("scripts.after_build")
 
-        local plugin_define = {
-            pluginName = target:name(),
-            pluginFile = path.filename(target:targetfile()),
+        local mod_define = {
+            modName = target:name(),
+            modFile = path.filename(target:targetfile()),
         }
         
-        plugin_packer.pack_plugin(target,plugin_define)
+        mod_packer.pack_mod(target,mod_define)
     end)