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

this is so sad

Browse Source
This commit is contained in:
Leijurv 2018-08-14 10:50:41 -07:00
parent 60d246ecc9
commit 2e7f5048dc
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/baritone/bot/pathing/calc/AStarPathFinder.java
View File

@ -105,7 +105,7 @@ public class AStarPathFinder extends AbstractNodeCostSearch implements Helper {
} }
if (goal.isInGoal(currentNodePos)) { if (goal.isInGoal(currentNodePos)) {
currentlyRunning = null; currentlyRunning = null;
return Optional.of(new Path(startNode, currentNode, goal, numNodes)); return Optional.of(new Path(startNode, currentNode, numNodes));
} }
//long constructStart = System.nanoTime(); //long constructStart = System.nanoTime();
Movement[] possibleMovements = getConnectedPositions(currentNodePos, calcContext);//movement that we could take that start at myPos, in random order Movement[] possibleMovements = getConnectedPositions(currentNodePos, calcContext);//movement that we could take that start at myPos, in random order
@ -184,7 +184,7 @@ public class AStarPathFinder extends AbstractNodeCostSearch implements Helper {
} }
System.out.println("Path goes for " + dist + " blocks"); System.out.println("Path goes for " + dist + " blocks");
currentlyRunning = null; currentlyRunning = null;
return Optional.of(new Path(startNode, bestSoFar[i], goal, numNodes)); return Optional.of(new Path(startNode, bestSoFar[i], numNodes));
} }
} }
displayChatMessageRaw("Even with a cost coefficient of " + COEFFICIENTS[COEFFICIENTS.length - 1] + ", I couldn't get more than " + bestDist + " blocks =("); displayChatMessageRaw("Even with a cost coefficient of " + COEFFICIENTS[COEFFICIENTS.length - 1] + ", I couldn't get more than " + bestDist + " blocks =(");

4
src/main/java/baritone/bot/pathing/calc/AbstractNodeCostSearch.java
View File

@ -121,7 +121,7 @@ public abstract class AbstractNodeCostSearch implements IPathFinder {
@Override @Override
public Optional<IPath> pathToMostRecentNodeConsidered() { public Optional<IPath> pathToMostRecentNodeConsidered() {
return Optional.ofNullable(mostRecentConsidered).map(node -> new Path(startNode, node, goal, 0)); return Optional.ofNullable(mostRecentConsidered).map(node -> new Path(startNode, node, 0));
} }
@Override @Override
@ -129,7 +129,7 @@ public abstract class AbstractNodeCostSearch implements IPathFinder {
if (startNode == null || bestSoFar[0] == null) if (startNode == null || bestSoFar[0] == null)
return Optional.empty(); return Optional.empty();
return Optional.of(new Path(startNode, bestSoFar[0], goal, 0)); return Optional.of(new Path(startNode, bestSoFar[0], 0));
} }
@Override @Override

9
src/main/java/baritone/bot/pathing/calc/Path.java
View File

@ -17,7 +17,6 @@
package baritone.bot.pathing.calc; package baritone.bot.pathing.calc;
import baritone.bot.pathing.goals.Goal;
import baritone.bot.pathing.movement.Movement; import baritone.bot.pathing.movement.Movement;
import baritone.bot.pathing.path.IPath; import baritone.bot.pathing.path.IPath;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
@ -44,11 +43,6 @@ class Path implements IPath {
*/ */
final BlockPos end; final BlockPos end;
/**
* The goal that this path is attempting to accomplish
*/
final Goal goal;
/** /**
* The blocks on the path. Guaranteed that path.get(0) equals start and * The blocks on the path. Guaranteed that path.get(0) equals start and
* path.get(path.size()-1) equals end * path.get(path.size()-1) equals end
@ -59,10 +53,9 @@ class Path implements IPath {
private final int numNodes; private final int numNodes;
Path(PathNode start, PathNode end, Goal goal, int numNodes) { Path(PathNode start, PathNode end, int numNodes) {
this.start = start.pos; this.start = start.pos;
this.end = end.pos; this.end = end.pos;
this.goal = goal;
this.numNodes = numNodes; this.numNodes = numNodes;
this.path = new ArrayList<>(); this.path = new ArrayList<>();
this.movements = new ArrayList<>(); this.movements = new ArrayList<>();