feat: adapt levlamina 1.6.x

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++23"]
+  Add:
-  Remove: ["/Yu_HeaderOutputPredefine.h", "/FI_HeaderOutputPredefine.h"]
+    - "-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

@@ -16,7 +16,8 @@ jobs:
 
       - uses: xmake-io/github-action-setup-xmake@v1
         with:
-          xmake-version: latest
+          xmake-version: 3.0.0
+          
       - run: |
           xmake repo -u
 
@@ -26,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

@@ -16,7 +16,8 @@ jobs:
 
       - uses: xmake-io/github-action-setup-xmake@v1
         with:
-          xmake-version: latest
+          xmake-version: 3.0.0
+          
       - run: |
           xmake repo -u
 
@@ -26,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: |
@@ -41,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/

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}",
+    "name": "${modName}",
-    "entry": "${pluginFile}",
+    "entry": "${modFile}",
     "type": "native",
-    "version": "0.13.0",
+    "version": "0.15.0",
     "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 outputdir = path.join(bindir, mod_define.modName)
-        local targetfile = path.join(outputdir, plugin_define.pluginFile)
+        local targetfile = path.join(outputdir, mod_define.modFile)
-        local pdbfile = path.join(outputdir, path.basename(plugin_define.pluginFile) .. ".pdb")
+        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,7 +1,8 @@
 #pragma once
-#include <iostream>
+#include <string>
 #include <vector>
 
