From dcbccbb01b16a1cea4722a1954f79f75fc3ad508 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Thu, 7 Jun 2018 10:36:28 +0200 Subject: [PATCH] Move rs-client related classes to own package To properly differentiate between client loading logic, move these classes to own package. Signed-off-by: Tomas Slusny --- .../java/net/runelite/client/RuneLite.java | 14 +++++++----- .../ClientConfigLoader.java} | 4 ++-- .../client/{ => rs}/ClientLoader.java | 22 +++++++++---------- .../ClientUpdateCheckMode.java} | 4 ++-- .../net/runelite/client/{ => rs}/RSStub.java | 10 ++++----- .../ClientConfigLoaderTest.java} | 7 +++--- 6 files changed, 32 insertions(+), 29 deletions(-) rename runelite-client/src/main/java/net/runelite/client/{ConfigLoader.java => rs/ClientConfigLoader.java} (98%) rename runelite-client/src/main/java/net/runelite/client/{ => rs}/ClientLoader.java (83%) rename runelite-client/src/main/java/net/runelite/client/{UpdateCheckMode.java => rs/ClientUpdateCheckMode.java} (95%) rename runelite-client/src/main/java/net/runelite/client/{ => rs}/RSStub.java (91%) rename runelite-client/src/test/java/net/runelite/client/{ConfigLoaderTest.java => rs/ClientConfigLoaderTest.java} (91%) diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLite.java b/runelite-client/src/main/java/net/runelite/client/RuneLite.java index e50d087203..569b4661a1 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLite.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLite.java @@ -52,6 +52,8 @@ import net.runelite.client.game.ClanManager; import net.runelite.client.game.ItemManager; import net.runelite.client.menus.MenuManager; import net.runelite.client.plugins.PluginManager; +import net.runelite.client.rs.ClientLoader; +import net.runelite.client.rs.ClientUpdateCheckMode; import net.runelite.client.ui.ClientUI; import net.runelite.client.ui.DrawManager; import net.runelite.client.ui.TitleToolbar; @@ -150,15 +152,15 @@ public class RuneLite parser.accepts("developer-mode", "Enable developer tools"); parser.accepts("debug", "Show extra debugging output"); - final ArgumentAcceptingOptionSpec updateMode = parser + final ArgumentAcceptingOptionSpec updateMode = parser .accepts("rs", "Select client type") .withRequiredArg() - .ofType(UpdateCheckMode.class) - .defaultsTo(UpdateCheckMode.AUTO) - .withValuesConvertedBy(new EnumConverter(UpdateCheckMode.class) + .ofType(ClientUpdateCheckMode.class) + .defaultsTo(ClientUpdateCheckMode.AUTO) + .withValuesConvertedBy(new EnumConverter(ClientUpdateCheckMode.class) { @Override - public UpdateCheckMode convert(String v) + public ClientUpdateCheckMode convert(String v) { return super.convert(v.toUpperCase()); } @@ -207,7 +209,7 @@ public class RuneLite injector.getInstance(RuneLite.class).start(getOptions().valueOf(updateMode)); } - public void start(UpdateCheckMode updateMode) throws Exception + public void start(ClientUpdateCheckMode updateMode) throws Exception { // Load RuneLite or Vanilla client final Applet client = new ClientLoader().loadRs(updateMode); diff --git a/runelite-client/src/main/java/net/runelite/client/ConfigLoader.java b/runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java similarity index 98% rename from runelite-client/src/main/java/net/runelite/client/ConfigLoader.java rename to runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java index e5581ad148..aa5b6a7d2f 100644 --- a/runelite-client/src/main/java/net/runelite/client/ConfigLoader.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.client; +package net.runelite.client.rs; import java.io.BufferedReader; import java.io.IOException; @@ -34,7 +34,7 @@ import okhttp3.HttpUrl; import okhttp3.Request; import okhttp3.Response; -public class ConfigLoader +public class ClientConfigLoader { private static final HttpUrl CONFIG_URL = HttpUrl.parse("http://oldschool.runescape.com/jav_config.ws"); // https redirects us to rs3 diff --git a/runelite-client/src/main/java/net/runelite/client/ClientLoader.java b/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java similarity index 83% rename from runelite-client/src/main/java/net/runelite/client/ClientLoader.java rename to runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java index ef657e5bdf..34125a8aca 100644 --- a/runelite-client/src/main/java/net/runelite/client/ClientLoader.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.client; +package net.runelite.client.rs; import java.applet.Applet; import java.io.IOException; @@ -34,14 +34,14 @@ import net.runelite.http.api.updatecheck.UpdateCheckClient; @Slf4j public class ClientLoader { - public Applet loadRs(UpdateCheckMode updateMode) + public Applet loadRs(ClientUpdateCheckMode updateMode) { - if (updateMode == UpdateCheckMode.AUTO) + if (updateMode == ClientUpdateCheckMode.AUTO) { final UpdateCheckClient updateCheck = new UpdateCheckClient(); updateMode = updateCheck.isOutdated() ? - UpdateCheckMode.VANILLA : - UpdateCheckMode.RUNELITE; + ClientUpdateCheckMode.VANILLA : + ClientUpdateCheckMode.RUNELITE; } try @@ -74,11 +74,11 @@ public class ClientLoader private Applet loadRuneLite() throws ClassNotFoundException, IOException, InstantiationException, IllegalAccessException { - ConfigLoader config = new ConfigLoader(); + ClientConfigLoader config = new ClientConfigLoader(); config.fetch(); - String initialClass = config.getProperty(ConfigLoader.INITIAL_CLASS).replace(".class", ""); + String initialClass = config.getProperty(ClientConfigLoader.INITIAL_CLASS).replace(".class", ""); // the injected client is a runtime scoped dependency Class clientClass = this.getClass().getClassLoader().loadClass(initialClass); @@ -91,13 +91,13 @@ public class ClientLoader private Applet loadVanilla() throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException { - ConfigLoader config = new ConfigLoader(); + ClientConfigLoader config = new ClientConfigLoader(); config.fetch(); - String codebase = config.getProperty(ConfigLoader.CODEBASE); - String initialJar = config.getProperty(ConfigLoader.INITIAL_JAR); - String initialClass = config.getProperty(ConfigLoader.INITIAL_CLASS).replace(".class", ""); + String codebase = config.getProperty(ClientConfigLoader.CODEBASE); + String initialJar = config.getProperty(ClientConfigLoader.INITIAL_JAR); + String initialClass = config.getProperty(ClientConfigLoader.INITIAL_CLASS).replace(".class", ""); URL url = new URL(codebase + initialJar); diff --git a/runelite-client/src/main/java/net/runelite/client/UpdateCheckMode.java b/runelite-client/src/main/java/net/runelite/client/rs/ClientUpdateCheckMode.java similarity index 95% rename from runelite-client/src/main/java/net/runelite/client/UpdateCheckMode.java rename to runelite-client/src/main/java/net/runelite/client/rs/ClientUpdateCheckMode.java index 06abaaa07d..4957089162 100644 --- a/runelite-client/src/main/java/net/runelite/client/UpdateCheckMode.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/ClientUpdateCheckMode.java @@ -22,9 +22,9 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.client; +package net.runelite.client.rs; -public enum UpdateCheckMode +public enum ClientUpdateCheckMode { AUTO, NONE, diff --git a/runelite-client/src/main/java/net/runelite/client/RSStub.java b/runelite-client/src/main/java/net/runelite/client/rs/RSStub.java similarity index 91% rename from runelite-client/src/main/java/net/runelite/client/RSStub.java rename to runelite-client/src/main/java/net/runelite/client/rs/RSStub.java index 24bba2a05d..06076879a3 100644 --- a/runelite-client/src/main/java/net/runelite/client/RSStub.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/RSStub.java @@ -23,7 +23,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.client; +package net.runelite.client.rs; import java.applet.AppletContext; import java.applet.AppletStub; @@ -32,9 +32,9 @@ import java.net.URL; public class RSStub implements AppletStub { - private final ConfigLoader config; + private final ClientConfigLoader config; - public RSStub(ConfigLoader config) + public RSStub(ClientConfigLoader config) { this.config = config; } @@ -56,7 +56,7 @@ public class RSStub implements AppletStub { try { - return new URL(config.getProperty(ConfigLoader.CODEBASE)); + return new URL(config.getProperty(ClientConfigLoader.CODEBASE)); } catch (MalformedURLException ex) { @@ -81,5 +81,5 @@ public class RSStub implements AppletStub { } - + } diff --git a/runelite-client/src/test/java/net/runelite/client/ConfigLoaderTest.java b/runelite-client/src/test/java/net/runelite/client/rs/ClientConfigLoaderTest.java similarity index 91% rename from runelite-client/src/test/java/net/runelite/client/ConfigLoaderTest.java rename to runelite-client/src/test/java/net/runelite/client/rs/ClientConfigLoaderTest.java index 8c416dd370..f602822d40 100644 --- a/runelite-client/src/test/java/net/runelite/client/ConfigLoaderTest.java +++ b/runelite-client/src/test/java/net/runelite/client/rs/ClientConfigLoaderTest.java @@ -23,21 +23,22 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.client; +package net.runelite.client.rs; import java.io.IOException; +import net.runelite.client.rs.ClientConfigLoader; import org.junit.Test; /** * * @author Adam */ -public class ConfigLoaderTest +public class ClientConfigLoaderTest { @Test public void test() throws IOException { - ConfigLoader loader = new ConfigLoader(); + ClientConfigLoader loader = new ClientConfigLoader(); loader.fetch(); for (String key : loader.getProperties().keySet())