From 30cc4b3ead46e31e3fdd28cc9ae00da5e4ec2631 Mon Sep 17 00:00:00 2001
From: Teriuihi <teriuihi@alttd.com>
Date: Sun, 8 Aug 2021 12:46:56 +0200
Subject: [PATCH] Renamed party things to not conflict with mcmmo hopefully

---
 galaxy/src/main/java/com/alttd/chat/ChatPlugin.java           | 4 ++--
 .../alttd/chat/commands/{PartyCommand.java => ChatParty.java} | 4 ++--
 .../chat/commands/{PartyChatCommand.java => PartyChat.java}   | 2 +-
 galaxy/src/main/resources/plugin.yml                          | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename galaxy/src/main/java/com/alttd/chat/commands/{PartyCommand.java => ChatParty.java} (99%)
 rename galaxy/src/main/java/com/alttd/chat/commands/{PartyChatCommand.java => PartyChat.java} (96%)

diff --git a/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java b/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java
index 0f1174f..a6b3f0a 100755
--- a/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java
+++ b/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java
@@ -48,8 +48,8 @@ public class ChatPlugin extends JavaPlugin {
         registerCommand("unignore", new Unignore());
         registerCommand("muteserver", new MuteServer());
         registerCommand("spy", new Spy());
-        registerCommand("party", new PartyCommand());
-        registerCommand("pc", new PartyChatCommand());
+        registerCommand("chatparty", new ChatParty());
+        registerCommand("pc", new PartyChat());
         for (Channel channel : Channel.getChannels()) {
             if (!(channel instanceof CustomChannel customChannel)) continue;
            this.getServer().getCommandMap().register(channel.getChannelName().toLowerCase(), new ChatChannel(customChannel));
diff --git a/galaxy/src/main/java/com/alttd/chat/commands/PartyCommand.java b/galaxy/src/main/java/com/alttd/chat/commands/ChatParty.java
similarity index 99%
rename from galaxy/src/main/java/com/alttd/chat/commands/PartyCommand.java
rename to galaxy/src/main/java/com/alttd/chat/commands/ChatParty.java
index 8260fc1..322e647 100644
--- a/galaxy/src/main/java/com/alttd/chat/commands/PartyCommand.java
+++ b/galaxy/src/main/java/com/alttd/chat/commands/ChatParty.java
@@ -26,7 +26,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-public class PartyCommand implements CommandExecutor, TabCompleter {
+public class ChatParty implements CommandExecutor, TabCompleter {
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
@@ -159,7 +159,7 @@ public class PartyCommand implements CommandExecutor, TabCompleter {
                         }
 
                         StringBuilder stringBuilder = new StringBuilder();
-                        stringBuilder.append("<gold><bold>Party info</bold>:</gold>")
+                        stringBuilder.append("<gold><bold>Party info</bold>:\n</gold>")
                                 .append("<green>Party name: <dark_aqua>").append(party.getPartyName()).append("</dark_aqua>\n")
                                 .append(party.getOwnerUuid().equals(player.getUniqueId()) ? "Party password: <dark_aqua>" + party.getPartyPassword() + "</dark_aqua>\n" : "")
                                 .append("Party owner: ").append(party.getUserDisplayName(party.getOwnerUuid())).append("\n")
diff --git a/galaxy/src/main/java/com/alttd/chat/commands/PartyChatCommand.java b/galaxy/src/main/java/com/alttd/chat/commands/PartyChat.java
similarity index 96%
rename from galaxy/src/main/java/com/alttd/chat/commands/PartyChatCommand.java
rename to galaxy/src/main/java/com/alttd/chat/commands/PartyChat.java
index 3e19aa4..17daf5a 100644
--- a/galaxy/src/main/java/com/alttd/chat/commands/PartyChatCommand.java
+++ b/galaxy/src/main/java/com/alttd/chat/commands/PartyChat.java
@@ -12,7 +12,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.jetbrains.annotations.NotNull;
 
-public class PartyChatCommand implements CommandExecutor {
+public class PartyChat implements CommandExecutor {
 
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
diff --git a/galaxy/src/main/resources/plugin.yml b/galaxy/src/main/resources/plugin.yml
index e917c0c..46d2050 100755
--- a/galaxy/src/main/resources/plugin.yml
+++ b/galaxy/src/main/resources/plugin.yml
@@ -27,7 +27,7 @@ commands:
     permission: command.mute-server
   spy:
     permission: command.togglespy
-  party:
-    permission: command.party
+  chatparty:
+    permission: command.chatparty
   pc:
     permission: command.pc
\ No newline at end of file