diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/jewelrycount/JewelryCharges.java b/runelite-client/src/main/java/net/runelite/client/plugins/jewelrycount/JewelryCharges.java index 327d13c350..a9f8bcbee1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/jewelrycount/JewelryCharges.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/jewelrycount/JewelryCharges.java @@ -24,54 +24,67 @@ */ package net.runelite.client.plugins.jewelrycount; -import net.runelite.api.ItemID; - import java.util.HashMap; import java.util.Map; +import static net.runelite.api.ItemID.*; +import static net.runelite.client.plugins.jewelrycount.JewelryType.*; + public enum JewelryCharges { - GLORY1(JewelryType.GLORY, ItemID.AMULET_OF_GLORY1, 1), - GLORY2(JewelryType.GLORY, ItemID.AMULET_OF_GLORY2, 2), - GLORY3(JewelryType.GLORY, ItemID.AMULET_OF_GLORY3, 3), - GLORY4(JewelryType.GLORY, ItemID.AMULET_OF_GLORY4, 4), - GLORY5(JewelryType.GLORY, ItemID.AMULET_OF_GLORY5, 5), - GLORY6(JewelryType.GLORY, ItemID.AMULET_OF_GLORY6, 6), - GLORYT1(JewelryType.GLORY, ItemID.AMULET_OF_GLORY_T1, 1), - GLORYT2(JewelryType.GLORY, ItemID.AMULET_OF_GLORY_T2, 2), - GLORYT3(JewelryType.GLORY, ItemID.AMULET_OF_GLORY_T3, 3), - GLORYT4(JewelryType.GLORY, ItemID.AMULET_OF_GLORY_T4, 4), - GLORYT5(JewelryType.GLORY, ItemID.AMULET_OF_GLORY_T5, 5), - GLORYT6(JewelryType.GLORY, ItemID.AMULET_OF_GLORY_T6, 6), - ROD1(JewelryType.ROD, ItemID.RING_OF_DUELING1, 1), - ROD2(JewelryType.ROD, ItemID.RING_OF_DUELING2, 2), - ROD3(JewelryType.ROD, ItemID.RING_OF_DUELING3, 3), - ROD4(JewelryType.ROD, ItemID.RING_OF_DUELING4, 4), - ROD5(JewelryType.ROD, ItemID.RING_OF_DUELING5, 5), - ROD6(JewelryType.ROD, ItemID.RING_OF_DUELING6, 6), - ROD7(JewelryType.ROD, ItemID.RING_OF_DUELING7, 7), - ROD8(JewelryType.ROD, ItemID.RING_OF_DUELING8, 8), - GAMES1(JewelryType.GAMES, ItemID.GAMES_NECKLACE1, 1), - GAMES2(JewelryType.GAMES, ItemID.GAMES_NECKLACE2, 2), - GAMES3(JewelryType.GAMES, ItemID.GAMES_NECKLACE3, 3), - GAMES4(JewelryType.GAMES, ItemID.GAMES_NECKLACE4, 4), - GAMES5(JewelryType.GAMES, ItemID.GAMES_NECKLACE5, 5), - GAMES6(JewelryType.GAMES, ItemID.GAMES_NECKLACE6, 6), - GAMES7(JewelryType.GAMES, ItemID.GAMES_NECKLACE7, 7), - GAMES8(JewelryType.GAMES, ItemID.GAMES_NECKLACE8, 8), - ROW1(JewelryType.ROW, ItemID.RING_OF_WEALTH_1, 1), - ROW2(JewelryType.ROW, ItemID.RING_OF_WEALTH_2, 2), - ROW3(JewelryType.ROW, ItemID.RING_OF_WEALTH_3, 3), - ROW4(JewelryType.ROW, ItemID.RING_OF_WEALTH_4, 4), - ROW5(JewelryType.ROW, ItemID.RING_OF_WEALTH_5, 5), - ROS1(JewelryType.ROS, ItemID.SLAYER_RING_1, 1), - ROS2(JewelryType.ROS, ItemID.SLAYER_RING_2, 2), - ROS3(JewelryType.ROS, ItemID.SLAYER_RING_3, 3), - ROS4(JewelryType.ROS, ItemID.SLAYER_RING_4, 4), - ROS5(JewelryType.ROS, ItemID.SLAYER_RING_5, 5), - ROS6(JewelryType.ROS, ItemID.SLAYER_RING_6, 6), - ROS7(JewelryType.ROS, ItemID.SLAYER_RING_7, 7), - ROS8(JewelryType.ROS, ItemID.SLAYER_RING_8, 8); + GLORY1(GLORY, AMULET_OF_GLORY1, 1), + GLORY2(GLORY, AMULET_OF_GLORY2, 2), + GLORY3(GLORY, AMULET_OF_GLORY3, 3), + GLORY4(GLORY, AMULET_OF_GLORY4, 4), + GLORY5(GLORY, AMULET_OF_GLORY5, 5), + GLORY6(GLORY, AMULET_OF_GLORY6, 6), + GLORYT1(GLORY, AMULET_OF_GLORY_T1, 1), + GLORYT2(GLORY, AMULET_OF_GLORY_T2, 2), + GLORYT3(GLORY, AMULET_OF_GLORY_T3, 3), + GLORYT4(GLORY, AMULET_OF_GLORY_T4, 4), + GLORYT5(GLORY, AMULET_OF_GLORY_T5, 5), + GLORYT6(GLORY, AMULET_OF_GLORY_T6, 6), + ROD1(ROD, RING_OF_DUELING1, 1), + ROD2(ROD, RING_OF_DUELING2, 2), + ROD3(ROD, RING_OF_DUELING3, 3), + ROD4(ROD, RING_OF_DUELING4, 4), + ROD5(ROD, RING_OF_DUELING5, 5), + ROD6(ROD, RING_OF_DUELING6, 6), + ROD7(ROD, RING_OF_DUELING7, 7), + ROD8(ROD, RING_OF_DUELING8, 8), + GAMES1(GAMES, GAMES_NECKLACE1, 1), + GAMES2(GAMES, GAMES_NECKLACE2, 2), + GAMES3(GAMES, GAMES_NECKLACE3, 3), + GAMES4(GAMES, GAMES_NECKLACE4, 4), + GAMES5(GAMES, GAMES_NECKLACE5, 5), + GAMES6(GAMES, GAMES_NECKLACE6, 6), + GAMES7(GAMES, GAMES_NECKLACE7, 7), + GAMES8(GAMES, GAMES_NECKLACE8, 8), + ROW1(ROW, RING_OF_WEALTH_1, 1), + ROW2(ROW, RING_OF_WEALTH_2, 2), + ROW3(ROW, RING_OF_WEALTH_3, 3), + ROW4(ROW, RING_OF_WEALTH_4, 4), + ROW5(ROW, RING_OF_WEALTH_5, 5), + ROS1(ROS, SLAYER_RING_1, 1), + ROS2(ROS, SLAYER_RING_2, 2), + ROS3(ROS, SLAYER_RING_3, 3), + ROS4(ROS, SLAYER_RING_4, 4), + ROS5(ROS, SLAYER_RING_5, 5), + ROS6(ROS, SLAYER_RING_6, 6), + ROS7(ROS, SLAYER_RING_7, 7), + ROS8(ROS, SLAYER_RING_8, 8), + SKILLS1(SKILLS, SKILLS_NECKLACE1, 1), + SKILLS2(SKILLS, SKILLS_NECKLACE2, 2), + SKILLS3(SKILLS, SKILLS_NECKLACE3, 3), + SKILLS4(SKILLS, SKILLS_NECKLACE4, 4), + SKILLS5(SKILLS, SKILLS_NECKLACE5, 5), + SKILLS6(SKILLS, SKILLS_NECKLACE6, 6), + CBRACE1(CBRACE, COMBAT_BRACELET1, 1), + CBRACE2(CBRACE, COMBAT_BRACELET2, 2), + CBRACE3(CBRACE, COMBAT_BRACELET3, 3), + CBRACE4(CBRACE, COMBAT_BRACELET4, 4), + CBRACE5(CBRACE, COMBAT_BRACELET5, 5), + CBRACE6(CBRACE, COMBAT_BRACELET6, 6); private final JewelryType type; private final int id; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/jewelrycount/JewelryCountOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/jewelrycount/JewelryCountOverlay.java index 23c9c71d21..9d05f77d96 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/jewelrycount/JewelryCountOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/jewelrycount/JewelryCountOverlay.java @@ -83,7 +83,8 @@ class JewelryCountOverlay extends Overlay Widget[] equipment = { - client.getWidget(WidgetInfo.EQUIPMENT_AMULET).getChild(1), client.getWidget(WidgetInfo.EQUIPMENT_RING).getChild(1) + client.getWidget(WidgetInfo.EQUIPMENT_AMULET).getChild(1), client.getWidget(WidgetInfo.EQUIPMENT_RING).getChild(1), + client.getWidget(WidgetInfo.EQUIPMENT_GLOVES).getChild(1) }; if (equipment == null) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/jewelrycount/JewelryType.java b/runelite-client/src/main/java/net/runelite/client/plugins/jewelrycount/JewelryType.java index fa2c3168b0..ab827a45e7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/jewelrycount/JewelryType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/jewelrycount/JewelryType.java @@ -30,5 +30,7 @@ public enum JewelryType ROD, GAMES, ROW, - ROS + ROS, + SKILLS, + CBRACE }