ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #9720 from adwitkow/private-chat

Browse Source 
chat: fix private chat username recolouring, improve responsiveness to config settings
This commit is contained in:
Adam
2019-08-30 14:35:01 -04:00
committed by GitHub
parent e183feab69 4b0740c8f4
commit 7cc9690cd2
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java
View File

@@ -119,12 +119,8 @@ public class ChatMessageManager
switch (chatMessageType) switch (chatMessageType)
{ {
case MODPRIVATECHAT: // username recoloring for MODPRIVATECHAT, PRIVATECHAT and PRIVATECHATOUT
case PRIVATECHAT: // ChatMessageTypes is handled in the script callback event
case PRIVATECHATOUT:
usernameColor = isChatboxTransparent ? chatColorConfig.transparentPrivateUsernames() : chatColorConfig.opaquePrivateUsernames();
break;
case TRADEREQ: case TRADEREQ:
case AUTOTYPER: case AUTOTYPER:
case PUBLICCHAT: case PUBLICCHAT:
@@ -399,6 +395,11 @@ public class ChatMessageManager
cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaqueFilteredHighlight(), false), cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaqueFilteredHighlight(), false),
ChatMessageType.SPAM); ChatMessageType.SPAM);
} }
if (chatColorConfig.opaquePrivateUsernames() != null)
{
cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaquePrivateUsernames(), false),
ChatMessageType.LOGINLOGOUTNOTIFICATION);
}
//Transparent Chat Colours //Transparent Chat Colours
if (chatColorConfig.transparentPublicChat() != null) if (chatColorConfig.transparentPublicChat() != null)
@@ -527,6 +528,11 @@ public class ChatMessageManager
cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentFilteredHighlight(), true), cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentFilteredHighlight(), true),
ChatMessageType.SPAM); ChatMessageType.SPAM);
} }
if (chatColorConfig.transparentPrivateUsernames() != null)
{
cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentPrivateUsernames(), true),
ChatMessageType.LOGINLOGOUTNOTIFICATION);
}
} }
private void cacheColor(final ChatColor chatColor, final ChatMessageType... types) private void cacheColor(final ChatColor chatColor, final ChatMessageType... types)