feat: adapt gmlib 1.0.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"]
-  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"

README.md

@@ -101,6 +101,13 @@
         "Cooldown": 120, // 投票冷却时间 单位:秒
         "CheckDelay": 30, // 投票时长 单位:秒
         "Percentage": 50 // 投票百分比(大于此值则清理)
+    },
+    "UnloadActorClean": { // 离线实体清理
+        "Enabled": false, // 是否启用
+        "CleanList": [ // 清理实体列表
+            "minecraft:iron_golem", // 铁傀儡
+            "minecraft:zombie_pigman" // 僵尸猪灵
+        ]
     }
 }
 ```

manifest.json

@@ -2,12 +2,15 @@
     "name": "${modName}",
     "entry": "${modFile}",
     "type": "native",
-    "version": "0.13.3",
+    "version": "0.13.5",
     "author": "GroupMountain",
     "description": "Clean Entities",
     "dependencies": [
         {
             "name": "GMLIB"
+        },
+        {
+            "name": "iListenAttentively"
         }
     ]
 }

src/Config.h

@@ -91,5 +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,4 +1,5 @@
 #include "Cleaner.h"
+#include "mc/world/actor/provider/SynchedActorDataAccess.h"
 
 namespace Cleaner {
 
@@ -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()->getRuntimeActorList();
+    auto all_entities = level->getRuntimeActorList();
     for (auto entity : all_entities) {
         if (ShouldClean(entity)) {
             entity->despawn();
@@ -106,8 +110,9 @@ int ExecuteClean() {
 }
 
 int CountEntities() {
+    auto level        = ll::service::getLevel();
     int  clean_count  = 0;
-    auto all_entities = GMLIB_Level::getLevel()->getRuntimeActorList();
+    auto all_entities = level->getRuntimeActorList();
     for (auto* entity : all_entities) {
         if (ShouldClean(entity)) {
             clean_count++;

src/Features/CleanTask.cpp

@@ -10,11 +10,11 @@ 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  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);
+    auto&                config        = Cleaner::Entry::getInstance().getConfig();
+    auto                 time          = config.Basic.Notice1;
+    auto                 announce_time = config.Basic.Notice2;
+    std::chrono::seconds time_1(time);
+    std::chrono::seconds time_2(time - announce_time);
     if (config.Basic.ConsoleLog) {
         ll::io::LoggerRegistry::getInstance().getOrCreate("Cleaner")->info(
             tr("cleaner.output.count1", {S(time_1.count())})
@@ -59,7 +59,7 @@ void CleanTask() {
 }
 
 void AutoCleanTask(int seconds) {
-    auto time = std::chrono::seconds::duration(seconds);
+    std::chrono::seconds time(seconds);
     *mAutoCleanTask = true;
     ll::coro::keepThis([time]() -> ll::coro::CoroTask<> {
         while (true) {
@@ -72,7 +72,7 @@ void AutoCleanTask(int seconds) {
 }
 
 void CleanTaskCount(int max_entities) {
-    auto& config = Cleaner::Entry::getInstance().getConfig();
+    auto& config     = Cleaner::Entry::getInstance().getConfig();
     *mCleanTaskCount = true;
     ll::coro::keepThis([max_entities, &config]() -> ll::coro::CoroTask<> {
         while (true) {
@@ -83,7 +83,9 @@ void CleanTaskCount(int max_entities) {
                 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)}));
+                        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)}));
@@ -100,16 +102,16 @@ void CleanTaskCount(int max_entities) {
 }
 
 void CleanTaskTPS(float min_tps) {
-    auto& config = Cleaner::Entry::getInstance().getConfig();
+    auto& config   = Cleaner::Entry::getInstance().getConfig();
     *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::GMLevel::getInstance()->getServerAverageTps() <= min_tps) {
                     auto_clean_triggerred = true;
-                    auto mspt             = S(GMLIB_Level::getLevel()->getServerAverageTps());
+                    auto mspt             = S(gmlib::GMLevel::getInstance()->getServerAverageTps());
                     if (config.Basic.ConsoleLog) {
                         ll::io::LoggerRegistry::getInstance().getOrCreate("Cleaner")->warn(
                             tr("cleaner.output.triggerAutoCleanTps", {mspt})

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

@@ -26,4 +26,10 @@ namespace VoteClean {
 
 extern void voteCommandExecute(Player* pl);
 
+}
+
+namespace UnloadActorClean {
+
+extern void cleanUnloadActor();
+
 }

src/Features/Events.cpp

@@ -1,44 +1,39 @@
 #include "Cleaner.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();
-                if (pl->isPlayer() && !pl->isAlive()) { // Death Drop
-                    auto ac = (GMLIB_Actor*)&item;
-                    setShouldIgnore(ac);
+    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::GMActor*)&item;
+                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;
-                auto list       = config.ItemDespawn.WhiteList;
-                auto type       = item.item().getTypeName();
-                for (auto& key : list) {
-                    if (isMatch(type, key)) {
-                        return;
-                    }
-                }
-                item.lifeTime() = config.ItemDespawn.DespawnTime;
-            }
+            item.lifeTime() = config.ItemDespawn.DespawnTime;
         }
-    );
+    });
     // MobTakeItemEvent
-    eventBus.emplaceListener<GMLIB::Event::EntityEvent::MobPickupItemAfterEvent>(
-        [](GMLIB::Event::EntityEvent::MobPickupItemAfterEvent& event) {
-            auto mob = (GMLIB_Actor*)&event.self();
-            setShouldIgnore(mob);
-        }
-    );
+    eventBus.emplaceListener<ila::mc::ActorPickupItemAfterEvent>([](ila::mc::ActorPickupItemAfterEvent& event) {
+        auto mob = (gmlib::GMActor*)&event.self();
+        setShouldIgnore(mob);
+    });
 }
 
 } // namespace Cleaner

src/Features/Helper.cpp

@@ -3,11 +3,11 @@
 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/Global.h

@@ -1,7 +1,11 @@
 #pragma once
+// IWYU pragma: begin_exports
 #include "Mod.h"
-#include <include_all.h>
+#include "gmlib/include_lib.h"
+#include "gmlib/include_ll.h"
+#include "ila/include_all.h"
 #include <regex>
+// IWYU pragma: end_exports
 
 #define S(x) std::to_string(x)
 

src/Mod.cpp

@@ -2,6 +2,7 @@
 #include "Features/Cleaner.h"
 #include "Global.h"
 #include "Language.h"
+#include "ll/api/utils/ErrorUtils.h"
 
 namespace Cleaner {
 
@@ -14,11 +15,15 @@ bool Entry::load() { return true; }
 
 bool Entry::enable() {
     mConfig.emplace();
-    ll::config::loadConfig(*mConfig, getSelf().getConfigDir() / "config.json");
+    try {
+        ll::config::loadConfig(*mConfig, getSelf().getConfigDir() / "config.json");
+    } catch (...) {
+        ll::error_utils::printCurrentException(getSelf().getLogger());
+    }
     saveConfig();
-    I18nAPI::updateOrCreateLanguageFile(getSelf().getLangDir(), "en_US", en_US);
-    I18nAPI::updateOrCreateLanguageFile(getSelf().getLangDir(), "zh_CN", zh_CN);
-    I18nAPI::loadLanguagesFromDirectory(getSelf().getLangDir());
+    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();
@@ -43,5 +48,5 @@ void Entry::saveConfig() { ll::config::saveConfig(*mConfig, getSelf().getConfigD
 LL_REGISTER_MOD(Cleaner::Entry, Cleaner::Entry::getInstance());
 
 std::string tr(std::string const& key, std::vector<std::string> const& params) {
-    return I18nAPI::get(key, params, Cleaner::Entry::getInstance().getConfig().language);
+    return gmlib::I18nAPI::get(key, params);
 }

src/RegisterCommand.cpp

@@ -15,10 +15,8 @@ void RegCleanerCommand() {
         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(tr("cleaner.command.error.noTarget"));
@@ -27,10 +25,10 @@ void RegCleanerCommand() {
                 en->despawn();
             }
             return output.success(tr("cleaner.command.despawnSuccess", {S(ens.size())}));
-        });
-    cmd.overload<CleanerParam>()
-        .required("action")
-        .execute([&](CommandOrigin const& origin, CommandOutput& output, CleanerParam const& param) {
+        }
+    );
+    cmd.overload<CleanerParam>().required("action").execute(
+        [&](CommandOrigin const& origin, CommandOutput& output, CleanerParam const& param) {
             switch (param.action) {
             case CleanerParam::Action::clean: {
                 Cleaner::CleanTask();
@@ -46,15 +44,15 @@ void RegCleanerCommand() {
                 return output.success(tr("cleaner.command.clean.output"));
             }
             case CleanerParam::Action::tps: {
-                return output.success(tr(
-                    "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::GMLevel::getInstance()->getServerAverageTps())})
+                );
             }
             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: {
@@ -62,7 +60,8 @@ void RegCleanerCommand() {
                 return output.success(tr("cleaner.output.reload"));
             }
             }
-        });
+        }
+    );
     cmd.overload<CleanerParam>()
         .required("despawntime")
         .required("ticks")

tooth.json

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

@@ -2,15 +2,17 @@ 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("levibuildscript")
-add_requires("gmlib")
+add_requires("levilamina 1.1.1")
+add_requires("levibuildscript 0.3.0")
+add_requires("gmlib 1.0.0")
+add_requires("ilistenattentively 0.4.1")
 
 target("Cleaner") -- Change this to your mod name.
     add_cxflags(
@@ -25,19 +27,18 @@ target("Cleaner") -- Change this to your mod name.
     )
     add_packages(
         "levilamina",
-        "gmlib"
+        "gmlib",
+        "ilistenattentively"
     )
     add_defines(
         "NOMINMAX", 
-        "UNICODE", 
-        "_HAS_CXX17",
-        "_HAS_CXX20",
-        "_HAS_CXX23"
+        "UNICODE",
+        "_HAS_CXX23=1"
     )
     add_rules("@levibuildscript/linkrule")
     set_exceptions("none")
     set_kind("shared")
-    set_languages("cxx23")
+    set_languages("cxx20")
 
     after_build(function (target)
         local mod_packer = import("scripts.after_build")