From 7dd17d8b74c9f8470968ab2ae51d647d0dbaf0a9 Mon Sep 17 00:00:00 2001 From: Dark98 Date: Wed, 6 Oct 2021 15:32:03 +0100 Subject: [PATCH] Download Randoms.jar From 2006Scape.org --- src/main/java/org/parabot/core/Configuration.java | 3 ++- src/main/java/org/parabot/core/desc/ServerProviderInfo.java | 2 +- .../java/org/parabot/core/parsers/servers/LocalServers.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/parabot/core/Configuration.java b/src/main/java/org/parabot/core/Configuration.java index 4b45547..95565ce 100644 --- a/src/main/java/org/parabot/core/Configuration.java +++ b/src/main/java/org/parabot/core/Configuration.java @@ -9,12 +9,13 @@ import org.parabot.environment.api.utils.Version; */ public class Configuration extends org.parabot.api.Configuration { + public static final String GET_RANDOMS = "https://2006Scape.org/Downloads/bot/Randoms-0.26.1.jar"; + public static final String GET_SERVER_PROVIDER_TYPE = "http://v3.bdn.parabot.org/api/bot/server/type?server=%s"; public static final String SERVER_PROVIDER_INFO = "http://v3.bdn.parabot.org/api/bot/list/%s?latest=true"; public static final String GET_SERVER_SETTINGS = "http://bdn.parabot.org/api/get.php?action=get_settings"; public static final String API_DOWNLOAD_BOT = "http://v3.bdn.parabot.org/api/bot/download/client"; public static final String DOWNLOAD_BOT = "http://bdn.parabot.org/versions/"; - public static final String GET_RANDOMS = "http://v3.bdn.parabot.org/api/bot/download/randoms"; public static final String DATA_API = "http://bdn.parabot.org/api/v2/data/"; public static final String ITEM_API = DATA_API + "items/"; diff --git a/src/main/java/org/parabot/core/desc/ServerProviderInfo.java b/src/main/java/org/parabot/core/desc/ServerProviderInfo.java index 0e0f7c3..418c19f 100644 --- a/src/main/java/org/parabot/core/desc/ServerProviderInfo.java +++ b/src/main/java/org/parabot/core/desc/ServerProviderInfo.java @@ -160,7 +160,7 @@ public class ServerProviderInfo { String randomsUrl = properties.getProperty("randoms_jar"); if (randomsUrl == null || randomsUrl.length() == 0) { // Fallback to default BDN URL if there is no 'randoms' specified in the server JSON configuration. - randomsUrl = Configuration.GET_RANDOMS + (Configuration.BOT_VERSION.isNightly() ? Configuration.NIGHTLY_APPEND : ""); + randomsUrl = Configuration.GET_RANDOMS; } return new URL(randomsUrl); } catch (MalformedURLException e) { diff --git a/src/main/java/org/parabot/core/parsers/servers/LocalServers.java b/src/main/java/org/parabot/core/parsers/servers/LocalServers.java index d372dea..0ea39ac 100644 --- a/src/main/java/org/parabot/core/parsers/servers/LocalServers.java +++ b/src/main/java/org/parabot/core/parsers/servers/LocalServers.java @@ -96,7 +96,7 @@ public class LocalServers extends ServerParser { String randoms = (String) locations.get("randoms"); if (randoms == null) { - randoms = Configuration.GET_RANDOMS + (Configuration.BOT_VERSION.isNightly() ? Configuration.NIGHTLY_APPEND : ""); + randoms = Configuration.GET_RANDOMS; } Core.verbose("[LocalServers]: Parsed server: " + name);