From 8eda75dde8df9d50f0acbcca810105e149c45796 Mon Sep 17 00:00:00 2001 From: rune3132 Date: Mon, 26 Mar 2018 04:01:33 +0200 Subject: [PATCH] Additions to Jewellery count plugin Added the enchanted lyre and showing the remaining charges of teleport items equipped in the weapon slot. --- .../client/plugins/jewellerycount/JewelleryCharges.java | 7 ++++++- .../plugins/jewellerycount/JewelleryCountOverlay.java | 3 ++- .../client/plugins/jewellerycount/JewelleryType.java | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/jewellerycount/JewelleryCharges.java b/runelite-client/src/main/java/net/runelite/client/plugins/jewellerycount/JewelleryCharges.java index a7fff97e25..bdae178f9b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/jewellerycount/JewelleryCharges.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/jewellerycount/JewelleryCharges.java @@ -123,7 +123,12 @@ public enum JewelleryCharges WSKIN1(WATERSKIN, WATERSKIN1, 1), WSKIN0(WATERSKIN, WATERSKIN0, 0), IMP_IN_A_BOX1(IMP_IN_A_BOX, IMPINABOX1, 1), - IMP_IN_A_BOX2(IMP_IN_A_BOX, IMPINABOX2, 2); + IMP_IN_A_BOX2(IMP_IN_A_BOX, IMPINABOX2, 2), + ELYRE1(ELYRE, ENCHANTED_LYRE1, 1), + ELYRE2(ELYRE, ENCHANTED_LYRE2, 2), + ELYRE3(ELYRE, ENCHANTED_LYRE3, 3), + ELYRE4(ELYRE, ENCHANTED_LYRE4, 4), + ELYRE5(ELYRE, ENCHANTED_LYRE5, 5); private final JewelleryType type; private final int id; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/jewellerycount/JewelleryCountOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/jewellerycount/JewelleryCountOverlay.java index 31056ea1b4..22e9a4f055 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/jewellerycount/JewelleryCountOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/jewellerycount/JewelleryCountOverlay.java @@ -88,7 +88,8 @@ class JewelleryCountOverlay extends Overlay Query equipmentQuery = new EquipmentItemQuery().slotEquals( WidgetInfo.EQUIPMENT_AMULET, WidgetInfo.EQUIPMENT_RING, - WidgetInfo.EQUIPMENT_GLOVES + WidgetInfo.EQUIPMENT_GLOVES, + WidgetInfo.EQUIPMENT_WEAPON ); WidgetItem[] equipmentWidgetItems = queryRunner.runQuery(equipmentQuery); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/jewellerycount/JewelleryType.java b/runelite-client/src/main/java/net/runelite/client/plugins/jewellerycount/JewelleryType.java index 1a07a7ec99..8e05da9d15 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/jewellerycount/JewelleryType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/jewellerycount/JewelleryType.java @@ -40,5 +40,6 @@ public enum JewelleryType TCRYSTAL, PHARAO, WATERSKIN, - IMP_IN_A_BOX + IMP_IN_A_BOX, + ELYRE }