From d860c1553e827e8866b8b4a4bac13064cb2643b0 Mon Sep 17 00:00:00 2001
From: Aust1n46 <aust1n46@yahoo.com>
Date: Fri, 28 Aug 2020 17:32:02 -0500
Subject: [PATCH] Tweaked implementation from PR from
 https://bitbucket.org/Rodentman87/

---
 .../Aust1n46/chat/command/chat/Me.java        |  3 +++
 .../Aust1n46/chat/command/chat/Party.java     |  3 +++
 .../chat/command/message/Message.java         |  6 ++++++
 .../Aust1n46/chat/command/message/Reply.java  |  3 +++
 .../Aust1n46/chat/listeners/ChatListener.java |  9 ++++++++
 .../chat/listeners/CommandListener.java       | 11 ++++++++--
 .../Aust1n46/chat/listeners/SignListener.java |  3 +++
 .../Aust1n46/chat/utilities/Format.java       | 21 +++++++++++++++++--
 .../Aust1n46/chat/utilities/FormatTest.java   | 19 +++++++++++++++++
 9 files changed, 74 insertions(+), 4 deletions(-)

diff --git a/src/mineverse/Aust1n46/chat/command/chat/Me.java b/src/mineverse/Aust1n46/chat/command/chat/Me.java
index 45d363f..9c02875 100644
--- a/src/mineverse/Aust1n46/chat/command/chat/Me.java
+++ b/src/mineverse/Aust1n46/chat/command/chat/Me.java
@@ -27,6 +27,9 @@ public class Me extends MineverseCommand {
 				if(sender instanceof Player && MineverseChatAPI.getMineverseChatPlayer((Player) sender).hasFilter()) {
 					msg = Format.FilterChat(msg);
 				}
+				if(sender.hasPermission("venturechat.color.legacy")) {
+					msg = Format.FormatStringLegacyColor(msg);
+				}
 				if(sender.hasPermission("venturechat.color")) 
 					msg = Format.FormatStringColor(msg);
 				if(sender.hasPermission("venturechat.format")) 
diff --git a/src/mineverse/Aust1n46/chat/command/chat/Party.java b/src/mineverse/Aust1n46/chat/command/chat/Party.java
index d3985f3..faad4be 100644
--- a/src/mineverse/Aust1n46/chat/command/chat/Party.java
+++ b/src/mineverse/Aust1n46/chat/command/chat/Party.java
@@ -285,6 +285,9 @@ public class Party extends MineverseCommand {
 						if(mcp.hasFilter()) {
 							msg = Format.FilterChat(msg);
 						}
+						if(mcp.getPlayer().hasPermission("venturechat.color.legacy")) {
+							msg = Format.FormatStringLegacyColor(msg);
+						}
 						if(mcp.getPlayer().hasPermission("venturechat.color")) {
 							msg = Format.FormatStringColor(msg);
 						}
diff --git a/src/mineverse/Aust1n46/chat/command/message/Message.java b/src/mineverse/Aust1n46/chat/command/message/Message.java
index 2ceebe6..48feae3 100644
--- a/src/mineverse/Aust1n46/chat/command/message/Message.java
+++ b/src/mineverse/Aust1n46/chat/command/message/Message.java
@@ -55,6 +55,9 @@ public class Message extends MineverseCommand {
 			if(mcp.hasFilter()) {
 				msg = Format.FilterChat(msg);
 			}
+			if(mcp.getPlayer().hasPermission("venturechat.color.legacy")) {
+				msg = Format.FormatStringLegacyColor(msg);
+			}
 			if(mcp.getPlayer().hasPermission("venturechat.color")) {
 				msg = Format.FormatStringColor(msg);
 			}
@@ -122,6 +125,9 @@ public class Message extends MineverseCommand {
 				if(mcp.hasFilter()) {
 					msg = Format.FilterChat(msg);
 				}
+				if(mcp.getPlayer().hasPermission("venturechat.color.legacy")) {
+					msg = Format.FormatStringLegacyColor(msg);
+				}
 				if(mcp.getPlayer().hasPermission("venturechat.color")) {
 					msg = Format.FormatStringColor(msg);
 				}
diff --git a/src/mineverse/Aust1n46/chat/command/message/Reply.java b/src/mineverse/Aust1n46/chat/command/message/Reply.java
index f9dbf75..ae4469b 100644
--- a/src/mineverse/Aust1n46/chat/command/message/Reply.java
+++ b/src/mineverse/Aust1n46/chat/command/message/Reply.java
@@ -93,6 +93,9 @@ public class Reply extends MineverseCommand {
 					if(mcp.hasFilter()) {
 						msg = Format.FilterChat(msg);
 					}
+					if(mcp.getPlayer().hasPermission("venturechat.color.legacy")) {
+						msg = Format.FormatStringLegacyColor(msg);
+					}
 					if(mcp.getPlayer().hasPermission("venturechat.color")) {
 						msg = Format.FormatStringColor(msg);
 					}
diff --git a/src/mineverse/Aust1n46/chat/listeners/ChatListener.java b/src/mineverse/Aust1n46/chat/listeners/ChatListener.java
index 71d141b..0edf6eb 100644
--- a/src/mineverse/Aust1n46/chat/listeners/ChatListener.java
+++ b/src/mineverse/Aust1n46/chat/listeners/ChatListener.java
@@ -113,6 +113,9 @@ public class ChatListener implements Listener {
 				if(mcp.hasFilter()) {
 					filtered = Format.FilterChat(filtered);
 				}
+				if(mcp.getPlayer().hasPermission("venturechat.color.legacy")) {
+					filtered = Format.FormatStringLegacyColor(filtered);
+				}
 				if(mcp.getPlayer().hasPermission("venturechat.color")) {
 					filtered = Format.FormatStringColor(filtered);
 				}
@@ -177,6 +180,9 @@ public class ChatListener implements Listener {
 						if(mcp.hasFilter()) {
 							filtered = Format.FilterChat(filtered);
 						}
+						if(mcp.getPlayer().hasPermission("venturechat.color.legacy")) {
+							filtered = Format.FormatStringLegacyColor(filtered);
+						}
 						if(mcp.getPlayer().hasPermission("venturechat.color")) {
 							filtered = Format.FormatStringColor(filtered);
 						}
@@ -463,6 +469,9 @@ public class ChatListener implements Listener {
 			}
 		}
 		
+		if(mcp.getPlayer().hasPermission("venturechat.color.legacy")) {
+			chat = Format.FormatStringLegacyColor(chat);
+		}
 		if(mcp.getPlayer().hasPermission("venturechat.color")) {
 			chat = Format.FormatStringColor(chat);
 		}
diff --git a/src/mineverse/Aust1n46/chat/listeners/CommandListener.java b/src/mineverse/Aust1n46/chat/listeners/CommandListener.java
index 022c2c4..b486c7e 100644
--- a/src/mineverse/Aust1n46/chat/listeners/CommandListener.java
+++ b/src/mineverse/Aust1n46/chat/listeners/CommandListener.java
@@ -127,8 +127,15 @@ public class CommandListener implements CommandExecutor, Listener {
 					}
 					if(send.length() > 0) send = send.substring(1);
 					s = Format.FormatStringAll(s);
-					if(mcp.getPlayer().hasPermission("venturechat.color")) send = Format.FormatStringColor(send);
-					if(mcp.getPlayer().hasPermission("venturechat.format")) send = Format.FormatString(send);
+					if(mcp.getPlayer().hasPermission("venturechat.color.legacy")) {
+						send = Format.FormatStringLegacyColor(send);
+					}
+					if(mcp.getPlayer().hasPermission("venturechat.color")) {
+						send = Format.FormatStringColor(send);
+					}
+					if(mcp.getPlayer().hasPermission("venturechat.format")) {
+						send = Format.FormatString(send);
+					}
 					if(s.startsWith("Command:")) {
 						mcp.getPlayer().chat(s.substring(9).replace("$", send));
 						event.setCancelled(true);
diff --git a/src/mineverse/Aust1n46/chat/listeners/SignListener.java b/src/mineverse/Aust1n46/chat/listeners/SignListener.java
index 36b32c2..41c4c41 100644
--- a/src/mineverse/Aust1n46/chat/listeners/SignListener.java
+++ b/src/mineverse/Aust1n46/chat/listeners/SignListener.java
@@ -19,6 +19,9 @@ public class SignListener implements Listener {
 		MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer(event.getPlayer());
 		for(int a = 0; a < event.getLines().length; a++) {
 			String line = event.getLine(a);
+			if(mcp.getPlayer().hasPermission("venturechat.color.legacy")) {
+				line = Format.FormatStringLegacyColor(line);
+			}
 			if(mcp.getPlayer().hasPermission("venturechat.color")) {
 				line = Format.FormatStringColor(line);
 			}
diff --git a/src/mineverse/Aust1n46/chat/utilities/Format.java b/src/mineverse/Aust1n46/chat/utilities/Format.java
index 495f0c0..a136deb 100644
--- a/src/mineverse/Aust1n46/chat/utilities/Format.java
+++ b/src/mineverse/Aust1n46/chat/utilities/Format.java
@@ -30,7 +30,7 @@ public class Format {
 	public static final int HEX_COLOR_CODE_LENGTH = 14;
 	public static final String DEFAULT_COLOR_CODE = String.valueOf(ChatColor.WHITE);
 	public static final String HEX_COLOR_CODE_PREFIX = "#";
-	public static final String BUKKIT_COLOR_CODE_PREFIX = "§";
+	public static final String BUKKIT_COLOR_CODE_PREFIX = "\u00A7";
 	public static final String BUKKIT_HEX_COLOR_CODE_PREFIX = "x";
 	
 	public static String convertToJson(MineverseChatPlayer sender, String format, String chat) {
@@ -438,6 +438,7 @@ public class Format {
 	}
 	
 	protected static Pattern chatColorPattern = Pattern.compile("(?i)&([0-9])");
+	protected static Pattern legacyChatFormatPattern = Pattern.compile("(?<!(&x(&[a-fA-F0-9]){5}))(?<!(&x(&[a-fA-F0-9]){4}))(?<!(&x(&[a-fA-F0-9]){3}))(?<!(&x(&[a-fA-F0-9]){2}))(?<!(&x(&[a-fA-F0-9]){1}))(?<!(&x))(&)([0-9a-fA-F])");
 
 	public static String FormatStringColor(String string) {
 		String allFormated = string;
@@ -456,6 +457,22 @@ public class Format {
 		allFormated = convertHexColorCodeStringToBukkitColorCodeString(allFormated);
 		return allFormated;
 	}
+	
+	public static String FormatStringLegacyColor(String string) {
+		String allFormated = string;
+
+		allFormated = legacyChatFormatPattern.matcher(allFormated).replaceAll("\u00A7$13");
+		allFormated = allFormated.replaceAll(BUKKIT_COLOR_CODE_PREFIX + "[aA]", BUKKIT_COLOR_CODE_PREFIX + "a");
+		allFormated = allFormated.replaceAll(BUKKIT_COLOR_CODE_PREFIX + "[bB]", BUKKIT_COLOR_CODE_PREFIX + "b");
+		allFormated = allFormated.replaceAll(BUKKIT_COLOR_CODE_PREFIX + "[cC]", BUKKIT_COLOR_CODE_PREFIX + "c");
+		allFormated = allFormated.replaceAll(BUKKIT_COLOR_CODE_PREFIX + "[dD]", BUKKIT_COLOR_CODE_PREFIX + "d");
+		allFormated = allFormated.replaceAll(BUKKIT_COLOR_CODE_PREFIX + "[eE]", BUKKIT_COLOR_CODE_PREFIX + "e");
+		allFormated = allFormated.replaceAll(BUKKIT_COLOR_CODE_PREFIX + "[fF]", BUKKIT_COLOR_CODE_PREFIX + "f");
+		
+		allFormated = allFormated.replaceAll("%", "\\%");
+		return allFormated;
+	}
+
 
 	public static String FormatString(String string) {
 		String allFormated = string;
@@ -544,4 +561,4 @@ public class Format {
 	public static int currentTimeMillis() {
 		return (int) (System.currentTimeMillis() % Integer.MAX_VALUE);
 	}
-}
\ No newline at end of file
+}
diff --git a/test/mineverse/Aust1n46/chat/utilities/FormatTest.java b/test/mineverse/Aust1n46/chat/utilities/FormatTest.java
index 4517226..7df6516 100644
--- a/test/mineverse/Aust1n46/chat/utilities/FormatTest.java
+++ b/test/mineverse/Aust1n46/chat/utilities/FormatTest.java
@@ -1,5 +1,6 @@
 package mineverse.Aust1n46.chat.utilities;
 
+import static mineverse.Aust1n46.chat.utilities.Format.BUKKIT_COLOR_CODE_PREFIX;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -137,4 +138,22 @@ public class FormatTest {
 		String result = Format.convertHexColorCodeStringToBukkitColorCodeString(input);
 		assertEquals(expectedResult, result);
 	}
+	
+	@Test
+	public void testConvertLegacyColorCodeStringToBukkitColorCodeString() {
+		String input = "Hello &cThere Austin";
+		String expectedResult = "Hello " + BUKKIT_COLOR_CODE_PREFIX + "cThere Austin";
+
+		String result = Format.FormatStringLegacyColor(input);
+		assertEquals(expectedResult, result);
+	}
+
+	@Test
+	public void testRemoveSpigoteHexColorCodeFromStringWithLegacyFormatting() {
+		String input = "&x&f&f&f&f&f&fHello There Austin";
+		String expectedResult = "&x&f&f&f&f&f&fHello There Austin";
+
+		String result = Format.FormatStringLegacyColor(input);
+		assertEquals(expectedResult, result);
+	}
 }