Merge pull request 'feat: merge to main' (#1) from main into develop

Reviewed-on: #1

manifest.json

@@ -2,7 +2,7 @@
     "name": "${modName}",
     "entry": "${modFile}",
     "type": "native",
-    "version": "0.13.7",
+    "version": "0.16.1",
     "author": "GroupMountain",
     "description": "Clean Entities",
     "dependencies": [
@@ -12,5 +12,10 @@
         {
             "name": "iListenAttentively"
         }
+    ],
+    "optionalDependencies": [
+        {
+            "name": "ModAPI"
+        }
     ]
-}
+}

src/Features/Clean.cpp

@@ -1,6 +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) {

src/Features/CleanTask.cpp

@@ -1,6 +1,7 @@
 #include "Cleaner.h"
 #include <memory>
-
+#include "gmlib/mc/world/Level.h"
+#include "gmlib/gm/data/TpsStatus.h"
 namespace Cleaner {
 
 static std::shared_ptr<bool> mAutoCleanTask  = std::make_shared<bool>(false);
@@ -109,9 +110,9 @@ void CleanTaskTPS(float min_tps) {
             co_await 10s;
             if (*mCleanTaskTPS == false) co_return;
             if (auto_clean_triggerred == false) {
-                if (gmlib::GMLevel::getInstance()->getServerAverageTps() <= min_tps) {
+                if (gmlib::TpsStatus::getInstance().getLevelAverageTps() <= min_tps) {
                     auto_clean_triggerred = true;
-                    auto mspt             = S(gmlib::GMLevel::getInstance()->getServerAverageTps());
+                    auto mspt             = S(gmlib::TpsStatus::getInstance().getLevelAverageTps());
                     if (config.Basic.ConsoleLog) {
                         ll::io::LoggerRegistry::getInstance().getOrCreate("Cleaner")->warn(
                             tr("cleaner.output.triggerAutoCleanTps", {mspt})

src/Features/Events.cpp

@@ -1,5 +1,6 @@
 #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"); }
 
@@ -18,7 +19,7 @@ void ListenEvents() {
             }
         }
         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) {

src/Features/Helper.cpp

@@ -1,5 +1,5 @@
 #include "Global.h"
-
+#include "gmlib/mc/world/Level.h"
 namespace Helper {
 
 void broadcastMessage(std::string_view msg) {

src/Features/VoteClean.cpp

@@ -94,12 +94,12 @@ void voteClean(Player* pl) {
     }
     sendVoteForm(pl);
     ll::coro::keepThis([&config]() -> ll::coro::CoroTask<> {
-        co_await std::chrono::seconds::duration(config.VoteClean.Cooldown);
+        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::duration(config.VoteClean.CheckDelay);
+        co_await std::chrono::seconds(config.VoteClean.CheckDelay);
         checkVote();
         co_return;
     }).launch(ll::thread::ServerThreadExecutor::getDefault());

src/Global.h

@@ -1,7 +1,7 @@
 #pragma once
 // IWYU pragma: begin_exports
 #include "Mod.h"
-#include "gmlib/include_lib.h"
+
 #include "gmlib/include_ll.h"
 #include "ila/include_all.h"
 #include <regex>

src/Language.h

@@ -44,7 +44,7 @@ std::string zh_CN = R"(
     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 游戏刻

src/Mod.cpp

@@ -3,6 +3,8 @@
 #include "Global.h"
 #include "Language.h"
 #include "ll/api/utils/ErrorUtils.h"
+#include "gmlib/mc/locale/I18nAPI.h"
+#include "gmlib/gm/data/TpsStatus.h"
 
 namespace Cleaner {
 
@@ -14,6 +16,7 @@ Entry& Entry::getInstance() {
 bool Entry::load() { return true; }
 
 bool Entry::enable() {
+    (void)gmlib::TpsStatus::getInstance();
     mConfig.emplace();
     try {
         ll::config::loadConfig(*mConfig, getSelf().getConfigDir() / "config.json");

src/RegisterCommand.cpp

@@ -1,5 +1,7 @@
 #include "Features/Cleaner.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;
@@ -10,7 +12,7 @@ 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,
         tr("cleaner.command.cleaner"),
         CommandPermissionLevel::GameDirectors
@@ -47,7 +49,7 @@ void RegCleanerCommand() {
                 return output.success(
                     tr("cleaner.command.tps.output",
                        {S(gmlib::GMLevel::getInstance()->getServerCurrentTps()),
-                        S(gmlib::GMLevel::getInstance()->getServerAverageTps())})
+                        S(gmlib::TpsStatus::getInstance().getLevelAverageTps())})
                 );
             }
             case CleanerParam::Action::mspt: {
@@ -73,7 +75,7 @@ void RegCleanerCommand() {
 };
 
 void RegVoteCommand() {
-    auto& cmd = ll::command::CommandRegistrar::getInstance().getOrCreateCommand(
+    auto& cmd = ll::command::CommandRegistrar::getInstance(false).getOrCreateCommand(
         Cleaner::Entry::getInstance().getConfig().VoteClean.VoteCleanCommand,
         tr("cleaner.command.voteclean"),
         CommandPermissionLevel::Any

tooth.json

@@ -2,7 +2,7 @@
   "format_version": 3,
   "format_uuid": "289f771f-2c9a-4d73-9f3f-8492495a924d",
   "tooth": "github.com/GroupMountain/Cleaner",
-  "version": "0.13.7",
+  "version": "0.16.1",
   "info": {
     "name": "Cleaner",
     "description": "A Powerful Entities Cleaning up Mod for BDS",
@@ -18,14 +18,15 @@
       "label": "",
       "platform": "win-x64",
       "dependencies": {
-        "github.com/GroupMountain/GMLIB": ">=1.3.0",
+        "github.com/GroupMountain/GMLIB-Release": ">=1.9.0",
-        "github.com/MiracleForest/iListenAttentively-Release": ">=0.6.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/v0.13.7/Cleaner-windows-x64.zip"
+            "https://github.com/GroupMountain/Cleaner/releases/download/v{{version}}/Cleaner-windows-x64.zip"
           ],
           "placements": [
             {

xmake.lua

@@ -9,10 +9,10 @@ if not has_config("vs_runtime") then
 end
 
 -- Option 1: Use the latest version of LeviLamina released on GitHub.
-add_requires("levilamina 1.3.2")
+add_requires("levilamina 1.9.5", {configs = {target_type = "server"}})
-add_requires("levibuildscript 0.4.1")
+add_requires("levibuildscript 0.6.0")
-add_requires("gmlib 1.3.0")
+add_requires("gmlib 1.9.1")
-add_requires("ilistenattentively 0.6.0")
+add_requires("ilistenattentively 0.11.0")
 
 target("Cleaner") -- Change this to your mod name.
     add_cxflags(
@@ -35,6 +35,7 @@ target("Cleaner") -- Change this to your mod name.
         "UNICODE",
         "_HAS_CXX23=1"
     )
+    add_defines("LL_PLAT_S")  --TODO: check client compatibility
     add_rules("@levibuildscript/linkrule")
     set_exceptions("none")
     set_kind("shared")