From bc3af562bd6be3b7e16a51ca225ca91310a644f2 Mon Sep 17 00:00:00 2001 From: rbbi <31489752+rbbi@users.noreply.github.com> Date: Sun, 17 Dec 2017 03:06:23 +0000 Subject: [PATCH] Guice : RuneliteProperties inj (#212) --- .../src/main/java/net/runelite/client/RuneLite.java | 4 +++- .../main/java/net/runelite/client/RuneliteProperties.java | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) 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 646d96d289..f8d1b4dd33 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLite.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLite.java @@ -88,10 +88,12 @@ public class RuneLite private static RuneLite runelite; private static TrayIcon trayIcon; - private final RuneliteProperties properties = new RuneliteProperties(); private Client client; private ClientUI gui; + @Inject + private RuneliteProperties properties; + @Inject private PluginManager pluginManager; diff --git a/runelite-client/src/main/java/net/runelite/client/RuneliteProperties.java b/runelite-client/src/main/java/net/runelite/client/RuneliteProperties.java index 7a8abd679d..ad53a85727 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneliteProperties.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneliteProperties.java @@ -29,6 +29,10 @@ import java.io.InputStream; import java.util.Properties; import lombok.extern.slf4j.Slf4j; +import javax.inject.Inject; +import javax.inject.Singleton; + +@Singleton @Slf4j public class RuneliteProperties { @@ -36,6 +40,7 @@ public class RuneliteProperties private final Properties properties = new Properties(); + @Inject public RuneliteProperties() { InputStream in = getClass().getResourceAsStream("runelite.properties");