From ab1aa4a9a79ff904b1b27d4882bd3b3713975f11 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Sat, 9 Jun 2018 22:41:58 -0400
Subject: [PATCH] Add public chat friend name color in chat color config

---
 .../runelite/client/chat/ChatMessageManager.java | 14 ++++++++++++--
 .../runelite/client/config/ChatColorConfig.java  | 16 ++++++++++++++++
 2 files changed, 28 insertions(+), 2 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 24c00cff4f..cb89d755fe 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
@@ -123,9 +123,19 @@ public class ChatMessageManager
 			case AUTOCHAT:
 			case PUBLIC:
 			case PUBLIC_MOD:
-				usernameColor = isChatboxTransparent ? chatColorConfig.transparentUsername() : chatColorConfig.opaqueUsername();
-				break;
+			{
+				boolean isFriend = client.isFriended(setMessage.getName(), true) && !client.getLocalPlayer().getName().equals(setMessage.getName());
 
+				if (isFriend)
+				{
+					usernameColor = isChatboxTransparent ? chatColorConfig.transparentPublicFriendUsernames() : chatColorConfig.opaquePublicFriendUsernames();
+				}
+				if (usernameColor == null)
+				{
+					usernameColor = isChatboxTransparent ? chatColorConfig.transparentUsername() : chatColorConfig.opaqueUsername();
+				}
+				break;
+			}
 			case CLANCHAT:
 				usernameColor = isChatboxTransparent ? chatColorConfig.transparentClanUsernames() : chatColorConfig.opaqueClanUsernames();
 				break;
diff --git a/runelite-client/src/main/java/net/runelite/client/config/ChatColorConfig.java b/runelite-client/src/main/java/net/runelite/client/config/ChatColorConfig.java
index d49fde038a..049aa252ab 100644
--- a/runelite-client/src/main/java/net/runelite/client/config/ChatColorConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/config/ChatColorConfig.java
@@ -262,6 +262,14 @@ public interface ChatColorConfig extends Config
 	)
 	Color opaqueClanUsernames();
 
+	@ConfigItem(
+		position = 57,
+		keyName = "opaquePublicFriendUsernames",
+		name = "Public friend usernames",
+		description = "Color of Friend Usernames in Public Chat"
+	)
+	Color opaquePublicFriendUsernames();
+
 	@ConfigItem(
 		position = 61,
 		keyName = "transparentPublicChat",
@@ -490,4 +498,12 @@ public interface ChatColorConfig extends Config
 		description = "Color of Usernames in Clan Chat (transparent)"
 	)
 	Color transparentClanUsernames();
+
+	@ConfigItem(
+		position = 87,
+		keyName = "transparentPublicFriendUsernames",
+		name = "Public friend usernames (transparent)",
+		description = "Color of Friend Usernames in Public Chat (transparent)"
+	)
+	Color transparentPublicFriendUsernames();
 }