wed150/Cleaner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: merge to main #1

Merged
wed150 merged 27 commits from main into develop 2026-07-03 20:29:43 +08:00
Conversation 0 Commits 27 Files Changed 20
+12 -10
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 04856f7e6f - Show all commits
src/RegisterCommand.cpp
+3 -2
View File
@@ -1,6 +1,7 @@
#include "Features/Cleaner.h" #include "Features/Cleaner.h"
#include "gmlib/mc/world/Level.h" #include "gmlib/mc/world/Level.h"
#include "gmlib/gm/data/TpsStatus.h" #include "gmlib/gm/data/TpsStatus.h"
#include "mc/server/commands/CommandOutput.h"
struct CleanerParam { struct CleanerParam {
enum class Despawn { despawn } despawn; enum class Despawn { despawn } despawn;
enum class Action { tps, clean, reload, mspt } action; enum class Action { tps, clean, reload, mspt } action;
@@ -11,7 +12,7 @@ struct CleanerParam {
void RegCleanerCommand() { void RegCleanerCommand() {
auto& config = Cleaner::Entry::getInstance().getConfig(); auto& config = Cleaner::Entry::getInstance().getConfig();
auto& cmd = ll::command::CommandRegistrar::getInstance().getOrCreateCommand( auto& cmd = ll::command::CommandRegistrar::getInstance(false).getOrCreateCommand(
config.Basic.Command, config.Basic.Command,
tr("cleaner.command.cleaner"), tr("cleaner.command.cleaner"),
CommandPermissionLevel::GameDirectors CommandPermissionLevel::GameDirectors
@@ -74,7 +75,7 @@ void RegCleanerCommand() {
}; };
void RegVoteCommand() { void RegVoteCommand() {
auto& cmd = ll::command::CommandRegistrar::getInstance().getOrCreateCommand( auto& cmd = ll::command::CommandRegistrar::getInstance(false).getOrCreateCommand(
Cleaner::Entry::getInstance().getConfig().VoteClean.VoteCleanCommand, Cleaner::Entry::getInstance().getConfig().VoteClean.VoteCleanCommand,
tr("cleaner.command.voteclean"), tr("cleaner.command.voteclean"),
CommandPermissionLevel::Any CommandPermissionLevel::Any
tooth.json
+4 -4
View File
@@ -2,7 +2,7 @@
"format_version": 3, "format_version": 3,
"format_uuid": "289f771f-2c9a-4d73-9f3f-8492495a924d", "format_uuid": "289f771f-2c9a-4d73-9f3f-8492495a924d",
"tooth": "github.com/GroupMountain/Cleaner", "tooth": "github.com/GroupMountain/Cleaner",
"version": "0.15.1", "version": "0.16.0",
"info": { "info": {
"name": "Cleaner", "name": "Cleaner",
"description": "A Powerful Entities Cleaning up Mod for BDS", "description": "A Powerful Entities Cleaning up Mod for BDS",
@@ -18,9 +18,9 @@
"label": "", "label": "",
"platform": "win-x64", "platform": "win-x64",
"dependencies": { "dependencies": {
"github.com/GroupMountain/GMLIB-Release": ">=1.6.0", "github.com/GroupMountain/GMLIB-Release": ">=1.9.0",
"github.com/GroupMountain/ModAPI-Release": ">=0.2.0", "github.com/GroupMountain/ModAPI-Release": ">=0.4.0",
"github.com/MiracleForest/iListenAttentively-Release": ">=0.9.0" "github.com/MiracleForest/iListenAttentively-Release": ">=0.11.0"
}, },
"assets": [ "assets": [
{ {
xmake.lua
+5 -4
View File
@@ -9,10 +9,10 @@ if not has_config("vs_runtime") then
end end
-- Option 1: Use the latest version of LeviLamina released on GitHub. -- Option 1: Use the latest version of LeviLamina released on GitHub.
add_requires("levilamina 1.6.1") add_requires("levilamina 1.9.5", {configs = {target_type = "server"}})
add_requires("levibuildscript 0.5.2") add_requires("levibuildscript 0.6.0")
add_requires("gmlib 1.6.0") add_requires("gmlib 1.9.0")
add_requires("ilistenattentively 0.9.0") add_requires("ilistenattentively 0.11.0")
target("Cleaner") -- Change this to your mod name. target("Cleaner") -- Change this to your mod name.
add_cxflags( add_cxflags(
@@ -35,6 +35,7 @@ target("Cleaner") -- Change this to your mod name.
"UNICODE", "UNICODE",
"_HAS_CXX23=1" "_HAS_CXX23=1"
) )
add_defines("LL_PLAT_S") --TODO: check client compatibility
add_rules("@levibuildscript/linkrule") add_rules("@levibuildscript/linkrule")
set_exceptions("none") set_exceptions("none")
set_kind("shared") set_kind("shared")