From afa46b653842599ca2ddcf8fde9aead1eb4bfcc8 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 25 Jun 2018 20:27:06 -0400 Subject: [PATCH] queries: replace some isHidden checks with isSelfHidden The parents are known to be not hidden in these cases --- .../main/java/net/runelite/api/queries/BankItemQuery.java | 7 ++++--- .../java/net/runelite/api/queries/EquipmentItemQuery.java | 2 +- .../net/runelite/api/queries/InventoryWidgetItemQuery.java | 5 +++-- .../main/java/net/runelite/api/queries/ShopItemQuery.java | 5 +++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/queries/BankItemQuery.java b/runelite-api/src/main/java/net/runelite/api/queries/BankItemQuery.java index a4e11a3690..b0131dce32 100644 --- a/runelite-api/src/main/java/net/runelite/api/queries/BankItemQuery.java +++ b/runelite-api/src/main/java/net/runelite/api/queries/BankItemQuery.java @@ -61,15 +61,16 @@ public class BankItemQuery extends WidgetItemQuery Widget[] children = bank.getDynamicChildren(); for (int i = 0; i < children.length; i++) { - if (children[i].getItemId() == ITEM_EMPTY || children[i].isHidden()) + Widget child = children[i]; + if (child.getItemId() == ITEM_EMPTY || child.isSelfHidden()) { continue; } // set bounds to same size as default inventory - Rectangle bounds = children[i].getBounds(); + Rectangle bounds = child.getBounds(); bounds.setBounds(bounds.x - 1, bounds.y - 1, 32, 32); // Index is set to 0 because the widget's index does not correlate to the order in the bank - widgetItems.add(new WidgetItem(children[i].getItemId(), children[i].getItemQuantity(), 0, bounds)); + widgetItems.add(new WidgetItem(child.getItemId(), child.getItemQuantity(), 0, bounds)); } } return widgetItems; diff --git a/runelite-api/src/main/java/net/runelite/api/queries/EquipmentItemQuery.java b/runelite-api/src/main/java/net/runelite/api/queries/EquipmentItemQuery.java index 34e2a7dbbb..210fc1e8d0 100644 --- a/runelite-api/src/main/java/net/runelite/api/queries/EquipmentItemQuery.java +++ b/runelite-api/src/main/java/net/runelite/api/queries/EquipmentItemQuery.java @@ -89,7 +89,7 @@ public class EquipmentItemQuery extends WidgetItemQuery Widget parentWidget = client.getWidget(slot); Widget itemWidget = parentWidget.getChild(1); // Check if background icon is hidden. if hidden, item is equipped. - boolean equipped = parentWidget.getChild(2).isHidden(); + boolean equipped = parentWidget.getChild(2).isSelfHidden(); // set bounds to same size as default inventory Rectangle bounds = itemWidget.getBounds(); bounds.setBounds(bounds.x - 1, bounds.y - 1, 32, 32); diff --git a/runelite-api/src/main/java/net/runelite/api/queries/InventoryWidgetItemQuery.java b/runelite-api/src/main/java/net/runelite/api/queries/InventoryWidgetItemQuery.java index d64fb10db6..1872eeed65 100644 --- a/runelite-api/src/main/java/net/runelite/api/queries/InventoryWidgetItemQuery.java +++ b/runelite-api/src/main/java/net/runelite/api/queries/InventoryWidgetItemQuery.java @@ -81,10 +81,11 @@ public class InventoryWidgetItemQuery extends WidgetItemQuery Widget[] children = inventory.getDynamicChildren(); for (int i = 0; i < children.length; i++) { + Widget child = children[i]; // set bounds to same size as default inventory - Rectangle bounds = children[i].getBounds(); + Rectangle bounds = child.getBounds(); bounds.setBounds(bounds.x - 1, bounds.y - 1, 32, 32); - widgetItems.add(new WidgetItem(children[i].getItemId(), children[i].getItemQuantity(), i, bounds)); + widgetItems.add(new WidgetItem(child.getItemId(), child.getItemQuantity(), i, bounds)); } break; } diff --git a/runelite-api/src/main/java/net/runelite/api/queries/ShopItemQuery.java b/runelite-api/src/main/java/net/runelite/api/queries/ShopItemQuery.java index 023e7e1716..cd037f0a28 100644 --- a/runelite-api/src/main/java/net/runelite/api/queries/ShopItemQuery.java +++ b/runelite-api/src/main/java/net/runelite/api/queries/ShopItemQuery.java @@ -59,10 +59,11 @@ public class ShopItemQuery extends WidgetItemQuery Widget[] children = shop.getDynamicChildren(); for (int i = 1; i < children.length; i++) { + Widget child = children[i]; // set bounds to same size as default inventory - Rectangle bounds = children[i].getBounds(); + Rectangle bounds = child.getBounds(); bounds.setBounds(bounds.x - 1, bounds.y - 1, 32, 32); - widgetItems.add(new WidgetItem(children[i].getItemId(), children[i].getItemQuantity(), i - 1, bounds)); + widgetItems.add(new WidgetItem(child.getItemId(), child.getItemQuantity(), i - 1, bounds)); } } return widgetItems;