Merge pull request #288 from AzaelMew/master

onixiya1337 · web-flow · commit b55b24547369 · 2025-02-11T00:58:26.000+01:00
Removed support for moving backwards in cactus farm in order to fix Farminghub design cactus farm
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.9.0
+version=2.9.1-pre1
 shouldRelease=true
diff --git a/src/main/java/com/jelly/farmhelperv2/macro/impl/SShapeVerticalCropMacro.java b/src/main/java/com/jelly/farmhelperv2/macro/impl/SShapeVerticalCropMacro.java
@@ -45,7 +45,7 @@ public void updateState() {
                     }
                     changeState(State.SWITCHING_LANE);
                     setWalkingDirection();
-                } else if (GameStateHandler.getInstance().isBackWalkable() && !FarmHelperConfig.alwaysHoldW) {
+                } else if (FarmHelperConfig.getMacro() != FarmHelperConfig.MacroEnum.S_CACTUS && GameStateHandler.getInstance().isBackWalkable() && !FarmHelperConfig.alwaysHoldW) {
                     if (stuckInMelonsOrPumpkins()) {
                         AntiStuck.getInstance().setDirectionBlockPos(BlockUtils.getRelativeBlockPos(0, 0, -1, getYaw()));
                         AntiStuck.getInstance().start();

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public void updateState() {`
`45`	`45`	`}`
`46`	`46`	`changeState(State.SWITCHING_LANE);`
`47`	`47`	`setWalkingDirection();`
`48`		`- } else if (GameStateHandler.getInstance().isBackWalkable() && !FarmHelperConfig.alwaysHoldW) {`
	`48`	`+ } else if (FarmHelperConfig.getMacro() != FarmHelperConfig.MacroEnum.S_CACTUS && GameStateHandler.getInstance().isBackWalkable() && !FarmHelperConfig.alwaysHoldW) {`
`49`	`49`	`if (stuckInMelonsOrPumpkins()) {`
`50`	`50`	`AntiStuck.getInstance().setDirectionBlockPos(BlockUtils.getRelativeBlockPos(0, 0, -1, getYaw()));`
`51`	`51`	`AntiStuck.getInstance().start();`