Release Hub development updates for Microbot 2.6.34

src/main/java/net/runelite/client/plugins/microbot/AmmoniteCrabs/AmmoniteCrabPlugin.java

@@ -28,7 +28,7 @@
 @Slf4j
 public class AmmoniteCrabPlugin extends Plugin {
 
-    public final static String version = "1.1.6";
+    public final static String version = "1.1.7";
     @Inject
     public AmmoniteCrabScript ammoniteCrabScript;
     @Inject

src/main/java/net/runelite/client/plugins/microbot/AmmoniteCrabs/AmmoniteCrabScript.java

@@ -46,11 +46,12 @@ public boolean run(AmmoniteCrabConfig config) {
 
                 switch (ammoniteCrabState) {
                     case FIGHT:
-                        if (!Microbot.getClient().getLocalPlayer().isInteracting() && !Rs2Combat.inCombat()) {
+                        if (!Rs2Player.isInteracting() && !Rs2Combat.inCombat()) {
                             Rs2Combat.enableAutoRetialiate();
                         }
 
-                        if (Rs2Player.getWorldLocation().distanceTo(config.crabLocation().getFightLocation()) > 0) {
+                        WorldPoint fightPlayerLocation = Rs2Player.getWorldLocation();
+                        if (fightPlayerLocation != null && fightPlayerLocation.distanceTo(config.crabLocation().getFightLocation()) > 0) {
                             Rs2Walker.walkFastCanvas(config.crabLocation().getFightLocation());
                         }
 
@@ -132,7 +133,8 @@ private void preStateChecks(AmmoniteCrabConfig config) {
             ammoniteCrabState = AmmoniteCrabState.HOP_WORLD;
         }
 
-        if (Microbot.getClientThread().invoke(() -> Microbot.getClient().getLocalPlayer().getWorldLocation()).distanceTo(config.crabLocation().getWorldhopLocation()) > 10 && (ammoniteCrabState != AmmoniteCrabState.RESET_AGGRO && ammoniteCrabState != AmmoniteCrabState.WALK_BACK && ammoniteCrabState != AmmoniteCrabState.BANK)) {
+        WorldPoint playerLocation = Rs2Player.getWorldLocation();
+        if (playerLocation != null && playerLocation.distanceTo(config.crabLocation().getWorldhopLocation()) > 10 && (ammoniteCrabState != AmmoniteCrabState.RESET_AGGRO && ammoniteCrabState != AmmoniteCrabState.WALK_BACK && ammoniteCrabState != AmmoniteCrabState.BANK)) {
             ammoniteCrabState = AmmoniteCrabState.WALK_BACK;
             resetAggro(config);
             resetAfkTimer();
@@ -178,7 +180,11 @@ private void scanAmmoniteCrabLocation(AmmoniteCrabConfig config) {
             ammoniteCrabState = AmmoniteCrabState.FIGHT;
             return;
         }
-        if (config.crabLocation().getWorldhopLocation().distanceTo(Microbot.getClientThread().invoke(() -> Microbot.getClient().getLocalPlayer().getWorldLocation())) > 2) {
+        WorldPoint playerLocation = Rs2Player.getWorldLocation();
+        if (playerLocation == null) {
+            return;
+        }
+        if (config.crabLocation().getWorldhopLocation().distanceTo(playerLocation) > 2) {
             Rs2Walker.walkTo(config.crabLocation().getWorldhopLocation());
             return;
         }
@@ -188,7 +194,7 @@ private void scanAmmoniteCrabLocation(AmmoniteCrabConfig config) {
             return;
         } else {
             Rs2Walker.walkTo(config.crabLocation().getFightLocation(), 0);
-            if (Rs2Player.getWorldLocation().distanceTo(config.crabLocation().getFightLocation()) <= 3) {
+            if (isWithin(Rs2Player.getWorldLocation(), config.crabLocation().getFightLocation(), 3)) {
                 resetAfkTimer();
                 ammoniteCrabState = AmmoniteCrabState.FIGHT;
             } else {
@@ -208,7 +214,7 @@ private void usePotions(AmmoniteCrabConfig config) {
 
     private void walkBack(AmmoniteCrabConfig config) {
         Rs2Walker.walkTo(config.crabLocation().getFightLocation());
-        if (Microbot.getClientThread().invoke(() -> Microbot.getClient().getLocalPlayer().getWorldLocation()).distanceTo(config.crabLocation().getFightLocation()) <= 3) {
+        if (isWithin(Rs2Player.getWorldLocation(), config.crabLocation().getFightLocation(), 3)) {
             attackScatteredCrabs(config);
             resetAfkTimer();
             ammoniteCrabState = AmmoniteCrabState.FIGHT;
@@ -256,7 +262,7 @@ private boolean isNpcAggressive() {
 
     private void resetAggro(AmmoniteCrabConfig config) {
         Rs2Walker.walkTo(config.crabLocation().getResetLocation());
-        if (Microbot.getClientThread().invoke(() -> Microbot.getClient().getLocalPlayer().getWorldLocation()).distanceTo(config.crabLocation().getResetLocation()) <= 3) {
+        if (isWithin(Rs2Player.getWorldLocation(), config.crabLocation().getResetLocation(), 3)) {
             ammoniteCrabState = AmmoniteCrabState.WALK_BACK;
         }
     }
@@ -273,10 +279,17 @@ private void resetAfkTimer() {
     }
 
     private boolean otherPlayerDetected() {
-        return otherPlayerDetected(Microbot.getClientThread().invoke(() -> Microbot.getClient().getLocalPlayer().getWorldLocation()));
+        return otherPlayerDetected(Rs2Player.getWorldLocation());
     }
 
-    private boolean otherPlayerDetected(WorldPoint worldPoint) {
+    static boolean isWithin(WorldPoint location, WorldPoint target, int distance) {
+        return location != null && location.distanceTo(target) <= distance;
+    }
+
+    static boolean otherPlayerDetected(WorldPoint worldPoint) {
+        if (worldPoint == null) {
+            return false;
+        }
         for (Rs2PlayerModel player : Rs2Player.getPlayers(player -> true).collect(Collectors.toList())) {
             if (player.getWorldLocation().distanceTo(worldPoint) > 3)
                 continue;

src/main/java/net/runelite/client/plugins/microbot/aiofighter/AIOFighterPlugin.java

@@ -62,7 +62,7 @@
 )
 @Slf4j
 public class AIOFighterPlugin extends Plugin {
-    public static final String version = "2.2.3";
+    public static final String version = "2.2.9";
     public static boolean needShopping = false;
     private static final String SET = "Set";
     private static final String CENTER_TILE = ColorUtil.wrapWithColorTag("Center Tile", JagexColors.MENU_TARGET);
@@ -251,6 +251,10 @@ public static void setSlayerHasTaskWeakness(boolean slayerHasTaskWeakness) {
     }
 
     public static void setCurrentSlayerInventorySetup(InventorySetup currentInventorySetup) {
+        if (currentInventorySetup == null) {
+            Microbot.log("Inventory setup not found; keeping current inventory setup");
+            return;
+        }
         Microbot.log("Setting current inventory setup to: " + currentInventorySetup.getName());
         setConfig("currentInventorySetup", currentInventorySetup);
     }

src/main/java/net/runelite/client/plugins/microbot/aiofighter/bank/BankerScript.java

@@ -242,6 +242,17 @@ static boolean isSetupResolvable(Collection<String> setupNames, String setupName
                 .anyMatch(name -> name.equalsIgnoreCase(setupName) || name.equals("default"));
     }
 
+    static InventorySetup findSetupByName(Collection<InventorySetup> setups, String setupName) {
+        if (setups == null || setupName == null) {
+            return null;
+        }
+        return setups.stream()
+                .filter(Objects::nonNull)
+                .filter(setup -> setupName.equalsIgnoreCase(setup.getName()))
+                .findFirst()
+                .orElse(null);
+    }
+
     /**
      * Checks if the given setup requires any variant of a specific potion but the player does not have it.
      */
@@ -323,7 +334,7 @@ public boolean hasSlayerItems() {
     public boolean hasProtectiveSlayerEquipment() {
         String needed = Rs2Slayer.getSlayerTaskProtectiveEquipment();
 
-        if ("None".equals(needed)) {
+        if (!requiresProtectiveEquipment(needed)) {
             return true;
         }
 
@@ -349,7 +360,14 @@ public boolean hasProtectiveSlayerEquipment() {
         return result;
     }
 
-    private boolean isBypassedBySlayerHelmet(String item) {
+    static boolean requiresProtectiveEquipment(String needed) {
+        return needed != null && !"None".equals(needed);
+    }
+
+    static boolean isBypassedBySlayerHelmet(String item) {
+        if (item == null) {
+            return false;
+        }
         switch (item) {
             case "Earmuffs":
             case "Facemask":
@@ -472,7 +490,8 @@ public void withdrawUpkeepItems(AIOFighterConfig config) {
                         Rs2Bank.withdrawAndEquip(Rs2Slayer.getSlayerTaskProtectiveEquipment());
                         sleep(3000);
                         inventorySetupsPlugin.addInventorySetup("cache");
-                        InventorySetup inventorySetup1 = MInventorySetupsPlugin.getInventorySetups().stream().filter(Objects::nonNull).filter(x -> x.getName().equalsIgnoreCase("cache")).findFirst().orElse(null);
+                        sleepUntil(() -> findSetupByName(MInventorySetupsPlugin.getInventorySetups(), "cache") != null, 3000);
+                        InventorySetup inventorySetup1 = findSetupByName(MInventorySetupsPlugin.getInventorySetups(), "cache");
                          AIOFighterPlugin.setCurrentSlayerInventorySetup(inventorySetup1);
                     } else {
                         ShopScript.shopItems.add(new ShopItem(Rs2Slayer.getSlayerTaskProtectiveEquipment(), 1, Microbot.getRs2ItemManager().getItemId(Rs2Slayer.getSlayerTaskProtectiveEquipment()), ShopType.SLAYER_SHOP));

src/main/java/net/runelite/client/plugins/microbot/aiofighter/combat/AttackNpcScript.java

@@ -44,6 +44,8 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.IntUnaryOperator;
+import java.util.function.ToIntFunction;
 import java.util.stream.Collectors;
 
 import static net.runelite.api.gameval.VarbitID.*;
@@ -158,12 +160,10 @@ public void run(AIOFighterConfig config) {
                             String name = npc.getName();
                             return name != null && !npcsToAttack.isEmpty() && npcsToAttack.contains(name.toLowerCase());
                         })
-                        .toList()
-                        .stream()
-                        .sorted(Comparator
-                                .comparingInt((Rs2NpcModel npc) -> Objects.equals(npc.getInteracting(), localPlayer) ? 0 : 1)
-                                .thenComparingInt(npc -> rs2PlayerPoint.distanceToPath(npcWorldLocation(npc, instanced))))
-                        .collect(Collectors.toList());
+                        .toList();
+                attackableNpcs = sortBySnapshotKeys(attackableNpcs,
+                        npc -> Objects.equals(npc.getInteracting(), localPlayer) ? 0 : 1,
+                        npc -> rs2PlayerPoint.distanceToPath(npcWorldLocation(npc, instanced)));
 
                 filteredAttackableNpcs.set(attackableNpcs);
 
@@ -296,6 +296,20 @@ public void run(AIOFighterConfig config) {
     }
 
 
+    static <T> List<T> sortBySnapshotKeys(List<T> items, ToIntFunction<T> primary, ToIntFunction<T> secondary) {
+        List<int[]> keyed = new ArrayList<>(items.size());
+        for (int i = 0; i < items.size(); i++) {
+            T item = items.get(i);
+            keyed.add(new int[]{primary.applyAsInt(item), secondary.applyAsInt(item), i});
+        }
+        keyed.sort(Comparator.<int[]>comparingInt(k -> k[0]).thenComparingInt(k -> k[1]));
+        List<T> sorted = new ArrayList<>(keyed.size());
+        for (int[] k : keyed) {
+            sorted.add(items.get(k[2]));
+        }
+        return sorted;
+    }
+
     static boolean shouldHoldAttack(boolean inCombat, boolean antibanEnabled, double actionCooldownChance, boolean actionCooldownActive) {
         if (inCombat) return true;
         return antibanEnabled && actionCooldownChance > 0 && actionCooldownActive;
@@ -310,20 +324,26 @@ private void handleItemOnNpcToKill(AIOFighterConfig config) {
                 .where(n -> n.isDead() && Objects.equals(n.getInteracting(), localPlayer))
                 .first();
         if (npc == null) return;
-        List<String> lizardVariants = new ArrayList<>(Arrays.asList("Lizard", "Desert Lizard", "Small Lizard"));
+        int itemId = finishingItemFor(npc.getName(), npc.getHealthRatio(), Microbot::getVarbitValue);
+        if (itemId == -1) return;
         // Rs2Inventory.useItemOnNpc only accepts the legacy util.npc.Rs2NpcModel — wrap our underlying NPC at the call site.
         net.runelite.client.plugins.microbot.util.npc.Rs2NpcModel legacyNpc =
                 new net.runelite.client.plugins.microbot.util.npc.Rs2NpcModel(npc.getNpc());
-        if (Microbot.getVarbitValue(SLAYER_AUTOKILL_DESERTLIZARDS) == 0 && lizardVariants.contains(npc.getName()) && npc.getHealthRatio() < 5) {
-            Rs2Inventory.useItemOnNpc(ItemID.SLAYER_ICY_WATER, legacyNpc);
-            Rs2Player.waitForAnimation();
-        } else if (Microbot.getVarbitValue(SLAYER_AUTOKILL_ROCKSLUGS) == 0 && npc.getName().equalsIgnoreCase("rockslug") && npc.getHealthRatio() < 5) {
-            Rs2Inventory.useItemOnNpc(ItemID.SLAYER_BAG_OF_SALT, legacyNpc);
-            Rs2Player.waitForAnimation();
-        } else if (Microbot.getVarbitValue(SLAYER_AUTOKILL_GARGOYLES) == 0 && npc.getName().equalsIgnoreCase("gargoyle") && npc.getHealthRatio() < 3) {
-            Rs2Inventory.useItemOnNpc(ItemID.SLAYER_ROCK_HAMMER, legacyNpc);
-            Rs2Player.waitForAnimation();
+        Rs2Inventory.useItemOnNpc(itemId, legacyNpc);
+        Rs2Player.waitForAnimation();
+    }
+
+    static int finishingItemFor(String name, int healthRatio, IntUnaryOperator varbits) {
+        if (name == null) return -1;
+        List<String> lizardVariants = Arrays.asList("Lizard", "Desert Lizard", "Small Lizard");
+        if (varbits.applyAsInt(SLAYER_AUTOKILL_DESERTLIZARDS) == 0 && lizardVariants.contains(name) && healthRatio < 5) {
+            return ItemID.SLAYER_ICY_WATER;
+        } else if (varbits.applyAsInt(SLAYER_AUTOKILL_ROCKSLUGS) == 0 && name.equalsIgnoreCase("rockslug") && healthRatio < 5) {
+            return ItemID.SLAYER_BAG_OF_SALT;
+        } else if (varbits.applyAsInt(SLAYER_AUTOKILL_GARGOYLES) == 0 && name.equalsIgnoreCase("gargoyle") && healthRatio < 3) {
+            return ItemID.SLAYER_ROCK_HAMMER;
         }
+        return -1;
     }
 
     /**

src/main/java/net/runelite/client/plugins/microbot/aiofighter/combat/SafeSpot.java

@@ -19,7 +19,7 @@ public class SafeSpot extends Script {
 public boolean run(AIOFighterConfig config) {
     mainScheduledFuture = scheduledExecutorService.scheduleWithFixedDelay(() -> {
         try {
-            if (AIOFighterPlugin.getState().equals(State.BANKING) || AIOFighterPlugin.getState().equals(State.WALKING)) return;
+            if (isBlockedByState(AIOFighterPlugin.getState())) return;
             if (!Microbot.isLoggedIn() || !super.run() || !config.toggleSafeSpot() || Rs2Player.isMoving()) return;
 
             currentSafeSpot = config.safeSpot();
@@ -48,6 +48,10 @@ public boolean run(AIOFighterConfig config) {
     return true;
 }
 
+static boolean isBlockedByState(State state) {
+    return state == State.BANKING || state == State.WALKING;
+}
+
 private boolean isDefaultSafeSpot(WorldPoint safeSpot) {
     return safeSpot.getX() == 0 && safeSpot.getY() == 0;
 }

src/main/java/net/runelite/client/plugins/microbot/aiofighter/skill/AttackStyleScript.java

@@ -197,14 +197,25 @@ private void updateAttackStyle(int equippedWeaponType, int attackStyleIndex, int
         }
     }
 
-    private AttackStyle[] getWeaponTypeStyles(int weaponType) {
-        int weaponStyleEnum = Microbot.getEnum(EnumID.WEAPON_STYLES).getIntValue(weaponType);
-        int[] weaponStyleStructs = Microbot.getEnum(weaponStyleEnum).getIntVals();
+    static AttackStyle[] getWeaponTypeStyles(int weaponType) {
+        EnumComposition weaponStylesEnum = Microbot.getEnum(EnumID.WEAPON_STYLES);
+        if (weaponStylesEnum == null) {
+            return new AttackStyle[0];
+        }
+        EnumComposition weaponStyleEnum = Microbot.getEnum(weaponStylesEnum.getIntValue(weaponType));
+        if (weaponStyleEnum == null) {
+            return new AttackStyle[0];
+        }
+        int[] weaponStyleStructs = weaponStyleEnum.getIntVals();
 
         AttackStyle[] styles = new AttackStyle[weaponStyleStructs.length];
         int i = 0;
         for (int style : weaponStyleStructs) {
-            String attackStyleName = Microbot.getStructComposition(style).getStringValue(ParamID.ATTACK_STYLE_NAME);
+            StructComposition struct = Microbot.getStructComposition(style);
+            String attackStyleName = struct == null ? null : struct.getStringValue(ParamID.ATTACK_STYLE_NAME);
+            if (attackStyleName == null) {
+                return new AttackStyle[0];
+            }
             AttackStyle attackStyle = AttackStyle.valueOf(attackStyleName.toUpperCase());
 
             if (attackStyle == AttackStyle.OTHER) {

src/main/java/net/runelite/client/plugins/microbot/bankorganizer/BankOrganizerPlugin.java

@@ -42,7 +42,7 @@
 @Slf4j
 public class BankOrganizerPlugin extends Plugin
 {
-	public static final String version = "1.0.0";
+	public static final String version = "1.0.1";
 
 	@Inject
 	private BankOrganizerConfig config;

src/main/java/net/runelite/client/plugins/microbot/bankorganizer/BankSnapshotReader.java

@@ -8,6 +8,7 @@
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Optional;
 import javax.inject.Inject;
 import net.runelite.api.Client;
 import net.runelite.api.ItemComposition;
@@ -44,14 +45,15 @@ final class BankSnapshotReader
 	BankSnapshot read()
 	{
 		return Microbot.getClientThread().runOnClientThreadOptional(this::readOnClientThread)
-			.orElseThrow(() -> new IllegalStateException("Could not read bank snapshot on the client thread."));
+			.orElseThrow(() -> new IllegalStateException("Could not read bank snapshot on the client thread."))
+			.orElseThrow(() -> new IllegalStateException("Open your bank before running Bank Organizer."));
 	}
 
-	private BankSnapshot readOnClientThread()
+	private Optional<BankSnapshot> readOnClientThread()
 	{
 		if (!Rs2Bank.isOpen())
 		{
-			throw new IllegalStateException("Open your bank before running Bank Organizer.");
+			return Optional.empty();
 		}
 
 		List<Rs2ItemModel> bankItems = new ArrayList<>(Rs2Bank.bankItems());
@@ -83,7 +85,7 @@ private BankSnapshot readOnClientThread()
 				isEquipable(composition)));
 		}
 
-		return new BankSnapshot(stacks, tabCounts, client.getVarbitValue(Varbits.CURRENT_BANK_TAB));
+		return Optional.of(new BankSnapshot(stacks, tabCounts, client.getVarbitValue(Varbits.CURRENT_BANK_TAB)));
 	}
 
 	private int[] readTabCounts()

src/main/java/net/runelite/client/plugins/microbot/cluesolver/ClueSolverPlugin.java

@@ -29,7 +29,7 @@
 @PluginDependency(ClueScrollPlugin.class)
 public class ClueSolverPlugin extends Plugin {
 
-    final static String version = "1.0.5";
+    final static String version = "1.0.7";
     @Inject
     private ClueSolverScript clueSolverScript;
 

src/main/java/net/runelite/client/plugins/microbot/cluesolver/cluetask/AnagramClueTask.java

@@ -183,9 +183,11 @@ private boolean handleDialogue() {
                 Rs2Dialogue.clickContinue();
             }
 
-            Rs2Keyboard.typeString(answer);
-            Rs2Keyboard.enter();
-            Rs2Dialogue.sleepUntilHasContinue();
+            if (answer != null && !answer.isBlank()) {
+                Rs2Keyboard.typeString(answer);
+                Rs2Keyboard.enter();
+                Rs2Dialogue.sleepUntilHasContinue();
+            }
 
             if (Rs2Dialogue.hasContinue()) {
                 Rs2Dialogue.clickContinue();