diff --git a/gradle.properties b/gradle.properties index a4b202858..a77771af4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ baseGroup=com.jelly.farmhelperv2 mcVersion=1.8.9 modid=farmhelperv2 modName=FarmHelper -version=2.9.6 +version=2.9.6-pre1 shouldRelease=true diff --git a/src/main/java/com/jelly/farmhelperv2/config/FarmHelperConfig.java b/src/main/java/com/jelly/farmhelperv2/config/FarmHelperConfig.java index 68fc9d804..a024fef4c 100644 --- a/src/main/java/com/jelly/farmhelperv2/config/FarmHelperConfig.java +++ b/src/main/java/com/jelly/farmhelperv2/config/FarmHelperConfig.java @@ -1,8 +1,8 @@ package com.jelly.farmhelperv2.config; import cc.polyfrost.oneconfig.config.Config; -import cc.polyfrost.oneconfig.config.annotations.Number; import cc.polyfrost.oneconfig.config.annotations.*; +import cc.polyfrost.oneconfig.config.annotations.Number; import cc.polyfrost.oneconfig.config.core.OneColor; import cc.polyfrost.oneconfig.config.core.OneKeyBind; import cc.polyfrost.oneconfig.config.data.*; @@ -463,6 +463,14 @@ public class FarmHelperConfig extends Config { description = "Switch to game window when failsafe triggers") public static boolean autoAltTab = false; + @DualOption( + name = "Failsafe Action", + category = FAILSAFE, subcategory = "General", + description = "Decides what the macro should do upon macro check.", + left = "React", right = "Disable" + ) + public static boolean failsafeAction = false; + @Slider(name = "Failsafe Stop Delay", category = FAILSAFE, subcategory = "General", description = "Delay before stopping macro after failsafe (ms)", min = 1000, max = 7500) diff --git a/src/main/java/com/jelly/farmhelperv2/failsafe/FailsafeManager.java b/src/main/java/com/jelly/farmhelperv2/failsafe/FailsafeManager.java index 35a702b0b..16b87cec8 100644 --- a/src/main/java/com/jelly/farmhelperv2/failsafe/FailsafeManager.java +++ b/src/main/java/com/jelly/farmhelperv2/failsafe/FailsafeManager.java @@ -299,7 +299,9 @@ public void onFailsafeTriggered(TickEvent.ClientTickEvent event) { if (onTickDelay.isScheduled() && !onTickDelay.passed()) { return; } - triggeredFailsafe.get().duringFailsafeTrigger(); + + if (FarmHelperConfig.failsafeAction) + triggeredFailsafe.get().duringFailsafeTrigger(); } @SubscribeEvent