Compare commits
21 Commits
@@ -1,5 +1,23 @@
|
|||||||
Diagnostics:
|
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:
|
CompileFlags:
|
||||||
Add: ["-ferror-limit=0", "-D__FUNCTION__=\"dummy\"", "-D_CRT_USE_BUILTIN_OFFSETOF", "-std=c++23"]
|
Add:
|
||||||
Remove: ["/Yu_HeaderOutputPredefine.h", "/FI_HeaderOutputPredefine.h"]
|
- "-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"
|
||||||
@@ -16,7 +16,8 @@ jobs:
|
|||||||
|
|
||||||
- uses: xmake-io/github-action-setup-xmake@v1
|
- uses: xmake-io/github-action-setup-xmake@v1
|
||||||
with:
|
with:
|
||||||
xmake-version: latest
|
xmake-version: 3.0.0
|
||||||
|
|
||||||
- run: |
|
- run: |
|
||||||
xmake repo -u
|
xmake repo -u
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,8 @@ jobs:
|
|||||||
|
|
||||||
- uses: xmake-io/github-action-setup-xmake@v1
|
- uses: xmake-io/github-action-setup-xmake@v1
|
||||||
with:
|
with:
|
||||||
xmake-version: latest
|
xmake-version: 3.0.0
|
||||||
|
|
||||||
- run: |
|
- run: |
|
||||||
xmake repo -u
|
xmake repo -u
|
||||||
|
|
||||||
|
|||||||
@@ -101,6 +101,13 @@
|
|||||||
"Cooldown": 120, // 投票冷却时间 单位:秒
|
"Cooldown": 120, // 投票冷却时间 单位:秒
|
||||||
"CheckDelay": 30, // 投票时长 单位:秒
|
"CheckDelay": 30, // 投票时长 单位:秒
|
||||||
"Percentage": 50 // 投票百分比(大于此值则清理)
|
"Percentage": 50 // 投票百分比(大于此值则清理)
|
||||||
|
},
|
||||||
|
"UnloadActorClean": { // 离线实体清理
|
||||||
|
"Enabled": false, // 是否启用
|
||||||
|
"CleanList": [ // 清理实体列表
|
||||||
|
"minecraft:iron_golem", // 铁傀儡
|
||||||
|
"minecraft:zombie_pigman" // 僵尸猪灵
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|||||||
+4
-1
@@ -2,12 +2,15 @@
|
|||||||
"name": "${modName}",
|
"name": "${modName}",
|
||||||
"entry": "${modFile}",
|
"entry": "${modFile}",
|
||||||
"type": "native",
|
"type": "native",
|
||||||
"version": "0.13.3",
|
"version": "0.14.0",
|
||||||
"author": "GroupMountain",
|
"author": "GroupMountain",
|
||||||
"description": "Clean Entities",
|
"description": "Clean Entities",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
{
|
{
|
||||||
"name": "GMLIB"
|
"name": "GMLIB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "iListenAttentively"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -91,5 +91,10 @@ struct Config {
|
|||||||
int CheckDelay = 30;
|
int CheckDelay = 30;
|
||||||
int Percentage = 50;
|
int Percentage = 50;
|
||||||
} VoteClean;
|
} VoteClean;
|
||||||
|
|
||||||
|
struct Unload_Actor_Clean {
|
||||||
|
bool Enabled = false;
|
||||||
|
std::vector<std::string> CleanList = {"minecraft:iron_golem", "minecraft:zombie_pigman"};
|
||||||
|
} UnloadActorClean;
|
||||||
};
|
};
|
||||||
} // namespace Cleaner
|
} // namespace Cleaner
|
||||||
+14
-9
@@ -1,5 +1,6 @@
|
|||||||
#include "Cleaner.h"
|
#include "Cleaner.h"
|
||||||
|
#include "mc/world/actor/provider/SynchedActorDataAccess.h"
|
||||||
|
#include "gmlib/mc/world/actor/Actor.h"
|
||||||
namespace Cleaner {
|
namespace Cleaner {
|
||||||
|
|
||||||
bool isMatch(std::string& A, std::string& B) {
|
bool isMatch(std::string& A, std::string& B) {
|
||||||
@@ -15,9 +16,11 @@ bool isMatch(std::string& A, std::string& B) {
|
|||||||
return (A == B);
|
return (A == B);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool shouldIgnore(GMLIB_Actor* ac) {
|
bool isTrust(Actor* ac) { return SynchedActorDataAccess::getActorFlag(ac->getEntityContext(), ::ActorFlags::Trusting); }
|
||||||
if (ac->isMob() || ac->isItemActor()) {
|
|
||||||
if (ac->isTame() || ac->isTrusting() || ac->getNameTag() != "" || ac->hasTag("cleaner:ignore")) {
|
bool shouldIgnore(gmlib::GMActor* ac) {
|
||||||
|
if (ac->hasCategory(::ActorCategory::Mob) || ac->hasCategory(::ActorCategory::Item)) {
|
||||||
|
if (ac->isTame() || isTrust(ac) || ac->getNameTag() != "" || ac->hasTag("cleaner:ignore")) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -27,7 +30,7 @@ bool shouldIgnore(GMLIB_Actor* ac) {
|
|||||||
bool ShouldClean(Actor* actor) {
|
bool ShouldClean(Actor* actor) {
|
||||||
// Players
|
// Players
|
||||||
auto& config = Cleaner::Entry::getInstance().getConfig();
|
auto& config = Cleaner::Entry::getInstance().getConfig();
|
||||||
auto en = (GMLIB_Actor*)actor;
|
auto en = (gmlib::GMActor*)actor;
|
||||||
if (en->isPlayer() || shouldIgnore(en)) {
|
if (en->isPlayer() || shouldIgnore(en)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -38,7 +41,7 @@ bool ShouldClean(Actor* actor) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Items
|
// Items
|
||||||
if (en->isItemActor()) {
|
if (en->hasCategory(::ActorCategory::Item)) {
|
||||||
if (config.CleanItem.Enabled) {
|
if (config.CleanItem.Enabled) {
|
||||||
auto itac = (ItemActor*)en;
|
auto itac = (ItemActor*)en;
|
||||||
if (itac->age() <= config.CleanItem.ExistTicks) {
|
if (itac->age() <= config.CleanItem.ExistTicks) {
|
||||||
@@ -56,7 +59,7 @@ bool ShouldClean(Actor* actor) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
// Mobs
|
// Mobs
|
||||||
else if (en->isMob()) {
|
else if (en->hasCategory(::ActorCategory::Mob)) {
|
||||||
if (config.CleanMobs.Enabled) {
|
if (config.CleanMobs.Enabled) {
|
||||||
auto blacklist = config.CleanMobs.BlackList;
|
auto blacklist = config.CleanMobs.BlackList;
|
||||||
for (auto& key : blacklist) {
|
for (auto& key : blacklist) {
|
||||||
@@ -94,8 +97,9 @@ bool ShouldClean(Actor* actor) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
int ExecuteClean() {
|
int ExecuteClean() {
|
||||||
|
auto level = ll::service::getLevel();
|
||||||
int clean_count = 0;
|
int clean_count = 0;
|
||||||
auto all_entities = GMLIB_Level::getLevel()->getRuntimeActorList();
|
auto all_entities = level->getRuntimeActorList();
|
||||||
for (auto entity : all_entities) {
|
for (auto entity : all_entities) {
|
||||||
if (ShouldClean(entity)) {
|
if (ShouldClean(entity)) {
|
||||||
entity->despawn();
|
entity->despawn();
|
||||||
@@ -106,8 +110,9 @@ int ExecuteClean() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
int CountEntities() {
|
int CountEntities() {
|
||||||
|
auto level = ll::service::getLevel();
|
||||||
int clean_count = 0;
|
int clean_count = 0;
|
||||||
auto all_entities = GMLIB_Level::getLevel()->getRuntimeActorList();
|
auto all_entities = level->getRuntimeActorList();
|
||||||
for (auto* entity : all_entities) {
|
for (auto* entity : all_entities) {
|
||||||
if (ShouldClean(entity)) {
|
if (ShouldClean(entity)) {
|
||||||
clean_count++;
|
clean_count++;
|
||||||
|
|||||||
+15
-12
@@ -1,6 +1,7 @@
|
|||||||
#include "Cleaner.h"
|
#include "Cleaner.h"
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
#include "gmlib/mc/world/Level.h"
|
||||||
|
#include "gmlib/gm/data/TpsStatus.h"
|
||||||
namespace Cleaner {
|
namespace Cleaner {
|
||||||
|
|
||||||
static std::shared_ptr<bool> mAutoCleanTask = std::make_shared<bool>(false);
|
static std::shared_ptr<bool> mAutoCleanTask = std::make_shared<bool>(false);
|
||||||
@@ -10,11 +11,11 @@ static std::shared_ptr<bool> mCleanTaskTPS = std::make_shared<bool>(false);
|
|||||||
bool auto_clean_triggerred = false;
|
bool auto_clean_triggerred = false;
|
||||||
|
|
||||||
void CleanTask() {
|
void CleanTask() {
|
||||||
auto& config = Cleaner::Entry::getInstance().getConfig();
|
auto& config = Cleaner::Entry::getInstance().getConfig();
|
||||||
auto time = config.Basic.Notice1;
|
auto time = config.Basic.Notice1;
|
||||||
auto announce_time = config.Basic.Notice2;
|
auto announce_time = config.Basic.Notice2;
|
||||||
auto time_1 = std::chrono::seconds::duration(time);
|
std::chrono::seconds time_1(time);
|
||||||
auto time_2 = std::chrono::seconds::duration(time - announce_time);
|
std::chrono::seconds time_2(time - announce_time);
|
||||||
if (config.Basic.ConsoleLog) {
|
if (config.Basic.ConsoleLog) {
|
||||||
ll::io::LoggerRegistry::getInstance().getOrCreate("Cleaner")->info(
|
ll::io::LoggerRegistry::getInstance().getOrCreate("Cleaner")->info(
|
||||||
tr("cleaner.output.count1", {S(time_1.count())})
|
tr("cleaner.output.count1", {S(time_1.count())})
|
||||||
@@ -59,7 +60,7 @@ void CleanTask() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void AutoCleanTask(int seconds) {
|
void AutoCleanTask(int seconds) {
|
||||||
auto time = std::chrono::seconds::duration(seconds);
|
std::chrono::seconds time(seconds);
|
||||||
*mAutoCleanTask = true;
|
*mAutoCleanTask = true;
|
||||||
ll::coro::keepThis([time]() -> ll::coro::CoroTask<> {
|
ll::coro::keepThis([time]() -> ll::coro::CoroTask<> {
|
||||||
while (true) {
|
while (true) {
|
||||||
@@ -72,7 +73,7 @@ void AutoCleanTask(int seconds) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void CleanTaskCount(int max_entities) {
|
void CleanTaskCount(int max_entities) {
|
||||||
auto& config = Cleaner::Entry::getInstance().getConfig();
|
auto& config = Cleaner::Entry::getInstance().getConfig();
|
||||||
*mCleanTaskCount = true;
|
*mCleanTaskCount = true;
|
||||||
ll::coro::keepThis([max_entities, &config]() -> ll::coro::CoroTask<> {
|
ll::coro::keepThis([max_entities, &config]() -> ll::coro::CoroTask<> {
|
||||||
while (true) {
|
while (true) {
|
||||||
@@ -83,7 +84,9 @@ void CleanTaskCount(int max_entities) {
|
|||||||
if (count >= max_entities) {
|
if (count >= max_entities) {
|
||||||
auto_clean_triggerred = true;
|
auto_clean_triggerred = true;
|
||||||
if (config.Basic.ConsoleLog) {
|
if (config.Basic.ConsoleLog) {
|
||||||
ll::io::LoggerRegistry::getInstance().getOrCreate("Cleaner")->warn(tr("cleaner.output.triggerAutoCleanCount", {S(count)}));
|
ll::io::LoggerRegistry::getInstance().getOrCreate("Cleaner")->warn(
|
||||||
|
tr("cleaner.output.triggerAutoCleanCount", {S(count)})
|
||||||
|
);
|
||||||
}
|
}
|
||||||
if (config.Basic.SendBroadcast) {
|
if (config.Basic.SendBroadcast) {
|
||||||
Helper::broadcastMessage(tr("cleaner.output.triggerAutoCleanCount", {S(count)}));
|
Helper::broadcastMessage(tr("cleaner.output.triggerAutoCleanCount", {S(count)}));
|
||||||
@@ -100,16 +103,16 @@ void CleanTaskCount(int max_entities) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void CleanTaskTPS(float min_tps) {
|
void CleanTaskTPS(float min_tps) {
|
||||||
auto& config = Cleaner::Entry::getInstance().getConfig();
|
auto& config = Cleaner::Entry::getInstance().getConfig();
|
||||||
*mCleanTaskTPS = true;
|
*mCleanTaskTPS = true;
|
||||||
ll::coro::keepThis([min_tps, &config]() -> ll::coro::CoroTask<> {
|
ll::coro::keepThis([min_tps, &config]() -> ll::coro::CoroTask<> {
|
||||||
while (true) {
|
while (true) {
|
||||||
co_await 10s;
|
co_await 10s;
|
||||||
if (*mCleanTaskTPS == false) co_return;
|
if (*mCleanTaskTPS == false) co_return;
|
||||||
if (auto_clean_triggerred == false) {
|
if (auto_clean_triggerred == false) {
|
||||||
if (GMLIB_Level::getLevel()->getServerAverageTps() <= min_tps) {
|
if (gmlib::TpsStatus::getInstance().getLevelAverageTps() <= min_tps) {
|
||||||
auto_clean_triggerred = true;
|
auto_clean_triggerred = true;
|
||||||
auto mspt = S(GMLIB_Level::getLevel()->getServerAverageTps());
|
auto mspt = S(gmlib::TpsStatus::getInstance().getLevelAverageTps());
|
||||||
if (config.Basic.ConsoleLog) {
|
if (config.Basic.ConsoleLog) {
|
||||||
ll::io::LoggerRegistry::getInstance().getOrCreate("Cleaner")->warn(
|
ll::io::LoggerRegistry::getInstance().getOrCreate("Cleaner")->warn(
|
||||||
tr("cleaner.output.triggerAutoCleanTps", {mspt})
|
tr("cleaner.output.triggerAutoCleanTps", {mspt})
|
||||||
|
|||||||
@@ -4,6 +4,9 @@ namespace Cleaner {
|
|||||||
|
|
||||||
void loadCleaner() {
|
void loadCleaner() {
|
||||||
auto& config = Cleaner::Entry::getInstance().getConfig();
|
auto& config = Cleaner::Entry::getInstance().getConfig();
|
||||||
|
if(config.UnloadActorClean.Enabled){
|
||||||
|
UnloadActorClean::cleanUnloadActor();
|
||||||
|
}
|
||||||
if (config.ScheduleClean.Enabled) {
|
if (config.ScheduleClean.Enabled) {
|
||||||
Cleaner::AutoCleanTask(config.ScheduleClean.CleanInterval);
|
Cleaner::AutoCleanTask(config.ScheduleClean.CleanInterval);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,4 +26,10 @@ namespace VoteClean {
|
|||||||
|
|
||||||
extern void voteCommandExecute(Player* pl);
|
extern void voteCommandExecute(Player* pl);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace UnloadActorClean {
|
||||||
|
|
||||||
|
extern void cleanUnloadActor();
|
||||||
|
|
||||||
}
|
}
|
||||||
+25
-29
@@ -1,44 +1,40 @@
|
|||||||
#include "Cleaner.h"
|
#include "Cleaner.h"
|
||||||
|
#include "gmlib/mc/world/Level.h"
|
||||||
|
#include "gmlib/mc/world/actor/Player.h"
|
||||||
namespace Cleaner {
|
namespace Cleaner {
|
||||||
|
void setShouldIgnore(gmlib::GMActor* ac) { ac->addTag("cleaner:ignore"); }
|
||||||
void setShouldIgnore(GMLIB_Actor* ac) { ac->addTag("cleaner:ignore"); }
|
|
||||||
|
|
||||||
void ListenEvents() {
|
void ListenEvents() {
|
||||||
auto& eventBus = ll::event::EventBus::getInstance();
|
auto& eventBus = ll::event::EventBus::getInstance();
|
||||||
auto& config = Cleaner::Entry::getInstance().getConfig();
|
auto& config = Cleaner::Entry::getInstance().getConfig();
|
||||||
// ItemSpawnEvent
|
// ItemSpawnEvent
|
||||||
eventBus.emplaceListener<GMLIB::Event::EntityEvent::ItemActorSpawnAfterEvent>(
|
eventBus.emplaceListener<ila::mc::SpawnItemActorAfterEvent>([&config](ila::mc::SpawnItemActorAfterEvent& event) {
|
||||||
[&config](GMLIB::Event::EntityEvent::ItemActorSpawnAfterEvent& event) {
|
auto& item = event.itemActor();
|
||||||
auto& item = event.getItemActor();
|
if (event.spawner()) {
|
||||||
if (event.getSpawner().has_value()) {
|
auto pl = (gmlib::GMPlayer*)event.spawner();
|
||||||
auto pl = (GMLIB_Player*)event.getSpawner().as_ptr();
|
if (pl->isPlayer() && !pl->isAlive()) { // Death Drop
|
||||||
if (pl->isPlayer() && !pl->isAlive()) { // Death Drop
|
auto ac = (gmlib::GMActor*)&item;
|
||||||
auto ac = (GMLIB_Actor*)&item;
|
setShouldIgnore(ac);
|
||||||
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;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
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) {
|
|
||||||
if (isMatch(type, key)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
item.lifeTime() = config.ItemDespawn.DespawnTime;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
);
|
});
|
||||||
// MobTakeItemEvent
|
// MobTakeItemEvent
|
||||||
eventBus.emplaceListener<GMLIB::Event::EntityEvent::MobPickupItemAfterEvent>(
|
eventBus.emplaceListener<ila::mc::ActorPickupItemAfterEvent>([](ila::mc::ActorPickupItemAfterEvent& event) {
|
||||||
[](GMLIB::Event::EntityEvent::MobPickupItemAfterEvent& event) {
|
auto mob = (gmlib::GMActor*)&event.self();
|
||||||
auto mob = (GMLIB_Actor*)&event.self();
|
setShouldIgnore(mob);
|
||||||
setShouldIgnore(mob);
|
});
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace Cleaner
|
} // namespace Cleaner
|
||||||
@@ -1,13 +1,13 @@
|
|||||||
#include "Global.h"
|
#include "Global.h"
|
||||||
|
#include "gmlib/mc/world/Level.h"
|
||||||
namespace Helper {
|
namespace Helper {
|
||||||
|
|
||||||
void broadcastMessage(std::string_view msg) {
|
void broadcastMessage(std::string_view msg) {
|
||||||
GMLIB_Level::getInstance()->broadcast(tr("cleaner.info.prefix") + std::string(msg));
|
gmlib::GMLevel::getInstance()->broadcast(tr("cleaner.info.prefix") + std::string(msg));
|
||||||
}
|
}
|
||||||
|
|
||||||
void broadcastToast(std::string_view msg) {
|
void broadcastToast(std::string_view msg) {
|
||||||
GMLIB_Level::getInstance()->broadcastToast(tr("cleaner.info.prefix"), msg);
|
gmlib::GMLevel::getInstance()->broadcastToast(tr("cleaner.info.prefix"), msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace Helper
|
} // namespace Helper
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
#include "Cleaner.h"
|
||||||
|
#include "Global.h"
|
||||||
|
#include "gmlib/mc/world/actor/UnloadedActor.h"
|
||||||
|
|
||||||
|
namespace UnloadActorClean {
|
||||||
|
void cleanUnloadActor() {
|
||||||
|
auto& config = Cleaner::Entry::getInstance().getConfig();
|
||||||
|
gmlib::UnloadedActor::foreachUnloadedActor(
|
||||||
|
[config](gmlib::UnloadedActor& actor) -> bool {
|
||||||
|
for (auto& actorname : config.UnloadActorClean.CleanList) {
|
||||||
|
if (actor.getTypeName() == actorname) {
|
||||||
|
actor.remove();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
} // namespace UnloadActorClean
|
||||||
@@ -94,12 +94,12 @@ void voteClean(Player* pl) {
|
|||||||
}
|
}
|
||||||
sendVoteForm(pl);
|
sendVoteForm(pl);
|
||||||
ll::coro::keepThis([&config]() -> ll::coro::CoroTask<> {
|
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;
|
canVote = true;
|
||||||
co_return;
|
co_return;
|
||||||
}).launch(ll::thread::ServerThreadExecutor::getDefault());
|
}).launch(ll::thread::ServerThreadExecutor::getDefault());
|
||||||
ll::coro::keepThis([&config]() -> ll::coro::CoroTask<> {
|
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();
|
checkVote();
|
||||||
co_return;
|
co_return;
|
||||||
}).launch(ll::thread::ServerThreadExecutor::getDefault());
|
}).launch(ll::thread::ServerThreadExecutor::getDefault());
|
||||||
|
|||||||
+5
-1
@@ -1,7 +1,11 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
// IWYU pragma: begin_exports
|
||||||
#include "Mod.h"
|
#include "Mod.h"
|
||||||
#include <include_all.h>
|
|
||||||
|
#include "gmlib/include_ll.h"
|
||||||
|
#include "ila/include_all.h"
|
||||||
#include <regex>
|
#include <regex>
|
||||||
|
// IWYU pragma: end_exports
|
||||||
|
|
||||||
#define S(x) std::to_string(x)
|
#define S(x) std::to_string(x)
|
||||||
|
|
||||||
|
|||||||
+11
-6
@@ -2,7 +2,8 @@
|
|||||||
#include "Features/Cleaner.h"
|
#include "Features/Cleaner.h"
|
||||||
#include "Global.h"
|
#include "Global.h"
|
||||||
#include "Language.h"
|
#include "Language.h"
|
||||||
|
#include "ll/api/utils/ErrorUtils.h"
|
||||||
|
#include "gmlib/mc/locale/I18nAPI.h"
|
||||||
namespace Cleaner {
|
namespace Cleaner {
|
||||||
|
|
||||||
Entry& Entry::getInstance() {
|
Entry& Entry::getInstance() {
|
||||||
@@ -14,11 +15,15 @@ bool Entry::load() { return true; }
|
|||||||
|
|
||||||
bool Entry::enable() {
|
bool Entry::enable() {
|
||||||
mConfig.emplace();
|
mConfig.emplace();
|
||||||
ll::config::loadConfig(*mConfig, getSelf().getConfigDir() / "config.json");
|
try {
|
||||||
|
ll::config::loadConfig(*mConfig, getSelf().getConfigDir() / "config.json");
|
||||||
|
} catch (...) {
|
||||||
|
ll::error_utils::printCurrentException(getSelf().getLogger());
|
||||||
|
}
|
||||||
saveConfig();
|
saveConfig();
|
||||||
I18nAPI::updateOrCreateLanguageFile(getSelf().getLangDir(), "en_US", en_US);
|
gmlib::I18nAPI::updateOrCreateLanguageFile(getSelf().getLangDir(), "en_US", en_US);
|
||||||
I18nAPI::updateOrCreateLanguageFile(getSelf().getLangDir(), "zh_CN", zh_CN);
|
gmlib::I18nAPI::updateOrCreateLanguageFile(getSelf().getLangDir(), "zh_CN", zh_CN);
|
||||||
I18nAPI::loadLanguagesFromDirectory(getSelf().getLangDir());
|
gmlib::I18nAPI::loadLanguagesFromDirectory(getSelf().getLangDir());
|
||||||
Cleaner::ListenEvents();
|
Cleaner::ListenEvents();
|
||||||
RegisterCommands();
|
RegisterCommands();
|
||||||
Cleaner::loadCleaner();
|
Cleaner::loadCleaner();
|
||||||
@@ -43,5 +48,5 @@ void Entry::saveConfig() { ll::config::saveConfig(*mConfig, getSelf().getConfigD
|
|||||||
LL_REGISTER_MOD(Cleaner::Entry, Cleaner::Entry::getInstance());
|
LL_REGISTER_MOD(Cleaner::Entry, Cleaner::Entry::getInstance());
|
||||||
|
|
||||||
std::string tr(std::string const& key, std::vector<std::string> const& params) {
|
std::string tr(std::string const& key, std::vector<std::string> const& params) {
|
||||||
return I18nAPI::get(key, params, Cleaner::Entry::getInstance().getConfig().language);
|
return gmlib::I18nAPI::get(key, params);
|
||||||
}
|
}
|
||||||
|
|||||||
+16
-16
@@ -1,5 +1,6 @@
|
|||||||
#include "Features/Cleaner.h"
|
#include "Features/Cleaner.h"
|
||||||
|
#include "gmlib/mc/world/Level.h"
|
||||||
|
#include "gmlib/gm/data/TpsStatus.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;
|
||||||
@@ -15,10 +16,8 @@ void RegCleanerCommand() {
|
|||||||
tr("cleaner.command.cleaner"),
|
tr("cleaner.command.cleaner"),
|
||||||
CommandPermissionLevel::GameDirectors
|
CommandPermissionLevel::GameDirectors
|
||||||
);
|
);
|
||||||
cmd.overload<CleanerParam>()
|
cmd.overload<CleanerParam>().required("despawn").required("entity").execute(
|
||||||
.required("despawn")
|
[&](CommandOrigin const& origin, CommandOutput& output, CleanerParam const& param) {
|
||||||
.required("entity")
|
|
||||||
.execute([&](CommandOrigin const& origin, CommandOutput& output, CleanerParam const& param) {
|
|
||||||
auto ens = param.entity.results(origin);
|
auto ens = param.entity.results(origin);
|
||||||
if (ens.empty()) {
|
if (ens.empty()) {
|
||||||
return output.error(tr("cleaner.command.error.noTarget"));
|
return output.error(tr("cleaner.command.error.noTarget"));
|
||||||
@@ -27,10 +26,10 @@ void RegCleanerCommand() {
|
|||||||
en->despawn();
|
en->despawn();
|
||||||
}
|
}
|
||||||
return output.success(tr("cleaner.command.despawnSuccess", {S(ens.size())}));
|
return output.success(tr("cleaner.command.despawnSuccess", {S(ens.size())}));
|
||||||
});
|
}
|
||||||
cmd.overload<CleanerParam>()
|
);
|
||||||
.required("action")
|
cmd.overload<CleanerParam>().required("action").execute(
|
||||||
.execute([&](CommandOrigin const& origin, CommandOutput& output, CleanerParam const& param) {
|
[&](CommandOrigin const& origin, CommandOutput& output, CleanerParam const& param) {
|
||||||
switch (param.action) {
|
switch (param.action) {
|
||||||
case CleanerParam::Action::clean: {
|
case CleanerParam::Action::clean: {
|
||||||
Cleaner::CleanTask();
|
Cleaner::CleanTask();
|
||||||
@@ -46,15 +45,15 @@ void RegCleanerCommand() {
|
|||||||
return output.success(tr("cleaner.command.clean.output"));
|
return output.success(tr("cleaner.command.clean.output"));
|
||||||
}
|
}
|
||||||
case CleanerParam::Action::tps: {
|
case CleanerParam::Action::tps: {
|
||||||
return output.success(tr(
|
return output.success(
|
||||||
"cleaner.command.tps.output",
|
tr("cleaner.command.tps.output",
|
||||||
{S(GMLIB_Level::getLevel()->getServerCurrentTps()),
|
{S(gmlib::GMLevel::getInstance()->getServerCurrentTps()),
|
||||||
S(GMLIB_Level::getLevel()->getServerAverageTps())}
|
S(gmlib::TpsStatus::getInstance().getLevelAverageTps())})
|
||||||
));
|
);
|
||||||
}
|
}
|
||||||
case CleanerParam::Action::mspt: {
|
case CleanerParam::Action::mspt: {
|
||||||
return output.success(
|
return output.success(
|
||||||
tr("cleaner.command.mspt.output", {S(GMLIB_Level::getLevel()->getServerMspt())})
|
tr("cleaner.command.mspt.output", {S(gmlib::GMLevel::getInstance()->getServerMspt())})
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
case CleanerParam::Action::reload: {
|
case CleanerParam::Action::reload: {
|
||||||
@@ -62,7 +61,8 @@ void RegCleanerCommand() {
|
|||||||
return output.success(tr("cleaner.output.reload"));
|
return output.success(tr("cleaner.output.reload"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
}
|
||||||
|
);
|
||||||
cmd.overload<CleanerParam>()
|
cmd.overload<CleanerParam>()
|
||||||
.required("despawntime")
|
.required("despawntime")
|
||||||
.required("ticks")
|
.required("ticks")
|
||||||
|
|||||||
+49
-24
@@ -1,28 +1,53 @@
|
|||||||
{
|
{
|
||||||
"format_version": 2,
|
"format_version": 3,
|
||||||
"tooth": "github.com/GroupMountain/Cleaner",
|
"format_uuid": "289f771f-2c9a-4d73-9f3f-8492495a924d",
|
||||||
"version": "0.13.3",
|
"tooth": "github.com/GroupMountain/Cleaner",
|
||||||
"info": {
|
"version": "0.14.0",
|
||||||
"name": "Cleaner",
|
"info": {
|
||||||
"description": "A Powerful Entities Cleaning up Mod for BDS",
|
"name": "Cleaner",
|
||||||
"author": "GroupMountain",
|
"description": "A Powerful Entities Cleaning up Mod for BDS",
|
||||||
"source": "github.com/GroupMountain/Cleaner",
|
"tags": [
|
||||||
"tags": [
|
"levilamina",
|
||||||
"levilamina",
|
"cleaner",
|
||||||
"cleaner",
|
"gmlib"
|
||||||
"gmlib"
|
],
|
||||||
]
|
"avatar_url": ""
|
||||||
},
|
},
|
||||||
"asset_url": "https://github.com/GroupMountain/Cleaner/releases/download/v0.13.3/Cleaner-windows-x64.zip",
|
"variants": [
|
||||||
"dependencies": {
|
{
|
||||||
"github.com/GroupMountain/GMLIB": ">=0.13.10"
|
"label": "",
|
||||||
},
|
"platform": "win-x64",
|
||||||
"files": {
|
"dependencies": {
|
||||||
"place": [
|
"github.com/GroupMountain/GMLIB-Release": ">=1.5.0",
|
||||||
|
"github.com/MiracleForest/iListenAttentively-Release": ">=0.8.0"
|
||||||
|
},
|
||||||
|
"assets": [
|
||||||
|
{
|
||||||
|
"type": "zip",
|
||||||
|
"urls": [
|
||||||
|
"https://github.com/GroupMountain/Cleaner/releases/download/v0.13.8/Cleaner-windows-x64.zip"
|
||||||
|
],
|
||||||
|
"placements": [
|
||||||
{
|
{
|
||||||
"src": "Cleaner/*",
|
"type": "dir",
|
||||||
"dest": "mods/Cleaner"
|
"src": "Cleaner/",
|
||||||
|
"dest": "plugins/Cleaner"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"preserve_files": [],
|
||||||
|
"remove_files": [],
|
||||||
|
"scripts": {
|
||||||
|
"pre_install": [],
|
||||||
|
"install": [],
|
||||||
|
"post_install": [],
|
||||||
|
"pre_pack": [],
|
||||||
|
"post_pack": [],
|
||||||
|
"pre_uninstall": [],
|
||||||
|
"uninstall": [],
|
||||||
|
"post_uninstall": []
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
]
|
||||||
|
}
|
||||||
@@ -2,15 +2,17 @@ add_rules("mode.debug", "mode.release", "mode.releasedbg")
|
|||||||
|
|
||||||
add_repositories("liteldev-repo https://github.com/LiteLDev/xmake-repo.git")
|
add_repositories("liteldev-repo https://github.com/LiteLDev/xmake-repo.git")
|
||||||
add_repositories("groupmountain-repo https://github.com/GroupMountain/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
|
if not has_config("vs_runtime") then
|
||||||
set_runtimes("MD")
|
set_runtimes("MD")
|
||||||
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")
|
add_requires("levilamina 1.5.2")
|
||||||
add_requires("levibuildscript")
|
add_requires("levibuildscript")
|
||||||
add_requires("gmlib")
|
add_requires("gmlib 1.5.2")
|
||||||
|
add_requires("ilistenattentively 0.8.0")
|
||||||
|
|
||||||
target("Cleaner") -- Change this to your mod name.
|
target("Cleaner") -- Change this to your mod name.
|
||||||
add_cxflags(
|
add_cxflags(
|
||||||
@@ -25,19 +27,19 @@ target("Cleaner") -- Change this to your mod name.
|
|||||||
)
|
)
|
||||||
add_packages(
|
add_packages(
|
||||||
"levilamina",
|
"levilamina",
|
||||||
"gmlib"
|
"gmlib",
|
||||||
|
"ilistenattentively"
|
||||||
)
|
)
|
||||||
add_defines(
|
add_defines(
|
||||||
"NOMINMAX",
|
"NOMINMAX",
|
||||||
"UNICODE",
|
"UNICODE",
|
||||||
"_HAS_CXX17",
|
"_HAS_CXX23=1"
|
||||||
"_HAS_CXX20",
|
|
||||||
"_HAS_CXX23"
|
|
||||||
)
|
)
|
||||||
add_rules("@levibuildscript/linkrule")
|
add_rules("@levibuildscript/linkrule")
|
||||||
set_exceptions("none")
|
set_exceptions("none")
|
||||||
set_kind("shared")
|
set_kind("shared")
|
||||||
set_languages("cxx23")
|
set_languages("cxx20")
|
||||||
|
set_symbols("debug")
|
||||||
|
|
||||||
after_build(function (target)
|
after_build(function (target)
|
||||||
local mod_packer = import("scripts.after_build")
|
local mod_packer = import("scripts.after_build")
|
||||||
|
|||||||
Reference in New Issue
Block a user