Compare commits
32 Commits
-
killcerr
·
2025-03-22 23:40:13 +08:00 -
killcerr
·
2025-03-22 23:39:40 +08:00 -
killcerr
·
2025-03-22 23:38:08 +08:00 -
killcerr
·
2025-03-22 23:32:42 +08:00 -
子沐呀
·
2025-01-16 13:00:22 +08:00 -
n15421
·
2025-01-14 15:29:21 +08:00 -
子沐呀
·
2025-01-14 13:41:12 +08:00 -
子沐呀
·
2025-01-14 13:30:39 +08:00 -
killcerr
·
2024-11-23 18:09:51 +08:00 -
killcerr
·
2024-11-23 18:08:56 +08:00 -
子沐呀
·
2024-11-10 16:49:36 +08:00 -
Zhongzi8972
·
2024-10-31 19:22:15 +08:00 -
Zhongzi8972
·
2024-10-31 19:08:38 +08:00 -
子沐呀
·
2024-10-31 12:59:20 +08:00 -
killcerr
·
2024-07-25 11:25:29 +08:00 -
killcerr
·
2024-07-25 11:14:57 +08:00 -
killcerr
·
2024-07-25 11:14:33 +08:00 -
killcerr
·
2024-07-25 11:11:55 +08:00 -
killcerr
·
2024-07-25 11:10:48 +08:00 -
killcerr
·
2024-07-25 11:10:16 +08:00 -
EpsilonZunsat
·
2024-06-21 13:09:44 +08:00 -
Tsubasa6848
·
2024-05-25 23:53:06 +08:00 -
Tsubasa6848
·
2024-05-03 00:45:05 +08:00 -
Tsubasa6848
·
2024-05-03 00:43:13 +08:00 -
Tsubasa6848
·
2024-05-01 01:12:17 +08:00 -
Tsubasa6848
·
2024-04-29 07:04:48 +08:00 -
Tsubasa6848
·
2024-04-15 17:56:50 +08:00 -
Tsubasa6848
·
2024-04-15 17:54:42 +08:00 -
Tsubasa6848
·
2024-04-01 03:03:20 +08:00 -
Tsubasa6848
·
2024-04-01 03:02:13 +08:00 -
Tsubasa6848
·
2024-03-29 19:00:48 +08:00 -
Tsubasa6848
·
2024-03-29 18:49:34 +08:00
@@ -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++latest"]
|
||||
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"
|
||||
@@ -15,7 +15,8 @@ jobs:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- uses: xmake-io/github-action-setup-xmake@v1
|
||||
|
||||
with:
|
||||
xmake-version: latest
|
||||
- run: |
|
||||
xmake repo -u
|
||||
|
||||
@@ -25,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: |
|
||||
|
||||
@@ -15,7 +15,8 @@ jobs:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- uses: xmake-io/github-action-setup-xmake@v1
|
||||
|
||||
with:
|
||||
xmake-version: latest
|
||||
- run: |
|
||||
xmake repo -u
|
||||
|
||||
@@ -25,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: |
|
||||
@@ -40,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/
|
||||
|
||||
@@ -1,6 +1,110 @@
|
||||
# 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 // 投票百分比(大于此值则清理)
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
# 开源许可
|
||||
## 源代码可用性
|
||||
- 您可以自由地获取、使用和修改本插件的源代码，无论是个人使用还是商业目的。
|
||||
|
||||
-1
Submodule SDK-GMLIB deleted from 37d92200bd
+3
-3
@@ -1,8 +1,8 @@
|
||||
{
|
||||
"name": "${pluginName}",
|
||||
"entry": "${pluginFile}",
|
||||
"name": "${modName}",
|
||||
"entry": "${modFile}",
|
||||
"type": "native",
|
||||
"version": "0.10.0",
|
||||
"version": "0.13.4",
|
||||
"author": "GroupMountain",
|
||||
"description": "Clean Entities",
|
||||
"dependencies": [
|
||||
|
||||
@@ -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 targetfile = path.join(outputdir, plugin_define.pluginFile)
|
||||
local pdbfile = path.join(outputdir, path.basename(plugin_define.pluginFile) .. ".pdb")
|
||||
local outputdir = path.join(bindir, mod_define.modName)
|
||||
local targetfile = path.join(outputdir, mod_define.modFile)
|
||||
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
|
||||
}
|
||||
|
||||
+79
-86
@@ -1,38 +1,43 @@
|
||||
#pragma once
|
||||
#include "Global.h"
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
std::string defaultConfig = R"({
|
||||
"Basic": {
|
||||
"Language": "en_US",
|
||||
"Command": "cleaner",
|
||||
"Notice1": 20,
|
||||
"Notice2": 5,
|
||||
"ConsoleLog": true,
|
||||
"SendBroadcast": true,
|
||||
"SendToast": true
|
||||
},
|
||||
"IgnoreTags": [
|
||||
"ignore",
|
||||
"不清理"
|
||||
],
|
||||
"AutoCleanCount": {
|
||||
"Enabled": true,
|
||||
"TriggerCount": 900
|
||||
},
|
||||
"AutoCleanTPS": {
|
||||
"Enabled": false,
|
||||
"TriggerTPS": 15
|
||||
},
|
||||
"ItemDespawn": {
|
||||
"Enabled": true,
|
||||
"DespawnTime": 6000,
|
||||
"WhiteList": [
|
||||
"minecraft:elytra"
|
||||
]
|
||||
},
|
||||
"CleanInanimate": {
|
||||
"Enabled": true,
|
||||
"Blacklist": [
|
||||
namespace Cleaner {
|
||||
struct Config {
|
||||
int version = 2;
|
||||
|
||||
std::string language = "zh_CN";
|
||||
|
||||
struct basic {
|
||||
std::string Command = "cleaner";
|
||||
int Notice1 = 20;
|
||||
int Notice2 = 5;
|
||||
bool ConsoleLog = true;
|
||||
bool SendBroadcast = true;
|
||||
bool SendToast = true;
|
||||
} Basic;
|
||||
|
||||
std::vector<std::string> IgnoreTags = {"ignore", "不清理"};
|
||||
|
||||
struct auto_clean_count {
|
||||
bool Enabled = true;
|
||||
int TriggerCount = 900;
|
||||
} AutoCleanCount;
|
||||
|
||||
struct auto_clean_tps {
|
||||
bool Enabled = true;
|
||||
int TriggerTPS = 15;
|
||||
} AutoCleanTPS;
|
||||
|
||||
struct item_despawn {
|
||||
bool Enabled = true;
|
||||
int DespawnTime = 6000;
|
||||
std::vector<std::string> WhiteList = {"minecraft:elytra"};
|
||||
} ItemDespawn;
|
||||
|
||||
struct Clean_Inanimate {
|
||||
bool Enabled = true;
|
||||
std::vector<std::string> Blacklist = {
|
||||
"minecraft:xp_orb",
|
||||
"minecraft:arrow",
|
||||
"minecraft:fireball",
|
||||
@@ -40,45 +45,30 @@ std::string defaultConfig = R"({
|
||||
"minecraft:wither_skull",
|
||||
"minecraft:wither_skull_dangerous",
|
||||
"minecraft:dragon_fireball"
|
||||
]
|
||||
},
|
||||
"CleanItem": {
|
||||
"Enabled": true,
|
||||
"ExistTicks": 0,
|
||||
"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": [
|
||||
};
|
||||
} CleanInanimate;
|
||||
|
||||
struct Clean_Item {
|
||||
bool Enabled = true;
|
||||
int ExistTicks = 0;
|
||||
std::vector<std::string> 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"
|
||||
};
|
||||
} CleanItem;
|
||||
|
||||
struct Clean_Mobs {
|
||||
bool Enabled = true;
|
||||
bool CleanMonstors = true;
|
||||
bool CleanPeacefulMobs = false;
|
||||
bool EnableAutoExclude = true;
|
||||
std::vector<std::string> BlackList = {"minecraft:guardian", "minecraft:zombie_pigman"};
|
||||
std::vector<std::string> Whitelist = {
|
||||
"minecraft:ender_dragon",
|
||||
"minecraft:shulker",
|
||||
"minecraft:wither",
|
||||
@@ -86,17 +76,20 @@ std::string defaultConfig = R"({
|
||||
"minecraft:piglin_brute",
|
||||
"minecraft:ender_pearl",
|
||||
"minecraft:phantom"
|
||||
]
|
||||
},
|
||||
"ScheduleClean": {
|
||||
"Enabled": true,
|
||||
"CleanInterval": 3600
|
||||
},
|
||||
"VoteClean": {
|
||||
"Enabled": true,
|
||||
"VoteCleanCommand": "voteclean",
|
||||
"Cooldown": 120,
|
||||
"CheckDelay": 30,
|
||||
"Percentage": 50
|
||||
}
|
||||
})";
|
||||
};
|
||||
} CleanMobs;
|
||||
|
||||
struct Schedule_Clean {
|
||||
bool Enabled = true;
|
||||
int CleanInterval = 3600;
|
||||
} ScheduleClean;
|
||||
|
||||
struct Vote_Clean {
|
||||
bool Enabled = true;
|
||||
std::string VoteCleanCommand = "voteclean";
|
||||
int Cooldown = 120;
|
||||
int CheckDelay = 30;
|
||||
int Percentage = 50;
|
||||
} VoteClean;
|
||||
};
|
||||
} // namespace Cleaner
|
||||
+26
-21
@@ -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::world::actor::GMActor* ac) {
|
||||
if (ac->hasCategory(::ActorCategory::Mob) || ac->hasCategory(::ActorCategory::Item)) {
|
||||
if (ac->isTame() || isTrust(ac) || ac->getNameTag() != "" || ac->hasTag("cleaner:ignore")) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -26,25 +29,26 @@ bool shouldIgnore(GMLIB_Actor* ac) {
|
||||
|
||||
bool ShouldClean(Actor* actor) {
|
||||
// Players
|
||||
auto en = (GMLIB_Actor*)actor;
|
||||
auto& config = Cleaner::Entry::getInstance().getConfig();
|
||||
auto en = (gmlib::world::actor::GMActor*)actor;
|
||||
if (en->isPlayer() || shouldIgnore(en)) {
|
||||
return false;
|
||||
}
|
||||
auto type = en->getTypeName();
|
||||
for (auto& tag : ConfigFile::mIgnoreTags) {
|
||||
for (auto& tag : config.IgnoreTags) {
|
||||
if (en->hasTag(tag)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
// Items
|
||||
if (en->isItemActor()) {
|
||||
if (Config->getValue<bool>({"CleanItem", "Enabled"}, false)) {
|
||||
if (en->hasCategory(::ActorCategory::Item)) {
|
||||
if (config.CleanItem.Enabled) {
|
||||
auto itac = (ItemActor*)en;
|
||||
if (itac->age() <= Config->getValue<int>({"CleanItem", "ExistTicks"}, 0)) {
|
||||
if (itac->age() <= config.CleanItem.ExistTicks) {
|
||||
return false;
|
||||
}
|
||||
auto itemType = itac->item().getTypeName();
|
||||
auto whitelist = Config->getValue<std::vector<std::string>>({"CleanItem", "Whitelist"}, {});
|
||||
auto whitelist = config.CleanItem.Whitelist;
|
||||
for (auto& key : whitelist) {
|
||||
if (isMatch(itemType, key)) {
|
||||
return false;
|
||||
@@ -55,25 +59,24 @@ bool ShouldClean(Actor* actor) {
|
||||
return false;
|
||||
}
|
||||
// Mobs
|
||||
else if (en->isMob()) {
|
||||
if (Config->getValue<bool>({"CleanMobs", "Enabled"}, false)) {
|
||||
auto blacklist = Config->getValue<std::vector<std::string>>({"CleanMobs", "Blacklist"}, {});
|
||||
else if (en->hasCategory(::ActorCategory::Mob)) {
|
||||
if (config.CleanMobs.Enabled) {
|
||||
auto blacklist = config.CleanMobs.BlackList;
|
||||
for (auto& key : blacklist) {
|
||||
if (isMatch(type, key)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
auto whitelist = Config->getValue<std::vector<std::string>>({"CleanMobs", "Whitelist"}, {});
|
||||
auto whitelist = config.CleanMobs.Whitelist;
|
||||
for (auto& key : whitelist) {
|
||||
if (isMatch(type, key)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
if (Config->getValue<bool>({"CleanMobs", "CleanMonstors"}, false)
|
||||
&& en->hasCategory(ActorCategory::Monster)) {
|
||||
if (config.CleanMobs.CleanMonstors && en->hasCategory(ActorCategory::Monster)) {
|
||||
return true;
|
||||
}
|
||||
if (Config->getValue<bool>({"CleanMobs", "CleanPeacefulMobs"}, false)) {
|
||||
if (config.CleanMobs.CleanPeacefulMobs) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -81,8 +84,8 @@ bool ShouldClean(Actor* actor) {
|
||||
}
|
||||
// Others
|
||||
else {
|
||||
if (Config->getValue<bool>({"CleanInanimate", "Enabled"}, false)) {
|
||||
auto blacklist = Config->getValue<std::vector<std::string>>({"CleanInanimate", "Blacklist"}, {});
|
||||
if (config.CleanInanimate.Enabled) {
|
||||
auto blacklist = config.CleanInanimate.Blacklist;
|
||||
for (auto& key : blacklist) {
|
||||
if (isMatch(type, key)) {
|
||||
return true;
|
||||
@@ -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();
|
||||
for (auto entity : all_entities) {
|
||||
auto all_entities = level->getRuntimeActorList();
|
||||
for (auto* entity : all_entities) {
|
||||
if (ShouldClean(entity)) {
|
||||
clean_count++;
|
||||
}
|
||||
|
||||
+94
-73
@@ -1,124 +1,145 @@
|
||||
#include "Cleaner.h"
|
||||
|
||||
namespace ConfigFile {
|
||||
|
||||
bool mConsoleLog = true;
|
||||
bool mAnnounce = true;
|
||||
bool mSendToast = true;
|
||||
std::vector<std::string> mIgnoreTags = {};
|
||||
|
||||
} // namespace ConfigFile
|
||||
|
||||
#include <memory>
|
||||
|
||||
namespace Cleaner {
|
||||
|
||||
static std::shared_ptr<ll::schedule::task::Task<ll::chrono::ServerClock>> mAutoCleanTask = nullptr;
|
||||
static std::shared_ptr<ll::schedule::task::Task<ll::chrono::ServerClock>> mCleanTaskCount = nullptr;
|
||||
static std::shared_ptr<ll::schedule::task::Task<ll::chrono::ServerClock>> mCleanTaskTPS = nullptr;
|
||||
|
||||
ServerTimeScheduler scheduler;
|
||||
static std::shared_ptr<bool> mAutoCleanTask = std::make_shared<bool>(false);
|
||||
static std::shared_ptr<bool> mCleanTaskCount = std::make_shared<bool>(false);
|
||||
static std::shared_ptr<bool> mCleanTaskTPS = std::make_shared<bool>(false);
|
||||
|
||||
bool auto_clean_triggerred = false;
|
||||
|
||||
void CleanTask() {
|
||||
auto time = Config->getValue<int>({"Basic", "Notice1"}, 20);
|
||||
auto announce_time = Config->getValue<int>({"Basic", "Notice2"}, 5);
|
||||
auto time_1 = std::chrono::seconds::duration(time);
|
||||
auto time_2 = std::chrono::seconds::duration(time - announce_time);
|
||||
if (ConfigFile::mConsoleLog) {
|
||||
logger.info(tr("cleaner.output.count1", {S(time_1.count())}));
|
||||
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())})
|
||||
);
|
||||
}
|
||||
if (ConfigFile::mAnnounce) {
|
||||
if (config.Basic.SendBroadcast) {
|
||||
Helper::broadcastMessage(tr("cleaner.output.count1", {S(time_1.count())}));
|
||||
}
|
||||
if (ConfigFile::mSendToast) {
|
||||
if (config.Basic.SendToast) {
|
||||
Helper::broadcastToast(tr("cleaner.output.count2", {S(announce_time)}));
|
||||
}
|
||||
scheduler.add<DelayTask>(time_2, [announce_time] {
|
||||
if (ConfigFile::mConsoleLog) {
|
||||
logger.info(tr("cleaner.output.count2", {S(announce_time)}));
|
||||
ll::coro::keepThis([announce_time, &config, time_2]() -> ll::coro::CoroTask<> {
|
||||
co_await time_2;
|
||||
if (config.Basic.ConsoleLog) {
|
||||
ll::io::LoggerRegistry::getInstance().getOrCreate("Cleaner")->info(
|
||||
tr("cleaner.output.count2", {S(announce_time)})
|
||||
);
|
||||
}
|
||||
if (ConfigFile::mAnnounce) {
|
||||
if (config.Basic.SendBroadcast) {
|
||||
Helper::broadcastMessage(tr("cleaner.output.count2", {S(announce_time)}));
|
||||
}
|
||||
if (ConfigFile::mSendToast) {
|
||||
if (config.Basic.SendToast) {
|
||||
Helper::broadcastToast(tr("cleaner.output.count2", {S(announce_time)}));
|
||||
}
|
||||
});
|
||||
scheduler.add<DelayTask>(time_1, [] {
|
||||
co_return;
|
||||
}).launch(ll::thread::ServerThreadExecutor::getDefault());
|
||||
ll::coro::keepThis([announce_time, &config, time_1]() -> ll::coro::CoroTask<> {
|
||||
co_await time_1;
|
||||
auto count = ExecuteClean();
|
||||
if (ConfigFile::mConsoleLog) {
|
||||
logger.info(tr("cleaner.output.finish", {S(count)}));
|
||||
if (config.Basic.ConsoleLog) {
|
||||
ll::io::LoggerRegistry::getInstance().getOrCreate("Cleaner")->info(tr("cleaner.output.finish", {S(count)}));
|
||||
}
|
||||
if (ConfigFile::mAnnounce) {
|
||||
if (config.Basic.SendBroadcast) {
|
||||
Helper::broadcastMessage(tr("cleaner.output.finish", {S(count)}));
|
||||
}
|
||||
if (ConfigFile::mSendToast) {
|
||||
if (config.Basic.SendToast) {
|
||||
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);
|
||||
mAutoCleanTask = scheduler.add<RepeatTask>(time, [] { CleanTask(); });
|
||||
std::chrono::seconds time(seconds);
|
||||
*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) {
|
||||
mCleanTaskCount = scheduler.add<RepeatTask>(10s, [max_entities] {
|
||||
auto count = CountEntities();
|
||||
if (auto_clean_triggerred == false) {
|
||||
if (count >= max_entities) {
|
||||
auto_clean_triggerred = true;
|
||||
if (ConfigFile::mConsoleLog) {
|
||||
logger.warn(tr("cleaner.output.triggerAutoCleanCount", {S(count)}));
|
||||
auto& config = Cleaner::Entry::getInstance().getConfig();
|
||||
*mCleanTaskCount = true;
|
||||
ll::coro::keepThis([max_entities, &config]() -> ll::coro::CoroTask<> {
|
||||
while (true) {
|
||||
co_await 10s;
|
||||
if (*mCleanTaskCount == false) co_return;
|
||||
auto count = CountEntities();
|
||||
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 (ConfigFile::mAnnounce) {
|
||||
Helper::broadcastMessage(tr("cleaner.output.triggerAutoCleanCount", {S(count)}));
|
||||
}
|
||||
if (ConfigFile::mSendToast) {
|
||||
Helper::broadcastToast(tr("cleaner.output.triggerAutoCleanCount", {S(count)}));
|
||||
}
|
||||
CleanTask();
|
||||
}
|
||||
}
|
||||
});
|
||||
co_return;
|
||||
}).launch(ll::thread::ServerThreadExecutor::getDefault());
|
||||
}
|
||||
|
||||
void CleanTaskTPS(float min_tps) {
|
||||
mCleanTaskTPS = scheduler.add<RepeatTask>(10s, [min_tps] {
|
||||
if (auto_clean_triggerred == false) {
|
||||
if (GMLIB_Level::getLevel()->getServerAverageTps() <= min_tps) {
|
||||
auto_clean_triggerred = true;
|
||||
auto mspt = S(GMLIB_Level::getLevel()->getServerAverageTps());
|
||||
if (ConfigFile::mConsoleLog) {
|
||||
logger.warn(tr("cleaner.output.triggerAutoCleanTps", {mspt}));
|
||||
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::world::GMLevel::getInstance()->getServerAverageTps() <= min_tps) {
|
||||
auto_clean_triggerred = true;
|
||||
auto mspt = S(gmlib::world::GMLevel::getInstance()->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 (ConfigFile::mAnnounce) {
|
||||
Helper::broadcastMessage(tr("cleaner.output.triggerAutoCleanTps", {mspt}));
|
||||
}
|
||||
if (ConfigFile::mSendToast) {
|
||||
Helper::broadcastToast(tr("cleaner.output.triggerAutoCleanTps", {mspt}));
|
||||
}
|
||||
CleanTask();
|
||||
}
|
||||
}
|
||||
});
|
||||
co_return;
|
||||
}).launch(ll::thread::ServerThreadExecutor::getDefault());
|
||||
}
|
||||
|
||||
void stopAllTasks() {
|
||||
if (!mCleanTaskCount) {
|
||||
mCleanTaskTPS->cancel();
|
||||
scheduler.remove(mCleanTaskTPS);
|
||||
*mCleanTaskTPS = false;
|
||||
}
|
||||
if (mCleanTaskCount) {
|
||||
mCleanTaskCount->cancel();
|
||||
scheduler.remove(mCleanTaskCount);
|
||||
*mCleanTaskCount = false;
|
||||
}
|
||||
if (mAutoCleanTask) {
|
||||
mAutoCleanTask->cancel();
|
||||
scheduler.remove(mAutoCleanTask);
|
||||
*mAutoCleanTask = false;
|
||||
}
|
||||
}
|
||||
} // namespace Cleaner
|
||||
|
||||
@@ -3,31 +3,23 @@
|
||||
namespace Cleaner {
|
||||
|
||||
void loadCleaner() {
|
||||
if (Config->getValue<bool>({"ScheduleClean", "Enabled"}, false)) {
|
||||
Cleaner::AutoCleanTask(Config->getValue<int>({"ScheduleClean", "CleanInterval"}, 3000));
|
||||
auto& config = Cleaner::Entry::getInstance().getConfig();
|
||||
if (config.ScheduleClean.Enabled) {
|
||||
Cleaner::AutoCleanTask(config.ScheduleClean.CleanInterval);
|
||||
}
|
||||
if (Config->getValue<bool>({"AutoCleanCount", "Enabled"}, false)) {
|
||||
Cleaner::CleanTaskCount(Config->getValue<int>({"AutoCleanCount", "TriggerCount"}, 900));
|
||||
if (config.AutoCleanCount.Enabled) {
|
||||
Cleaner::CleanTaskCount(config.AutoCleanCount.TriggerCount);
|
||||
}
|
||||
if (Config->getValue<bool>({"AutoCleanTPS", "Enabled"}, false)) {
|
||||
Cleaner::CleanTaskTPS(Config->getValue<float>({"AutoCleanTPS", "TriggerTPS"}, 15.0f));
|
||||
if (config.AutoCleanTPS.Enabled) {
|
||||
Cleaner::CleanTaskTPS(config.AutoCleanTPS.TriggerTPS);
|
||||
}
|
||||
ConfigFile::mItemDespawnTicks = Config->getValue<int>({"ItemDespawn", "DespawnTime"}, 6000);
|
||||
ConfigFile::mAnnounce = Config->getValue<bool>({"Basic", "SendBroadcast"}, true);
|
||||
ConfigFile::mConsoleLog = Config->getValue<bool>({"Basic", "ConsoleLog"}, true);
|
||||
ConfigFile::mSendToast = Config->getValue<bool>({"Basic", "SendToast"}, true);
|
||||
ConfigFile::mIgnoreTags = Config->getValue<std::vector<std::string>>({"IgnoreTags"}, {});
|
||||
}
|
||||
|
||||
void unloadCleaner() { stopAllTasks(); }
|
||||
|
||||
void reloadCleaner() {
|
||||
unloadCleaner();
|
||||
Config->reload();
|
||||
std::string languageCode = Config->getValue<std::string>({"Basic", "Language"}, "en_US");
|
||||
Language->reloadAllLanguages();
|
||||
Language->chooseLanguage(languageCode);
|
||||
loadCleaner();
|
||||
Cleaner::Entry::getInstance().disable();
|
||||
Cleaner::Entry::getInstance().enable();
|
||||
}
|
||||
|
||||
} // namespace Cleaner
|
||||
@@ -1,13 +1,10 @@
|
||||
#pragma once
|
||||
#include "Global.h"
|
||||
|
||||
using namespace ll::schedule;
|
||||
using namespace ll::chrono_literals;
|
||||
|
||||
namespace Cleaner {
|
||||
|
||||
extern ServerTimeScheduler scheduler;
|
||||
|
||||
extern int ExecuteClean();
|
||||
extern int CountEntities();
|
||||
|
||||
|
||||
+24
-35
@@ -1,50 +1,39 @@
|
||||
#include "Cleaner.h"
|
||||
|
||||
namespace ConfigFile {
|
||||
|
||||
int mItemDespawnTicks = 3000;
|
||||
|
||||
} // namespace ConfigFile
|
||||
|
||||
|
||||
namespace Cleaner {
|
||||
|
||||
void setShouldIgnore(GMLIB_Actor* ac) { ac->addTag("cleaner:ignore"); }
|
||||
void setShouldIgnore(gmlib::world::actor::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>(
|
||||
[](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::world::actor::GMPlayer*)event.spawner();
|
||||
if (pl->isPlayer() && !pl->isAlive()) { // Death Drop
|
||||
auto ac = (gmlib::world::actor::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->getValue<bool>({"ItemDespawn", "Enabled"}, true)) {
|
||||
item.lifeTime() = ConfigFile::mItemDespawnTicks;
|
||||
auto list = Config->getValue<std::vector<std::string>>({"ItemDespawn", "WhiteList"}, {});
|
||||
auto type = item.item().getTypeName();
|
||||
for (auto& key : list) {
|
||||
if (isMatch(type, key)) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
item.lifeTime() = ConfigFile::mItemDespawnTicks;
|
||||
}
|
||||
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::world::actor::GMActor*)&event.self();
|
||||
setShouldIgnore(mob);
|
||||
});
|
||||
}
|
||||
|
||||
} // namespace Cleaner
|
||||
@@ -2,8 +2,12 @@
|
||||
|
||||
namespace Helper {
|
||||
|
||||
void broadcastMessage(std::string_view msg) { GMLIB_Level::broadcast(tr("cleaner.info.prefix") + std::string(msg)); }
|
||||
void broadcastMessage(std::string_view msg) {
|
||||
gmlib::world::GMLevel::getInstance()->broadcast(tr("cleaner.info.prefix") + std::string(msg));
|
||||
}
|
||||
|
||||
void broadcastToast(std::string_view msg) { GMLIB_Level::broadcastToast(tr("cleaner.info.prefix"), msg); }
|
||||
void broadcastToast(std::string_view msg) {
|
||||
gmlib::world::GMLevel::getInstance()->broadcastToast(tr("cleaner.info.prefix"), msg);
|
||||
}
|
||||
|
||||
} // namespace Helper
|
||||
+47
-37
@@ -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 {
|
||||
@@ -30,20 +28,22 @@ void sendVoteForm(Player* pl) {
|
||||
tr("cleaner.vote.no")
|
||||
);
|
||||
ll::service::getLevel()->forEachPlayer([&](Player& pl) -> bool {
|
||||
fm.sendTo(pl, [](Player& player, ll::form::ModalForm::SelectedButton button) {
|
||||
switch (button) {
|
||||
case ll::form::ModalForm::SelectedButton::Upper: {
|
||||
voteList[player.getUuid()] = true;
|
||||
player.sendMessage(tr("cleaner.vote.accept"));
|
||||
return;
|
||||
}
|
||||
case ll::form::ModalForm::SelectedButton::Lower: {
|
||||
voteList[player.getUuid()] = false;
|
||||
player.sendMessage(tr("cleaner.vote.deny"));
|
||||
return;
|
||||
}
|
||||
default:
|
||||
return;
|
||||
fm.sendTo(pl, [](Player& player, ll::form::ModalFormResult result, ll::form::FormCancelReason reason) {
|
||||
if (result.has_value()) {
|
||||
switch (result.value()) {
|
||||
case ll::form::ModalFormSelectedButton::Upper: {
|
||||
voteList[player.getUuid()] = true;
|
||||
player.sendMessage(tr("cleaner.vote.accept"));
|
||||
return;
|
||||
}
|
||||
case ll::form::ModalFormSelectedButton::Lower: {
|
||||
voteList[player.getUuid()] = false;
|
||||
player.sendMessage(tr("cleaner.vote.deny"));
|
||||
return;
|
||||
}
|
||||
default:
|
||||
return;
|
||||
}
|
||||
}
|
||||
});
|
||||
return true;
|
||||
@@ -51,7 +51,8 @@ void sendVoteForm(Player* pl) {
|
||||
}
|
||||
|
||||
void checkVote() {
|
||||
float percentage = Config->getValue<float>({"VoteClean", "Percentage"}, 50.0f) / 100.0f;
|
||||
auto& config = Cleaner::Entry::getInstance().getConfig();
|
||||
float percentage = config.VoteClean.Percentage / 100.0f;
|
||||
int voteCount = 0;
|
||||
for (auto& key : voteList) {
|
||||
if (key.second == true) {
|
||||
@@ -60,18 +61,18 @@ void checkVote() {
|
||||
}
|
||||
float result = ((float)voteCount) / ((float)playerCount);
|
||||
if (result >= percentage) {
|
||||
if (ConfigFile::mAnnounce) {
|
||||
if (config.Basic.SendBroadcast) {
|
||||
Helper::broadcastMessage(tr("cleaner.vote.succeed"));
|
||||
}
|
||||
if (ConfigFile::mSendToast) {
|
||||
if (config.Basic.SendToast) {
|
||||
Helper::broadcastToast(tr("cleaner.vote.succeed"));
|
||||
}
|
||||
Cleaner::CleanTask();
|
||||
} else {
|
||||
if (ConfigFile::mAnnounce) {
|
||||
if (config.Basic.SendBroadcast) {
|
||||
Helper::broadcastMessage(tr("cleaner.vote.failed"));
|
||||
}
|
||||
if (ConfigFile::mSendToast) {
|
||||
if (config.Basic.SendToast) {
|
||||
Helper::broadcastToast(tr("cleaner.vote.failed"));
|
||||
}
|
||||
}
|
||||
@@ -80,21 +81,28 @@ void checkVote() {
|
||||
}
|
||||
|
||||
void voteClean(Player* pl) {
|
||||
auto& config = Cleaner::Entry::getInstance().getConfig();
|
||||
voteList.clear();
|
||||
canVote = false;
|
||||
hasVote = true;
|
||||
playerCount = getPlayerCount();
|
||||
if (ConfigFile::mAnnounce) {
|
||||
if (config.Basic.SendBroadcast) {
|
||||
Helper::broadcastMessage(tr("cleaner.vote.voteMessage", {pl->getRealName()}));
|
||||
}
|
||||
if (ConfigFile::mSendToast) {
|
||||
if (config.Basic.SendToast) {
|
||||
Helper::broadcastToast(tr("cleaner.vote.voteMessage", {pl->getRealName()}));
|
||||
}
|
||||
sendVoteForm(pl);
|
||||
auto cooldown = std::chrono::seconds::duration(Config->getValue<int>({"VoteClean", "Cooldown"}, 120));
|
||||
auto waitTime = std::chrono::seconds::duration(Config->getValue<int>({"VoteClean", "CheckDelay"}, 30));
|
||||
Cleaner::scheduler.add<DelayTask>(cooldown, [] { canVote = false; });
|
||||
Cleaner::scheduler.add<DelayTask>(waitTime, [] { checkVote(); });
|
||||
ll::coro::keepThis([&config]() -> ll::coro::CoroTask<> {
|
||||
co_await std::chrono::seconds::duration(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);
|
||||
checkVote();
|
||||
co_return;
|
||||
}).launch(ll::thread::ServerThreadExecutor::getDefault());
|
||||
}
|
||||
|
||||
void confirmForm(Player* pl) {
|
||||
@@ -104,16 +112,18 @@ void confirmForm(Player* pl) {
|
||||
tr("cleaner.vote.confirmOk"),
|
||||
tr("cleaner.vote.confirmNo")
|
||||
);
|
||||
fm.sendTo(*pl, [](Player& player, ll::form::ModalForm::SelectedButton button) {
|
||||
switch (button) {
|
||||
case ll::form::ModalForm::SelectedButton::Upper: {
|
||||
return voteClean(&player);
|
||||
}
|
||||
case ll::form::ModalForm::SelectedButton::Lower: {
|
||||
return player.sendMessage(tr("cleaner.vote.cancel"));
|
||||
}
|
||||
default:
|
||||
return;
|
||||
fm.sendTo(*pl, [](Player& player, ll::form::ModalFormResult result, ll::form::FormCancelReason reason) {
|
||||
if (result.has_value()) {
|
||||
switch (result.value()) {
|
||||
case ll::form::ModalFormSelectedButton::Upper: {
|
||||
return voteClean(&player);
|
||||
}
|
||||
case ll::form::ModalFormSelectedButton::Lower: {
|
||||
return player.sendMessage(tr("cleaner.vote.cancel"));
|
||||
}
|
||||
default:
|
||||
return;
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
+7
-17
@@ -1,29 +1,19 @@
|
||||
#pragma once
|
||||
#include "Plugin.h"
|
||||
#include <include_all.h>
|
||||
// IWYU pragma: begin_exports
|
||||
#include "Mod.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)
|
||||
|
||||
extern ll::Logger logger;
|
||||
|
||||
extern GMLIB::Files::JsonConfig* Config;
|
||||
extern GMLIB::Files::I18n::JsonI18n* Language;
|
||||
|
||||
extern void RegisterCommands();
|
||||
extern void initPlugin();
|
||||
|
||||
namespace ConfigFile {
|
||||
extern int mItemDespawnTicks;
|
||||
extern bool mConsoleLog;
|
||||
extern bool mAnnounce;
|
||||
extern bool mSendToast;
|
||||
extern std::vector<std::string> mIgnoreTags;
|
||||
} // namespace ConfigFile
|
||||
|
||||
namespace Helper {
|
||||
extern void broadcastMessage(std::string_view msg);
|
||||
extern void broadcastToast(std::string_view msg);
|
||||
} // namespace Helper
|
||||
|
||||
extern std::string tr(std::string key, std::vector<std::string> data = {});
|
||||
extern std::string tr(std::string const& key, std::vector<std::string> const& params = {});
|
||||
@@ -1,21 +0,0 @@
|
||||
#include "Config.h"
|
||||
#include "Global.h"
|
||||
#include "Language.h"
|
||||
|
||||
GMLIB::Files::JsonConfig* Config = nullptr;
|
||||
GMLIB::Files::I18n::JsonI18n* Language = nullptr;
|
||||
int commandPermissionLevel = 4;
|
||||
|
||||
void initPlugin() {
|
||||
Config = new GMLIB::Files::JsonConfig("./plugins/Cleaner/config/config.json", defaultConfig);
|
||||
Config->init();
|
||||
std::string langPath = "./plugins/Cleaner/language/";
|
||||
std::string languageCode = Config->getValue<std::string>({"Basic", "Language"}, "en_US");
|
||||
Language = new GMLIB::Files::I18n::JsonI18n(langPath, languageCode);
|
||||
Language->updateOrCreateLanguage("en_US", defaultLanguage_en_US);
|
||||
Language->updateOrCreateLanguage("zh_CN", defaultLanguage_zh_CN);
|
||||
Language->loadAllLanguages();
|
||||
Language->chooseLanguage(languageCode);
|
||||
}
|
||||
|
||||
std::string tr(std::string key, std::vector<std::string> data) { return Language->translate(key, data); }
|
||||
+70
-70
@@ -1,74 +1,74 @@
|
||||
#pragma once
|
||||
#include "Global.h"
|
||||
|
||||
std::string defaultLanguage_en_US = R"({
|
||||
"cleaner.info.prefix": "§e§l[Cleaner] §r",
|
||||
"cleaner.command.cleaner": "Cleaner admin command.",
|
||||
"cleaner.command.despawnSuccess": "Successfully despawned %1$s entities.",
|
||||
"cleaner.command.error.noTarget": "No targets matched the selector.",
|
||||
"cleaner.command.error.playerOnly": "This command can only be executed by players!",
|
||||
"cleaner.command.tps.output": "Current server real-time TPS %1$s §r, average TPS %2$s.",
|
||||
"cleaner.command.mspt.output": "Current server MSPT %1$s.",
|
||||
"cleaner.command.clean.output": "Clean task successfully initiated!",
|
||||
"cleaner.command.voteclean": "Initiate entity clean vote.",
|
||||
"cleaner.command.despawntime": "Despawn time for items set to %1$s game ticks.",
|
||||
"cleaner.output.count1": "The system will automatically clean server entities in %1$s seconds!",
|
||||
"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.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...",
|
||||
"cleaner.vote.cancel": "Vote canceled!",
|
||||
"cleaner.vote.confirmNo": "Think again",
|
||||
"cleaner.vote.confirmOk": "Initiate vote",
|
||||
"cleaner.vote.confirmTubtitle": "Do you want to initiate a clean vote?",
|
||||
"cleaner.vote.accept": "You have agreed to entity cleaning.",
|
||||
"cleaner.vote.deny": "You have declined entity cleaning.",
|
||||
"cleaner.vote.no": "Deny",
|
||||
"cleaner.vote.ok": "Agree",
|
||||
"cleaner.vote.subtitle": "%1$s lunched a clean vote.\n\n Do you agree to clean server entities now?",
|
||||
"cleaner.vote.timeout": "Vote has expired!",
|
||||
"cleaner.vote.succeed": "Vote cleaning successful!",
|
||||
"cleaner.vote.failed": "Vote cleaning did not passed!",
|
||||
"cleaner.vote.title": "Vote Cleaning",
|
||||
"cleaner.vote.voted": "You have been voted!",
|
||||
"cleaner.vote.voteMessage": "%1$s lunched a clean vote. If you agree cleaning entities but did not received a form, please type command /voteclean to vote."
|
||||
})";
|
||||
std::string en_US = R"(
|
||||
cleaner.info.prefix=§e§l[Cleaner] §r
|
||||
cleaner.command.cleaner=Cleaner admin command.
|
||||
cleaner.command.despawnSuccess=Successfully despawned %1$s entities.
|
||||
cleaner.command.error.noTarget=No targets matched the selector.
|
||||
cleaner.command.error.playerOnly=This command can only be executed by players!
|
||||
cleaner.command.tps.output=Current server real-time TPS %1$s §r, average TPS %2$s.
|
||||
cleaner.command.mspt.output=Current server MSPT %1$s.
|
||||
cleaner.command.clean.output=Clean task successfully initiated!
|
||||
cleaner.command.voteclean=Initiate entity clean vote.
|
||||
cleaner.command.despawntime=Despawn time for items set to %1$s game ticks.
|
||||
cleaner.output.count1=The system will automatically clean server entities in %1$s seconds!
|
||||
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 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...
|
||||
cleaner.vote.cancel=Vote canceled!
|
||||
cleaner.vote.confirmNo=Think again
|
||||
cleaner.vote.confirmOk=Initiate vote
|
||||
cleaner.vote.confirmTubtitle=Do you want to initiate a clean vote?
|
||||
cleaner.vote.accept=You have agreed to entity cleaning.
|
||||
cleaner.vote.deny=You have declined entity cleaning.
|
||||
cleaner.vote.no=Deny
|
||||
cleaner.vote.ok=Agree
|
||||
cleaner.vote.subtitle=%1$s lunched a clean vote.\n\n Do you agree to clean server entities now?
|
||||
cleaner.vote.timeout=Vote has expired!
|
||||
cleaner.vote.succeed=Vote cleaning successful!
|
||||
cleaner.vote.failed=Vote cleaning did not passed!
|
||||
cleaner.vote.title=Vote Cleaning
|
||||
cleaner.vote.voted=You have been voted!
|
||||
cleaner.vote.voteMessage=%1$s lunched a clean vote. If you agree cleaning entities but did not received a form, please type command /voteclean to vote.
|
||||
)";
|
||||
|
||||
std::string defaultLanguage_zh_CN = R"({
|
||||
"cleaner.toast.title": "§e§lCleaner",
|
||||
"cleaner.command.cleaner": "Cleaner管理员命令。",
|
||||
"cleaner.command.despawnSuccess": "已成功清除了 %1$s 个实体",
|
||||
"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.clean.output": "已成功启动清理任务！",
|
||||
"cleaner.command.voteclean": "发起实体清理投票。",
|
||||
"cleaner.command.despawntime" : "已成功将物品消失时间设置为 %1$s 游戏刻",
|
||||
"cleaner.output.count1": "系统将在 %1$s 秒后自动清理服务器实体！",
|
||||
"cleaner.output.count2": "请注意！系统将在 %1$s 秒后自动清理服务器实体！",
|
||||
"cleaner.output.finish": "清理完成！本次总共清理了 %1$s 个实体。",
|
||||
"cleaner.output.opClean": "管理员启用了服务器实体清理。",
|
||||
"cleaner.output.reload": "已重载Cleaner插件，部分配置可能需要重启服务器才能生效。",
|
||||
"cleaner.output.triggerAutoCleanCount": "检测到服务器实体过多！！当前服务器存在 %1$s 个可清理实体，已启动自动清理程序。",
|
||||
"cleaner.output.triggerAutoCleanTps": "当前服务器TPS过低！！服务器平均TPS %1$s\n系统已启动清理程序。",
|
||||
"cleaner.vote.cooldown": "投票清理正在冷却...",
|
||||
"cleaner.vote.cancel": "投票已取消！",
|
||||
"cleaner.vote.confirmNo": "我再想想",
|
||||
"cleaner.vote.confirmOk": "发起投票",
|
||||
"cleaner.vote.confirmTubtitle": "你是否要发起投票清理？",
|
||||
"cleaner.vote.accept": "你已同意实体清理。",
|
||||
"cleaner.vote.deny": "你已拒绝实体清理。",
|
||||
"cleaner.vote.no": "拒绝",
|
||||
"cleaner.vote.ok": "同意",
|
||||
"cleaner.vote.subtitle": "%1$s 发起了服务器实体清理投票！\n\n你是否同意现在清理服务器实体？",
|
||||
"cleaner.vote.timeout": "投票已过期！",
|
||||
"cleaner.vote.succeed": "投票清理成功！",
|
||||
"cleaner.vote.failed": "投票清理未通过。",
|
||||
"cleaner.vote.title": "投票清理",
|
||||
"cleaner.vote.voted": "你已经投过票了！",
|
||||
"cleaner.vote.voteMessage": "%1$s 发起了服务器实体清理投票！如果同意清理但是未收到表单，请输入命令 /voteclean 投票。拒绝清理请忽略此信息。"
|
||||
})";
|
||||
std::string zh_CN = R"(
|
||||
cleaner.info.prefix=§e§l[Cleaner] §r
|
||||
cleaner.command.cleaner=Cleaner管理员命令。
|
||||
cleaner.command.despawnSuccess=已成功清除了 %1$s 个实体
|
||||
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.clean.output=已成功启动清理任务！
|
||||
cleaner.command.voteclean=发起实体清理投票。
|
||||
cleaner.command.despawntime=已成功将物品消失时间设置为 %1$s 游戏刻
|
||||
cleaner.output.count1=系统将在 %1$s 秒后自动清理服务器实体！
|
||||
cleaner.output.count2=请注意！系统将在 %1$s 秒后自动清理服务器实体！
|
||||
cleaner.output.finish=清理完成！本次总共清理了 %1$s 个实体。
|
||||
cleaner.output.opClean=管理员启用了服务器实体清理。
|
||||
cleaner.output.reload=已重载Cleaner插件，部分配置可能需要重启服务器才能生效。
|
||||
cleaner.output.triggerAutoCleanCount=检测到服务器实体过多！！当前服务器存在 %1$s 个可清理实体，已启动自动清理程序。
|
||||
cleaner.output.triggerAutoCleanTps=当前服务器TPS过低！！服务器平均TPS %1$s\n系统已启动清理程序。
|
||||
cleaner.vote.cooldown=投票清理正在冷却...
|
||||
cleaner.vote.cancel=投票已取消！
|
||||
cleaner.vote.confirmNo=我再想想
|
||||
cleaner.vote.confirmOk=发起投票
|
||||
cleaner.vote.confirmTubtitle=你是否要发起投票清理？
|
||||
cleaner.vote.accept=你已同意实体清理。
|
||||
cleaner.vote.deny=你已拒绝实体清理。
|
||||
cleaner.vote.no=拒绝
|
||||
cleaner.vote.ok=同意
|
||||
cleaner.vote.subtitle=%1$s 发起了服务器实体清理投票！\n\n你是否同意现在清理服务器实体？
|
||||
cleaner.vote.timeout=投票已过期！
|
||||
cleaner.vote.succeed=投票清理成功！
|
||||
cleaner.vote.failed=投票清理未通过。
|
||||
cleaner.vote.title=投票清理
|
||||
cleaner.vote.voted=你已经投过票了！
|
||||
cleaner.vote.voteMessage=%1$s 发起了服务器实体清理投票！如果同意清理但是未收到表单，请输入命令 /voteclean 投票。拒绝清理请忽略此信息。
|
||||
)";
|
||||
@@ -0,0 +1,7 @@
|
||||
// This file will make your mod use LeviLamina's memory operators by default.
|
||||
// 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
|
||||
|
||||
#include <ll/api/memory/MemoryOperators.h>
|
||||
+47
@@ -0,0 +1,47 @@
|
||||
#include "Mod.h"
|
||||
#include "Features/Cleaner.h"
|
||||
#include "Global.h"
|
||||
#include "Language.h"
|
||||
|
||||
namespace Cleaner {
|
||||
|
||||
Entry& Entry::getInstance() {
|
||||
static Entry instance;
|
||||
return instance;
|
||||
}
|
||||
|
||||
bool Entry::load() { return true; }
|
||||
|
||||
bool Entry::enable() {
|
||||
mConfig.emplace();
|
||||
ll::config::loadConfig(*mConfig, getSelf().getConfigDir() / "config.json");
|
||||
saveConfig();
|
||||
gmlib::locale::I18nAPI::updateOrCreateLanguageFile(getSelf().getLangDir(), "en_US", en_US);
|
||||
gmlib::locale::I18nAPI::updateOrCreateLanguageFile(getSelf().getLangDir(), "zh_CN", zh_CN);
|
||||
gmlib::locale::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::locale::I18nAPI::get(key, params);
|
||||
}
|
||||
@@ -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
|
||||
@@ -1,30 +0,0 @@
|
||||
#include "Features/Cleaner.h"
|
||||
#include "Global.h"
|
||||
|
||||
ll::Logger logger("Cleaner");
|
||||
|
||||
namespace plugin {
|
||||
|
||||
Plugin::Plugin(ll::plugin::NativePlugin& self) : mSelf(self) {
|
||||
// Code for loading the plugin goes here.
|
||||
initPlugin();
|
||||
}
|
||||
|
||||
bool Plugin::enable() {
|
||||
Cleaner::ListenEvents();
|
||||
RegisterCommands();
|
||||
Cleaner::loadCleaner();
|
||||
logger.info("Cleaner Loaded!");
|
||||
logger.info("Author: GroupMountain");
|
||||
logger.info("Repository: https://github.com/GroupMountain/Cleaner");
|
||||
return true;
|
||||
}
|
||||
|
||||
bool Plugin::disable() {
|
||||
// Code for disabling the plugin goes here.
|
||||
Cleaner::unloadCleaner();
|
||||
logger.info("Cleaner Disabled!");
|
||||
return true;
|
||||
}
|
||||
|
||||
} // namespace plugin
|
||||
@@ -1,28 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
#include <ll/api/plugin/NativePlugin.h>
|
||||
|
||||
namespace plugin {
|
||||
|
||||
class Plugin {
|
||||
public:
|
||||
explicit Plugin(ll::plugin::NativePlugin& self);
|
||||
|
||||
Plugin(Plugin&&) = delete;
|
||||
Plugin(const Plugin&) = delete;
|
||||
Plugin& operator=(Plugin&&) = delete;
|
||||
Plugin& operator=(const Plugin&) = delete;
|
||||
|
||||
~Plugin() = default;
|
||||
|
||||
/// @return True if the plugin is enabled successfully.
|
||||
bool enable();
|
||||
|
||||
/// @return True if the plugin is disabled successfully.
|
||||
bool disable();
|
||||
|
||||
private:
|
||||
ll::plugin::NativePlugin& mSelf;
|
||||
};
|
||||
|
||||
} // namespace plugin
|
||||
+29
-28
@@ -1,5 +1,4 @@
|
||||
#include "Features/Cleaner.h"
|
||||
#include "Global.h"
|
||||
|
||||
struct CleanerParam {
|
||||
enum class Despawn { despawn } despawn;
|
||||
@@ -10,15 +9,14 @@ struct CleanerParam {
|
||||
};
|
||||
|
||||
void RegCleanerCommand() {
|
||||
auto& cmd = ll::command::CommandRegistrar::getInstance().getOrCreateCommand(
|
||||
Config->getValue<std::string>({"Basic", "Command"}, "cleaner"),
|
||||
auto& config = Cleaner::Entry::getInstance().getConfig();
|
||||
auto& cmd = ll::command::CommandRegistrar::getInstance().getOrCreateCommand(
|
||||
config.Basic.Command,
|
||||
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,20 +25,20 @@ 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();
|
||||
if (ConfigFile::mConsoleLog) {
|
||||
logger.info(tr("cleaner.output.opClean"));
|
||||
if (Cleaner::Entry::getInstance().getConfig().Basic.ConsoleLog) {
|
||||
ll::io::LoggerRegistry::getInstance().getOrCreate("Cleaner")->info(tr("cleaner.output.opClean"));
|
||||
}
|
||||
if (ConfigFile::mAnnounce) {
|
||||
if (Cleaner::Entry::getInstance().getConfig().Basic.SendBroadcast) {
|
||||
Helper::broadcastMessage(tr("cleaner.output.opClean"));
|
||||
}
|
||||
if (ConfigFile::mSendToast) {
|
||||
if (Cleaner::Entry::getInstance().getConfig().Basic.SendToast) {
|
||||
Helper::broadcastToast(tr("cleaner.output.opClean"));
|
||||
}
|
||||
return output.success(tr("cleaner.command.clean.output"));
|
||||
@@ -48,47 +46,50 @@ void RegCleanerCommand() {
|
||||
case CleanerParam::Action::tps: {
|
||||
return output.success(
|
||||
tr("cleaner.command.tps.output",
|
||||
{S(GMLIB_Level::getLevel()->getServerCurrentTps()),
|
||||
S(GMLIB_Level::getLevel()->getServerAverageTps())})
|
||||
{S(gmlib::world::GMLevel::getInstance()->getServerCurrentTps()),
|
||||
S(gmlib::world::GMLevel::getInstance()->getServerAverageTps())})
|
||||
);
|
||||
}
|
||||
case CleanerParam::Action::mspt: {
|
||||
return output.success(tr("cleaner.command.mspt.output", {S(GMLIB_Level::getLevel()->getServerMspt())}));
|
||||
return output.success(
|
||||
tr("cleaner.command.mspt.output", {S(gmlib::world::GMLevel::getInstance()->getServerMspt())})
|
||||
);
|
||||
}
|
||||
case CleanerParam::Action::reload: {
|
||||
Cleaner::reloadCleaner();
|
||||
return output.success(tr("cleaner.output.reload"));
|
||||
}
|
||||
}
|
||||
}>();
|
||||
}
|
||||
);
|
||||
cmd.overload<CleanerParam>()
|
||||
.required("despawntime")
|
||||
.required("ticks")
|
||||
.execute<[&](CommandOrigin const& origin, CommandOutput& output, CleanerParam const& param) {
|
||||
ConfigFile::mItemDespawnTicks = param.ticks;
|
||||
Config->setValue({"ItemDespawn", "DespawnTime"}, ConfigFile::mItemDespawnTicks);
|
||||
return output.success(tr("cleaner.command.despawntime", {S(ConfigFile::mItemDespawnTicks)}));
|
||||
}>();
|
||||
.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() {
|
||||
auto& cmd = ll::command::CommandRegistrar::getInstance().getOrCreateCommand(
|
||||
Config->getValue<std::string>({"VoteClean", "VoteCleanCommand"}, "voteclean"),
|
||||
Cleaner::Entry::getInstance().getConfig().VoteClean.VoteCleanCommand,
|
||||
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() {
|
||||
RegCleanerCommand();
|
||||
if (Config->getValue<bool>({"VoteClean", "Enabled"}, false)) {
|
||||
if (Cleaner::Entry::getInstance().getConfig().VoteClean.Enabled) {
|
||||
RegVoteCommand();
|
||||
}
|
||||
}
|
||||
@@ -1,32 +0,0 @@
|
||||
#include <memory>
|
||||
|
||||
#include <ll/api/plugin/NativePlugin.h>
|
||||
|
||||
#include "Plugin.h"
|
||||
|
||||
namespace plugin {
|
||||
|
||||
// The global plugin instance.
|
||||
std::unique_ptr<Plugin> plugin = nullptr;
|
||||
|
||||
extern "C" {
|
||||
_declspec(dllexport) bool ll_plugin_load(ll::plugin::NativePlugin& self) {
|
||||
plugin = std::make_unique<plugin::Plugin>(self);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/// @warning Unloading the plugin may cause a crash if the plugin has not released all of its
|
||||
/// resources. If you are unsure, keep this function commented out.
|
||||
// _declspec(dllexport) bool ll_plugin_unload(ll::plugin::Plugin&) {
|
||||
// plugin.reset();
|
||||
//
|
||||
// return true;
|
||||
// }
|
||||
|
||||
_declspec(dllexport) bool ll_plugin_enable(ll::plugin::NativePlugin&) { return plugin->enable(); }
|
||||
|
||||
_declspec(dllexport) bool ll_plugin_disable(ll::plugin::NativePlugin&) { return plugin->disable(); }
|
||||
}
|
||||
|
||||
} // namespace plugin
|
||||
+43
-23
@@ -1,28 +1,48 @@
|
||||
{
|
||||
"format_version": 2,
|
||||
"tooth": "github.com/GroupMountain/Cleaner",
|
||||
"version": "0.10.0",
|
||||
"info": {
|
||||
"name": "Cleaner",
|
||||
"description": "A Powerful Entities Cleaning up Plugin for BDS",
|
||||
"author": "GroupMountain",
|
||||
"source": "github.com/GroupMountain/Cleaner",
|
||||
"tags": [
|
||||
"levilamina",
|
||||
"cleaner",
|
||||
"gmlib"
|
||||
]
|
||||
},
|
||||
"asset_url": "https://github.com/GroupMountain/Cleaner/releases/download/v0.10.0/Cleaner-windows-x64.zip",
|
||||
"dependencies": {
|
||||
"github.com/GroupMountain/GMLIB": ">=0.10.0"
|
||||
},
|
||||
"files": {
|
||||
"place": [
|
||||
"format_version": 3,
|
||||
"format_uuid": "289f771f-2c9a-4d73-9f3f-8492495a924d",
|
||||
"tooth": "github.com/GroupMountain/Cleaner",
|
||||
"version": "0.13.4",
|
||||
"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"
|
||||
},
|
||||
"assets": [
|
||||
{
|
||||
"type": "zip",
|
||||
"urls": [
|
||||
"https://github.com/GroupMountain/Cleaner/releases/download/v0.13.4/Cleaner-windows-x64.zip"
|
||||
],
|
||||
"placements": [
|
||||
{
|
||||
"src": "Cleaner/*",
|
||||
"dest": "plugins/Cleaner"
|
||||
"type": "dir",
|
||||
"src": "Cleaner/",
|
||||
"dest": "mods/Cleaner"
|
||||
}
|
||||
]
|
||||
]
|
||||
}
|
||||
],
|
||||
"preserve_files": [],
|
||||
"remove_files": [],
|
||||
"scripts": {
|
||||
"pre_install": [],
|
||||
"install": [],
|
||||
"post_install": [],
|
||||
"pre_pack": [],
|
||||
"post_pack": [],
|
||||
"pre_uninstall": [],
|
||||
"uninstall": [],
|
||||
"post_uninstall": []
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,6 +1,8 @@
|
||||
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")
|
||||
@@ -8,8 +10,11 @@ end
|
||||
|
||||
-- Option 1: Use the latest version of LeviLamina released on GitHub.
|
||||
add_requires("levilamina")
|
||||
add_requires("levibuildscript")
|
||||
add_requires("gmlib")
|
||||
add_requires("ilistenattentively")
|
||||
|
||||
target("Cleaner") -- Change this to your plugin name.
|
||||
target("Cleaner") -- Change this to your mod name.
|
||||
add_cxflags(
|
||||
"/EHa",
|
||||
"/utf-8"
|
||||
@@ -17,30 +22,33 @@ target("Cleaner") -- Change this to your plugin name.
|
||||
add_files(
|
||||
"src/**.cpp"
|
||||
)
|
||||
add_links(
|
||||
"SDK-GMLIB/Lib/GMLIB"
|
||||
)
|
||||
add_includedirs(
|
||||
"SDK-GMLIB",
|
||||
"src"
|
||||
)
|
||||
add_packages(
|
||||
"levilamina"
|
||||
"levilamina",
|
||||
"gmlib",
|
||||
"ilistenattentively"
|
||||
)
|
||||
add_shflags(
|
||||
"/DELAYLOAD:bedrock_server.dll"
|
||||
add_defines(
|
||||
"NOMINMAX",
|
||||
"UNICODE",
|
||||
"_HAS_CXX17",
|
||||
"_HAS_CXX20",
|
||||
"_HAS_CXX23"
|
||||
)
|
||||
add_rules("@levibuildscript/linkrule")
|
||||
set_exceptions("none")
|
||||
set_kind("shared")
|
||||
set_languages("cxx23")
|
||||
|
||||
after_build(function (target)
|
||||
local plugin_packer = import("scripts.after_build")
|
||||
local mod_packer = import("scripts.after_build")
|
||||
|
||||
local plugin_define = {
|
||||
pluginName = target:name(),
|
||||
pluginFile = path.filename(target:targetfile()),
|
||||
local mod_define = {
|
||||
modName = target:name(),
|
||||
modFile = path.filename(target:targetfile()),
|
||||
}
|
||||
|
||||
plugin_packer.pack_plugin(target,plugin_define)
|
||||
mod_packer.pack_mod(target,mod_define)
|
||||
end)
|
||||
|
||||
Reference in New Issue
Block a user