development

gradle.properties

@@ -31,7 +31,7 @@ project.build.group=net.runelite
 project.build.version=1.12.22
 
 glslang.path=
-microbot.version=2.1.30
+microbot.version=2.1.31
 microbot.commit.sha=nogit
 microbot.repo.url=http://138.201.81.246:8081/repository/microbot-snapshot/
 microbot.repo.username=

runelite-client/src/main/java/net/runelite/client/game/LootManager.java

@@ -66,6 +66,7 @@
 import net.runelite.client.events.ServerNpcLoot;
 import net.runelite.client.events.NpcLootReceived;
 import net.runelite.client.events.PlayerLootReceived;
+import net.runelite.client.plugins.microbot.util.player.Rs2Player;
 import net.runelite.client.util.Text;
 
 @Singleton
@@ -161,7 +162,7 @@ public void onPlayerDespawned(PlayerDespawned playerDespawned)
 			return;
 		}
 
-		final WorldPoint worldPoint = player.getWorldLocation();
+		final WorldPoint worldPoint = Rs2Player.getWorldLocation();
 		final LocalPoint location = LocalPoint.fromWorld(client, worldPoint);
 		if (location == null || killPoints.contains(worldPoint))
 		{

runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java

@@ -44,6 +44,7 @@
 import net.runelite.api.Point;
 import net.runelite.api.coords.LocalPoint;
 import net.runelite.api.coords.WorldPoint;
+import net.runelite.client.plugins.microbot.util.player.Rs2Player;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
@@ -78,7 +79,7 @@ public Dimension render(Graphics2D g)
 			return null;
 		}
 
-		WorldPoint playerLoc = player.getWorldLocation();
+		WorldPoint playerLoc = Rs2Player.getWorldLocation();
 
 		if (playerLoc.getRegionID() != KourendLibraryPlugin.REGION)
 		{

runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryTutorialOverlay.java

@@ -30,6 +30,7 @@
 import net.runelite.api.Client;
 import net.runelite.api.Player;
 import net.runelite.api.coords.WorldPoint;
+import net.runelite.client.plugins.microbot.util.player.Rs2Player;
 import net.runelite.client.ui.overlay.OverlayPanel;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.components.LineComponent;
@@ -77,7 +78,7 @@ public Dimension render(Graphics2D graphics)
 			return null;
 		}
 
-		WorldPoint playerLoc = player.getWorldLocation();
+		WorldPoint playerLoc = Rs2Player.getWorldLocation();
 		if (playerLoc.getRegionID() != KourendLibraryPlugin.REGION)
 		{
 			return null;

runelite-client/src/main/java/net/runelite/client/plugins/microbot/MicrobotPlugin.java

@@ -179,6 +179,7 @@ protected void startUp() throws AWTException
 			overlayManager.add(gembagOverlay);
 			overlayManager.add(pouchOverlay);
 		}
+
 	}
 
 	protected void shutDown()
@@ -502,7 +503,7 @@ public void onOverlayMenuClicked(OverlayMenuClicked overlayMenuClicked)
 
 	@Subscribe
 	public void onGameTick(GameTick event)
