client: update SetMessage usages to ChatMessage

This commit is contained in:
Adam
2019-02-05 10:34:42 -05:00
parent d4682746c7
commit b0f29aab0a
17 changed files with 160 additions and 147 deletions

View File

@@ -28,7 +28,7 @@ import java.util.function.BiConsumer;
import java.util.function.BiPredicate;
import lombok.AllArgsConstructor;
import lombok.Getter;
import net.runelite.api.events.SetMessage;
import net.runelite.api.events.ChatMessage;
import net.runelite.client.events.ChatInput;
@AllArgsConstructor
@@ -37,6 +37,6 @@ class ChatCommand
{
private final String name;
private boolean async;
private final BiConsumer<SetMessage, String> execute;
private final BiConsumer<ChatMessage, String> execute;
private final BiPredicate<ChatInput, String> input;
}

View File

@@ -34,7 +34,7 @@ import javax.inject.Singleton;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.api.events.SetMessage;
import net.runelite.api.events.ChatMessage;
import net.runelite.client.eventbus.EventBus;
import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.events.ChatInput;
@@ -59,22 +59,22 @@ public class ChatCommandManager implements ChatboxInputListener
commandManager.register(this);
}
public void registerCommand(String command, BiConsumer<SetMessage, String> execute)
public void registerCommand(String command, BiConsumer<ChatMessage, String> execute)
{
registerCommand(command, execute, null);
}
public void registerCommand(String command, BiConsumer<SetMessage, String> execute, BiPredicate<ChatInput, String> input)
public void registerCommand(String command, BiConsumer<ChatMessage, String> execute, BiPredicate<ChatInput, String> input)
{
commands.put(command.toLowerCase(), new ChatCommand(command, false, execute, input));
}
public void registerCommandAsync(String command, BiConsumer<SetMessage, String> execute)
public void registerCommandAsync(String command, BiConsumer<ChatMessage, String> execute)
{
registerCommandAsync(command, execute, null);
}
public void registerCommandAsync(String command, BiConsumer<SetMessage, String> execute, BiPredicate<ChatInput, String> input)
public void registerCommandAsync(String command, BiConsumer<ChatMessage, String> execute, BiPredicate<ChatInput, String> input)
{
commands.put(command.toLowerCase(), new ChatCommand(command, true, execute, input));
}
@@ -85,14 +85,14 @@ public class ChatCommandManager implements ChatboxInputListener
}
@Subscribe
public void onSetMessage(SetMessage setMessage)
public void onChatMessage(ChatMessage chatMessage)
{
if (client.getGameState() != GameState.LOGGED_IN)
{
return;
}
switch (setMessage.getType())
switch (chatMessage.getType())
{
case PUBLIC:
case PUBLIC_MOD:
@@ -104,7 +104,7 @@ public class ChatCommandManager implements ChatboxInputListener
return;
}
String message = setMessage.getValue();
String message = chatMessage.getMessage();
String command = extractCommand(message);
if (command == null)
@@ -120,11 +120,11 @@ public class ChatCommandManager implements ChatboxInputListener
if (chatCommand.isAsync())
{
scheduledExecutorService.execute(() -> chatCommand.getExecute().accept(setMessage, message));
scheduledExecutorService.execute(() -> chatCommand.getExecute().accept(chatMessage, message));
}
else
{
chatCommand.getExecute().accept(setMessage, message);
chatCommand.getExecute().accept(chatMessage, message);
}
}

View File

