From 477027a032355aadd73811615a82e7f0f7889c97 Mon Sep 17 00:00:00 2001
From: Jordan Atwood <jordan.atwood423@gmail.com>
Date: Tue, 17 Jul 2018 10:22:31 -0700
Subject: [PATCH] chat message manager: Use ColorUtil functions

---
 .../runelite/client/chat/ChatMessageManager.java   | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java
index 90d8e72205..a7e6dd30ef 100644
--- a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java
@@ -51,6 +51,7 @@ import net.runelite.api.events.ResizeableChanged;
 import net.runelite.api.events.SetMessage;
 import net.runelite.api.events.VarbitChanged;
 import net.runelite.client.config.ChatColorConfig;
+import net.runelite.client.util.ColorUtil;
 
 @Slf4j
 @Singleton
@@ -145,13 +146,13 @@ public class ChatMessageManager
 
 		if (usernameColor != null)
 		{
-			messageNode.setName(wrapTextWithColour(messageNode.getName(), usernameColor));
+			messageNode.setName(ColorUtil.wrapWithColorTag(messageNode.getName(), usernameColor));
 		}
 
 		String sender = setMessage.getSender();
 		if (senderColor != null && !Strings.isNullOrEmpty(sender))
 		{
-			messageNode.setSender(wrapTextWithColour(sender, senderColor));
+			messageNode.setSender(ColorUtil.wrapWithColorTag(sender, senderColor));
 		}
 
 		final Collection<ChatColor> chatColors = colorCache.get(chatMessageType);
@@ -162,16 +163,11 @@ public class ChatMessageManager
 				continue;
 			}
 
-			messageNode.setValue(wrapTextWithColour(messageNode.getValue(), chatColor.getColor()));
+			messageNode.setValue(ColorUtil.wrapWithColorTag(messageNode.getValue(), chatColor.getColor()));
 			break;
 		}
 	}
 
-	private static String wrapTextWithColour(String text, Color colour)
-	{
-		return "<col=" + Integer.toHexString(colour.getRGB() & 0xFFFFFF) + ">" + text + "</col>";
-	}
-
 	private static Color getDefaultColor(ChatMessageType type, boolean transparent)
 	{
 		if (!transparent)
@@ -566,7 +562,7 @@ public class ChatMessageManager
 			.forEach(chatColor ->
 				resultMessage.getAndUpdate(oldMessage -> oldMessage.replaceAll(
 					"<col" + chatColor.getType().name() + ">",
-					"<col=" + Integer.toHexString(chatColor.getColor().getRGB() & 0xFFFFFF) + ">")));
+					ColorUtil.colorTag(chatColor.getColor()))));
 
 		return resultMessage.get();
 	}