From 1892adf6cafdfe658565d986b005cd8ad78b2094 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 12 Dec 2021 21:04:55 -0500 Subject: [PATCH] hiscore: add nex --- .../runelite/http/api/hiscore/HiscoreResult.java | 3 +++ .../http/api/hiscore/HiscoreResultBuilder.java | 4 ++++ .../runelite/http/api/hiscore/HiscoreSkill.java | 1 + .../http/service/hiscore/HiscoreServiceTest.java | 4 +++- .../client/plugins/hiscore/HiscorePanel.java | 14 +++++++------- .../client/plugins/hiscore/bosses/nex.png | Bin 0 -> 585 bytes 6 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/bosses/nex.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 de52f5c5aa..af6c461562 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 @@ -93,6 +93,7 @@ public class HiscoreResult private Skill kreearra; private Skill krilTsutsaroth; private Skill mimic; + private Skill nex; private Skill nightmare; private Skill phosanisNightmare; private Skill obor; @@ -244,6 +245,8 @@ public class HiscoreResult return krilTsutsaroth; case MIMIC: return mimic; + case NEX: + return nex; case NIGHTMARE: return nightmare; case PHOSANIS_NIGHTMARE: 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 6c88ebcd18..ee8504bc8a 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 @@ -118,6 +118,10 @@ class HiscoreResultBuilder hiscoreResult.setKreearra(skills.get(index++)); hiscoreResult.setKrilTsutsaroth(skills.get(index++)); hiscoreResult.setMimic(skills.get(index++)); + if (skills.size() > 83) + { + hiscoreResult.setNex(skills.get(index++)); + } hiscoreResult.setNightmare(skills.get(index++)); hiscoreResult.setPhosanisNightmare(skills.get(index++)); hiscoreResult.setObor(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 698bd34e8e..0856e9270a 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 @@ -97,6 +97,7 @@ public enum HiscoreSkill KREEARRA("Kree'Arra", BOSS), KRIL_TSUTSAROTH("K'ril Tsutsaroth", BOSS), MIMIC("Mimic", BOSS), + NEX("Nex", BOSS), NIGHTMARE("Nightmare", BOSS), PHOSANIS_NIGHTMARE("Phosani's Nightmare", BOSS), OBOR("Obor", 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 a301e694d9..798116e7ee 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,7 +98,8 @@ public class HiscoreServiceTest + "702,6495\n" + "10170,184\n" + "8064,202\n" - + "6936,2\n" + + "6936,2\n" // Mimic + + "1,4920\n" // Nex + "2335,9\n" // Nightmare + "2336,10\n" // Phosanis Nightmare + "-1,-1\n" @@ -151,6 +152,7 @@ public class HiscoreServiceTest Assert.assertEquals(2460, result.getLeaguePoints().getLevel()); Assert.assertEquals(37, result.getAbyssalSire().getLevel()); Assert.assertEquals(92357, result.getCallisto().getRank()); + Assert.assertEquals(4920, result.getNex().getLevel()); Assert.assertEquals(2336, result.getPhosanisNightmare().getRank()); Assert.assertEquals(5678, result.getTempoross().getLevel()); Assert.assertEquals(42, result.getTheatreOfBloodHardMode().getLevel()); 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 56673629e4..b823a57f62 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,13 +105,13 @@ public class HiscorePanel extends PluginPanel GIANT_MOLE, GROTESQUE_GUARDIANS, HESPORI, KALPHITE_QUEEN, KING_BLACK_DRAGON, KRAKEN, KREEARRA, KRIL_TSUTSAROTH, MIMIC, - NIGHTMARE, PHOSANIS_NIGHTMARE, OBOR, SARACHNIS, - SCORPIA, SKOTIZO, TEMPOROSS, - THE_GAUNTLET, THE_CORRUPTED_GAUNTLET, THEATRE_OF_BLOOD, - THEATRE_OF_BLOOD_HARD_MODE, THERMONUCLEAR_SMOKE_DEVIL, TZKAL_ZUK, - TZTOK_JAD, VENENATIS, VETION, - VORKATH, WINTERTODT, ZALCANO, - ZULRAH + NEX, NIGHTMARE, PHOSANIS_NIGHTMARE, + OBOR, SARACHNIS, SCORPIA, + SKOTIZO, TEMPOROSS, THE_GAUNTLET, + THE_CORRUPTED_GAUNTLET, THEATRE_OF_BLOOD, THEATRE_OF_BLOOD_HARD_MODE, + THERMONUCLEAR_SMOKE_DEVIL, TZKAL_ZUK, TZTOK_JAD, + VENENATIS, VETION, VORKATH, + WINTERTODT, ZALCANO, ZULRAH ); private static final HiscoreEndpoint[] ENDPOINTS = { diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/bosses/nex.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/bosses/nex.png new file mode 100644 index 0000000000000000000000000000000000000000..eaaa147d0f4bb2ecba686578ed85a56723553de6 GIT binary patch literal 585 zcmV-P0=E5$P)FeMme`J~Ts&d7*S*e^W+V zg>8|CZ@EQEE9eL2zAqT}@^B`S|7H;7veN!L_ugqnb1R0d!JMQvg8b*k%9#0NP1JK~yNuwb5H! z0bvjaaQ~LbuB`NKn`Oz`RwtyQoXSh(oX8=i@BcCEg^SsTOZ~6rncp)PGvjjoM_^}r zcTdwOZu5}u2pIQxFbhTb(JsIUJe8mq%9U!`P=OkO=NHsD*A>ni zK$F1h8(>+Szqi^zhXA@jPwNjphMySG4KW7lU;W8+HpjPPb32R0&+l~kx8;oM?EarC Xzmpf%HB?FZ00000NkvXXu0mjfRDSB` literal 0 HcmV?d00001