From faa1ef6e2f1932b0966b6879100c07823e171d3d Mon Sep 17 00:00:00 2001 From: Robert <42982719+Zytion@users.noreply.github.com> Date: Sun, 4 Apr 2021 23:56:47 -0400 Subject: [PATCH] chat colors: add color option for player's own name --- .../client/chat/ChatMessageManager.java | 9 ++++++--- .../client/config/ChatColorConfig.java | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 3 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 50e6fefbb0..bc3cfc96e7 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 @@ -131,13 +131,16 @@ public class ChatMessageManager case MODCHAT: { String sanitizedUsername = Text.removeTags(chatMessage.getName()); - boolean isFriend = client.isFriended(sanitizedUsername, true) && !client.getLocalPlayer().getName().equals(sanitizedUsername); - if (isFriend) + if (client.getLocalPlayer().getName().equals(sanitizedUsername)) + { + usernameColor = isChatboxTransparent ? chatColorConfig.transparentPlayerUsername() : chatColorConfig.opaquePlayerUsername(); + } + else if (client.isFriended(sanitizedUsername, true)) { usernameColor = isChatboxTransparent ? chatColorConfig.transparentPublicFriendUsernames() : chatColorConfig.opaquePublicFriendUsernames(); } - if (usernameColor == null) + else { usernameColor = isChatboxTransparent ? chatColorConfig.transparentUsername() : chatColorConfig.opaqueUsername(); } 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 a6757a382a..30666249eb 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 @@ -313,6 +313,15 @@ public interface ChatColorConfig extends Config ) Color opaquePublicFriendUsernames(); + @ConfigItem( + position = 28, + keyName = "opaquePlayerUsername", + name = "Your username", + description = "Color of your username", + section = opaqueSection + ) + Color opaquePlayerUsername(); + @ConfigItem( position = 51, keyName = "transparentPublicChat", @@ -579,4 +588,13 @@ public interface ChatColorConfig extends Config section = transparentSection ) Color transparentPublicFriendUsernames(); + + @ConfigItem( + position = 78, + keyName = "transparentPlayerUsername", + name = "Your username (transparent)", + description = "Color of your username (transparent)", + section = transparentSection + ) + Color transparentPlayerUsername(); }