From a78fa0560ce6af3e14f504730d66ef347cb4a7d1 Mon Sep 17 00:00:00 2001 From: dekvall Date: Mon, 26 Oct 2020 23:04:46 +0100 Subject: [PATCH] xp: add support for wise-old-man trailblazer --- .../runelite/client/plugins/xptracker/XpInfoBox.java | 4 +++- .../net/runelite/client/plugins/xptracker/XpPanel.java | 10 +++++++--- .../client/plugins/xpupdater/XpUpdaterPlugin.java | 6 +++++- 3 files changed, 15 insertions(+), 5 deletions(-) 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 d2d5d8bf3c..4dc0af0f88 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,6 +50,7 @@ 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; @@ -123,7 +124,8 @@ 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))); + openXpTracker.addActionListener(e -> LinkBrowser.browse(XpPanel.buildXpTrackerUrl( + client.getLocalPlayer(), skill, client.getWorldType().contains(WorldType.LEAGUE)))); // 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 e50cd3a050..aa7af98aed 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,6 +41,7 @@ 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; @@ -82,7 +83,8 @@ 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))); + openXpTracker.addActionListener(e -> LinkBrowser.browse(XpPanel.buildXpTrackerUrl( + client.getLocalPlayer(), Skill.OVERALL, client.getWorldType().contains(WorldType.LEAGUE)))); // Create reset all menu final JMenuItem reset = new JMenuItem("Reset All"); @@ -140,16 +142,18 @@ class XpPanel extends PluginPanel add(errorPanel); } - static String buildXpTrackerUrl(final Actor player, final Skill skill) + static String buildXpTrackerUrl(final Actor player, final Skill skill, boolean leagueWorld) { if (player == null) { return ""; } + final String host = leagueWorld ? "trailblazer.wiseoldman.net" : "wiseoldman.net"; + return new HttpUrl.Builder() .scheme("https") - .host("wiseoldman.net") + .host(host) .addPathSegment("players") .addPathSegment(player.getName()) .addPathSegment("gained") 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 6f86e0006e..1a529b3328 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 @@ -34,6 +34,7 @@ import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.Player; +import net.runelite.api.WorldType; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.client.config.ConfigManager; @@ -172,9 +173,12 @@ public class XpUpdaterPlugin extends Plugin if (config.wiseoldman()) { + final boolean leagueWorld = client.getWorldType().contains(WorldType.LEAGUE); + final String host = leagueWorld ? "trailblazer.wiseoldman.net" : "wiseoldman.net"; + HttpUrl url = new HttpUrl.Builder() .scheme("https") - .host("wiseoldman.net") + .host(host) .addPathSegment("api") .addPathSegment("players") .addPathSegment("track")