Fix hasClutched and removed messy and problematic code.

Murat65536 · Murat65536 · commit a9d3b593f79a · 2025-10-05T10:19:47.000-04:00
diff --git a/src/main/java/baritone/pathing/clutch/Clutch.java b/src/main/java/baritone/pathing/clutch/Clutch.java
@@ -72,6 +72,17 @@ public boolean clutch(IBaritone baritone, MovementState state, BlockPos dest, Mu
         return ClutchUtils.blockClutch(baritone, state, dest, result, true);
     }
 
+    public boolean hasClutched(IPlayerContext ctx, BetterBlockPos dest, BlockState destState) {
+        VoxelShape shape = destState.getCollisionShape(ctx.world(), dest);
+        if (shape.isEmpty()) {
+            return ctx.player().getBoundingBox().intersects(dest.x, dest.y, dest.z, dest.x + 1, dest.y + 1, dest.z + 1);
+        } else {
+            return ctx.player().getBoundingBox().intersects(
+                    dest.x + shape.bounds().minX, dest.x + shape.bounds().minY, dest.x + shape.bounds().minZ,
+                    dest.x + shape.bounds().maxX, dest.x + shape.bounds().maxY, dest.x + shape.bounds().maxZ);
+        }
+    }
+
     public boolean isFinished(IPlayerContext ctx, MovementState state, MutableClutchResult result) {
         return true;
     }
diff --git a/src/main/java/baritone/pathing/clutch/clutches/LadderClutch.java b/src/main/java/baritone/pathing/clutch/clutches/LadderClutch.java
@@ -59,4 +59,9 @@ public boolean isPlaceable(CalculationContext context, int x, int y, int z, Bloc
     public boolean clutch(IBaritone baritone, MovementState state, BlockPos dest, MutableClutchResult result) {
         return ClutchUtils.blockClutch(baritone, state, dest, result, false);
     }
+
+    @Override
+    public boolean hasClutched(IPlayerContext ctx, BetterBlockPos dest, BlockState destState) {
+        return ctx.player().getBoundingBox().intersects(dest.x, dest.y, dest.z, dest.x + 1, dest.y + 1, dest.z + 1);
+    }
 }
diff --git a/src/main/java/baritone/pathing/clutch/clutches/ScaffoldingClutch.java b/src/main/java/baritone/pathing/clutch/clutches/ScaffoldingClutch.java
@@ -47,4 +47,9 @@ public boolean isFinished(IPlayerContext ctx, MovementState state, MutableClutch
         state.setInput(Input.SNEAK, true);
         return ctx.world().getBlockState(ctx.playerFeet()).is(Blocks.SCAFFOLDING);
     }
+
+    @Override
+    public boolean hasClutched(IPlayerContext ctx, BetterBlockPos dest, BlockState destState) {
+        return ctx.player().getBoundingBox().intersects(dest.x, dest.y, dest.z, dest.x + 1, dest.y + 2, dest.z + 1);
+    }
 }
