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

client: accept custom javconfig url

Browse Source
This commit is contained in:
Adam
2020-06-04 20:30:42 -04:00
parent 217a5425d4
commit 7092c0a29d
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,6 +139,9 @@ public class RuneLite
parser.accepts("debug", "Show extra debugging output"); parser.accepts("debug", "Show extra debugging output");
parser.accepts("safe-mode", "Disables external plugins and the GPU plugin"); parser.accepts("safe-mode", "Disables external plugins and the GPU plugin");
parser.accepts("insecure-skip-tls-verification", "Disables TLS verification"); parser.accepts("insecure-skip-tls-verification", "Disables TLS verification");
parser.accepts("jav_config", "jav_config url")
.withRequiredArg()
.defaultsTo(RuneLiteProperties.getJavConfig());
final ArgumentAcceptingOptionSpec<File> sessionfile = parser.accepts("sessionfile", "Use a specified session file") final ArgumentAcceptingOptionSpec<File> sessionfile = parser.accepts("sessionfile", "Use a specified session file")
.withRequiredArg() .withRequiredArg()
@@ -204,7 +207,7 @@ public class RuneLite
try try
{ {
final ClientLoader clientLoader = new ClientLoader(okHttpClient, options.valueOf(updateMode)); final ClientLoader clientLoader = new ClientLoader(okHttpClient, options.valueOf(updateMode), (String) options.valueOf("jav_config"));
new Thread(() -> new Thread(() ->
{ {

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

@@ -87,15 +87,17 @@ public class ClientLoader implements Supplier<Applet>
private final ClientConfigLoader clientConfigLoader; private final ClientConfigLoader clientConfigLoader;
private ClientUpdateCheckMode updateCheckMode; private ClientUpdateCheckMode updateCheckMode;
private final WorldSupplier worldSupplier; private final WorldSupplier worldSupplier;
private final String javConfigUrl;
private Object client; private Object client;
public ClientLoader(OkHttpClient okHttpClient, ClientUpdateCheckMode updateCheckMode) public ClientLoader(OkHttpClient okHttpClient, ClientUpdateCheckMode updateCheckMode, String javConfigUrl)
{ {
this.okHttpClient = okHttpClient; this.okHttpClient = okHttpClient;
this.clientConfigLoader = new ClientConfigLoader(okHttpClient); this.clientConfigLoader = new ClientConfigLoader(okHttpClient);
this.updateCheckMode = updateCheckMode; this.updateCheckMode = updateCheckMode;
this.worldSupplier = new WorldSupplier(okHttpClient); this.worldSupplier = new WorldSupplier(okHttpClient);
this.javConfigUrl = javConfigUrl;
} }
@Override @Override
@@ -186,7 +188,7 @@ public class ClientLoader implements Supplier<Applet>
private RSConfig downloadConfig() throws IOException private RSConfig downloadConfig() throws IOException
{ {
HttpUrl url = HttpUrl.parse(RuneLiteProperties.getJavConfig()); HttpUrl url = HttpUrl.parse(javConfigUrl);
IOException err = null; IOException err = null;
for (int attempt = 0; attempt < NUM_ATTEMPTS; attempt++) for (int attempt = 0; attempt < NUM_ATTEMPTS; attempt++)
{ {
@@ -204,6 +206,12 @@ public class ClientLoader implements Supplier<Applet>
catch (IOException e) catch (IOException e)
{ {
log.info("Failed to get jav_config from host \"{}\" ({})", url.host(), e.getMessage()); log.info("Failed to get jav_config from host \"{}\" ({})", url.host(), e.getMessage());
if (!javConfigUrl.equals(RuneLiteProperties.getJavConfig()))
{
throw e;
}
String host = worldSupplier.get().getAddress(); String host = worldSupplier.get().getAddress();
url = url.newBuilder().host(host).build(); url = url.newBuilder().host(host).build();
err = e; err = e;