From 135a0a13188e9f94a8d5ac3791ce3af1e8c140f7 Mon Sep 17 00:00:00 2001 From: Crystalknoct Date: Sat, 19 Oct 2019 23:49:31 -0600 Subject: [PATCH 1/4] itemchargeconfig: fix basketcharge config --- .../plugins/itemcharges/ItemChargeConfig.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) 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 405ecd6fa9..3d2c3d6cae 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 @@ -472,6 +472,17 @@ public interface ItemChargeConfig extends Config return true; } + @ConfigItem( + keyName = "showBasketCharges", + name = "Show Basket Quantity", + description = "Configures if the number of fruit in a basket is shown", + position = 26 + ) + default boolean showBasketCharges() + { + return true; + } + @ConfigItem( keyName = "showInfoboxes", name = "Show Infoboxes", @@ -482,4 +493,4 @@ public interface ItemChargeConfig extends Config { return false; } -} \ No newline at end of file +} From 5b8ee39b66247cea663feed7cea65b3e010caa46 Mon Sep 17 00:00:00 2001 From: Crystalknoct Date: Sat, 19 Oct 2019 23:50:27 -0600 Subject: [PATCH 2/4] itemchargeconfig: fix baskets/sack config add basket config and fix sack config --- .../runelite/client/plugins/itemcharges/ItemChargeConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3d2c3d6cae..cf9c9758d4 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 @@ -487,7 +487,7 @@ public interface ItemChargeConfig extends Config keyName = "showInfoboxes", name = "Show Infoboxes", description = "Configures whether to show an infobox equipped charge items", - position = 26 + position = 27 ) default boolean showInfoboxes() { From 100231d731a1fd79caceeb3ff0b06093e63c17dd Mon Sep 17 00:00:00 2001 From: Crystalknoct Date: Sat, 19 Oct 2019 23:51:17 -0600 Subject: [PATCH 3/4] itemchargeoverlay: add basket/fix sack add basket config and fix sack config --- .../client/plugins/itemcharges/ItemChargeOverlay.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 e307aac089..79f8510ebb 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 @@ -36,9 +36,11 @@ import static net.runelite.client.plugins.itemcharges.ItemChargeType.ABYSSAL_BRA import static net.runelite.client.plugins.itemcharges.ItemChargeType.BELLOWS; 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.SACK; 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.FRUIT_BASKET; import net.runelite.client.ui.FontManager; import net.runelite.client.ui.overlay.WidgetItemOverlay; import net.runelite.client.ui.overlay.components.TextComponent; @@ -160,6 +162,8 @@ class ItemChargeOverlay extends WidgetItemOverlay || (type == WATERCAN && !plugin.isShowWateringCanCharges()) || (type == WATERSKIN && !plugin.isShowWaterskinCharges()) || (type == BELLOWS && !plugin.isShowBellowCharges()) + || (type == FRUIT_BASKET && !plugin.isShowBasketCharges()) + || (type == SACK && !plugin.isShowSackCharges()) || (type == ABYSSAL_BRACELET && !plugin.isShowAbyssalBraceletCharges())) { return; @@ -180,7 +184,7 @@ class ItemChargeOverlay extends WidgetItemOverlay { return plugin.isShowTeleportCharges() || plugin.isShowDodgyCount() || plugin.isShowFungicideCharges() || plugin.isShowImpCharges() || plugin.isShowWateringCanCharges() || plugin.isShowWaterskinCharges() - || plugin.isShowBellowCharges() || plugin.isShowAbyssalBraceletCharges() || plugin.isShowExplorerRingCharges() + || plugin.isShowBellowCharges() || plugin.isShowBasketCharges() || plugin.isShowSackCharges() || plugin.isShowAbyssalBraceletCharges() || plugin.isShowExplorerRingCharges() || plugin.isShowRingOfForgingCount(); } -} \ No newline at end of file +} From 3c65ef82b7527a40190908b419fbc32644430167 Mon Sep 17 00:00:00 2001 From: Crystalknoct Date: Sat, 19 Oct 2019 23:52:12 -0600 Subject: [PATCH 4/4] itemchargeplugin: add basket/fix sack Add basket config and fix sack config. --- .../runelite/client/plugins/itemcharges/ItemChargePlugin.java | 1 + 1 file changed, 1 insertion(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java index fb1c26dda6..9e6f412ff9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java @@ -956,6 +956,7 @@ public class ItemChargePlugin extends Plugin this.showXericTalismanCharges = config.showXericTalismanCharges(); this.showrecoil = config.showrecoil(); this.chronicle = config.chronicle(); + this.showBasketCharges = config.showBasketCharges(); this.showSackCharges = config.showSackCharges(); } }