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

client: more performance boosts (#1792)

Browse Source 
client: more performance boosts
This commit is contained in:
Owain van Brakel
2019-10-16 03:21:28 +02:00
committed by GitHub
parent 498641b1b6 68d67435bf
commit de940648f2
21 changed files with 319 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java
View File

@@ -84,9 +84,8 @@ public class RuneLiteAPI
static static
{ {
try try (InputStream in = RuneLiteAPI.class.getResourceAsStream("/runelite.properties"))
{ {
InputStream in = RuneLiteAPI.class.getResourceAsStream("/runelite.properties");
properties.load(in); properties.load(in);
version = properties.getProperty("runelite.version"); version = properties.getProperty("runelite.version");

4
runelite-client/src/main/java/net/runelite/client/ClientSessionManager.java
View File

@@ -69,7 +69,7 @@ public class ClientSessionManager
sessionClient.pingSession(sessionId) sessionClient.pingSession(sessionId)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(Schedulers.from(clientThread)) .observeOn(Schedulers.from(clientThread))
.doOnError(e -> this.error((Throwable) e)) .doOnError(this::error)
.subscribe(); .subscribe();
} }
@@ -80,7 +80,7 @@ public class ClientSessionManager
sessionClient.delete(sessionId) sessionClient.delete(sessionId)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(Schedulers.from(clientThread)) .observeOn(Schedulers.from(clientThread))
.doOnError(e -> this.error((Throwable) e)) .doOnError(this::error)
.subscribe(); .subscribe();
sessionId = null; sessionId = null;

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

@@ -30,6 +30,8 @@ import com.google.common.annotations.VisibleForTesting;
import com.google.inject.Guice; import com.google.inject.Guice;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Injector; import com.google.inject.Injector;
import io.reactivex.Completable;
import io.reactivex.schedulers.Schedulers;
import java.io.File; import java.io.File;
import java.lang.management.ManagementFactory; import java.lang.management.ManagementFactory;
import java.lang.management.RuntimeMXBean; import java.lang.management.RuntimeMXBean;
@@ -61,6 +63,7 @@ import net.runelite.client.game.chatbox.ChatboxPanelManager;
import net.runelite.client.graphics.ModelOutlineRenderer; import net.runelite.client.graphics.ModelOutlineRenderer;
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.rs.ClientUpdateCheckMode;
import net.runelite.client.task.Scheduler; import net.runelite.client.task.Scheduler;
import net.runelite.client.ui.ClientUI; import net.runelite.client.ui.ClientUI;
@@ -85,8 +88,8 @@ public class RuneLite
public static final File PLUGIN_DIR = new File(RUNELITE_DIR, "plugins"); public static final File PLUGIN_DIR = new File(RUNELITE_DIR, "plugins");
public static final File SCREENSHOT_DIR = new File(RUNELITE_DIR, "screenshots"); public static final File SCREENSHOT_DIR = new File(RUNELITE_DIR, "screenshots");
public static final File LOGS_DIR = new File(RUNELITE_DIR, "logs"); public static final File LOGS_DIR = new File(RUNELITE_DIR, "logs");
public static boolean allowPrivateServer = false;
public static final Locale SYSTEM_LOCALE = Locale.getDefault(); public static final Locale SYSTEM_LOCALE = Locale.getDefault();
public static boolean allowPrivateServer = false;
@Getter @Getter
private static Injector injector; private static Injector injector;
@@ -198,16 +201,30 @@ public class RuneLite
parser.accepts("help", "Show this text").forHelp(); parser.accepts("help", "Show this text").forHelp();
OptionSet options = parser.parse(args); OptionSet options = parser.parse(args);
if (options.has("help"))
{
parser.printHelpOn(System.out);
System.exit(0);
}
if (options.has("debug"))
{
final Logger logger = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
logger.setLevel(Level.DEBUG);
}
if (options.has("bootstrap")) if (options.has("bootstrap"))
{ {
Bootstrapper.main(false); Bootstrapper.main(false);
System.exit(0); System.exit(0);
} }
if (options.has("bootstrap-staging")) if (options.has("bootstrap-staging"))
{ {
Bootstrapper.main(true); Bootstrapper.main(true);
System.exit(0); System.exit(0);
} }
if (options.has("proxy")) if (options.has("proxy"))
{ {
String[] proxy = options.valueOf(proxyInfo).split(":"); String[] proxy = options.valueOf(proxyInfo).split(":");
@@ -238,10 +255,18 @@ public class RuneLite
} }
} }
if (options.has("help")) final ClientLoader clientLoader = new ClientLoader(options.valueOf(updateMode));
Completable.fromAction(clientLoader::get)
.subscribeOn(Schedulers.single())
.subscribe();
Completable.fromAction(ClassPreloader::preload)
.subscribeOn(Schedulers.computation())
.subscribe();
if (!options.has("no-splash"))
{ {
parser.printHelpOn(System.out); RuneLiteSplashScreen.init();
System.exit(0);
} }
final boolean developerMode = options.has("developer-mode"); final boolean developerMode = options.has("developer-mode");
@@ -252,27 +277,13 @@ public class RuneLite
assert assertions = true; assert assertions = true;
if (!assertions) if (!assertions)
{ {
java.util.logging.Logger.getAnonymousLogger().warning("Developers should enable assertions; Add `-ea` to your JVM arguments`"); log.warn("Developers should enable assertions; Add `-ea` to your JVM arguments`");
} }
} }
if (!options.has("no-splash"))
{
RuneLiteSplashScreen.init();
}
RuneLiteSplashScreen.stage(0, "Initializing client");
PROFILES_DIR.mkdirs();
if (options.has("debug"))
{
final Logger logger = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
logger.setLevel(Level.DEBUG);
}
Thread.setDefaultUncaughtExceptionHandler((thread, throwable) -> Thread.setDefaultUncaughtExceptionHandler((thread, throwable) ->
{ {
log.error("Uncaught exception:", throwable);
if (throwable instanceof AbstractMethodError) if (throwable instanceof AbstractMethodError)
{ {
RuneLiteSplashScreen.setError("Out of date!", "Classes are out of date; Build with Gradle again."); RuneLiteSplashScreen.setError("Out of date!", "Classes are out of date; Build with Gradle again.");
@@ -284,13 +295,16 @@ public class RuneLite
RuneLiteSplashScreen.stage(0, "Starting OpenOSRS injector"); RuneLiteSplashScreen.stage(0, "Starting OpenOSRS injector");
PROFILES_DIR.mkdirs();
final long start = System.currentTimeMillis(); final long start = System.currentTimeMillis();
injector = Guice.createInjector(new RuneLiteModule( injector = Guice.createInjector(new RuneLiteModule(
options.valueOf(updateMode), clientLoader,
true)); true));
injector.getInstance(RuneLite.class).start(); injector.getInstance(RuneLite.class).start();
final long end = System.currentTimeMillis(); final long end = System.currentTimeMillis();
final RuntimeMXBean rb = ManagementFactory.getRuntimeMXBean(); final RuntimeMXBean rb = ManagementFactory.getRuntimeMXBean();
final long uptime = rb.getUptime(); final long uptime = rb.getUptime();

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

@@ -31,6 +31,7 @@ import java.applet.Applet;
import java.io.File; import java.io.File;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import java.util.function.Supplier;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import javax.inject.Singleton; import javax.inject.Singleton;
import net.runelite.api.Client; import net.runelite.api.Client;
@@ -46,8 +47,6 @@ import net.runelite.client.eventbus.EventBus;
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.task.Scheduler; import net.runelite.client.task.Scheduler;
import net.runelite.client.util.DeferredEventBus; import net.runelite.client.util.DeferredEventBus;
import net.runelite.client.util.ExecutorServiceExceptionLogger; import net.runelite.client.util.ExecutorServiceExceptionLogger;
@@ -61,19 +60,18 @@ public class RuneLiteModule extends AbstractModule
{ {
private static final int MAX_OKHTTP_CACHE_SIZE = 20 * 1024 * 1024; // 20mb private static final int MAX_OKHTTP_CACHE_SIZE = 20 * 1024 * 1024; // 20mb
private final ClientUpdateCheckMode updateCheckMode; private final Supplier<Applet> clientLoader;
private final boolean developerMode; private final boolean developerMode;
public RuneLiteModule(final ClientUpdateCheckMode updateCheckMode, final boolean developerMode) public RuneLiteModule(final Supplier<Applet> clientLoader, boolean developerMode)
{ {
this.updateCheckMode = updateCheckMode; this.clientLoader = clientLoader;
this.developerMode = developerMode; this.developerMode = developerMode;
} }
@Override @Override
protected void configure() protected void configure()
{ {
bindConstant().annotatedWith(Names.named("updateCheckMode")).to(updateCheckMode);
bindConstant().annotatedWith(Names.named("developerMode")).to(developerMode); bindConstant().annotatedWith(Names.named("developerMode")).to(developerMode);
bind(ScheduledExecutorService.class).toInstance(new ExecutorServiceExceptionLogger(Executors.newSingleThreadScheduledExecutor())); bind(ScheduledExecutorService.class).toInstance(new ExecutorServiceExceptionLogger(Executors.newSingleThreadScheduledExecutor()));
bind(OkHttpClient.class).toInstance(RuneLiteAPI.CLIENT.newBuilder() bind(OkHttpClient.class).toInstance(RuneLiteAPI.CLIENT.newBuilder()
@@ -102,9 +100,9 @@ public class RuneLiteModule extends AbstractModule
@Provides @Provides
@Singleton @Singleton
Applet provideApplet(ClientLoader clientLoader) Applet provideApplet()
{ {
return clientLoader.load(); return clientLoader.get();
} }
@Provides @Provides

2
runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java
View File

@@ -24,12 +24,10 @@
*/ */
package net.runelite.client; package net.runelite.client;
import com.google.inject.Singleton;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.Properties; import java.util.Properties;
@Singleton
public class RuneLiteProperties public class RuneLiteProperties
{ {
private static final String RUNELITE_TITLE = "open.osrs.title"; private static final String RUNELITE_TITLE = "open.osrs.title";

17
runelite-client/src/main/java/net/runelite/client/SessionClient.java
View File

@@ -24,7 +24,9 @@
*/ */
package net.runelite.client; package net.runelite.client;
import io.reactivex.Completable;
import io.reactivex.Observable; import io.reactivex.Observable;
import java.io.IOException;
import java.util.UUID; import java.util.UUID;
import net.runelite.http.api.RuneLiteAPI; import net.runelite.http.api.RuneLiteAPI;
import okhttp3.HttpUrl; import okhttp3.HttpUrl;
@@ -50,34 +52,36 @@ class SessionClient
}); });
} }
Observable pingSession(UUID uuid) Completable pingSession(UUID uuid)
{ {
final HttpUrl url = RuneLiteAPI.getSessionBase().newBuilder() final HttpUrl url = RuneLiteAPI.getSessionBase().newBuilder()
.addPathSegment("ping") .addPathSegment("ping")
.addQueryParameter("session", uuid.toString()) .addQueryParameter("session", uuid.toString())
.build(); .build();
return Observable.defer(() -> return Completable.fromAction(() ->
{ {
Request request = new Request.Builder() Request request = new Request.Builder()
.url(url) .url(url)
.build(); .build();
try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute())
{ {
return Observable.empty(); if (!response.isSuccessful())
{
throw new IOException("Unsuccesful ping");
}
} }
}); });
} }
Observable delete(UUID uuid) Completable delete(UUID uuid)
{ {
final HttpUrl url = RuneLiteAPI.getSessionBase().newBuilder() final HttpUrl url = RuneLiteAPI.getSessionBase().newBuilder()
.addQueryParameter("session", uuid.toString()) .addQueryParameter("session", uuid.toString())
.build(); .build();
return Observable.defer(() -> return Completable.fromAction(() ->
{ {
Request request = new Request.Builder() Request request = new Request.Builder()
.delete() .delete()
@@ -85,7 +89,6 @@ class SessionClient
.build(); .build();
RuneLiteAPI.CLIENT.newCall(request).execute().close(); RuneLiteAPI.CLIENT.newCall(request).execute().close();
return Observable.empty();
}); });
} }
} }

24
runelite-client/src/main/java/net/runelite/client/eventbus/EventBus.java
View File

@@ -52,10 +52,26 @@ public class EventBus implements EventBusInterface
Disposable disposable = getSubject(eventClass) Disposable disposable = getSubject(eventClass)
.filter(Objects::nonNull) // Filter out null objects, better safe than sorry .filter(Objects::nonNull) // Filter out null objects, better safe than sorry
.cast(eventClass) // Cast it for easier usage .cast(eventClass) // Cast it for easier usage
.subscribe(action, error -> .subscribe(action, error -> log.error("Error in eventbus", error));
{
log.error("Error in eventbus", error); getCompositeDisposable(lifecycle).add(disposable);
}); subscriptionList.put(lifecycle, eventClass);
}
@Override
public <T> void subscribe(Class<T> eventClass, @NonNull Object lifecycle, @NonNull Consumer<T> action, int takeUntil)
{
if (subscriptionList.containsKey(lifecycle) && eventClass.equals(subscriptionList.get(lifecycle)))
{
return;
}
Disposable disposable = getSubject(eventClass)
.filter(Objects::nonNull) // Filter out null objects, better safe than sorry
.cast(eventClass) // Cast it for easier usage
.take(takeUntil)
.doFinally(() -> unregister(lifecycle))
.subscribe(action, error -> log.error("Error in eventbus", error));
getCompositeDisposable(lifecycle).add(disposable); getCompositeDisposable(lifecycle).add(disposable);
subscriptionList.put(lifecycle, eventClass); subscriptionList.put(lifecycle, eventClass);

2
runelite-client/src/main/java/net/runelite/client/eventbus/EventBusInterface.java
View File

@@ -8,6 +8,8 @@ public interface EventBusInterface
{ {
<T> void subscribe(Class<T> eventClass, @NonNull Object lifecycle, @NonNull Consumer<T> action); <T> void subscribe(Class<T> eventClass, @NonNull Object lifecycle, @NonNull Consumer<T> action);
<T> void subscribe(Class<T> eventClass, @NonNull Object lifecycle, @NonNull Consumer<T> action, int takeUntil);
void unregister(@NonNull Object lifecycle); void unregister(@NonNull Object lifecycle);
<T> void post(Class<T> eventClass, @NonNull Event event); <T> void post(Class<T> eventClass, @NonNull Event event);

24
runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java
View File

@@ -28,11 +28,11 @@
package net.runelite.client.plugins.grandexchange; package net.runelite.client.plugins.grandexchange;
import com.google.common.reflect.TypeToken; import com.google.common.reflect.TypeToken;
import com.google.gson.Gson; import com.google.gson.stream.JsonReader;
import com.google.inject.Provides; import com.google.inject.Provides;
import io.reactivex.schedulers.Schedulers; import io.reactivex.schedulers.Schedulers;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.InputStream; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
@@ -85,6 +85,7 @@ import net.runelite.client.ui.NavigationButton;
import net.runelite.client.util.ImageUtil; import net.runelite.client.util.ImageUtil;
import net.runelite.client.util.StackFormatter; import net.runelite.client.util.StackFormatter;
import net.runelite.api.util.Text; import net.runelite.api.util.Text;
import net.runelite.http.api.RuneLiteAPI;
import net.runelite.http.api.ge.GrandExchangeClient; import net.runelite.http.api.ge.GrandExchangeClient;
import net.runelite.http.api.ge.GrandExchangeTrade; import net.runelite.http.api.ge.GrandExchangeTrade;
import net.runelite.http.api.osbuddy.OSBGrandExchangeClient; import net.runelite.http.api.osbuddy.OSBGrandExchangeClient;
@@ -107,7 +108,6 @@ public class GrandExchangePlugin extends Plugin
private static final OSBGrandExchangeClient CLIENT = new OSBGrandExchangeClient(); private static final OSBGrandExchangeClient CLIENT = new OSBGrandExchangeClient();
private static final String OSB_GE_TEXT = "<br>OSBuddy Actively traded price: "; private static final String OSB_GE_TEXT = "<br>OSBuddy Actively traded price: ";
private static final String BUY_LIMIT_GE_TEXT = "<br>Buy limit: "; private static final String BUY_LIMIT_GE_TEXT = "<br>Buy limit: ";
private static final Gson GSON = new Gson();
private static final TypeToken<Map<Integer, Integer>> BUY_LIMIT_TOKEN = new TypeToken<Map<Integer, Integer>>() private static final TypeToken<Map<Integer, Integer>> BUY_LIMIT_TOKEN = new TypeToken<Map<Integer, Integer>>()
{ {
}; };
@@ -173,12 +173,14 @@ public class GrandExchangePlugin extends Plugin
private boolean enableGELimits; private boolean enableGELimits;
private boolean enableAfford; private boolean enableAfford;
private static Map<Integer, Integer> loadGELimits() private static Map<Integer, Integer> loadGELimits() throws IOException
{ {
final InputStream geLimitData = GrandExchangePlugin.class.getResourceAsStream("ge_limits.json"); try (final JsonReader geLimitData = new JsonReader(new InputStreamReader(GrandExchangePlugin.class.getResourceAsStream("ge_limits.json"))))
final Map<Integer, Integer> itemGELimits = GSON.fromJson(new InputStreamReader(geLimitData), BUY_LIMIT_TOKEN.getType()); {
log.debug("Loaded {} limits", itemGELimits.size()); final Map<Integer, Integer> itemGELimits = RuneLiteAPI.GSON.fromJson(geLimitData, BUY_LIMIT_TOKEN.getType());
return itemGELimits; log.debug("Loaded {} limits", itemGELimits.size());
return itemGELimits;
}
} }
private SavedOffer getOffer(int slot) private SavedOffer getOffer(int slot)
@@ -188,12 +190,12 @@ public class GrandExchangePlugin extends Plugin
{ {
return null; return null;
} }
return GSON.fromJson(offer, SavedOffer.class); return RuneLiteAPI.GSON.fromJson(offer, SavedOffer.class);
} }
private void setOffer(int slot, SavedOffer offer) private void setOffer(int slot, SavedOffer offer)
{ {
configManager.setConfiguration("geoffer." + client.getUsername().toLowerCase(), Integer.toString(slot), GSON.toJson(offer)); configManager.setConfiguration("geoffer." + client.getUsername().toLowerCase(), Integer.toString(slot), RuneLiteAPI.GSON.toJson(offer));
} }
private void deleteOffer(int slot) private void deleteOffer(int slot)
@@ -208,7 +210,7 @@ public class GrandExchangePlugin extends Plugin
} }
@Override @Override
protected void startUp() protected void startUp() throws Exception
{ {
updateConfig(); updateConfig();
addSubscriptions(); addSubscriptions();

23
runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerXpDropLookup.java
View File

@@ -26,6 +26,7 @@ package net.runelite.client.plugins.slayer;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.util.List; import java.util.List;
@@ -38,14 +39,15 @@ class SlayerXpDropLookup
// floating point math equality // floating point math equality
private static final double EPSILON = 1e-6; private static final double EPSILON = 1e-6;
private void loadXpJson() private void loadXpJson() throws IOException
{ {
final InputStream xpFile = getClass().getResourceAsStream("/slayer_xp.json"); try (final InputStream xpFile = getClass().getResourceAsStream("/slayer_xp.json"))
Gson gson = new Gson();
xpMap = gson.fromJson(new InputStreamReader(xpFile), new TypeToken<Map<String, List<Double>>>()
{ {
Gson gson = new Gson();
}.getType()); xpMap = gson.fromJson(new InputStreamReader(xpFile), new TypeToken<Map<String, List<Double>>>()
{
}.getType());
}
} }
/** /**
@@ -129,6 +131,13 @@ class SlayerXpDropLookup
SlayerXpDropLookup() SlayerXpDropLookup()
{ {
loadXpJson(); try
{
loadXpJson();
}
catch (IOException e)
{
throw new RuntimeException(e);
}
} }
} }

8
runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java
View File

@@ -43,7 +43,6 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import javax.imageio.ImageIO;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
@@ -84,6 +83,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
import net.runelite.client.util.ExecutorServiceExceptionLogger; import net.runelite.client.util.ExecutorServiceExceptionLogger;
import net.runelite.client.util.HotkeyListener; import net.runelite.client.util.HotkeyListener;
import net.runelite.api.util.Text; import net.runelite.api.util.Text;
import net.runelite.client.util.ImageUtil;
import net.runelite.client.util.WorldUtil; import net.runelite.client.util.WorldUtil;
import net.runelite.client.util.ping.Ping; import net.runelite.client.util.ping.Ping;
import net.runelite.http.api.worlds.World; import net.runelite.http.api.worlds.World;
@@ -215,11 +215,7 @@ public class WorldHopperPlugin extends Plugin
panel = new WorldSwitcherPanel(this); panel = new WorldSwitcherPanel(this);
final BufferedImage icon; final BufferedImage icon = ImageUtil.getResourceStreamFromClass(WorldHopperPlugin.class, "icon.png");
synchronized (ImageIO.class)
{
icon = ImageIO.read(getClass().getResourceAsStream("icon.png"));
}
navButton = NavigationButton.builder() navButton = NavigationButton.builder()
.tooltip("World Switcher") .tooltip("World Switcher")

100
runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java
View File

@@ -25,68 +25,92 @@
*/ */
package net.runelite.client.rs; package net.runelite.client.rs;
import io.reactivex.Single;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import net.runelite.http.api.RuneLiteAPI; import net.runelite.http.api.RuneLiteAPI;
import okhttp3.HttpUrl;
import okhttp3.Request; import okhttp3.Request;
import okhttp3.Response; import okhttp3.Response;
class ClientConfigLoader class ClientConfigLoader
{ {
public ClientConfigLoader() private ClientConfigLoader()
{ {
throw new RuntimeException();
} }
private static final String CONFIG_URL = "http://oldschool.runescape.com/jav_config.ws"; private static final String CONFIG_URL = "http://oldschool.runescape.com/jav_config.ws";
private static final int MAX_ATTEMPTS = 16;
static RSConfig fetch() throws IOException static Single<RSConfig> fetch()
{ {
final Request request = new Request.Builder() return Single.create(obs ->
.url(CONFIG_URL)
.build();
final RSConfig config = new RSConfig();
try (final Response response = RuneLiteAPI.CLIENT.newCall(request).execute())
{ {
if (!response.isSuccessful()) int attempt = 0;
HostSupplier supplier = null;
HttpUrl url = HttpUrl.parse(CONFIG_URL);
final RSConfig config = new RSConfig();
while (attempt++ < MAX_ATTEMPTS)
{ {
throw new IOException("Unsuccessful response: " + response.message()); final Request request = new Request.Builder()
} .url(url)
.build();
String str; try (final Response response = RuneLiteAPI.CLIENT.newCall(request).execute())
final BufferedReader in = new BufferedReader(new InputStreamReader(response.body().byteStream()));
while ((str = in.readLine()) != null)
{
int idx = str.indexOf('=');
if (idx == -1)
{ {
continue; if (!response.isSuccessful())
} {
if (supplier == null)
{
supplier = new HostSupplier();
}
String s = str.substring(0, idx); url = supplier.get();
continue;
}
switch (s) String str;
{ final BufferedReader in = new BufferedReader(new InputStreamReader(response.body().byteStream()));
case "param": while ((str = in.readLine()) != null)
str = str.substring(idx + 1); {
idx = str.indexOf('='); int idx = str.indexOf('=');
s = str.substring(0, idx);
config.getAppletProperties().put(s, str.substring(idx + 1)); if (idx == -1)
break; {
case "msg": continue;
// ignore }
break;
default: String s = str.substring(0, idx);
config.getClassLoaderProperties().put(s, str.substring(idx + 1));
break; switch (s)
{
case "param":
str = str.substring(idx + 1);
idx = str.indexOf('=');
s = str.substring(0, idx);
config.getAppletProperties().put(s, str.substring(idx + 1));
break;
case "msg":
// ignore
break;
default:
config.getClassLoaderProperties().put(s, str.substring(idx + 1));
break;
}
}
obs.onSuccess(config);
return;
} }
} }
}
return config; obs.onError(new IOException("Too many attempts"));
});
} }
} }

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

@@ -32,32 +32,44 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.URL; import java.net.URL;
import java.net.URLClassLoader; import java.net.URLClassLoader;
import javax.inject.Inject; import java.util.function.Supplier;
import javax.inject.Named;
import javax.inject.Singleton;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.client.RuneLite; import net.runelite.client.RuneLite;
import net.runelite.client.ui.RuneLiteSplashScreen; import net.runelite.client.ui.RuneLiteSplashScreen;
@Slf4j @Slf4j
@Singleton public class ClientLoader implements Supplier<Applet>
public class ClientLoader
{ {
private final ClientUpdateCheckMode updateCheckMode; private ClientUpdateCheckMode updateCheckMode;
private Object client = null;
@Inject public ClientLoader(ClientUpdateCheckMode updateCheckMode)
private ClientLoader(
@Named("updateCheckMode") final ClientUpdateCheckMode updateCheckMode)
{ {
this.updateCheckMode = updateCheckMode; this.updateCheckMode = updateCheckMode;
} }
public Applet load() @Override
public synchronized Applet get()
{
if (client == null)
{
client = doLoad();
}
if (client instanceof Throwable)
{
throw new RuntimeException((Throwable) client);
}
return (Applet) client;
}
private Object doLoad()
{ {
try try
{ {
RuneLiteSplashScreen.stage(.2, "Fetching applet viewer config"); RuneLiteSplashScreen.stage(.2, "Fetching applet viewer config");
final RSConfig config = ClientConfigLoader.fetch();
final RSConfig config = ClientConfigLoader.fetch().blockingGet();
switch (updateCheckMode) switch (updateCheckMode)
{ {
@@ -92,7 +104,7 @@ public class ClientLoader
private static Applet loadRLPlus(final RSConfig config) private static Applet loadRLPlus(final RSConfig config)
throws ClassNotFoundException, InstantiationException, IllegalAccessException throws ClassNotFoundException, InstantiationException, IllegalAccessException
{ {
RuneLiteSplashScreen.stage(.465, "Starting Old School RuneScape"); RuneLiteSplashScreen.stage(.465, "Starting Open Old School RuneScape");
ClassLoader rsClassLoader = new ClassLoader(ClientLoader.class.getClassLoader()) ClassLoader rsClassLoader = new ClassLoader(ClientLoader.class.getClassLoader())
{ {
@@ -126,7 +138,7 @@ public class ClientLoader
private static Applet loadVanilla(final RSConfig config) private static Applet loadVanilla(final RSConfig config)
throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException
{ {
RuneLiteSplashScreen.stage(.465, "Starting Old School RuneScape"); RuneLiteSplashScreen.stage(.465, "Starting Vanilla Old School RuneScape");
final String codebase = config.getCodeBase(); final String codebase = config.getCodeBase();
final String initialJar = config.getInitialJar(); final String initialJar = config.getInitialJar();

76
runelite-client/src/main/java/net/runelite/client/rs/HostSupplier.java Normal file
View File

@@ -0,0 +1,76 @@
/*
* Copyright (c) 2019 Abex
* Copyright (c) 2019, Lucas <https://github.com/lucwousin>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (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.rs;
import java.util.ArrayDeque;
import java.util.Collections;
import java.util.List;
import java.util.Queue;
import java.util.Random;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
import net.runelite.http.api.RuneLiteAPI;
import net.runelite.http.api.worlds.World;
import net.runelite.http.api.worlds.WorldClient;
import net.runelite.http.api.worlds.WorldResult;
import okhttp3.HttpUrl;
@Slf4j
class HostSupplier implements Supplier<HttpUrl>
{
private final Random random = new Random();
private Queue<HttpUrl> hosts = new ArrayDeque<>();
@Override
public HttpUrl get()
{
if (!hosts.isEmpty())
{
return hosts.poll();
}
List<HttpUrl> newHosts = new WorldClient(RuneLiteAPI.CLIENT)
.lookupWorlds()
.map(WorldResult::getWorlds)
.blockingSingle()
.stream()
.map(World::getAddress)
.map(HttpUrl::parse)
.collect(Collectors.toList());
Collections.shuffle(newHosts, random);
hosts.addAll(newHosts.subList(0, 16));
while (hosts.size() < 2)
{
hosts.add(HttpUrl.parse("oldschool" + (random.nextInt(50) + 1) + ".runescape.COM"));
}
return hosts.poll();
}
}

4
runelite-client/src/main/java/net/runelite/client/ui/ClientPanel.java
View File

@@ -38,7 +38,7 @@ import net.runelite.client.util.StringFileUtils;
final class ClientPanel extends JPanel final class ClientPanel extends JPanel
{ {
public ClientPanel(@Nullable Applet client) ClientPanel(@Nullable Applet client)
{ {
setSize(Constants.GAME_FIXED_SIZE); setSize(Constants.GAME_FIXED_SIZE);
setMinimumSize(Constants.GAME_FIXED_SIZE); setMinimumSize(Constants.GAME_FIXED_SIZE);
@@ -71,7 +71,7 @@ final class ClientPanel extends JPanel
add(client, BorderLayout.CENTER); add(client, BorderLayout.CENTER);
// api.renderableThis causes the whole game frame to be redrawn each frame instead // This causes the whole game frame to be redrawn each frame instead
// of only the viewport, so we can hook to MainBufferProvider#draw // of only the viewport, so we can hook to MainBufferProvider#draw
// and draw anywhere without it leaving artifacts // and draw anywhere without it leaving artifacts
if (client instanceof Client) if (client instanceof Client)

2
runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java
View File

@@ -114,8 +114,8 @@ public class ClientUI
private static final String CONFIG_OPACITY_AMOUNT = "opacityPercentage"; private static final String CONFIG_OPACITY_AMOUNT = "opacityPercentage";
private static final int CLIENT_WELL_HIDDEN_MARGIN = 160; private static final int CLIENT_WELL_HIDDEN_MARGIN = 160;
private static final int CLIENT_WELL_HIDDEN_MARGIN_TOP = 10; private static final int CLIENT_WELL_HIDDEN_MARGIN_TOP = 10;
public static boolean allowInput = false;
public static final BufferedImage ICON = ImageUtil.getResourceStreamFromClass(ClientUI.class, "/openosrs.png"); public static final BufferedImage ICON = ImageUtil.getResourceStreamFromClass(ClientUI.class, "/openosrs.png");
public static boolean allowInput = false;
@Getter @Getter
private TrayIcon trayIcon; private TrayIcon trayIcon;

40
runelite-client/src/main/java/net/runelite/client/ui/FontManager.java
View File

@@ -28,6 +28,7 @@ import java.awt.Font;
import java.awt.FontFormatException; import java.awt.FontFormatException;
import java.awt.GraphicsEnvironment; import java.awt.GraphicsEnvironment;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import javax.swing.text.StyleContext; import javax.swing.text.StyleContext;
public class FontManager public class FontManager
@@ -42,31 +43,42 @@ public class FontManager
try try
{ {
Font font = Font.createFont(Font.TRUETYPE_FONT, Font font;
FontManager.class.getResourceAsStream("runescape.ttf"))
.deriveFont(Font.PLAIN, 16); try (InputStream runescapeIn = FontManager.class.getResourceAsStream("runescape.ttf"))
ge.registerFont(font); {
font = Font.createFont(Font.TRUETYPE_FONT,
runescapeIn)
.deriveFont(Font.PLAIN, 16);
ge.registerFont(font);
}
runescapeFont = StyleContext.getDefaultStyleContext() runescapeFont = StyleContext.getDefaultStyleContext()
.getFont(font.getName(), Font.PLAIN, 16); .getFont(font.getName(), Font.PLAIN, 16);
ge.registerFont(runescapeFont); ge.registerFont(runescapeFont);
Font smallFont = Font.createFont(Font.TRUETYPE_FONT, try (InputStream smallIn = FontManager.class.getResourceAsStream("runescape_small.ttf"))
FontManager.class.getResourceAsStream("runescape_small.ttf")) {
.deriveFont(Font.PLAIN, 16); font = Font.createFont(Font.TRUETYPE_FONT,
ge.registerFont(smallFont); smallIn)
.deriveFont(Font.PLAIN, 16);
ge.registerFont(font);
}
runescapeSmallFont = StyleContext.getDefaultStyleContext() runescapeSmallFont = StyleContext.getDefaultStyleContext()
.getFont(smallFont.getName(), Font.PLAIN, 16); .getFont(font.getName(), Font.PLAIN, 16);
ge.registerFont(runescapeSmallFont); ge.registerFont(runescapeSmallFont);
Font boldFont = Font.createFont(Font.TRUETYPE_FONT, try (InputStream boldIn = FontManager.class.getResourceAsStream("runescape_bold.ttf"))
FontManager.class.getResourceAsStream("runescape_bold.ttf")) {
.deriveFont(Font.PLAIN, 16); font = Font.createFont(Font.TRUETYPE_FONT,
ge.registerFont(boldFont); boldIn)
.deriveFont(Font.PLAIN, 16);
ge.registerFont(font);
}
runescapeBoldFont = StyleContext.getDefaultStyleContext() runescapeBoldFont = StyleContext.getDefaultStyleContext()
.getFont(boldFont.getName(), Font.PLAIN, 16); .getFont(font.getName(), Font.PLAIN, 16);
ge.registerFont(runescapeBoldFont); ge.registerFont(runescapeBoldFont);
} }
catch (FontFormatException ex) catch (FontFormatException ex)

34
runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java
View File

@@ -26,7 +26,6 @@ package net.runelite.client.ui;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Dimension; import java.awt.Dimension;
import java.lang.reflect.InvocationTargetException;
import javax.swing.JFrame; import javax.swing.JFrame;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JProgressBar; import javax.swing.JProgressBar;
@@ -35,7 +34,6 @@ import lombok.Getter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.client.ui.components.InfoPanel; import net.runelite.client.ui.components.InfoPanel;
import net.runelite.client.ui.components.MessagePanel; import net.runelite.client.ui.components.MessagePanel;
import net.runelite.client.util.ImageUtil;
@Slf4j @Slf4j
public class RuneLiteSplashScreen extends JFrame public class RuneLiteSplashScreen extends JFrame
@@ -53,7 +51,7 @@ public class RuneLiteSplashScreen extends JFrame
this.setSize(FRAME_SIZE); this.setSize(FRAME_SIZE);
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
this.setUndecorated(true); this.setUndecorated(true);
this.setIconImage(ImageUtil.getResourceStreamFromClass(RuneLiteSplashScreen.class, "/openosrs.png")); this.setIconImage(ClientUI.ICON);
final JPanel panel = new JPanel(); final JPanel panel = new JPanel();
panel.setLayout(new BorderLayout()); panel.setLayout(new BorderLayout());
@@ -112,29 +110,17 @@ public class RuneLiteSplashScreen extends JFrame
public static void init() public static void init()
{ {
try SwingUtilities.invokeLater(() ->
{ {
SwingUtilities.invokeAndWait(() -> try
{ {
if (INSTANCE != null) INSTANCE = new RuneLiteSplashScreen();
{ }
return; catch (Exception e)
} {
log.warn("Unable to start splash screen", e);
try }
{ });
INSTANCE = new RuneLiteSplashScreen();
}
catch (Exception e)
{
log.warn("Unable to start splash screen", e);
}
});
}
catch (InterruptedException | InvocationTargetException bs)
{
throw new RuntimeException(bs);
}
} }
public static void close() public static void close()

6
runelite-client/src/main/java/net/runelite/client/util/ImageUtil.java
View File

@@ -36,6 +36,7 @@ import java.awt.image.PixelGrabber;
import java.awt.image.RescaleOp; import java.awt.image.RescaleOp;
import java.awt.image.WritableRaster; import java.awt.image.WritableRaster;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@@ -361,7 +362,10 @@ public class ImageUtil
{ {
synchronized (ImageIO.class) synchronized (ImageIO.class)
{ {
return ImageIO.read(c.getResourceAsStream(path)); try (InputStream in = c.getResourceAsStream(path))
{
return ImageIO.read(in);
}
} }
} }
catch (IOException e) catch (IOException e)

7
runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java
View File

@@ -57,8 +57,7 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder; import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner; import org.mockito.runners.MockitoJUnitRunner;
import net.runelite.client.rs.ClientUpdateCheckMode;
@RunWith(MockitoJUnitRunner.class) @RunWith(MockitoJUnitRunner.class)
public class PluginManagerTest public class PluginManagerTest
@@ -83,7 +82,7 @@ public class PluginManagerTest
public void before() throws IOException public void before() throws IOException
{ {
Injector injector = Guice.createInjector(Modules Injector injector = Guice.createInjector(Modules
.override(new RuneLiteModule(ClientUpdateCheckMode.NONE, true)) .override(new RuneLiteModule(() -> null, true))
.with(BoundFieldModule.of(this))); .with(BoundFieldModule.of(this)));
RuneLite.setInjector(injector); RuneLite.setInjector(injector);
@@ -141,7 +140,7 @@ public class PluginManagerTest
{ {
List<Module> modules = new ArrayList<>(); List<Module> modules = new ArrayList<>();
modules.add(new GraphvizModule()); modules.add(new GraphvizModule());
modules.add(new RuneLiteModule(ClientUpdateCheckMode.NONE, true)); modules.add(new RuneLiteModule(() -> null, true));
PluginManager pluginManager = new PluginManager(true, null, null, null, null, null); PluginManager pluginManager = new PluginManager(true, null, null, null, null, null);
pluginManager.loadCorePlugins(); pluginManager.loadCorePlugins();

5
runelite-client/src/test/java/net/runelite/client/rs/ClientConfigLoaderTest.java
View File

@@ -25,7 +25,6 @@
package net.runelite.client.rs; package net.runelite.client.rs;
import java.io.IOException;
import org.junit.Test; import org.junit.Test;
/** /**
@@ -35,9 +34,9 @@ import org.junit.Test;
public class ClientConfigLoaderTest public class ClientConfigLoaderTest
{ {
@Test @Test
public void test() throws IOException public void test()
{ {
final RSConfig config = ClientConfigLoader.fetch(); final RSConfig config = ClientConfigLoader.fetch().blockingGet();
for (String key : config.getClassLoaderProperties().keySet()) for (String key : config.getClassLoaderProperties().keySet())
{ {