From f97649083a421d5d9280a4047671d2dadb40543c Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Thu, 19 May 2022 16:32:31 -0500
Subject: [PATCH] Fix errors

---
 .../java/dev/plex/command/impl/ToggleCMD.java | 35 ++++++++++++-------
 server/src/main/resources/messages.yml        |  3 +-
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/server/src/main/java/dev/plex/command/impl/ToggleCMD.java b/server/src/main/java/dev/plex/command/impl/ToggleCMD.java
index 66bb98c..ad0177c 100644
--- a/server/src/main/java/dev/plex/command/impl/ToggleCMD.java
+++ b/server/src/main/java/dev/plex/command/impl/ToggleCMD.java
@@ -10,6 +10,7 @@ import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
 import java.util.List;
 import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
@@ -24,26 +25,33 @@ public class ToggleCMD extends PlexCommand
     {
         if (isConsole(sender) || playerSender == null)
         {
-            sender.sendMessage(PlexUtils.mmDeserialize("<gray>Available toggles:"));
-            sender.sendMessage(PlexUtils.mmDeserialize("<gray>  - Explosions " + status("explosions")));
-            sender.sendMessage(PlexUtils.mmDeserialize("<gray>  - Fluidspread " + status("fluidspread")));
-            sender.sendMessage(PlexUtils.mmDeserialize("<gray>  - Drops " + status("drops")));
+            if (args.length == 0)
+            {
+                sender.sendMessage(PlexUtils.mmDeserialize("<gray>Available toggles:"));
+                sender.sendMessage(PlexUtils.mmDeserialize("<gray>  - Explosions" + status("explosions")));
+                sender.sendMessage(PlexUtils.mmDeserialize("<gray>  - Fluidspread" + status("fluidspread")));
+                sender.sendMessage(PlexUtils.mmDeserialize("<gray>  - Drops" + status("drops")));
+                return null;
+            }
             switch (args[0].toLowerCase())
             {
-                case "explosions":
+                case "explosions" ->
                 {
-                    toggle("explosions");
+                    return toggle(sender, "explosions");
                 }
-                case "fluidspread":
+                case "fluidspread" ->
                 {
-                    toggle("fluidspread");
+                    return toggle(sender, "fluidspread");
                 }
-                case "drops":
+                case "drops" ->
                 {
-                    toggle("drops");
+                    return toggle(sender, "drops");
+                }
+                default ->
+                {
+                    return messageComponent("invalidToggle");
                 }
             }
-            return null;
         }
         new ToggleMenu().openInv(playerSender, 0);
         return null;
@@ -57,11 +65,12 @@ public class ToggleCMD extends PlexCommand
 
     private String status(String toggle)
     {
-        return plugin.toggles.getBoolean(toggle) ? "(enabled)" : "(disabled)";
+        return plugin.toggles.getBoolean(toggle) ? " (enabled)" : " (disabled)";
     }
 
-    private void toggle(String toggle)
+    private Component toggle(CommandSender sender, String toggle)
     {
         plugin.toggles.set(toggle, !plugin.getToggles().getBoolean(toggle));
+        return Component.text("Toggled " + toggle + status(toggle)).color(NamedTextColor.GRAY);
     }
 }
diff --git a/server/src/main/resources/messages.yml b/server/src/main/resources/messages.yml
index 2130c8d..22d6465 100644
--- a/server/src/main/resources/messages.yml
+++ b/server/src/main/resources/messages.yml
@@ -180,4 +180,5 @@ noteNotFound: "<red>A note with this ID could not be found."
 # 0 - The ID of the note removed
 removedNote: "<green>Removed note with ID: {0}"
 # 0 - The number of notes cleared
-clearedNotes: "<green>Cleared {0} notes."
\ No newline at end of file
+clearedNotes: "<green>Cleared {0} notes."
+invalidToggle: "<red>That is not a valid toggle."
\ No newline at end of file