Merge pull request #21 from GroupMountain/develop

adapt: adapt LeviLamina 1.0.0-rc.3 and GMLIB-0.9.10

.github/workflows/build.yml

@@ -26,7 +26,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

@@ -26,7 +26,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 +41,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/

manifest.json

@@ -2,7 +2,7 @@
     "name": "${modName}",
     "entry": "${modFile}",
     "type": "native",
-    "version": "0.13.2",
+    "version": "0.13.3",
     "author": "GroupMountain",
     "description": "Clean Entities",
     "dependencies": [

src/Config.h

@@ -1,7 +1,8 @@
 #pragma once
-#include <iostream>
+#include <string>
 #include <vector>
 
+namespace Cleaner {
 struct Config {
     int version = 2;
 
@@ -91,3 +92,4 @@ struct Config {
         int         Percentage       = 50;
     } VoteClean;
 };
+} // namespace Cleaner

src/Features/CleanTask.cpp

@@ -1,10 +1,11 @@
 #include "Cleaner.h"
+#include <memory>
 
 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;
 
@@ -15,7 +16,9 @@ void CleanTask() {
     auto  time_1        = std::chrono::seconds::duration(time);
     auto  time_2        = std::chrono::seconds::duration(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 +26,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 +39,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 +54,90 @@ 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);
+    auto time = std::chrono::seconds::duration(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_Level::getLevel()->getServerAverageTps() <= min_tps) {
+                    auto_clean_triggerred = true;
+                    auto mspt             = S(GMLIB_Level::getLevel()->getServerAverageTps());
+                    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.h

@@ -1,7 +1,6 @@
 #pragma once
 #include "Global.h"
 
-using namespace ll::schedule;
 using namespace ll::chrono_literals;
 
 namespace Cleaner {

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::duration(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::duration(config.VoteClean.CheckDelay);
+        checkVote();
+        co_return;
+    }).launch(ll::thread::ServerThreadExecutor::getDefault());
 }
 
 void confirmForm(Player* pl) {

src/Global.h

@@ -5,8 +5,6 @@
 
 #define S(x) std::to_string(x)
 
-extern ll::Logger logger;
-
 extern void RegisterCommands();
 
 namespace Helper {

src/Mod.cpp

@@ -1,20 +1,19 @@
+#include "Mod.h"
 #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() {
-
+    static Entry instance;
-Entry& Entry::getInstance() { return *instance; }
+    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);
@@ -23,16 +22,15 @@ bool Entry::enable() {
     Cleaner::ListenEvents();
     RegisterCommands();
     Cleaner::loadCleaner();
-    logger.info("Cleaner Loaded!");
+    getSelf().getLogger().info("Cleaner Loaded!");
-    logger.info("Author: GroupMountain");
+    getSelf().getLogger().info("Author: GroupMountain");
-    logger.info("Repository: https://github.com/GroupMountain/Cleaner");
+    getSelf().getLogger().info("Repository: https://github.com/GroupMountain/Cleaner");
     return true;
 }
 
 bool Entry::disable() {
     mConfig.reset();
     Cleaner::unloadCleaner();
-    mScheduler.reset();
     return true;
 }
 
@@ -40,11 +38,9 @@ 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);
+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);

src/Mod.h

@@ -2,18 +2,15 @@
 
 #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) {}
+    Entry() : mSelf(*ll::mod::NativeMod::current()) {}
 
     [[nodiscard]] ll::mod::NativeMod& getSelf() const { return mSelf; }
 
@@ -34,12 +31,9 @@ public:
 
     void saveConfig();
 
-    ServerTimeScheduler& getScheduler();
-
 private:
-    ll::mod::NativeMod&                mSelf;
+    ll::mod::NativeMod&   mSelf;
-    std::optional<Config>              mConfig;
+    std::optional<Config> mConfig;
-    std::optional<ServerTimeScheduler> mScheduler;
 };
 
 } // namespace Cleaner

src/RegisterCommand.cpp

@@ -1,5 +1,4 @@
 #include "Features/Cleaner.h"
-#include "Mod.h"
 
 struct CleanerParam {
     enum class Despawn { despawn } despawn;
@@ -19,7 +18,7 @@ void RegCleanerCommand() {
     cmd.overload<CleanerParam>()
         .required("despawn")
         .required("entity")
-        .execute<[&](CommandOrigin const& origin, CommandOutput& output, CleanerParam const& param) {
+        .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 +27,15 @@ 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) {
+        .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(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"));
@@ -63,15 +62,15 @@ 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,7 +1,7 @@
 {
     "format_version": 2,
     "tooth": "github.com/GroupMountain/Cleaner",
-    "version": "0.13.2",
+    "version": "0.13.3",
     "info": {
         "name": "Cleaner",
         "description": "A Powerful Entities Cleaning up Mod for BDS",
@@ -13,9 +13,9 @@
             "gmlib"
         ]
     },
-    "asset_url": "https://github.com/GroupMountain/Cleaner/releases/download/v0.13.2/Cleaner-windows-x64.zip",
+    "asset_url": "https://github.com/GroupMountain/Cleaner/releases/download/v0.13.3/Cleaner-windows-x64.zip",
     "dependencies": {
-        "github.com/GroupMountain/GMLIB": ">=0.13.7"
+        "github.com/GroupMountain/GMLIB": ">=1.0.0-rc.3"
     },
     "files": {
         "place": [

xmake.lua

@@ -9,7 +9,8 @@ end
 
 -- Option 1: Use the latest version of LeviLamina released on GitHub.
 add_requires("levilamina")
-add_requires("gmlib 0.13.7")
+add_requires("levibuildscript")
+add_requires("gmlib")
 
 target("Cleaner") -- Change this to your mod name.
     add_cxflags(
@@ -26,9 +27,14 @@ target("Cleaner") -- Change this to your mod name.
         "levilamina",
         "gmlib"
     )
-    add_shflags(
+    add_defines(
-        "/DELAYLOAD:bedrock_server.dll"
+        "NOMINMAX", 
+        "UNICODE", 
+        "_HAS_CXX17",
+        "_HAS_CXX20",
+        "_HAS_CXX23"
     )
+    add_rules("@levibuildscript/linkrule")
     set_exceptions("none")
     set_kind("shared")
     set_languages("cxx23")