+namespace Cleaner {
 struct Config {
     int version = 2;
 
@@ -90,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) {
+bool isTrust(Actor* ac) { return SynchedActorDataAccess::getActorFlag(ac->getEntityContext(), ::ActorFlags::Trusting); }
-    if (ac->isMob() || ac->isItemActor()) {
+
-        if (ac->isTame() || ac->isTrusting() || ac->getNameTag() != "" || ac->hasTag("cleaner:ignore")) {
+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();
+    auto all_entities = level->getRuntimeActorList();
-    for (auto entity : all_entities) {
+    for (auto* entity : all_entities) {
         if (ShouldClean(entity)) {
             clean_count++;
         }

src/Features/CleanTask.cpp

@@ -1,21 +1,25 @@
 #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<bool> mAutoCleanTask  = std::make_shared<bool>(false);
-static std::shared_ptr<ll::schedule::task::Task<ll::chrono::ServerClock>> mCleanTaskCount = nullptr;
+static std::shared_ptr<bool> mCleanTaskCount = std::make_shared<bool>(false);
-static std::shared_ptr<ll::schedule::task::Task<ll::chrono::ServerClock>> mCleanTaskTPS   = nullptr;
+static std::shared_ptr<bool> mCleanTaskTPS   = std::make_shared<bool>(false);
 
 bool auto_clean_triggerred = false;
 
 void CleanTask() {
-    auto& config        = Cleaner::Entry::getInstance().getConfig();
+    auto&                config        = Cleaner::Entry::getInstance().getConfig();
-    auto  time          = config.Basic.Notice1;
+    auto                 time          = config.Basic.Notice1;
-    auto  announce_time = config.Basic.Notice2;
+    auto                 announce_time = config.Basic.Notice2;
-    auto  time_1        = std::chrono::seconds::duration(time);
+    std::chrono::seconds time_1(time);
-    auto  time_2        = std::chrono::seconds::duration(time - announce_time);
+    std::chrono::seconds time_2(time - announce_time);
     if (config.Basic.ConsoleLog) {
-        logger.info(tr("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(tr("cleaner.output.count1", {S(time_1.count())}));
@@ -23,9 +27,12 @@ void CleanTask() {
     if (config.Basic.SendToast) {
         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(tr("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(tr("cleaner.output.count2", {S(announce_time)}));
@@ -33,11 +40,13 @@ void CleanTask() {
         if (config.Basic.SendToast) {
             Helper::broadcastToast(tr("cleaner.output.count2", {S(announce_time)}));
         }
-    });
+        co_return;
-    Cleaner::Entry::getInstance().getScheduler().add<DelayTask>(time_1, [&config] {
+    }).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(tr("cleaner.output.finish", {S(count)}));
+            ll::io::LoggerRegistry::getInstance().getOrCreate("Cleaner")->info(tr("cleaner.output.finish", {S(count)}));
         }
         if (config.Basic.SendBroadcast) {
             Helper::broadcastMessage(tr("cleaner.output.finish", {S(count)}));
@@ -46,70 +55,92 @@ void CleanTask() {
             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);
+    std::chrono::seconds time(seconds);
-    mAutoCleanTask = Cleaner::Entry::getInstance().getScheduler().add<RepeatTask>(time, [] { CleanTask(); });
+    *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();
+    auto& config     = Cleaner::Entry::getInstance().getConfig();
-    mCleanTaskCount = Cleaner::Entry::getInstance().getScheduler().add<RepeatTask>(10s, [max_entities, &config] {
+    *mCleanTaskCount = true;
-        auto count = CountEntities();
+    ll::coro::keepThis([max_entities, &config]() -> ll::coro::CoroTask<> {
-        if (auto_clean_triggerred == false) {
+        while (true) {
-            if (count >= max_entities) {
+            co_await 10s;
-                auto_clean_triggerred = true;
+            if (*mCleanTaskCount == false) co_return;
-                if (config.Basic.ConsoleLog) {
+            auto count = CountEntities();
-                    logger.warn(tr("cleaner.output.triggerAutoCleanCount", {S(count)}));
+            if (auto_clean_triggerred == false) {
+                if (count >= max_entities) {
+                    auto_clean_triggerred = true;
+                    if (config.Basic.ConsoleLog) {
+                        ll::io::LoggerRegistry::getInstance().getOrCreate("Cleaner")->warn(
+                            tr("cleaner.output.triggerAutoCleanCount", {S(count)})
+                        );
+                    }
+                    if (config.Basic.SendBroadcast) {
+                        Helper::broadcastMessage(tr("cleaner.output.triggerAutoCleanCount", {S(count)}));
+                    }
+                    if (config.Basic.SendToast) {
+                        Helper::broadcastToast(tr("cleaner.output.triggerAutoCleanCount", {S(count)}));
+                    }
+                    CleanTask();
                 }
-                if (config.Basic.SendBroadcast) {
-                    Helper::broadcastMessage(tr("cleaner.output.triggerAutoCleanCount", {S(count)}));
-                }
-                if (config.Basic.SendToast) {
-                    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();
+    auto& config   = Cleaner::Entry::getInstance().getConfig();
-    mCleanTaskTPS = Cleaner::Entry::getInstance().getScheduler().add<RepeatTask>(10s, [min_tps, &config] {
+    *mCleanTaskTPS = true;
-        if (auto_clean_triggerred == false) {
+    ll::coro::keepThis([min_tps, &config]() -> ll::coro::CoroTask<> {
-            if (GMLIB_Level::getLevel()->getServerAverageTps() <= min_tps) {
+        while (true) {
-                auto_clean_triggerred = true;
+            co_await 10s;
-                auto mspt             = S(GMLIB_Level::getLevel()->getServerAverageTps());
+            if (*mCleanTaskTPS == false) co_return;
-                if (config.Basic.ConsoleLog) {
+            if (auto_clean_triggerred == false) {
-                    logger.warn(tr("cleaner.output.triggerAutoCleanTps", {mspt}));
+                if (gmlib::TpsStatus::getInstance().getLevelAverageTps() <= min_tps) {
+                    auto_clean_triggerred = true;
+                    auto mspt             = S(gmlib::TpsStatus::getInstance().getLevelAverageTps());
+                    if (config.Basic.ConsoleLog) {
+                        ll::io::LoggerRegistry::getInstance().getOrCreate("Cleaner")->warn(
+                            tr("cleaner.output.triggerAutoCleanTps", {mspt})
+                        );
+                    }
+                    if (config.Basic.SendBroadcast) {
+                        Helper::broadcastMessage(tr("cleaner.output.triggerAutoCleanTps", {mspt}));
+                    }
+                    if (config.Basic.SendToast) {
+                        Helper::broadcastToast(tr("cleaner.output.triggerAutoCleanTps", {mspt}));
+                    }
+                    CleanTask();
                 }
-                if (config.Basic.SendBroadcast) {
-                    Helper::broadcastMessage(tr("cleaner.output.triggerAutoCleanTps", {mspt}));
-                }
-                if (config.Basic.SendToast) {
-                    Helper::broadcastToast(tr("cleaner.output.triggerAutoCleanTps", {mspt}));
-                }
-                CleanTask();
             }
         }
-    });
+        co_return;
+    }).launch(ll::thread::ServerThreadExecutor::getDefault());
 }
 
 void stopAllTasks() {
     if (!mCleanTaskCount) {
-        mCleanTaskTPS->cancel();
+        *mCleanTaskTPS = false;
-        Cleaner::Entry::getInstance().getScheduler().remove(mCleanTaskTPS);
     }
     if (mCleanTaskCount) {
-        mCleanTaskCount->cancel();
+        *mCleanTaskCount = false;
-        Cleaner::Entry::getInstance().getScheduler().remove(mCleanTaskCount);
     }
     if (mAutoCleanTask) {
-        mAutoCleanTask->cancel();
+        *mAutoCleanTask = false;
-        Cleaner::Entry::getInstance().getScheduler().remove(mAutoCleanTask);
     }
 }
 } // 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,6 @@
 #pragma once
 #include "Global.h"
 
-using namespace ll::schedule;
 using namespace ll::chrono_literals;
 
 namespace Cleaner {
@@ -27,4 +26,10 @@ namespace VoteClean {
 
 extern void voteCommandExecute(Player* pl);
 
+}
+
+namespace UnloadActorClean {
+
+extern void cleanUnloadActor();
+
 }

src/Features/Events.cpp

@@ -1,44 +1,40 @@
 #include "Cleaner.h"
-
+#include "gmlib/mc/world/Level.h"
+#include "gmlib/mc/world/actor/Player.h"
 namespace Cleaner {
-
+void setShouldIgnore(gmlib::GMActor* ac) { ac->addTag("cleaner:ignore"); }
-void setShouldIgnore(GMLIB_Actor* 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>(
+    eventBus.emplaceListener<ila::mc::SpawnItemActorAfterEvent>([&config](ila::mc::SpawnItemActorAfterEvent& event) {
-        [&config](GMLIB::Event::EntityEvent::ItemActorSpawnAfterEvent& event) {
+        auto& item = event.itemActor();
-            auto& item = event.getItemActor();
+        if (event.spawner()) {
-            if (event.getSpawner().has_value()) {
+            auto pl = (gmlib::GMPlayer*)event.spawner();
-                auto pl = (GMLIB_Player*)event.getSpawner().as_ptr();
+            if (pl->isPlayer() && !pl->isAlive()) { // Death Drop
-                if (pl->isPlayer() && !pl->isAlive()) { // Death Drop
+                auto ac = (gmlib::GMActor*)&item;
-                    auto ac = (GMLIB_Actor*)&item;
+                setShouldIgnore(ac);
-                    setShouldIgnore(ac);
+                return;
+            }
+        }
+        if (config.ItemDespawn.Enabled) {
+            // item.lifeTime() = config.ItemDespawn.DespawnTime;
+            auto list        = config.ItemDespawn.WhiteList;
+            auto type        = item.item().getTypeName();
+            for (auto& key : list) {
+                if (isMatch(type, key)) {
                     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) {
-                    if (isMatch(type, key)) {
-                        return;
-                    }
-                }
-                item.lifeTime() = config.ItemDespawn.DespawnTime;
-            }
         }
-    );
+    });
     // MobTakeItemEvent
-    eventBus.emplaceListener<GMLIB::Event::EntityEvent::MobPickupItemAfterEvent>(
+    eventBus.emplaceListener<ila::mc::ActorPickupItemAfterEvent>([](ila::mc::ActorPickupItemAfterEvent& event) {
-        [](GMLIB::Event::EntityEvent::MobPickupItemAfterEvent& event) {
+        auto mob = (gmlib::GMActor*)&event.self();
-            auto mob = (GMLIB_Actor*)&event.self();
+        setShouldIgnore(mob);
-            setShouldIgnore(mob);
+    });
-        }
-    );
 }
 
 } // namespace Cleaner

src/Features/Helper.cpp

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

src/Features/UnloadActorClean.cpp

@@ -0,0 +1,19 @@
+#include "Cleaner.h"
+#include "Global.h"
+#include "gmlib/mc/world/actor/UnloadedActor.h"
+
+namespace UnloadActorClean {
+void cleanUnloadActor() {
+    auto& config = Cleaner::Entry::getInstance().getConfig();
+    gmlib::UnloadedActor::foreachUnloadedActor(
+        [config](gmlib::UnloadedActor& actor) -> bool {
+            for (auto& actorname : config.UnloadActorClean.CleanList) {
+                if (actor.getTypeName() == actorname) {
+                    actor.remove();
+                }
+            }
+            return true;
+        }
+    );
+}
+} // 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 {
@@ -95,10 +93,16 @@ void voteClean(Player* pl) {
         Helper::broadcastToast(tr("cleaner.vote.voteMessage", {pl->getRealName()}));
     }
     sendVoteForm(pl);
-    auto cooldown = std::chrono::seconds::duration(config.VoteClean.Cooldown);
+    ll::coro::keepThis([&config]() -> ll::coro::CoroTask<> {
-    auto waitTime = std::chrono::seconds::duration(config.VoteClean.CheckDelay);
+        co_await std::chrono::seconds(config.VoteClean.Cooldown);
-    Cleaner::Entry::getInstance().getScheduler().add<DelayTask>(cooldown, [] { canVote = false; });
+        canVote = true;
-    Cleaner::Entry::getInstance().getScheduler().add<DelayTask>(waitTime, [] { checkVote(); });
+        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) {

src/Global.h

@@ -1,12 +1,14 @@
 #pragma once
-#include "Plugin.h"
+// IWYU pragma: begin_exports
-#include <include_all.h>
+#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 {

src/Language.h

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

src/MemoryOperators.cpp

@@ -1,5 +1,5 @@
-// This file will make your plugin use LeviLamina's memory operators by default.
+// This file will make your mod use LeviLamina's memory operators by default.
-// This improves the memory management of your plugin and is recommended to use.
+// 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,52 @@
+#include "Mod.h"
+#include "Features/Cleaner.h"
+#include "Global.h"
+#include "Language.h"
+#include "ll/api/utils/ErrorUtils.h"
+#include "gmlib/mc/locale/I18nAPI.h"
+namespace Cleaner {
+
+Entry& Entry::getInstance() {
+    static Entry instance;
+    return instance;
+}
+
+bool Entry::load() { return true; }
+
+bool Entry::enable() {
+    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());
+    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;
+}
+
+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,51 +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_MOD(Cleaner::Entry, Cleaner::instance);
-
-std::string tr(std::string const& key, std::vector<std::string> const& params) {
-    return I18nAPI::get(key, params, Cleaner::Entry::getInstance().getConfig().language);
-}

src/Plugin.h

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

src/RegisterCommand.cpp

@@ -1,6 +1,6 @@
 #include "Features/Cleaner.h"
-#include "Plugin.h"
+#include "gmlib/mc/world/Level.h"
-
+#include "gmlib/gm/data/TpsStatus.h"
 struct CleanerParam {
     enum class Despawn { despawn } despawn;
     enum class Action { tps, clean, reload, mspt } action;
@@ -16,10 +16,8 @@ void RegCleanerCommand() {
         tr("cleaner.command.cleaner"),
         CommandPermissionLevel::GameDirectors
     );
-    cmd.overload<CleanerParam>()
+    cmd.overload<CleanerParam>().required("despawn").required("entity").execute(
-        .required("despawn")
+        [&](CommandOrigin const& origin, CommandOutput& output, CleanerParam const& param) {
-        .required("entity")
-        .execute<[&](CommandOrigin const& origin, CommandOutput& output, CleanerParam const& param) {
             auto ens = param.entity.results(origin);
             if (ens.empty()) {
                 return output.error(tr("cleaner.command.error.noTarget"));
@@ -28,15 +26,15 @@ void RegCleanerCommand() {
                 en->despawn();
             }
             return output.success(tr("cleaner.command.despawnSuccess", {S(ens.size())}));
-        }>();
+        }
-    cmd.overload<CleanerParam>()
+    );
-        .required("action")
+    cmd.overload<CleanerParam>().required("action").execute(
-        .execute<[&](CommandOrigin const& origin, CommandOutput& output, CleanerParam const& param) {
+        [&](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(tr("cleaner.output.opClean"));
+                    ll::io::LoggerRegistry::getInstance().getOrCreate("Cleaner")->info(tr("cleaner.output.opClean"));
                 }
                 if (Cleaner::Entry::getInstance().getConfig().Basic.SendBroadcast) {
                     Helper::broadcastMessage(tr("cleaner.output.opClean"));
@@ -47,15 +45,15 @@ void RegCleanerCommand() {
                 return output.success(tr("cleaner.command.clean.output"));
             }
             case CleanerParam::Action::tps: {
-                return output.success(tr(
+                return output.success(
-                    "cleaner.command.tps.output",
+                    tr("cleaner.command.tps.output",
-                    {S(GMLIB_Level::getLevel()->getServerCurrentTps()),
+                       {S(gmlib::GMLevel::getInstance()->getServerCurrentTps()),
-                     S(GMLIB_Level::getLevel()->getServerAverageTps())}
+                        S(gmlib::TpsStatus::getInstance().getLevelAverageTps())})
-                ));
+                );
             }
             case CleanerParam::Action::mspt: {
                 return output.success(
-                    tr("cleaner.command.mspt.output", {S(GMLIB_Level::getLevel()->getServerMspt())})
+                    tr("cleaner.command.mspt.output", {S(gmlib::GMLevel::getInstance()->getServerMspt())})
                 );
             }
             case CleanerParam::Action::reload: {
@@ -63,15 +61,16 @@ void RegCleanerCommand() {
                 return output.success(tr("cleaner.output.reload"));
             }
             }
-        }>();
+        }
+    );
     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(tr("cleaner.command.despawntime", {S(param.ticks)}));
-        }>();
+        });
 };
 
 void RegVoteCommand() {
@@ -80,13 +79,13 @@ void RegVoteCommand() {
         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(tr("cleaner.command.error.playerOnly"));
-    }>();
+    });
 }
 
 void RegisterCommands() {

tooth.json

@@ -1,28 +1,54 @@
 {
-    "format_version": 2,
+  "format_version": 3,
-    "tooth": "github.com/GroupMountain/Cleaner",
+  "format_uuid": "289f771f-2c9a-4d73-9f3f-8492495a924d",
-    "version": "0.13.0",
+  "tooth": "github.com/GroupMountain/Cleaner",
-    "info": {
+  "version": "0.15.0",
-        "name": "Cleaner",
+  "info": {
-        "description": "A Powerful Entities Cleaning up Plugin for BDS",
+    "name": "Cleaner",
-        "author": "GroupMountain",
+    "description": "A Powerful Entities Cleaning up Mod for BDS",
-        "source": "github.com/GroupMountain/Cleaner",
+    "tags": [
-        "tags": [
+      "levilamina",
-            "levilamina",
+      "cleaner",
-            "cleaner",
+      "gmlib"
-            "gmlib"
+    ],
-        ]
+    "avatar_url": ""
-    },
+  },
-    "asset_url": "https://github.com/GroupMountain/Cleaner/releases/download/v0.13.0/Cleaner-windows-x64.zip",
+  "variants": [
-    "dependencies": {
+    {
-        "github.com/GroupMountain/GMLIB": ">=0.13.0"
+      "label": "",
-    },
+      "platform": "win-x64",
-    "files": {
+      "dependencies": {
-        "place": [
+        "github.com/GroupMountain/GMLIB-Release": ">=1.6.0",
+        "github.com/GroupMountain/ModAPI-Release": ">=0.2.0",
+        "github.com/MiracleForest/iListenAttentively-Release": ">=0.9.0"
+      },
+      "assets": [
+        {
+          "type": "zip",
+          "urls": [
+            "https://github.com/GroupMountain/Cleaner/releases/download/v{{version}}/Cleaner-windows-x64.zip"
+          ],
+          "placements": [
             {
-                "src": "Cleaner/*",
+              "type": "dir",
-                "dest": "plugins/Cleaner"
+              "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

@@ -2,16 +2,19 @@ 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 1.6.1")
-add_requires("gmlib")
+add_requires("levibuildscript 0.5.2")
+add_requires("gmlib 1.6.0")
+add_requires("ilistenattentively 0.9.0")
 
-target("Cleaner") -- Change this to your plugin name.
+target("Cleaner") -- Change this to your mod name.
     add_cxflags(
         "/EHa",
         "/utf-8"
@@ -24,22 +27,27 @@ target("Cleaner") -- Change this to your plugin name.
     )
     add_packages(
         "levilamina",
-        "gmlib"
+        "gmlib",
+        "ilistenattentively"
     )
-    add_shflags(
+    add_defines(
-        "/DELAYLOAD:bedrock_server.dll"
+        "NOMINMAX", 
+        "UNICODE",
+        "_HAS_CXX23=1"
     )
+    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 = {
+        local mod_define = {
-            pluginName = target:name(),
+            modName = target:name(),
-            pluginFile = path.filename(target:targetfile()),
+            modFile = path.filename(target:targetfile()),
         }
         
-        plugin_packer.pack_plugin(target,plugin_define)
+        mod_packer.pack_mod(target,mod_define)
     end)