Merge pull request #1371 from OShadowz/impling_improvements

Impling Configuration Improvements
This commit is contained in:
Adam
2018-04-13 08:41:23 -04:00
committed by GitHub
3 changed files with 29 additions and 8 deletions

View File

@@ -24,6 +24,7 @@
*/ */
package net.runelite.client.plugins.implings; package net.runelite.client.plugins.implings;
import java.awt.Color;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import javax.inject.Inject; import javax.inject.Inject;
@@ -37,13 +38,15 @@ import net.runelite.client.ui.overlay.OverlayUtil;
public class ImplingMinimapOverlay extends Overlay public class ImplingMinimapOverlay extends Overlay
{ {
private final ImplingsPlugin plugin; private final ImplingsPlugin plugin;
private final ImplingsConfig config;
@Inject @Inject
private ImplingMinimapOverlay(ImplingsPlugin plugin) private ImplingMinimapOverlay(ImplingsPlugin plugin, ImplingsConfig config)
{ {
setPosition(OverlayPosition.DYNAMIC); setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.ABOVE_WIDGETS); setLayer(OverlayLayer.ABOVE_WIDGETS);
this.plugin = plugin; this.plugin = plugin;
this.config = config;
} }
@Override @Override
@@ -57,10 +60,17 @@ public class ImplingMinimapOverlay extends Overlay
for (NPC imp : imps) for (NPC imp : imps)
{ {
Point minimapLocation = imp.getMinimapLocation(); Point impLocation = imp.getMinimapLocation();
if (minimapLocation != null) 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);
}
} }
} }

View File

@@ -208,10 +208,10 @@ public interface ImplingsConfig extends Config
@ConfigItem( @ConfigItem(
position = 16, position = 16,
keyName = "magpieColor", keyName = "magpieColor",
name = "Ninja impling color", name = "Magpie impling color",
description = "Text color for Magpie implings" description = "Text color for Magpie implings"
) )
default Color getMapgieColor() default Color getMagpieColor()
{ {
return new Color(142, 142, 19); return new Color(142, 142, 19);
} }
@@ -303,4 +303,15 @@ public interface ImplingsConfig extends Config
{ {
return Color.WHITE; 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;
}
} }

View File

@@ -150,8 +150,8 @@ public class ImplingsPlugin extends Plugin
} }
if (config.showMagpie()) if (config.showMagpie())
{ {
ids.put(NpcID.MAGPIE_IMPLING, config.getMapgieColor()); ids.put(NpcID.MAGPIE_IMPLING, config.getMagpieColor());
ids.put(NpcID.MAGPIE_IMPLING_1652, config.getMapgieColor()); ids.put(NpcID.MAGPIE_IMPLING_1652, config.getMagpieColor());
} }
if (config.showNinja()) if (config.showNinja())
{ {