From 019ed814ea41fdf9250d02c71cc42d8c91b17e1e Mon Sep 17 00:00:00 2001 From: dekvall Date: Mon, 7 Oct 2019 01:46:03 +0200 Subject: [PATCH] item identification: show identifier for placeholders and noted items --- .../ItemIdentificationOverlay.java | 14 +++++++++++--- .../ItemIdentificationPlugin.java | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationOverlay.java index 4089af6027..341cd1c306 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationOverlay.java @@ -34,6 +34,7 @@ import static net.runelite.api.widgets.WidgetID.LOOTING_BAG_GROUP_ID; import static net.runelite.api.widgets.WidgetID.SEED_BOX_GROUP_ID; import static net.runelite.api.widgets.WidgetID.KINGDOM_GROUP_ID; import net.runelite.api.widgets.WidgetItem; +import net.runelite.client.game.ItemManager; import net.runelite.client.ui.FontManager; import net.runelite.client.ui.overlay.WidgetItemOverlay; import net.runelite.client.ui.overlay.components.TextComponent; @@ -41,11 +42,13 @@ import net.runelite.client.ui.overlay.components.TextComponent; class ItemIdentificationOverlay extends WidgetItemOverlay { private final ItemIdentificationConfig config; + private final ItemManager itemManager; @Inject - ItemIdentificationOverlay(ItemIdentificationConfig config) + ItemIdentificationOverlay(ItemIdentificationConfig config, ItemManager itemManager) { this.config = config; + this.itemManager = itemManager; showOnInventory(); showOnBank(); showOnInterfaces(KEPT_ON_DEATH_GROUP_ID, GUIDE_PRICE_GROUP_ID, LOOTING_BAG_GROUP_ID, SEED_BOX_GROUP_ID, KINGDOM_GROUP_ID); @@ -54,7 +57,7 @@ class ItemIdentificationOverlay extends WidgetItemOverlay @Override public void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem itemWidget) { - ItemIdentification iden = ItemIdentification.get(itemId); + ItemIdentification iden = findItemIdentification(itemId); if (iden == null) { return; @@ -96,7 +99,6 @@ class ItemIdentificationOverlay extends WidgetItemOverlay graphics.setFont(FontManager.getRunescapeSmallFont()); renderText(graphics, itemWidget.getCanvasBounds(), iden); - } private void renderText(Graphics2D graphics, Rectangle bounds, ItemIdentification iden) @@ -115,4 +117,10 @@ class ItemIdentificationOverlay extends WidgetItemOverlay } textComponent.render(graphics); } + + private ItemIdentification findItemIdentification(final int itemID) + { + final int realItemId = itemManager.canonicalize(itemID); + return ItemIdentification.get(realItemId); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationPlugin.java index 6e4f331765..1eb4158076 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationPlugin.java @@ -61,4 +61,4 @@ public class ItemIdentificationPlugin extends Plugin { overlayManager.remove(overlay); } -} \ No newline at end of file +}