From cf92765cf3f8f78ed831e30df2b29beefc68080a Mon Sep 17 00:00:00 2001 From: Lotto Date: Mon, 26 Feb 2018 15:02:17 +0100 Subject: [PATCH 1/2] Add guide prices support to InventoryWidgetItemQuery --- .../runelite/api/queries/InventoryWidgetItemQuery.java | 1 + .../src/main/java/net/runelite/api/widgets/WidgetID.java | 8 ++++++++ .../main/java/net/runelite/api/widgets/WidgetInfo.java | 3 +++ 3 files changed, 12 insertions(+) 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 8ed6dbda92..3bc9e15db9 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 @@ -42,6 +42,7 @@ public class InventoryWidgetItemQuery extends WidgetItemQuery WidgetInfo.BANK_INVENTORY_ITEMS_CONTAINER, WidgetInfo.SHOP_INVENTORY_ITEMS_CONTAINER, WidgetInfo.GRAND_EXCHANGE_INVENTORY_ITEMS_CONTAINER, + WidgetInfo.GUIDE_PRICES_INVENTORY_ITEMS_CONTAINER, WidgetInfo.INVENTORY }; diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java index 7d4dd04d34..2cde18b5d1 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java @@ -46,6 +46,8 @@ public class WidgetID public static final int PRAYER_GROUP_ID = 541; public static final int SHOP_GROUP_ID = 300; public static final int SHOP_INVENTORY_GROUP_ID = 301; + public static final int GUIDE_PRICES_GROUP_ID = 464; + public static final int GUIDE_PRICES_INVENTORY_GROUP_ID = 238; public static final int COMBAT_GROUP_ID = 593; public static final int DIALOG_NPC_GROUP_ID = 231; public static final int SLAYER_REWARDS_GROUP_ID = 426; @@ -144,6 +146,12 @@ public class WidgetID static final int INVENTORY_ITEM_CONTAINER = 0; } + static class GuidePrices + { + static final int ITEM_CONTAINER = 2; + static final int INVENTORY_ITEM_CONTAINER = 0; + } + static class Equipment { static final int HELMET = 6; diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java index 228adfd62d..4c41157b78 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java @@ -94,6 +94,9 @@ public enum WidgetInfo SHOP_ITEMS_CONTAINER(WidgetID.SHOP_GROUP_ID, WidgetID.Shop.ITEMS_CONTAINER), SHOP_INVENTORY_ITEMS_CONTAINER(WidgetID.SHOP_INVENTORY_GROUP_ID, WidgetID.Shop.INVENTORY_ITEM_CONTAINER), + GUIDE_PRICES_ITEMS_CONTAINER(WidgetID.GUIDE_PRICES_GROUP_ID, WidgetID.GuidePrices.ITEM_CONTAINER), + GUIDE_PRICES_INVENTORY_ITEMS_CONTAINER(WidgetID.GUIDE_PRICES_INVENTORY_GROUP_ID, WidgetID.GuidePrices.INVENTORY_ITEM_CONTAINER), + RUNE_POUCH_ITEM_CONTAINER(WidgetID.RUNE_POUCH_GROUP_ID, 0), MINIMAP_XP_ORB(WidgetID.MINIMAP_GROUP_ID, WidgetID.Minimap.XP_ORB), From 45a1c737fa2d340488c2a6023816cd2ef2520ef6 Mon Sep 17 00:00:00 2001 From: Lotto Date: Mon, 26 Feb 2018 15:02:34 +0100 Subject: [PATCH 2/2] Add equipment window support to InventoryWidgetItemQuery --- .../java/net/runelite/api/queries/InventoryWidgetItemQuery.java | 1 + .../src/main/java/net/runelite/api/widgets/WidgetID.java | 2 ++ .../src/main/java/net/runelite/api/widgets/WidgetInfo.java | 1 + 3 files changed, 4 insertions(+) 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 3bc9e15db9..d64fb10db6 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 @@ -43,6 +43,7 @@ public class InventoryWidgetItemQuery extends WidgetItemQuery WidgetInfo.SHOP_INVENTORY_ITEMS_CONTAINER, WidgetInfo.GRAND_EXCHANGE_INVENTORY_ITEMS_CONTAINER, WidgetInfo.GUIDE_PRICES_INVENTORY_ITEMS_CONTAINER, + WidgetInfo.EQUIPMENT_INVENTORY_ITEMS_CONTAINER, WidgetInfo.INVENTORY }; diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java index 2cde18b5d1..e8a2f15064 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java @@ -33,6 +33,7 @@ public class WidgetID public static final int DEPOSIT_BOX_GROUP_ID = 192; public static final int INVENTORY_GROUP_ID = 149; public static final int EQUIPMENT_GROUP_ID = 387; + public static final int EQUIPMENT_INVENTORY_GROUP_ID = 85; public static final int RUNE_POUCH_GROUP_ID = 190; public static final int DIARY_GROUP_ID = 259; public static final int PESTRCONTROL_GROUP_ID = 408; @@ -165,6 +166,7 @@ public class WidgetID static final int BOOTS = 14; static final int RING = 15; static final int AMMO = 16; + static final int INVENTORY_ITEM_CONTAINER = 0; } static class Cluescroll diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java index 4c41157b78..b6a0296260 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java @@ -37,6 +37,7 @@ public enum WidgetInfo QUICK_PRAYER_ORB(WidgetID.MINIMAP_GROUP_ID, WidgetID.Minimap.QUICK_PRAYER_ORB), EQUIPMENT(WidgetID.EQUIPMENT_GROUP_ID, 0), + EQUIPMENT_INVENTORY_ITEMS_CONTAINER(WidgetID.EQUIPMENT_INVENTORY_GROUP_ID, WidgetID.Equipment.INVENTORY_ITEM_CONTAINER), EQUIPMENT_HELMET(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.HELMET), EQUIPMENT_CAPE(WidgetID.EQUIPMENT_GROUP_ID, WidgetID.Equipment.CAPE),