Refactor pathfinding => pathing

This commit is contained in:
Howard Stark
2018-08-01 23:27:41 -04:00
parent e4fa043c8c
commit 37be3908c7
14 changed files with 11 additions and 11 deletions

View File

@@ -1,5 +0,0 @@
package baritone.bot.pathfinding.actions;
public enum ActionTypes {
}

View File

@@ -1,4 +1,4 @@
package baritone.bot.pathfinding; package baritone.bot.pathing;
public class State { public class State {

View File

@@ -1,4 +1,4 @@
package baritone.bot.pathfinding.actions; package baritone.bot.pathing.actions;
public final class ActionCosts { public final class ActionCosts {
private ActionCosts() {} private ActionCosts() {}

View File

@@ -0,0 +1,5 @@
package baritone.bot.pathing.actions;
public enum ActionTypes {
}

View File

@@ -8,7 +8,7 @@ package baritone.bot.goals;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
/** /**
* An abstract Goal for pathfinding, can be anything from a specific block to just a Y coordinate. * An abstract Goal for pathing, can be anything from a specific block to just a Y coordinate.
* @author leijurv * @author leijurv
*/ */
public interface Goal { public interface Goal {

View File

@@ -233,7 +233,7 @@ public class Baritone {
if (isThereAnythingInProgress && Action.isWater(theWorld.getBlockState(playerFeet).getBlock())) { if (isThereAnythingInProgress && Action.isWater(theWorld.getBlockState(playerFeet).getBlock())) {
if (Action.isWater(theWorld.getBlockState(playerFeet.down()).getBlock()) || !Action.canWalkOn(playerFeet.down()) || Action.isWater(theWorld.getBlockState(playerFeet.up()).getBlock())) { if (Action.isWater(theWorld.getBlockState(playerFeet.down()).getBlock()) || !Action.canWalkOn(playerFeet.down()) || Action.isWater(theWorld.getBlockState(playerFeet.up()).getBlock())) {
//if water is deeper than one block, or we can't walk on what's below the water, or our head is in water, jump //if water is deeper than one block, or we can't walk on what's below the water, or our head is in water, jump
Out.log("Jumping because in water and pathfinding"); Out.log("Jumping because in water and pathing");
MovementManager.jumping = true; MovementManager.jumping = true;
} }
} }
@@ -346,7 +346,7 @@ public class Baritone {
} }
/** /**
* Actually do the pathfinding * Actually do the pathing
* *
* @param start * @param start
* @return * @return

View File

@@ -214,7 +214,7 @@ public class ChatCommand {
Baritone.cancelPath(); Baritone.cancelPath();
Baritone.plsCancel = true; Baritone.plsCancel = true;
Manager.cancel(LookManager.class); Manager.cancel(LookManager.class);
return Baritone.isThereAnythingInProgress ? "Cancelled it, but btw I'm pathfinding right now" : "Cancelled it"; return Baritone.isThereAnythingInProgress ? "Cancelled it, but btw I'm pathing right now" : "Cancelled it";
} }
public static String st(String message) { public static String st(String message) {