Fixed merge branch

build.gradle

@@ -15,7 +15,7 @@ repositories {
     }
 }
 
-def lastSupportedVersion = "1.10.36"
+def lastSupportedVersion = "1.11.7"
 def runeLiteVersion = getRuneLiteVersion()
 def supportedCheck = false
 if (supportedCheck) {
@@ -24,9 +24,8 @@ if (supportedCheck) {
         throw new Exception("Out of date (last supported: " + lastSupportedVersion + " current client: " + runeLiteVersion + ")")
     }
 }
-
 static def getRuneLiteVersion() {
-    URL url = new URL("http://repo.runelite.net/net/runelite/client/maven-metadata.xml")
+    URL url = new URL("https://repo.runelite.net/net/runelite/client/maven-metadata.xml")
     URLConnection urlConnection = url.openConnection()
     BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(
             urlConnection.getInputStream()))

src/main/java/net/runelite/client/callback/ClientThread.java

@@ -70,28 +70,20 @@ public void invokeLater(BooleanSupplier r) {
         invokes.add(r);
     }
 
+    public void invokeAtTickEnd(Runnable r)
+    {
+        invokesAtTickEnd.add(() ->
+        {
+            r.run();
+            return true;
+        });
+    }
+
     /**
      * Invokes queued actions on the client thread
      */
     void invoke() {
-        assert client.isClientThread();
-        Iterator<BooleanSupplier> ir = invokes.iterator();
-        while (ir.hasNext()) {
-            BooleanSupplier r = ir.next();
-            boolean remove = true;
-            try {
-                remove = r.getAsBoolean();
-            } catch (ThreadDeath d) {
-                throw d;
-            } catch (Throwable e) {
-                log.warn("Exception in invoke", e);
-            }
-            if (remove) {
-                ir.remove();
-            } else {
-                log.trace("Deferring task {}", r);
-            }
-        }
+        invokeList(invokes);
     }
 
     void invokeTickEnd() {
@@ -118,4 +110,4 @@ private void invokeList(ConcurrentLinkedQueue<BooleanSupplier> invokes) {
             }
         }
     }
-}
+}

src/main/java/net/runelite/client/modified/BotModule.java

@@ -34,6 +34,7 @@
 import net.runelite.client.game.NPCManager;
 import net.runelite.client.menus.MenuManager;
 import net.runelite.client.plugins.PluginManager;
+import net.runelite.client.rs.ClientLoader;
 import net.runelite.client.task.Scheduler;
 import net.runelite.client.util.DeferredEventBus;
 import net.runelite.client.util.ExecutorServiceExceptionLogger;
