From ce4f40c2c4248fe3781c0594dfc66c2f39ad5acf Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Fri, 17 Jul 2020 17:41:38 +0200
Subject: [PATCH] Fix /u ncolor (#118)

---
 pom.xml                                       |  4 ++--
 .../components/towncolors/NColorCommand.java  | 24 ++++++++++++-------
 .../towncolors/TownColorComponent.java        |  4 ++--
 src/main/resources/plugin.yml                 |  2 +-
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5e0aeb4..e4beb85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -211,10 +211,10 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.palmergames.bukkit.towny</groupId>
+            <groupId>com.github.TownyAdvanced</groupId>
             <artifactId>Towny</artifactId>
             <!-- <version>8d3b6b6</version> ButtonCore repo -->
-            <version>0.96.1.0</version>
+            <version>0.96.2.0</version>
             <scope>provided</scope>
         </dependency>
 		<!-- <dependency> <groupId>au.com.mineauz</groupId> <artifactId>Minigames</artifactId> 
diff --git a/src/main/java/buttondevteam/chat/components/towncolors/NColorCommand.java b/src/main/java/buttondevteam/chat/components/towncolors/NColorCommand.java
index 980466f..bc2cc0d 100644
--- a/src/main/java/buttondevteam/chat/components/towncolors/NColorCommand.java
+++ b/src/main/java/buttondevteam/chat/components/towncolors/NColorCommand.java
@@ -41,7 +41,7 @@ public class NColorCommand extends UCommandBase {
 		//Don't add ~ for nicknames
 		if (!nameWithLines.replace("|", "").replace(":", "").equalsIgnoreCase(name)) {
 			player.sendMessage("§cThe name you gave doesn't match your name. Make sure to use "
-                    + name + "§c with added vertical lines (|) or colons (:).");
+				+ name + "§c with added vertical lines (|) or colons (:).");
 			return true;
 		}
 		String[] nameparts = nameWithLines.split("[|:]");
@@ -50,22 +50,30 @@ public class NColorCommand extends UCommandBase {
 			player.sendMessage("§cYour town doesn't have a color set. The town mayor can set it using /u towncolor.");
 			return true;
 		}
-		if (nameparts.length < towncolors.length + 1) { //+1: Nation color
+		var component = TownColorComponent.getComponent();
+		byte nationColors = (byte) (component.useNationColors().get() ? 1 : 0);
+		if (nameparts.length < towncolors.length + nationColors) { //+1: Nation color
 			player.sendMessage("§cYou need more vertical lines (|) or colons (:) in your name. (Should have " + (towncolors.length - 1 + 1) + ")"); //Nation color
 			return true;
 		}
-		if (nameparts.length > (towncolors.length + 1) * 2) {
+		if (nameparts.length > (towncolors.length + nationColors) * 2) {
 			player.sendMessage("§cYou have waay too many vertical lines (|) or colons (:) in your name. (Should have " + (towncolors.length - 1 + 1) + ")");
 			return true;
 		}
-		if (nameparts.length > towncolors.length + 1) {
+		if (nameparts.length > towncolors.length + nationColors) {
 			player.sendMessage("§cYou have too many vertical lines (|) or colons (:) in your name. (Should have " + (towncolors.length - 1 + 1) + ")");
 			return true;
 		}
-		ChatPlayer.getPlayer(player.getUniqueId(), ChatPlayer.class).NameColorLocations()
-			.set(new ArrayList<>(Arrays.stream(nameparts).map(String::length).collect(Collectors.toList()))); // No byte[], no TIntArrayList
-		TownColorComponent.updatePlayerColors(player);
-        player.sendMessage("§bName colors set: " + player.getDisplayName());
+		var cp = ChatPlayer.getPlayer(player.getUniqueId(), ChatPlayer.class);
+		var list = Arrays.stream(nameparts).map(String::length).collect(Collectors.toList());
+		if (list.contains(0)) {
+			player.sendMessage("§cAll colors need to be represented in your name. (Use as Test|name|123 instead of |Testname123|)");
+			return true;
+		}
+		cp.NameColorLocations().set(new ArrayList<>(list)); // No byte[], no TIntArrayList
+		TownColorComponent.updatePlayerColors(player, cp);
+		cp.save();
+		player.sendMessage("§bName colors set: " + player.getDisplayName());
 		return true;
 	}
 }
diff --git a/src/main/java/buttondevteam/chat/components/towncolors/TownColorComponent.java b/src/main/java/buttondevteam/chat/components/towncolors/TownColorComponent.java
index 02ea820..bbb2f63 100644
--- a/src/main/java/buttondevteam/chat/components/towncolors/TownColorComponent.java
+++ b/src/main/java/buttondevteam/chat/components/towncolors/TownColorComponent.java
@@ -207,14 +207,14 @@ public class TownColorComponent extends Component<PluginMain> implements Listene
 	/**
 	 * Checks if the component is enabled
 	 */
-	public static void updatePlayerColors(Player player) { //Probably while ingame (/u ncolor)
+	public static void updatePlayerColors(Player player) { //Probably while ingame (/u ncolor - not anymore)
 		updatePlayerColors(player, ChatPlayer.getPlayer(player.getUniqueId(), ChatPlayer.class));
 	}
 
 	/**
 	 * Checks if the component is enabled
 	 */
-	private static void updatePlayerColors(Player player, ChatPlayer cp) { //Probably at join - nop, nicknames
+	public static void updatePlayerColors(Player player, ChatPlayer cp) { //Probably at join - nop, nicknames
 		if (!ComponentManager.isEnabled(TownColorComponent.class))
 			return;
 		User user = PluginMain.essentials.getUser(player);
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index bab4949..7cbaab7 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: Chroma-Chat
 main: buttondevteam.chat.PluginMain
-version: '4.0'
+version: '1.0'
 commands:
   u:
     description: Auto-flair system. Accept or ignore flair.