refactor: change ChatMessageType names to follow ones given
ref: https://twitter.com/JagexAsh/status/1100744640662302720
This commit is contained in:
@@ -140,7 +140,7 @@ public class Notifier
|
||||
.build();
|
||||
|
||||
chatMessageManager.queue(QueuedMessage.builder()
|
||||
.type(ChatMessageType.GAME)
|
||||
.type(ChatMessageType.CONSOLE)
|
||||
.name(appName)
|
||||
.runeLiteFormattedMessage(formattedMessage)
|
||||
.build());
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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()))
|
||||
{
|
||||
|
||||
@@ -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 = "<img=" + iconNumber + ">";
|
||||
if (message.getType() == ChatMessageType.CLANCHAT)
|
||||
if (message.getType() == ChatMessageType.FRIENDSCHAT)
|
||||
{
|
||||
message.getMessageNode()
|
||||
.setSender(message.getMessageNode().getSender() + " " + img);
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -181,7 +181,7 @@ public class CorpPlugin extends Plugin
|
||||
.build();
|
||||
|
||||
chatMessageManager.queue(QueuedMessage.builder()
|
||||
.type(ChatMessageType.GAME)
|
||||
.type(ChatMessageType.CONSOLE)
|
||||
.runeLiteFormattedMessage(message)
|
||||
.build());
|
||||
}
|
||||
|
||||
@@ -281,7 +281,7 @@ public class DailyTasksPlugin extends Plugin
|
||||
|
||||
chatMessageManager.queue(
|
||||
QueuedMessage.builder()
|
||||
.type(ChatMessageType.GAME)
|
||||
.type(ChatMessageType.CONSOLE)
|
||||
.runeLiteFormattedMessage(message)
|
||||
.build());
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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))
|
||||
{
|
||||
|
||||
@@ -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."))
|
||||
{
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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))
|
||||
{
|
||||
|
||||
@@ -197,7 +197,7 @@ public class MusicIndicatorPlugin extends Plugin
|
||||
|
||||
chatMessageManager.queue(
|
||||
QueuedMessage.builder()
|
||||
.type(ChatMessageType.GAME)
|
||||
.type(ChatMessageType.CONSOLE)
|
||||
.runeLiteFormattedMessage(message)
|
||||
.build());
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
@@ -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())
|
||||
|
||||
@@ -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: ")
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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.")))
|
||||
{
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user