- Reliability improvements to rune essence mining

Author: Explv

AIO/src/org/aio/activities/skills/mining/RuneEssMiningActivity.java

@@ -4,17 +4,17 @@
 import org.aio.util.ResourceMode;
 import org.aio.util.Sleep;
 import org.osbot.rs07.api.map.Area;
-import org.osbot.rs07.api.map.Position;
 import org.osbot.rs07.api.model.Entity;
+import org.osbot.rs07.api.model.RS2Object;
+import org.osbot.rs07.event.WalkingEvent;
 
-import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Optional;
 import java.util.stream.Stream;
 
 public class RuneEssMiningActivity extends MiningActivity {
 
-    private final Area auburyHouse = new Area(
+    private static final Area AUBURY_HOUSE = new Area(
             new int[][]{
                     { 3250, 3403 },
                     { 3250, 3401 },
@@ -28,39 +28,26 @@ public class RuneEssMiningActivity extends MiningActivity {
             }
     );
 
-    private final int[][] gridPortalCoordinates = {
-            { 37, 29 },
-            { 33, 76 },
-            { 72, 77 },
-            { 74, 33 }
-    };
-
     public RuneEssMiningActivity(final ResourceMode resourceMode) {
         super(null, Rock.RUNE_ESSENCE, resourceMode);
     }
 
     @Override
     public void onStart() throws InterruptedException {
         super.onStart();
-
         miningNode = new MiningNode();
         miningNode.exchangeContext(getBot());
     }
 
     @Override
     public void runActivity() throws InterruptedException {
-        if ((shouldBank() || pickaxeBanking.toolUpgradeAvailable()) && getObjects().closest("Rune Essence") != null) {
+        if ((shouldBank() || pickaxeBanking.toolUpgradeAvailable()) && inEssenceMine()) {
             leaveEssenceMine();
         } else {
             super.runActivity();
         }
     }
 
-    @Override
-    public boolean canExit() {
-        return getObjects().closest("Rune Essence") == null;
-    }
-
     @Override
     protected boolean inventoryContainsNonMiningItem() {
         return getInventory().contains(item -> {
@@ -73,43 +60,68 @@ protected boolean inventoryContainsNonMiningItem() {
         });
     }
 
+    private boolean inEssenceMine() {
+        return getClosestRuneEssence() != null;
+    }
+
+    private RS2Object getClosestRuneEssence() {
+        return getObjects().closest("Rune Essence");
+    }
+
     private void leaveEssenceMine() {
-        Optional<Entity> portal = Stream.concat(getObjects().getAll().stream(), getNpcs().getAll().stream())
-                .filter(entity -> entity.getName().contains("Portal"))
-                .min(Comparator.comparingInt(p -> myPosition().distance(p.getPosition())));
-        if (portal.isPresent()) {
-            if (portal.get().interact("Use", "Exit")) {
-                Sleep.sleepUntil(() -> auburyHouse.contains(myPosition()), 10_000);
-            }
-        } else {
-            Position[] portalPositions = new Position[4];
-            for (int i = 0; i < gridPortalCoordinates.length; i++) {
-                portalPositions[i] = new Position(getMap().getBaseX() + gridPortalCoordinates[i][0], getMap().getBaseY() + gridPortalCoordinates[i][1], myPlayer().getZ());
-            }
-            Position closestPosition = Arrays.stream(portalPositions).min(Comparator.comparingInt(p -> myPosition().distance(p))).get();
-            getWalking().walk(closestPosition);
+        Optional<Entity> portal = getClosestPortal();
+
+        if (!portal.isPresent()) {
+            getWalking().walk(getClosestRuneEssence());
+        } else if (myPosition().distance(portal.get().getPosition()) > 3) {
+            WalkingEvent walkingEvent = new WalkingEvent(portal.get());
+            walkingEvent.setMinDistanceThreshold(2);
+            execute(walkingEvent);
+        } else if (portal.get().interact("Use", "Exit")) {
+            Sleep.sleepUntil(() -> AUBURY_HOUSE.contains(myPosition()), 10_000);
         }
     }
 
+    private Optional<Entity> getClosestPortal() {
+        // For some reason portals can be both Objects and NPCs
+        return Stream.concat(
+                   getObjects().getAll().stream(),
+                   getNpcs().getAll().stream()
+               )
+               .filter(entity -> entity.getName().contains("Portal"))
+               .min(Comparator.comparingInt(p -> myPosition().distance(p.getPosition())));
+    }
+
     private class MiningNode extends Executable {
+
         @Override
         public void run() throws InterruptedException {
             if (myPlayer().isAnimating()) {
                 return;
-            } else if (getObjects().closest("Rune Essence") != null) {
-                if (getObjects().closest("Rune Essence").interact("Mine")) {
+            }
+
+            if (inEssenceMine()) {
+                RS2Object essence = getClosestRuneEssence();
+                if (myPosition().distance(essence) > 5) {
+                    getWalking().walk(essence);
+                } else if (essence.interact("Mine")) {
                     Sleep.sleepUntil(() -> myPlayer().isAnimating(), 10_000);
                 }
-            } else if (auburyHouse.contains(myPosition())) {
+            } else if (AUBURY_HOUSE.contains(myPosition())) {
                 if (getNpcs().closest("Aubury").interact("Teleport")) {
                     Sleep.sleepUntil(() -> getNpcs().closest("Aubury") == null, 10_000);
                 }
             } else {
-                getWalking().webWalk(auburyHouse);
+                getWalking().webWalk(AUBURY_HOUSE);
             }
         }
     }
 
+    @Override
+    public boolean canExit() {
+        return !inEssenceMine();
+    }
+
     @Override
     public RuneEssMiningActivity copy() {
         return new RuneEssMiningActivity(resourceMode);

AIO/src/org/aio/script/AIO.java

@@ -31,7 +31,7 @@
 @ScriptManifest(author = "Explv", name = "Explv's AIO " + AIO.VERSION, info = "AIO", version = 0, logo = "http://i.imgur.com/58Zz0fb.png")
 public class AIO extends Script {
 
-    static final String VERSION = "v2.1.3";
+    static final String VERSION = "v2.1.4";
 
     private Gui gui;
     private Paint paint;