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

goal parsing

Browse Source
This commit is contained in:
Leijurv 2018-08-10 10:45:18 -07:00
parent 9dd5aa21b1
commit 3dc544b120
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/baritone/bot/behavior/impl/PathingBehavior.java
View File

@ -28,6 +28,7 @@ import baritone.bot.pathing.calc.IPathFinder;
import baritone.bot.pathing.goals.Goal; import baritone.bot.pathing.goals.Goal;
import baritone.bot.pathing.goals.GoalBlock; import baritone.bot.pathing.goals.GoalBlock;
import baritone.bot.pathing.goals.GoalXZ; import baritone.bot.pathing.goals.GoalXZ;
import baritone.bot.pathing.goals.GoalYLevel;
import baritone.bot.pathing.path.IPath; import baritone.bot.pathing.path.IPath;
import baritone.bot.pathing.path.PathExecutor; import baritone.bot.pathing.path.PathExecutor;
import baritone.bot.utils.PathRenderer; import baritone.bot.utils.PathRenderer;
@ -63,10 +64,32 @@ public class PathingBehavior extends Behavior {
@Override @Override
public void onSendChatMessage(ChatEvent event) { public void onSendChatMessage(ChatEvent event) {
String msg = event.getMessage(); String msg = event.getMessage();
if (msg.equals("goal")) { if (msg.toLowerCase().startsWith("goal")) {
goal = new GoalBlock(playerFeet());
displayChatMessageRaw("Goal: " + goal);
event.cancel(); event.cancel();
String[] params = msg.toLowerCase().substring(4).trim().split(" ");
try {
switch (params.length) {
case 0:
goal = new GoalBlock(playerFeet());
break;
case 1:
goal = new GoalYLevel(Integer.parseInt(params[0]));
break;
case 2:
goal = new GoalXZ(Integer.parseInt(params[0]), Integer.parseInt(params[1]));
break;
case 3:
goal = new GoalBlock(new BlockPos(Integer.parseInt(params[0]), Integer.parseInt(params[1]), Integer.parseInt(params[2])));
break;
default:
displayChatMessageRaw("unable to understand lol");
return;
}
} catch (NumberFormatException ex) {
displayChatMessageRaw("unable to parse integer " + ex);
return;
}
displayChatMessageRaw("Goal: " + goal);
return; return;
} }
if (msg.equals("path")) { if (msg.equals("path")) {
@ -127,7 +150,7 @@ public class PathingBehavior extends Behavior {
} }
*/ */
if (talkAboutIt && current != null && current.getPath() != null) { if (talkAboutIt && current != null && current.getPath() != null) {
displayChatMessageRaw("Finished finding a path from " + start + " to " + goal + ". " + current.getPath().getNumNodesConsidered() + " nodes considered"); displayChatMessageRaw("Finished finding a path from " + start + " towards " + goal + ". " + current.getPath().getNumNodesConsidered() + " nodes considered");
} }
}).start(); }).start();
} }

2
src/main/java/baritone/bot/pathing/path/PathExecutor.java
View File

@ -174,7 +174,7 @@ public class PathExecutor extends Behavior {
} }
long end = System.currentTimeMillis(); long end = System.currentTimeMillis();
if (end - start > 0) { if (end - start > 0) {
displayChatMessageRaw("Recalculating break and place took " + (end - start) + "ms"); //displayChatMessageRaw("Recalculating break and place took " + (end - start) + "ms");
} }
Movement movement = path.movements().get(pathPosition); Movement movement = path.movements().get(pathPosition);
if (movement.recalculateCost() >= ActionCosts.COST_INF) { if (movement.recalculateCost() >= ActionCosts.COST_INF) {