From 62f7089bb424949487b9f397935a2e6483141d76 Mon Sep 17 00:00:00 2001 From: Hydrox6 Date: Sat, 9 Jun 2018 04:00:35 +0100 Subject: [PATCH] Clean up the Examine Colour loading --- .../client/chat/ChatMessageManager.java | 40 ++++--------------- 1 file changed, 8 insertions(+), 32 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 528f321fbe..24c00cff4f 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 @@ -322,29 +322,17 @@ public class ChatMessageManager { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaqueExamine(), false), ChatMessageType.EXAMINE_OBJECT); - } - if (chatColorConfig.opaqueExamineHighlight() != null) - { - cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaqueExamineHighlight(), false), - ChatMessageType.EXAMINE_OBJECT); - } - if (chatColorConfig.opaqueExamine() != null) - { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaqueExamine(), false), ChatMessageType.EXAMINE_NPC); - } - if (chatColorConfig.opaqueExamineHighlight() != null) - { - cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaqueExamineHighlight(), false), - ChatMessageType.EXAMINE_NPC); - } - if (chatColorConfig.opaqueExamine() != null) - { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaqueExamine(), false), ChatMessageType.EXAMINE_ITEM); } if (chatColorConfig.opaqueExamineHighlight() != null) { + cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaqueExamineHighlight(), false), + ChatMessageType.EXAMINE_OBJECT); + cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaqueExamineHighlight(), false), + ChatMessageType.EXAMINE_NPC); cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaqueExamineHighlight(), false), ChatMessageType.EXAMINE_ITEM); } @@ -458,29 +446,17 @@ public class ChatMessageManager { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentExamine(), true), ChatMessageType.EXAMINE_OBJECT); - } - if (chatColorConfig.transparentExamineHighlight() != null) - { - cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentExamineHighlight(), true), - ChatMessageType.EXAMINE_OBJECT); - } - if (chatColorConfig.transparentExamine() != null) - { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentExamine(), true), ChatMessageType.EXAMINE_NPC); - } - if (chatColorConfig.transparentExamineHighlight() != null) - { - cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentExamineHighlight(), true), - ChatMessageType.EXAMINE_NPC); - } - if (chatColorConfig.transparentExamine() != null) - { cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentExamine(), true), ChatMessageType.EXAMINE_ITEM); } if (chatColorConfig.transparentExamineHighlight() != null) { + cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentExamineHighlight(), true), + ChatMessageType.EXAMINE_OBJECT); + cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentExamineHighlight(), true), + ChatMessageType.EXAMINE_NPC); cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentExamineHighlight(), true), ChatMessageType.EXAMINE_ITEM); }