From 496a28c9f98e6a9d2f77ab2ab6c9f0ed71e902b2 Mon Sep 17 00:00:00 2001 From: Cyborger1 <45152844+Cyborger1@users.noreply.github.com> Date: Sat, 13 Feb 2021 14:16:19 -0500 Subject: [PATCH] emoji plugin: set message node message instead of rl format message The replaced message has no rl-format tags, and using the rl-format message causes it to lose color whenever the message node is refreshed due to not containing any rl-format tags --- .../net/runelite/client/plugins/emojis/EmojiPlugin.java | 8 +------- .../runelite/client/plugins/emojis/EmojiPluginTest.java | 4 ++-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java index e63a97c3cc..9fc33d8647 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java @@ -40,7 +40,6 @@ import net.runelite.api.events.ChatMessage; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.OverheadTextChanged; import net.runelite.client.callback.ClientThread; -import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -63,9 +62,6 @@ public class EmojiPlugin extends Plugin @Inject private ClientThread clientThread; - @Inject - private ChatMessageManager chatMessageManager; - private int modIconsStart = -1; @Override @@ -145,9 +141,7 @@ public class EmojiPlugin extends Plugin return; } - messageNode.setRuneLiteFormatMessage(updatedMessage); - chatMessageManager.update(messageNode); - client.refreshChat(); + messageNode.setValue(updatedMessage); } @Subscribe diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/emojis/EmojiPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/emojis/EmojiPluginTest.java index 326ea07a38..99fc2dc174 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/emojis/EmojiPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/emojis/EmojiPluginTest.java @@ -89,7 +89,7 @@ public class EmojiPluginTest emojiPlugin.onChatMessage(chatMessage); - verify(messageNode).setRuneLiteFormatMessage(" "); + verify(messageNode).setValue(" "); } @Test @@ -113,7 +113,7 @@ public class EmojiPluginTest emojiPlugin.onChatMessage(chatMessage); - verify(messageNode).setRuneLiteFormatMessage(""); + verify(messageNode).setValue(""); } @Test