Fixed bug

Author: Murat65536

src/main/java/baritone/pathing/clutch/Clutch.java

@@ -31,8 +31,6 @@
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
 public abstract class Clutch {

src/main/java/baritone/pathing/clutch/ClutchUtils.java

@@ -57,6 +57,7 @@ static boolean isClutchBlock(BlockState state) {
     }
 
     static boolean blockClutch(IBaritone baritone, MovementState state, BlockPos dest, MutableClutchResult result, boolean allowDown) {
+        state.setTarget(new MovementState.MovementTarget(baritone.getPlayerContext().playerRotations().withPitch(90), true));
         if (MovementHelper.attemptToPlaceABlock(state, baritone, dest, allowDown, true, true, result.item.getItem()) == MovementHelper.PlaceResult.READY_TO_PLACE) {
             state.setInput(Input.CLICK_RIGHT, true);
             return true;

src/main/java/baritone/pathing/clutch/clutches/TwistingVineClutch.java

@@ -33,6 +33,6 @@ public boolean isAcceptedItem(Item item) {
 
     @Override
     public boolean compare(BlockState state) {
-        return state.is(Blocks.TWISTING_VINES);
+        return state.is(Blocks.TWISTING_VINES) || state.is(Blocks.TWISTING_VINES_PLANT);
     }
 }

src/main/java/baritone/pathing/movement/movements/MovementDescend.java

@@ -190,7 +190,6 @@ public static void dynamicFallCost(CalculationContext context, int x, int y, int
                 }
                 break;
             }
-            BlockState aboveBlock = context.get(destX, newY + 1, destZ);
             Clutch nonSolidClutchBlock = null;
             if (unprotectedFallHeight > context.maxFallHeightNoClutch) {
                 for (Clutch clutch : ClutchUtils.CLUTCHES) {
@@ -214,29 +213,32 @@ public static void dynamicFallCost(CalculationContext context, int x, int y, int
                     }
                 }
             }
+            BlockState aboveBlock = context.get(destX, newY + 1, destZ);
             if (unprotectedFallHeight - 1 <= context.maxFallHeightClutch &&
                     context.allowPlace &&
                     !context.isPossiblyProtected(destX, newY + 1, destZ) &&
                     context.worldBorder.canPlaceAt(destX, destZ) &&
-                    MovementHelper.isReplaceable(destX, newY + 1, destZ, aboveBlock, context.bsi) &&
-                    !aboveBlock.hasProperty(BlockStateProperties.DOUBLE_BLOCK_HALF)) {
+                    MovementHelper.isReplaceable(destX, newY + 1, destZ, aboveBlock, context.bsi)) {
                 for (Clutch clutch : ClutchUtils.CLUTCHES) {
                     ItemStack item = clutch.getClutchingItem(context);
                     if (clutch.getFallDamage(unprotectedFallHeight - 1) <= context.maxFallHeightNoClutch &&
                             clutch.isPlaceable(context, destX, newY, destZ, ontoBlock) &&
                             item != null) {
                         double newCost = tentativeCost + context.placeBlockCost;
+                        boolean solidPlace;
                         if (clutch.isSolid(context)) {
                             newCost += ActionCosts.distanceToTicks(unprotectedFallHeight, 0.08, velocity) + clutch.getAdditionalCost();
+                            solidPlace = true;
                         } else if (MovementHelper.canWalkOn(context, destX, newY, destZ, ontoBlock)) {
                             newCost += clutch.getCost(unprotectedFallHeight, 1.0, velocity).first();
+                            solidPlace = false;
                         } else {
                             continue;
                         }
                         if (newCost < res.cost) {
                             res.cost = newCost;
                             res.x = destX;
-                            res.y = newY + 2;
+                            res.y = newY + (solidPlace ? 2 : 1);
                             res.z = destZ;
                             if (clutchRes != null) {
                                 clutchRes.clutch = clutch;

src/main/java/baritone/pathing/movement/movements/MovementFall.java

@@ -45,7 +45,7 @@ public class MovementFall extends Movement {
     private final MutableClutchResult clutchResult = new MutableClutchResult();
 
     public MovementFall(IBaritone baritone, BetterBlockPos src, BetterBlockPos dest) {
-        super(baritone, src, dest, MovementFall.buildPositionsToBreak(src, dest)); // TODO add `toPlace`
+        super(baritone, src, dest, MovementFall.buildPositionsToBreak(src, dest), dest.below());
     }
 
     @Override
@@ -115,6 +115,7 @@ public MovementState updateState(MovementState state) {
         }
         Vec3 destCenterOffset = new Vec3(destCenter.x + 0.125 * avoid.getX(), destCenter.y, destCenter.z + 0.125 * avoid.getZ());
         return state.setTarget(new MovementTarget(RotationUtils.calcRotationFromVec3d(ctx.playerHead(), destCenterOffset, ctx.playerRotations()), true));
+//        return state;
     }
 
     private Direction avoid() {