= Pests Destroyer - Additional fixes regarding false staff checks

= Auto Sprayonator - Won't start during scheduler break = Fix for holding left click on rewarp points
JellyLabScripts · Feb 11, 2024 · 2e9168e · 2e9168e
1 parent 275dc45
commit 2e9168e
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 17 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -4,5 +4,5 @@ baseGroup=com.jelly.farmhelperv2
 mcVersion=1.8.9
 modid=farmhelperv2
 modName=FarmHelper
-version=2.4.5-pre2
+version=2.4.5-pre3
 shouldRelease=true
diff --git a/src/main/java/com/jelly/farmhelperv2/feature/FeatureManager.java b/src/main/java/com/jelly/farmhelperv2/feature/FeatureManager.java
@@ -7,7 +7,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 public class FeatureManager {
     private static FeatureManager instance;
@@ -96,21 +95,17 @@ public boolean shouldIgnoreFalseCheck() {
         }
         if (PestsDestroyer.getInstance().isRunning()) {
             if (!PestsDestroyer.getInstance().shouldCheckForFailsafes()) return true;
-            AtomicBoolean result = new AtomicBoolean(false);
-            FailsafeManager.getInstance().triggeredFailsafe.ifPresent(failsafe -> {
-                if (failsafe.getType().equals(FailsafeManager.EmergencyType.KNOCKBACK_CHECK)) {
-                    result.set(true);
-                    return;
+            boolean result = false;
+            result = FailsafeManager.getInstance().emergencyQueue.stream().anyMatch(f -> {
+                if (f.getType().equals(FailsafeManager.EmergencyType.KNOCKBACK_CHECK)) {
+                    return true;
                 }
-                if (failsafe.getType().equals(FailsafeManager.EmergencyType.TELEPORT_CHECK)) {
-                    result.set(true);
-                    return;
-                }
-                if (failsafe.getType().equals(FailsafeManager.EmergencyType.ROTATION_CHECK)) {
-                    result.set(true);
+                if (f.getType().equals(FailsafeManager.EmergencyType.TELEPORT_CHECK)) {
+                    return true;
                 }
+                return f.getType().equals(FailsafeManager.EmergencyType.ROTATION_CHECK);
             });
-            return result.get();
+            return result;
         }
         if (PlotCleaningHelper.getInstance().isRunning() && !PlotCleaningHelper.getInstance().shouldCheckForFailsafes()) {
             return true;

diff --git a/src/main/java/com/jelly/farmhelperv2/feature/impl/AutoSprayonator.java b/src/main/java/com/jelly/farmhelperv2/feature/impl/AutoSprayonator.java
@@ -208,7 +208,7 @@ public void onTickShouldEnable(TickEvent.ClientTickEvent event) {
             enableDelay.schedule(sprayonatorEnableDelayTime + sprayonatorEnableDelayTimeRand);
             return;
         }
-        ;
+        if (!Scheduler.getInstance().isFarming()) return;
         if (!MacroHandler.getInstance().isMacroToggled()) return;
         if (GameStateHandler.getInstance().getServerClosingSeconds().isPresent()) return;
         if (!GameStateHandler.getInstance().inGarden()) return;

diff --git a/src/main/java/com/jelly/farmhelperv2/feature/impl/PestsDestroyer.java b/src/main/java/com/jelly/farmhelperv2/feature/impl/PestsDestroyer.java
@@ -761,7 +761,7 @@ public void onTickExecute(TickEvent.ClientTickEvent event) {
                     } else {
                         LogUtils.sendDebug("Teleporting to plot");
                         state = States.TELEPORT_TO_PLOT;
-                        delayClock.schedule(400 + (long) (Math.random() * 400));
+                        delayClock.schedule(600 + (long) (Math.random() * 500));
                     }
                 }
                 KeyBindUtils.stopMovement();
@@ -832,6 +832,9 @@ private boolean isInventoryOpen() {
 
     private void finishMacro() {
         if (isInventoryOpen()) return;
+        if (FlyPathFinderExecutor.getInstance().isPathing()) {
+            FlyPathFinderExecutor.getInstance().stop();
+        }
         if (MacroHandler.getInstance().isMacroToggled()) {
             if (PlayerUtils.isStandingOnSpawnPoint()) {
                 stop();
@@ -844,6 +847,7 @@ private void finishMacro() {
                 MacroHandler.getInstance().disableMacro();
                 return;
             }
+            PlayerUtils.getTool();
             MacroHandler.getInstance().triggerWarpGarden(true, true);
             finishTries++;
             delayClock.schedule(1_000 + Math.random() * 500);

diff --git a/src/main/java/com/jelly/farmhelperv2/macro/AbstractMacro.java b/src/main/java/com/jelly/farmhelperv2/macro/AbstractMacro.java
@@ -109,7 +109,10 @@ public void onTick() {
             return;
         }
 
-        if (PlayerUtils.isStandingOnRewarpLocation() && !FailsafeManager.getInstance().triggeredFailsafe.isPresent() && (GameStateHandler.getInstance().notMoving() || GameStateHandler.getInstance().canRewarp())) {
+        if (PlayerUtils.isStandingOnRewarpLocation() && !FailsafeManager.getInstance().triggeredFailsafe.isPresent()) {
+            if (GameStateHandler.getInstance().notMoving() && KeyBindUtils.getHoldingKeybinds().length > 0) {
+                KeyBindUtils.stopMovement();
+            }
             if (GameStateHandler.getInstance().canRewarp()) {
                 MacroHandler.getInstance().triggerWarpGarden(false, true);
                 checkOnSpawnClock.schedule(5000);

diff --git a/src/main/java/com/jelly/farmhelperv2/pathfinder/FlyPathFinderExecutor.java b/src/main/java/com/jelly/farmhelperv2/pathfinder/FlyPathFinderExecutor.java
@@ -594,6 +594,9 @@ public void onDraw(RenderWorldLastEvent event) {
     }
 
     private Vec3 getNext() {
+        if (path.isEmpty()) {
+            return mc.thePlayer.getPositionVector();
+        }
         try {
             Vec3 current = mc.thePlayer.getPositionVector();
             Vec3 closestToPlayer = path.stream().min(Comparator.comparingDouble(vec -> vec.distanceTo(current))).orElse(path.get(0));