0xf8/baritone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove implementation of IMovement

Browse Source
This commit is contained in:
Howard Stark
2018-08-04 23:01:38 -04:00
parent 4608086656
commit 5a573f52bf
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/baritone/bot/pathing/movement/Movement.java
View File

@ -12,7 +12,7 @@ import net.minecraft.util.math.Vec3d;
import java.util.Optional; import java.util.Optional;
public abstract class Movement implements IMovement, Helper, MovementHelper { public abstract class Movement implements Helper, MovementHelper {
private MovementState currentState = new MovementState().setStatus(MovementStatus.PREPPING); private MovementState currentState = new MovementState().setStatus(MovementStatus.PREPPING);
protected final BlockPos src; protected final BlockPos src;
@ -45,6 +45,12 @@ public abstract class Movement implements IMovement, Helper, MovementHelper {
public abstract double calculateCost(ToolSet ts); // TODO pass in information like whether it's allowed to place throwaway blocks public abstract double calculateCost(ToolSet ts); // TODO pass in information like whether it's allowed to place throwaway blocks
/**
* Handles the execution of the latest Movement
* State, and offers a Status to the calling class.
*
* @return Status
*/
public MovementStatus update() { public MovementStatus update() {
// if(isPrepared(state)) { // if(isPrepared(state)) {
// if (!currentState.isPresent()) { // if (!currentState.isPresent()) {
@ -57,9 +63,9 @@ public abstract class Movement implements IMovement, Helper, MovementHelper {
} }
MovementState latestState = updateState(currentState); MovementState latestState = updateState(currentState);
Tuple<Float, Float> rotation = Utils.calcRotationFromVec3d(mc.player.getPositionEyes(1.0F), Tuple<Float, Float> rotation = Utils.calcRotationFromVec3d(player().getPositionEyes(1.0F),
latestState.getGoal().rotation); latestState.getGoal().rotation);
mc.player.setPositionAndRotation(mc.player.posX, mc.player.posY, mc.player.posZ, player().setPositionAndRotation(player().posX, player().posY, player().posZ,
rotation.getFirst(), rotation.getSecond()); rotation.getFirst(), rotation.getSecond());
//TODO calculate movement inputs from latestState.getGoal().position //TODO calculate movement inputs from latestState.getGoal().position
latestState.inputState.forEach((input, forced) -> { latestState.inputState.forEach((input, forced) -> {