diff --git a/src/main/java/baritone/pathing/clutch/clutches/SlimeClutch.java b/src/main/java/baritone/pathing/clutch/clutches/SlimeClutch.java
@@ -33,6 +33,8 @@
 public class SlimeClutch extends Clutch {
     public static final SlimeClutch INSTANCE = new SlimeClutch();
 
+    private boolean onGround = false;
+
     private SlimeClutch() {}
 
     @Override
@@ -52,21 +54,22 @@ public boolean isSolid(CalculationContext context) {
 
     @Override
     public boolean isFinished(IPlayerContext ctx, MovementState state, MutableClutchResult result) {
-        if (result.phase == 0) {
-            state.setInput(Input.SNEAK, false);
-            state.setInput(Input.JUMP, true);
-            if (ctx.player().isOnGround()) {
-                result.phase = 1;
-            }
-            return false;
-        } else {
-            state.setInput(Input.SNEAK, true);
+        state.setInput(Input.SNEAK, false);
+        state.setInput(Input.JUMP, true);
+        if (onGround) {
             return true;
         }
+        onGround = ctx.player().isOnGround();
+        return false;
     }
 
     @Override
     public double getAdditionalCost() {
         return 13.0182684d;
     }
+
+    @Override
+    public boolean hasClutched(IPlayerContext ctx, BetterBlockPos dest, BlockState destState) {
+        return ctx.player().getBoundingBox().intersects(dest.x, dest.y, dest.z, dest.x + 1, dest.y + 2, dest.z + 1);
+    }
 }
diff --git a/src/main/java/baritone/pathing/clutch/clutches/VineClutch.java b/src/main/java/baritone/pathing/clutch/clutches/VineClutch.java
@@ -33,6 +33,7 @@
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.VineBlock;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class VineClutch extends Clutch {
     public static final VineClutch INSTANCE = new VineClutch();
@@ -77,4 +78,9 @@ public boolean isPlaceable(CalculationContext context, int x, int y, int z, Bloc
     public boolean clutch(IBaritone baritone, MovementState state, BlockPos dest, MutableClutchResult result) {
         return ClutchUtils.blockClutch(baritone, state, dest, result, false);
     }
+
+    @Override
+    public boolean hasClutched(IPlayerContext ctx, BetterBlockPos dest, BlockState destState) {
+        return ctx.player().getBoundingBox().intersects(dest.x, dest.y, dest.z, dest.x + 1, dest.y + 1, dest.z + 1);
+    }
 }
diff --git a/src/main/java/baritone/pathing/movement/movements/MovementDescend.java b/src/main/java/baritone/pathing/movement/movements/MovementDescend.java
@@ -237,7 +237,6 @@ public static void dynamicFallCost(CalculationContext context, int x, int y, int
                             if (clutchRes != null) {
                                 clutchRes.clutch = clutch;
                                 clutchRes.item = item;
-                                clutchRes.placeBelow = true;
                             }
                         }
                         break;
diff --git a/src/main/java/baritone/pathing/movement/movements/MovementFall.java b/src/main/java/baritone/pathing/movement/movements/MovementFall.java
@@ -82,8 +82,9 @@ public MovementState updateState(MovementState state) {
 
         BlockPos playerFeet = ctx.playerFeet();
         Rotation toDest = RotationUtils.calcRotationFromVec3d(ctx.playerHead(), VecUtils.getBlockPosCenter(dest), ctx.playerRotations());
-        BetterBlockPos trueDest = clutchResult.placeBelow ? dest.below() : dest;
-        BlockState destState = ctx.world().getBlockState(trueDest);
+        BlockState destState = ctx.world().getBlockState(dest);
+        BetterBlockPos blockDest = dest.below();
+        BlockState blockDestState = ctx.world().getBlockState(blockDest);
         if (ctx.world().getBlockState(dest.below()).is(Blocks.MAGMA_BLOCK) &&
                 MovementHelper.steppingOnBlocks(ctx).stream().allMatch(block -> MovementHelper.canWalkThrough(ctx, block))) {
             state.setInput(Input.SNEAK, true);
@@ -93,15 +94,12 @@ public MovementState updateState(MovementState state) {
             return state.setStatus(MovementStatus.UNREACHABLE);
         }
         if (clutchResult.clutch != null) {
-            if (clutchResult.clutch.compare(destState) ||
-                    clutchResult.item == null ||
-                    clutchResult.clutch.clutch(baritone, state, trueDest, clutchResult)) {
-                if (clutchResult.clutch.isFinished(ctx, state, clutchResult) && ctx.player().isOnGround()) {
-                    clutchResult.reset();
-                    return state.setStatus(MovementStatus.SUCCESS);
-                } else {
-                    return state;
-                }
+            if (clutchResult.item != null && !clutchResult.clutch.compare(blockDestState)) {
+                clutchResult.clutch.clutch(baritone, state, blockDest, clutchResult);
+            }
+            if (clutchResult.clutch.hasClutched(ctx, dest, destState) && clutchResult.clutch.isFinished(ctx, state, clutchResult)) {
+                clutchResult.reset();
+                return state.setStatus(MovementStatus.SUCCESS);
             }
         } else if (playerFeet.equals(dest)) {
             return state.setStatus(MovementStatus.SUCCESS);
diff --git a/src/main/java/baritone/utils/pathing/MutableClutchResult.java b/src/main/java/baritone/utils/pathing/MutableClutchResult.java
@@ -23,8 +23,6 @@
 public final class MutableClutchResult {
     public Clutch clutch;
     public ItemStack item;
-    public int phase;
-    public boolean placeBelow;
 
     public MutableClutchResult() {
         reset();
@@ -33,7 +31,5 @@ public MutableClutchResult() {
     public void reset() {
         clutch = null;
         item = null;
-        phase = 0;
-        placeBelow = true;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -59,4 +59,9 @@ public boolean isPlaceable(CalculationContext context, int x, int y, int z, Bloc`
`59`	`59`	`public boolean clutch(IBaritone baritone, MovementState state, BlockPos dest, MutableClutchResult result) {`
`60`	`60`	`return ClutchUtils.blockClutch(baritone, state, dest, result, false);`
`61`	`61`	`}`
	`62`	`+`
	`63`	`+ @Override`
	`64`	`+ public boolean hasClutched(IPlayerContext ctx, BetterBlockPos dest, BlockState destState) {`
	`65`	`+ return ctx.player().getBoundingBox().intersects(dest.x, dest.y, dest.z, dest.x + 1, dest.y + 1, dest.z + 1);`
	`66`	`+ }`
`62`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,4 +47,9 @@ public boolean isFinished(IPlayerContext ctx, MovementState state, MutableClutch`
`47`	`47`	`state.setInput(Input.SNEAK, true);`
`48`	`48`	`return ctx.world().getBlockState(ctx.playerFeet()).is(Blocks.SCAFFOLDING);`
`49`	`49`	`}`
	`50`	`+`
	`51`	`+ @Override`
	`52`	`+ public boolean hasClutched(IPlayerContext ctx, BetterBlockPos dest, BlockState destState) {`
	`53`	`+ return ctx.player().getBoundingBox().intersects(dest.x, dest.y, dest.z, dest.x + 1, dest.y + 2, dest.z + 1);`
	`54`	`+ }`
`50`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,6 @@ public static void dynamicFallCost(CalculationContext context, int x, int y, int`
`237`	`237`	`if (clutchRes != null) {`
`238`	`238`	`clutchRes.clutch = clutch;`
`239`	`239`	`clutchRes.item = item;`
`240`		`- clutchRes.placeBelow = true;`
`241`	`240`	`}`
`242`	`241`	`}`
`243`	`242`	`break;`