From 5a84107ebb6e5e393083df8a3427405f21a297ab Mon Sep 17 00:00:00 2001
From: ThatGamerBlue <thatgamerblue@gmail.com>
Date: Sun, 7 Jul 2019 19:20:42 +0100
Subject: [PATCH] npcunaggroarea: add notification when timer runs out

---
 .../npcunaggroarea/NpcAggroAreaConfig.java    | 11 +++++++++
 .../npcunaggroarea/NpcAggroAreaOverlay.java   |  4 ++++
 .../npcunaggroarea/NpcAggroAreaPlugin.java    | 24 +++++++++++++++++++
 3 files changed, 39 insertions(+)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java
index 38cb016c63..46593c4d32 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java
@@ -115,4 +115,15 @@ public interface NpcAggroAreaConfig extends Config
 	{
 		return false;
 	}
+
+	@ConfigItem(
+		keyName = "sendNotification",
+		name = "Send notification",
+		description = "Send a notification when the timer runs out",
+		position = 7
+	)
+	default boolean sendNotification()
+	{
+		return false;
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java
index 5a295e2f35..c9c1c4fae2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java
@@ -86,6 +86,10 @@ class NpcAggroAreaOverlay extends Overlay
 				outlineColor.getBlue(),
 				100);
 		}
+		else
+		{
+			plugin.doNotification();
+		}
 
 		renderPath(graphics, lines, outlineColor);
 		return null;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java
index d4093c07a5..af60fb56ed 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.npcunaggroarea;
 import java.awt.Color;
 import javax.inject.Singleton;
 import lombok.AccessLevel;
+import net.runelite.api.Player;
 import net.runelite.api.geometry.Geometry;
 import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
@@ -56,6 +57,7 @@ import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.NpcSpawned;
+import net.runelite.client.Notifier;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.game.ItemManager;
@@ -116,6 +118,9 @@ public class NpcAggroAreaPlugin extends Plugin
 	@Inject
 	private ConfigManager configManager;
 
+	@Inject
+	private Notifier notifier;
+
 	@Getter(AccessLevel.PACKAGE)
 	private final WorldPoint[] safeCenters = new WorldPoint[2];
 
@@ -137,12 +142,15 @@ public class NpcAggroAreaPlugin extends Plugin
 	private boolean showNotWorkingOverlay;
 	@Getter(AccessLevel.PACKAGE)
 	private boolean hideOverlayHint;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean sendNotification;
 
 	private WorldPoint lastPlayerLocation;
 	private WorldPoint previousUnknownCenter;
 	private boolean loggingIn;
 	private List<String> npcNamePatterns;
 	private boolean notWorkingOverlayShown = false;
+	private boolean hasSentNotification = false;
 
 	@Provides
 	NpcAggroAreaConfig provideConfig(ConfigManager configManager)
@@ -259,6 +267,7 @@ public class NpcAggroAreaPlugin extends Plugin
 		BufferedImage image = itemManager.getImage(ItemID.ENSOULED_DEMON_HEAD);
 		currentTimer = new AggressionTimer(duration, image, this, active && this.showTimer);
 		infoBoxManager.addInfoBox(currentTimer);
+		hasSentNotification = false;
 	}
 
 	private void resetTimer()
@@ -417,6 +426,9 @@ public class NpcAggroAreaPlugin extends Plugin
 				npcNamePatterns = NAME_SPLITTER.splitToList(this.configNpcNamePatterns);
 				recheckActive();
 				break;
+			case "sendNotification":
+				hasSentNotification = false;
+				break;
 		}
 	}
 
@@ -507,6 +519,17 @@ public class NpcAggroAreaPlugin extends Plugin
 		}
 	}
 
+	void doNotification()
+	{
+		if (hasSentNotification)
+		{
+			return;
+		}
+		final Player local = client.getLocalPlayer();
+		hasSentNotification = true;
+		notifier.notify("[" + local.getName() + "]'s aggression timer has run out!");
+	}
+
 	private void updateConfig()
 	{
 		this.alwaysActive = config.alwaysActive();
@@ -516,5 +539,6 @@ public class NpcAggroAreaPlugin extends Plugin
 		this.aggroAreaColor = config.aggroAreaColor();
 		this.showNotWorkingOverlay = config.showNotWorkingOverlay();
 		this.hideOverlayHint = config.hideOverlayHint();
+		this.sendNotification = config.sendNotification();
 	}
 }