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

Merge pull request #3706 from Hydrox6/chat-color-pmod

Browse Source 
[chat-color] Add support for Public Chat from Mods
This commit is contained in:
Adam
2018-06-09 21:38:17 -04:00
committed by GitHub
parent 9abb99f81b 62f7089bb4
commit cf9305b1e5
2 changed files with 23 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runelite-api/src/main/java/net/runelite/api/ChatMessageType.java
View File

@@ -40,6 +40,10 @@ public enum ChatMessageType
* A message received from the server. * A message received from the server.
*/ */
SERVER(0), SERVER(0),
/**
* A message in the public chat from a moderator
*/
PUBLIC_MOD(1),
/** /**
* A message in the public chat. * A message in the public chat.
*/ */

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

@@ -122,6 +122,7 @@ public class ChatMessageManager
case TRADE: case TRADE:
case AUTOCHAT: case AUTOCHAT:
case PUBLIC: case PUBLIC:
case PUBLIC_MOD:
usernameColor = isChatboxTransparent ? chatColorConfig.transparentUsername() : chatColorConfig.opaqueUsername(); usernameColor = isChatboxTransparent ? chatColorConfig.transparentUsername() : chatColorConfig.opaqueUsername();
break; break;
@@ -168,6 +169,7 @@ public class ChatMessageManager
switch (type) switch (type)
{ {
case PUBLIC: case PUBLIC:
case PUBLIC_MOD:
return Color.decode("#0000FF"); return Color.decode("#0000FF");
case PRIVATE_MESSAGE_SENT: case PRIVATE_MESSAGE_SENT:
case PRIVATE_MESSAGE_RECEIVED: case PRIVATE_MESSAGE_RECEIVED:
@@ -185,6 +187,7 @@ public class ChatMessageManager
switch (type) switch (type)
{ {
case PUBLIC: case PUBLIC:
case PUBLIC_MOD:
return Color.decode("#9090FF"); return Color.decode("#9090FF");
case PRIVATE_MESSAGE_SENT: case PRIVATE_MESSAGE_SENT:
case PRIVATE_MESSAGE_RECEIVED: case PRIVATE_MESSAGE_RECEIVED:
@@ -225,11 +228,15 @@ public class ChatMessageManager
{ {
cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaquePublicChat(), false), cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaquePublicChat(), false),
ChatMessageType.PUBLIC); ChatMessageType.PUBLIC);
cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaquePublicChat(), false),
ChatMessageType.PUBLIC_MOD);
} }
if (chatColorConfig.opaquePublicChatHighlight() != null) if (chatColorConfig.opaquePublicChatHighlight() != null)
{ {
cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaquePublicChatHighlight(), false), cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaquePublicChatHighlight(), false),
ChatMessageType.PUBLIC); ChatMessageType.PUBLIC);
cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaquePublicChatHighlight(), false),
ChatMessageType.PUBLIC_MOD);
} }
if (chatColorConfig.opaquePrivateMessageSent() != null) if (chatColorConfig.opaquePrivateMessageSent() != null)
{ {
@@ -315,29 +322,17 @@ public class ChatMessageManager
{ {
cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaqueExamine(), false), cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaqueExamine(), false),
ChatMessageType.EXAMINE_OBJECT); ChatMessageType.EXAMINE_OBJECT);
}
if (chatColorConfig.opaqueExamineHighlight() != null)
{
cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaqueExamineHighlight(), false),
ChatMessageType.EXAMINE_OBJECT);
}
if (chatColorConfig.opaqueExamine() != null)
{
cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaqueExamine(), false), cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaqueExamine(), false),
ChatMessageType.EXAMINE_NPC); ChatMessageType.EXAMINE_NPC);
}
if (chatColorConfig.opaqueExamineHighlight() != null)
{
cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaqueExamineHighlight(), false),
ChatMessageType.EXAMINE_NPC);
}
if (chatColorConfig.opaqueExamine() != null)
{
cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaqueExamine(), false), cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaqueExamine(), false),
ChatMessageType.EXAMINE_ITEM); ChatMessageType.EXAMINE_ITEM);
} }
if (chatColorConfig.opaqueExamineHighlight() != null) if (chatColorConfig.opaqueExamineHighlight() != null)
{ {
cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaqueExamineHighlight(), false),
ChatMessageType.EXAMINE_OBJECT);
cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaqueExamineHighlight(), false),
ChatMessageType.EXAMINE_NPC);
cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaqueExamineHighlight(), false), cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaqueExamineHighlight(), false),
ChatMessageType.EXAMINE_ITEM); ChatMessageType.EXAMINE_ITEM);
} }
@@ -357,11 +352,15 @@ public class ChatMessageManager
{ {
cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentPublicChat(), true), cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentPublicChat(), true),
ChatMessageType.PUBLIC); ChatMessageType.PUBLIC);
cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentPublicChat(), true),
ChatMessageType.PUBLIC_MOD);
} }
if (chatColorConfig.transparentPublicChatHighlight() != null) if (chatColorConfig.transparentPublicChatHighlight() != null)
{ {
cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentPublicChatHighlight(), true), cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentPublicChatHighlight(), true),
ChatMessageType.PUBLIC); ChatMessageType.PUBLIC);
cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentPublicChatHighlight(), true),
ChatMessageType.PUBLIC_MOD);
} }
if (chatColorConfig.transparentPrivateMessageSent() != null) if (chatColorConfig.transparentPrivateMessageSent() != null)
{ {
@@ -447,29 +446,17 @@ public class ChatMessageManager
{ {
cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentExamine(), true), cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentExamine(), true),
ChatMessageType.EXAMINE_OBJECT); ChatMessageType.EXAMINE_OBJECT);
}
if (chatColorConfig.transparentExamineHighlight() != null)
{
cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentExamineHighlight(), true),
ChatMessageType.EXAMINE_OBJECT);
}
if (chatColorConfig.transparentExamine() != null)
{
cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentExamine(), true), cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentExamine(), true),
ChatMessageType.EXAMINE_NPC); ChatMessageType.EXAMINE_NPC);
}
if (chatColorConfig.transparentExamineHighlight() != null)
{
cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentExamineHighlight(), true),
ChatMessageType.EXAMINE_NPC);
}
if (chatColorConfig.transparentExamine() != null)
{
cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentExamine(), true), cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentExamine(), true),
ChatMessageType.EXAMINE_ITEM); ChatMessageType.EXAMINE_ITEM);
} }
if (chatColorConfig.transparentExamineHighlight() != null) if (chatColorConfig.transparentExamineHighlight() != null)
{ {
cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentExamineHighlight(), true),
ChatMessageType.EXAMINE_OBJECT);
cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentExamineHighlight(), true),
ChatMessageType.EXAMINE_NPC);
cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentExamineHighlight(), true), cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentExamineHighlight(), true),
ChatMessageType.EXAMINE_ITEM); ChatMessageType.EXAMINE_ITEM);
} }