Merge pull request #110 from Jookly123/master

refactor mining speed retrieval to account for decimal speeds

Author: anson-yeung

src/main/java/com/jelly/mightyminerv2/feature/impl/AutoGetStats/tasks/impl/MiningSpeedRetrievalTask.java

@@ -8,6 +8,8 @@
 import net.minecraft.client.Minecraft;
 
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * A task that retrieves the Mining Speed value from the player's SkyBlock GUI.
@@ -17,6 +19,7 @@ public class MiningSpeedRetrievalTask extends AbstractInventoryTask<Integer> {
     private final Minecraft mc = Minecraft.getMinecraft();
     private final Clock timer = new Clock();
     private Integer miningSpeed;
+    private static final Pattern MINING_SPEED_PATTERN = Pattern.compile("Mining Speed\\s+([\\d,]+\\.?\\d*)");
 
     @Override
     public void init() {
@@ -48,16 +51,24 @@ public void onTick() {
 
         List<String> loreList = InventoryUtil.getItemLoreFromOpenContainer("Your SkyBlock Profile");
         for (String lore : loreList) {
-            if (!lore.contains("Mining Speed")) continue;
-            try {
-                String[] split = lore.replace(",", "").split(" ");
-                miningSpeed = Integer.parseInt(split[split.length - 1]);
-                taskStatus = TaskStatus.SUCCESS;
-                return;
-            } catch (Exception e) {
-                taskStatus = TaskStatus.FAILURE;
-                error = "Failed to parse mining speed in GUI";
-                return;
+            Matcher matcher = MINING_SPEED_PATTERN.matcher(lore);
+            if (matcher.find()) {
+                try {
+                    // The number - for example, "2,000" or "123.45" or "1,234.56"
+                    String numberAsString = matcher.group(1);
+                    String cleanNumberString = numberAsString.replace(",", "");
+
+                    // Mining speeds from the 'sbmenu' can be a decimal
+                    double rawMiningSpeed = Double.parseDouble(cleanNumberString);
+                    miningSpeed = (int) rawMiningSpeed;
+
+                    taskStatus = TaskStatus.SUCCESS;
+                    return;
+                } catch (NumberFormatException e) {
+                    taskStatus = TaskStatus.FAILURE;
+                    error = "Found 'Mining Speed' but failed to parse the number in line: '" + lore + "'. Exiting with error: " + e.getMessage();
+                    return;
+                }
             }
         }
 

src/main/java/com/jelly/mightyminerv2/macro/impl/GlacialMacro/states/PathfindingState.java

@@ -13,6 +13,8 @@
 
 import java.util.List;
 
+import static com.jelly.mightyminerv2.util.Logger.sendError;
+
 /**
  * PathfindingState is responsible for navigating to the best available vein
  * and handling the pathfinding logic for the Glacial Macro.
@@ -22,13 +24,17 @@ public class PathfindingState implements GlacialMacroState {
     private boolean isNavigating = false;
     private final Clock commissionCheckClock = new Clock();
 
+    // Counter for consecutive pathfinding failures (would indicate player is stuck)
+    private int pathingFailures = 0;
+    private static final int MAX_PATHING_FAILURES = 5;
+
     @Override
     public void onStart(GlacialMacro macro) {
         log("Starting pathing state");
         InventoryUtil.holdItem("Aspect of the Void");
         RouteNavigator.getInstance().stop(); // Ensure pathfinding is stopped
         macro.updateMiningTasks(); // Update tasks at the beginning of each pathfinding cycle
-
+        pathingFailures = 0;
         isNavigating = false;
     }
 
@@ -58,10 +64,17 @@ public GlacialMacroState onTick(GlacialMacro macro) {
 
             if (RouteNavigator.getInstance().succeeded()) {
                 log("Successfully reached the destination vein.");
+                pathingFailures = 0;
                 return new MiningState();
             } else {
                 Pair<GlaciteVeins, RouteWaypoint> failedVein = macro.getCurrentVein();
                 logError("RouteNavigator failed to reach destination: " + (failedVein != null ? failedVein.first() : "Unknown"));
+                pathingFailures++;
+                log("Pathing failure count: " + pathingFailures);
+                if (pathingFailures >= MAX_PATHING_FAILURES) {
+                    sendError("Failed to pathfind " + MAX_PATHING_FAILURES + " times. Assuming player is stuck. Changing lobbies.");
+                    return new NewLobbyState();
+                }
 
                 if (failedVein != null) {
                     log("Blacklisting the unreachable vein.");
@@ -87,6 +100,7 @@ public GlacialMacroState onTick(GlacialMacro macro) {
         // Check if we are already at the destination
         if (bestVein.second().isWithinRange(PlayerUtil.getBlockStandingOn(), 2)) {
             log("Already at the destination. Starting to mine");
+            pathingFailures = 0;
             return new MiningState();
         }
 

src/main/java/com/jelly/mightyminerv2/macro/impl/GlacialMacro/states/StartingState.java

@@ -29,8 +29,7 @@ public GlacialMacroState onTick(GlacialMacro macro) {
         }
 
         SubLocation subLocation = GameStateHandler.getInstance().getCurrentSubLocation();
-        if (subLocation == SubLocation.GLACITE_TUNNELS || subLocation == SubLocation.DWARVEN_BASE_CAMP) {
-
+        if (subLocation == SubLocation.DWARVEN_BASE_CAMP) {
             if (!InventoryUtil.areItemsInHotbar(macro.getNecessaryItems())) {
                 macro.disable("Please put the following items in hotbar: " + InventoryUtil.getMissingItemsInHotbar(macro.getNecessaryItems()));
                 return null;
@@ -39,7 +38,7 @@ public GlacialMacroState onTick(GlacialMacro macro) {
             log("Player is in a valid location. Initialising stats");
             return new GettingStatsState();
         } else {
-            log("Player is not in the Glacite Tunnels. Teleporting...");
+            log("Player is not at Dwarven Base Camp. Teleporting...");
             return new TeleportingState(new StartingState());
         }
     }