Attempt to add better support for untranslated RGB codes in meta

Author: OllieMartin

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

@@ -28,7 +28,7 @@ public String getPrefix(UUID uuid) {
 				return MultiChatUtil.approximateHexCodes(vaultChat.getPlayerPrefix(Bukkit.getServer().getPlayer(uuid)));
 			}
 
-			return vaultChat.getPlayerPrefix(Bukkit.getServer().getPlayer(uuid));
+			return MultiChatUtil.reformatRGB(vaultChat.getPlayerPrefix(Bukkit.getServer().getPlayer(uuid)));
 
 		}
 
@@ -50,7 +50,7 @@ public String getSuffix(UUID uuid) {
 				return MultiChatUtil.approximateHexCodes(vaultChat.getPlayerSuffix(Bukkit.getServer().getPlayer(uuid)));
 			}
 
-			return vaultChat.getPlayerSuffix(Bukkit.getServer().getPlayer(uuid));
+			return MultiChatUtil.reformatRGB(vaultChat.getPlayerSuffix(Bukkit.getServer().getPlayer(uuid)));
 
 		}
 
@@ -86,6 +86,7 @@ public String getDisplayName(UUID uuid) {
 			displayNameFormat = displayNameFormat.replaceAll("%NAME%", player.getName());
 			displayNameFormat = displayNameFormat.replaceAll("%PREFIX%", getPrefix(uuid));
 			displayNameFormat = displayNameFormat.replaceAll("%SUFFIX%", getSuffix(uuid));
+			displayNameFormat = MultiChatUtil.reformatRGB(displayNameFormat);
 			displayNameFormat = displayNameFormat.replaceAll("&(?=[a-f,0-9,k-o,r,x])", "§");
 
 			// LEGACY HACK

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

@@ -24,7 +24,7 @@ public String getPrefix(UUID uuid) {
 			Player player = opPlayer.get();
 
 			if (player.getOption("prefix").isPresent()) {
-				return MultiChatUtil.approximateHexCodes(player.getOption("prefix").get());
+				return MultiChatUtil.approximateHexCodes(MultiChatUtil.reformatRGB(player.getOption("prefix").get()));
 			} else {
 				return "";
 			}
@@ -45,7 +45,7 @@ public String getSuffix(UUID uuid) {
 			Player player = opPlayer.get();
 
 			if (player.getOption("suffix").isPresent()) {
-				return MultiChatUtil.approximateHexCodes(player.getOption("suffix").get());
+				return MultiChatUtil.approximateHexCodes(MultiChatUtil.reformatRGB(player.getOption("suffix").get()));
 			} else {
 				return "";
 			}
@@ -92,8 +92,9 @@ public String getDisplayName(UUID uuid) {
 			displayNameFormat = displayNameFormat.replaceAll("%NAME%", player.getName());
 			displayNameFormat = displayNameFormat.replaceAll("%PREFIX%", getPrefix(uuid));
 			displayNameFormat = displayNameFormat.replaceAll("%SUFFIX%", getSuffix(uuid));
+			displayNameFormat = MultiChatUtil.reformatRGB(displayNameFormat);
 			displayNameFormat = displayNameFormat.replaceAll("&(?=[a-f,0-9,k-o,r,x])", "§");
-			
+
 			displayNameFormat = MultiChatUtil.approximateHexCodes(displayNameFormat);
 
 			// TODO Sponge doesn't seem to like this... So we tend to work around it by sending back our original string