= AutoGodPot - bug fixes

JellyLabScripts · Feb 29, 2024 · 39f57b9 · 39f57b9
1 parent aa5f973
commit 39f57b9
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 10 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-pre17
+version=2.4.5-pre18
 shouldRelease=true
diff --git a/src/main/java/com/jelly/farmhelperv2/feature/impl/AutoGodPot.java b/src/main/java/com/jelly/farmhelperv2/feature/impl/AutoGodPot.java
@@ -2,15 +2,14 @@
 
 import cc.polyfrost.oneconfig.utils.Multithreading;
 import com.jelly.farmhelperv2.config.FarmHelperConfig;
+import com.jelly.farmhelperv2.failsafe.Failsafe;
+import com.jelly.farmhelperv2.failsafe.FailsafeManager;
 import com.jelly.farmhelperv2.feature.FeatureManager;
 import com.jelly.farmhelperv2.feature.IFeature;
 import com.jelly.farmhelperv2.handler.GameStateHandler;
 import com.jelly.farmhelperv2.handler.MacroHandler;
 import com.jelly.farmhelperv2.handler.RotationHandler;
-import com.jelly.farmhelperv2.util.InventoryUtils;
-import com.jelly.farmhelperv2.util.KeyBindUtils;
-import com.jelly.farmhelperv2.util.LogUtils;
-import com.jelly.farmhelperv2.util.PlayerUtils;
+import com.jelly.farmhelperv2.util.*;
 import com.jelly.farmhelperv2.util.helper.Clock;
 import com.jelly.farmhelperv2.util.helper.Rotation;
 import com.jelly.farmhelperv2.util.helper.RotationConfiguration;
@@ -28,6 +27,7 @@
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
 
+import java.awt.*;
 import java.util.ArrayList;
 import java.util.Objects;
 import java.util.Optional;
@@ -67,6 +67,7 @@ public class AutoGodPot implements IFeature {
     @Getter
     private BitsShopState bitsShopState = BitsShopState.NONE;
     private Slot godPotItem;
+    private int teleportTries = 0;
 
     public static AutoGodPot getInstance() {
         if (instance == null) {
@@ -144,13 +145,26 @@ public void stop() {
         resetBitsShopState();
         godPotMode = GodPotMode.NONE;
         KeyBindUtils.stopMovement();
-        if (shouldTpToGarden)
-            MacroHandler.getInstance().triggerWarpGarden(true, true);
+        LogUtils.sendWarning("[Auto God Pot] Disabled!");
         shouldTpToGarden = true;
+        teleportToGarden();
+    }
+
+    private void teleportToGarden() {
+        if (teleportTries >= 3) {
+            LogUtils.sendError("[Auto God Pot] Could not teleport to garden after 3 tries! Disabling Auto God Pot!");
+            LogUtils.webhookLog("[Auto God Pot]\\nCould not teleport to garden after 3 tries! Disabling Auto God Pot!");
+            teleportTries = 0;
+            return;
+        }
         Multithreading.schedule(() -> {
-            LogUtils.sendWarning("[Auto God Pot] Disabled!");
-            if (MacroHandler.getInstance().isMacroToggled()) {
+            if (!GameStateHandler.getInstance().inGarden() && shouldTpToGarden) {
+                MacroHandler.getInstance().triggerWarpGarden(true, true);
+                teleportToGarden();
+                teleportTries++;
+            } else if (GameStateHandler.getInstance().inGarden() && MacroHandler.getInstance().isMacroToggled()) {
                 MacroHandler.getInstance().resumeMacro();
+                teleportTries = 0;
             }
         }, 4_000, TimeUnit.MILLISECONDS);
     }
@@ -166,7 +180,8 @@ public boolean isToggled() {
 
     @Override
     public boolean shouldCheckForFailsafes() {
-        return goingToAHState != GoingToAHState.NONE && bitsShopState != BitsShopState.NONE;
+        return goingToAHState != GoingToAHState.NONE && bitsShopState != BitsShopState.NONE
+                && goingToAHState != GoingToAHState.TELEPORT_TO_HUB && bitsShopState != BitsShopState.TELEPORT_TO_HUB;
     }
 
     @SubscribeEvent