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

feat: migrate to LeviLamina

Browse Source
This commit is contained in:
Tsubasa6848
2024-02-15 20:51:07 +08:00
Unverified
parent cb1de9a4c4
commit 87030e34f0
12 changed files with 944 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Cleaner.cpp
+33 -46
View File
@@ -5,15 +5,13 @@
#include <GMLIB/Server/PlayerAPI.h>
#include <regex>
GMLIB::Files::JsonConfig* Config = nullptr;
nlohmann::json Language;
using namespace ll::schedule;
using namespace ll::chrono_literals;
int item_despawn_time = 3000;
// ServerTimeAsyncScheduler scheduler;
bool auto_clean_triggerred = false;
ServerTimeAsyncScheduler scheduler;
bool auto_clean_triggerred = false;
namespace Cleaner {
@@ -130,43 +128,42 @@ int CountEntities() {
return clean_count;
}
void CleanTask(int time, int announce_time) {
auto time_1 = std::chrono::seconds::duration(time);
auto time_2 = std::chrono::seconds::duration(time - announce_time);
void CleanTask() {
auto time = Config->getValue<int>({"Basic", "Notice1"}, 20);
auto announce_time = Config->getValue<int>({"Basic", "Notice2"}, 15);
auto time_1 = std::chrono::seconds::duration(time);
auto time_2 = std::chrono::seconds::duration(time - announce_time);
logger.info(tr("cleaner.output.count1", {S(time_1.count())}));
// scheduler.add<DelayTask>(time_2, [announce_time] {
logger.info(tr("cleaner.output.count2", {S(announce_time)}));
//});
// scheduler.add<DelayTask>(time_1, [] {
auto count = ExecuteClean();
logger.info(tr("cleaner.output.finish", {S(count)}));
auto_clean_triggerred = false;
//});
scheduler.add<DelayTask>(time_2, [announce_time] { logger.info(tr("cleaner.output.count2", {S(announce_time)})); });
scheduler.add<DelayTask>(time_1, [] {
auto count = ExecuteClean();
logger.info(tr("cleaner.output.finish", {S(count)}));
auto_clean_triggerred = false;
});
}
void AutoCleanTask(int seconds) {
auto time = std::chrono::seconds::duration(seconds);
// mAutoCleanTask = scheduler.add<RepeatTask>(time, [] {
CleanTask(Config->getValue<int>({"Basic", "Notice1"}, 20), Config->getValue<int>({"Basic", "Notice2"}, 15));
//});
auto time = std::chrono::seconds::duration(seconds);
mAutoCleanTask = scheduler.add<RepeatTask>(time, [] { CleanTask(); });
}
void CheckCleanTask(int max_entities, float min_tps) {
// mCheckCleanTask = scheduler.add<RepeatTask>(10s, [max_entities, min_tps] {
auto count = CountEntities();
if (auto_clean_triggerred == false) {
if (count >= max_entities) {
auto_clean_triggerred = true;
logger.warn(tr("cleaner.output.triggerAutoCleanCount", {S(count)}));
CleanTask(Config->getValue<int>({"Basic", "Notice1"}, 20), Config->getValue<int>({"Basic", "Notice2"}, 15));
} else if (GMLIB_Level::getLevel()->getServerAverageTps() <= min_tps) {
auto_clean_triggerred = true;
logger.warn(tr("cleaner.output.triggerAutoCleanCount", {S(GMLIB_Level::getLevel()->getServerAverageTps())})
);
CleanTask(Config->getValue<int>({"Basic", "Notice1"}, 20), Config->getValue<int>({"Basic", "Notice2"}, 15));
mCheckCleanTask = scheduler.add<RepeatTask>(10s, [max_entities, min_tps] {
auto count = CountEntities();
if (auto_clean_triggerred == false) {
if (count >= max_entities) {
auto_clean_triggerred = true;
logger.warn(tr("cleaner.output.triggerAutoCleanCount", {S(count)}));
CleanTask();
} else if (GMLIB_Level::getLevel()->getServerAverageTps() <= min_tps) {
auto_clean_triggerred = true;
logger.warn(
tr("cleaner.output.triggerAutoCleanCount", {S(GMLIB_Level::getLevel()->getServerAverageTps())})
);
CleanTask();
}
}
}
//});
});
}
void setShouldIgnore(GMLIB_Actor* ac) {
@@ -207,12 +204,6 @@ void reloadCleaner() {
loadCleaner();
}
void loadConfig() {
Config = new GMLIB::Files::JsonConfig("./plugins/Cleaner/config/config.json", defaultConfig);
Config->initConfig();
Language = GMLIB::Files::JsonLanguage::initLanguage("./plugins/Cleaner/config/language.json", defaultLanguage);
}
void loadCleaner() {
ListenEvents();
RegisterCommands();
@@ -226,17 +217,13 @@ void loadCleaner() {
Config->getValue<int>({"AutoCleanTPS", "TriggerTPS"}, 15)
);
}
item_despawn_time = Config->getValue<int>({"ItemDespawn", "DespawnTime"}, 6000);
}
void unloadCleaner() {
mAutoCleanTask->cancel();
mCheckCleanTask->cancel();
// UnregisterCommands();
delete Config;
}
} // namespace Cleaner
std::string tr(std::string key, std::vector<std::string> data) {
return GMLIB::Files::JsonLanguage::translate(Language, key, data);
}
} // namespace Cleaner
src/Config.h
+10 -42
View File
@@ -1,8 +1,16 @@
#pragma once
#include <GMLIB/Files/JsonConfig.h>
#include <GMLIB/Files/JsonLanguage.h>
#include "Global.h"
inline std::string defaultConfig = R"({
"Basic": {
"Language": "en_US",
"ConsoleLog": true,
"Command": "cleaner",
"Notice1": 20,
"Notice2": 5,
"SendBroadcast": true,
"SendToast": false
},
"AutoCleanCount": {
"Enabled": true,
"TriggerCount": 900
@@ -11,14 +19,6 @@ inline std::string defaultConfig = R"({
"Enabled": false,
"TriggerTPS": 15
},
"Basic": {
"Command": "cleaner",
"ConsoleLog": true,
"Notice1": 20,
"Notice2": 5,
"SendBroadcast": true,
"SendToast": false
},
"ItemDespawn": {
"Enabled": true,
"DespawnTime": 6000,
@@ -99,36 +99,4 @@ inline std::string defaultConfig = R"({
"Percentage": 50,
"VoteCleanCommand": "voteclean"
}
})";
inline std::string defaultLanguage = 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.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": "你是否同意现在清理服务器实体？",
"cleaner.vote.Timeout": "投票已过期！",
"cleaner.vote.succeed": "投票清理成功！",
"cleaner.vote.title": "投票清理",
"cleaner.vote.toastNotice": "通知"
})";
src/Global.h
+8 -13
View File
@@ -1,19 +1,15 @@
#pragma once
#include "Config.h"
#include "Plugin.h"
#include "include_all.h"
#include <GMLIB/Files/JsonConfig.h>
#include <GMLIB/Files/JsonLanguage.h>
#include <GMLIB/Server/ActorAPI.h>
#include <GMLIB/Server/LevelAPI.h>
#include <include_all.h>
#define S(x) std::to_string(x)
extern ll::Logger logger;
extern void RegisterCommands();
extern void UnregisterCommands();
extern ll::Logger logger;
extern GMLIB::Files::JsonConfig* Config;
extern void RegisterCommands();
extern void initPlugin();
extern int item_despawn_time;
namespace Cleaner {
@@ -21,12 +17,11 @@ namespace Cleaner {
static std::shared_ptr<ll::schedule::task::Task<ll::chrono::ServerClock>> mAutoCleanTask;
static std::shared_ptr<ll::schedule::task::Task<ll::chrono::ServerClock>> mCheckCleanTask;
extern void loadConfig();
extern void loadCleaner();
extern void unloadCleaner();
extern void reloadCleaner();
extern void CleanTask(int time, int announce_time);
extern void CleanTask();
} // namespace Cleaner
extern std::string tr(std::string key, std::vector<std::string> data = {});
extern std::string tr(std::string key, std::vector<std::string> data = {});
src/Initialization.cpp
+22
View File
@@ -0,0 +1,22 @@
#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();
logger.warn("language {}", languageCode);
Language->chooseLanguage(languageCode);
}
std::string tr(std::string key, std::vector<std::string> data) { return Language->translate(key, data); }
src/Language.h
+34
View File
@@ -0,0 +1,34 @@
#pragma once
#include "Global.h"
std::string defaultLanguage_zh_CN = 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.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": "你是否同意现在清理服务器实体？",
"cleaner.vote.Timeout": "投票已过期！",
"cleaner.vote.succeed": "投票清理成功！",
"cleaner.vote.title": "投票清理",
"cleaner.vote.toastNotice": "通知"
})";
src/Plugin.cpp
+2 -2
View File
@@ -6,13 +6,13 @@ namespace plugin {
Plugin::Plugin(ll::plugin::NativePlugin& self) : mSelf(self) {
// Code for loading the plugin goes here.
Cleaner::loadConfig();
initPlugin();
}
bool Plugin::enable() {
Cleaner::loadCleaner();
logger.info("Cleaner Loaded!");
logger.info("Author: Tsubasa6848");
logger.info("Author: GroupMountain");
logger.info("Repository: https://github.com/GroupMountain/Cleaner");
return true;
}
src/RegisterCommand.cpp
+67 -73
View File
@@ -1,7 +1,72 @@
#include "Global.h"
using ParamType = DynamicCommand::ParameterType;
struct CleanerParam {
enum class Despawn { despawn } despawn;
enum class Action { tps, clean, reload, mspt } action;
enum class DespawnTime { despawntime } despawntime;
int ticks;
CommandSelector<Actor> entity;
};
void RegCleanerCommand() {
auto& cmd = ll::command::CommandRegistrar::getInstance().getOrCreateCommand(
Config->getValue<std::string>({"Basic", "Command"}, "cleaner"),
tr("cleaner.command.cleaner"),
CommandPermissionLevel::GameDirectors
);
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"));
}
for (auto en : ens) {
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) {
switch (param.action) {
case CleanerParam::Action::clean: {
Cleaner::CleanTask();
return output.success(tr("cleaner.output.opClean"));
}
case CleanerParam::Action::tps: {
return output.success(
tr("cleaner.command.tps.output",
{S(GMLIB_Level::getLevel()->getServerCurrentTps()),
S(GMLIB_Level::getLevel()->getServerAverageTps())})
);
}
case CleanerParam::Action::mspt: {
return output.success(tr("cleaner.command.mspt.output", {S(GMLIB_Level::getLevel()->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) {
item_despawn_time = param.ticks;
Config->setValue({"ItemDespawn", "DespawnTime"}, item_despawn_time);
return output.success(tr("cleaner.command.despawntime", {S(item_despawn_time)}));
}>();
};
void RegisterCommands() {
RegCleanerCommand();
// RegVoteCommand(registry);
}
/*
void RegVoteCommand(CommandRegistry& registry) {
auto command = DynamicCommand::createCommand(registry, "voteclean", "Clean entities", CommandPermissionLevel::Any);
command->addOverload();
@@ -13,75 +78,4 @@ void RegVoteCommand(CommandRegistry& registry) {
});
DynamicCommand::setup(registry, std::move(command));
}
void RegCleanerCommand(CommandRegistry& registry) {
auto command = DynamicCommand::createCommand(
registry,
Config->getValue<std::string>({"Basic", "Command"}, "cleaner"),
tr("cleaner.command.cleaner"),
CommandPermissionLevel::GameDirectors
);
command->setEnum("Despawn", {"despawn"});
command->setEnum("Action", {"tps", "clean", "reload", "mspt"});
command->setEnum("Despawntime", {"despawntime"});
command->mandatory("action", ParamType::Enum, "Action", CommandParameterOption::EnumAutocompleteExpansion);
command
->mandatory("despawntime", ParamType::Enum, "Despawntime", CommandParameterOption::EnumAutocompleteExpansion);
command->mandatory("despawn", ParamType::Enum, "Despawn", CommandParameterOption::EnumAutocompleteExpansion);
command->mandatory("ticks", ParamType::Int);
command->mandatory("target", ParamType::Actor);
command->addOverload({"action"});
command->addOverload({"despawntime", "ticks"});
command->addOverload({"despawn", "target"});
command->setCallback([](DynamicCommand const& cmd,
CommandOrigin const& origin,
CommandOutput& output,
std::unordered_map<std::string, DynamicCommand::Result>& result) {
if (result["despawn"].isSet && result["target"].isSet) {
auto ens = result["target"].get<std::vector<Actor*>>();
if (ens.size() == 0) {
return output.error(tr("cleaner.command.error.noTarget"));
}
for (auto en : ens) {
en->despawn();
}
return output.success(tr("cleaner.command.despawnSuccess", {S(ens.size())}));
} else if (result["action"].isSet) {
auto act = result["action"].get<std::string>();
if (act == "tps") {
return output.success(
tr("cleaner.command.tps.output",
{S(GMLIB_Level::getLevel()->getServerCurrentTps()),
S(GMLIB_Level::getLevel()->getServerAverageTps())})
);
} else if (act == "mspt") {
return output.success(tr("cleaner.command.mspt.output", {S(GMLIB_Level::getLevel()->getServerMspt())}));
} else if (act == "clean") {
Cleaner::CleanTask(
Config->getValue<int>({"Basic", "Notice1"}, 20),
Config->getValue<int>({"Basic", "Notice2"}, 15)
);
return output.success(tr("cleaner.output.opClean"));
} else if (act == "reload") {
Cleaner::reloadCleaner();
return output.success(tr("cleaner.output.reload"));
}
} else if (result["despawntime"].isSet && result["ticks"].isSet) {
item_despawn_time = result["ticks"].get<int>();
return output.success(tr("cleaner.command.despawntime", {S(item_despawn_time)}));
}
});
DynamicCommand::setup(registry, std::move(command));
}
void RegisterCommands() {
auto registry = ll::service::bedrock::getCommandRegistry();
RegCleanerCommand(registry);
// RegVoteCommand(registry);
}
void UnregisterCommands() {
auto registry = ll::service::bedrock::getCommandRegistry();
registry->unregisterCommand(Config->getValue<std::string>({"Basic", "Command"}, "cleaner"));
// registry->unregisterCommand("voteclean");
}
*/
src/include_all.h
-1
View File
@@ -38,7 +38,6 @@
#include <ll/api/event/entity/ActorHurtEvent.h>
#include <ll/api/event/entity/MobDieEvent.h>
#include <ll/api/event/entity/MobEvent.h>
#include <ll/api/event/filesystem/FileActionEvent.h>
#include <ll/api/event/player/PlayerAddExperienceEvent.h>
#include <ll/api/event/player/PlayerAttackEvent.h>
#include <ll/api/event/player/PlayerChangePermEvent.h>