From cf2487529b869cb21720376b48fec87c6e6a3a33 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 14 Oct 2017 08:37:48 -0400 Subject: [PATCH] Set default query predicate to always true --- runelite-api/src/main/java/net/runelite/api/Query.java | 2 +- .../main/java/net/runelite/api/queries/BankItemQuery.java | 5 ++++- .../java/net/runelite/api/queries/DecorativeObjectQuery.java | 5 ++++- .../java/net/runelite/api/queries/EquipmentItemQuery.java | 5 ++++- .../main/java/net/runelite/api/queries/GameObjectQuery.java | 5 ++++- .../java/net/runelite/api/queries/GroundObjectQuery.java | 5 ++++- .../java/net/runelite/api/queries/InventoryItemQuery.java | 5 ++++- .../main/java/net/runelite/api/queries/ShopItemQuery.java | 5 ++++- .../main/java/net/runelite/api/queries/WallObjectQuery.java | 5 ++++- 9 files changed, 33 insertions(+), 9 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/Query.java b/runelite-api/src/main/java/net/runelite/api/Query.java index 08d9e0e8da..be6787e563 100644 --- a/runelite-api/src/main/java/net/runelite/api/Query.java +++ b/runelite-api/src/main/java/net/runelite/api/Query.java @@ -28,7 +28,7 @@ import java.util.function.Predicate; public abstract class Query { - protected Predicate predicate; + protected Predicate predicate = x -> true; protected Query() { 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 e60408e5c0..96ddf0f454 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 @@ -44,7 +44,10 @@ public class BankItemQuery extends WidgetItemQuery Collection widgetItems = getBankItems(client); if (widgetItems != null) { - return widgetItems.stream().filter(Objects::nonNull).filter(predicate).toArray(WidgetItem[]::new); + return widgetItems.stream() + .filter(Objects::nonNull) + .filter(predicate) + .toArray(WidgetItem[]::new); } return new WidgetItem[0]; } diff --git a/runelite-api/src/main/java/net/runelite/api/queries/DecorativeObjectQuery.java b/runelite-api/src/main/java/net/runelite/api/queries/DecorativeObjectQuery.java index e5a9f94de5..7551195759 100644 --- a/runelite-api/src/main/java/net/runelite/api/queries/DecorativeObjectQuery.java +++ b/runelite-api/src/main/java/net/runelite/api/queries/DecorativeObjectQuery.java @@ -37,7 +37,10 @@ public class DecorativeObjectQuery extends TileObjectQuery getDecorativeObjects(Client client) 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 70cf2058e4..aef2625f8a 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 @@ -70,7 +70,10 @@ public class EquipmentItemQuery extends WidgetItemQuery Collection widgetItems = getEquippedItems(client); if (widgetItems != null) { - return widgetItems.stream().filter(Objects::nonNull).filter(predicate).toArray(WidgetItem[]::new); + return widgetItems.stream() + .filter(Objects::nonNull) + .filter(predicate) + .toArray(WidgetItem[]::new); } return new WidgetItem[0]; } diff --git a/runelite-api/src/main/java/net/runelite/api/queries/GameObjectQuery.java b/runelite-api/src/main/java/net/runelite/api/queries/GameObjectQuery.java index 1937db4335..b9b80826ef 100644 --- a/runelite-api/src/main/java/net/runelite/api/queries/GameObjectQuery.java +++ b/runelite-api/src/main/java/net/runelite/api/queries/GameObjectQuery.java @@ -38,7 +38,10 @@ public class GameObjectQuery extends TileObjectQuery getGameObjects(Client client) diff --git a/runelite-api/src/main/java/net/runelite/api/queries/GroundObjectQuery.java b/runelite-api/src/main/java/net/runelite/api/queries/GroundObjectQuery.java index cfd0b1c93e..78e4198663 100644 --- a/runelite-api/src/main/java/net/runelite/api/queries/GroundObjectQuery.java +++ b/runelite-api/src/main/java/net/runelite/api/queries/GroundObjectQuery.java @@ -37,7 +37,10 @@ public class GroundObjectQuery extends TileObjectQuery getGroundObjects(Client client) diff --git a/runelite-api/src/main/java/net/runelite/api/queries/InventoryItemQuery.java b/runelite-api/src/main/java/net/runelite/api/queries/InventoryItemQuery.java index da2c80d516..52a4a087d9 100644 --- a/runelite-api/src/main/java/net/runelite/api/queries/InventoryItemQuery.java +++ b/runelite-api/src/main/java/net/runelite/api/queries/InventoryItemQuery.java @@ -49,7 +49,10 @@ public class InventoryItemQuery extends WidgetItemQuery Collection widgetItems = getInventoryItems(client); if (widgetItems != null) { - return widgetItems.stream().filter(Objects::nonNull).filter(predicate).toArray(WidgetItem[]::new); + return widgetItems.stream() + .filter(Objects::nonNull) + .filter(predicate) + .toArray(WidgetItem[]::new); } return new WidgetItem[0]; } 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 52847b268b..023e7e1716 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 @@ -42,7 +42,10 @@ public class ShopItemQuery extends WidgetItemQuery Collection widgetItems = getShopItems(client); if (widgetItems != null) { - return widgetItems.stream().filter(Objects::nonNull).filter(predicate).toArray(WidgetItem[]::new); + return widgetItems.stream() + .filter(Objects::nonNull) + .filter(predicate) + .toArray(WidgetItem[]::new); } return new WidgetItem[0]; } diff --git a/runelite-api/src/main/java/net/runelite/api/queries/WallObjectQuery.java b/runelite-api/src/main/java/net/runelite/api/queries/WallObjectQuery.java index d292b50871..0c808c716e 100644 --- a/runelite-api/src/main/java/net/runelite/api/queries/WallObjectQuery.java +++ b/runelite-api/src/main/java/net/runelite/api/queries/WallObjectQuery.java @@ -37,7 +37,10 @@ public class WallObjectQuery extends TileObjectQuery getWallObjects(Client client)