From ebedd5484c22d2684d5d57b1cd136028a94126bc Mon Sep 17 00:00:00 2001 From: OShadowz Date: Tue, 10 Apr 2018 12:40:55 -0400 Subject: [PATCH 1/2] imp plugin: fix magpie impling name and spelling --- .../net/runelite/client/plugins/implings/ImplingsConfig.java | 4 ++-- .../net/runelite/client/plugins/implings/ImplingsPlugin.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsConfig.java index 4d1f957c9c..c439504545 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsConfig.java @@ -208,10 +208,10 @@ public interface ImplingsConfig extends Config @ConfigItem( position = 16, keyName = "magpieColor", - name = "Ninja impling color", + name = "Magpie impling color", description = "Text color for Magpie implings" ) - default Color getMapgieColor() + default Color getMagpieColor() { return new Color(142, 142, 19); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsPlugin.java index b95a4525fe..d294f89c45 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsPlugin.java @@ -150,8 +150,8 @@ public class ImplingsPlugin extends Plugin } if (config.showMagpie()) { - ids.put(NpcID.MAGPIE_IMPLING, config.getMapgieColor()); - ids.put(NpcID.MAGPIE_IMPLING_1652, config.getMapgieColor()); + ids.put(NpcID.MAGPIE_IMPLING, config.getMagpieColor()); + ids.put(NpcID.MAGPIE_IMPLING_1652, config.getMagpieColor()); } if (config.showNinja()) { From 364c7eb98eb483d1d254d166287d3a1540f4aa2a Mon Sep 17 00:00:00 2001 From: OShadowz Date: Wed, 11 Apr 2018 03:37:43 -0400 Subject: [PATCH 2/2] imp plugin: add config option to display impling names on minimap --- .../implings/ImplingMinimapOverlay.java | 18 ++++++++++++++---- .../plugins/implings/ImplingsConfig.java | 11 +++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingMinimapOverlay.java index 415209ec91..298b89615b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingMinimapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingMinimapOverlay.java @@ -24,6 +24,7 @@ */ package net.runelite.client.plugins.implings; +import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; @@ -37,13 +38,15 @@ import net.runelite.client.ui.overlay.OverlayUtil; public class ImplingMinimapOverlay extends Overlay { private final ImplingsPlugin plugin; + private final ImplingsConfig config; @Inject - private ImplingMinimapOverlay(ImplingsPlugin plugin) + private ImplingMinimapOverlay(ImplingsPlugin plugin, ImplingsConfig config) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_WIDGETS); this.plugin = plugin; + this.config = config; } @Override @@ -57,10 +60,17 @@ public class ImplingMinimapOverlay extends Overlay for (NPC imp : imps) { - Point minimapLocation = imp.getMinimapLocation(); - if (minimapLocation != null) + Point impLocation = imp.getMinimapLocation(); + if (impLocation != null) { - OverlayUtil.renderMinimapLocation(graphics, minimapLocation, plugin.getIds().get(imp.getId())); + Color color = plugin.getIds().get(imp.getId()); + OverlayUtil.renderMinimapLocation(graphics, impLocation, color); + + if (config.showName()) + { + Point textLocation = new Point(impLocation.getX() + 1, impLocation.getY()); + OverlayUtil.renderTextLocation(graphics, textLocation, imp.getName(), color); + } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsConfig.java index c439504545..c4f2b46f03 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsConfig.java @@ -303,4 +303,15 @@ public interface ImplingsConfig extends Config { return Color.WHITE; } + + @ConfigItem( + position = 25, + keyName = "showname", + name = "Show name on minimap", + description = "Configures whether or not impling names are displayed on minimap" + ) + default boolean showName() + { + return false; + } }