Improve ReloadCommand nad DispatcherCommands.

Author: imDMK

automessage-core/src/main/java/com/github/imdmk/automessage/AutoMessagePlugin.java

@@ -96,7 +96,7 @@ void enable(@NotNull PluginSettings settings) {
                 .commands(
                         new DisableCommand(messageDispatcherConfig, messageService),
                         new EnableCommand(messageDispatcherConfig, messageService),
-                        new ReloadCommand(logger, configManager, messageService)
+                        new ReloadCommand(logger, configManager, taskScheduler, messageService)
                 )
 
                 .build();

automessage-core/src/main/java/com/github/imdmk/automessage/command/dispatcher/DisableCommand.java

@@ -27,8 +27,14 @@ public DisableCommand(
 
     @Execute
     void disable(@Context CommandSender sender) {
+        if (!dispatcherConfig.isEnabled()) {
+            messageService.send(sender, n -> n.dispatcherMessages.dispatcherAlreadyDisabled());
+            return;
+        }
+
         dispatcherConfig.setEnabled(false);
         dispatcherConfig.save();
+
         messageService.send(sender, n -> n.dispatcherMessages.dispatcherDisabled());
     }
 }

automessage-core/src/main/java/com/github/imdmk/automessage/command/dispatcher/EnableCommand.java

@@ -27,8 +27,14 @@ public EnableCommand(
 
     @Execute
     void enable(@Context CommandSender sender) {
+        if (dispatcherConfig.isEnabled()) {
+            messageService.send(sender, n -> n.dispatcherMessages.dispatcherAlreadyEnabled());
+            return;
+        }
+
         dispatcherConfig.setEnabled(true);
         dispatcherConfig.save();
+
         messageService.send(sender, n -> n.dispatcherMessages.dispatcherEnabled());
     }
 }

automessage-core/src/main/java/com/github/imdmk/automessage/command/dispatcher/messages/DispatcherMessages.java

@@ -6,6 +6,9 @@ public interface DispatcherMessages {
 
     Notice dispatcherEnabled();
 
+    Notice dispatcherAlreadyEnabled();
+
     Notice dispatcherDisabled();
 
+    Notice dispatcherAlreadyDisabled();
 }

automessage-core/src/main/java/com/github/imdmk/automessage/command/dispatcher/messages/DispatcherMessagesImpl.java

@@ -6,23 +6,43 @@
 
 public final class DispatcherMessagesImpl extends OkaeriConfig implements DispatcherMessages {
 
-    @Comment({"#", "# Message shown when automatic message dispatching gets enabled.", "#"})
+    @Comment({"#", "# Sent when automatic message dispatching is successfully enabled.", "#"})
     Notice dispatcherEnabled = Notice.chat(
-            "<dark_gray>• <green>Automatic messages have been enabled.<dark_gray>"
+            "<dark_gray>• <green>Automatic messages have been <bold>enabled</bold>.<dark_gray>"
     );
 
-    @Comment({"#", "# Message shown when automatic message dispatching gets disabled.", "#"})
+    @Comment({"#", "# Sent when a user attempts to enable dispatching, but it is already active.", "#"})
+    Notice dispatcherAlreadyEnabled = Notice.chat(
+            "<dark_gray>• <yellow>Automatic messages are already enabled.<dark_gray>"
+    );
+
+    @Comment({"#", "# Sent when automatic message dispatching is successfully disabled.", "#"})
     Notice dispatcherDisabled = Notice.chat(
-            "<dark_gray>• <red>Automatic messages have been disabled.<dark_gray>"
+            "<dark_gray>• <red>Automatic messages have been <bold>disabled</bold>.<dark_gray>"
+    );
+
+    @Comment({"#", "# Sent when a user attempts to disable dispatching, but it is already inactive.", "#"})
+    Notice dispatcherAlreadyDisabled = Notice.chat(
+            "<dark_gray>• <yellow>Automatic messages are already disabled.<dark_gray>"
     );
 
     @Override
     public Notice dispatcherEnabled() {
         return dispatcherEnabled;
     }
 
+    @Override
+    public Notice dispatcherAlreadyEnabled() {
+        return dispatcherAlreadyEnabled;
+    }
+
     @Override
     public Notice dispatcherDisabled() {
         return dispatcherDisabled;
     }
+
+    @Override
+    public Notice dispatcherAlreadyDisabled() {
+        return dispatcherAlreadyDisabled;
+    }
 }

automessage-core/src/main/java/com/github/imdmk/automessage/command/reload/ReloadCommand.java

@@ -2,6 +2,7 @@
 
 import com.github.imdmk.automessage.config.ConfigManager;
 import com.github.imdmk.automessage.platform.logger.PluginLogger;
+import com.github.imdmk.automessage.platform.scheduler.TaskScheduler;
 import com.github.imdmk.automessage.shared.message.MessageService;
 import com.github.imdmk.automessage.shared.validate.Validator;
 import dev.rollczi.litecommands.annotations.command.Command;
@@ -11,34 +12,37 @@
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.concurrent.CompletableFuture;
-
 @Command(name = "automessage reload")
 @Permission("command.automessage.reload")
 public final class ReloadCommand {
 
     private final PluginLogger logger;
     private final ConfigManager configManager;
+    private final TaskScheduler taskScheduler;
     private final MessageService messageService;
 
     public ReloadCommand(
             @NotNull PluginLogger logger,
             @NotNull ConfigManager configManager,
+            @NotNull TaskScheduler taskScheduler,
             @NotNull MessageService messageService
     ) {
         this.logger = Validator.notNull(logger, "logger");
         this.configManager = Validator.notNull(configManager, "configManager");
+        this.taskScheduler = Validator.notNull(taskScheduler, "taskScheduler");
         this.messageService = Validator.notNull(messageService, "messageService");
     }
 
     @Execute
     void reload(@Context CommandSender sender) {
-        CompletableFuture.runAsync(configManager::loadAll)
-                .thenAccept(v -> messageService.send(sender, n -> n.reloadMessages.configReloadedSuccess()))
-                .exceptionally(e -> {
-                    logger.error(e, "Failed to reload plugin config");
-                    messageService.send(sender, n -> n.reloadMessages.configReloadFailed());
-                    return null;
-                });
+        taskScheduler.runAsync(() -> {
+            try {
+                configManager.loadAll();
+                messageService.send(sender, n -> n.reloadMessages.configReloadedSuccess());
+            } catch (Exception e) {
+                logger.error(e, "Failed to reload plugin config");
+                messageService.send(sender, n -> n.reloadMessages.configReloadFailed());
+            }
+        });
     }
 }

automessage-core/src/main/java/com/github/imdmk/automessage/scheduled/dispatcher/MessageDispatcherConfig.java

@@ -4,7 +4,6 @@
 import com.github.imdmk.automessage.scheduled.selector.MessageSelectorType;
 import eu.okaeri.configs.annotation.Comment;
 import eu.okaeri.configs.serdes.OkaeriSerdesPack;
-import eu.okaeri.configs.serdes.commons.SerdesCommons;
 import org.jetbrains.annotations.NotNull;
 
 import java.time.Duration;
@@ -27,6 +26,10 @@ public void setEnabled(boolean enabled) {
         this.enabled = enabled;
     }
 
+    public boolean isEnabled() {
+        return enabled;
+    }
+
     @Override
     public @NotNull OkaeriSerdesPack getSerdesPack() {
         return registry -> {