diff --git a/runelite-api/src/main/java/net/runelite/api/ChatMessageType.java b/runelite-api/src/main/java/net/runelite/api/ChatMessageType.java index 8906aaf7b7..b4659dfa18 100644 --- a/runelite-api/src/main/java/net/runelite/api/ChatMessageType.java +++ b/runelite-api/src/main/java/net/runelite/api/ChatMessageType.java @@ -37,101 +37,117 @@ import lombok.Getter; public enum ChatMessageType { /** - * A message received from the server. + * A normal game message. */ - SERVER(0), + GAMEMESSAGE(0), /** * A message in the public chat from a moderator */ - PUBLIC_MOD(1), + MODCHAT(1), /** * A message in the public chat. */ - PUBLIC(2), + PUBLICCHAT(2), /** * A private message from another player. */ - PRIVATE_MESSAGE_RECEIVED(3), + PRIVATECHAT(3), /** - * A trade request received. + * A message that the game engine sends. */ - TRADE_RECEIVED(4), + ENGINE(4), /** * A message received when a friend logs in or out. */ - PRIVATE_MESSAGE_INFO(5), + LOGINLOGOUTNOTIFICATION(5), /** * A private message sent to another player. */ - PRIVATE_MESSAGE_SENT(6), + PRIVATECHATOUT(6), /** * A private message received from a moderator. */ - PRIVATE_MESSAGE_RECEIVED_MOD(7), + MODPRIVATECHAT(7), /** * A message received in clan chat. */ - CLANCHAT(9), + FRIENDSCHAT(9), /** * A message received with information about the current clan chat. */ - CLANCHAT_INFO(11), + FRIENDSCHATNOTIFICATION(11), /** * A trade request being sent. */ TRADE_SENT(12), + /** + * A game broadcast. + */ + BROADCAST(14), /** * An abuse report submitted. */ - ABUSE_REPORT(26), + SNAPSHOTFEEDBACK(26), /** * Examine item description. */ - EXAMINE_ITEM(27), + ITEM_EXAMINE(27), /** * Examine NPC description. */ - EXAMINE_NPC(28), + NPC_EXAMINE(28), /** * Examine object description. */ - EXAMINE_OBJECT(29), + OBJECT_EXAMINE(29), /** * Adding player to friend list. */ - FRIENDS_LIST_ADD(30), + FRIENDNOTIFICATION(30), /** * Adding player to ignore list. */ - IGNORE_LIST_ADD(31), + IGNORENOTIFICATION(31), /** - * An autochat message from a player. + * An autotyper message from a player. */ - AUTOCHAT(90), + AUTOTYPER(90), + /** + * An autotyper message from a mod. + */ + MODAUTOTYPER(91), /** * A game message (ie. when a setting is changed). */ - GAME(99), + CONSOLE(99), /** * A message received when somebody sends a trade offer. */ - TRADE(101), + TRADEREQ(101), /** * A message received when completing a trade or a duel */ - TRANSACTION_COMPLETE(102), + TRADE(102), /** * A message received when somebody sends a duel offer. */ - DUEL(103), + CHALREQ_TRADE(103), + /** + * A message received when someone sends a clan challenge offer. + */ + CHALREQ_FRIENDSCHAT(104), /** * A message that was filtered. */ - FILTERED(105), + SPAM(105), /** - * A message about an action. + * A message that is relating to the player. */ - ACTION(109), + PLAYERRELATED(106), + /** + * A message that times out after 10 seconds. + */ + TENSECTIMEOUT(107), /** * An unknown message type. */ diff --git a/runelite-client/src/main/java/net/runelite/client/Notifier.java b/runelite-client/src/main/java/net/runelite/client/Notifier.java index b48a2f6e71..e29d66c87c 100644 --- a/runelite-client/src/main/java/net/runelite/client/Notifier.java +++ b/runelite-client/src/main/java/net/runelite/client/Notifier.java @@ -140,7 +140,7 @@ public class Notifier .build(); chatMessageManager.queue(QueuedMessage.builder() - .type(ChatMessageType.GAME) + .type(ChatMessageType.CONSOLE) .name(appName) .runeLiteFormattedMessage(formattedMessage) .build()); diff --git a/runelite-client/src/main/java/net/runelite/client/chat/ChatCommandManager.java b/runelite-client/src/main/java/net/runelite/client/chat/ChatCommandManager.java index 415afd8d80..d4a3964e08 100644 --- a/runelite-client/src/main/java/net/runelite/client/chat/ChatCommandManager.java +++ b/runelite-client/src/main/java/net/runelite/client/chat/ChatCommandManager.java @@ -94,11 +94,11 @@ public class ChatCommandManager implements ChatboxInputListener switch (chatMessage.getType()) { - case PUBLIC: - case PUBLIC_MOD: - case CLANCHAT: - case PRIVATE_MESSAGE_RECEIVED: - case PRIVATE_MESSAGE_SENT: + case PUBLICCHAT: + case MODCHAT: + case FRIENDSCHAT: + case PRIVATECHAT: + case PRIVATECHATOUT: break; default: return; 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 0dc2d7de1d..9cf5caead5 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 @@ -114,16 +114,16 @@ public class ChatMessageManager switch (chatMessageType) { - case PRIVATE_MESSAGE_RECEIVED_MOD: - case PRIVATE_MESSAGE_RECEIVED: - case PRIVATE_MESSAGE_SENT: + case MODPRIVATECHAT: + case PRIVATECHAT: + case PRIVATECHATOUT: usernameColor = isChatboxTransparent ? chatColorConfig.transparentPrivateUsernames() : chatColorConfig.opaquePrivateUsernames(); break; - case TRADE: - case AUTOCHAT: - case PUBLIC: - case PUBLIC_MOD: + case TRADEREQ: + case AUTOTYPER: + case PUBLICCHAT: + case MODCHAT: { boolean isFriend = client.isFriended(chatMessage.getName(), true) && !client.getLocalPlayer().getName().equals(chatMessage.getName()); @@ -137,7 +137,7 @@ public class ChatMessageManager } break; } - case CLANCHAT: + case FRIENDSCHAT: usernameColor = isChatboxTransparent ? chatColorConfig.transparentClanUsernames() : chatColorConfig.opaqueClanUsernames(); break; } @@ -205,19 +205,19 @@ public class ChatMessageManager { switch (type) { - case PUBLIC: - case PUBLIC_MOD: + case PUBLICCHAT: + case MODCHAT: return JagexColors.CHAT_PUBLIC_TEXT_OPAQUE_BACKGROUND; - case PRIVATE_MESSAGE_SENT: - case PRIVATE_MESSAGE_RECEIVED_MOD: - case PRIVATE_MESSAGE_RECEIVED: + case PRIVATECHATOUT: + case MODPRIVATECHAT: + case PRIVATECHAT: return JagexColors.CHAT_PRIVATE_MESSAGE_TEXT_OPAQUE_BACKGROUND; - case CLANCHAT: + case FRIENDSCHAT: return JagexColors.CHAT_CLAN_TEXT_OPAQUE_BACKGROUND; - case EXAMINE_ITEM: - case EXAMINE_OBJECT: - case EXAMINE_NPC: - case GAME: + case ITEM_EXAMINE: + case OBJECT_EXAMINE: + case NPC_EXAMINE: + case CONSOLE: return JagexColors.CHAT_GAME_EXAMINE_TEXT_OPAQUE_BACKGROUND; } } @@ -225,19 +225,19 @@ public class ChatMessageManager { switch (type) { - case PUBLIC: - case PUBLIC_MOD: + case PUBLICCHAT: + case MODCHAT: return JagexColors.CHAT_PUBLIC_TEXT_TRANSPARENT_BACKGROUND; - case PRIVATE_MESSAGE_SENT: - case PRIVATE_MESSAGE_RECEIVED_MOD: - case PRIVATE_MESSAGE_RECEIVED: + case PRIVATECHATOUT: + case MODPRIVATECHAT: + case PRIVATECHAT: return JagexColors.CHAT_PRIVATE_MESSAGE_TEXT_TRANSPARENT_BACKGROUND; - case CLANCHAT: + case FRIENDSCHAT: return JagexColors.CHAT_CLAN_TEXT_TRANSPARENT_BACKGROUND; - case EXAMINE_ITEM: - case EXAMINE_OBJECT: - case EXAMINE_NPC: - case GAME: + case ITEM_EXAMINE: + case OBJECT_EXAMINE: + case NPC_EXAMINE: + case CONSOLE: return JagexColors.CHAT_GAME_EXAMINE_TEXT_TRANSPARENT_BACKGROUND; } } @@ -271,256 +271,256 @@ public class ChatMessageManager if (chatColorConfig.opaquePublicChat() != null) { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaquePublicChat(), false), - ChatMessageType.PUBLIC); + ChatMessageType.PUBLICCHAT); cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaquePublicChat(), false), - ChatMessageType.PUBLIC_MOD); + ChatMessageType.MODCHAT); } if (chatColorConfig.opaquePublicChatHighlight() != null) { cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaquePublicChatHighlight(), false), - ChatMessageType.PUBLIC); + ChatMessageType.PUBLICCHAT); cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaquePublicChatHighlight(), false), - ChatMessageType.PUBLIC_MOD); + ChatMessageType.MODCHAT); } if (chatColorConfig.opaquePrivateMessageSent() != null) { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaquePrivateMessageSent(), false), - ChatMessageType.PRIVATE_MESSAGE_SENT); + ChatMessageType.PRIVATECHATOUT); } if (chatColorConfig.opaquePrivateMessageSentHighlight() != null) { cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaquePrivateMessageSentHighlight(), false), - ChatMessageType.PRIVATE_MESSAGE_SENT); + ChatMessageType.PRIVATECHATOUT); } if (chatColorConfig.opaquePrivateMessageReceived() != null) { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaquePrivateMessageReceived(), false), - ChatMessageType.PRIVATE_MESSAGE_RECEIVED); + ChatMessageType.PRIVATECHAT); cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaquePrivateMessageReceived(), false), - ChatMessageType.PRIVATE_MESSAGE_RECEIVED_MOD); + ChatMessageType.MODPRIVATECHAT); } if (chatColorConfig.opaquePrivateMessageReceivedHighlight() != null) { cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaquePrivateMessageReceivedHighlight(), false), - ChatMessageType.PRIVATE_MESSAGE_RECEIVED); + ChatMessageType.PRIVATECHAT); cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaquePrivateMessageReceivedHighlight(), false), - ChatMessageType.PRIVATE_MESSAGE_RECEIVED_MOD); + ChatMessageType.MODPRIVATECHAT); } if (chatColorConfig.opaqueClanChatInfo() != null) { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaqueClanChatInfo(), false), - ChatMessageType.CLANCHAT_INFO); + ChatMessageType.FRIENDSCHATNOTIFICATION); } if (chatColorConfig.opaqueClanChatInfoHighlight() != null) { cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaqueClanChatInfoHighlight(), false), - ChatMessageType.CLANCHAT_INFO); + ChatMessageType.FRIENDSCHATNOTIFICATION); } if (chatColorConfig.opaqueClanChatMessage() != null) { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaqueClanChatMessage(), false), - ChatMessageType.CLANCHAT); + ChatMessageType.FRIENDSCHAT); } if (chatColorConfig.opaqueClanChatMessageHighlight() != null) { cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaqueClanChatMessageHighlight(), false), - ChatMessageType.CLANCHAT); + ChatMessageType.FRIENDSCHAT); } if (chatColorConfig.opaqueAutochatMessage() != null) { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaqueAutochatMessage(), false), - ChatMessageType.AUTOCHAT); + ChatMessageType.AUTOTYPER); } if (chatColorConfig.opaqueAutochatMessageHighlight() != null) { cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaqueAutochatMessageHighlight(), false), - ChatMessageType.AUTOCHAT); + ChatMessageType.AUTOTYPER); } if (chatColorConfig.opaqueTradeChatMessage() != null) { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaqueTradeChatMessage(), false), - ChatMessageType.TRADE); + ChatMessageType.TRADEREQ); } if (chatColorConfig.opaqueTradeChatMessageHighlight() != null) { cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaqueTradeChatMessageHighlight(), false), - ChatMessageType.TRADE); + ChatMessageType.TRADEREQ); } if (chatColorConfig.opaqueServerMessage() != null) { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaqueServerMessage(), false), - ChatMessageType.SERVER); + ChatMessageType.GAMEMESSAGE); } if (chatColorConfig.opaqueServerMessageHighlight() != null) { cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaqueServerMessageHighlight(), false), - ChatMessageType.SERVER); + ChatMessageType.GAMEMESSAGE); } if (chatColorConfig.opaqueGameMessage() != null) { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaqueGameMessage(), false), - ChatMessageType.GAME); + ChatMessageType.CONSOLE); } if (chatColorConfig.opaqueGameMessageHighlight() != null) { cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaqueGameMessageHighlight(), false), - ChatMessageType.GAME); + ChatMessageType.CONSOLE); } if (chatColorConfig.opaqueExamine() != null) { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaqueExamine(), false), - ChatMessageType.EXAMINE_OBJECT); + ChatMessageType.OBJECT_EXAMINE); cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaqueExamine(), false), - ChatMessageType.EXAMINE_NPC); + ChatMessageType.NPC_EXAMINE); cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaqueExamine(), false), - ChatMessageType.EXAMINE_ITEM); + ChatMessageType.ITEM_EXAMINE); } if (chatColorConfig.opaqueExamineHighlight() != null) { cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaqueExamineHighlight(), false), - ChatMessageType.EXAMINE_OBJECT); + ChatMessageType.OBJECT_EXAMINE); cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaqueExamineHighlight(), false), - ChatMessageType.EXAMINE_NPC); + ChatMessageType.NPC_EXAMINE); cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaqueExamineHighlight(), false), - ChatMessageType.EXAMINE_ITEM); + ChatMessageType.ITEM_EXAMINE); } if (chatColorConfig.opaqueFiltered() != null) { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaqueFiltered(), false), - ChatMessageType.FILTERED); + ChatMessageType.SPAM); } if (chatColorConfig.opaqueFilteredHighlight() != null) { cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaqueFilteredHighlight(), false), - ChatMessageType.FILTERED); + ChatMessageType.SPAM); } //Transparent Chat Colours if (chatColorConfig.transparentPublicChat() != null) { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentPublicChat(), true), - ChatMessageType.PUBLIC); + ChatMessageType.PUBLICCHAT); cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentPublicChat(), true), - ChatMessageType.PUBLIC_MOD); + ChatMessageType.MODCHAT); } if (chatColorConfig.transparentPublicChatHighlight() != null) { cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentPublicChatHighlight(), true), - ChatMessageType.PUBLIC); + ChatMessageType.PUBLICCHAT); cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentPublicChatHighlight(), true), - ChatMessageType.PUBLIC_MOD); + ChatMessageType.MODCHAT); } if (chatColorConfig.transparentPrivateMessageSent() != null) { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentPrivateMessageSent(), true), - ChatMessageType.PRIVATE_MESSAGE_SENT); + ChatMessageType.PRIVATECHATOUT); } if (chatColorConfig.transparentPrivateMessageSentHighlight() != null) { cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentPrivateMessageSentHighlight(), true), - ChatMessageType.PRIVATE_MESSAGE_SENT); + ChatMessageType.PRIVATECHATOUT); } if (chatColorConfig.transparentPrivateMessageReceived() != null) { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentPrivateMessageReceived(), true), - ChatMessageType.PRIVATE_MESSAGE_RECEIVED); + ChatMessageType.PRIVATECHAT); cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentPrivateMessageReceived(), true), - ChatMessageType.PRIVATE_MESSAGE_RECEIVED_MOD); + ChatMessageType.MODPRIVATECHAT); } if (chatColorConfig.transparentPrivateMessageReceivedHighlight() != null) { cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentPrivateMessageReceivedHighlight(), true), - ChatMessageType.PRIVATE_MESSAGE_RECEIVED); + ChatMessageType.PRIVATECHAT); cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentPrivateMessageReceivedHighlight(), true), - ChatMessageType.PRIVATE_MESSAGE_RECEIVED_MOD); + ChatMessageType.MODPRIVATECHAT); } if (chatColorConfig.transparentClanChatInfo() != null) { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentClanChatInfo(), true), - ChatMessageType.CLANCHAT_INFO); + ChatMessageType.FRIENDSCHATNOTIFICATION); } if (chatColorConfig.transparentClanChatInfoHighlight() != null) { cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentClanChatInfoHighlight(), true), - ChatMessageType.CLANCHAT_INFO); + ChatMessageType.FRIENDSCHATNOTIFICATION); } if (chatColorConfig.transparentClanChatMessage() != null) { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentClanChatMessage(), true), - ChatMessageType.CLANCHAT); + ChatMessageType.FRIENDSCHAT); } if (chatColorConfig.transparentClanChatMessageHighlight() != null) { cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentClanChatMessageHighlight(), true), - ChatMessageType.CLANCHAT); + ChatMessageType.FRIENDSCHAT); } if (chatColorConfig.transparentAutochatMessage() != null) { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentAutochatMessage(), true), - ChatMessageType.AUTOCHAT); + ChatMessageType.AUTOTYPER); } if (chatColorConfig.transparentAutochatMessageHighlight() != null) { cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentAutochatMessageHighlight(), true), - ChatMessageType.AUTOCHAT); + ChatMessageType.AUTOTYPER); } if (chatColorConfig.transparentTradeChatMessage() != null) { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentTradeChatMessage(), true), - ChatMessageType.TRADE); + ChatMessageType.TRADEREQ); } if (chatColorConfig.transparentTradeChatMessageHighlight() != null) { cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentTradeChatMessageHighlight(), true), - ChatMessageType.TRADE); + ChatMessageType.TRADEREQ); } if (chatColorConfig.transparentServerMessage() != null) { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentServerMessage(), true), - ChatMessageType.SERVER); + ChatMessageType.GAMEMESSAGE); } if (chatColorConfig.transparentServerMessageHighlight() != null) { cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentServerMessageHighlight(), true), - ChatMessageType.SERVER); + ChatMessageType.GAMEMESSAGE); } if (chatColorConfig.transparentGameMessage() != null) { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentGameMessage(), true), - ChatMessageType.GAME); + ChatMessageType.CONSOLE); } if (chatColorConfig.transparentGameMessageHighlight() != null) { cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentGameMessageHighlight(), true), - ChatMessageType.GAME); + ChatMessageType.CONSOLE); } if (chatColorConfig.transparentExamine() != null) { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentExamine(), true), - ChatMessageType.EXAMINE_OBJECT); + ChatMessageType.OBJECT_EXAMINE); cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentExamine(), true), - ChatMessageType.EXAMINE_NPC); + ChatMessageType.NPC_EXAMINE); cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentExamine(), true), - ChatMessageType.EXAMINE_ITEM); + ChatMessageType.ITEM_EXAMINE); } if (chatColorConfig.transparentExamineHighlight() != null) { cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentExamineHighlight(), true), - ChatMessageType.EXAMINE_OBJECT); + ChatMessageType.OBJECT_EXAMINE); cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentExamineHighlight(), true), - ChatMessageType.EXAMINE_NPC); + ChatMessageType.NPC_EXAMINE); cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentExamineHighlight(), true), - ChatMessageType.EXAMINE_ITEM); + ChatMessageType.ITEM_EXAMINE); } if (chatColorConfig.transparentFiltered() != null) { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentFiltered(), true), - ChatMessageType.FILTERED); + ChatMessageType.SPAM); } if (chatColorConfig.transparentFilteredHighlight() != null) { cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentFilteredHighlight(), true), - ChatMessageType.FILTERED); + ChatMessageType.SPAM); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java index b2dccee030..985ef626f5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java @@ -127,7 +127,7 @@ public class BarbarianAssaultPlugin extends Plugin @Subscribe public void onChatMessage(ChatMessage event) { - if (event.getType() == ChatMessageType.SERVER + if (event.getType() == ChatMessageType.GAMEMESSAGE && event.getMessage().startsWith("---- Wave:")) { String[] message = event.getMessage().split(" "); @@ -200,7 +200,7 @@ public class BarbarianAssaultPlugin extends Plugin .build(); chatMessageManager.queue(QueuedMessage.builder() - .type(ChatMessageType.GAME) + .type(ChatMessageType.CONSOLE) .runeLiteFormattedMessage(chatMessage) .build()); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java index 42c1853a2f..321bb0a10a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java @@ -239,7 +239,7 @@ public class BarrowsPlugin extends Plugin .append(ChatColorType.NORMAL); chatMessageManager.queue(QueuedMessage.builder() - .type(ChatMessageType.EXAMINE_ITEM) + .type(ChatMessageType.ITEM_EXAMINE) .runeLiteFormattedMessage(message.build()) .build()); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java index 2d96d26e4c..de44d67c59 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java @@ -283,7 +283,7 @@ public class CannonPlugin extends Plugin @Subscribe public void onChatMessage(ChatMessage event) { - if (event.getType() != ChatMessageType.FILTERED && event.getType() != ChatMessageType.SERVER) + if (event.getType() != ChatMessageType.SPAM && event.getType() != ChatMessageType.GAMEMESSAGE) { return; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java index 72f4aec414..cf806f9da3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java @@ -197,7 +197,7 @@ public class ChatCommandsPlugin extends Plugin @Subscribe public void onChatMessage(ChatMessage chatMessage) { - if (chatMessage.getType() != ChatMessageType.SERVER && chatMessage.getType() != ChatMessageType.FILTERED) + if (chatMessage.getType() != ChatMessageType.GAMEMESSAGE && chatMessage.getType() != ChatMessageType.SPAM) { return; } @@ -375,7 +375,7 @@ public class ChatCommandsPlugin extends Plugin String search = message.substring(KILLCOUNT_COMMAND_STRING.length() + 1); final String player; - if (type.equals(ChatMessageType.PRIVATE_MESSAGE_SENT)) + if (type.equals(ChatMessageType.PRIVATECHATOUT)) { player = client.getLocalPlayer().getName(); } @@ -423,7 +423,7 @@ public class ChatCommandsPlugin extends Plugin ChatMessageType type = chatMessage.getType(); final String player; - if (type.equals(ChatMessageType.PRIVATE_MESSAGE_SENT)) + if (type.equals(ChatMessageType.PRIVATECHATOUT)) { player = client.getLocalPlayer().getName(); } @@ -497,7 +497,7 @@ public class ChatCommandsPlugin extends Plugin String search = message.substring(PB_COMMAND.length() + 1); final String player; - if (type.equals(ChatMessageType.PRIVATE_MESSAGE_SENT)) + if (type.equals(ChatMessageType.PRIVATECHATOUT)) { player = client.getLocalPlayer().getName(); } @@ -722,7 +722,7 @@ public class ChatCommandsPlugin extends Plugin ChatMessageType type = chatMessage.getType(); String player; - if (type == ChatMessageType.PRIVATE_MESSAGE_SENT) + if (type == ChatMessageType.PRIVATECHATOUT) { player = client.getLocalPlayer().getName(); } @@ -899,7 +899,7 @@ public class ChatCommandsPlugin extends Plugin final String player; final HiscoreEndpoint ironmanStatus; - if (chatMessage.getType().equals(ChatMessageType.PRIVATE_MESSAGE_SENT)) + if (chatMessage.getType().equals(ChatMessageType.PRIVATECHATOUT)) { player = client.getLocalPlayer().getName(); ironmanStatus = hiscoreEndpoint; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java index 355ed29b28..3f49a1f7e4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java @@ -102,12 +102,12 @@ public class ChatFilterPlugin extends Plugin // Only filter public chat and private messages switch (chatMessageType) { - case PUBLIC: - case PUBLIC_MOD: - case AUTOCHAT: - case PRIVATE_MESSAGE_RECEIVED: - case PRIVATE_MESSAGE_RECEIVED_MOD: - case CLANCHAT: + case PUBLICCHAT: + case MODCHAT: + case AUTOTYPER: + case PRIVATECHAT: + case MODPRIVATECHAT: + case FRIENDSCHAT: break; default: return; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java index 43919214ea..1cb5679498 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java @@ -129,18 +129,18 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener switch (chatMessage.getType()) { - case PRIVATE_MESSAGE_SENT: - case PRIVATE_MESSAGE_RECEIVED: - case PRIVATE_MESSAGE_RECEIVED_MOD: + case PRIVATECHATOUT: + case PRIVATECHAT: + case MODPRIVATECHAT: final String name = Text.removeTags(chatMessage.getName()); // Remove to ensure uniqueness & its place in history friends.remove(name); friends.add(name); // intentional fall-through - case PUBLIC: - case PUBLIC_MOD: - case CLANCHAT: - case GAME: + case PUBLICCHAT: + case MODCHAT: + case FRIENDSCHAT: + case CONSOLE: final QueuedMessage queuedMessage = QueuedMessage.builder() .type(chatMessage.getType()) .name(chatMessage.getName()) @@ -166,12 +166,12 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener { if (menuOption.startsWith(CLEAR_PRIVATE)) { - messageQueue.removeIf(e -> e.getType() == ChatMessageType.PRIVATE_MESSAGE_RECEIVED || - e.getType() == ChatMessageType.PRIVATE_MESSAGE_SENT || e.getType() == ChatMessageType.PRIVATE_MESSAGE_RECEIVED_MOD); + messageQueue.removeIf(e -> e.getType() == ChatMessageType.PRIVATECHAT || + e.getType() == ChatMessageType.PRIVATECHATOUT || e.getType() == ChatMessageType.MODPRIVATECHAT); } else { - messageQueue.removeIf(e -> e.getType() == ChatMessageType.PUBLIC || e.getType() == ChatMessageType.PUBLIC_MOD); + messageQueue.removeIf(e -> e.getType() == ChatMessageType.PUBLICCHAT || e.getType() == ChatMessageType.MODCHAT); } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java index 0bfd952e01..e2e2699f2a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java @@ -132,19 +132,19 @@ public class ChatNotificationsPlugin extends Plugin switch (chatMessage.getType()) { - case TRADE: + case TRADEREQ: if (chatMessage.getMessage().contains("wishes to trade with you.") && config.notifyOnTrade()) { notifier.notify(chatMessage.getMessage()); } break; - case DUEL: + case CHALREQ_TRADE: if (chatMessage.getMessage().contains("wishes to duel with you.") && config.notifyOnDuel()) { notifier.notify(chatMessage.getMessage()); } break; - case GAME: + case CONSOLE: // Don't notify for notification messages if (chatMessage.getName().equals(runeLiteProperties.getTitle())) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java index 4a588e081c..506c9a58c0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java @@ -307,7 +307,7 @@ public class ClanChatPlugin extends Plugin // If this message has been reused since, it will get a different id if (clanJoinMessage.getGetMessageId() == messageNode.getId()) { - ChatLineBuffer ccInfoBuffer = client.getChatLineMap().get(ChatMessageType.CLANCHAT_INFO.getType()); + ChatLineBuffer ccInfoBuffer = client.getChatLineMap().get(ChatMessageType.FRIENDSCHATNOTIFICATION.getType()); if (ccInfoBuffer != null) { ccInfoBuffer.removeMessageNode(messageNode); @@ -377,9 +377,9 @@ public class ClanChatPlugin extends Plugin .append(textColor, member.getUsername() + activityMessage); final String messageString = message.build(); - client.addChatMessage(ChatMessageType.CLANCHAT_INFO, "", messageString, ""); + client.addChatMessage(ChatMessageType.FRIENDSCHATNOTIFICATION, "", messageString, ""); - final ChatLineBuffer chatLineBuffer = client.getChatLineMap().get(ChatMessageType.CLANCHAT_INFO.getType()); + final ChatLineBuffer chatLineBuffer = client.getChatLineMap().get(ChatMessageType.FRIENDSCHATNOTIFICATION.getType()); final MessageNode[] lines = chatLineBuffer.getLines(); final MessageNode line = lines[0]; @@ -411,21 +411,21 @@ public class ClanChatPlugin extends Plugin switch (chatMessage.getType()) { - case PRIVATE_MESSAGE_RECEIVED: - case PRIVATE_MESSAGE_RECEIVED_MOD: + case PRIVATECHAT: + case MODPRIVATECHAT: if (!config.privateMessageIcons()) { return; } break; - case PUBLIC: - case PUBLIC_MOD: + case PUBLICCHAT: + case MODCHAT: if (!config.publicChatIcons()) { return; } break; - case CLANCHAT: + case FRIENDSCHAT: if (!config.clanChatIcons()) { return; @@ -500,7 +500,7 @@ public class ClanChatPlugin extends Plugin { int iconNumber = clanManager.getIconNumber(rank); final String img = ""; - if (message.getType() == ChatMessageType.CLANCHAT) + if (message.getType() == ChatMessageType.FRIENDSCHAT) { message.getMessageNode() .setSender(message.getMessageNode().getSender() + " " + img); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java index 8a24153854..d28ef92949 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java @@ -178,7 +178,7 @@ public class ClueScrollPlugin extends Plugin @Subscribe public void onChatMessage(ChatMessage event) { - if (event.getType() != ChatMessageType.SERVER && event.getType() != ChatMessageType.FILTERED) + if (event.getType() != ChatMessageType.GAMEMESSAGE && event.getType() != ChatMessageType.SPAM) { return; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java index 4538c161d7..7766438a73 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java @@ -102,7 +102,7 @@ public class CookingPlugin extends Plugin @Subscribe public void onChatMessage(ChatMessage event) { - if (event.getType() != ChatMessageType.FILTERED) + if (event.getType() != ChatMessageType.SPAM) { return; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java index 85355142a1..627c9091e8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java @@ -181,7 +181,7 @@ public class CorpPlugin extends Plugin .build(); chatMessageManager.queue(QueuedMessage.builder() - .type(ChatMessageType.GAME) + .type(ChatMessageType.CONSOLE) .runeLiteFormattedMessage(message) .build()); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java index 04d6a460a3..245fcd6b92 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java @@ -281,7 +281,7 @@ public class DailyTasksPlugin extends Plugin chatMessageManager.queue( QueuedMessage.builder() - .type(ChatMessageType.GAME) + .type(ChatMessageType.CONSOLE) .runeLiteFormattedMessage(message) .build()); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java index 3730a878b9..b6e96cba2d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java @@ -222,14 +222,14 @@ public class DevToolsPlugin extends Plugin message = "Logger level has been set to " + newLoggerLevel; } - client.addChatMessage(ChatMessageType.SERVER, "", message, null); + client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", message, null); break; } case "getvarp": { int varp = Integer.parseInt(args[0]); int value = client.getVarpValue(client.getVarps(), varp); - client.addChatMessage(ChatMessageType.SERVER, "", "VarPlayer " + varp + ": " + value, null); + client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "VarPlayer " + varp + ": " + value, null); break; } case "setvarp": @@ -237,7 +237,7 @@ public class DevToolsPlugin extends Plugin int varp = Integer.parseInt(args[0]); int value = Integer.parseInt(args[1]); client.setVarpValue(client.getVarps(), varp, value); - client.addChatMessage(ChatMessageType.SERVER, "", "Set VarPlayer " + varp + " to " + value, null); + client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Set VarPlayer " + varp + " to " + value, null); VarbitChanged varbitChanged = new VarbitChanged(); varbitChanged.setIndex(varp); eventBus.post(varbitChanged); // fake event @@ -247,7 +247,7 @@ public class DevToolsPlugin extends Plugin { int varbit = Integer.parseInt(args[0]); int value = client.getVarbitValue(client.getVarps(), varbit); - client.addChatMessage(ChatMessageType.SERVER, "", "Varbit " + varbit + ": " + value, null); + client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Varbit " + varbit + ": " + value, null); break; } case "setvarb": @@ -255,7 +255,7 @@ public class DevToolsPlugin extends Plugin int varbit = Integer.parseInt(args[0]); int value = Integer.parseInt(args[1]); client.setVarbitValue(client.getVarps(), varbit, value); - client.addChatMessage(ChatMessageType.SERVER, "", "Set varbit " + varbit + " to " + value, null); + client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Set varbit " + varbit + " to " + value, null); eventBus.post(new VarbitChanged()); // fake event break; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java index 2b4a623837..1f78bddb9f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java @@ -162,16 +162,16 @@ public class ExaminePlugin extends Plugin ExamineType type; switch (event.getType()) { - case EXAMINE_ITEM: + case ITEM_EXAMINE: type = ExamineType.ITEM; break; - case EXAMINE_OBJECT: + case OBJECT_EXAMINE: type = ExamineType.OBJECT; break; - case EXAMINE_NPC: + case NPC_EXAMINE: type = ExamineType.NPC; break; - case SERVER: + case GAMEMESSAGE: type = ExamineType.ITEM_BANK_EQ; break; default: @@ -381,7 +381,7 @@ public class ExaminePlugin extends Plugin } chatMessageManager.queue(QueuedMessage.builder() - .type(ChatMessageType.EXAMINE_ITEM) + .type(ChatMessageType.ITEM_EXAMINE) .runeLiteFormattedMessage(message.build()) .build()); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java index 8da48d7cdc..b9144a300f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java @@ -180,7 +180,7 @@ public class FishingPlugin extends Plugin @Subscribe public void onChatMessage(ChatMessage event) { - if (event.getType() != ChatMessageType.FILTERED) + if (event.getType() != ChatMessageType.SPAM) { return; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java index 5c81aca1b4..01fde6181d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java @@ -344,7 +344,7 @@ public class GrandExchangePlugin extends Plugin @Subscribe public void onChatMessage(ChatMessage event) { - if (!this.config.enableNotifications() || event.getType() != ChatMessageType.SERVER) + if (!this.config.enableNotifications() || event.getType() != ChatMessageType.GAMEMESSAGE) { return; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java index 2e713e965e..5ecd24ae1b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java @@ -210,7 +210,7 @@ public class HiscorePlugin extends Plugin @Subscribe public void onChatMessage(ChatMessage event) { - if (!config.bountylookup() || !event.getType().equals(ChatMessageType.SERVER)) + if (!config.bountylookup() || !event.getType().equals(ChatMessageType.GAMEMESSAGE)) { return; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java index e295efd9e5..7d3b1f0cc6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java @@ -144,7 +144,7 @@ public class ItemChargePlugin extends Plugin Matcher dodgyCheckMatcher = DODGY_CHECK_PATTERN.matcher(message); Matcher dodgyProtectMatcher = DODGY_PROTECT_PATTERN.matcher(message); Matcher dodgyBreakMatcher = DODGY_BREAK_PATTERN.matcher(message); - if (event.getType() == ChatMessageType.SERVER || event.getType() == ChatMessageType.FILTERED) + if (event.getType() == ChatMessageType.GAMEMESSAGE || event.getType() == ChatMessageType.SPAM) { if (config.recoilNotification() && message.contains(RING_OF_RECOIL_BREAK_MESSAGE)) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java index 649189fc47..0918d02dd6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java @@ -198,7 +198,7 @@ public class KourendLibraryPlugin extends Plugin @Subscribe public void onChatMessage(ChatMessage event) { - if (lastBookcaseAnimatedOn != null && event.getType() == ChatMessageType.SERVER) + if (lastBookcaseAnimatedOn != null && event.getType() == ChatMessageType.GAMEMESSAGE) { if (event.getMessage().equals("You don't find anything useful here.")) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java index ec2bf74aad..27cbe343a1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java @@ -368,7 +368,7 @@ public class LootTrackerPlugin extends Plugin @Subscribe public void onChatMessage(ChatMessage event) { - if (event.getType() != ChatMessageType.SERVER && event.getType() != ChatMessageType.FILTERED) + if (event.getType() != ChatMessageType.GAMEMESSAGE && event.getType() != ChatMessageType.SPAM) { return; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java index 90a5269c1b..82bea5175b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java @@ -217,7 +217,7 @@ public class MotherlodePlugin extends Plugin @Subscribe public void onChatMessage(ChatMessage event) { - if (!inMlm || event.getType() != ChatMessageType.FILTERED) + if (!inMlm || event.getType() != ChatMessageType.SPAM) { return; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java index b73f88788c..d76c24a838 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java @@ -235,7 +235,7 @@ public class AlchemyRoom extends MTARoom String message = wrapper.getMessage(); - if (wrapper.getType() == ChatMessageType.SERVER) + if (wrapper.getType() == ChatMessageType.GAMEMESSAGE) { if (message.contains(YOU_FOUND)) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/musicindicator/MusicIndicatorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/musicindicator/MusicIndicatorPlugin.java index ecef015bd7..25584f3a88 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/musicindicator/MusicIndicatorPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/musicindicator/MusicIndicatorPlugin.java @@ -197,7 +197,7 @@ public class MusicIndicatorPlugin extends Plugin chatMessageManager.queue( QueuedMessage.builder() - .type(ChatMessageType.GAME) + .type(ChatMessageType.CONSOLE) .runeLiteFormattedMessage(message) .build()); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java index 3c409987af..d5b91a94cd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java @@ -125,7 +125,7 @@ public class NightmareZonePlugin extends Plugin @Subscribe public void onChatMessage(ChatMessage event) { - if (event.getType() != ChatMessageType.SERVER + if (event.getType() != ChatMessageType.GAMEMESSAGE || !isInNightmareZone()) { return; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java index 0e910ff338..b824f17157 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java @@ -191,7 +191,7 @@ public class PartyPlugin extends Plugin implements KeyListener .build(); chatMessageManager.queue(QueuedMessage.builder() - .type(ChatMessageType.CLANCHAT_INFO) + .type(ChatMessageType.FRIENDSCHATNOTIFICATION) .runeLiteFormattedMessage(leaveMessage) .build()); } @@ -381,7 +381,7 @@ public class PartyPlugin extends Plugin implements KeyListener .build(); chatMessageManager.queue(QueuedMessage.builder() - .type(ChatMessageType.CLANCHAT_INFO) + .type(ChatMessageType.FRIENDSCHATNOTIFICATION) .runeLiteFormattedMessage(joinMessage) .build()); @@ -430,7 +430,7 @@ public class PartyPlugin extends Plugin implements KeyListener .build(); chatMessageManager.queue(QueuedMessage.builder() - .type(ChatMessageType.CLANCHAT_INFO) + .type(ChatMessageType.FRIENDSCHATNOTIFICATION) .runeLiteFormattedMessage(joinMessage) .build()); } @@ -519,7 +519,7 @@ public class PartyPlugin extends Plugin implements KeyListener .build(); chatMessageManager.queue(QueuedMessage.builder() - .type(ChatMessageType.CLANCHAT_INFO) + .type(ChatMessageType.FRIENDSCHATNOTIFICATION) .runeLiteFormattedMessage(helpMessage) .build()); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java index 7e711e66a0..960b589737 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java @@ -102,7 +102,7 @@ public class PestControlPlugin extends Plugin @Subscribe public void onChatMessage(ChatMessage chatMessage) { - if (overlay.getGame() != null && chatMessage.getType() == ChatMessageType.SERVER) + if (overlay.getGame() != null && chatMessage.getType() == ChatMessageType.GAMEMESSAGE) { Matcher matcher = SHIELD_DROP.matcher(chatMessage.getMessage()); if (matcher.lookingAt()) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java index 46570b3b5a..34db989c71 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java @@ -187,7 +187,7 @@ public class RaidsPlugin extends Plugin @Subscribe public void onChatMessage(ChatMessage event) { - if (inRaidChambers && event.getType() == ChatMessageType.CLANCHAT_INFO) + if (inRaidChambers && event.getType() == ChatMessageType.FRIENDSCHATNOTIFICATION) { String message = Text.removeTags(event.getMessage()); @@ -235,7 +235,7 @@ public class RaidsPlugin extends Plugin .build(); chatMessageManager.queue(QueuedMessage.builder() - .type(ChatMessageType.CLANCHAT_INFO) + .type(ChatMessageType.FRIENDSCHATNOTIFICATION) .runeLiteFormattedMessage(chatMessage) .build()); } @@ -305,7 +305,7 @@ public class RaidsPlugin extends Plugin final String raidData = "[" + layout + "]: " + rooms; chatMessageManager.queue(QueuedMessage.builder() - .type(ChatMessageType.CLANCHAT_INFO) + .type(ChatMessageType.FRIENDSCHATNOTIFICATION) .runeLiteFormattedMessage(new ChatMessageBuilder() .append(ChatColorType.HIGHLIGHT) .append("Layout: ") diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java index 4662b95d5a..342d432114 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java @@ -139,7 +139,7 @@ public class RunecraftPlugin extends Plugin @Subscribe public void onChatMessage(ChatMessage event) { - if (event.getType() != ChatMessageType.SERVER) + if (event.getType() != ChatMessageType.GAMEMESSAGE) { return; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java index ee78f3cc22..c586b9cd91 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java @@ -311,7 +311,7 @@ public class ScreenshotPlugin extends Plugin @Subscribe public void onChatMessage(ChatMessage event) { - if (event.getType() != ChatMessageType.SERVER && event.getType() != ChatMessageType.FILTERED && event.getType() != ChatMessageType.TRANSACTION_COMPLETE) + if (event.getType() != ChatMessageType.GAMEMESSAGE && event.getType() != ChatMessageType.SPAM && event.getType() != ChatMessageType.TRADE) { return; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java index 875f1f009d..b789162bd8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java @@ -400,7 +400,7 @@ public class SlayerPlugin extends Plugin @Subscribe public void onChatMessage(ChatMessage event) { - if (event.getType() != ChatMessageType.SERVER && event.getType() != ChatMessageType.FILTERED) + if (event.getType() != ChatMessageType.GAMEMESSAGE && event.getType() != ChatMessageType.SPAM) { return; } @@ -733,7 +733,7 @@ public class SlayerPlugin extends Plugin ChatMessageType type = chatMessage.getType(); final String player; - if (type.equals(ChatMessageType.PRIVATE_MESSAGE_SENT)) + if (type.equals(ChatMessageType.PRIVATECHATOUT)) { player = client.getLocalPlayer().getName(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java index 2a76b949be..5672ffdd31 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java @@ -437,7 +437,7 @@ public class TimersPlugin extends Plugin @Subscribe public void onChatMessage(ChatMessage event) { - if (event.getType() != ChatMessageType.FILTERED && event.getType() != ChatMessageType.SERVER) + if (event.getType() != ChatMessageType.SPAM && event.getType() != ChatMessageType.GAMEMESSAGE) { return; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/twitch/TwitchPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/twitch/TwitchPlugin.java index 275eea5d54..ce7b25acb3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/twitch/TwitchPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/twitch/TwitchPlugin.java @@ -166,7 +166,7 @@ public class TwitchPlugin extends Plugin implements TwitchListener, ChatboxInput .build(); chatMessageManager.queue(QueuedMessage.builder() - .type(ChatMessageType.CLANCHAT) + .type(ChatMessageType.FRIENDSCHAT) .sender("Twitch") .name(sender) .runeLiteFormattedMessage(chatMessage) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java index 67ac3ec635..2360a68604 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java @@ -215,7 +215,7 @@ public class WintertodtPlugin extends Plugin ChatMessageType chatMessageType = chatMessage.getType(); - if (chatMessageType != ChatMessageType.SERVER && chatMessageType != ChatMessageType.FILTERED) + if (chatMessageType != ChatMessageType.GAMEMESSAGE && chatMessageType != ChatMessageType.SPAM) { return; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java index bd74d146de..28547b8921 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java @@ -131,7 +131,7 @@ public class WoodcuttingPlugin extends Plugin @Subscribe public void onChatMessage(ChatMessage event) { - if (event.getType() == ChatMessageType.FILTERED || event.getType() == ChatMessageType.SERVER) + if (event.getType() == ChatMessageType.SPAM || event.getType() == ChatMessageType.GAMEMESSAGE) { if (event.getMessage().startsWith("You get some") && (event.getMessage().endsWith("logs.") || event.getMessage().endsWith("mushrooms."))) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java index b545939202..c0dfa2251c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java @@ -585,7 +585,7 @@ public class WorldHopperPlugin extends Plugin .build(); chatMessageManager.queue(QueuedMessage.builder() - .type(ChatMessageType.GAME) + .type(ChatMessageType.CONSOLE) .runeLiteFormattedMessage(chatMessage) .build()); } @@ -632,7 +632,7 @@ public class WorldHopperPlugin extends Plugin chatMessageManager .queue(QueuedMessage.builder() - .type(ChatMessageType.GAME) + .type(ChatMessageType.CONSOLE) .runeLiteFormattedMessage(chatMessage) .build()); } @@ -666,7 +666,7 @@ public class WorldHopperPlugin extends Plugin chatMessageManager .queue(QueuedMessage.builder() - .type(ChatMessageType.GAME) + .type(ChatMessageType.CONSOLE) .runeLiteFormattedMessage(chatMessage) .build()); @@ -683,7 +683,7 @@ public class WorldHopperPlugin extends Plugin @Subscribe public void onChatMessage(ChatMessage event) { - if (event.getType() != ChatMessageType.SERVER) + if (event.getType() != ChatMessageType.GAMEMESSAGE) { return; } diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java index 57615b907a..922b8fed25 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java @@ -29,7 +29,7 @@ import com.google.inject.testing.fieldbinder.Bind; import com.google.inject.testing.fieldbinder.BoundFieldModule; import java.util.concurrent.ScheduledExecutorService; import javax.inject.Inject; -import static net.runelite.api.ChatMessageType.SERVER; +import static net.runelite.api.ChatMessageType.GAMEMESSAGE; import net.runelite.api.Client; import net.runelite.api.events.ChatMessage; import net.runelite.client.config.ChatColorConfig; @@ -80,7 +80,7 @@ public class ChatCommandsPluginTest { when(client.getUsername()).thenReturn("Adam"); - ChatMessage chatMessageEvent = new ChatMessage(null, SERVER, "", "Your Corporeal Beast kill count is: 4.", null, 0); + ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", "Your Corporeal Beast kill count is: 4.", null, 0); chatCommandsPlugin.onChatMessage(chatMessageEvent); verify(configManager).setConfiguration("killcount.adam", "corporeal beast", 4); @@ -91,7 +91,7 @@ public class ChatCommandsPluginTest { when(client.getUsername()).thenReturn("Adam"); - ChatMessage chatMessageEvent = new ChatMessage(null, SERVER, "", "Your completed Theatre of Blood count is: 73.", null, 0); + ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", "Your completed Theatre of Blood count is: 73.", null, 0); chatCommandsPlugin.onChatMessage(chatMessageEvent); verify(configManager).setConfiguration("killcount.adam", "theatre of blood", 73); @@ -102,7 +102,7 @@ public class ChatCommandsPluginTest { when(client.getUsername()).thenReturn("Adam"); - ChatMessage chatMessageEvent = new ChatMessage(null, SERVER, "", "Your subdued Wintertodt count is: 4.", null, 0); + ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", "Your subdued Wintertodt count is: 4.", null, 0); chatCommandsPlugin.onChatMessage(chatMessageEvent); verify(configManager).setConfiguration("killcount.adam", "wintertodt", 4); @@ -113,7 +113,7 @@ public class ChatCommandsPluginTest { when(client.getUsername()).thenReturn("Adam"); - ChatMessage chatMessageEvent = new ChatMessage(null, SERVER, "", "Your Kree'arra kill count is: 4.", null, 0); + ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", "Your Kree'arra kill count is: 4.", null, 0); chatCommandsPlugin.onChatMessage(chatMessageEvent); verify(configManager).setConfiguration("killcount.adam", "kree'arra", 4); @@ -124,7 +124,7 @@ public class ChatCommandsPluginTest { when(client.getUsername()).thenReturn("Adam"); - ChatMessage chatMessageEvent = new ChatMessage(null, SERVER, "", "Your Barrows chest count is: 277.", null, 0); + ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", "Your Barrows chest count is: 277.", null, 0); chatCommandsPlugin.onChatMessage(chatMessageEvent); verify(configManager).setConfiguration("killcount.adam", "barrows chests", 277); @@ -135,7 +135,7 @@ public class ChatCommandsPluginTest { when(client.getUsername()).thenReturn("Adam"); - ChatMessage chatMessageEvent = new ChatMessage(null, SERVER, "", "Your herbiboar harvest count is: 4091.", null, 0); + ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", "Your herbiboar harvest count is: 4091.", null, 0); chatCommandsPlugin.onChatMessage(chatMessageEvent); verify(configManager).setConfiguration("killcount.adam", "herbiboar", 4091); @@ -149,10 +149,10 @@ public class ChatCommandsPluginTest when(client.getUsername()).thenReturn("Adam"); // This sets lastBoss - ChatMessage chatMessage = new ChatMessage(null, SERVER, "", "Your Kree'arra kill count is: 4.", null, 0); + ChatMessage chatMessage = new ChatMessage(null, GAMEMESSAGE, "", "Your Kree'arra kill count is: 4.", null, 0); chatCommandsPlugin.onChatMessage(chatMessage); - chatMessage = new ChatMessage(null, SERVER, "", FIGHT_DURATION, null, 0); + chatMessage = new ChatMessage(null, GAMEMESSAGE, "", FIGHT_DURATION, null, 0); chatCommandsPlugin.onChatMessage(chatMessage); verify(configManager).setConfiguration(eq("personalbest.adam"), eq("kree'arra"), eq(79)); @@ -166,10 +166,10 @@ public class ChatCommandsPluginTest when(client.getUsername()).thenReturn("Adam"); // This sets lastBoss - ChatMessage chatMessage = new ChatMessage(null, SERVER, "", "Your Zulrah kill count is: 4.", null, 0); + ChatMessage chatMessage = new ChatMessage(null, GAMEMESSAGE, "", "Your Zulrah kill count is: 4.", null, 0); chatCommandsPlugin.onChatMessage(chatMessage); - chatMessage = new ChatMessage(null, SERVER, "", FIGHT_DURATION, null, 0); + chatMessage = new ChatMessage(null, GAMEMESSAGE, "", FIGHT_DURATION, null, 0); chatCommandsPlugin.onChatMessage(chatMessage); verify(configManager).setConfiguration(eq("personalbest.adam"), eq("zulrah"), eq(55)); @@ -183,10 +183,10 @@ public class ChatCommandsPluginTest when(client.getUsername()).thenReturn("Adam"); // This sets lastBoss - ChatMessage chatMessage = new ChatMessage(null, SERVER, "", "Your Kree'arra kill count is: 4.", null, 0); + ChatMessage chatMessage = new ChatMessage(null, GAMEMESSAGE, "", "Your Kree'arra kill count is: 4.", null, 0); chatCommandsPlugin.onChatMessage(chatMessage); - chatMessage = new ChatMessage(null, SERVER, "", NEW_PB, null, 0); + chatMessage = new ChatMessage(null, GAMEMESSAGE, "", NEW_PB, null, 0); chatCommandsPlugin.onChatMessage(chatMessage); verify(configManager).setConfiguration(eq("personalbest.adam"), eq("kree'arra"), eq(181)); diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPluginTest.java index 68d2a8cc1a..6c154eaa9b 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPluginTest.java @@ -84,7 +84,7 @@ public class ChatNotificationsPluginTest when(messageNode.getValue()).thenReturn("Deathbeam, Deathbeam OSRS"); ChatMessage chatMessage = new ChatMessage(); - chatMessage.setType(ChatMessageType.PUBLIC); + chatMessage.setType(ChatMessageType.PUBLICCHAT); chatMessage.setMessageNode(messageNode); chatNotificationsPlugin.startUp(); // load highlight config diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/cooking/CookingPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/cooking/CookingPluginTest.java index 024a4de8b3..ae6418ee05 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/cooking/CookingPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/cooking/CookingPluginTest.java @@ -79,7 +79,7 @@ public class CookingPluginTest { for (String message : COOKING_MESSAGES) { - ChatMessage chatMessage = new ChatMessage(null, ChatMessageType.FILTERED, "", message, "", 0); + ChatMessage chatMessage = new ChatMessage(null, ChatMessageType.SPAM, "", message, "", 0); cookingPlugin.onChatMessage(chatMessage); } diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/examine/ExaminePluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/examine/ExaminePluginTest.java index f7416f4aad..de5c346980 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/examine/ExaminePluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/examine/ExaminePluginTest.java @@ -94,7 +94,7 @@ public class ExaminePluginTest menuOptionClicked.setId(ItemID.ABYSSAL_WHIP); examinePlugin.onMenuOptionClicked(menuOptionClicked); - ChatMessage chatMessage = new ChatMessage(null, ChatMessageType.EXAMINE_ITEM, "", "A weapon from the abyss.", "", 0); + ChatMessage chatMessage = new ChatMessage(null, ChatMessageType.ITEM_EXAMINE, "", "A weapon from the abyss.", "", 0); examinePlugin.onChatMessage(chatMessage); // This passes due to not mocking the ItemComposition for the whip @@ -112,7 +112,7 @@ public class ExaminePluginTest menuOptionClicked.setId(ItemID.ABYSSAL_WHIP); examinePlugin.onMenuOptionClicked(menuOptionClicked); - ChatMessage chatMessage = new ChatMessage(null, ChatMessageType.EXAMINE_ITEM, "", "100000 x Abyssal whip", "", 0); + ChatMessage chatMessage = new ChatMessage(null, ChatMessageType.ITEM_EXAMINE, "", "100000 x Abyssal whip", "", 0); examinePlugin.onChatMessage(chatMessage); verify(examineClient, never()).submitItem(anyInt(), anyString()); diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/itemcharges/ItemChargePluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/itemcharges/ItemChargePluginTest.java index 165c7d50a7..805c7822b8 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/itemcharges/ItemChargePluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/itemcharges/ItemChargePluginTest.java @@ -88,22 +88,22 @@ public class ItemChargePluginTest @Test public void testOnChatMessage() { - ChatMessage chatMessage = new ChatMessage(null, ChatMessageType.SERVER, "", CHECK, "", 0); + ChatMessage chatMessage = new ChatMessage(null, ChatMessageType.GAMEMESSAGE, "", CHECK, "", 0); itemChargePlugin.onChatMessage(chatMessage); verify(config).dodgyNecklace(eq(10)); reset(config); - chatMessage = new ChatMessage(null, ChatMessageType.SERVER, "", PROTECT, "", 0); + chatMessage = new ChatMessage(null, ChatMessageType.GAMEMESSAGE, "", PROTECT, "", 0); itemChargePlugin.onChatMessage(chatMessage); verify(config).dodgyNecklace(eq(9)); reset(config); - chatMessage = new ChatMessage(null, ChatMessageType.SERVER, "", PROTECT_1, "", 0); + chatMessage = new ChatMessage(null, ChatMessageType.GAMEMESSAGE, "", PROTECT_1, "", 0); itemChargePlugin.onChatMessage(chatMessage); verify(config).dodgyNecklace(eq(1)); reset(config); - chatMessage = new ChatMessage(null, ChatMessageType.SERVER, "", BREAK, "", 0); + chatMessage = new ChatMessage(null, ChatMessageType.GAMEMESSAGE, "", BREAK, "", 0); itemChargePlugin.onChatMessage(chatMessage); verify(config).dodgyNecklace(eq(10)); reset(config); diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java index be5b08e71b..9aff61c346 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java @@ -30,7 +30,7 @@ import com.google.inject.testing.fieldbinder.BoundFieldModule; import java.util.concurrent.ScheduledExecutorService; import java.util.function.Consumer; import javax.inject.Inject; -import static net.runelite.api.ChatMessageType.SERVER; +import static net.runelite.api.ChatMessageType.GAMEMESSAGE; import net.runelite.api.Client; import net.runelite.api.events.ChatMessage; import net.runelite.api.events.GameTick; @@ -110,7 +110,7 @@ public class ScreenshotPluginTest @Test public void testClueScroll() { - ChatMessage chatMessageEvent = new ChatMessage(null, SERVER, "Seth", CLUE_SCROLL, null, 0); + ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "Seth", CLUE_SCROLL, null, 0); screenshotPlugin.onChatMessage(chatMessageEvent); assertEquals("medium", screenshotPlugin.getClueType()); @@ -120,7 +120,7 @@ public class ScreenshotPluginTest @Test public void testBarrowsChest() { - ChatMessage chatMessageEvent = new ChatMessage(null, SERVER, "Seth", BARROWS_CHEST, null, 0); + ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "Seth", BARROWS_CHEST, null, 0); screenshotPlugin.onChatMessage(chatMessageEvent); assertEquals(310, screenshotPlugin.getBarrowsNumber()); @@ -129,7 +129,7 @@ public class ScreenshotPluginTest @Test public void testChambersOfXericChest() { - ChatMessage chatMessageEvent = new ChatMessage(null, SERVER, "Seth", CHAMBERS_OF_XERIC_CHEST, null, 0); + ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "Seth", CHAMBERS_OF_XERIC_CHEST, null, 0); screenshotPlugin.onChatMessage(chatMessageEvent); assertEquals(489, screenshotPlugin.getChambersOfXericNumber()); @@ -138,7 +138,7 @@ public class ScreenshotPluginTest @Test public void testTheatreOfBloodChest() { - ChatMessage chatMessageEvent = new ChatMessage(null, SERVER, "Magic fTail", THEATRE_OF_BLOOD_CHEST, null, 0); + ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "Magic fTail", THEATRE_OF_BLOOD_CHEST, null, 0); screenshotPlugin.onChatMessage(chatMessageEvent); assertEquals(73, screenshotPlugin.gettheatreOfBloodNumber()); @@ -147,7 +147,7 @@ public class ScreenshotPluginTest @Test public void testValuableDrop() { - ChatMessage chatMessageEvent = new ChatMessage(null, SERVER, "", VALUABLE_DROP, null, 0); + ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", VALUABLE_DROP, null, 0); screenshotPlugin.onChatMessage(chatMessageEvent); verify(drawManager).requestNextFrameListener(Matchers.any(Consumer.class)); @@ -156,7 +156,7 @@ public class ScreenshotPluginTest @Test public void testUntradeableDrop() { - ChatMessage chatMessageEvent = new ChatMessage(null, SERVER, "", UNTRADEABLE_DROP, null, 0); + ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", UNTRADEABLE_DROP, null, 0); screenshotPlugin.onChatMessage(chatMessageEvent); verify(drawManager).requestNextFrameListener(Matchers.any(Consumer.class)); diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java index 6bfa00f4f2..06291d7fce 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java @@ -31,7 +31,7 @@ import java.io.IOException; import java.util.concurrent.ScheduledExecutorService; import javax.inject.Inject; import net.runelite.api.ChatMessageType; -import static net.runelite.api.ChatMessageType.SERVER; +import static net.runelite.api.ChatMessageType.GAMEMESSAGE; import net.runelite.api.Client; import net.runelite.api.MessageNode; import net.runelite.api.Player; @@ -254,7 +254,7 @@ public class SlayerPluginTest @Test public void testPartnerTask() { - ChatMessage chatMessageEvent = new ChatMessage(null, SERVER, "", TASK_NEW_FROM_PARTNER, null, 0); + ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", TASK_NEW_FROM_PARTNER, null, 0); slayerPlugin.onChatMessage(chatMessageEvent); assertEquals("Dust Devils", slayerPlugin.getTaskName()); @@ -264,7 +264,7 @@ public class SlayerPluginTest @Test public void testCheckSlayerGem() { - ChatMessage chatMessageEvent = new ChatMessage(null, SERVER, "", TASK_CHECKSLAYERGEM, null, 0); + ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", TASK_CHECKSLAYERGEM, null, 0); slayerPlugin.onChatMessage(chatMessageEvent); assertEquals("Suqahs", slayerPlugin.getTaskName()); assertEquals(211, slayerPlugin.getAmount()); @@ -273,7 +273,7 @@ public class SlayerPluginTest @Test public void testCheckSlayerGemWildernessTask() { - ChatMessage chatMessageEvent = new ChatMessage(null, SERVER, "", TASK_CHECKSLAYERGEM_WILDERNESS, null, 0); + ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", TASK_CHECKSLAYERGEM_WILDERNESS, null, 0); slayerPlugin.onChatMessage(chatMessageEvent); assertEquals("Suqahs", slayerPlugin.getTaskName()); assertEquals(211, slayerPlugin.getAmount()); @@ -283,7 +283,7 @@ public class SlayerPluginTest @Test public void testCheckSlayerGemKonarTask() { - ChatMessage chatMessageEvent = new ChatMessage(null, SERVER, "", TASK_CHECKSLAYERGEM_KONAR, null, 0); + ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", TASK_CHECKSLAYERGEM_KONAR, null, 0); slayerPlugin.onChatMessage(chatMessageEvent); assertEquals("Blue dragons", slayerPlugin.getTaskName()); @@ -321,7 +321,7 @@ public class SlayerPluginTest @Test public void testOneTask() { - ChatMessage chatMessageEvent = new ChatMessage(null, SERVER, "Perterter", TASK_ONE, null, 0); + ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "Perterter", TASK_ONE, null, 0); slayerPlugin.onChatMessage(chatMessageEvent); assertEquals(1, slayerPlugin.getStreak()); @@ -332,7 +332,7 @@ public class SlayerPluginTest @Test public void testNoPoints() { - ChatMessage chatMessageEvent = new ChatMessage(null, SERVER, "Perterter", TASK_COMPLETE_NO_POINTS, null, 0); + ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "Perterter", TASK_COMPLETE_NO_POINTS, null, 0); slayerPlugin.onChatMessage(chatMessageEvent); assertEquals(3, slayerPlugin.getStreak()); @@ -343,7 +343,7 @@ public class SlayerPluginTest @Test public void testPoints() { - ChatMessage chatMessageEvent = new ChatMessage(null, SERVER, "Perterter", TASK_POINTS, null, 0); + ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "Perterter", TASK_POINTS, null, 0); slayerPlugin.onChatMessage(chatMessageEvent); assertEquals(9, slayerPlugin.getStreak()); @@ -355,7 +355,7 @@ public class SlayerPluginTest @Test public void testLargeStreak() { - ChatMessage chatMessageEvent = new ChatMessage(null, SERVER, "Perterter", TASK_LARGE_STREAK, null, 0); + ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "Perterter", TASK_LARGE_STREAK, null, 0); slayerPlugin.onChatMessage(chatMessageEvent); assertEquals(2465, slayerPlugin.getStreak()); @@ -370,7 +370,7 @@ public class SlayerPluginTest slayerPlugin.setTaskName("cows"); slayerPlugin.setAmount(42); - ChatMessage chatMessageEvent = new ChatMessage(null, SERVER, "Perterter", TASK_COMPLETE, null, 0); + ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "Perterter", TASK_COMPLETE, null, 0); slayerPlugin.onChatMessage(chatMessageEvent); assertEquals("", slayerPlugin.getTaskName()); @@ -383,7 +383,7 @@ public class SlayerPluginTest slayerPlugin.setTaskName("cows"); slayerPlugin.setAmount(42); - ChatMessage chatMessageEvent = new ChatMessage(null, SERVER, "Perterter", TASK_CANCELED, null, 0); + ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "Perterter", TASK_CANCELED, null, 0); slayerPlugin.onChatMessage(chatMessageEvent); assertEquals("", slayerPlugin.getTaskName()); @@ -393,7 +393,7 @@ public class SlayerPluginTest @Test public void testSuperiorNotification() { - ChatMessage chatMessageEvent = new ChatMessage(null, SERVER, "Superior", SUPERIOR_MESSAGE, null, 0); + ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "Superior", SUPERIOR_MESSAGE, null, 0); when(slayerConfig.showSuperiorNotification()).thenReturn(true); slayerPlugin.onChatMessage(chatMessageEvent); @@ -407,7 +407,7 @@ public class SlayerPluginTest @Test public void testBraceletSlaughter() { - ChatMessage chatMessageEvent = new ChatMessage(null, SERVER, "", BRACLET_SLAUGHTER, null, 0); + ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", BRACLET_SLAUGHTER, null, 0); slayerPlugin.setAmount(42); slayerPlugin.setSlaughterChargeCount(10); @@ -417,18 +417,18 @@ public class SlayerPluginTest assertEquals(9, slayerPlugin.getSlaughterChargeCount()); assertEquals(43, slayerPlugin.getAmount()); - chatMessageEvent = new ChatMessage(null, SERVER, "", CHAT_BRACELET_SLAUGHTER_CHARGE, null, 0); + chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", CHAT_BRACELET_SLAUGHTER_CHARGE, null, 0); slayerPlugin.onChatMessage(chatMessageEvent); assertEquals(12, slayerPlugin.getSlaughterChargeCount()); - chatMessageEvent = new ChatMessage(null, SERVER, "", CHAT_BRACELET_SLAUGHTER_CHARGE_ONE, null, 0); + chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", CHAT_BRACELET_SLAUGHTER_CHARGE_ONE, null, 0); slayerPlugin.onChatMessage(chatMessageEvent); assertEquals(1, slayerPlugin.getSlaughterChargeCount()); slayerPlugin.setSlaughterChargeCount(1); - chatMessageEvent = new ChatMessage(null, SERVER, "", BRACLET_SLAUGHTER_V3, null, 0); + chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", BRACLET_SLAUGHTER_V3, null, 0); slayerPlugin.onChatMessage(chatMessageEvent); assertEquals(30, slayerPlugin.getSlaughterChargeCount()); @@ -441,7 +441,7 @@ public class SlayerPluginTest slayerPlugin.onGameTick(new GameTick()); assertEquals(30, slayerPlugin.getSlaughterChargeCount()); - chatMessageEvent = new ChatMessage(null, SERVER, "", BRACLET_SLAUGHTER_V2, null, 0); + chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", BRACLET_SLAUGHTER_V2, null, 0); slayerPlugin.setAmount(42); slayerPlugin.setSlaughterChargeCount(2); @@ -455,7 +455,7 @@ public class SlayerPluginTest @Test public void testBraceletExpeditious() { - ChatMessage chatMessageEvent = new ChatMessage(null, SERVER, "", BRACLET_EXPEDITIOUS, null, 0); + ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", BRACLET_EXPEDITIOUS, null, 0); slayerPlugin.setAmount(42); slayerPlugin.setExpeditiousChargeCount(10); @@ -465,18 +465,18 @@ public class SlayerPluginTest assertEquals(41, slayerPlugin.getAmount()); assertEquals(9, slayerPlugin.getExpeditiousChargeCount()); - chatMessageEvent = new ChatMessage(null, SERVER, "", CHAT_BRACELET_EXPEDITIOUS_CHARGE, null, 0); + chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", CHAT_BRACELET_EXPEDITIOUS_CHARGE, null, 0); slayerPlugin.onChatMessage(chatMessageEvent); assertEquals(12, slayerPlugin.getExpeditiousChargeCount()); - chatMessageEvent = new ChatMessage(null, SERVER, "", CHAT_BRACELET_EXPEDITIOUS_CHARGE_ONE, null, 0); + chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", CHAT_BRACELET_EXPEDITIOUS_CHARGE_ONE, null, 0); slayerPlugin.onChatMessage(chatMessageEvent); assertEquals(1, slayerPlugin.getExpeditiousChargeCount()); slayerPlugin.setExpeditiousChargeCount(1); - chatMessageEvent = new ChatMessage(null, SERVER, "", BRACLET_EXPEDITIOUS_V3, null, 0); + chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", BRACLET_EXPEDITIOUS_V3, null, 0); slayerPlugin.onChatMessage(chatMessageEvent); assertEquals(30, slayerPlugin.getExpeditiousChargeCount()); @@ -489,7 +489,7 @@ public class SlayerPluginTest slayerPlugin.onGameTick(new GameTick()); assertEquals(30, slayerPlugin.getExpeditiousChargeCount()); - chatMessageEvent = new ChatMessage(null, SERVER, "", BRACLET_EXPEDITIOUS_V2, null, 0); + chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", BRACLET_EXPEDITIOUS_V2, null, 0); slayerPlugin.setAmount(42); slayerPlugin.setExpeditiousChargeCount(2); @@ -510,7 +510,7 @@ public class SlayerPluginTest slayerPlugin.setTaskName("Suqahs"); slayerPlugin.setAmount(231); - ChatMessage chatMessage = new ChatMessage(null, SERVER, "", TASK_UPDATE_COMBAT_BRACELET, null, 0); + ChatMessage chatMessage = new ChatMessage(null, GAMEMESSAGE, "", TASK_UPDATE_COMBAT_BRACELET, null, 0); slayerPlugin.onChatMessage(chatMessage); assertEquals("Suqahs", slayerPlugin.getTaskName()); @@ -531,7 +531,7 @@ public class SlayerPluginTest when(chatClient.getTask(anyString())).thenReturn(task); ChatMessage setMessage = new ChatMessage(); - setMessage.setType(ChatMessageType.PUBLIC); + setMessage.setType(ChatMessageType.PUBLICCHAT); setMessage.setName("Adam"); setMessage.setMessageNode(mock(MessageNode.class)); @@ -553,7 +553,7 @@ public class SlayerPluginTest when(chatClient.getTask(anyString())).thenReturn(task); ChatMessage chatMessage = new ChatMessage(); - chatMessage.setType(ChatMessageType.PUBLIC); + chatMessage.setType(ChatMessageType.PUBLICCHAT); chatMessage.setName("Adam"); chatMessage.setMessageNode(mock(MessageNode.class));