From 919ae6feb7609606d74aca688ce2c6738e01f406 Mon Sep 17 00:00:00 2001
From: Vanillj <robindavidsson@outlook.com>
Date: Thu, 23 Jun 2022 01:33:18 +0200
Subject: [PATCH] Changed notification booleans, disabled by default and
 trigger logic

---
 .../EasyGiantsFoundryConfig.java              |  4 +-
 .../EasyGiantsFoundryPlugin.java              | 55 ++++++++-----------
 2 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/src/main/java/com/toofifty/easygiantsfoundry/EasyGiantsFoundryConfig.java b/src/main/java/com/toofifty/easygiantsfoundry/EasyGiantsFoundryConfig.java
index 40ab2dd..6b31224 100644
--- a/src/main/java/com/toofifty/easygiantsfoundry/EasyGiantsFoundryConfig.java
+++ b/src/main/java/com/toofifty/easygiantsfoundry/EasyGiantsFoundryConfig.java
@@ -16,7 +16,7 @@ public interface EasyGiantsFoundryConfig extends Config {
     )
     default boolean showGiantsFoundryStageNotifications()
     {
-        return true;
+        return false;
     }
 
     @ConfigItem(
@@ -27,7 +27,7 @@ public interface EasyGiantsFoundryConfig extends Config {
     )
     default boolean showGiantsFoundryHeatNotifications()
     {
-        return true;
+        return false;
     }
 
 }
diff --git a/src/main/java/com/toofifty/easygiantsfoundry/EasyGiantsFoundryPlugin.java b/src/main/java/com/toofifty/easygiantsfoundry/EasyGiantsFoundryPlugin.java
index 56fae5a..16462cb 100644
--- a/src/main/java/com/toofifty/easygiantsfoundry/EasyGiantsFoundryPlugin.java
+++ b/src/main/java/com/toofifty/easygiantsfoundry/EasyGiantsFoundryPlugin.java
@@ -5,6 +5,7 @@ import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.GameObject;
 import net.runelite.api.GameState;
 import net.runelite.api.InventoryID;
+import net.runelite.api.Skill;
 import net.runelite.api.events.*;
 import net.runelite.client.Notifier;
 import net.runelite.client.eventbus.Subscribe;
@@ -40,9 +41,7 @@ public class EasyGiantsFoundryPlugin extends Plugin
 
 	private Stage oldStage;
 
-	private boolean enableStageNotifications;
-
-	private boolean enableHeatNotifications;
+	private int lastBoost;
 
 	@Inject
 	private EasyGiantsFoundryState state;
@@ -73,8 +72,6 @@ public class EasyGiantsFoundryPlugin extends Plugin
 	{
 		overlayManager.add(overlay2d);
 		overlayManager.add(overlay3d);
-		enableStageNotifications = config.showGiantsFoundryStageNotifications();
-		enableHeatNotifications = config.showGiantsFoundryHeatNotifications();
 	}
 
 	@Override
@@ -127,17 +124,27 @@ public class EasyGiantsFoundryPlugin extends Plugin
 	@Subscribe
 	public void onStatChanged(StatChanged statChanged)
 	{
-		if (state.isEnabled() && state.getCurrentStage() != null)
+		final int currBoost = statChanged.getBoostedLevel();
+		// if the difference between current and last boost is != 0 then a stat boost (or drop) change occurred
+		if (!statChanged.getSkill().equals(Skill.SMITHING) ||
+			currBoost - lastBoost != 0 ||
+			!state.isEnabled() ||
+			state.getCurrentStage() == null)
 		{
-			if (enableStageNotifications && helper.getActionsLeftInStage() == 1 && (oldStage == null || oldStage != state.getCurrentStage()))
-			{
-				notifier.notify("About to finish the current stage!");
-				oldStage = state.getCurrentStage();
-			}
-			else if (enableHeatNotifications && helper.getActionsForHeatLevel() == 1)
-			{
-				notifier.notify("About to run out of heat!");
-			}
+			lastBoost = currBoost;
+			return;
+		}
+
+		if (config.showGiantsFoundryStageNotifications() &&
+			helper.getActionsLeftInStage() == 1 &&
+			(oldStage == null || oldStage != state.getCurrentStage()))
+		{
+			notifier.notify("About to finish the current stage!");
+			oldStage = state.getCurrentStage();
+		}
+		else if (config.showGiantsFoundryHeatNotifications() && helper.getActionsForHeatLevel() == 1)
+		{
+			notifier.notify("About to run out of heat!");
 		}
 	}
 
@@ -213,24 +220,6 @@ public class EasyGiantsFoundryPlugin extends Plugin
 		}
 	}
 
-	@Subscribe
-	public void onConfigChanged(ConfigChanged event)
-	{
-		if (!event.getGroup().equals(EasyGiantsFoundryConfig.GROUP))
-		{
-			return;
-		}
-
-		if (config.showGiantsFoundryStageNotifications() != enableStageNotifications)
-		{
-			enableStageNotifications = config.showGiantsFoundryStageNotifications();
-		}
-
-		if (config.showGiantsFoundryHeatNotifications() != enableHeatNotifications)
-		{
-			enableHeatNotifications = config.showGiantsFoundryHeatNotifications();
-		}
-	}
 
 	@Provides
 	EasyGiantsFoundryConfig provideConfig(ConfigManager configManager)