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

feat: adapt gmlib 1.0.0

Browse Source
This commit is contained in:
zimuya4153
2025-04-14 22:44:24 +08:00
Unverified
parent 5bca67d884
commit a3a3c103fb
11 changed files with 57 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Features/Clean.cpp
+2 -2
View File
@@ -18,7 +18,7 @@ bool isMatch(std::string& A, std::string& B) {
bool isTrust(Actor* ac) { return SynchedActorDataAccess::getActorFlag(ac->getEntityContext(), ::ActorFlags::Trusting); }
bool shouldIgnore(gmlib::world::actor::GMActor* ac) {
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;
@@ -30,7 +30,7 @@ bool shouldIgnore(gmlib::world::actor::GMActor* ac) {
bool ShouldClean(Actor* actor) {
// Players
auto& config = Cleaner::Entry::getInstance().getConfig();
auto en = (gmlib::world::actor::GMActor*)actor;
auto en = (gmlib::GMActor*)actor;
if (en->isPlayer() || shouldIgnore(en)) {
return false;
}
src/Features/CleanTask.cpp
+2 -2
View File
@@ -109,9 +109,9 @@ void CleanTaskTPS(float min_tps) {
co_await 10s;
if (*mCleanTaskTPS == false) co_return;
if (auto_clean_triggerred == false) {
if (gmlib::world::GMLevel::getInstance()->getServerAverageTps() <= min_tps) {
if (gmlib::GMLevel::getInstance()->getServerAverageTps() <= min_tps) {
auto_clean_triggerred = true;
auto mspt = S(gmlib::world::GMLevel::getInstance()->getServerAverageTps());
auto mspt = S(gmlib::GMLevel::getInstance()->getServerAverageTps());
if (config.Basic.ConsoleLog) {
ll::io::LoggerRegistry::getInstance().getOrCreate("Cleaner")->warn(
tr("cleaner.output.triggerAutoCleanTps", {mspt})
src/Features/Events.cpp
+7 -7
View File
@@ -1,7 +1,7 @@
#include "Cleaner.h"
namespace Cleaner {
void setShouldIgnore(gmlib::world::actor::GMActor* ac) { ac->addTag("cleaner:ignore"); }
void setShouldIgnore(gmlib::GMActor* ac) { ac->addTag("cleaner:ignore"); }
void ListenEvents() {
auto& eventBus = ll::event::EventBus::getInstance();
@@ -10,28 +10,28 @@ void ListenEvents() {
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();
auto pl = (gmlib::GMPlayer*)event.spawner();
if (pl->isPlayer() && !pl->isAlive()) { // Death Drop
auto ac = (gmlib::world::actor::GMActor*)&item;
auto ac = (gmlib::GMActor*)&item;
setShouldIgnore(ac);
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();
auto type = item.item().getTypeName();
for (auto& key : list) {
if (isMatch(type, key)) {
return;
}
}
item->lifeTime() = config.ItemDespawn.DespawnTime;
item.lifeTime() = config.ItemDespawn.DespawnTime;
}
});
// MobTakeItemEvent
eventBus.emplaceListener<ila::mc::ActorPickupItemAfterEvent>([](ila::mc::ActorPickupItemAfterEvent& event) {
auto mob = (gmlib::world::actor::GMActor*)&event.self();
auto mob = (gmlib::GMActor*)&event.self();
setShouldIgnore(mob);
});
}
src/Features/Helper.cpp
+2 -2
View File
@@ -3,11 +3,11 @@
namespace Helper {
void broadcastMessage(std::string_view msg) {
gmlib::world::GMLevel::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) {
gmlib::world::GMLevel::getInstance()->broadcastToast(tr("cleaner.info.prefix"), msg);
gmlib::GMLevel::getInstance()->broadcastToast(tr("cleaner.info.prefix"), msg);
}
} // namespace Helper
src/Features/UnloadActorClean.cpp
+2 -2
View File
@@ -5,8 +5,8 @@
namespace UnloadActorClean {
void cleanUnloadActor() {
auto& config = Cleaner::Entry::getInstance().getConfig();
gmlib::world::actor::UnloadedActor::foreachUnloadedActor(
[config](gmlib::world::actor::UnloadedActor& actor) -> bool {
gmlib::UnloadedActor::foreachUnloadedActor(
[config](gmlib::UnloadedActor& actor) -> bool {
for (auto& actorname : config.UnloadActorClean.CleanList) {
if (actor.getTypeName() == actorname) {
actor.remove();
src/Mod.cpp
+10 -6
View File
@@ -2,6 +2,7 @@
#include "Features/Cleaner.h"
#include "Global.h"
#include "Language.h"
#include "ll/api/utils/ErrorUtils.h"
namespace Cleaner {
@@ -14,12 +15,15 @@ bool Entry::load() { return true; }
bool Entry::enable() {
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();
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());
gmlib::I18nAPI::updateOrCreateLanguageFile(getSelf().getLangDir(), "en_US", en_US);
gmlib::I18nAPI::updateOrCreateLanguageFile(getSelf().getLangDir(), "zh_CN", zh_CN);
gmlib::I18nAPI::loadLanguagesFromDirectory(getSelf().getLangDir());
Cleaner::ListenEvents();
RegisterCommands();
Cleaner::loadCleaner();
@@ -44,5 +48,5 @@ void Entry::saveConfig() { ll::config::saveConfig(*mConfig, getSelf().getConfigD
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);
return gmlib::I18nAPI::get(key, params);
}
src/RegisterCommand.cpp
+3 -3
View File
@@ -46,13 +46,13 @@ void RegCleanerCommand() {
case CleanerParam::Action::tps: {
return output.success(
tr("cleaner.command.tps.output",
{S(gmlib::world::GMLevel::getInstance()->getServerCurrentTps()),
S(gmlib::world::GMLevel::getInstance()->getServerAverageTps())})
{S(gmlib::GMLevel::getInstance()->getServerCurrentTps()),
S(gmlib::GMLevel::getInstance()->getServerAverageTps())})
);
}
case CleanerParam::Action::mspt: {
return output.success(
tr("cleaner.command.mspt.output", {S(gmlib::world::GMLevel::getInstance()->getServerMspt())})
tr("cleaner.command.mspt.output", {S(gmlib::GMLevel::getInstance()->getServerMspt())})
);
}
case CleanerParam::Action::reload: {