Improved Pathing logic

Author: anson-yeung

src/main/java/com/jelly/mightyminerv2/failsafe/FailsafeManager.java

@@ -31,16 +31,12 @@ public class FailsafeManager {
     public Set<Failsafe> failsafesToIgnore = new HashSet<>();
     private final Clock timer = new Clock();
 
+    // TODO: Implement all failsafe later!
     public FailsafeManager() {
         this.failsafes.addAll(Arrays.asList(
             DisconnectFailsafe.getInstance(),
-//            ItemChangeFailsafe.getInstance(),
             KnockbackFailsafe.getInstance(),
-//            TeleportFailsafe.getInstance(),
-//            RotationFailsafe.getInstance(),
-            BedrockCheckFailsafe.getInstance(),
             WorldChangeFailsafe.getInstance(),
-            PlayerFailsafe.getInstance(),
             ProfileFailsafe.getInstance()
         ));
     }

src/main/java/com/jelly/mightyminerv2/failsafe/impl/PlayerFailsafe.java

@@ -16,6 +16,7 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+// TODO: Check if it causes excessive lag before re-implementing!
 public class PlayerFailsafe extends AbstractFailsafe {
 
     @Getter

src/main/java/com/jelly/mightyminerv2/feature/impl/BlockMiner/BlockMiner.java

@@ -143,6 +143,8 @@ public void start(MineableBlock[] blocksToMine, final int miningSpeed, final int
 
     @Override
     public void stop() {
+        if(currentState != null)
+            currentState.onEnd(this);
         super.stop();
         KeyBindUtil.releaseAllExcept();  // Release all keybinds
     }

src/main/java/com/jelly/mightyminerv2/feature/impl/BlockMiner/states/BreakingState.java

@@ -80,6 +80,7 @@ public BlockMinerState onTick(BlockMiner miner) {
 
     @Override
     public void onEnd(BlockMiner miner) {
+        RotationHandler.getInstance().stop();
         log("Exiting Breaking State");
     }
 

src/main/java/com/jelly/mightyminerv2/macro/impl/CommissionMacro/states/PathingState.java

@@ -16,13 +16,14 @@ public class PathingState implements CommissionMacroState{
 
     private final RouteNavigator routeNavigator = RouteNavigator.getInstance();
     private final String GRAPH_NAME = "Commission Macro";
+    private int attempts = 0;
 
     @Override
     public void onStart(CommissionMacro macro) {
         log("Starting pathing state");
         Commission commission = macro.getCurrentCommission();
 
-        // When using royal pigeon or refueling using Abiphone, no path finding is needed
+        // When using royal pigeon or refueling using abiphone, no path finding is needed
         if ((commission == Commission.COMMISSION_CLAIM && MightyMinerConfig.commClaimMethod == 1)
                 || commission == Commission.REFUEL) {
             return;
@@ -82,8 +83,15 @@ public CommissionMacroState onTick(CommissionMacro macro) {
                 macro.disable("Route navigator failed, but no error is detected. Please contact the developer.");
                 break;
             case TIME_FAIL: case PATHFIND_FAILED:
-                logError("Failed to pathfind. Warping and restarting");
-                return new WarpingState();
+                attempts++;
+                if(attempts >= 3) {
+                    logError("Failed to pathfind. Warping and restarting");
+                    return new WarpingState();
+                } else {
+                    logError("Failed to pathfind. Retrying to pathfind");
+                    onStart(macro);
+                    return this;
+                }
         }
         return null;
     }