From 43e1bfedd2dd2333a38543582b6ae638af83498d Mon Sep 17 00:00:00 2001 From: Trevor Date: Wed, 12 Feb 2020 21:31:11 -0500 Subject: [PATCH 1/7] hot cold clues: add new slepe location --- .../plugins/cluescrolls/clues/hotcold/HotColdLocation.java | 1 + 1 file changed, 1 insertion(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java index f7f498ad2d..63558034db 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java @@ -135,6 +135,7 @@ public enum HotColdLocation MORYTANIA_MOS_LES_HARMLESS_BAR(new WorldPoint(3670, 2974, 0), MORYTANIA, "Near Mos Le'Harmless southern bar."), MORYTANIA_DRAGONTOOTH_NORTH(new WorldPoint(3811, 3569, 0), MORYTANIA, "Northern part of Dragontooth Island."), MORYTANIA_DRAGONTOOTH_SOUTH(new WorldPoint(3803, 3532, 0), MORYTANIA, "Southern part of Dragontooth Island."), + MORYTANIA_SLEPE_TENTS(new WorldPoint(3766, 3384, 0), MORYTANIA, "North-east of Slepe, near the tents."), NORTHEAST_OF_AL_KHARID_MINE(true, new WorldPoint(3332, 3313, 0), MISTHALIN, "Northeast of Al Kharid Mine"), WESTERN_PROVINCE_EAGLES_PEAK(new WorldPoint(2297, 3529, 0), WESTERN_PROVINCE, "North-west of Eagles' Peak."), WESTERN_PROVINCE_PISCATORIS(new WorldPoint(2334, 3685, 0), WESTERN_PROVINCE, "Piscatoris Fishing Colony"), From 976ecd8f6b3dc9806b7fceacddf97b3161bad8bb Mon Sep 17 00:00:00 2001 From: dekvall Date: Thu, 6 Feb 2020 16:43:41 +0100 Subject: [PATCH 2/7] hiscores: add nightmare boss --- .../runelite/http/api/hiscore/HiscoreResult.java | 3 +++ .../http/api/hiscore/HiscoreResultBuilder.java | 1 + .../runelite/http/api/hiscore/HiscoreSkill.java | 1 + .../http/service/hiscore/HiscoreServiceTest.java | 1 + .../client/plugins/hiscore/HiscorePanel.java | 12 ++++++------ .../client/plugins/hiscore/bosses/nightmare.png | Bin 0 -> 811 bytes 6 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/bosses/nightmare.png diff --git a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreResult.java b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreResult.java index 576b20a39f..aae95b9b83 100644 --- a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreResult.java +++ b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreResult.java @@ -92,6 +92,7 @@ public class HiscoreResult private Skill kreearra; private Skill krilTsutsaroth; private Skill mimic; + private Skill nightmare; private Skill obor; private Skill sarachnis; private Skill scorpia; @@ -237,6 +238,8 @@ public class HiscoreResult return krilTsutsaroth; case MIMIC: return mimic; + case NIGHTMARE: + return nightmare; case OBOR: return obor; case SARACHNIS: diff --git a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreResultBuilder.java b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreResultBuilder.java index 3ea03502bd..430755e7dd 100644 --- a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreResultBuilder.java +++ b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreResultBuilder.java @@ -117,6 +117,7 @@ class HiscoreResultBuilder hiscoreResult.setKreearra(skills.get(index++)); hiscoreResult.setKrilTsutsaroth(skills.get(index++)); hiscoreResult.setMimic(skills.get(index++)); + hiscoreResult.setNightmare(skills.get(index++)); hiscoreResult.setObor(skills.get(index++)); hiscoreResult.setSarachnis(skills.get(index++)); hiscoreResult.setScorpia(skills.get(index++)); diff --git a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreSkill.java b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreSkill.java index ac57522a5b..e20fafac0f 100644 --- a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreSkill.java +++ b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreSkill.java @@ -96,6 +96,7 @@ public enum HiscoreSkill KREEARRA("Kree'Arra", BOSS), KRIL_TSUTSAROTH("K'ril Tsutsaroth", BOSS), MIMIC("Mimic", BOSS), + NIGHTMARE("Nightmare", BOSS), OBOR("Obor", BOSS), SARACHNIS("Sarachnis", BOSS), SCORPIA("Scorpia", BOSS), diff --git a/http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java b/http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java index ee91740e17..d825d3047b 100644 --- a/http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java +++ b/http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java @@ -98,6 +98,7 @@ public class HiscoreServiceTest + "10170,184\n" + "8064,202\n" + "6936,2\n" + + "2335,9\n" + "-1,-1\n" + "-1,-1\n" + "19779,22\n" diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java index fa2a72f92a..4e67a0868c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java @@ -105,12 +105,12 @@ public class HiscorePanel extends PluginPanel GIANT_MOLE, GROTESQUE_GUARDIANS, HESPORI, KALPHITE_QUEEN, KING_BLACK_DRAGON, KRAKEN, KREEARRA, KRIL_TSUTSAROTH, MIMIC, - OBOR, SARACHNIS, SCORPIA, - SKOTIZO, THE_GAUNTLET, THE_CORRUPTED_GAUNTLET, - THEATRE_OF_BLOOD, THERMONUCLEAR_SMOKE_DEVIL, TZKAL_ZUK, - TZTOK_JAD, VENENATIS, VETION, - VORKATH, WINTERTODT, ZALCANO, - ZULRAH + NIGHTMARE, OBOR, SARACHNIS, + SCORPIA, SKOTIZO, THE_GAUNTLET, + THE_CORRUPTED_GAUNTLET, THEATRE_OF_BLOOD, THERMONUCLEAR_SMOKE_DEVIL, + TZKAL_ZUK, TZTOK_JAD, VENENATIS, + VETION, VORKATH, WINTERTODT, + ZALCANO, ZULRAH ); @Inject diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/bosses/nightmare.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/bosses/nightmare.png new file mode 100644 index 0000000000000000000000000000000000000000..22907bb92fa8a2b1cfe2892e74ef1e40dfdaff73 GIT binary patch literal 811 zcmV+`1JwM9P)0nT6(TMe9V8egG#VWu8X_tnA|@gx zEFvm2CMqy0E;TAOKrAvjE-o@KH9RsoKs7u=IX^}^LP|YFO+ZLdLP}IaE;U0#NJULn zMo?NvNKQ#oTuMq&Ofo!7RbEY3Voo(ZP*7G-T4Yf+KvFkAQa4FbTxV2XYE@NRRyspg zVQg1dT~}joSUg5qSz%gQVO%{)U0r2eYIa^;Wnf@uVq$7$W^QR|aA|3BYe-&fZFO#L zcW_K&aBz8Xae8ucdv#D}c6NVwcz}3#fqHs_dwYd@e1&{`hJAg9e}9RAfs2EKjf8}b zg@uoXhLDF_cZi6SiHenri=k6?a}kD8E>o05{Al$4*9m7$iGqnn$kot>$m zpsb>zucV}}rKPc_r?RT5wyPCetgN@KuDP$Ty0Njlwzj{^7;DuUar-rl4-8OF00007 zbW%=J000gwrNiOq*^O5K00C=BL_t(2Q&rOYTftBm2XIV0 zN+Oa_DMj~-f4`lx)id88&*!}F`<%VgXf-H=4#?3FS~(i6`dDQc(0Pz!X)&M0q5!(z zk3>R2wo($a+v@-*fbR40IL9$`tLKa(kYIPIV|0a z699-m7!*34&e8r}%x;Cp*Yb1>52ev)#C-oyb~|jHt>F?3_ho6gm*yy`qT1fYB^d6i z49m?^E{D|u;Z0>3jmOaH!3g_GQdZ0A9Ble?G7tc?i!jb}ZqlC3EW)~9ltFr5d*|sb z#kff7AeVquzcK@W#ua$^j4x2L=f%9qWJ=)gh@b|{&mS!5a8$&cK|h@_Ai=Gi&f)u) z$K@^;@_L(X$%F(|n57H_#^Wi~ZBk~Wb^s_4eM~03ftJr_G#ce?;Z}mMAqe3>G#ri! pE6Nt7cZ}^-z1ne^nw-Et!!J0iIfM2CWiJ2#002ovPDHLkV1kj)P|*MY literal 0 HcmV?d00001 From 20e29fd7309e52c6ed71497fa4590e55afc67540 Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Thu, 13 Feb 2020 12:32:44 +0000 Subject: [PATCH 3/7] Release 1.6.6 --- 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 ++-- protocol-api/pom.xml | 2 +- protocol/pom.xml | 2 +- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index fa4cf3dc73..261f18d03b 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.6-SNAPSHOT + 1.6.6 cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index 2312226b8d..3b6063afb5 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.6-SNAPSHOT + 1.6.6 Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index 01b80224af..774c2e138b 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.6-SNAPSHOT + 1.6.6 cache diff --git a/http-api/pom.xml b/http-api/pom.xml index 15e99bfcfa..b871122ff3 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.6-SNAPSHOT + 1.6.6 Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index cdaf89b09d..cc352be6f9 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.6-SNAPSHOT + 1.6.6 Web Service diff --git a/pom.xml b/pom.xml index 76ac38187a..93f5fe113a 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.6-SNAPSHOT + 1.6.6 pom RuneLite @@ -60,7 +60,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.6 diff --git a/protocol-api/pom.xml b/protocol-api/pom.xml index a9b3409ba5..9df030d3c8 100644 --- a/protocol-api/pom.xml +++ b/protocol-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.6-SNAPSHOT + 1.6.6 protocol-api diff --git a/protocol/pom.xml b/protocol/pom.xml index ac83929c03..c5e087207e 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.6-SNAPSHOT + 1.6.6 protocol diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index 771f6b1665..8d319e6cc9 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.6-SNAPSHOT + 1.6.6 runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index c7e38492ff..7e525c27b9 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.6-SNAPSHOT + 1.6.6 client diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index 231e04a190..35e953f2a9 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.6-SNAPSHOT + 1.6.6 script-assembler-plugin From 9d908110b87a8a9e39601f21d6ad44416470e279 Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Thu, 13 Feb 2020 12:32:53 +0000 Subject: [PATCH 4/7] Bump for 1.6.7-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 ++-- protocol-api/pom.xml | 2 +- protocol/pom.xml | 2 +- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index 261f18d03b..21c063b812 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.6 + 1.6.7-SNAPSHOT cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index 3b6063afb5..d5b0c7bceb 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.6 + 1.6.7-SNAPSHOT Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index 774c2e138b..e699f46625 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.6 + 1.6.7-SNAPSHOT cache diff --git a/http-api/pom.xml b/http-api/pom.xml index b871122ff3..beafb32aa8 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.6 + 1.6.7-SNAPSHOT Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index cc352be6f9..9367ee16c5 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.6 + 1.6.7-SNAPSHOT Web Service diff --git a/pom.xml b/pom.xml index 93f5fe113a..94bd9be594 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.6 + 1.6.7-SNAPSHOT pom RuneLite @@ -60,7 +60,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - runelite-parent-1.6.6 + HEAD diff --git a/protocol-api/pom.xml b/protocol-api/pom.xml index 9df030d3c8..3f3d3523c9 100644 --- a/protocol-api/pom.xml +++ b/protocol-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.6 + 1.6.7-SNAPSHOT protocol-api diff --git a/protocol/pom.xml b/protocol/pom.xml index c5e087207e..c145b19707 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.6 + 1.6.7-SNAPSHOT protocol diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index 8d319e6cc9..079fbd25fb 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.6 + 1.6.7-SNAPSHOT runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 7e525c27b9..6783d4de51 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.6 + 1.6.7-SNAPSHOT client diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index 35e953f2a9..7aaea29f51 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.6 + 1.6.7-SNAPSHOT script-assembler-plugin From e737d73257d8a38c7e7c5a6a102c9a7b547c7b03 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 13 Feb 2020 10:39:49 -0500 Subject: [PATCH 5/7] loottracker: prevent null events Also detect and log null events from the clue scroll reward interface --- .../client/plugins/loottracker/LootTrackerPlugin.java | 9 ++++++++- .../client/plugins/loottracker/LootTrackerRecord.java | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java index b48684ddf9..100bac6b29 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java @@ -54,6 +54,7 @@ import javax.inject.Inject; import javax.swing.SwingUtilities; import lombok.AccessLevel; import lombok.Getter; +import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; @@ -345,7 +346,7 @@ public class LootTrackerPlugin extends Plugin } } - void addLoot(String name, int combatLevel, LootRecordType type, Collection items) + void addLoot(@NonNull String name, int combatLevel, LootRecordType type, Collection items) { final LootTrackerItem[] entries = buildEntries(stack(items)); SwingUtilities.invokeLater(() -> panel.add(name, type, combatLevel, entries)); @@ -429,6 +430,12 @@ public class LootTrackerPlugin extends Plugin // Clue Scrolls use same InventoryID as Barrows event = eventType; container = client.getItemContainer(InventoryID.BARROWS_REWARD); + + if (event == null) + { + log.debug("Clue scroll reward interface with no event!"); + return; + } break; case (WidgetID.KINGDOM_GROUP_ID): event = "Kingdom of Miscellania"; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerRecord.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerRecord.java index a7f455c1f7..2887d90627 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerRecord.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerRecord.java @@ -24,12 +24,14 @@ */ package net.runelite.client.plugins.loottracker; +import lombok.NonNull; import lombok.Value; import net.runelite.http.api.loottracker.LootRecordType; @Value class LootTrackerRecord { + @NonNull private final String title; private final String subTitle; private final LootRecordType type; From 99e885cb0ae0b4f7cf5dfc60e88e68cfdd4e5d5b Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 13 Feb 2020 10:47:47 -0500 Subject: [PATCH 6/7] loottracker: fix tracking first clue opens --- .../plugins/loottracker/LootTrackerPlugin.java | 2 +- .../loottracker/LootTrackerPluginTest.java | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java index 100bac6b29..f62e2b4e79 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java @@ -112,7 +112,7 @@ import org.apache.commons.text.WordUtils; public class LootTrackerPlugin extends Plugin { // Activity/Event loot handling - private static final Pattern CLUE_SCROLL_PATTERN = Pattern.compile("You have completed [0-9]+ ([a-z]+) Treasure Trails."); + private static final Pattern CLUE_SCROLL_PATTERN = Pattern.compile("You have completed [0-9]+ ([a-z]+) Treasure Trails?\\."); private static final int THEATRE_OF_BLOOD_REGION = 12867; // Herbiboar loot handling diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/loottracker/LootTrackerPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/loottracker/LootTrackerPluginTest.java index 29a690c694..e28f122305 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/loottracker/LootTrackerPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/loottracker/LootTrackerPluginTest.java @@ -76,19 +76,29 @@ public class LootTrackerPluginTest public void setUp() { Guice.createInjector(BoundFieldModule.of(this)).injectMembers(this); + + Player player = mock(Player.class); + when(player.getWorldLocation()).thenReturn(new WorldPoint(0, 0, 0)); + when(client.getLocalPlayer()).thenReturn(player); } @Test public void testPickPocket() { - Player player = mock(Player.class); - when(player.getWorldLocation()).thenReturn(new WorldPoint(0, 0, 0)); - when(client.getLocalPlayer()).thenReturn(player); - ChatMessage chatMessage = new ChatMessage(null, ChatMessageType.SPAM, "", "You pick the hero's pocket.", "", 0); lootTrackerPlugin.onChatMessage(chatMessage); assertEquals("Hero", lootTrackerPlugin.eventType); assertEquals(LootRecordType.PICKPOCKET, lootTrackerPlugin.lootRecordType); } + + @Test + public void testFirstClue() + { + ChatMessage chatMessage = new ChatMessage(null, ChatMessageType.GAMEMESSAGE, "", "You have completed 1 master Treasure Trail.", "", 0); + lootTrackerPlugin.onChatMessage(chatMessage); + + assertEquals("Clue Scroll (Master)", lootTrackerPlugin.eventType); + assertEquals(LootRecordType.EVENT, lootTrackerPlugin.lootRecordType); + } } \ No newline at end of file From ed8a1b92ba397f404d861e225b812d744739515b Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 13 Feb 2020 17:25:46 -0500 Subject: [PATCH 7/7] pom: update maven repo link and use https --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 94bd9be594..505c997920 100644 --- a/pom.xml +++ b/pom.xml @@ -84,12 +84,12 @@ maven-central - http://repo1.maven.org/maven2 + https://repo.maven.apache.org/maven2 runelite RuneLite - http://repo.runelite.net + https://repo.runelite.net true always @@ -99,12 +99,12 @@ maven-central-plugins - http://repo1.maven.org/maven2 + https://repo.maven.apache.org/maven2 runelite-plugins RuneLite Plugins - http://repo.runelite.net + https://repo.runelite.net true always