From d4bbac71a4d6c25a520e03273e07f52d3bfa2596 Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 27 Nov 2019 19:10:34 -0600 Subject: [PATCH 1/4] AgilityShortcut: update Arceuus essence agility shortcut coordinates --- .../src/main/java/net/runelite/client/game/AgilityShortcut.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/game/AgilityShortcut.java b/runelite-client/src/main/java/net/runelite/client/game/AgilityShortcut.java index 2db362fa3a..110407efc6 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/AgilityShortcut.java +++ b/runelite-client/src/main/java/net/runelite/client/game/AgilityShortcut.java @@ -175,7 +175,7 @@ public enum AgilityShortcut ELVEN_OVERPASS_MEDIUM_CLIFF(68, "Rocks", new WorldPoint(2337, 3288, 0), ROCKS_16514, ROCKS_16515), ELVEN_OVERPASS_MEDIUM_CLIFF_PRIFDDINAS(68, "Rocks", new WorldPoint(3361, 6040, 0), ROCKS_16514, ROCKS_16515), WEISS_OBSTACLES(68, "Shortcut", null, LITTLE_BOULDER, ROCKSLIDE_33184, ROCKSLIDE_33185, NULL_33327, NULL_33328, LEDGE_33190, ROCKSLIDE_33191, FALLEN_TREE_33192), - ARCEUUS_ESSENSE_NORTH(69, "Rock Climb", new WorldPoint(1761, 3873, 0), ROCKS_34741), + ARCEUUS_ESSENSE_NORTH(69, "Rock Climb", new WorldPoint(1759, 3873, 0), ROCKS_34741), TAVERLEY_DUNGEON_PIPE_BLUE_DRAGON(70, "Pipe Squeeze", new WorldPoint(2886, 9798, 0), OBSTACLE_PIPE_16509), TAVERLEY_DUNGEON_ROCKS_NORTH(70, "Rocks", new WorldPoint(2887, 9823, 0), ROCKS, ROCKS_14106), TAVERLEY_DUNGEON_ROCKS_SOUTH(70, "Rocks", new WorldPoint(2887, 9631, 0), ROCKS, ROCKS_14106), From 3254077f488e0bb36fc21b9bce6534dc7529f401 Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 2 Dec 2019 17:52:24 -0600 Subject: [PATCH 2/4] QuestStartLocation: Update The forsaken tower/roving elves quest coordinates --- .../runelite/client/plugins/worldmap/QuestStartLocation.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/QuestStartLocation.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/QuestStartLocation.java index bce9ec50c3..f2ef23c869 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/QuestStartLocation.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/QuestStartLocation.java @@ -93,7 +93,7 @@ enum QuestStartLocation FISHING_CONTEST_1(Quest.FISHING_CONTEST, new WorldPoint(2875, 3483, 0)), FISHING_CONTEST_2(Quest.FISHING_CONTEST, new WorldPoint(2820, 3487, 0)), FORGETTABLE_TALE(Quest.FORGETTABLE_TALE, new WorldPoint(2826, 10215, 0)), - THE_FORSAKEN_TOWER(Quest.THE_FORSAKEN_TOWER, new WorldPoint(1484, 3747, 0)), + THE_FORSAKEN_TOWER(Quest.THE_FORSAKEN_TOWER, new WorldPoint(1482, 3748, 0)), THE_FREMENNIK_ISLES(Quest.THE_FREMENNIK_ISLES, new WorldPoint(2645, 3711, 0)), THE_FREMENNIK_TRIALS(Quest.THE_FREMENNIK_TRIALS, new WorldPoint(2657, 3669, 0)), THE_FREMENNIK_EXILES(Quest.THE_FREMENNIK_EXILES, new WorldPoint(2658, 3669, 0)), @@ -136,7 +136,7 @@ enum QuestStartLocation THE_QUEEN_OF_THIEVES(Quest.THE_QUEEN_OF_THIEVES, new WorldPoint(1795, 3782, 0)), RAG_AND_BONE_MAN(new Quest[]{Quest.RAG_AND_BONE_MAN, Quest.RAG_AND_BONE_MAN_II}, new WorldPoint(3359, 3504, 0)), RECRUITMENT_DRIVE_BLACK_KNIGHTS_FORTRESS(new Quest[]{Quest.BLACK_KNIGHTS_FORTRESS, Quest.RECRUITMENT_DRIVE}, new WorldPoint(2959, 3336, 0)), - ROVING_ELVES(Quest.ROVING_ELVES, new WorldPoint(2289, 3146, 0)), + ROVING_ELVES(Quest.ROVING_ELVES, new WorldPoint(2288, 3146, 0)), RUM_DEAL(Quest.RUM_DEAL, new WorldPoint(3679, 3535, 0)), SCORPION_CATCHER(Quest.SCORPION_CATCHER, new WorldPoint(2701, 3399, 0)), SEA_SLUG(Quest.SEA_SLUG, new WorldPoint(2715, 3302, 0)), From 75019396655854a195e535f458731f663b832f1b Mon Sep 17 00:00:00 2001 From: Max Weber Date: Thu, 20 Feb 2020 17:22:25 -0700 Subject: [PATCH 3/4] loottracker: fix hide/show ignored items button --- .../runelite/client/plugins/loottracker/LootTrackerPanel.java | 1 + 1 file changed, 1 insertion(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java index 141f306b57..69bd47032e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java @@ -221,6 +221,7 @@ class LootTrackerPanel extends PluginPanel viewHiddenBtn.setRolloverSelectedIcon(VISIBLE_ICON_HOVER); viewHiddenBtn.setBackground(ColorScheme.DARKER_GRAY_COLOR); viewHiddenBtn.setUI(new BasicToggleButtonUI()); // substance breaks the layout and the pressed icon + viewHiddenBtn.addActionListener(e -> changeItemHiding(viewHiddenBtn.isSelected())); SwingUtil.addModalTooltip(viewHiddenBtn, "Show ignored items", "Hide ignored items"); changeItemHiding(true); viewControls.add(viewHiddenBtn); From a38f2318decf76f80256ac541253a0c065254f8d Mon Sep 17 00:00:00 2001 From: Evan Walden Date: Thu, 20 Feb 2020 19:42:57 -0500 Subject: [PATCH 4/4] item prices: show tooltips in the seed vault --- .../net/runelite/api/widgets/WidgetID.java | 1 + .../net/runelite/api/widgets/WidgetInfo.java | 1 + .../plugins/itemprices/ItemPricesOverlay.java | 18 +++++++++++++++--- 3 files changed, 17 insertions(+), 3 deletions(-) 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 541999ee7b..8cda386cd5 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 @@ -835,6 +835,7 @@ public class WidgetID static class SeedVault { + static final int INVENTORY_ITEM_CONTAINER = 1; static final int TITLE_CONTAINER = 2; static final int ITEM_CONTAINER = 15; static final int ITEM_TEXT = 16; 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 26a034a110..2e7017e15e 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 @@ -501,6 +501,7 @@ public enum WidgetInfo SEED_VAULT_TITLE_CONTAINER(WidgetID.SEED_VAULT_GROUP_ID, WidgetID.SeedVault.TITLE_CONTAINER), SEED_VAULT_ITEM_CONTAINER(WidgetID.SEED_VAULT_GROUP_ID, WidgetID.SeedVault.ITEM_CONTAINER), SEED_VAULT_ITEM_TEXT(WidgetID.SEED_VAULT_GROUP_ID, WidgetID.SeedVault.ITEM_TEXT), + SEED_VAULT_INVENTORY_ITEMS_CONTAINER(WidgetID.SEED_VAULT_INVENTORY_GROUP_ID, WidgetID.SeedVault.INVENTORY_ITEM_CONTAINER), OPTIONS_MUSIC_SLIDER(WidgetID.OPTIONS_GROUP_ID, WidgetID.Options.MUSIC_SLIDER), OPTIONS_SOUND_EFFECT_SLIDER(WidgetID.OPTIONS_GROUP_ID, WidgetID.Options.SOUND_EFFECT_SLIDER), 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 40a97330e1..b0605cb684 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 @@ -53,7 +53,9 @@ class ItemPricesOverlay extends Overlay 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 static final int SEED_VAULT_ITEM_WIDGETID = WidgetInfo.SEED_VAULT_ITEM_CONTAINER.getPackedId(); + private static final int SEED_VAULT_INVENTORY_ITEM_WIDGETID = WidgetInfo.SEED_VAULT_INVENTORY_ITEMS_CONTAINER.getPackedId(); + private final Client client; private final ItemPricesConfig config; private final TooltipManager tooltipManager; @@ -123,6 +125,8 @@ class ItemPricesOverlay extends Overlay // intentional fallthrough case WidgetID.BANK_GROUP_ID: case WidgetID.BANK_INVENTORY_GROUP_ID: + case WidgetID.SEED_VAULT_GROUP_ID: + case WidgetID.SEED_VAULT_INVENTORY_GROUP_ID: // Make tooltip final String text = makeValueTooltip(menuEntry); if (text != null) @@ -148,7 +152,10 @@ class ItemPricesOverlay extends Overlay ItemContainer container = null; // Inventory item - if (widgetId == INVENTORY_ITEM_WIDGETID || widgetId == BANK_INVENTORY_ITEM_WIDGETID || widgetId == EXPLORERS_RING_ITEM_WIDGETID) + if (widgetId == INVENTORY_ITEM_WIDGETID || + widgetId == BANK_INVENTORY_ITEM_WIDGETID || + widgetId == EXPLORERS_RING_ITEM_WIDGETID || + widgetId == SEED_VAULT_INVENTORY_ITEM_WIDGETID) { container = client.getItemContainer(InventoryID.INVENTORY); } @@ -157,7 +164,12 @@ class ItemPricesOverlay extends Overlay { container = client.getItemContainer(InventoryID.BANK); } - + // Seed vault item + else if (widgetId == SEED_VAULT_ITEM_WIDGETID) + { + container = client.getItemContainer(InventoryID.SEED_VAULT); + } + if (container == null) { return null;