ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'runelite/master'

Browse Source
This commit is contained in:
Owain van Brakel
2020-05-01 20:08:11 +02:00
parent c3a399b595 1db99628a1
commit 04188f2d82
4 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/kotlin/Dependencies.kt
View File

@@ -25,7 +25,7 @@
object ProjectVersions {
const val launcherVersion = "2.2.0"
const val rlVersion = "1.6.12"
const val rlVersion = "1.6.13"
const val openosrsVersion = "3.3.1"

15
http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreEndpoint.java
View File

@@ -26,8 +26,10 @@
package net.runelite.http.api.hiscore;
import lombok.Getter;
import okhttp3.HttpUrl;
@Getter
public enum HiscoreEndpoint
{
NORMAL("Normal", "https://services.runescape.com/m=hiscore_oldschool/index_lite.ws"),
@@ -35,7 +37,8 @@ public enum HiscoreEndpoint
HARDCORE_IRONMAN("Hardcore Ironman", "https://services.runescape.com/m=hiscore_oldschool_hardcore_ironman/index_lite.ws"),
ULTIMATE_IRONMAN("Ultimate Ironman", "https://services.runescape.com/m=hiscore_oldschool_ultimate/index_lite.ws"),
DEADMAN("Deadman", "https://services.runescape.com/m=hiscore_oldschool_deadman/index_lite.ws"),
LEAGUE("Twisted League", "https://services.runescape.com/m=hiscore_oldschool_seasonal/index_lite.ws");
LEAGUE("Twisted League", "https://services.runescape.com/m=hiscore_oldschool_seasonal/index_lite.ws"),
TOURNAMENT("Tournament", "https://services.runescape.com/m=hiscore_oldschool_tournament/index_lite.ws");
private final String name;
private final HttpUrl hiscoreURL;
@@ -45,14 +48,4 @@ public enum HiscoreEndpoint
this.name = name;
this.hiscoreURL = HttpUrl.parse(hiscoreURL);
}
public String getName()
{
return name;
}
public HttpUrl getHiscoreURL()
{
return hiscoreURL;
}
}

1
http-api/src/main/java/net/runelite/http/api/worlds/WorldType.java
View File

@@ -34,5 +34,6 @@ public enum WorldType
LAST_MAN_STANDING,
TOURNAMENT,
DEADMAN,
DEADMAN_TOURNAMENT,
LEAGUE;
}

6
runelite-api/src/main/java/net/runelite/api/WorldType.java
View File

@@ -60,6 +60,10 @@ public enum WorldType
* Tournament world type.
*/
TOURNAMENT(1 << 25),
/**
* Deadman Tournament world type.
*/
DEADMAN_TOURNAMENT(1 << 26),
/**
* Deadman world type.
*/
@@ -77,7 +81,7 @@ public enum WorldType
}
private static final EnumSet<WorldType> PVP_WORLD_TYPES = EnumSet.of(
DEADMAN,
DEADMAN, // dmmt worlds are also flaged as DEADMAN
PVP
);