From b5b25aa6cae39d47cdb9fa933959b8f3c85c9696 Mon Sep 17 00:00:00 2001
From: Mack Bryan <30667892+MackBryan@users.noreply.github.com>
Date: Thu, 6 Sep 2018 09:18:06 -0700
Subject: [PATCH] Add ogre bellows to item charges plugin (#5323)

---
 .../plugins/itemcharges/ItemChargeConfig.java       | 13 ++++++++++++-
 .../plugins/itemcharges/ItemChargeOverlay.java      |  7 +++++--
 .../client/plugins/itemcharges/ItemChargeType.java  |  1 +
 .../client/plugins/itemcharges/ItemWithCharge.java  |  5 +++++
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeConfig.java
index 794f24437e..26853330ea 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeConfig.java
@@ -171,11 +171,22 @@ public interface ItemChargeConfig extends Config
 		return true;
 	}
 
+	@ConfigItem(
+			keyName = "showBellowCharges",
+			name = "Show Bellow Charges",
+			description = "Configures if ogre bellow item charge is shown",
+			position = 12
+	)
+	default boolean showBellowCharges()
+	{
+		return true;
+	}
+
 	@ConfigItem(
 		keyName = "recoilNotification",
 		name = "Ring of Recoil Notification",
 		description = "Configures if the ring of recoil breaking notification is shown",
-		position = 12
+		position = 13
 	)
 	default boolean recoilNotification()
 	{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java
index 96be2ee08e..645d7f2ae2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java
@@ -44,6 +44,7 @@ import static net.runelite.client.plugins.itemcharges.ItemChargeType.IMPBOX;
 import static net.runelite.client.plugins.itemcharges.ItemChargeType.TELEPORT;
 import static net.runelite.client.plugins.itemcharges.ItemChargeType.WATERCAN;
 import static net.runelite.client.plugins.itemcharges.ItemChargeType.WATERSKIN;
+import static net.runelite.client.plugins.itemcharges.ItemChargeType.BELLOWS;
 import net.runelite.client.ui.FontManager;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
@@ -102,7 +103,8 @@ class ItemChargeOverlay extends Overlay
 					|| (type == FUNGICIDE_SPRAY && !config.showFungicideCharges())
 					|| (type == IMPBOX && !config.showImpCharges())
 					|| (type == WATERCAN && !config.showWateringCanCharges())
-					|| (type == WATERSKIN && !config.showWaterskinCharges()))
+					|| (type == WATERSKIN && !config.showWaterskinCharges())
+					|| (type == BELLOWS && !config.showBellowCharges()))
 				{
 					continue;
 				}
@@ -156,6 +158,7 @@ class ItemChargeOverlay extends Overlay
 	private boolean displayOverlay()
 	{
 		return config.showTeleportCharges() || config.showDodgyCount() || config.showFungicideCharges()
-			|| config.showImpCharges() || config.showWateringCanCharges() || config.showWaterskinCharges();
+			|| config.showImpCharges() || config.showWateringCanCharges() || config.showWaterskinCharges()
+			|| config.showBellowCharges();
 	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeType.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeType.java
index 224044b62d..df37c34c57 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeType.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeType.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.itemcharges;
 
 enum ItemChargeType
 {
+	BELLOWS,
 	FUNGICIDE_SPRAY,
 	IMPBOX,
 	TELEPORT,
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithCharge.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithCharge.java
index 96b54f37e8..d492f47d5b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithCharge.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithCharge.java
@@ -35,11 +35,16 @@ import static net.runelite.client.plugins.itemcharges.ItemChargeType.IMPBOX;
 import static net.runelite.client.plugins.itemcharges.ItemChargeType.TELEPORT;
 import static net.runelite.client.plugins.itemcharges.ItemChargeType.WATERCAN;
 import static net.runelite.client.plugins.itemcharges.ItemChargeType.WATERSKIN;
+import static net.runelite.client.plugins.itemcharges.ItemChargeType.BELLOWS;
 
 @AllArgsConstructor
 @Getter
 enum ItemWithCharge
 {
+	BELLOWS0(BELLOWS, OGRE_BELLOWS, 0),
+	BELLOWS1(BELLOWS, OGRE_BELLOWS_1, 1),
+	BELLOWS2(BELLOWS, OGRE_BELLOWS_2, 2),
+	BELLOWS3(BELLOWS, OGRE_BELLOWS_3, 3),
 	BURNING1(TELEPORT, BURNING_AMULET1, 1),
 	BURNING2(TELEPORT, BURNING_AMULET2, 2),
 	BURNING3(TELEPORT, BURNING_AMULET3, 3),