From d0a9857aa979057b7ee1ba1874df8db62f0ae2b5 Mon Sep 17 00:00:00 2001 From: Hydrox6 Date: Fri, 12 Jun 2020 11:46:50 +0100 Subject: [PATCH 1/6] clues: update location for Castle Drakan emote clue and STASH --- .../runelite/client/plugins/cluescrolls/clues/EmoteClue.java | 2 +- .../client/plugins/cluescrolls/clues/emote/STASHUnit.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java index 5af6a45989..af60b2f282 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java @@ -164,7 +164,7 @@ public class EmoteClue extends ClueScroll implements TextClueScroll, LocationClu new EmoteClue("Wave along the south fence of the Lumber Yard. Equip a hard leather body, leather chaps and a bronze axe.", "Lumber Yard", NEAR_THE_SAWMILL_OPERATORS_BOOTH, new WorldPoint(3307, 3491, 0), WAVE, item(HARDLEATHER_BODY), item(LEATHER_CHAPS), item(BRONZE_AXE)), new EmoteClue("Wave in the Falador gem store. Equip a Mithril pickaxe, Black platebody and an Iron Kiteshield.", "Falador", NEAR_HERQUINS_SHOP_IN_FALADOR, new WorldPoint(2945, 3335, 0), WAVE, item(MITHRIL_PICKAXE), item(BLACK_PLATEBODY), item(IRON_KITESHIELD)), new EmoteClue("Wave on Mudskipper Point. Equip a black cape, leather chaps and a steel mace.", "Mudskipper Point", MUDSKIPPER_POINT, new WorldPoint(2989, 3110, 0), WAVE, item(BLACK_CAPE), item(LEATHER_CHAPS), item(STEEL_MACE)), - new EmoteClue("Wave on the northern wall of Castle Drakan. Beware of double agents! Wear a dragon sq shield, splitbark body and any boater.", "Castle Drakan", NORTHERN_WALL_OF_CASTLE_DRAKAN, new WorldPoint(3560, 3385, 0), DOUBLE_AGENT_141, WAVE, any("Dragon sq shield", item(DRAGON_SQ_SHIELD), item(DRAGON_SQ_SHIELD_G)), item(SPLITBARK_BODY), any("Any boater", item(RED_BOATER), item(ORANGE_BOATER), item(GREEN_BOATER), item(BLUE_BOATER), item(BLACK_BOATER), item(PINK_BOATER), item(PURPLE_BOATER), item(WHITE_BOATER))), + new EmoteClue("Wave on the northern wall of Castle Drakan. Beware of double agents! Wear a dragon sq shield, splitbark body and any boater.", "Castle Drakan", NORTHERN_WALL_OF_CASTLE_DRAKAN, new WorldPoint(3562, 3379, 0), DOUBLE_AGENT_141, WAVE, any("Dragon sq shield", item(DRAGON_SQ_SHIELD), item(DRAGON_SQ_SHIELD_G)), item(SPLITBARK_BODY), any("Any boater", item(RED_BOATER), item(ORANGE_BOATER), item(GREEN_BOATER), item(BLUE_BOATER), item(BLACK_BOATER), item(PINK_BOATER), item(PURPLE_BOATER), item(WHITE_BOATER))), new EmoteClue("Yawn in the 7th room of Pyramid Plunder. Beware of double agents! Equip a pharaoh sceptre and a full set of menaphite robes.", "Pyramid Plunder", _7TH_CHAMBER_OF_JALSAVRAH, new WorldPoint(1944, 4427, 0), DOUBLE_AGENT_141, YAWN, any("Pharaoh's sceptre", item(PHARAOHS_SCEPTRE), item(PHARAOHS_SCEPTRE_1), item(PHARAOHS_SCEPTRE_2), item(PHARAOHS_SCEPTRE_3), item(PHARAOHS_SCEPTRE_4), item(PHARAOHS_SCEPTRE_5), item(PHARAOHS_SCEPTRE_6), item(PHARAOHS_SCEPTRE_7), item(PHARAOHS_SCEPTRE_8)), any("Full set of menaphite robes", all(item(MENAPHITE_PURPLE_HAT), item(MENAPHITE_PURPLE_TOP), range(MENAPHITE_PURPLE_ROBE, MENAPHITE_PURPLE_KILT)), all(item(MENAPHITE_RED_HAT), item(MENAPHITE_RED_TOP), range(MENAPHITE_RED_ROBE, MENAPHITE_RED_KILT)))), new EmoteClue("Yawn in the Varrock library. Equip a green gnome robe top, HAM robe bottom and an iron warhammer.", "Varrock Castle", VARROCK_PALACE_LIBRARY, new WorldPoint(3209, 3492, 0), YAWN, item(GREEN_ROBE_TOP), item(HAM_ROBE), item(IRON_WARHAMMER)), new EmoteClue("Yawn in Draynor Marketplace. Equip studded leather chaps, an iron kiteshield and a steel longsword.", "Draynor", DRAYNOR_VILLAGE_MARKET, new WorldPoint(3083, 3253, 0), YAWN, item(STUDDED_CHAPS), item(IRON_KITESHIELD), item(STEEL_LONGSWORD)), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/STASHUnit.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/STASHUnit.java index 05874dd05b..5eca73a7c0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/STASHUnit.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/STASHUnit.java @@ -117,7 +117,7 @@ public enum STASHUnit NEAR_THE_PIER_IN_ZULANDRA(NullObjectID.NULL_29041, new WorldPoint(2203, 3059, 0)), BARROWS_CHEST(NullObjectID.NULL_29042, new WorldPoint(3547, 9690, 0)), WELL_OF_VOYAGE(NullObjectID.NULL_29043, new WorldPoint(2006, 4709, 1)), - NORTHERN_WALL_OF_CASTLE_DRAKAN(NullObjectID.NULL_29044, new WorldPoint(3559, 3385, 1)), + NORTHERN_WALL_OF_CASTLE_DRAKAN(NullObjectID.NULL_29044, new WorldPoint(3563, 3379, 0)), _7TH_CHAMBER_OF_JALSAVRAH(NullObjectID.NULL_29045, new WorldPoint(1951, 4431, 0)), SOUL_ALTAR(NullObjectID.NULL_29046, new WorldPoint(1810, 3855, 0)), WARRIORS_GUILD_BANK_29047(NullObjectID.NULL_29047, new WorldPoint(2845, 3545, 0)), From 74b0e7b27d554a5ca33a848f428dbfb70e2d00fc Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Fri, 12 Jun 2020 15:50:33 +0000 Subject: [PATCH 2/6] Release 1.6.19 --- cache-client/pom.xml | 2 +- cache-updater/pom.xml | 2 +- cache/pom.xml | 2 +- http-api/pom.xml | 2 +- http-service/pom.xml | 2 +- pom.xml | 4 ++-- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index d8378f030a..6857746bf7 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.19-SNAPSHOT + 1.6.19 cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index 83b685c4b2..127de46e3d 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.19-SNAPSHOT + 1.6.19 Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index da0113a6b4..d5a2faa41c 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.19-SNAPSHOT + 1.6.19 cache diff --git a/http-api/pom.xml b/http-api/pom.xml index 2ebd5678f7..31958b0efb 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.19-SNAPSHOT + 1.6.19 Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index d72de23680..e6b870f256 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.19-SNAPSHOT + 1.6.19 Web Service diff --git a/pom.xml b/pom.xml index e0d6bb7e88..bd4439baf1 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.19-SNAPSHOT + 1.6.19 pom RuneLite @@ -61,7 +61,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - HEAD + runelite-parent-1.6.19 diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index a38aa80369..8cc03c61bd 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.19-SNAPSHOT + 1.6.19 runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index d9742f56c9..1a276f9ce6 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.19-SNAPSHOT + 1.6.19 client diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index ccb1f5f52f..ed10da7b7b 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.19-SNAPSHOT + 1.6.19 script-assembler-plugin From 0b3abecbc8d56fe2349b52acff034fe7d51ceae6 Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Fri, 12 Jun 2020 15:50:43 +0000 Subject: [PATCH 3/6] Bump for 1.6.20-SNAPSHOT --- cache-client/pom.xml | 2 +- cache-updater/pom.xml | 2 +- cache/pom.xml | 2 +- http-api/pom.xml | 2 +- http-service/pom.xml | 2 +- pom.xml | 4 ++-- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index 6857746bf7..cfb8fd5db9 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.19 + 1.6.20-SNAPSHOT cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index 127de46e3d..f28f920a6b 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.19 + 1.6.20-SNAPSHOT Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index d5a2faa41c..0c833de61e 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.19 + 1.6.20-SNAPSHOT cache diff --git a/http-api/pom.xml b/http-api/pom.xml index 31958b0efb..fbb44449d4 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.19 + 1.6.20-SNAPSHOT Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index e6b870f256..ddfacf1bd9 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.19 + 1.6.20-SNAPSHOT Web Service diff --git a/pom.xml b/pom.xml index bd4439baf1..a1fdaa1316 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.19 + 1.6.20-SNAPSHOT pom RuneLite @@ -61,7 +61,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - runelite-parent-1.6.19 + HEAD diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index 8cc03c61bd..64a78ce80a 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.19 + 1.6.20-SNAPSHOT runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 1a276f9ce6..1af68d83f7 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.19 + 1.6.20-SNAPSHOT client diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index ed10da7b7b..df02a7d1de 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.19 + 1.6.20-SNAPSHOT script-assembler-plugin From 40452b28647cfca97c63c79ed9e7c766e784f161 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 12 Jun 2020 13:54:52 -0400 Subject: [PATCH 4/6] pom: update discord to 1.2 This is to remove the compile scoped dependency on jsr305 --- runelite-client/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 1af68d83f7..914b1410af 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -221,7 +221,7 @@ net.runelite discord - 1.1 + 1.2 net.runelite From 3d762d7ca2f5cad30009f1d48dca5093155a8fc8 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 12 Jun 2020 13:28:25 -0400 Subject: [PATCH 5/6] ge plugin: fix adding limit reset timer multiple times The code was assuming anything added to the examine text was separated with
, however the reset timer doesn't do that. --- .../grandexchange/GrandExchangePlugin.java | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java index 02972dd772..47c3ef6480 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java @@ -180,6 +180,7 @@ public class GrandExchangePlugin extends Plugin private Widget grandExchangeText; private Widget grandExchangeItem; + private String grandExchangeExamine; private int osbItem; private OSBGrandExchangeResult osbGrandExchangeResult; @@ -842,8 +843,13 @@ public class GrandExchangePlugin extends Plugin return; } - String[] lines = geText.getText().split("
"); - String text = lines[0]; // remove any limit or OSB ge values + if (geText.getText() == grandExchangeExamine) + { + // if we've already set the text, don't set it again + return; + } + + String text = geText.getText(); if (config.enableGELimits()) { @@ -866,6 +872,7 @@ public class GrandExchangePlugin extends Plugin } } + grandExchangeExamine = text; geText.setText(text); if (!config.enableOsbPrices()) @@ -876,7 +883,8 @@ public class GrandExchangePlugin extends Plugin // If we already have the result, use it if (osbGrandExchangeResult != null && osbGrandExchangeResult.getItem_id() == itemId && osbGrandExchangeResult.getOverall_average() > 0) { - geText.setText(text + OSB_GE_TEXT + QuantityFormatter.formatNumber(osbGrandExchangeResult.getOverall_average())); + grandExchangeExamine = text + OSB_GE_TEXT + QuantityFormatter.formatNumber(osbGrandExchangeResult.getOverall_average()); + geText.setText(grandExchangeExamine); } if (osbItem == itemId) @@ -895,9 +903,13 @@ public class GrandExchangePlugin extends Plugin try { final OSBGrandExchangeResult result = CLIENT.lookupItem(itemId); - osbGrandExchangeResult = result; - // Update the text on the widget too - geText.setText(start + OSB_GE_TEXT + QuantityFormatter.formatNumber(result.getOverall_average())); + if (result != null && result.getOverall_average() > 0) + { + osbGrandExchangeResult = result; + // Update the text on the widget too + grandExchangeExamine = start + OSB_GE_TEXT + QuantityFormatter.formatNumber(result.getOverall_average()); + geText.setText(grandExchangeExamine); + } } catch (IOException e) { From e5adab24ddb088b35d7e09ac5a90bbb0909129a7 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 12 Jun 2020 21:33:05 -0400 Subject: [PATCH 6/6] agility overlay: correctly use sepulchre overlay color --- .../net/runelite/client/plugins/agility/AgilityOverlay.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java index 258f06e0da..a7118cc1ab 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java @@ -145,7 +145,7 @@ class AgilityOverlay extends Overlay Set npcs = plugin.getNpcs(); if (!npcs.isEmpty() && config.highlightSepulchreNpcs()) { - Color color = config.getOverlayColor(); + Color color = config.sepulchreHighlightColor(); for (NPC npc : npcs) { NPCComposition npcComposition = npc.getComposition();