From 04ac327365058e74449e6e9494c2279f43e0753a Mon Sep 17 00:00:00 2001
From: destro174 <40720638+destro174@users.noreply.github.com>
Date: Sun, 18 Jul 2021 00:56:33 +0200
Subject: [PATCH] Split toggleglobalchat into another command

---
 .../main/java/com/alttd/chat/ChatPlugin.java  |  2 ++
 .../com/alttd/chat/commands/GlobalChat.java   |  9 -----
 .../alttd/chat/commands/ToggleGlobalChat.java | 33 +++++++++++++++++++
 galaxy/src/main/resources/plugin.yml          |  4 +++
 4 files changed, 39 insertions(+), 9 deletions(-)
 create mode 100755 galaxy/src/main/java/com/alttd/chat/commands/ToggleGlobalChat.java

diff --git a/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java b/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java
index 863bc3e..c809e93 100755
--- a/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java
+++ b/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java
@@ -3,6 +3,7 @@ package com.alttd.chat;
 import com.alttd.chat.commands.GlobalChat;
 import com.alttd.chat.commands.Message;
 import com.alttd.chat.commands.Reply;
+import com.alttd.chat.commands.ToggleGlobalChat;
 import com.alttd.chat.config.Config;
 import com.alttd.chat.database.DatabaseConnection;
 import com.alttd.chat.handler.ChatHandler;
@@ -32,6 +33,7 @@ public class ChatPlugin extends JavaPlugin {
         DatabaseConnection.initialize();
         registerListener(new PlayerListener(), new ChatListener());
         registerCommand("globalchat", new GlobalChat());
+        registerCommand("toggleglobalchat", new ToggleGlobalChat());
         registerCommand("message", new Message());
         registerCommand("reply", new Reply());
 
diff --git a/galaxy/src/main/java/com/alttd/chat/commands/GlobalChat.java b/galaxy/src/main/java/com/alttd/chat/commands/GlobalChat.java
index 96930d5..136b1cc 100755
--- a/galaxy/src/main/java/com/alttd/chat/commands/GlobalChat.java
+++ b/galaxy/src/main/java/com/alttd/chat/commands/GlobalChat.java
@@ -20,15 +20,6 @@ public class GlobalChat implements CommandExecutor {
         }
         Player player = (Player) sender;
         if(args.length == 0) return false;
-        if(args[0].equalsIgnoreCase("togglegc")) {
-            new BukkitRunnable() {
-                @Override
-                public void run() {
-                    Objects.requireNonNull(ChatUserManager.getChatUser(((Player) sender).getUniqueId())).toggleGc();
-                }
-            }.runTask(ChatPlugin.getInstance());
-            return false;
-        }
 
         String message = StringUtils.join(args, " ", 0, args.length);
         ChatPlugin.getInstance().getChatHandler().globalChat(player, message);
diff --git a/galaxy/src/main/java/com/alttd/chat/commands/ToggleGlobalChat.java b/galaxy/src/main/java/com/alttd/chat/commands/ToggleGlobalChat.java
new file mode 100755
index 0000000..3bc4eca
--- /dev/null
+++ b/galaxy/src/main/java/com/alttd/chat/commands/ToggleGlobalChat.java
@@ -0,0 +1,33 @@
+package com.alttd.chat.commands;
+
+import com.alttd.chat.ChatPlugin;
+import com.alttd.chat.managers.ChatUserManager;
+import com.alttd.chat.objects.ChatUser;
+import org.apache.commons.lang.StringUtils;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.scheduler.BukkitRunnable;
+
+import java.util.Objects;
+
+public class ToggleGlobalChat implements CommandExecutor {
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if(!(sender instanceof Player)) { // must be a player
+            return true;
+        }
+        new BukkitRunnable() {
+            @Override
+            public void run() {
+                ChatUser chatUser = ChatUserManager.getChatUser(((Player) sender).getUniqueId());
+                chatUser.toggleGc();
+                sender.sendMessage("You have turned globalchat " + (chatUser.isGcOn() ? "<green>on." : "<red>off.")); // TODO load from config and minimessage
+            }
+        }.runTask(ChatPlugin.getInstance());
+        return false;
+    }
+
+}
diff --git a/galaxy/src/main/resources/plugin.yml b/galaxy/src/main/resources/plugin.yml
index 94dacfa..458f5ef 100755
--- a/galaxy/src/main/resources/plugin.yml
+++ b/galaxy/src/main/resources/plugin.yml
@@ -9,6 +9,10 @@ commands:
     permission: command.globalchat
     permission-message: You do not have permission!
     aliases: gc
+  toggleglobalchat:
+    permission: command.globalchat
+    permission-message: You do not have permission!
+    aliases: togglegc
   message:
     permission: command.message
     aliases: msg