@@ -47,7 +48,7 @@
 public class BotModule extends AbstractModule {
 
     private final OkHttpClient okHttpClient;
-    private final Supplier<Applet> clientLoader;
+    private final ClientLoader clientLoader;
     private final RuntimeConfigLoader configSupplier;
     private final boolean developerMode;
     private final boolean safeMode;
@@ -60,7 +61,7 @@ public class BotModule extends AbstractModule {
     private final boolean noupdate = false;
 
 
-    public BotModule(OkHttpClient okHttpClient, Supplier<Applet> clientLoader, RuntimeConfigLoader configSupplier, boolean developerMode, boolean safeMode, File sessionfile, File config) {
+    public BotModule(OkHttpClient okHttpClient, ClientLoader clientLoader, RuntimeConfigLoader configSupplier, boolean developerMode, boolean safeMode, File sessionfile, File config) {
         this.okHttpClient = okHttpClient;
         this.clientLoader = clientLoader;
         this.configSupplier = configSupplier;
@@ -144,7 +145,7 @@ else if (entry.getValue() instanceof Double)
     @Singleton
     Applet provideApplet()
     {
-        return clientLoader.get();
+        return (Applet) clientLoader.get();
     }
 
     @Provides

src/main/java/net/runelite/client/modified/RuneLite.java

@@ -49,7 +49,6 @@
 import net.runelite.client.game.WorldService;
 import net.runelite.client.plugins.PluginManager;
 import net.runelite.client.rs.ClientLoader;
-import net.runelite.client.rs.ClientUpdateCheckMode;
 import net.runelite.client.ui.FontManager;
 import net.runelite.client.ui.overlay.WidgetOverlay;
 import net.runelite.rsb.botLauncher.BotLite;
@@ -175,23 +174,11 @@ public static ArgumentAcceptingOptionSpec<?>[] handleParsing(OptionParser parser
                 .withValuesConvertedBy(new ConfigFileConverter())
                 .defaultsTo(DEFAULT_CONFIG_FILE);
 
-        final ArgumentAcceptingOptionSpec<ClientUpdateCheckMode> updateMode = parser
-                .accepts("rs", "Select client type")
-                .withRequiredArg()
-                .ofType(ClientUpdateCheckMode.class)
-                .defaultsTo(ClientUpdateCheckMode.AUTO)
-                .withValuesConvertedBy(new EnumConverter<>(ClientUpdateCheckMode.class) {
-                    @Override
-                    public ClientUpdateCheckMode convert(String v) {
-                        return super.convert(v.toUpperCase());
-                    }
-                });
-
         final ArgumentAcceptingOptionSpec<String> proxyInfo = parser
                 .accepts("proxy", "Designates a proxy ip address to be used to make the bot server connections")
                 .withRequiredArg().ofType(String.class);
 
-        return (ArgumentAcceptingOptionSpec<?>[]) new ArgumentAcceptingOptionSpec[]{sessionfile, configfile, updateMode, proxyInfo};
+        return (ArgumentAcceptingOptionSpec<?>[]) new ArgumentAcceptingOptionSpec[]{sessionfile, configfile, proxyInfo};
     }
 
     /**
@@ -260,7 +247,6 @@ public static void initializeClient(ArgumentAcceptingOptionSpec<?>[] optionSpecs
         {
             final RuntimeConfigLoader runtimeConfigLoader = new RuntimeConfigLoader(okHttpClient);
             final ClientLoader clientLoader = new ClientLoader(okHttpClient,
-                    options.valueOf(optionSpecs[Options.UPDATE_MODE.getIndex()].ofType(ClientUpdateCheckMode.class)),
                     runtimeConfigLoader,
                     (String) options.valueOf("jav_config"));
 

src/main/java/net/runelite/rsb/wrappers/client_wrapper/BaseClientWrapper.java

@@ -1,5 +1,6 @@
 package net.runelite.rsb.wrappers.client_wrapper;
 
+import com.jagex.oldscape.pub.OAuthApi;
 import net.runelite.api.*;
 import net.runelite.api.annotations.Varp;
 import net.runelite.api.clan.ClanChannel;
@@ -12,27 +13,17 @@
 import net.runelite.api.vars.AccountType;
 import net.runelite.api.widgets.Widget;
 import net.runelite.api.widgets.WidgetInfo;
-import net.runelite.api.widgets.WidgetModalMode;
 import net.runelite.api.worldmap.MapElementConfig;
 import net.runelite.api.worldmap.WorldMap;
-import net.runelite.api.RuneLiteObjectController;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.applet.Applet;
 import java.awt.*;
-import java.lang.reflect.Method;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
 import java.util.function.IntPredicate;
-import com.jagex.oldscape.pub.OAuthApi;
-import com.jagex.oldscape.pub.OtlTokenRequester;
-import com.jagex.oldscape.pub.OtlTokenResponse;
-
-
-
-
 
 /*
 Base class for wrapping runelite Client, along with some weird Applet shenanigans.
@@ -81,14 +72,12 @@ public List<NPC> getNpcs() {
         return wrappedClient.getNpcs();
     }
 
-    @Override
     public NPC[] getCachedNPCs() {
-        return wrappedClient.getCachedNPCs();
+       return (NPC[]) wrappedClient.getTopLevelWorldView().npcs().stream().toArray();
     }
 
-    @Override
     public Player[] getCachedPlayers() {
-        return wrappedClient.getCachedPlayers();
+        return (Player[]) wrappedClient.getTopLevelWorldView().players().stream().toArray();
     }
 
     @Override
@@ -235,6 +224,11 @@ public int getWorld() {
         return wrappedClient.getWorld();
     }
 
+    @Override
+    public String getWorldHost() {
+        return wrappedClient.getWorldHost();
+    }
+
     @Override
     public int getCanvasHeight() {
         return wrappedClient.getCanvasHeight();
@@ -784,6 +778,26 @@ public LocalPoint getLocalDestinationLocation() {
         return wrappedClient.getLocalDestinationLocation();
     }
 
+    @Override
+    public void registerRuneLiteObject(RuneLiteObjectController controller) {
+        wrappedClient.registerRuneLiteObject(controller);
+    }
+
+    @Override
+    public void removeRuneLiteObject(RuneLiteObjectController controller) {
+        wrappedClient.removeRuneLiteObject(controller);
+    }
+
+    @Override
+    public boolean isRuneLiteObjectRegistered(RuneLiteObjectController controller) {
+        return wrappedClient.isRuneLiteObjectRegistered(controller);
+    }
+
+    @Override
+    public List<MidiRequest> getActiveMidiRequests() {
+        return wrappedClient.getActiveMidiRequests();
+    }
+
     @Override
     public Projectile createProjectile(int id, int plane, int startX, int startY, int startZ, int startCycle, int endCycle, int slope, int startHeight, int endHeight, @Nullable Actor target, int targetX, int targetY) {
         return wrappedClient.createProjectile(id, plane, startX, startY, startZ, startCycle, endCycle, slope, startHeight, endHeight, target, targetX, targetY);
@@ -1643,19 +1657,4 @@ public void setDraw2DMask(int mask) {
     public int getDraw2DMask() {
         return wrappedClient.getDraw2DMask();
     }
-
-    @Override
-    public List<MidiRequest> getActiveMidiRequests() {
-        return wrappedClient.getActiveMidiRequests();
-    }
-
-    @Override
-    public boolean isRuneLiteObjectRegistered(RuneLiteObjectController controller) {return wrappedClient.isRuneLiteObjectRegistered(controller);}
-
-    @Override
-    public void removeRuneLiteObject(RuneLiteObjectController controller) {wrappedClient.removeRuneLiteObject(controller);}
-
-    @Override
-    public void registerRuneLiteObject(RuneLiteObjectController controller) {wrappedClient.registerRuneLiteObject(controller);}
-
 }

src/main/java/net/runelite/rsb/wrappers/client_wrapper/BaseWidgetWrapper.java

@@ -779,8 +779,8 @@ public void setOnScrollWheelListener(Object... objects) {
     @Override
     public void clearActions() { wrappedWidget.clearActions(); }
 
-
     @Override
-    public int[] getVarTransmitTrigger() { return wrappedWidget.getVarTransmitTrigger(); }
-
+    public int[] getVarTransmitTrigger() {
+        return wrappedWidget.getVarTransmitTrigger();
+    }
 }