Merge pull request #183 from OSRSB/cleanup

Fix recent update breaking the client
OSRSB · Apr 27, 2022 · a265932 · a265932
2 parents b19cc30 + cd3bb9a
commit a265932
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ repositories {
     mavenCentral()
 }
 
-def runeLiteVersion = '1.8.16'
+def runeLiteVersion = '1.8.18.4'
 
 dependencies {
     implementation group: 'net.runelite', name: 'client', version: runeLiteVersion

diff --git a/src/main/java/rsb/botLauncher/Application.java b/src/main/java/rsb/botLauncher/Application.java
@@ -33,10 +33,9 @@ public static void main(final String[] args) throws Throwable {
 		OptionSet options = parser.parse(args);
 		programArgs = args;
 
-		checkForCacheAndLoad();
-
 		if (!options.has("bot") || options.has("bot-runelite") || options.has("runelite")) {
 			if (options.has("bot-runelite") && !options.has("runelite")) {
+				checkForCacheAndLoad();
 				RuneLite bot = new RuneLite();
 				bot.launch(parser, optionSpecs, options);
 				addBot(bot);

diff --git a/src/main/java/rsb/internal/BotModule.java b/src/main/java/rsb/internal/BotModule.java
@@ -52,12 +52,15 @@ public BotModule(OkHttpClient okHttpClient, Supplier<Applet> clientLoader, Suppl
     @Override
     protected void configure()
     {
+        // bind properties
         Properties properties = BotProperties.getProperties();
         for (String key : properties.stringPropertyNames())
         {
             String value = properties.getProperty(key);
             bindConstant().annotatedWith(Names.named(key)).to(value);
         }
+
+        // bind runtime config
         RuntimeConfig runtimeConfig = configSupplier.get();
         if (runtimeConfig != null && runtimeConfig.getProps() != null)
         {
@@ -71,13 +74,13 @@ protected void configure()
                 else if (entry.getValue() instanceof Double)
                 {
                     ConstantBindingBuilder binder = bindConstant().annotatedWith(Names.named(entry.getKey()));
-                    if (DoubleMath.isMathematicalInteger((Double) entry.getValue()))
+                    if (DoubleMath.isMathematicalInteger((double) entry.getValue()))
                     {
-                        binder.to(((Double) entry.getValue()).intValue());
+                        binder.to((int) (double) entry.getValue());
                     }
                     else
                     {
-                        binder.to((Double) entry.getValue());
+                        binder.to((double) entry.getValue());
                     }
                 }
             }

diff --git a/src/main/java/rsb/plugin/BotPanel.java b/src/main/java/rsb/plugin/BotPanel.java
@@ -53,7 +53,7 @@ class BotPanel extends PluginPanel
 
 
 	@Inject
-	private BotPanel(ClientThread clientThread, ItemManager itemManager, ScheduledExecutorService executor)
+	private BotPanel()
 	{
 		super(false);
 		setLayout(new BorderLayout());