From fab50b17255f257358f4b2a524d7155ca28f0e50 Mon Sep 17 00:00:00 2001
From: Adam <Adam@sigterm.info>
Date: Fri, 15 Nov 2019 09:37:21 -0500
Subject: [PATCH] http api: update hiscore for leagues

Co-authored-by: Hydrox6 <ikada@protonmail.ch>
---
 .../net/runelite/http/api/hiscore/HiscoreResult.java     | 3 +++
 .../runelite/http/api/hiscore/HiscoreResultBuilder.java  | 9 ++++-----
 .../java/net/runelite/http/api/hiscore/HiscoreSkill.java | 5 +++--
 .../http/service/hiscore/HiscoreServiceTest.java         | 6 ++++--
 4 files changed, 14 insertions(+), 9 deletions(-)

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 9af6f6e4b9..57f29c2910 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
@@ -54,6 +54,7 @@ public class HiscoreResult
 	private Skill runecraft;
 	private Skill hunter;
 	private Skill construction;
+	private Skill leaguePoints;
 	private Skill bountyHunterHunter;
 	private Skill bountyHunterRogue;
 	private Skill clueScrollAll;
@@ -115,6 +116,8 @@ public class HiscoreResult
 				return getHunter();
 			case CONSTRUCTION:
 				return getConstruction();
+			case LEAGUE_POINTS:
+				return getLeaguePoints();
 			case OVERALL:
 				return getOverall();
 			case BOUNTY_HUNTER_HUNTER:
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 a6117160a4..10394b4919 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
@@ -26,8 +26,6 @@ package net.runelite.http.api.hiscore;
 
 import java.util.ArrayList;
 import java.util.List;
-import net.runelite.http.api.hiscore.HiscoreResult;
-import net.runelite.http.api.hiscore.Skill;
 
 public class HiscoreResultBuilder
 {
@@ -77,9 +75,9 @@ public class HiscoreResultBuilder
 		hiscoreResult.setRunecraft(skills.get(21));
 		hiscoreResult.setHunter(skills.get(22));
 		hiscoreResult.setConstruction(skills.get(23));
-		hiscoreResult.setBountyHunterHunter(skills.get(24));
-		hiscoreResult.setBountyHunterRogue(skills.get(25));
-		hiscoreResult.setLastManStanding(skills.get(26));
+		hiscoreResult.setLeaguePoints(skills.get(24));
+		hiscoreResult.setBountyHunterHunter(skills.get(25));
+		hiscoreResult.setBountyHunterRogue(skills.get(26));
 		hiscoreResult.setClueScrollAll(skills.get(27));
 		hiscoreResult.setClueScrollBeginner(skills.get(28));
 		hiscoreResult.setClueScrollEasy(skills.get(29));
@@ -87,6 +85,7 @@ public class HiscoreResultBuilder
 		hiscoreResult.setClueScrollHard(skills.get(31));
 		hiscoreResult.setClueScrollElite(skills.get(32));
 		hiscoreResult.setClueScrollMaster(skills.get(33));
+		hiscoreResult.setLastManStanding(skills.get(34));
 		return hiscoreResult;
 	}
 }
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 db043dfcfb..f0864a9424 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
@@ -50,16 +50,17 @@ public enum HiscoreSkill
 	RUNECRAFT("Runecraft"),
 	HUNTER("Hunter"),
 	CONSTRUCTION("Construction"),
+	LEAGUE_POINTS("League Points"),
 	BOUNTY_HUNTER_HUNTER("Bounty Hunter - Hunter"),
 	BOUNTY_HUNTER_ROGUE("Bounty Hunter - Rogue"),
-	LAST_MAN_STANDING("Last Man Standing"),
 	CLUE_SCROLL_ALL("Clue Scrolls (all)"),
 	CLUE_SCROLL_BEGINNER("Clue Scrolls (beginner)"),
 	CLUE_SCROLL_EASY("Clue Scrolls (easy)"),
 	CLUE_SCROLL_MEDIUM("Clue Scrolls (medium)"),
 	CLUE_SCROLL_HARD("Clue Scrolls (hard)"),
 	CLUE_SCROLL_ELITE("Clue Scrolls (elite)"),
-	CLUE_SCROLL_MASTER("Clue Scrolls (master)");
+	CLUE_SCROLL_MASTER("Clue Scrolls (master)"),
+	LAST_MAN_STANDING("Last Man Standing");
 
 	private final String name;
 
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 9cda0a54ed..52aa2e3d06 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
@@ -60,16 +60,17 @@ public class HiscoreServiceTest
 			+ "638177,1,0\n"
 			+ "516239,9,1000\n"
 			+ "492790,1,0\n"
+			+ "2,2460\n" // leagues
 			+ "-1,-1\n"
 			+ "73,1738\n"
-			+ "-1,-1\n"
 			+ "531,1432\n"
 			+ "324,212\n"
 			+ "8008,131\n"
 			+ "1337,911\n"
 			+ "42,14113\n"
 			+ "1,777\n"
-			+ "254,92\n";
+			+ "254,92\n"
+			+ "-1,-1\n"; // lms
 
 	private final MockWebServer server = new MockWebServer();
 
@@ -105,6 +106,7 @@ public class HiscoreServiceTest
 		Assert.assertEquals(777, result.getClueScrollElite().getLevel());
 		Assert.assertEquals(254, result.getClueScrollMaster().getRank());
 		Assert.assertEquals(-1, result.getLastManStanding().getLevel());
+		Assert.assertEquals(2460, result.getLeaguePoints().getLevel());
 	}
 
 }