diff --git a/SDK-GMLIB b/SDK-GMLIB index 72e596a..945cea5 160000 --- a/SDK-GMLIB +++ b/SDK-GMLIB @@ -1 +1 @@ -Subproject commit 72e596afb1fcca9c7bf0bdedc88535704bfb19a8 +Subproject commit 945cea5caee03d9f911e0d0fb60f9bb601f869ad diff --git a/src/Features/CleanTask.cpp b/src/Features/CleanTask.cpp index 1dabec9..424e1cf 100644 --- a/src/Features/CleanTask.cpp +++ b/src/Features/CleanTask.cpp @@ -83,13 +83,13 @@ void CheckCleanTask(int max_entities, float min_tps) { auto_clean_triggerred = true; auto mspt = S(GMLIB_Level::getLevel()->getServerAverageTps()); if (ConfigFile::mConsoleLog) { - logger.warn(tr("cleaner.output.triggerAutoCleanCount", {mspt})); + logger.warn(tr("cleaner.output.triggerAutoCleanTps", {mspt})); } if (ConfigFile::mAnnounce) { - Helper::broadcastMessage(tr("cleaner.output.triggerAutoCleanCount", {mspt})); + Helper::broadcastMessage(tr("cleaner.output.triggerAutoCleanTps", {mspt})); } if (ConfigFile::mSendToast) { - Helper::broadcastToast(tr("cleaner.output.triggerAutoCleanCount", {mspt})); + Helper::broadcastToast(tr("cleaner.output.triggerAutoCleanTps", {mspt})); } CleanTask(); } diff --git a/src/Features/Cleaner.cpp b/src/Features/Cleaner.cpp index 41b290d..096ff66 100644 --- a/src/Features/Cleaner.cpp +++ b/src/Features/Cleaner.cpp @@ -23,9 +23,9 @@ void unloadCleaner() { stopAllTasks(); } void reloadCleaner() { unloadCleaner(); - Config->init(); + Config->reload(); std::string languageCode = Config->getValue({"Basic", "Language"}, "en_US"); - Language->loadAllLanguages(); + Language->reloadAllLanguages(); Language->chooseLanguage(languageCode); loadCleaner(); } diff --git a/src/Features/Helper.cpp b/src/Features/Helper.cpp index 0242b13..be8b1dd 100644 --- a/src/Features/Helper.cpp +++ b/src/Features/Helper.cpp @@ -2,13 +2,8 @@ namespace Helper { -void broadcastMessage(std::string msg) { - TextPacket::createRawMessage(tr("cleaner.info.prefix") + msg).sendToClients(); -} +void broadcastMessage(std::string_view msg) { GMLIB_Level::broadcast(tr("cleaner.info.prefix") + std::string(msg)); } -void broadcastToast(std::string msg) { - auto pkt = ToastRequestPacket(tr("cleaner.info.prefix"), msg); - pkt.sendToClients(); -} +void broadcastToast(std::string_view msg) { GMLIB_Level::broadcastToast(tr("cleaner.info.prefix"), msg); } } // namespace Helper \ No newline at end of file diff --git a/src/Global.h b/src/Global.h index b2e88c2..39ac3f9 100644 --- a/src/Global.h +++ b/src/Global.h @@ -21,8 +21,8 @@ extern bool mSendToast; } // namespace ConfigFile namespace Helper { -extern void broadcastMessage(std::string msg); -extern void broadcastToast(std::string msg); +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 data = {}); \ No newline at end of file diff --git a/tooth.json b/tooth.json index b58121f..b75bccd 100644 --- a/tooth.json +++ b/tooth.json @@ -1,7 +1,7 @@ { "format_version": 2, "tooth": "github.com/GroupMountain/Cleaner", - "version": "0.8.0", + "version": "0.8.1", "info": { "name": "Cleaner", "description": "A Powerful Entities Cleaning up Plugin for BDS", @@ -11,9 +11,9 @@ "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": { - "github.com/GroupMountain/GMLIB": ">=0.8.0" + "github.com/GroupMountain/GMLIB": ">=0.8.2" }, "files": { "place": [