ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

item identification: show identifier for placeholders and noted items

Browse Source
This commit is contained in:
dekvall
2019-10-07 01:46:03 +02:00
committed by Tomas Slusny
parent 6c62b95561
commit 019ed814ea
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationOverlay.java
View File

@@ -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.SEED_BOX_GROUP_ID;
import static net.runelite.api.widgets.WidgetID.KINGDOM_GROUP_ID; import static net.runelite.api.widgets.WidgetID.KINGDOM_GROUP_ID;
import net.runelite.api.widgets.WidgetItem; import net.runelite.api.widgets.WidgetItem;
import net.runelite.client.game.ItemManager;
import net.runelite.client.ui.FontManager; import net.runelite.client.ui.FontManager;
import net.runelite.client.ui.overlay.WidgetItemOverlay; import net.runelite.client.ui.overlay.WidgetItemOverlay;
import net.runelite.client.ui.overlay.components.TextComponent; import net.runelite.client.ui.overlay.components.TextComponent;
@@ -41,11 +42,13 @@ import net.runelite.client.ui.overlay.components.TextComponent;
class ItemIdentificationOverlay extends WidgetItemOverlay class ItemIdentificationOverlay extends WidgetItemOverlay
{ {
private final ItemIdentificationConfig config; private final ItemIdentificationConfig config;
private final ItemManager itemManager;
@Inject @Inject
ItemIdentificationOverlay(ItemIdentificationConfig config) ItemIdentificationOverlay(ItemIdentificationConfig config, ItemManager itemManager)
{ {
this.config = config; this.config = config;
this.itemManager = itemManager;
showOnInventory(); showOnInventory();
showOnBank(); showOnBank();
showOnInterfaces(KEPT_ON_DEATH_GROUP_ID, GUIDE_PRICE_GROUP_ID, LOOTING_BAG_GROUP_ID, SEED_BOX_GROUP_ID, KINGDOM_GROUP_ID); 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 @Override
public void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem itemWidget) public void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem itemWidget)
{ {
ItemIdentification iden = ItemIdentification.get(itemId); ItemIdentification iden = findItemIdentification(itemId);
if (iden == null) if (iden == null)
{ {
return; return;
@@ -96,7 +99,6 @@ class ItemIdentificationOverlay extends WidgetItemOverlay
graphics.setFont(FontManager.getRunescapeSmallFont()); graphics.setFont(FontManager.getRunescapeSmallFont());
renderText(graphics, itemWidget.getCanvasBounds(), iden); renderText(graphics, itemWidget.getCanvasBounds(), iden);
} }
private void renderText(Graphics2D graphics, Rectangle bounds, ItemIdentification iden) private void renderText(Graphics2D graphics, Rectangle bounds, ItemIdentification iden)
@@ -115,4 +117,10 @@ class ItemIdentificationOverlay extends WidgetItemOverlay
} }
textComponent.render(graphics); textComponent.render(graphics);
} }
private ItemIdentification findItemIdentification(final int itemID)
{
final int realItemId = itemManager.canonicalize(itemID);
return ItemIdentification.get(realItemId);
}
} }

2
runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationPlugin.java
View File

@@ -61,4 +61,4 @@ public class ItemIdentificationPlugin extends Plugin
{ {
overlayManager.remove(overlay); overlayManager.remove(overlay);
} }
} }