mirror of
https://github.com/cabaletta/baritone
synced 2024-12-25 08:22:33 +00:00
target rotation for traverse and ascend
This commit is contained in:
parent
785e5377e6
commit
5b96e6cd57
@ -7,9 +7,12 @@ import baritone.bot.pathing.movement.MovementState;
|
||||
import baritone.bot.pathing.movement.MovementState.MovementStatus;
|
||||
import baritone.bot.utils.BlockStateInterface;
|
||||
import baritone.bot.utils.ToolSet;
|
||||
import baritone.bot.utils.Utils;
|
||||
import net.minecraft.block.BlockFalling;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
public class MovementAscend extends Movement {
|
||||
BlockPos[] against = new BlockPos[3];
|
||||
|
||||
@ -58,14 +61,11 @@ public class MovementAscend extends Movement {
|
||||
return WALK_ONE_BLOCK_COST / 2 + Math.max(JUMP_ONE_BLOCK_COST, WALK_ONE_BLOCK_COST / 2) + getTotalHardnessOfBlocksToBreak(ts);//we walk half the block to get to the edge, then we walk the other half while simultaneously jumping (math.max because of how it's in parallel)
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFinish() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public MovementState updateState(MovementState state) {
|
||||
|
||||
super.updateState(state);
|
||||
System.out.println("Ticking with state " + state.getStatus());
|
||||
switch (state.getStatus()) {
|
||||
case PREPPING:
|
||||
case UNREACHABLE:
|
||||
@ -73,6 +73,8 @@ public class MovementAscend extends Movement {
|
||||
return state;
|
||||
case WAITING:
|
||||
case RUNNING:
|
||||
state.setTarget(new MovementState.MovementTarget(Optional.empty(), Optional.of(Utils.calcRotationFromCoords(playerFeet(), positionsToBreak[0]))));
|
||||
|
||||
MovementState latestState = state.setInput(InputOverrideHandler.Input.JUMP, true).setInput(InputOverrideHandler.Input.MOVE_FORWARD, true);
|
||||
if (playerFeet().equals(dest))
|
||||
latestState.setStatus(MovementStatus.SUCCESS);
|
||||
|
@ -81,14 +81,11 @@ public class MovementTraverse extends Movement {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFinish() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public MovementState updateState(MovementState state) {
|
||||
super.updateState(state);
|
||||
System.out.println("Ticking with state " + state.getStatus());
|
||||
System.out.println(state.getTarget().rotation);
|
||||
switch (state.getStatus()) {
|
||||
case PREPPING:
|
||||
case UNREACHABLE:
|
||||
|
Loading…
Reference in New Issue
Block a user