diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 4e0e8fb180..2f3b082f48 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -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" diff --git a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreEndpoint.java b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreEndpoint.java index 8e5a97dfb3..106c5f0ad8 100644 --- a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreEndpoint.java +++ b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreEndpoint.java @@ -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; - } } diff --git a/http-api/src/main/java/net/runelite/http/api/worlds/WorldType.java b/http-api/src/main/java/net/runelite/http/api/worlds/WorldType.java index af543b7383..9e6ae694e3 100644 --- a/http-api/src/main/java/net/runelite/http/api/worlds/WorldType.java +++ b/http-api/src/main/java/net/runelite/http/api/worlds/WorldType.java @@ -34,5 +34,6 @@ public enum WorldType LAST_MAN_STANDING, TOURNAMENT, DEADMAN, + DEADMAN_TOURNAMENT, LEAGUE; } diff --git a/runelite-api/src/main/java/net/runelite/api/WorldType.java b/runelite-api/src/main/java/net/runelite/api/WorldType.java index bb895ad504..74caa635b6 100644 --- a/runelite-api/src/main/java/net/runelite/api/WorldType.java +++ b/runelite-api/src/main/java/net/runelite/api/WorldType.java @@ -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 PVP_WORLD_TYPES = EnumSet.of( - DEADMAN, + DEADMAN, // dmmt worlds are also flaged as DEADMAN PVP );