From 719022c044b852666b0a1e97b9839e5cb2c69fb5 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 25 Aug 2021 08:06:40 -0400 Subject: [PATCH] Update world types for seasonal deadman --- .../runelite/http/api/worlds/WorldType.java | 6 +++--- .../http/service/worlds/ServiceWorldType.java | 6 +++--- .../main/java/net/runelite/api/WorldType.java | 19 ++++++++----------- .../client/config/RuneScapeProfileType.java | 4 ++-- .../chatcommands/ChatCommandsPlugin.java | 10 +++++----- .../grandexchange/GrandExchangePlugin.java | 4 ++-- .../client/plugins/hiscore/HiscorePlugin.java | 6 +----- .../opponentinfo/OpponentInfoPlugin.java | 6 +----- .../plugins/worldhopper/WorldTableRow.java | 8 ++++---- .../client/plugins/xptracker/XpInfoBox.java | 3 +-- .../client/plugins/xptracker/XpPanel.java | 9 +++------ .../client/plugins/xptracker/XpWorldType.java | 4 +--- .../plugins/xpupdater/XpUpdaterPlugin.java | 12 ++++++------ 13 files changed, 40 insertions(+), 57 deletions(-) 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 9e6ae694e3..20639b5f3c 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 @@ -32,8 +32,8 @@ public enum WorldType SKILL_TOTAL, HIGH_RISK, LAST_MAN_STANDING, - TOURNAMENT, + NOSAVE_MODE, DEADMAN, - DEADMAN_TOURNAMENT, - LEAGUE; + TOURNAMENT, + SEASONAL; } diff --git a/http-service/src/main/java/net/runelite/http/service/worlds/ServiceWorldType.java b/http-service/src/main/java/net/runelite/http/service/worlds/ServiceWorldType.java index d0a7b62103..642cd0440a 100644 --- a/http-service/src/main/java/net/runelite/http/service/worlds/ServiceWorldType.java +++ b/http-service/src/main/java/net/runelite/http/service/worlds/ServiceWorldType.java @@ -34,10 +34,10 @@ enum ServiceWorldType SKILL_TOTAL(WorldType.SKILL_TOTAL, 1 << 7), HIGH_RISK(WorldType.HIGH_RISK, 1 << 10), LAST_MAN_STANDING(WorldType.LAST_MAN_STANDING, 1 << 14), - TOURNAMENT(WorldType.TOURNAMENT, 1 << 25), - DEADMAN_TOURNAMENT(WorldType.DEADMAN_TOURNAMENT, 1 << 26), + NOSAVE_MODE(WorldType.NOSAVE_MODE, 1 << 25), + TOURNAMENT(WorldType.TOURNAMENT, 1 << 26), DEADMAN(WorldType.DEADMAN, 1 << 29), - LEAGUE(WorldType.LEAGUE, 1 << 30); + SEASONAL(WorldType.SEASONAL, 1 << 30); private final WorldType apiType; private final int mask; 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 2bd54cf0ed..27162fab2d 100644 --- a/runelite-api/src/main/java/net/runelite/api/WorldType.java +++ b/runelite-api/src/main/java/net/runelite/api/WorldType.java @@ -26,10 +26,12 @@ package net.runelite.api; import java.util.Collection; import java.util.EnumSet; +import lombok.AllArgsConstructor; /** * An enumeration of possible world types. */ +@AllArgsConstructor public enum WorldType { /** @@ -57,29 +59,24 @@ public enum WorldType */ LAST_MAN_STANDING(1 << 14), /** - * Tournament world type. + * Beta worlds without profiles that are saved. */ - TOURNAMENT(1 << 25), + NOSAVE_MODE(1 << 25), /** - * Deadman Tournament world type. + * Tournament world type */ - DEADMAN_TOURNAMENT(1 << 26), + TOURNAMENT_WORLD(1 << 26), /** * Deadman world type. */ DEADMAN(1 << 29), /** - * League world type + * Seasonal world type for leagues and seasonal deadman. */ - LEAGUE(1 << 30); + SEASONAL(1 << 30); private final int mask; - WorldType(int mask) - { - this.mask = mask; - } - private static final EnumSet PVP_WORLD_TYPES = EnumSet.of( DEADMAN, // dmmt worlds are also flaged as DEADMAN PVP diff --git a/runelite-client/src/main/java/net/runelite/client/config/RuneScapeProfileType.java b/runelite-client/src/main/java/net/runelite/client/config/RuneScapeProfileType.java index d82fc13f69..8eba74cd4d 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/RuneScapeProfileType.java +++ b/runelite-client/src/main/java/net/runelite/client/config/RuneScapeProfileType.java @@ -35,10 +35,10 @@ import net.runelite.api.WorldType; public enum RuneScapeProfileType { STANDARD(client -> true), - BETA(client -> client.getWorldType().contains(WorldType.TOURNAMENT)), + BETA(client -> client.getWorldType().contains(WorldType.NOSAVE_MODE)), DEADMAN(client -> client.getWorldType().contains(WorldType.DEADMAN)), TRAILBLAZER_LEAGUE, - DEADMAN_REBORN(client -> client.getWorldType().contains(WorldType.DEADMAN_TOURNAMENT)) + DEADMAN_REBORN(client -> client.getWorldType().contains(WorldType.SEASONAL)) ; private final Predicate test; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java index 01b29fe814..9168c8f150 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java @@ -1738,12 +1738,12 @@ public class ChatCommandsPlugin extends Plugin return new HiscoreLookup(localPlayer.getName(), hiscoreEndpoint); } - // Public chat on a leagues world is always league hiscores, regardless of icon if (chatMessage.getType() == ChatMessageType.PUBLICCHAT || chatMessage.getType() == ChatMessageType.MODCHAT) { - if (client.getWorldType().contains(WorldType.LEAGUE)) + // Public chat on a seasonal world is always seasonal or tournament hiscores, regardless of icon + if (client.getWorldType().contains(WorldType.SEASONAL)) { - return new HiscoreLookup(player, HiscoreEndpoint.LEAGUE); + return new HiscoreLookup(player, HiscoreEndpoint.TOURNAMENT); } } @@ -1789,9 +1789,9 @@ public class ChatCommandsPlugin extends Plugin private HiscoreEndpoint getLocalHiscoreEndpointType() { EnumSet worldType = client.getWorldType(); - if (worldType.contains(WorldType.LEAGUE)) + if (worldType.contains(WorldType.SEASONAL)) { - return HiscoreEndpoint.LEAGUE; + return HiscoreEndpoint.TOURNAMENT; } return toEndPoint(client.getAccountType()); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java index 53f3276b12..a8dd17da60 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java @@ -479,9 +479,9 @@ public class GrandExchangePlugin extends Plugin private WorldType getGeWorldType() { EnumSet worldTypes = client.getWorldType(); - if (worldTypes.contains(net.runelite.api.WorldType.DEADMAN_TOURNAMENT)) + if (worldTypes.contains(net.runelite.api.WorldType.SEASONAL)) { - return WorldType.DEADMAN_TOURNAMENT; + return WorldType.SEASONAL; } else if (worldTypes.contains(net.runelite.api.WorldType.DEADMAN)) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java index 7f1f65606e..37f298c4ab 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java @@ -265,7 +265,7 @@ public class HiscorePlugin extends Plugin { EnumSet wTypes = client.getWorldType(); - if (wTypes.contains(WorldType.DEADMAN_TOURNAMENT)) + if (wTypes.contains(WorldType.SEASONAL)) { return HiscoreEndpoint.TOURNAMENT; } @@ -273,10 +273,6 @@ public class HiscorePlugin extends Plugin { return HiscoreEndpoint.DEADMAN; } - else if (wTypes.contains(WorldType.LEAGUE)) - { - return HiscoreEndpoint.LEAGUE; - } } return HiscoreEndpoint.NORMAL; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java index 65fcf0af05..4d58b924d1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java @@ -116,7 +116,7 @@ public class OpponentInfoPlugin extends Plugin } final EnumSet worldType = client.getWorldType(); - if (worldType.contains(WorldType.DEADMAN_TOURNAMENT)) + if (worldType.contains(WorldType.SEASONAL)) { hiscoreEndpoint = HiscoreEndpoint.TOURNAMENT; } @@ -124,10 +124,6 @@ public class OpponentInfoPlugin extends Plugin { hiscoreEndpoint = HiscoreEndpoint.DEADMAN; } - else if (worldType.contains(WorldType.LEAGUE)) - { - hiscoreEndpoint = HiscoreEndpoint.LEAGUE; - } else { hiscoreEndpoint = HiscoreEndpoint.NORMAL; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java index fc46f386da..6c9a6b9ef2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java @@ -62,7 +62,7 @@ class WorldTableRow extends JPanel private static final Color TOURNAMENT_WORLD = new Color(79, 145, 255); private static final Color MEMBERS_WORLD = new Color(210, 193, 53); private static final Color FREE_WORLD = new Color(200, 200, 200); - private static final Color LEAGUE_WORLD = new Color(133, 177, 178); + private static final Color SEASONAL_WORLD = new Color(133, 177, 178); static { @@ -253,11 +253,11 @@ class WorldTableRow extends JPanel { activityField.setForeground(DANGEROUS_WORLD); } - else if (world.getTypes().contains(WorldType.LEAGUE)) + else if (world.getTypes().contains(WorldType.SEASONAL)) { - activityField.setForeground(LEAGUE_WORLD); + activityField.setForeground(SEASONAL_WORLD); } - else if (world.getTypes().contains(WorldType.TOURNAMENT)) + else if (world.getTypes().contains(WorldType.NOSAVE_MODE)) { activityField.setForeground(TOURNAMENT_WORLD); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBox.java index 5d41b055c6..dbcfd6ddbd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBox.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBox.java @@ -50,7 +50,6 @@ import lombok.Getter; import net.runelite.api.Client; import net.runelite.api.Experience; import net.runelite.api.Skill; -import net.runelite.api.WorldType; import net.runelite.client.game.SkillIconManager; import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.DynamicGridLayout; @@ -125,7 +124,7 @@ class XpInfoBox extends JPanel // Create open xp tracker menu final JMenuItem openXpTracker = new JMenuItem("Open Wise Old Man"); openXpTracker.addActionListener(e -> LinkBrowser.browse(XpPanel.buildXpTrackerUrl( - client.getLocalPlayer(), skill, client.getWorldType().contains(WorldType.LEAGUE)))); + client.getLocalPlayer(), skill))); // Create reset menu final JMenuItem reset = new JMenuItem("Reset"); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpPanel.java index b346f2733d..ed72128ef4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpPanel.java @@ -41,7 +41,6 @@ import javax.swing.border.EmptyBorder; import net.runelite.api.Actor; import net.runelite.api.Client; import net.runelite.api.Skill; -import net.runelite.api.WorldType; import net.runelite.client.game.SkillIconManager; import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.FontManager; @@ -84,7 +83,7 @@ class XpPanel extends PluginPanel // Create open xp tracker menu final JMenuItem openXpTracker = new JMenuItem("Open Wise Old Man"); openXpTracker.addActionListener(e -> LinkBrowser.browse(XpPanel.buildXpTrackerUrl( - client.getLocalPlayer(), Skill.OVERALL, client.getWorldType().contains(WorldType.LEAGUE)))); + client.getLocalPlayer(), Skill.OVERALL))); // Create reset all menu final JMenuItem reset = new JMenuItem("Reset All"); @@ -147,18 +146,16 @@ class XpPanel extends PluginPanel add(errorPanel); } - static String buildXpTrackerUrl(final Actor player, final Skill skill, boolean leagueWorld) + static String buildXpTrackerUrl(final Actor player, final Skill skill) { if (player == null) { return ""; } - final String host = leagueWorld ? "trailblazer.wiseoldman.net" : "wiseoldman.net"; - return new HttpUrl.Builder() .scheme("https") - .host(host) + .host("wiseoldman.net") .addPathSegment("players") .addPathSegment(player.getName()) .addPathSegment("gained") diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpWorldType.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpWorldType.java index 245057e209..909a7de841 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpWorldType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpWorldType.java @@ -70,12 +70,10 @@ enum XpWorldType { switch (type) { - case TOURNAMENT: + case NOSAVE_MODE: return TOURNEY; case DEADMAN: return DMM; - case LEAGUE: - return LEAGUE; default: return NORMAL; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xpupdater/XpUpdaterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/xpupdater/XpUpdaterPlugin.java index 73f295ccaa..4595a9f722 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xpupdater/XpUpdaterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xpupdater/XpUpdaterPlugin.java @@ -143,9 +143,9 @@ public class XpUpdaterPlugin extends Plugin private void updateCml(String username, EnumSet worldTypes) { if (config.cml() - && !worldTypes.contains(WorldType.LEAGUE) + && !worldTypes.contains(WorldType.SEASONAL) && !worldTypes.contains(WorldType.DEADMAN) - && !worldTypes.contains(WorldType.TOURNAMENT)) + && !worldTypes.contains(WorldType.NOSAVE_MODE)) { HttpUrl url = new HttpUrl.Builder() .scheme("https") @@ -168,9 +168,9 @@ public class XpUpdaterPlugin extends Plugin private void updateTempleosrs(String username, EnumSet worldTypes) { if (config.templeosrs() - && !worldTypes.contains(WorldType.LEAGUE) + && !worldTypes.contains(WorldType.SEASONAL) && !worldTypes.contains(WorldType.DEADMAN) - && !worldTypes.contains(WorldType.TOURNAMENT)) + && !worldTypes.contains(WorldType.NOSAVE_MODE)) { HttpUrl url = new HttpUrl.Builder() .scheme("https") @@ -192,9 +192,9 @@ public class XpUpdaterPlugin extends Plugin private void updateWom(String username, EnumSet worldTypes) { if (config.wiseoldman() - && !worldTypes.contains(WorldType.LEAGUE) + && !worldTypes.contains(WorldType.SEASONAL) && !worldTypes.contains(WorldType.DEADMAN) - && !worldTypes.contains(WorldType.TOURNAMENT)) + && !worldTypes.contains(WorldType.NOSAVE_MODE)) { HttpUrl url = new HttpUrl.Builder() .scheme("https")