@@ -42,10 +42,10 @@ import net.runelite.api.ChatMessageType;
import net.runelite.api.Client;
import net.runelite.api.MessageNode;
import net.runelite.api.Varbits;
import net.runelite.api.events.ChatMessage;
import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.ResizeableChanged;
import net.runelite.api.events.ScriptCallbackEvent;
import net.runelite.api.events.SetMessage;
import net.runelite.api.events.VarbitChanged;
import net.runelite.client.callback.ClientThread;
import net.runelite.client.config.ChatColorConfig;
@@ -103,10 +103,10 @@ public class ChatMessageManager
}
@Subscribe
public void onSetMessage(SetMessage setMessage)
public void onChatMessage(ChatMessage chatMessage)
{
MessageNode messageNode = setMessage.getMessageNode();
ChatMessageType chatMessageType = setMessage.getType();
MessageNode messageNode = chatMessage.getMessageNode();
ChatMessageType chatMessageType = chatMessage.getType();
boolean isChatboxTransparent = client.isResized() && client.getVar(Varbits.TRANSPARENT_CHATBOX) == 1;
Color usernameColor = null;
@@ -125,7 +125,7 @@ public class ChatMessageManager
case PUBLIC:
case PUBLIC_MOD:
{
boolean isFriend = client.isFriended(setMessage.getName(), true) && !client.getLocalPlayer().getName().equals(setMessage.getName());
boolean isFriend = client.isFriended(chatMessage.getName(), true) && !client.getLocalPlayer().getName().equals(chatMessage.getName());
if (isFriend)
{
@@ -149,7 +149,7 @@ public class ChatMessageManager
messageNode.setName(ColorUtil.wrapWithColorTag(messageNode.getName(), usernameColor));
}
String sender = setMessage.getSender();
String sender = chatMessage.getSender();
if (senderColor != null && !Strings.isNullOrEmpty(sender))
{
messageNode.setSender(ColorUtil.wrapWithColorTag(sender, senderColor));

View File

@@ -43,7 +43,6 @@ import net.runelite.api.MessageNode;
import net.runelite.api.VarPlayer;
import net.runelite.api.events.ChatMessage;
import net.runelite.api.events.GameTick;
import net.runelite.api.events.SetMessage;
import net.runelite.api.events.VarbitChanged;
import net.runelite.api.events.WidgetLoaded;
import net.runelite.api.vars.AccountType;
@@ -360,14 +359,14 @@ public class ChatCommandsPlugin extends Plugin
return true;
}
private void killCountLookup(SetMessage setMessage, String message)
private void killCountLookup(ChatMessage chatMessage, String message)
{
if (!config.killcount())
{
return;
}
ChatMessageType type = setMessage.getType();
ChatMessageType type = chatMessage.getType();
String search = message.substring(KILLCOUNT_COMMAND_STRING.length() + 1);
final String player;
@@ -377,7 +376,7 @@ public class ChatCommandsPlugin extends Plugin
}
else
{
player = sanitize(setMessage.getName());
player = sanitize(chatMessage.getName());
}
search = longBossName(search);
@@ -403,20 +402,20 @@ public class ChatCommandsPlugin extends Plugin
.build();
log.debug("Setting response {}", response);
final MessageNode messageNode = setMessage.getMessageNode();
final MessageNode messageNode = chatMessage.getMessageNode();
messageNode.setRuneLiteFormatMessage(response);
chatMessageManager.update(messageNode);
client.refreshChat();
}
private void questPointsLookup(SetMessage setMessage, String message)
private void questPointsLookup(ChatMessage chatMessage, String message)
{
if (!config.qp())
{
return;
}
ChatMessageType type = setMessage.getType();
ChatMessageType type = chatMessage.getType();
final String player;
if (type.equals(ChatMessageType.PRIVATE_MESSAGE_SENT))
@@ -425,7 +424,7 @@ public class ChatCommandsPlugin extends Plugin
}
else
{
player = sanitize(setMessage.getName());
player = sanitize(chatMessage.getName());
}
int qp;
@@ -447,7 +446,7 @@ public class ChatCommandsPlugin extends Plugin
.build();
log.debug("Setting response {}", response);
final MessageNode messageNode = setMessage.getMessageNode();
final MessageNode messageNode = chatMessage.getMessageNode();
messageNode.setRuneLiteFormatMessage(response);
chatMessageManager.update(messageNode);
client.refreshChat();
@@ -477,14 +476,14 @@ public class ChatCommandsPlugin extends Plugin
return true;
}
private void personalBestLookup(SetMessage setMessage, String message)
private void personalBestLookup(ChatMessage chatMessage, String message)
{
if (!config.pb())
{
return;
}
ChatMessageType type = setMessage.getType();
ChatMessageType type = chatMessage.getType();
String search = message.substring(PB_COMMAND.length() + 1);
final String player;
@@ -494,7 +493,7 @@ public class ChatCommandsPlugin extends Plugin
}
else
{
player = sanitize(setMessage.getName());
player = sanitize(chatMessage.getName());
}
search = longBossName(search);
@@ -523,7 +522,7 @@ public class ChatCommandsPlugin extends Plugin
.build();
log.debug("Setting response {}", response);
final MessageNode messageNode = setMessage.getMessageNode();
final MessageNode messageNode = chatMessage.getMessageNode();
messageNode.setRuneLiteFormatMessage(response);
chatMessageManager.update(messageNode);
client.refreshChat();
@@ -565,17 +564,17 @@ public class ChatCommandsPlugin extends Plugin
* Looks up the item price and changes the original message to the
* response.
*
* @param setMessage The chat message containing the command.
* @param chatMessage The chat message containing the command.
* @param message The chat message
*/
private void itemPriceLookup(SetMessage setMessage, String message)
private void itemPriceLookup(ChatMessage chatMessage, String message)
{
if (!config.price())
{
return;
}
MessageNode messageNode = setMessage.getMessageNode();
MessageNode messageNode = chatMessage.getMessageNode();
String search = message.substring(PRICE_COMMAND_STRING.length() + 1);
List<ItemPrice> results = itemManager.search(search);
@@ -621,10 +620,10 @@ public class ChatCommandsPlugin extends Plugin
* Looks up the player skill and changes the original message to the
* response.
*
* @param setMessage The chat message containing the command.
* @param chatMessage The chat message containing the command.
* @param message The chat message
*/
private void playerSkillLookup(SetMessage setMessage, String message)
private void playerSkillLookup(ChatMessage chatMessage, String message)
{
if (!config.lvl())
{
@@ -652,7 +651,7 @@ public class ChatCommandsPlugin extends Plugin
return;
}
final HiscoreLookup lookup = getCorrectLookupFor(setMessage);
final HiscoreLookup lookup = getCorrectLookupFor(chatMessage);
try
{
@@ -682,7 +681,7 @@ public class ChatCommandsPlugin extends Plugin
.build();
log.debug("Setting response {}", response);
final MessageNode messageNode = setMessage.getMessageNode();
final MessageNode messageNode = chatMessage.getMessageNode();
messageNode.setRuneLiteFormatMessage(response);
chatMessageManager.update(messageNode);
client.refreshChat();
@@ -693,14 +692,14 @@ public class ChatCommandsPlugin extends Plugin
}
}
private void combatLevelLookup(SetMessage setMessage, String message)
private void combatLevelLookup(ChatMessage chatMessage, String message)
{
if (!config.lvl())
{
return;
}
ChatMessageType type = setMessage.getType();
ChatMessageType type = chatMessage.getType();
String player;
if (type == ChatMessageType.PRIVATE_MESSAGE_SENT)
@@ -709,7 +708,7 @@ public class ChatCommandsPlugin extends Plugin
}
else
{
player = sanitize(setMessage.getName());
player = sanitize(chatMessage.getName());
}
try
@@ -767,7 +766,7 @@ public class ChatCommandsPlugin extends Plugin
.build();
log.debug("Setting response {}", response);
final MessageNode messageNode = setMessage.getMessageNode();
final MessageNode messageNode = chatMessage.getMessageNode();
messageNode.setRuneLiteFormatMessage(response);
chatMessageManager.update(messageNode);
client.refreshChat();
@@ -778,7 +777,7 @@ public class ChatCommandsPlugin extends Plugin
}
}
private void clueLookup(SetMessage setMessage, String message)
private void clueLookup(ChatMessage chatMessage, String message)
{
if (!config.clue())
{
@@ -799,7 +798,7 @@ public class ChatCommandsPlugin extends Plugin
try
{
final Skill hiscoreSkill;
final HiscoreLookup lookup = getCorrectLookupFor(setMessage);
final HiscoreLookup lookup = getCorrectLookupFor(chatMessage);
final HiscoreResult result = hiscoreClient.lookup(lookup.getName(), lookup.getEndpoint());
if (result == null)
@@ -858,7 +857,7 @@ public class ChatCommandsPlugin extends Plugin
String response = chatMessageBuilder.build();
log.debug("Setting response {}", response);
final MessageNode messageNode = setMessage.getMessageNode();
final MessageNode messageNode = chatMessage.getMessageNode();
messageNode.setRuneLiteFormatMessage(response);
chatMessageManager.update(messageNode);
client.refreshChat();
@@ -872,22 +871,22 @@ public class ChatCommandsPlugin extends Plugin
/**
* Gets correct lookup data for message
*
* @param setMessage chat message
* @param chatMessage chat message
* @return hiscore lookup data
*/
private HiscoreLookup getCorrectLookupFor(final SetMessage setMessage)
private HiscoreLookup getCorrectLookupFor(final ChatMessage chatMessage)
{
final String player;
final HiscoreEndpoint ironmanStatus;
if (setMessage.getType().equals(ChatMessageType.PRIVATE_MESSAGE_SENT))
if (chatMessage.getType().equals(ChatMessageType.PRIVATE_MESSAGE_SENT))
{
player = client.getLocalPlayer().getName();
ironmanStatus = hiscoreEndpoint;
}
else
{
player = sanitize(setMessage.getName());
player = sanitize(chatMessage.getName());
if (player.equals(client.getLocalPlayer().getName()))
{
@@ -897,7 +896,7 @@ public class ChatCommandsPlugin extends Plugin
else
{
// Get ironman status from their icon in chat
ironmanStatus = getHiscoreEndpointByName(setMessage.getName());
ironmanStatus = getHiscoreEndpointByName(chatMessage.getName());
}
}

View File

@@ -30,8 +30,8 @@ import java.util.Queue;
import java.util.Set;
import javax.inject.Inject;
import net.runelite.api.ChatMessageType;
import net.runelite.api.events.ChatMessage;
import net.runelite.api.events.MenuOptionClicked;
import net.runelite.api.events.SetMessage;
import net.runelite.client.chat.ChatMessageManager;
import net.runelite.client.chat.QueuedMessage;
import net.runelite.client.eventbus.Subscribe;
@@ -76,11 +76,11 @@ public class ChatHistoryPlugin extends Plugin
}
@Subscribe
public void onSetMessage(SetMessage message)
public void onChatMessage(ChatMessage chatMessage)
{
// Start sending old messages right after the welcome message, as that is most reliable source
// of information that chat history was reset
if (message.getValue().equals(WELCOME_MESSAGE))
if (chatMessage.getMessage().equals(WELCOME_MESSAGE))
{
QueuedMessage queuedMessage;
@@ -92,15 +92,15 @@ public class ChatHistoryPlugin extends Plugin
return;
}
if (ALLOWED_HISTORY.contains(message.getType()))
if (ALLOWED_HISTORY.contains(chatMessage.getType()))
{
final QueuedMessage queuedMessage = QueuedMessage.builder()
.type(message.getType())
.name(message.getName())
.sender(message.getSender())
.value(nbsp(message.getValue()))
.runeLiteFormattedMessage(nbsp(message.getMessageNode().getRuneLiteFormatMessage()))
.timestamp(message.getTimestamp())
.type(chatMessage.getType())
.name(chatMessage.getName())
.sender(chatMessage.getSender())
.value(nbsp(chatMessage.getMessage()))
.runeLiteFormattedMessage(nbsp(chatMessage.getMessageNode().getRuneLiteFormatMessage()))
.timestamp(chatMessage.getTimestamp())
.build();
if (!messageQueue.contains(queuedMessage))

View File

@@ -35,9 +35,9 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
import net.runelite.api.Client;
import net.runelite.api.MessageNode;
import net.runelite.api.events.ChatMessage;
import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.SetMessage;
import net.runelite.client.Notifier;
import net.runelite.client.RuneLiteProperties;
import net.runelite.client.chat.ChatColorType;
@@ -124,29 +124,29 @@ public class ChatNotificationsPlugin extends Plugin
}
@Subscribe
public void onSetMessage(SetMessage event)
public void onChatMessage(ChatMessage chatMessage)
{
MessageNode messageNode = event.getMessageNode();
MessageNode messageNode = chatMessage.getMessageNode();
String nodeValue = Text.removeTags(messageNode.getValue());
boolean update = false;
switch (event.getType())
switch (chatMessage.getType())
{
case TRADE:
if (event.getValue().contains("wishes to trade with you.") && config.notifyOnTrade())
if (chatMessage.getMessage().contains("wishes to trade with you.") && config.notifyOnTrade())
{
notifier.notify(event.getValue());
notifier.notify(chatMessage.getMessage());
}
break;
case DUEL:
if (event.getValue().contains("wishes to duel with you.") && config.notifyOnDuel())
if (chatMessage.getMessage().contains("wishes to duel with you.") && config.notifyOnDuel())
{
notifier.notify(event.getValue());
notifier.notify(chatMessage.getMessage());
}
break;
case GAME:
// Don't notify for notification messages
if (event.getName().equals(runeLiteProperties.getTitle()))
if (chatMessage.getName().equals(runeLiteProperties.getTitle()))
{
return;
}
@@ -170,7 +170,7 @@ public class ChatNotificationsPlugin extends Plugin
if (config.notifyOnOwnName())
{
sendNotification(event);
sendNotification(chatMessage);
}
}
}
@@ -196,7 +196,7 @@ public class ChatNotificationsPlugin extends Plugin
if (config.notifyOnHighlight())
{
sendNotification(event);
sendNotification(chatMessage);
}
}
}
@@ -208,7 +208,7 @@ public class ChatNotificationsPlugin extends Plugin
}
}
private void sendNotification(SetMessage message)
private void sendNotification(ChatMessage message)
{
String name = Text.removeTags(message.getName());
String sender = message.getSender();
@@ -224,7 +224,7 @@ public class ChatNotificationsPlugin extends Plugin
stringBuilder.append(name).append(": ");
}
stringBuilder.append(Text.removeTags(message.getValue()));
stringBuilder.append(Text.removeTags(message.getMessage()));
String notification = stringBuilder.toString();
notifier.notify(notification);
}

