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 738375df7f..8d33d384b8 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 @@ -102,11 +102,22 @@ public interface ItemChargeConfig extends Config return true; } + @ConfigItem( + keyName = "showFungicideCharges", + name = "Show Fungicide Charges", + description = "Configures if fungicide item charges is shown", + position = 7 + ) + default boolean showFungicideCharges() + { + return true; + } + @ConfigItem( keyName = "showWateringCanCharges", name = "Show Watering Can Charges", description = "Configures if watering can item charge is shown", - position = 7 + position = 8 ) default boolean showWateringCanCharges() { @@ -117,7 +128,7 @@ public interface ItemChargeConfig extends Config keyName = "showWaterskinCharges", name = "Show Waterskin Charges", description = "Configures if waterskin item charge is shown", - position = 8 + position = 9 ) default boolean showWaterskinCharges() { @@ -128,7 +139,7 @@ public interface ItemChargeConfig extends Config keyName = "recoilNotification", name = "Ring of Recoil Notification", description = "Configures if the ring of recoil breaking notification is shown", - position = 9 + position = 10 ) 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 3246a0ae22..f1f3568c16 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 @@ -38,6 +38,7 @@ import net.runelite.api.queries.EquipmentItemQuery; import net.runelite.api.queries.InventoryWidgetItemQuery; import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetItem; +import static net.runelite.client.plugins.itemcharges.ItemChargeType.FUNGICIDE_SPRAY; 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; @@ -66,7 +67,8 @@ class ItemChargeOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (!config.showTeleportCharges() && !config.showImpCharges() && !config.showWateringCanCharges() && !config.showWaterskinCharges()) + if (!config.showTeleportCharges() && !config.showFungicideCharges() && !config.showImpCharges() + && !config.showWateringCanCharges() && !config.showWaterskinCharges()) { return null; } @@ -83,6 +85,7 @@ class ItemChargeOverlay extends Overlay ItemChargeType type = chargeItem.getType(); if ((type == TELEPORT && !config.showTeleportCharges()) + || (type == FUNGICIDE_SPRAY && !config.showFungicideCharges()) || (type == IMPBOX && !config.showImpCharges()) || (type == WATERCAN && !config.showWateringCanCharges()) || (type == WATERSKIN && !config.showWaterskinCharges())) 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 4d18e5c903..224044b62d 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 { + FUNGICIDE_SPRAY, IMPBOX, TELEPORT, WATERCAN, 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 eee8e7d2d2..96b54f37e8 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 @@ -30,6 +30,7 @@ import javax.annotation.Nullable; import lombok.AllArgsConstructor; import lombok.Getter; import static net.runelite.api.ItemID.*; +import static net.runelite.client.plugins.itemcharges.ItemChargeType.FUNGICIDE_SPRAY; 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; @@ -60,6 +61,17 @@ enum ItemWithCharge ELYRE3(TELEPORT, ENCHANTED_LYRE3, 3), ELYRE4(TELEPORT, ENCHANTED_LYRE4, 4), ELYRE5(TELEPORT, ENCHANTED_LYRE5, 5), + FUNGICIDE0(FUNGICIDE_SPRAY, FUNGICIDE_SPRAY_0, 0), + FUNGICIDE1(FUNGICIDE_SPRAY, FUNGICIDE_SPRAY_1, 1), + FUNGICIDE2(FUNGICIDE_SPRAY, FUNGICIDE_SPRAY_2, 2), + FUNGICIDE3(FUNGICIDE_SPRAY, FUNGICIDE_SPRAY_3, 3), + FUNGICIDE4(FUNGICIDE_SPRAY, FUNGICIDE_SPRAY_4, 4), + FUNGICIDE5(FUNGICIDE_SPRAY, FUNGICIDE_SPRAY_5, 5), + FUNGICIDE6(FUNGICIDE_SPRAY, FUNGICIDE_SPRAY_6, 6), + FUNGICIDE7(FUNGICIDE_SPRAY, FUNGICIDE_SPRAY_7, 7), + FUNGICIDE8(FUNGICIDE_SPRAY, FUNGICIDE_SPRAY_8, 8), + FUNGICIDE9(FUNGICIDE_SPRAY, FUNGICIDE_SPRAY_9, 9), + FUNGICIDE10(FUNGICIDE_SPRAY, FUNGICIDE_SPRAY_10, 10), GAMES1(TELEPORT, GAMES_NECKLACE1, 1), GAMES2(TELEPORT, GAMES_NECKLACE2, 2), GAMES3(TELEPORT, GAMES_NECKLACE3, 3),