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

Rename various itemWidget to widgetItem to match class name

Browse Source
This commit is contained in:
Adam
2020-12-14 20:53:22 -05:00
parent 61a36f106f
commit a43a344aca
8 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runelite-client/src/main/java/net/runelite/client/callback/Hooks.java
View File

@@ -465,7 +465,7 @@ public class Hooks implements Callbacks
// WidgetItemOverlays render at ABOVE_WIDGETS, reset widget item // WidgetItemOverlays render at ABOVE_WIDGETS, reset widget item
// list for next frame. // list for next frame.
overlayManager.getItemWidgets().clear(); overlayManager.getWidgetItems().clear();
} }
@Subscribe @Subscribe
@@ -510,7 +510,7 @@ public class Hooks implements Callbacks
// Empty bank item // Empty bank item
if (widgetItem.getId() != NullItemID.NULL_6512) if (widgetItem.getId() != NullItemID.NULL_6512)
{ {
overlayManager.getItemWidgets().add(widgetItem); overlayManager.getWidgetItems().add(widgetItem);
} }
} }

6
runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsOverlay.java
View File

@@ -51,7 +51,7 @@ public class InventoryTagsOverlay extends WidgetItemOverlay
} }
@Override @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); final String group = plugin.getTag(itemId);
if (group != null) if (group != null)
@@ -60,10 +60,10 @@ public class InventoryTagsOverlay extends WidgetItemOverlay
final DisplayMode displayMode = config.getDisplayMode(); final DisplayMode displayMode = config.getDisplayMode();
if (color != null) if (color != null)
{ {
Rectangle bounds = itemWidget.getCanvasBounds(); Rectangle bounds = widgetItem.getCanvasBounds();
if (displayMode == DisplayMode.OUTLINE) 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); graphics.drawImage(outline, (int) bounds.getX(), (int) bounds.getY(), null);
} }
else else

4
runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java
View File

@@ -52,7 +52,7 @@ class ItemChargeOverlay extends WidgetItemOverlay
} }
@Override @Override
public void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem itemWidget) public void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem widgetItem)
{ {
if (!displayOverlay()) if (!displayOverlay())
{ {
@@ -153,7 +153,7 @@ class ItemChargeOverlay extends WidgetItemOverlay
charges = chargeItem.getCharges(); charges = chargeItem.getCharges();
} }
final Rectangle bounds = itemWidget.getCanvasBounds(); final Rectangle bounds = widgetItem.getCanvasBounds();
final TextComponent textComponent = new TextComponent(); final TextComponent textComponent = new TextComponent();
textComponent.setPosition(new Point(bounds.x - 1, bounds.y + 15)); textComponent.setPosition(new Point(bounds.x - 1, bounds.y + 15));
textComponent.setText(charges < 0 ? "?" : String.valueOf(charges)); textComponent.setText(charges < 0 ? "?" : String.valueOf(charges));

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

@@ -55,7 +55,7 @@ class ItemIdentificationOverlay extends WidgetItemOverlay
} }
@Override @Override
public void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem itemWidget) public void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem widgetItem)
{ {
ItemIdentification iden = findItemIdentification(itemId); ItemIdentification iden = findItemIdentification(itemId);
if (iden == null) if (iden == null)
@@ -116,7 +116,7 @@ class ItemIdentificationOverlay extends WidgetItemOverlay
} }
graphics.setFont(FontManager.getRunescapeSmallFont()); graphics.setFont(FontManager.getRunescapeSmallFont());
renderText(graphics, itemWidget.getCanvasBounds(), iden); renderText(graphics, widgetItem.getCanvasBounds(), iden);
} }
private void renderText(Graphics2D graphics, Rectangle bounds, ItemIdentification iden) private void renderText(Graphics2D graphics, Rectangle bounds, ItemIdentification iden)

6
runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java
View File

@@ -74,7 +74,7 @@ public class RunepouchOverlay extends WidgetItemOverlay
} }
@Override @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) if (itemId != ItemID.RUNE_POUCH && itemId != ItemID.RUNE_POUCH_L)
{ {
@@ -85,7 +85,7 @@ public class RunepouchOverlay extends WidgetItemOverlay
graphics.setFont(FontManager.getRunescapeSmallFont()); graphics.setFont(FontManager.getRunescapeSmallFont());
Point location = itemWidget.getCanvasLocation(); Point location = widgetItem.getCanvasLocation();
StringBuilder tooltipBuilder = new StringBuilder(); StringBuilder tooltipBuilder = new StringBuilder();
for (int i = 0; i < AMOUNT_VARBITS.length; i++) for (int i = 0; i < AMOUNT_VARBITS.length; i++)
@@ -142,7 +142,7 @@ public class RunepouchOverlay extends WidgetItemOverlay
String tooltip = tooltipBuilder.toString(); String tooltip = tooltipBuilder.toString();
if (!tooltip.isEmpty() 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)) && (config.runePouchOverlayMode() == MOUSE_HOVER || config.runePouchOverlayMode() == BOTH))
{ {
tooltipManager.add(new Tooltip(tooltip)); tooltipManager.add(new Tooltip(tooltip));

4
runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerOverlay.java
View File

@@ -94,7 +94,7 @@ class SlayerOverlay extends WidgetItemOverlay
} }
@Override @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)) if (!ALL_SLAYER_ITEMS.contains(itemId))
{ {
@@ -117,7 +117,7 @@ class SlayerOverlay extends WidgetItemOverlay
graphics.setFont(FontManager.getRunescapeSmallFont()); graphics.setFont(FontManager.getRunescapeSmallFont());
final Rectangle bounds = itemWidget.getCanvasBounds(); final Rectangle bounds = widgetItem.getCanvasBounds();
final TextComponent textComponent = new TextComponent(); final TextComponent textComponent = new TextComponent();
switch (itemId) switch (itemId)

2
runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java
View File

@@ -98,7 +98,7 @@ public class OverlayManager
@Getter(AccessLevel.PACKAGE) @Getter(AccessLevel.PACKAGE)
private final List<Overlay> overlays = new ArrayList<>(); private final List<Overlay> overlays = new ArrayList<>();
@Getter @Getter
private final List<WidgetItem> itemWidgets = new ArrayList<>(); private final List<WidgetItem> widgetItems = new ArrayList<>();
private final Map<OverlayLayer, List<Overlay>> overlayLayers = new EnumMap<>(OverlayLayer.class); private final Map<OverlayLayer, List<Overlay>> overlayLayers = new EnumMap<>(OverlayLayer.class);

6
runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetItemOverlay.java
View File

@@ -69,15 +69,15 @@ public abstract class WidgetItemOverlay extends Overlay
super.setLayer(OverlayLayer.ABOVE_WIDGETS); 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 @Override
public Dimension render(Graphics2D graphics) public Dimension render(Graphics2D graphics)
{ {
final List<WidgetItem> itemWidgets = overlayManager.getItemWidgets(); final List<WidgetItem> widgetItems = overlayManager.getWidgetItems();
final Rectangle originalClipBounds = graphics.getClipBounds(); final Rectangle originalClipBounds = graphics.getClipBounds();
Widget curClipParent = null; Widget curClipParent = null;
for (WidgetItem widgetItem : itemWidgets) for (WidgetItem widgetItem : widgetItems)
{ {
Widget widget = widgetItem.getWidget(); Widget widget = widgetItem.getWidget();
int interfaceGroup = TO_GROUP(widget.getId()); int interfaceGroup = TO_GROUP(widget.getId());