From 3f544bc83fda90dcf0328eb2b5f026053f90c6fe Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Thu, 1 Mar 2018 12:07:23 +0100 Subject: [PATCH] Remove unnecessary chatCommandsEnabled from config As this is not used in chat commands only anymore, and since it is configuration parameter that noone needs to disable, it is unnecessary and is just causing confusion. Signed-off-by: Tomas Slusny --- .../net/runelite/client/chat/ChatMessageManager.java | 9 +++------ .../net/runelite/client/config/RuneLiteConfig.java | 10 ---------- 2 files changed, 3 insertions(+), 16 deletions(-) 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 e40cbf48a3..cf5a9b11ea 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 @@ -48,7 +48,6 @@ import net.runelite.api.MessageNode; import net.runelite.api.Varbits; import net.runelite.api.events.ResizeableChanged; import net.runelite.api.events.VarbitChanged; -import net.runelite.client.config.RuneLiteConfig; @Slf4j @Singleton @@ -57,16 +56,14 @@ public class ChatMessageManager private final Map> colorCache = new HashMap<>(); private final Provider clientProvider; private final ScheduledExecutorService executor; - private final RuneLiteConfig config; private int transparancyVarbit = -1; private final Queue queuedMessages = new ConcurrentLinkedQueue<>(); @Inject - public ChatMessageManager(Provider clientProvider, ScheduledExecutorService executor, RuneLiteConfig config) + public ChatMessageManager(Provider clientProvider, ScheduledExecutorService executor) { this.clientProvider = clientProvider; this.executor = executor; - this.config = config; } @Subscribe @@ -146,8 +143,8 @@ public class ChatMessageManager final boolean transparent = client.isResized() && client.getSetting(Varbits.TRANSPARANT_CHATBOX) != 0; final Set chatColors = colorCache.get(target.getType()); - // If we do not have any colors cached or recoloring is disabled, simply set clean message - if (!config.chatCommandsRecolorEnabled() || chatColors == null || chatColors.isEmpty()) + // If we do not have any colors cached, simply set clean message + if (chatColors == null || chatColors.isEmpty()) { target.setValue(target.getRuneLiteFormatMessage()); return; diff --git a/runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java b/runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java index 9604c7d9bb..6b23c6f209 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java @@ -43,16 +43,6 @@ public interface RuneLiteConfig extends Config return new Dimension(765, 503); } - @ConfigItem( - keyName = "chatCommandsRecolorEnabled", - name = "Enable chat commands recolor", - description = "Determines if recoloring of custom RuneLite chat commands is enabled" - ) - default boolean chatCommandsRecolorEnabled() - { - return true; - } - @ConfigItem( keyName = "uiEnableCustomChrome", name = "Enable custom window chrome",