Implement changes for 1.9.5 to fix formats not respecting RGB

Author: OllieMartin

multichat/pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>xyz.olivermartin.multichat</groupId>
 	<artifactId>multichat</artifactId>
-	<version>1.9.4</version>
+	<version>1.9.5</version>
 
 	<repositories>
 

multichat/releases/1.9.5/multichat-1.9.5-dev.1.jar

@@ -37,11 +37,12 @@
  */
 public class MultiChat extends Plugin implements Listener {
 
-	public static final String LATEST_VERSION = "1.9.4";
+	public static final String LATEST_VERSION = "1.9.5";
 
 	public static final String[] ALLOWED_VERSIONS = new String[] {
 
 			LATEST_VERSION,
+			"1.9.4",
 			"1.9.3",
 			"1.9.2",
 			"1.9.1",

multichat/src/main/java/xyz/olivermartin/multichat/bungee/MultiChat.java

@@ -2,6 +2,7 @@
 
 import java.util.UUID;
 
+import xyz.olivermartin.multichat.bungee.MultiChatUtil;
 import xyz.olivermartin.multichat.local.common.LocalPlaceholderManager;
 import xyz.olivermartin.multichat.local.common.MultiChatLocalPlatform;
 
@@ -14,6 +15,9 @@ public LocalSpigotPlaceholderManager() {
 	@Override
 	public String buildChatFormat(UUID uuid, String format) {
 
+		// Reformat any hex codes in the format
+		format = MultiChatUtil.reformatRGB(format);
+
 		// RESPECT OTHER PLUGIN'S DISPLAY NAMES FIRST! (Allows for factions etc.)
 		format = format.replace("%DISPLAYNAME%", "%1$s");
 

multichat/src/main/java/xyz/olivermartin/multichat/local/spigot/LocalSpigotPlaceholderManager.java

@@ -2,6 +2,7 @@
 
 import java.util.UUID;
 
+import xyz.olivermartin.multichat.bungee.MultiChatUtil;
 import xyz.olivermartin.multichat.local.common.LocalPlaceholderManager;
 import xyz.olivermartin.multichat.local.common.MultiChatLocalPlatform;
 
@@ -13,7 +14,11 @@ public LocalSpongePlaceholderManager() {
 
 	@Override
 	public String buildChatFormat(UUID uuid, String format) {
-		return processMultiChatPlaceholders(uuid, format).replaceAll("&(?=[a-f,0-9,k-o,r])", "§");
+		// Reformat any hex codes in the format
+		format = MultiChatUtil.reformatRGB(format);
+		format = processMultiChatPlaceholders(uuid, format).replaceAll("&(?=[a-f,0-9,k-o,r,x])", "§");
+		format = MultiChatUtil.approximateHexCodes(format);
+		return format;
 	}
 
 }

multichat/src/main/java/xyz/olivermartin/multichat/local/sponge/LocalSpongePlaceholderManager.java

@@ -56,7 +56,7 @@
 import xyz.olivermartin.multichat.local.sponge.listeners.communication.LocalSpongePlayerChannelListener;
 import xyz.olivermartin.multichat.local.sponge.listeners.communication.LocalSpongePlayerMetaListener;
 
-@Plugin(id = "multichat", name = "MultiChat", version = "1.9.4", dependencies = { @Dependency(id = "placeholderapi", optional = true) })
+@Plugin(id = "multichat", name = "MultiChat", version = "1.9.5", dependencies = { @Dependency(id = "placeholderapi", optional = true) })
 public class MultiChatLocalSpongePlugin {
 
 	@Inject

multichat/src/main/java/xyz/olivermartin/multichat/local/sponge/MultiChatLocalSpongePlugin.java

@@ -1,6 +1,6 @@
 name: MultiChat
 main: xyz.olivermartin.multichat.bungee.MultiChat
-version: 1.9.4
+version: 1.9.5
 author: Revilo410
 api-version: 1.16
 softdepends: [PremiumVanish]