3 Commits

6 changed files with 13 additions and 18 deletions
+3 -3
View File
@@ -83,13 +83,13 @@ void CheckCleanTask(int max_entities, float min_tps) {
auto_clean_triggerred = true; auto_clean_triggerred = true;
auto mspt = S(GMLIB_Level::getLevel()->getServerAverageTps()); auto mspt = S(GMLIB_Level::getLevel()->getServerAverageTps());
if (ConfigFile::mConsoleLog) { if (ConfigFile::mConsoleLog) {
logger.warn(tr("cleaner.output.triggerAutoCleanCount", {mspt})); logger.warn(tr("cleaner.output.triggerAutoCleanTps", {mspt}));
} }
if (ConfigFile::mAnnounce) { if (ConfigFile::mAnnounce) {
Helper::broadcastMessage(tr("cleaner.output.triggerAutoCleanCount", {mspt})); Helper::broadcastMessage(tr("cleaner.output.triggerAutoCleanTps", {mspt}));
} }
if (ConfigFile::mSendToast) { if (ConfigFile::mSendToast) {
Helper::broadcastToast(tr("cleaner.output.triggerAutoCleanCount", {mspt})); Helper::broadcastToast(tr("cleaner.output.triggerAutoCleanTps", {mspt}));
} }
CleanTask(); CleanTask();
} }
+2 -2
View File
@@ -23,9 +23,9 @@ void unloadCleaner() { stopAllTasks(); }
void reloadCleaner() { void reloadCleaner() {
unloadCleaner(); unloadCleaner();
Config->init(); Config->reload();
std::string languageCode = Config->getValue<std::string>({"Basic", "Language"}, "en_US"); std::string languageCode = Config->getValue<std::string>({"Basic", "Language"}, "en_US");
Language->loadAllLanguages(); Language->reloadAllLanguages();
Language->chooseLanguage(languageCode); Language->chooseLanguage(languageCode);
loadCleaner(); loadCleaner();
} }
+2 -7
View File
@@ -2,13 +2,8 @@
namespace Helper { namespace Helper {
void broadcastMessage(std::string msg) { void broadcastMessage(std::string_view msg) { GMLIB_Level::broadcast(tr("cleaner.info.prefix") + std::string(msg)); }
TextPacket::createRawMessage(tr("cleaner.info.prefix") + msg).sendToClients();
}
void broadcastToast(std::string msg) { void broadcastToast(std::string_view msg) { GMLIB_Level::broadcastToast(tr("cleaner.info.prefix"), msg); }
auto pkt = ToastRequestPacket(tr("cleaner.info.prefix"), msg);
pkt.sendToClients();
}
} // namespace Helper } // namespace Helper
+2 -2
View File
@@ -21,8 +21,8 @@ extern bool mSendToast;
} // namespace ConfigFile } // namespace ConfigFile
namespace Helper { namespace Helper {
extern void broadcastMessage(std::string msg); extern void broadcastMessage(std::string_view msg);
extern void broadcastToast(std::string msg); extern void broadcastToast(std::string_view msg);
} // namespace Helper } // namespace Helper
extern std::string tr(std::string key, std::vector<std::string> data = {}); extern std::string tr(std::string key, std::vector<std::string> data = {});
+3 -3
View File
@@ -1,7 +1,7 @@
{ {
"format_version": 2, "format_version": 2,
"tooth": "github.com/GroupMountain/Cleaner", "tooth": "github.com/GroupMountain/Cleaner",
"version": "0.8.0", "version": "0.8.1",
"info": { "info": {
"name": "Cleaner", "name": "Cleaner",
"description": "A Powerful Entities Cleaning up Plugin for BDS", "description": "A Powerful Entities Cleaning up Plugin for BDS",
@@ -11,9 +11,9 @@
"Cleaner" "Cleaner"
] ]
}, },
"asset_url": "https://github.com/GroupMountain/Cleaner/releases/download/v0.8.0/Cleaner-windows-x64.zip", "asset_url": "https://github.com/GroupMountain/Cleaner/releases/download/v0.8.1/Cleaner-windows-x64.zip",
"dependencies": { "dependencies": {
"github.com/GroupMountain/GMLIB": ">=0.8.0" "github.com/GroupMountain/GMLIB": ">=0.8.2"
}, },
"files": { "files": {
"place": [ "place": [