View File

@@ -35,13 +35,13 @@ import net.runelite.api.ClanMemberRank;
import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.api.VarClientStr;
import net.runelite.api.widgets.WidgetType;
import net.runelite.api.events.ChatMessage;
import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameTick;
import net.runelite.api.events.SetMessage;
import net.runelite.api.events.VarClientStrChanged;
import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo;
import net.runelite.api.widgets.WidgetType;
import net.runelite.client.config.ConfigManager;
import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.game.ClanManager;
@@ -134,20 +134,20 @@ public class ClanChatPlugin extends Plugin
}
@Subscribe
public void onSetMessage(SetMessage setMessage)
public void onChatMessage(ChatMessage chatMessage)
{
if (client.getGameState() != GameState.LOADING && client.getGameState() != GameState.LOGGED_IN)
{
return;
}
if (setMessage.getType() == ChatMessageType.CLANCHAT && client.getClanChatCount() > 0)
if (chatMessage.getType() == ChatMessageType.CLANCHAT && client.getClanChatCount() > 0)
{
insertClanRankIcon(setMessage);
insertClanRankIcon(chatMessage);
}
}
private void insertClanRankIcon(final SetMessage message)
private void insertClanRankIcon(final ChatMessage message)
{
final ClanMemberRank rank = clanManager.getRank(message.getName());

View File

@@ -60,7 +60,6 @@ import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.GameTick;
import net.runelite.api.events.NpcDespawned;
import net.runelite.api.events.NpcSpawned;
import net.runelite.api.events.SetMessage;
import net.runelite.api.vars.SlayerUnlock;
import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo;
@@ -724,14 +723,14 @@ public class SlayerPlugin extends Plugin
counter = null;
}
void taskLookup(SetMessage setMessage, String message)
void taskLookup(ChatMessage chatMessage, String message)
{
if (!config.taskCommand())
{
return;
}
ChatMessageType type = setMessage.getType();
ChatMessageType type = chatMessage.getType();
final String player;
if (type.equals(ChatMessageType.PRIVATE_MESSAGE_SENT))
@@ -740,7 +739,7 @@ public class SlayerPlugin extends Plugin
}
else
{
player = Text.removeTags(setMessage.getName())
player = Text.removeTags(chatMessage.getName())
.replace('\u00A0', ' ');
}
@@ -787,7 +786,7 @@ public class SlayerPlugin extends Plugin
.append(sb.toString())
.build();
final MessageNode messageNode = setMessage.getMessageNode();
final MessageNode messageNode = chatMessage.getMessageNode();
messageNode.setRuneLiteFormatMessage(response);
chatMessageManager.update(messageNode);
client.refreshChat();

