Merge pull request #10420 from Hydrox6/npc-aggro-remove-remove-hint

This commit is contained in:
Jordan
2020-05-02 17:08:30 -07:00
committed by GitHub
2 changed files with 3 additions and 16 deletions

View File

@@ -93,22 +93,11 @@ public interface NpcAggroAreaConfig extends Config
return Color.YELLOW; return Color.YELLOW;
} }
@ConfigItem(
keyName = "npcUnaggroShowNotWorkingOverlay",
name = "Hide overlay hint",
description = "Hide overlay hint if plugin is enabled in unsupported area",
position = 6
)
default boolean hideOverlayHint()
{
return false;
}
@ConfigItem( @ConfigItem(
keyName = "notifyExpire", keyName = "notifyExpire",
name = "Notify Expiration", name = "Notify Expiration",
description = "Send a notifcation when the unaggressive timer expires", description = "Send a notifcation when the unaggressive timer expires",
position = 7 position = 6
) )
default boolean notifyExpire() default boolean notifyExpire()
{ {

View File

@@ -35,13 +35,11 @@ import net.runelite.client.ui.overlay.components.LineComponent;
class NpcAggroAreaNotWorkingOverlay extends OverlayPanel class NpcAggroAreaNotWorkingOverlay extends OverlayPanel
{ {
private final NpcAggroAreaPlugin plugin; private final NpcAggroAreaPlugin plugin;
private final NpcAggroAreaConfig config;
@Inject @Inject
private NpcAggroAreaNotWorkingOverlay(NpcAggroAreaPlugin plugin, NpcAggroAreaConfig config) private NpcAggroAreaNotWorkingOverlay(NpcAggroAreaPlugin plugin)
{ {
this.plugin = plugin; this.plugin = plugin;
this.config = config;
panelComponent.getChildren().add(LineComponent.builder() panelComponent.getChildren().add(LineComponent.builder()
.left("Unaggressive NPC timers will start working when you teleport far away or enter a dungeon.") .left("Unaggressive NPC timers will start working when you teleport far away or enter a dungeon.")
@@ -55,7 +53,7 @@ class NpcAggroAreaNotWorkingOverlay extends OverlayPanel
@Override @Override
public Dimension render(Graphics2D graphics) public Dimension render(Graphics2D graphics)
{ {
if (!plugin.isActive() || plugin.getSafeCenters()[1] != null || config.hideOverlayHint()) if (!plugin.isActive() || plugin.getSafeCenters()[1] != null)
{ {
return null; return null;
} }