= Fixed weird bug with slabs walkables

= Fixed detect of suffocating = Custom's yaw fixes, dunno if works (does anyone use custom yaw anyway??)
JellyLabScripts · Dec 9, 2023 · 9326c88 · 9326c88
1 parent 61b96ed
commit 9326c88
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 11 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.1.18
+version=2.1.19
 shouldRelease=true
diff --git a/src/main/java/com/jelly/farmhelperv2/feature/impl/PestsDestroyer.java b/src/main/java/com/jelly/farmhelperv2/feature/impl/PestsDestroyer.java
@@ -721,7 +721,6 @@ private void manipulateHeight(Entity entity, double distance, double distanceWit
 
     private void flyAwayFromStructures() {
         if (mc.thePlayer.posY < 77 && !hasBlockAboveThePlayer()) {
-            LogUtils.sendDebug("Has block above the player");
             if (!GameStateHandler.getInstance().isRightWalkable() && GameStateHandler.getInstance().isLeftWalkable()) {
                 KeyBindUtils.holdThese(mc.gameSettings.keyBindLeft, mc.thePlayer.capabilities.isFlying ? mc.gameSettings.keyBindJump : null);
             } else if (!GameStateHandler.getInstance().isLeftWalkable() && GameStateHandler.getInstance().isRightWalkable()) {

diff --git a/src/main/java/com/jelly/farmhelperv2/handler/GameStateHandler.java b/src/main/java/com/jelly/farmhelperv2/handler/GameStateHandler.java
@@ -379,7 +379,7 @@ public boolean hasPassedSinceStopped() {
     }
 
     public boolean notMoving() {
-        return (dx < 0.01 && dz < 0.01 && dyIsRest() && mc.currentScreen == null) || (!holdingKeybindIsWalkable() && mc.thePlayer != null && (playerIsInFlowingWater(0) || playerIsInFlowingWater(1)) && mc.thePlayer.isInWater()) || RotationHandler.getInstance().isRotating();
+        return (dx < 0.01 && dz < 0.01 && dyIsRest() && mc.currentScreen == null) || (!holdingKeybindIsWalkable() && mc.thePlayer != null && (playerIsInFlowingWater(0) || playerIsInFlowingWater(1)) && mc.thePlayer.isInWater());
     }
 
     private boolean dyIsRest() {

diff --git a/src/main/java/com/jelly/farmhelperv2/macro/AbstractMacro.java b/src/main/java/com/jelly/farmhelperv2/macro/AbstractMacro.java
@@ -254,7 +254,7 @@ public void onEnable() {
             changeState(calculateDirection());
         }
         if (!closest90Deg.isPresent())
-            setClosest90Deg(Optional.of(AngleUtils.getClosest()));
+            setClosest90Deg(Optional.of(AngleUtils.getClosest(getYaw())));
         setEnabled(true);
         setLayerY(mc.thePlayer.getPosition().getY());
         analyticsClock.schedule(60_000);

diff --git a/src/main/java/com/jelly/farmhelperv2/macro/impl/SShapeCocoaBeanMacro.java b/src/main/java/com/jelly/farmhelperv2/macro/impl/SShapeCocoaBeanMacro.java
@@ -12,6 +12,8 @@
 import com.jelly.farmhelperv2.util.helper.RotationConfiguration;
 import net.minecraft.init.Blocks;
 
+import java.util.Optional;
+
 public class SShapeCocoaBeanMacro extends AbstractMacro {
 
     @Override
@@ -22,6 +24,7 @@ public void onEnable() {
         }
         if (!FarmHelperConfig.customYaw && !isRestoredState()) {
             setYaw(AngleUtils.getClosest());
+            setClosest90Deg(Optional.of(AngleUtils.getClosest(getYaw())));
         }
         if (MacroHandler.getInstance().isTeleporting()) return;
         setRestoredState(false);

diff --git a/src/main/java/com/jelly/farmhelperv2/macro/impl/SShapeMelonPumpkinDefaultMacro.java b/src/main/java/com/jelly/farmhelperv2/macro/impl/SShapeMelonPumpkinDefaultMacro.java
@@ -28,8 +28,10 @@ public void onEnable() {
         super.onEnable();
         if (!FarmHelperConfig.customPitch && !isRestoredState())
             setPitch(50 + (float) (Math.random() * 6 - 3)); // -3 - 3
-        if (!FarmHelperConfig.customYaw && !isRestoredState())
+        if (!FarmHelperConfig.customYaw && !isRestoredState()) {
             setYaw(AngleUtils.getClosestDiagonal());
+            setClosest90Deg(Optional.of(AngleUtils.getClosest(getYaw())));
+        }
         float additionalRotation;
         switch (getCurrentState()) {
             case LEFT:

diff --git a/src/main/java/com/jelly/farmhelperv2/macro/impl/SShapeMushroomMacro.java b/src/main/java/com/jelly/farmhelperv2/macro/impl/SShapeMushroomMacro.java
@@ -22,6 +22,7 @@ public void onEnable() {
         }
         if (!FarmHelperConfig.customYaw && !isRestoredState()) {
             setYaw(AngleUtils.getClosestDiagonal());
+            setClosest90Deg(Optional.of(AngleUtils.getClosest(getYaw())));
         }
         if (MacroHandler.getInstance().isTeleporting()) return;
         setRestoredState(false);

diff --git a/src/main/java/com/jelly/farmhelperv2/macro/impl/SShapeMushroomRotateMacro.java b/src/main/java/com/jelly/farmhelperv2/macro/impl/SShapeMushroomRotateMacro.java
@@ -27,6 +27,7 @@ public void onEnable() {
         }
         if (!FarmHelperConfig.customYaw && !isRestoredState()) {
             setYaw(AngleUtils.getClosest());
+            setClosest90Deg(Optional.of(AngleUtils.getClosest(getYaw())));
         }
         if (MacroHandler.getInstance().isTeleporting()) return;
         setRestoredState(false);

diff --git a/src/main/java/com/jelly/farmhelperv2/macro/impl/SShapeSugarcaneMacro.java b/src/main/java/com/jelly/farmhelperv2/macro/impl/SShapeSugarcaneMacro.java
@@ -120,6 +120,7 @@ public void onEnable() {
         }
         if (!FarmHelperConfig.customYaw && !isRestoredState()) {
             setYaw(AngleUtils.getClosestDiagonal());
+            setClosest90Deg(Optional.of(AngleUtils.getClosest(getYaw())));
         }
         rowStartX = mc.thePlayer.posX;
         rowStartZ = mc.thePlayer.posZ;

diff --git a/src/main/java/com/jelly/farmhelperv2/macro/impl/SShapeVerticalCropMacro.java b/src/main/java/com/jelly/farmhelperv2/macro/impl/SShapeVerticalCropMacro.java
@@ -180,6 +180,7 @@ public void onEnable() {
         }
         if (!FarmHelperConfig.customYaw && !isRestoredState()) {
             setYaw(AngleUtils.getClosest());
+            setClosest90Deg(Optional.of(AngleUtils.getClosest(getYaw())));
         }
         setRestoredState(false);
         if (MacroHandler.getInstance().isTeleporting()) return;

diff --git a/src/main/java/com/jelly/farmhelperv2/util/BlockUtils.java b/src/main/java/com/jelly/farmhelperv2/util/BlockUtils.java
@@ -170,7 +170,7 @@ private static boolean canWalkThroughBottom(BlockPos blockPos, Direction directi
             return state.getValue(BlockFenceGate.OPEN);
 
         if (block instanceof BlockTrapDoor) {
-            return state.getValue(BlockTrapDoor.OPEN);
+            return state.getValue(BlockTrapDoor.OPEN) || state.getValue(BlockTrapDoor.HALF) == BlockTrapDoor.DoorHalf.BOTTOM;
         }
 
         if (block instanceof BlockSnow)

diff --git a/src/main/java/com/jelly/farmhelperv2/util/PlayerUtils.java b/src/main/java/com/jelly/farmhelperv2/util/PlayerUtils.java
@@ -331,12 +331,9 @@ public static Entity getEntityCuttingOtherEntity(Entity e, boolean armorStand) {
     }
 
     public static boolean isPlayerSuffocating() {
-        BlockPos playerFeet = BlockUtils.getRelativeBlockPos(0, 0, 0);
-        BlockPos playerHead = BlockUtils.getRelativeBlockPos(0, mc.thePlayer.eyeHeight, 0);
         AxisAlignedBB playerBB = mc.thePlayer.getEntityBoundingBox().expand(-0.1, -0.1, -0.1);
-        AxisAlignedBB playerFeetBB = new AxisAlignedBB(playerFeet.getX(), playerFeet.getY(), playerFeet.getZ(), playerFeet.getX() + 1, playerFeet.getY() + 1, playerFeet.getZ() + 1);
-        AxisAlignedBB playerHeadBB = new AxisAlignedBB(playerHead.getX(), playerHead.getY(), playerHead.getZ(), playerHead.getX() + 1, playerHead.getY() + 1, playerHead.getZ() + 1);
-        return mc.theWorld.getCollidingBoundingBoxes(mc.thePlayer, playerBB).stream().anyMatch(bb -> bb != playerFeetBB && bb != playerHeadBB);
+        List<AxisAlignedBB> collidingBoxes = mc.theWorld.getCollidingBoundingBoxes(mc.thePlayer, playerBB);
+        return !collidingBoxes.isEmpty();
     }
 
     public static EnumFacing getHorizontalFacing(float yaw) {