ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Move rs-client related classes to own package

Browse Source 
To properly differentiate between client loading logic, move these
classes to own package.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2018-06-07 10:36:28 +02:00
parent 7de8436bdb
commit dcbccbb01b
6 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
runelite-client/src/main/java/net/runelite/client/RuneLite.java
View File

@@ -52,6 +52,8 @@ import net.runelite.client.game.ClanManager;
import net.runelite.client.game.ItemManager; import net.runelite.client.game.ItemManager;
import net.runelite.client.menus.MenuManager; import net.runelite.client.menus.MenuManager;
import net.runelite.client.plugins.PluginManager; 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.ClientUI;
import net.runelite.client.ui.DrawManager; import net.runelite.client.ui.DrawManager;
import net.runelite.client.ui.TitleToolbar; import net.runelite.client.ui.TitleToolbar;
@@ -150,15 +152,15 @@ public class RuneLite
parser.accepts("developer-mode", "Enable developer tools"); parser.accepts("developer-mode", "Enable developer tools");
parser.accepts("debug", "Show extra debugging output"); parser.accepts("debug", "Show extra debugging output");
final ArgumentAcceptingOptionSpec<UpdateCheckMode> updateMode = parser final ArgumentAcceptingOptionSpec<ClientUpdateCheckMode> updateMode = parser
.accepts("rs", "Select client type") .accepts("rs", "Select client type")
.withRequiredArg() .withRequiredArg()
.ofType(UpdateCheckMode.class) .ofType(ClientUpdateCheckMode.class)
.defaultsTo(UpdateCheckMode.AUTO) .defaultsTo(ClientUpdateCheckMode.AUTO)
.withValuesConvertedBy(new EnumConverter<UpdateCheckMode>(UpdateCheckMode.class) .withValuesConvertedBy(new EnumConverter<ClientUpdateCheckMode>(ClientUpdateCheckMode.class)
{ {
@Override @Override
public UpdateCheckMode convert(String v) public ClientUpdateCheckMode convert(String v)
{ {
return super.convert(v.toUpperCase()); return super.convert(v.toUpperCase());
} }
@@ -207,7 +209,7 @@ public class RuneLite
injector.getInstance(RuneLite.class).start(getOptions().valueOf(updateMode)); 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 // Load RuneLite or Vanilla client
final Applet client = new ClientLoader().loadRs(updateMode); final Applet client = new ClientLoader().loadRs(updateMode);

4
runelite-client/src/main/java/net/runelite/client/ConfigLoader.java → runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java
View File

@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * 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.BufferedReader;
import java.io.IOException; import java.io.IOException;
@@ -34,7 +34,7 @@ import okhttp3.HttpUrl;
import okhttp3.Request; import okhttp3.Request;
import okhttp3.Response; 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 private static final HttpUrl CONFIG_URL = HttpUrl.parse("http://oldschool.runescape.com/jav_config.ws"); // https redirects us to rs3

22
runelite-client/src/main/java/net/runelite/client/ClientLoader.java → runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java
View File

@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * 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.applet.Applet;
import java.io.IOException; import java.io.IOException;
@@ -34,14 +34,14 @@ import net.runelite.http.api.updatecheck.UpdateCheckClient;
@Slf4j @Slf4j
public class ClientLoader 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(); final UpdateCheckClient updateCheck = new UpdateCheckClient();
updateMode = updateCheck.isOutdated() ? updateMode = updateCheck.isOutdated() ?
UpdateCheckMode.VANILLA : ClientUpdateCheckMode.VANILLA :
UpdateCheckMode.RUNELITE; ClientUpdateCheckMode.RUNELITE;
} }
try try
@@ -74,11 +74,11 @@ public class ClientLoader
private Applet loadRuneLite() throws ClassNotFoundException, IOException, InstantiationException, IllegalAccessException private Applet loadRuneLite() throws ClassNotFoundException, IOException, InstantiationException, IllegalAccessException
{ {
ConfigLoader config = new ConfigLoader(); ClientConfigLoader config = new ClientConfigLoader();
config.fetch(); 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 // the injected client is a runtime scoped dependency
Class<?> clientClass = this.getClass().getClassLoader().loadClass(initialClass); Class<?> clientClass = this.getClass().getClassLoader().loadClass(initialClass);
@@ -91,13 +91,13 @@ public class ClientLoader
private Applet loadVanilla() throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException private Applet loadVanilla() throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException
{ {
ConfigLoader config = new ConfigLoader(); ClientConfigLoader config = new ClientConfigLoader();
config.fetch(); config.fetch();
String codebase = config.getProperty(ConfigLoader.CODEBASE); String codebase = config.getProperty(ClientConfigLoader.CODEBASE);
String initialJar = config.getProperty(ConfigLoader.INITIAL_JAR); String initialJar = config.getProperty(ClientConfigLoader.INITIAL_JAR);
String initialClass = config.getProperty(ConfigLoader.INITIAL_CLASS).replace(".class", ""); String initialClass = config.getProperty(ClientConfigLoader.INITIAL_CLASS).replace(".class", "");
URL url = new URL(codebase + initialJar); URL url = new URL(codebase + initialJar);

4
runelite-client/src/main/java/net/runelite/client/UpdateCheckMode.java → runelite-client/src/main/java/net/runelite/client/rs/ClientUpdateCheckMode.java
View File

@@ -22,9 +22,9 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * 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, AUTO,
NONE, NONE,

8
runelite-client/src/main/java/net/runelite/client/RSStub.java → runelite-client/src/main/java/net/runelite/client/rs/RSStub.java
View File

@@ -23,7 +23,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * 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.AppletContext;
import java.applet.AppletStub; import java.applet.AppletStub;
@@ -32,9 +32,9 @@ import java.net.URL;
public class RSStub implements AppletStub public class RSStub implements AppletStub
{ {
private final ConfigLoader config; private final ClientConfigLoader config;
public RSStub(ConfigLoader config) public RSStub(ClientConfigLoader config)
{ {
this.config = config; this.config = config;
} }
@@ -56,7 +56,7 @@ public class RSStub implements AppletStub
{ {
try try
{ {
return new URL(config.getProperty(ConfigLoader.CODEBASE)); return new URL(config.getProperty(ClientConfigLoader.CODEBASE));
} }
catch (MalformedURLException ex) catch (MalformedURLException ex)
{ {

7
runelite-client/src/test/java/net/runelite/client/ConfigLoaderTest.java → runelite-client/src/test/java/net/runelite/client/rs/ClientConfigLoaderTest.java
View File

@@ -23,21 +23,22 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package net.runelite.client; package net.runelite.client.rs;
import java.io.IOException; import java.io.IOException;
import net.runelite.client.rs.ClientConfigLoader;
import org.junit.Test; import org.junit.Test;
/** /**
* *
* @author Adam * @author Adam
*/ */
public class ConfigLoaderTest public class ClientConfigLoaderTest
{ {
@Test @Test
public void test() throws IOException public void test() throws IOException
{ {
ConfigLoader loader = new ConfigLoader(); ClientConfigLoader loader = new ClientConfigLoader();
loader.fetch(); loader.fetch();
for (String key : loader.getProperties().keySet()) for (String key : loader.getProperties().keySet())