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

better output

Browse Source
This commit is contained in:
Leijurv 2018-08-08 17:04:01 -07:00
parent 1f5874876b
commit ea10c136c8
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@ import baritone.bot.pathing.movement.ActionCosts;
import baritone.bot.pathing.movement.Movement; import baritone.bot.pathing.movement.Movement;
import baritone.bot.pathing.movement.MovementState; import baritone.bot.pathing.movement.MovementState;
import baritone.bot.utils.BlockStateInterface; import baritone.bot.utils.BlockStateInterface;
import baritone.bot.utils.Helper;
import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.entity.EntityPlayerSP;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.util.Tuple; import net.minecraft.util.Tuple;
@ -37,7 +38,7 @@ import static baritone.bot.pathing.movement.MovementState.MovementStatus.*;
* *
* @author leijurv * @author leijurv
*/ */
public class PathExecutor extends Behavior { public class PathExecutor extends Behavior implements Helper {
private static final double MAX_DIST_FROM_PATH = 2; private static final double MAX_DIST_FROM_PATH = 2;
private static final double MAX_TICKS_AWAY = 200; // ten seconds private static final double MAX_TICKS_AWAY = 200; // ten seconds
private final IPath path; private final IPath path;
@ -65,7 +66,7 @@ public class PathExecutor extends Behavior {
EntityPlayerSP thePlayer = mc.player; EntityPlayerSP thePlayer = mc.player;
BlockPos whereAmI = playerFeet(); BlockPos whereAmI = playerFeet();
if (pathPosition == path.length() - 1) { if (pathPosition == path.length() - 1) {
System.out.println("On last path position -- done!"); displayChatMessageRaw("On last position, ending this path.");
pathPosition++; pathPosition++;
return; return;
} }
@ -74,14 +75,14 @@ public class PathExecutor extends Behavior {
if (!Blocks.AIR.equals(BlockStateInterface.getBlock(whereAmI.down()))) {//do not skip if standing on air, because our position isn't stable to skip if (!Blocks.AIR.equals(BlockStateInterface.getBlock(whereAmI.down()))) {//do not skip if standing on air, because our position isn't stable to skip
for (int i = 0; i < pathPosition - 2 && i < path.length(); i++) {//this happens for example when you lag out and get teleported back a couple blocks for (int i = 0; i < pathPosition - 2 && i < path.length(); i++) {//this happens for example when you lag out and get teleported back a couple blocks
if (whereAmI.equals(path.positions().get(i))) { if (whereAmI.equals(path.positions().get(i))) {
System.out.println("Skipping back " + (pathPosition - i) + " steps, to " + i); displayChatMessageRaw("Skipping back " + (pathPosition - i) + " steps, to " + i);
pathPosition = Math.max(i - 1, 0); // previous step might not actually be done pathPosition = Math.max(i - 1, 0); // previous step might not actually be done
return; return;
} }
} }
for (int i = pathPosition + 2; i < path.length(); i++) { //dont check pathPosition+1. the movement tells us when it's done (e.g. sneak placing) for (int i = pathPosition + 2; i < path.length(); i++) { //dont check pathPosition+1. the movement tells us when it's done (e.g. sneak placing)
if (whereAmI.equals(path.positions().get(i))) { if (whereAmI.equals(path.positions().get(i))) {
System.out.println("Skipping forward " + (i - pathPosition) + " steps, to " + i); displayChatMessageRaw("Skipping forward " + (i - pathPosition) + " steps, to " + i);
pathPosition = i - 1; pathPosition = i - 1;
return; return;
} }
@ -94,9 +95,10 @@ public class PathExecutor extends Behavior {
ticksAway++; ticksAway++;
System.out.println("FAR AWAY FROM PATH FOR " + ticksAway + " TICKS. Current distance: " + distanceFromPath + ". Threshold: " + MAX_DIST_FROM_PATH); System.out.println("FAR AWAY FROM PATH FOR " + ticksAway + " TICKS. Current distance: " + distanceFromPath + ". Threshold: " + MAX_DIST_FROM_PATH);
if (ticksAway > MAX_TICKS_AWAY) { if (ticksAway > MAX_TICKS_AWAY) {
System.out.println("Too far away from path for too long, cancelling path"); displayChatMessageRaw("Too far away from path for too long, cancelling path");
System.out.println("Too many ticks"); System.out.println("Too many ticks");
pathPosition = path.length() + 3; pathPosition = path.length() + 3;
Baritone.INSTANCE.getInputOverrideHandler().clearAllKeys();
failed = true; failed = true;
return; return;
} }
@ -143,16 +145,18 @@ public class PathExecutor extends Behavior {
} }
Movement movement = path.movements().get(pathPosition); Movement movement = path.movements().get(pathPosition);
if (movement.recalculateCost() >= ActionCosts.COST_INF) { if (movement.recalculateCost() >= ActionCosts.COST_INF) {
System.out.println("Something has changed in the world and this movement has become impossible. Cancelling."); displayChatMessageRaw("Something has changed in the world and this movement has become impossible. Cancelling.");
pathPosition = path.length() + 3; pathPosition = path.length() + 3;
failed = true; failed = true;
Baritone.INSTANCE.getInputOverrideHandler().clearAllKeys();
return; return;
} }
MovementState.MovementStatus movementStatus = movement.update(); MovementState.MovementStatus movementStatus = movement.update();
if (movementStatus == UNREACHABLE || movementStatus == FAILED) { if (movementStatus == UNREACHABLE || movementStatus == FAILED) {
System.out.println("Movement returns status " + movementStatus); displayChatMessageRaw("Movement returns status " + movementStatus);
pathPosition = path.length() + 3; pathPosition = path.length() + 3;
failed = true; failed = true;
Baritone.INSTANCE.getInputOverrideHandler().clearAllKeys();
return; return;
} }
if (movementStatus == SUCCESS) { if (movementStatus == SUCCESS) {
@ -164,8 +168,9 @@ public class PathExecutor extends Behavior {
} else { } else {
ticksOnCurrent++; ticksOnCurrent++;
if (ticksOnCurrent > movement.recalculateCost() + 100) { if (ticksOnCurrent > movement.recalculateCost() + 100) {
System.out.println("This movement has taken too long (" + ticksOnCurrent + " ticks, expected " + movement.getCost(null) + "). Cancelling."); displayChatMessageRaw("This movement has taken too long (" + ticksOnCurrent + " ticks, expected " + movement.getCost(null) + "). Cancelling.");
movement.cancel(); movement.cancel();
Baritone.INSTANCE.getInputOverrideHandler().clearAllKeys();
pathPosition = path.length() + 3; pathPosition = path.length() + 3;
failed = true; failed = true;
return; return;

16
src/main/java/baritone/bot/utils/Helper.java
View File

@ -19,11 +19,17 @@ package baritone.bot.utils;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.entity.EntityPlayerSP;
import net.minecraft.client.gui.GuiNewChat;
import net.minecraft.client.gui.GuiUtilRenderComponents;
import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.multiplayer.WorldClient;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextComponentString;
import java.util.List;
/** /**
* @author Brady * @author Brady
* @since 8/1/2018 12:18 AM * @since 8/1/2018 12:18 AM
@ -53,6 +59,14 @@ public interface Helper {
} }
default void displayChatMessageRaw(String message) { default void displayChatMessageRaw(String message) {
mc.ingameGUI.getChatGUI().printChatMessage(new TextComponentString(message)); GuiNewChat gui = mc.ingameGUI.getChatGUI();
int normalMaxWidth = MathHelper.floor((float) gui.getChatWidth() / gui.getChatScale());
int widthWithStyleFormat = normalMaxWidth - 2;
List<ITextComponent> list = GuiUtilRenderComponents.splitText(new TextComponentString("§5[§dBaritone§5]§7 " + message), widthWithStyleFormat,
this.mc.fontRenderer, false, true);
for (ITextComponent component : list) {
gui.printChatMessage(new TextComponentString("§7" + component.getUnformattedText()));
}
} }
} }