From 4b543d9dc2836cd9d7c5e3bbb608860e01b46414 Mon Sep 17 00:00:00 2001 From: Hydrox6 Date: Wed, 31 Jul 2019 14:58:15 +0100 Subject: [PATCH 1/2] item prices: show alch price while selecting item to alch --- .../client/plugins/itemprices/ItemPricesConfig.java | 10 ++++++++++ .../client/plugins/itemprices/ItemPricesOverlay.java | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesConfig.java index a7b62e52b3..2880d1b8f0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesConfig.java @@ -86,4 +86,14 @@ public interface ItemPricesConfig extends Config return false; } + @ConfigItem( + keyName = "showWhileAlching", + name = "Show prices while alching", + description = "Show the price overlay while using High Alchemy", + position = 6 + ) + default boolean showWhileAlching() + { + return true; + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java index b7de787305..a84a077e87 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java @@ -95,7 +95,7 @@ class ItemPricesOverlay extends Overlay switch (action) { case ITEM_USE_ON_WIDGET: - if (!menuEntry.getTarget().contains("High Level Alchemy") || !config.showAlchProfit()) + if (!config.showWhileAlching() || !menuEntry.getOption().equals("Cast") || !menuEntry.getTarget().contains("High Level Alchemy")) { break; } From effad44e17f1e0538da8472d24740f4a30eab8d7 Mon Sep 17 00:00:00 2001 From: Hydrox6 Date: Wed, 31 Jul 2019 14:58:24 +0100 Subject: [PATCH 2/2] item prices: show alch price when alching with Explorer's Ring interface --- .../src/main/java/net/runelite/api/widgets/WidgetID.java | 6 ++++++ .../main/java/net/runelite/api/widgets/WidgetInfo.java | 2 ++ .../client/plugins/itemprices/ItemPricesOverlay.java | 8 +++++++- 3 files changed, 15 insertions(+), 1 deletion(-) 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 8f008fe485..349d29721b 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 @@ -142,6 +142,7 @@ public class WidgetID public static final int SEED_BOX_GROUP_ID = 128; public static final int ITEMS_KEPT_ON_DEATH_GROUP_ID = 4; public static final int SEED_VAULT_GROUP_ID = 631; + public static final int EXPLORERS_RING_ALCH_GROUP_ID = 483; static class WorldMap { @@ -828,4 +829,9 @@ public class WidgetID static final int ITEM_CONTAINER = 15; static final int ITEM_TEXT = 16; } + + static class ExplorersRing + { + static final int INVENTORY = 7; + } } 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 a506001421..cb79dc5af9 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 @@ -118,6 +118,8 @@ public enum WidgetInfo IGNORE_TITLE(WidgetID.IGNORE_LIST_GROUP_ID, WidgetID.IgnoreList.TITLE), + EXPLORERS_RING_ALCH_INVENTORY(WidgetID.EXPLORERS_RING_ALCH_GROUP_ID, WidgetID.ExplorersRing.INVENTORY), + CLAN_CHAT_TITLE(WidgetID.CLAN_CHAT_GROUP_ID, WidgetID.ClanChat.TITLE), CLAN_CHAT_NAME(WidgetID.CLAN_CHAT_GROUP_ID, WidgetID.ClanChat.NAME), CLAN_CHAT_OWNER(WidgetID.CLAN_CHAT_GROUP_ID, WidgetID.ClanChat.OWNER), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java index a84a077e87..d98828d3b0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java @@ -52,6 +52,7 @@ class ItemPricesOverlay extends Overlay private static final int INVENTORY_ITEM_WIDGETID = WidgetInfo.INVENTORY.getPackedId(); private static final int BANK_INVENTORY_ITEM_WIDGETID = WidgetInfo.BANK_INVENTORY_ITEMS_CONTAINER.getPackedId(); private static final int BANK_ITEM_WIDGETID = WidgetInfo.BANK_ITEM_CONTAINER.getPackedId(); + private static final int EXPLORERS_RING_ITEM_WIDGETID = WidgetInfo.EXPLORERS_RING_ALCH_INVENTORY.getPackedId(); private final Client client; private final ItemPricesConfig config; @@ -109,6 +110,11 @@ class ItemPricesOverlay extends Overlay // Item tooltip values switch (groupId) { + case WidgetID.EXPLORERS_RING_ALCH_GROUP_ID: + if (!config.showWhileAlching()) + { + return null; + } case WidgetID.INVENTORY_GROUP_ID: if (config.hideInventory()) { @@ -142,7 +148,7 @@ class ItemPricesOverlay extends Overlay ItemContainer container = null; // Inventory item - if (widgetId == INVENTORY_ITEM_WIDGETID || widgetId == BANK_INVENTORY_ITEM_WIDGETID) + if (widgetId == INVENTORY_ITEM_WIDGETID || widgetId == BANK_INVENTORY_ITEM_WIDGETID || widgetId == EXPLORERS_RING_ITEM_WIDGETID) { container = client.getItemContainer(InventoryID.INVENTORY); }