From 6d7b07a355ce881c9503983ba95ff2368734e6ed Mon Sep 17 00:00:00 2001
From: Tsubasa6848 <116721335+Tsubasa6848@users.noreply.github.com>
Date: Thu, 15 Feb 2024 21:37:27 +0800
Subject: [PATCH] refactor: refactor config

---
 src/Cleaner.cpp         | 32 ++++++++++++++++++++------------
 src/Language.h          |  2 +-
 src/RegisterCommand.cpp |  2 +-
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/Cleaner.cpp b/src/Cleaner.cpp
index 32c6af9..04724ec 100644
--- a/src/Cleaner.cpp
+++ b/src/Cleaner.cpp
@@ -10,8 +10,11 @@ using namespace ll::chrono_literals;
 
 int item_despawn_time = 3000;
 
-ServerTimeAsyncScheduler scheduler;
-bool                     auto_clean_triggerred = false;
+ServerTimeScheduler scheduler;
+bool                auto_clean_triggerred = false;
+
+bool ConsoleLog = true;
+bool Announce   = true;
 
 namespace Cleaner {
 
@@ -130,30 +133,33 @@ int CountEntities() {
 
 void CleanTask() {
     auto time          = Config->getValue<int>({"Basic", "Notice1"}, 20);
-    auto announce_time = Config->getValue<int>({"Basic", "Notice2"}, 15);
+    auto announce_time = Config->getValue<int>({"Basic", "Notice2"}, 5);
     auto time_1        = std::chrono::seconds::duration(time);
     auto time_2        = std::chrono::seconds::duration(time - announce_time);
-    if (Config->getValue<bool>({"Basic", "ConsoleLog"}, true)) {
+    if (ConsoleLog) {
         logger.info(tr("cleaner.output.count1", {S(time_1.count())}));
     }
-    if (Config->getValue<bool>({"Basic", "SendBroadcast"}, true)) {
-        TextPacket::createRawMessage(tr("cleaner.output.count1", {S(time_1.count())})).sendToClients();
+    if (Announce) {
+        TextPacket::createRawMessage(tr("cleaner.info.prefix") + tr("cleaner.output.count1", {S(time_1.count())}))
+            .sendToClients();
     }
     scheduler.add<DelayTask>(time_2, [announce_time] {
-        if (Config->getValue<bool>({"Basic", "ConsoleLog"}, true)) {
+        if (ConsoleLog) {
             logger.info(tr("cleaner.output.count2", {S(announce_time)}));
         }
-        if (Config->getValue<bool>({"Basic", "SendBroadcast"}, true)) {
-            TextPacket::createRawMessage(tr("cleaner.output.count2", {S(announce_time)})).sendToClients();
+        if (Announce) {
+            TextPacket::createRawMessage(tr("cleaner.info.prefix") + tr("cleaner.output.count2", {S(announce_time)}))
+                .sendToClients();
         }
     });
     scheduler.add<DelayTask>(time_1, [] {
         auto count = ExecuteClean();
-        if (Config->getValue<bool>({"Basic", "ConsoleLog"}, true)) {
+        if (ConsoleLog) {
             logger.info(tr("cleaner.output.finish", {S(count)}));
         }
-        if (Config->getValue<bool>({"Basic", "SendBroadcast"}, true)) {
-            TextPacket::createRawMessage(tr("cleaner.output.finish", {S(count)})).sendToClients();
+        if (Announce) {
+            TextPacket::createRawMessage(tr("cleaner.info.prefix") + tr("cleaner.output.finish", {S(count)}))
+                .sendToClients();
         }
         auto_clean_triggerred = false;
     });
@@ -235,6 +241,8 @@ void loadCleaner() {
         );
     }
     item_despawn_time = Config->getValue<int>({"ItemDespawn", "DespawnTime"}, 6000);
+    Announce          = Config->getValue<bool>({"Basic", "SendBroadcast"}, true);
+    ConsoleLog        = Config->getValue<bool>({"Basic", "ConsoleLog"}, true);
 }
 
 void unloadCleaner() {
diff --git a/src/Language.h b/src/Language.h
index cb7bcb6..df33c9e 100644
--- a/src/Language.h
+++ b/src/Language.h
@@ -2,7 +2,7 @@
 #include "Global.h"
 
 std::string defaultLanguage_en_US = R"({
-    "cleaner.toast.title": "§e§lCleaner",
+    "cleaner.info.prefix": "§e§l[Cleaner] §r",
     "cleaner.command.cleaner": "Cleaner admin command.",
     "cleaner.command.despawnSuccess": "Successfully despawned %1$s entities.",
     "cleaner.command.error.noTarget": "No targets matched the selector.",
diff --git a/src/RegisterCommand.cpp b/src/RegisterCommand.cpp
index 5537d0c..07c586f 100644
--- a/src/RegisterCommand.cpp
+++ b/src/RegisterCommand.cpp
@@ -37,7 +37,7 @@ void RegCleanerCommand() {
                     logger.info(tr("cleaner.output.opClean"));
                 }
                 if (Config->getValue<bool>({"Basic", "SendBroadcast"}, true)) {
-                    TextPacket::createRawMessage(tr("cleaner.output.opClean")).sendToClients();
+                    TextPacket::createRawMessage(tr("cleaner.info.prefix") + tr("cleaner.output.opClean")).sendToClients();
                 }
                 return output.success(tr("cleaner.command.clean.output"));
             }