View File

@@ -32,7 +32,21 @@ import javax.inject.Inject;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import static net.runelite.api.AnimationID.*;
import static net.runelite.api.AnimationID.CONSTRUCTION;
import static net.runelite.api.AnimationID.FIREMAKING;
import static net.runelite.api.AnimationID.FLETCHING_BOW_CUTTING;
import static net.runelite.api.AnimationID.IDLE;
import static net.runelite.api.AnimationID.LOOKING_INTO;
import static net.runelite.api.AnimationID.WOODCUTTING_3A_AXE;
import static net.runelite.api.AnimationID.WOODCUTTING_ADAMANT;
import static net.runelite.api.AnimationID.WOODCUTTING_BLACK;
import static net.runelite.api.AnimationID.WOODCUTTING_BRONZE;
import static net.runelite.api.AnimationID.WOODCUTTING_DRAGON;
import static net.runelite.api.AnimationID.WOODCUTTING_INFERNAL;
import static net.runelite.api.AnimationID.WOODCUTTING_IRON;
import static net.runelite.api.AnimationID.WOODCUTTING_MITHRIL;
import static net.runelite.api.AnimationID.WOODCUTTING_RUNE;
import static net.runelite.api.AnimationID.WOODCUTTING_STEEL;
import net.runelite.api.ChatMessageType;
import net.runelite.api.Client;
import net.runelite.api.InventoryID;
@@ -43,9 +57,9 @@ import static net.runelite.api.ItemID.BRUMA_ROOT;
import net.runelite.api.MessageNode;
import net.runelite.api.Player;
import net.runelite.api.events.AnimationChanged;
import net.runelite.api.events.ChatMessage;
import net.runelite.api.events.GameTick;
import net.runelite.api.events.ItemContainerChanged;
import net.runelite.api.events.SetMessage;
import net.runelite.client.Notifier;
import net.runelite.client.chat.ChatMessageManager;
import net.runelite.client.config.ConfigManager;
@@ -192,21 +206,21 @@ public class WintertodtPlugin extends Plugin
}
@Subscribe
public void onSetMessage(SetMessage setMessage)
public void onSetMessage(ChatMessage chatMessage)
{
if (!isInWintertodt)
{
return;
}
ChatMessageType chatMessageType = setMessage.getType();
ChatMessageType chatMessageType = chatMessage.getType();
if (chatMessageType != ChatMessageType.SERVER && chatMessageType != ChatMessageType.FILTERED)
{
return;
}
MessageNode messageNode = setMessage.getMessageNode();
MessageNode messageNode = chatMessage.getMessageNode();
final WintertodtInterruptType interruptType;
if (messageNode.getValue().startsWith("The cold of"))