Failsafe update

Rotations:
= It will stop rotating after receiving rotation packets if the rotation was already started

Pests Destroyer, Visitors Macro, Auto Pest Exchange:
= Added early checks to prevent macro execution (including rotations) during failsafe

Author: onixiya1337

gradle.properties

@@ -4,5 +4,5 @@ baseGroup=com.jelly.farmhelperv2
 mcVersion=1.8.9
 modid=farmhelperv2
 modName=FarmHelper
-version=2.8.13-pre2
+version=2.8.13
 shouldRelease=true

src/main/java/com/jelly/farmhelperv2/failsafe/impl/RotationFailsafe.java

@@ -133,6 +133,8 @@ private void evaluateRotation() {
         }
         if (shouldTriggerCheck(rotationBeforeReacting.getYaw(), rotationBeforeReacting.getPitch())) {
             FailsafeManager.getInstance().possibleDetection(this);
+            if (RotationHandler.getInstance().isRotating())
+                RotationHandler.getInstance().reset();
         } else {
             FailsafeManager.getInstance().emergencyQueue.remove(this);
             if (FailsafeManager.getInstance().emergencyQueue.isEmpty()) {

src/main/java/com/jelly/farmhelperv2/feature/impl/AutoPestExchange.java

@@ -1,6 +1,7 @@
 package com.jelly.farmhelperv2.feature.impl;
 
 import com.jelly.farmhelperv2.config.FarmHelperConfig;
+import com.jelly.farmhelperv2.failsafe.FailsafeManager;
 import com.jelly.farmhelperv2.feature.FeatureManager;
 import com.jelly.farmhelperv2.feature.IFeature;
 import com.jelly.farmhelperv2.handler.BaritoneHandler;
@@ -158,6 +159,7 @@ public boolean canEnableMacro(boolean manual) {
         if (mc.thePlayer == null || mc.theWorld == null) return false;
         if (!MacroHandler.getInstance().isMacroToggled() && !manual) return false;
         if (FeatureManager.getInstance().isAnyOtherFeatureEnabled(this, VisitorsMacro.getInstance())) return false;
+        if (!FailsafeManager.getInstance().getEmergencyQueue().isEmpty()) return false;
         if (GameStateHandler.getInstance().getServerClosingSeconds().isPresent()) {
             LogUtils.sendError("[Auto Pest Exchange] Server is closing in " + GameStateHandler.getInstance().getServerClosingSeconds().get() + " seconds!");
             return false;
@@ -216,6 +218,11 @@ public void onTickExecutionNew(TickEvent.ClientTickEvent event) {
         if (mc.thePlayer == null || mc.theWorld == null) return;
         if (!isToggled()) return;
         if (event.phase != TickEvent.Phase.START) return;
+        if (!FailsafeManager.getInstance().getEmergencyQueue().isEmpty()) return;
+        if (FailsafeManager.getInstance().triggeredFailsafe.isPresent()) {
+            stop();
+            return;
+        }
         if (!GameStateHandler.getInstance().inGarden()) return;
 
         if (stuckClock.isScheduled() && stuckClock.passed()) {

src/main/java/com/jelly/farmhelperv2/feature/impl/PestsDestroyer.java

@@ -5,6 +5,7 @@
 import com.jelly.farmhelperv2.event.DrawScreenAfterEvent;
 import com.jelly.farmhelperv2.event.SpawnObjectEvent;
 import com.jelly.farmhelperv2.event.SpawnParticleEvent;
+import com.jelly.farmhelperv2.failsafe.FailsafeManager;
 import com.jelly.farmhelperv2.feature.IFeature;
 import com.jelly.farmhelperv2.handler.GameStateHandler;
 import com.jelly.farmhelperv2.handler.MacroHandler;
@@ -250,6 +251,8 @@ public boolean canEnableMacro(boolean manually) {
         if (isRunning()) return false;
         if (!GameStateHandler.getInstance().inGarden()) return false;
         if (!MacroHandler.getInstance().isMacroToggled() && !manually) return false;
+        if (!FailsafeManager.getInstance().getEmergencyQueue().isEmpty()) return false;
+        if (FailsafeManager.getInstance().triggeredFailsafe.isPresent()) return false;
         if (enabled || preparing) return false;
         if (GameStateHandler.getInstance().getPestsCount() < FarmHelperConfig.startKillingPestsAt && !manually || (manually && GameStateHandler.getInstance().getPestsCount() == 0))
             return false;
@@ -292,6 +295,11 @@ public void onTickExecute(TickEvent.ClientTickEvent event) {
         if (event.phase != TickEvent.Phase.START) return;
         if (!GameStateHandler.getInstance().inGarden() && escapeState == EscapeState.NONE) return;
         if (!enabled) return;
+        if (!FailsafeManager.getInstance().getEmergencyQueue().isEmpty()) return;
+        if (FailsafeManager.getInstance().triggeredFailsafe.isPresent()) {
+            stop();
+            return;
+        }
 
 
         if (stuckClock.isScheduled() && stuckClock.passed()) {

src/main/java/com/jelly/farmhelperv2/feature/impl/VisitorsMacro.java

@@ -2,6 +2,7 @@
 
 import cc.polyfrost.oneconfig.utils.Multithreading;
 import com.jelly.farmhelperv2.config.FarmHelperConfig;
+import com.jelly.farmhelperv2.failsafe.FailsafeManager;
 import com.jelly.farmhelperv2.feature.FeatureManager;
 import com.jelly.farmhelperv2.feature.IFeature;
 import com.jelly.farmhelperv2.handler.BaritoneHandler;
@@ -221,6 +222,8 @@ public void onTickAFKMode(TickEvent.ClientTickEvent event) {
             return;
         }
         if (MacroHandler.getInstance().isMacroToggled()) return;
+        if (FailsafeManager.getInstance().triggeredFailsafe.isPresent()) return;
+        if (!FailsafeManager.getInstance().getEmergencyQueue().isEmpty()) return;
         if (!PlayerUtils.isInBarn()) return;
         if (isRunning()) return;
         if (!afkDelay.passed()) return;
@@ -237,6 +240,7 @@ public boolean canEnableMacro(boolean manual, boolean withError) {
         if (!GameStateHandler.getInstance().inGarden()) return false;
         if (mc.thePlayer == null || mc.theWorld == null) return false;
         if (FeatureManager.getInstance().isAnyOtherFeatureEnabled()) return false;
+        if (FailsafeManager.getInstance().triggeredFailsafe.isPresent()) return false;
 
         if (GameStateHandler.getInstance().getServerClosingSeconds().isPresent()) {
             LogUtils.sendError("[Visitors Macro] Server is closing in " + GameStateHandler.getInstance().getServerClosingSeconds().get() + " seconds!");
@@ -331,11 +335,16 @@ public void onTick(TickEvent.ClientTickEvent event) {
         if (mc.thePlayer == null || mc.theWorld == null) return;
         if (!GameStateHandler.getInstance().inGarden()) return;
         if (delayClock.isScheduled() && !delayClock.passed()) return;
+        if (!FailsafeManager.getInstance().getEmergencyQueue().isEmpty()) return;
         if (GameStateHandler.getInstance().getServerClosingSeconds().isPresent()) {
             LogUtils.sendError("[Visitors Macro] Server is closing in " + GameStateHandler.getInstance().getServerClosingSeconds().get() + " seconds!");
             stop();
             return;
         }
+        if (FailsafeManager.getInstance().triggeredFailsafe.isPresent()) {
+            stop();
+            return;
+        }
 
         if (stuckClock.isScheduled() && stuckClock.passed()) {
             if (visitors.isEmpty()) {