diff --git a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java index d7e353df4c..6c725bab94 100644 --- a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java +++ b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java @@ -465,7 +465,7 @@ public class Hooks implements Callbacks // WidgetItemOverlays render at ABOVE_WIDGETS, reset widget item // list for next frame. - overlayManager.getItemWidgets().clear(); + overlayManager.getWidgetItems().clear(); } @Subscribe @@ -510,7 +510,7 @@ public class Hooks implements Callbacks // Empty bank item if (widgetItem.getId() != NullItemID.NULL_6512) { - overlayManager.getItemWidgets().add(widgetItem); + overlayManager.getWidgetItems().add(widgetItem); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsOverlay.java index c6fafc9466..03857e185c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsOverlay.java @@ -51,7 +51,7 @@ public class InventoryTagsOverlay extends WidgetItemOverlay } @Override - public void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem itemWidget) + public void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem widgetItem) { final String group = plugin.getTag(itemId); if (group != null) @@ -60,10 +60,10 @@ public class InventoryTagsOverlay extends WidgetItemOverlay final DisplayMode displayMode = config.getDisplayMode(); if (color != null) { - Rectangle bounds = itemWidget.getCanvasBounds(); + Rectangle bounds = widgetItem.getCanvasBounds(); if (displayMode == DisplayMode.OUTLINE) { - final BufferedImage outline = itemManager.getItemOutline(itemId, itemWidget.getQuantity(), color); + final BufferedImage outline = itemManager.getItemOutline(itemId, widgetItem.getQuantity(), color); graphics.drawImage(outline, (int) bounds.getX(), (int) bounds.getY(), null); } else diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java index fc91487230..07e213d1d2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java @@ -52,7 +52,7 @@ class ItemChargeOverlay extends WidgetItemOverlay } @Override - public void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem itemWidget) + public void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem widgetItem) { if (!displayOverlay()) { @@ -153,7 +153,7 @@ class ItemChargeOverlay extends WidgetItemOverlay charges = chargeItem.getCharges(); } - final Rectangle bounds = itemWidget.getCanvasBounds(); + final Rectangle bounds = widgetItem.getCanvasBounds(); final TextComponent textComponent = new TextComponent(); textComponent.setPosition(new Point(bounds.x - 1, bounds.y + 15)); textComponent.setText(charges < 0 ? "?" : String.valueOf(charges)); 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 8d332ac837..eaf7824ff6 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 @@ -55,7 +55,7 @@ class ItemIdentificationOverlay extends WidgetItemOverlay } @Override - public void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem itemWidget) + public void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem widgetItem) { ItemIdentification iden = findItemIdentification(itemId); if (iden == null) @@ -116,7 +116,7 @@ class ItemIdentificationOverlay extends WidgetItemOverlay } graphics.setFont(FontManager.getRunescapeSmallFont()); - renderText(graphics, itemWidget.getCanvasBounds(), iden); + renderText(graphics, widgetItem.getCanvasBounds(), iden); } private void renderText(Graphics2D graphics, Rectangle bounds, ItemIdentification iden) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java index 8b8131cb7d..255f3f9ac1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java @@ -74,7 +74,7 @@ public class RunepouchOverlay extends WidgetItemOverlay } @Override - public void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem itemWidget) + public void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem widgetItem) { if (itemId != ItemID.RUNE_POUCH && itemId != ItemID.RUNE_POUCH_L) { @@ -85,7 +85,7 @@ public class RunepouchOverlay extends WidgetItemOverlay graphics.setFont(FontManager.getRunescapeSmallFont()); - Point location = itemWidget.getCanvasLocation(); + Point location = widgetItem.getCanvasLocation(); StringBuilder tooltipBuilder = new StringBuilder(); for (int i = 0; i < AMOUNT_VARBITS.length; i++) @@ -142,7 +142,7 @@ public class RunepouchOverlay extends WidgetItemOverlay String tooltip = tooltipBuilder.toString(); if (!tooltip.isEmpty() - && itemWidget.getCanvasBounds().contains(client.getMouseCanvasPosition().getX(), client.getMouseCanvasPosition().getY()) + && widgetItem.getCanvasBounds().contains(client.getMouseCanvasPosition().getX(), client.getMouseCanvasPosition().getY()) && (config.runePouchOverlayMode() == MOUSE_HOVER || config.runePouchOverlayMode() == BOTH)) { tooltipManager.add(new Tooltip(tooltip)); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerOverlay.java index 4d70d82f53..6e5ecd72eb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerOverlay.java @@ -94,7 +94,7 @@ class SlayerOverlay extends WidgetItemOverlay } @Override - public void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem itemWidget) + public void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem widgetItem) { if (!ALL_SLAYER_ITEMS.contains(itemId)) { @@ -117,7 +117,7 @@ class SlayerOverlay extends WidgetItemOverlay graphics.setFont(FontManager.getRunescapeSmallFont()); - final Rectangle bounds = itemWidget.getCanvasBounds(); + final Rectangle bounds = widgetItem.getCanvasBounds(); final TextComponent textComponent = new TextComponent(); switch (itemId) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java index b64f845695..9bc2b57769 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java @@ -98,7 +98,7 @@ public class OverlayManager @Getter(AccessLevel.PACKAGE) private final List overlays = new ArrayList<>(); @Getter - private final List itemWidgets = new ArrayList<>(); + private final List widgetItems = new ArrayList<>(); private final Map> overlayLayers = new EnumMap<>(OverlayLayer.class); diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetItemOverlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetItemOverlay.java index 295c1d618b..5d1e404575 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetItemOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetItemOverlay.java @@ -69,15 +69,15 @@ public abstract class WidgetItemOverlay extends Overlay super.setLayer(OverlayLayer.ABOVE_WIDGETS); } - public abstract void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem itemWidget); + public abstract void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem widgetItem); @Override public Dimension render(Graphics2D graphics) { - final List itemWidgets = overlayManager.getItemWidgets(); + final List widgetItems = overlayManager.getWidgetItems(); final Rectangle originalClipBounds = graphics.getClipBounds(); Widget curClipParent = null; - for (WidgetItem widgetItem : itemWidgets) + for (WidgetItem widgetItem : widgetItems) { Widget widget = widgetItem.getWidget(); int interfaceGroup = TO_GROUP(widget.getId());