diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index d198fe2eb6..22bd5bf227 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.7.11" + const val rlVersion = "1.7.11.1" const val openosrsVersion = "4.8.1" 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 19331ed50f..6bb87e0909 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 @@ -102,6 +102,7 @@ public class HiscoreResult private Skill gauntlet; private Skill corruptedGauntlet; private Skill theatreOfBlood; + private Skill theatreOfBloodHardMode; private Skill thermonuclearSmokeDevil; private Skill tzKalZuk; private Skill tzTokJad; @@ -260,6 +261,8 @@ public class HiscoreResult return corruptedGauntlet; case THEATRE_OF_BLOOD: return theatreOfBlood; + case THEATRE_OF_BLOOD_HARD_MODE: + return theatreOfBloodHardMode; case THERMONUCLEAR_SMOKE_DEVIL: return thermonuclearSmokeDevil; case TZKAL_ZUK: 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 56834ccf94..33e43cc465 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 @@ -123,13 +123,14 @@ class HiscoreResultBuilder hiscoreResult.setSarachnis(skills.get(index++)); hiscoreResult.setScorpia(skills.get(index++)); hiscoreResult.setSkotizo(skills.get(index++)); - if (skills.size() >= 81) - { - hiscoreResult.setTempoross(skills.get(index++)); - } + hiscoreResult.setTempoross(skills.get(index++)); hiscoreResult.setGauntlet(skills.get(index++)); hiscoreResult.setCorruptedGauntlet(skills.get(index++)); hiscoreResult.setTheatreOfBlood(skills.get(index++)); + if (skills.size() >= 82) + { + hiscoreResult.setTheatreOfBloodHardMode(skills.get(index++)); + } hiscoreResult.setThermonuclearSmokeDevil(skills.get(index++)); hiscoreResult.setTzKalZuk(skills.get(index++)); hiscoreResult.setTzTokJad(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 54820a2e8b..d005e5a28c 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 @@ -106,6 +106,7 @@ public enum HiscoreSkill THE_GAUNTLET("The Gauntlet", BOSS), THE_CORRUPTED_GAUNTLET("The Corrupted Gauntlet", BOSS), THEATRE_OF_BLOOD("Theatre of Blood", BOSS), + THEATRE_OF_BLOOD_HARD_MODE("Theatre of Blood: Hard Mode", BOSS), THERMONUCLEAR_SMOKE_DEVIL("Thermonuclear Smoke Devil", BOSS), TZKAL_ZUK("TzKal-Zuk", BOSS), TZTOK_JAD("TzTok-Jad", BOSS), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterConfig.java index 326e8652d0..e4a7c06ca9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterConfig.java @@ -121,17 +121,6 @@ public interface ChatFilterConfig extends Config return false; } - @ConfigItem( - keyName = "filterLogin", - name = "Filter Logged In/Out Messages", - description = "Filter your private chat to remove logged in/out messages", - position = 8 - ) - default boolean filterLogin() - { - return false; - } - @ConfigItem( keyName = "filterGameChat", name = "Filter Game Chat", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java index 6baaeb79a5..b5d111035a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java @@ -205,12 +205,6 @@ public class ChatFilterPlugin extends Plugin blockMessage = message == null; } break; - case LOGINLOGOUTNOTIFICATION: - if (config.filterLogin()) - { - blockMessage = true; - } - break; } boolean shouldCollapse = chatMessageType == PUBLICCHAT || chatMessageType == MODCHAT 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 784d1f5aab..64424456ee 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 @@ -107,9 +107,10 @@ public class HiscorePanel extends PluginPanel NIGHTMARE, OBOR, SARACHNIS, SCORPIA, SKOTIZO, TEMPOROSS, THE_GAUNTLET, THE_CORRUPTED_GAUNTLET, THEATRE_OF_BLOOD, - THERMONUCLEAR_SMOKE_DEVIL, TZKAL_ZUK, TZTOK_JAD, - VENENATIS, VETION, VORKATH, - WINTERTODT, ZALCANO, ZULRAH + 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/theatre_of_blood_hard_mode.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/bosses/theatre_of_blood_hard_mode.png new file mode 100644 index 0000000000..160556fc77 Binary files /dev/null and b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/bosses/theatre_of_blood_hard_mode.png differ