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 773fc4f811..405ecd6fa9 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 @@ -461,11 +461,22 @@ public interface ItemChargeConfig extends Config return true; } + @ConfigItem( + keyName = "showSackCharges", + name = "Show Sack Quantity", + description = "Configures if the number of vegetables in sacks is shown", + position = 25 + ) + default boolean showSackCharges() + { + return true; + } + @ConfigItem( keyName = "showInfoboxes", name = "Show Infoboxes", description = "Configures whether to show an infobox equipped charge items", - position = 25 + position = 26 ) default boolean showInfoboxes() { 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 6b711d5844..fdac261cef 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 @@ -953,5 +953,6 @@ public class ItemChargePlugin extends Plugin this.showXericTalismanCharges = config.showXericTalismanCharges(); this.showrecoil = config.showrecoil(); this.chronicle = config.chronicle(); + this.showSackCharges = config.showSackCharges(); } } \ No newline at end of file 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 9462588529..548a27d7b6 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 @@ -38,5 +38,6 @@ enum ItemChargeType EXPEDITIOUS_BRACELET, BINDING_NECKLACE, EXPLORER_RING, - RING_OF_FORGING + RING_OF_FORGING, + SACK } \ No newline at end of file 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 6df317f5c6..58936f0afe 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,133 +30,7 @@ import javax.annotation.Nullable; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; -import static net.runelite.api.ItemID.ABYSSAL_BRACELET1; -import static net.runelite.api.ItemID.ABYSSAL_BRACELET2; -import static net.runelite.api.ItemID.ABYSSAL_BRACELET3; -import static net.runelite.api.ItemID.ABYSSAL_BRACELET4; -import static net.runelite.api.ItemID.ABYSSAL_BRACELET5; -import static net.runelite.api.ItemID.AMULET_OF_GLORY1; -import static net.runelite.api.ItemID.AMULET_OF_GLORY2; -import static net.runelite.api.ItemID.AMULET_OF_GLORY3; -import static net.runelite.api.ItemID.AMULET_OF_GLORY4; -import static net.runelite.api.ItemID.AMULET_OF_GLORY5; -import static net.runelite.api.ItemID.AMULET_OF_GLORY6; -import static net.runelite.api.ItemID.AMULET_OF_GLORY_T1; -import static net.runelite.api.ItemID.AMULET_OF_GLORY_T2; -import static net.runelite.api.ItemID.AMULET_OF_GLORY_T3; -import static net.runelite.api.ItemID.AMULET_OF_GLORY_T4; -import static net.runelite.api.ItemID.AMULET_OF_GLORY_T5; -import static net.runelite.api.ItemID.AMULET_OF_GLORY_T6; -import static net.runelite.api.ItemID.BURNING_AMULET1; -import static net.runelite.api.ItemID.BURNING_AMULET2; -import static net.runelite.api.ItemID.BURNING_AMULET3; -import static net.runelite.api.ItemID.BURNING_AMULET4; -import static net.runelite.api.ItemID.BURNING_AMULET5; -import static net.runelite.api.ItemID.COMBAT_BRACELET1; -import static net.runelite.api.ItemID.COMBAT_BRACELET2; -import static net.runelite.api.ItemID.COMBAT_BRACELET3; -import static net.runelite.api.ItemID.COMBAT_BRACELET4; -import static net.runelite.api.ItemID.COMBAT_BRACELET5; -import static net.runelite.api.ItemID.COMBAT_BRACELET6; -import static net.runelite.api.ItemID.DIGSITE_PENDANT_1; -import static net.runelite.api.ItemID.DIGSITE_PENDANT_2; -import static net.runelite.api.ItemID.DIGSITE_PENDANT_3; -import static net.runelite.api.ItemID.DIGSITE_PENDANT_4; -import static net.runelite.api.ItemID.DIGSITE_PENDANT_5; -import static net.runelite.api.ItemID.ENCHANTED_LYRE1; -import static net.runelite.api.ItemID.ENCHANTED_LYRE2; -import static net.runelite.api.ItemID.ENCHANTED_LYRE3; -import static net.runelite.api.ItemID.ENCHANTED_LYRE4; -import static net.runelite.api.ItemID.ENCHANTED_LYRE5; -import static net.runelite.api.ItemID.FUNGICIDE_SPRAY_0; -import static net.runelite.api.ItemID.FUNGICIDE_SPRAY_1; -import static net.runelite.api.ItemID.FUNGICIDE_SPRAY_10; -import static net.runelite.api.ItemID.FUNGICIDE_SPRAY_2; -import static net.runelite.api.ItemID.FUNGICIDE_SPRAY_3; -import static net.runelite.api.ItemID.FUNGICIDE_SPRAY_4; -import static net.runelite.api.ItemID.FUNGICIDE_SPRAY_5; -import static net.runelite.api.ItemID.FUNGICIDE_SPRAY_6; -import static net.runelite.api.ItemID.FUNGICIDE_SPRAY_7; -import static net.runelite.api.ItemID.FUNGICIDE_SPRAY_8; -import static net.runelite.api.ItemID.FUNGICIDE_SPRAY_9; -import static net.runelite.api.ItemID.GAMES_NECKLACE1; -import static net.runelite.api.ItemID.GAMES_NECKLACE2; -import static net.runelite.api.ItemID.GAMES_NECKLACE3; -import static net.runelite.api.ItemID.GAMES_NECKLACE4; -import static net.runelite.api.ItemID.GAMES_NECKLACE5; -import static net.runelite.api.ItemID.GAMES_NECKLACE6; -import static net.runelite.api.ItemID.GAMES_NECKLACE7; -import static net.runelite.api.ItemID.GAMES_NECKLACE8; -import static net.runelite.api.ItemID.IMPINABOX1; -import static net.runelite.api.ItemID.IMPINABOX2; -import static net.runelite.api.ItemID.NECKLACE_OF_PASSAGE1; -import static net.runelite.api.ItemID.NECKLACE_OF_PASSAGE2; -import static net.runelite.api.ItemID.NECKLACE_OF_PASSAGE3; -import static net.runelite.api.ItemID.NECKLACE_OF_PASSAGE4; -import static net.runelite.api.ItemID.NECKLACE_OF_PASSAGE5; -import static net.runelite.api.ItemID.OGRE_BELLOWS; -import static net.runelite.api.ItemID.OGRE_BELLOWS_1; -import static net.runelite.api.ItemID.OGRE_BELLOWS_2; -import static net.runelite.api.ItemID.OGRE_BELLOWS_3; -import static net.runelite.api.ItemID.PHARAOHS_SCEPTRE_1; -import static net.runelite.api.ItemID.PHARAOHS_SCEPTRE_2; -import static net.runelite.api.ItemID.PHARAOHS_SCEPTRE_3; -import static net.runelite.api.ItemID.PHARAOHS_SCEPTRE_4; -import static net.runelite.api.ItemID.PHARAOHS_SCEPTRE_5; -import static net.runelite.api.ItemID.PHARAOHS_SCEPTRE_6; -import static net.runelite.api.ItemID.PHARAOHS_SCEPTRE_7; -import static net.runelite.api.ItemID.PHARAOHS_SCEPTRE_8; -import static net.runelite.api.ItemID.RING_OF_DUELING1; -import static net.runelite.api.ItemID.RING_OF_DUELING2; -import static net.runelite.api.ItemID.RING_OF_DUELING3; -import static net.runelite.api.ItemID.RING_OF_DUELING4; -import static net.runelite.api.ItemID.RING_OF_DUELING5; -import static net.runelite.api.ItemID.RING_OF_DUELING6; -import static net.runelite.api.ItemID.RING_OF_DUELING7; -import static net.runelite.api.ItemID.RING_OF_DUELING8; -import static net.runelite.api.ItemID.RING_OF_RETURNING1; -import static net.runelite.api.ItemID.RING_OF_RETURNING2; -import static net.runelite.api.ItemID.RING_OF_RETURNING3; -import static net.runelite.api.ItemID.RING_OF_RETURNING4; -import static net.runelite.api.ItemID.RING_OF_RETURNING5; -import static net.runelite.api.ItemID.RING_OF_WEALTH_1; -import static net.runelite.api.ItemID.RING_OF_WEALTH_2; -import static net.runelite.api.ItemID.RING_OF_WEALTH_3; -import static net.runelite.api.ItemID.RING_OF_WEALTH_4; -import static net.runelite.api.ItemID.RING_OF_WEALTH_5; -import static net.runelite.api.ItemID.SKILLS_NECKLACE1; -import static net.runelite.api.ItemID.SKILLS_NECKLACE2; -import static net.runelite.api.ItemID.SKILLS_NECKLACE3; -import static net.runelite.api.ItemID.SKILLS_NECKLACE4; -import static net.runelite.api.ItemID.SKILLS_NECKLACE5; -import static net.runelite.api.ItemID.SKILLS_NECKLACE6; -import static net.runelite.api.ItemID.SLAYER_RING_1; -import static net.runelite.api.ItemID.SLAYER_RING_2; -import static net.runelite.api.ItemID.SLAYER_RING_3; -import static net.runelite.api.ItemID.SLAYER_RING_4; -import static net.runelite.api.ItemID.SLAYER_RING_5; -import static net.runelite.api.ItemID.SLAYER_RING_6; -import static net.runelite.api.ItemID.SLAYER_RING_7; -import static net.runelite.api.ItemID.SLAYER_RING_8; -import static net.runelite.api.ItemID.TELEPORT_CRYSTAL_1; -import static net.runelite.api.ItemID.TELEPORT_CRYSTAL_2; -import static net.runelite.api.ItemID.TELEPORT_CRYSTAL_3; -import static net.runelite.api.ItemID.TELEPORT_CRYSTAL_4; -import static net.runelite.api.ItemID.TELEPORT_CRYSTAL_5; -import static net.runelite.api.ItemID.WATERING_CAN; -import static net.runelite.api.ItemID.WATERING_CAN1; -import static net.runelite.api.ItemID.WATERING_CAN2; -import static net.runelite.api.ItemID.WATERING_CAN3; -import static net.runelite.api.ItemID.WATERING_CAN4; -import static net.runelite.api.ItemID.WATERING_CAN5; -import static net.runelite.api.ItemID.WATERING_CAN6; -import static net.runelite.api.ItemID.WATERING_CAN7; -import static net.runelite.api.ItemID.WATERING_CAN8; -import static net.runelite.api.ItemID.WATERSKIN0; -import static net.runelite.api.ItemID.WATERSKIN1; -import static net.runelite.api.ItemID.WATERSKIN2; -import static net.runelite.api.ItemID.WATERSKIN3; -import static net.runelite.api.ItemID.WATERSKIN4; +import static net.runelite.api.ItemID.*; import static net.runelite.client.plugins.itemcharges.ItemChargeType.ABYSSAL_BRACELET; import static net.runelite.client.plugins.itemcharges.ItemChargeType.BELLOWS; import static net.runelite.client.plugins.itemcharges.ItemChargeType.FUNGICIDE_SPRAY; @@ -164,6 +38,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.SACK; @AllArgsConstructor @Getter(AccessLevel.PACKAGE) @@ -295,7 +170,38 @@ enum ItemWithCharge WSKIN1(WATERSKIN, WATERSKIN1, 1), WSKIN2(WATERSKIN, WATERSKIN2, 2), WSKIN3(WATERSKIN, WATERSKIN3, 3), - WSKIN4(WATERSKIN, WATERSKIN4, 4); + WSKIN4(WATERSKIN, WATERSKIN4, 4), + EMPTYSACK(SACK, EMPTY_SACK, 0), + POTAT1(SACK, POTATOES1, 1), + POTAT2(SACK, POTATOES2, 2), + POTAT3(SACK, POTATOES3, 3), + POTAT4(SACK, POTATOES4, 4), + POTAT5(SACK, POTATOES5, 5), + POTAT6(SACK, POTATOES6, 6), + POTAT7(SACK, POTATOES7, 7), + POTAT8(SACK, POTATOES8, 8), + POTAT9(SACK, POTATOES9, 9), + POTAT10(SACK, POTATOES10, 10), + CABAG1(SACK, CABBAGES1, 1), + CABAG2(SACK, CABBAGES2, 2), + CABAG3(SACK, CABBAGES3, 3), + CABAG4(SACK, CABBAGES4, 4), + CABAG5(SACK, CABBAGES5, 5), + CABAG6(SACK, CABBAGES6, 6), + CABAG7(SACK, CABBAGES7, 7), + CABAG8(SACK, CABBAGES8, 8), + CABAG9(SACK, CABBAGES9, 9), + CABAG10(SACK, CABBAGES10, 10), + ONIO1(SACK, ONIONS1, 1), + ONIO2(SACK, ONIONS2, 2), + ONIO3(SACK, ONIONS3, 3), + ONIO4(SACK, ONIONS4, 4), + ONIO5(SACK, ONIONS5, 5), + ONIO6(SACK, ONIONS6, 6), + ONIO7(SACK, ONIONS7, 7), + ONIO8(SACK, ONIONS8, 8), + ONIO9(SACK, ONIONS9, 9), + ONIO10(SACK, ONIONS10, 10); private final ItemChargeType type; private final int id;