diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java index bb11683e91..e8d1bebf7a 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java @@ -28,6 +28,8 @@ public enum WidgetInfo { INVENTORY(WidgetID.INVENTORY_GROUP_ID, 0), + EQUIPMENT(WidgetID.EQUIPMENT_GROUP_ID, 0), + EQUIPMENT_HELMET(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.HELMET), EQUIPMENT_CAPE(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.CAPE), EQUIPMENT_AMULET(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.AMULET), 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 9d05f77d96..0d34a715d8 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 @@ -81,34 +81,34 @@ class JewelryCountOverlay extends Overlay } } - Widget[] equipment = - { - client.getWidget(WidgetInfo.EQUIPMENT_AMULET).getChild(1), client.getWidget(WidgetInfo.EQUIPMENT_RING).getChild(1), - client.getWidget(WidgetInfo.EQUIPMENT_GLOVES).getChild(1) - }; + Widget equipment = client.getWidget(WidgetInfo.EQUIPMENT); - if (equipment == null) + if (equipment != null) { - return null; - } - - for (Widget widget : equipment) - { - JewelryCharges charges = JewelryCharges.getCharges(widget.getItemId()); - - if (charges == null || widget.isHidden()) + Widget[] equipmentSlots = { - continue; + client.getWidget(WidgetInfo.EQUIPMENT_AMULET).getChild(1), client.getWidget(WidgetInfo.EQUIPMENT_RING).getChild(1), + client.getWidget(WidgetInfo.EQUIPMENT_GLOVES).getChild(1) + }; + + for (Widget widget : equipmentSlots) + { + JewelryCharges charges = JewelryCharges.getCharges(widget.getItemId()); + + if (charges == null || widget.isHidden()) + { + continue; + } + + Rectangle widgetBounds = widget.getBounds(); + + //to match inventory text + widgetBounds.x -= 5; + widgetBounds.y -= 1; + + renderWidgetText(graphics, widgetBounds, charges.getCharges(), Color.white); + } - - Rectangle widgetBounds = widget.getBounds(); - - //to match inventory text - widgetBounds.x -= 5; - widgetBounds.y -= 1; - - renderWidgetText(graphics, widgetBounds, charges.getCharges(), Color.white); - } return null;