From 82eecc314251c700823176ee66edead5f8ba98e0 Mon Sep 17 00:00:00 2001
From: Teriuihi <teriuihi@alttd.com>
Date: Mon, 30 May 2022 19:27:47 +0200
Subject: [PATCH] Colored toggle word, improved default party online/offline
 marker

---
 api/src/main/java/com/alttd/chat/config/Config.java       | 8 ++++++--
 .../main/java/com/alttd/chat/commands/ChatChannel.java    | 4 ++--
 .../src/main/java/com/alttd/chat/commands/PartyChat.java  | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/api/src/main/java/com/alttd/chat/config/Config.java b/api/src/main/java/com/alttd/chat/config/Config.java
index 3a1a246..0a19aa5 100755
--- a/api/src/main/java/com/alttd/chat/config/Config.java
+++ b/api/src/main/java/com/alttd/chat/config/Config.java
@@ -325,8 +325,8 @@ public final class Config {
         DISBANDED_PARTY = getString("party.messages.disbanded-party", DISBANDED_PARTY);
         PARTY_INFO = getString("party.messages.party-info", PARTY_INFO);
         ALREADY_IN_THIS_PARTY = getString("party.messages.already-in-this-party", ALREADY_IN_THIS_PARTY);
-        ONLINE_PREFIX = Utility.parseMiniMessage(getString("party.messages.online-prefix", "<green>■ </green>"));
-        OFFLINE_PREFIX = Utility.parseMiniMessage(getString("party.messages.offline-prefix", "<red>■ </red>"));
+        ONLINE_PREFIX = Utility.parseMiniMessage(getString("party.messages.online-prefix", "<green>■</green>"));
+        OFFLINE_PREFIX = Utility.parseMiniMessage(getString("party.messages.offline-prefix", "<red>■</red>"));
         PARTY_TOGGLED = getString("party.messages.party-toggled", PARTY_TOGGLED);
     }
 
@@ -360,6 +360,8 @@ public final class Config {
     }
 
     public static String CUSTOM_CHANNEL_TOGGLED = "<yellow>Toggled <channel> <status>.</yellow>";
+    public static Component TOGGLED_ON = null;
+    public static Component TOGGLED_OFF = null;
     private static void chatChannels() {
         ConfigurationNode node = getNode("chat-channels");
         if (node.empty()) {
@@ -379,6 +381,8 @@ public final class Config {
         }
 
         CUSTOM_CHANNEL_TOGGLED = getString("chat-channels-messages.channel-toggled", CUSTOM_CHANNEL_TOGGLED);
+        TOGGLED_ON = Utility.parseMiniMessage(getString("party.messages.online-prefix", "<green>on</green><gray>"));
+        TOGGLED_OFF = Utility.parseMiniMessage(getString("party.messages.offline-prefix", "<red>off</red><gray>"));
     }
 
     public static String SERVERMUTEPERMISSION = "chat.command.mute-server";
diff --git a/galaxy/src/main/java/com/alttd/chat/commands/ChatChannel.java b/galaxy/src/main/java/com/alttd/chat/commands/ChatChannel.java
index cace7a7..94dfdef 100644
--- a/galaxy/src/main/java/com/alttd/chat/commands/ChatChannel.java
+++ b/galaxy/src/main/java/com/alttd/chat/commands/ChatChannel.java
@@ -40,8 +40,8 @@ public class ChatChannel extends BukkitCommand {
         if(args.length == 0) {
             player.sendMiniMessage(Config.PARTY_TOGGLED, TagResolver.resolver(
                     Placeholder.unparsed("channel", channel.getChannelName()),
-                    Placeholder.unparsed("status", toggleableForCustomChannel.toggle(player.getUniqueId())
-                            ? "<green>on</green>" : "<red>off</red>")));
+                    Placeholder.component("status", toggleableForCustomChannel.toggle(player.getUniqueId())
+                            ? Config.TOGGLED_ON : Config.TOGGLED_OFF)));
             return false;
         }
 
diff --git a/galaxy/src/main/java/com/alttd/chat/commands/PartyChat.java b/galaxy/src/main/java/com/alttd/chat/commands/PartyChat.java
index ab9da7b..51a847b 100644
--- a/galaxy/src/main/java/com/alttd/chat/commands/PartyChat.java
+++ b/galaxy/src/main/java/com/alttd/chat/commands/PartyChat.java
@@ -26,8 +26,8 @@ public class PartyChat extends Toggleable implements CommandExecutor {
         }
 
         if(args.length == 0) {
-            player.sendMiniMessage(Config.PARTY_TOGGLED, Placeholder.unparsed("status",
-                    toggle(player.getUniqueId()) ? "<green>on</green>" : "<red>off</red>"));
+            player.sendMiniMessage(Config.PARTY_TOGGLED, Placeholder.component("status",
+                    toggle(player.getUniqueId()) ? Config.TOGGLED_ON : Config.TOGGLED_OFF));
             return true;
         }