-	{		
+	{
 		// Cache loading is now handled properly during login/profile changes
 		// No need to call loadInitialCacheFromCurrentConfig on every tick
 	}

runelite-client/src/main/java/net/runelite/client/plugins/microbot/accountselector/AutoLoginScript.java

@@ -243,6 +243,15 @@ private void initiateLogin(AutoLoginConfig config) {
 
             boolean membersOnly = config.membersOnly();
 
+            if (config.usePreferredWorld() && config.world() > 0) {
+                if (Rs2WorldUtil.canAccessWorld(config.world())) {
+                    targetWorld = config.world();
+                    log.info("Using preferred world: {}", targetWorld);
+                } else {
+                    log.warn("Preferred world {} is not accessible, falling back to world selection mode", config.world());
+                }
+            }
+
             // use world selection mode if no preferred world or preferred world not accessible
             if (targetWorld == -1) {
                 switch (config.worldSelectionMode()) {

runelite-client/src/main/java/net/runelite/client/plugins/microbot/api/boat/models/Rs2BoatModel.java

@@ -15,6 +15,7 @@
 import net.runelite.client.plugins.microbot.api.boat.data.PortTaskVarbits;
 import net.runelite.client.plugins.microbot.globval.enums.InterfaceTab;
 import net.runelite.client.plugins.microbot.util.menu.NewMenuEntry;
+import net.runelite.client.plugins.microbot.util.player.Rs2Player;
 import net.runelite.client.plugins.microbot.util.tabs.Rs2Tab;
 import net.runelite.client.plugins.microbot.util.widget.Rs2Widget;
 
@@ -255,7 +256,7 @@ public WorldPoint getPlayerBoatLocation()
                 return null;
             }
 
-            WorldPoint playerLocation = player.getWorldLocation();
+            WorldPoint playerLocation = Rs2Player.getWorldLocation();
             LocalPoint localPoint = LocalPoint.fromWorld(
                     player.getWorldView(),
                     playerLocation

runelite-client/src/main/java/net/runelite/client/plugins/microbot/questhelper/helpers/miniquests/enchantedkey/EnchantedKeyDigStep.java

@@ -42,6 +42,7 @@
 import net.runelite.api.gameval.VarbitID;
 import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.game.ItemManager;
+import net.runelite.client.plugins.microbot.util.player.Rs2Player;
 import net.runelite.client.ui.overlay.OverlayUtil;
 import net.runelite.client.ui.overlay.components.LineComponent;
 import net.runelite.client.ui.overlay.components.PanelComponent;
@@ -184,7 +185,7 @@ public boolean update(final String message)
 			return false;
 		}
 
-		final WorldPoint localWorld = player.getWorldLocation();
+		final WorldPoint localWorld = Rs2Player.getWorldLocation();
 
 		if (localWorld == null)
 		{

runelite-client/src/main/java/net/runelite/client/plugins/microbot/questhelper/helpers/quests/monkeymadnessii/AgilityDungeonSteps.java

@@ -44,6 +44,7 @@
 import net.runelite.api.events.GameTick;
 import net.runelite.api.gameval.*;
 import net.runelite.client.eventbus.Subscribe;
+import net.runelite.client.plugins.microbot.util.player.Rs2Player;
 
 import java.util.*;
 
@@ -416,7 +417,7 @@ public void checkSection5Successes()
 		{
 			return;
 		}
-		WorldPoint currentPosition = player.getWorldLocation();
+		WorldPoint currentPosition = Rs2Player.getWorldLocation();
 		for (int i = 0; i < fifthSectionMap.length; i++)
 		{
 			MM2Route[] pathsFromNode = fifthSectionMap[i].getPaths();

runelite-client/src/main/java/net/runelite/client/plugins/microbot/questhelper/managers/QuestMenuHandler.java

@@ -33,6 +33,7 @@
 import net.runelite.api.*;
 import net.runelite.api.coords.WorldPoint;
 import net.runelite.api.gameval.InterfaceID;
+import net.runelite.client.plugins.microbot.util.player.Rs2Player;
 import net.runelite.client.util.Text;
 
 import javax.inject.Inject;
@@ -130,7 +131,7 @@ private void handleShieldOfArrav()
 			return;
 		}
 
-		WorldPoint location = player.getWorldLocation();
+		WorldPoint location = Rs2Player.getWorldLocation();
 		QuestHelperQuest questToStart = PHOENIX_START_ZONE.contains(location) ?
 			QuestHelperQuest.SHIELD_OF_ARRAV_PHOENIX_GANG :
 			QuestHelperQuest.SHIELD_OF_ARRAV_BLACK_ARM_GANG;

runelite-client/src/main/java/net/runelite/client/plugins/microbot/questhelper/statemanagement/PlayerStateManager.java

@@ -41,6 +41,7 @@
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.eventbus.EventBus;
 import net.runelite.client.eventbus.Subscribe;
+import net.runelite.client.plugins.microbot.util.player.Rs2Player;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -124,7 +125,7 @@ public void onGameTick(GameTick gameTick)
 		Player player = client.getLocalPlayer();
 		if (player != null)
 		{
-			WorldPoint newPos = player.getWorldLocation();
+			WorldPoint newPos = Rs2Player.getWorldLocation();
 			if (newPos != null && lastPlayerPos != null)
 			{
 				if (newPos.distanceTo(lastPlayerPos) != 0)