From 464f5057c32780456915023affa6073b4b2f963a Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Mon, 7 May 2018 15:51:41 +0200 Subject: [PATCH] Unify NPC highlighting color settings Merge NPC highlight and tag color to one setting. Signed-off-by: Tomas Slusny --- .../plugins/npchighlight/NpcClickboxOverlay.java | 4 ++-- .../plugins/npchighlight/NpcIndicatorsConfig.java | 15 ++------------- .../plugins/npchighlight/NpcMinimapOverlay.java | 4 ++-- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcClickboxOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcClickboxOverlay.java index 12e1dcec34..fa000c4250 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcClickboxOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcClickboxOverlay.java @@ -60,7 +60,7 @@ public class NpcClickboxOverlay extends Overlay { for (NPC npc : plugin.getHighlightedNpcs()) { - renderNpcOverlay(graphics, npc, npc.getName(), config.getNpcColor()); + renderNpcOverlay(graphics, npc, npc.getName(), config.getHighlightColor()); } NPC[] npcs = client.getCachedNPCs(); @@ -69,7 +69,7 @@ public class NpcClickboxOverlay extends Overlay NPC npc = npcs[npcId]; if (npc != null && npc.getName() != null) { - renderNpcOverlay(graphics, npc, npc.getName(), config.getTagColor()); + renderNpcOverlay(graphics, npc, npc.getName(), config.getHighlightColor()); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsConfig.java index 1252cf4419..5772a8972c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsConfig.java @@ -64,7 +64,7 @@ public interface NpcIndicatorsConfig extends Config name = "Highlight Color", description = "Color of the NPC highlight" ) - default Color getNpcColor() + default Color getHighlightColor() { return Color.CYAN; } @@ -82,17 +82,6 @@ public interface NpcIndicatorsConfig extends Config @ConfigItem( position = 4, - keyName = "tagColor", - name = "Tag Color", - description = "Color of the NPC tag highlight" - ) - default Color getTagColor() - { - return Color.CYAN; - } - - @ConfigItem( - position = 5, keyName = "drawNames", name = "Draw names above NPC", description = "Configures whether or not NPC names should be drawn above the NPC" @@ -103,7 +92,7 @@ public interface NpcIndicatorsConfig extends Config } @ConfigItem( - position = 6, + position = 5, keyName = "drawMinimapNames", name = "Draw names on minimap", description = "Configures whether or not NPC names should be drawn on the minimap" diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcMinimapOverlay.java index acacb232b8..913291c234 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcMinimapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcMinimapOverlay.java @@ -58,7 +58,7 @@ public class NpcMinimapOverlay extends Overlay { for (NPC npc : plugin.getHighlightedNpcs()) { - renderNpcOverlay(graphics, npc, npc.getName(), config.getNpcColor()); + renderNpcOverlay(graphics, npc, npc.getName(), config.getHighlightColor()); } NPC[] npcs = client.getCachedNPCs(); @@ -67,7 +67,7 @@ public class NpcMinimapOverlay extends Overlay NPC npc = npcs[npcId]; if (npc != null && npc.getName() != null) { - renderNpcOverlay(graphics, npc, npc.getName(), config.getTagColor()); + renderNpcOverlay(graphics, npc, npc.getName(), config.getHighlightColor()); } }