From c423d5f575bf06e2cb7599bb19808d45849b0c93 Mon Sep 17 00:00:00 2001 From: Leijurv Date: Fri, 23 Nov 2018 11:35:13 -0800 Subject: [PATCH 1/2] report path start position --- src/comms/java/comms/upward/MessageStatus.java | 14 +++++++++++++- .../java/baritone/behavior/ControllerBehavior.java | 8 +++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/comms/java/comms/upward/MessageStatus.java b/src/comms/java/comms/upward/MessageStatus.java index 7a5e74af..53786a01 100644 --- a/src/comms/java/comms/upward/MessageStatus.java +++ b/src/comms/java/comms/upward/MessageStatus.java @@ -35,6 +35,9 @@ public class MessageStatus implements iMessage { public final float health; public final float saturation; public final int foodLevel; + public final int pathStartX; + public final int pathStartY; + public final int pathStartZ; public final boolean hasCurrentSegment; public final boolean hasNextSegment; public final boolean calcInProgress; @@ -54,6 +57,9 @@ public class MessageStatus implements iMessage { this.health = in.readFloat(); this.saturation = in.readFloat(); this.foodLevel = in.readInt(); + this.pathStartX = in.readInt(); + this.pathStartY = in.readInt(); + this.pathStartZ = in.readInt(); this.hasCurrentSegment = in.readBoolean(); this.hasNextSegment = in.readBoolean(); this.calcInProgress = in.readBoolean(); @@ -64,7 +70,7 @@ public class MessageStatus implements iMessage { this.currentProcess = in.readUTF(); } - public MessageStatus(double x, double y, double z, float yaw, float pitch, boolean onGround, float health, float saturation, int foodLevel, boolean hasCurrentSegment, boolean hasNextSegment, boolean calcInProgress, double ticksRemainingInCurrent, boolean calcFailedLastTick, boolean safeToCancel, String currentGoal, String currentProcess) { + public MessageStatus(double x, double y, double z, float yaw, float pitch, boolean onGround, float health, float saturation, int foodLevel, int pathStartX, int pathStartY, int pathStartZ, boolean hasCurrentSegment, boolean hasNextSegment, boolean calcInProgress, double ticksRemainingInCurrent, boolean calcFailedLastTick, boolean safeToCancel, String currentGoal, String currentProcess) { this.x = x; this.y = y; this.z = z; @@ -74,6 +80,9 @@ public class MessageStatus implements iMessage { this.health = health; this.saturation = saturation; this.foodLevel = foodLevel; + this.pathStartX = pathStartX; + this.pathStartY = pathStartY; + this.pathStartZ = pathStartZ; this.hasCurrentSegment = hasCurrentSegment; this.hasNextSegment = hasNextSegment; this.calcInProgress = calcInProgress; @@ -95,6 +104,9 @@ public class MessageStatus implements iMessage { out.writeFloat(health); out.writeFloat(saturation); out.writeInt(foodLevel); + out.writeInt(pathStartX); + out.writeInt(pathStartY); + out.writeInt(pathStartZ); out.writeBoolean(hasCurrentSegment); out.writeBoolean(hasNextSegment); out.writeBoolean(calcInProgress); diff --git a/src/main/java/baritone/behavior/ControllerBehavior.java b/src/main/java/baritone/behavior/ControllerBehavior.java index 3f8329bd..736d6ac6 100644 --- a/src/main/java/baritone/behavior/ControllerBehavior.java +++ b/src/main/java/baritone/behavior/ControllerBehavior.java @@ -28,6 +28,7 @@ import comms.IMessageListener; import comms.downward.MessageChat; import comms.iMessage; import comms.upward.MessageStatus; +import net.minecraft.util.math.BlockPos; import java.io.IOException; import java.util.List; @@ -49,7 +50,9 @@ public class ControllerBehavior extends Behavior implements IMessageListener { } public MessageStatus buildStatus() { - // TODO inventory + // TODO report inventory and echest contents + // TODO figure out who should remember echest contents when it isn't open, baritone or tenor? + BlockPos pathStart = baritone.getPathingBehavior().pathStart(); return new MessageStatus( ctx.player().posX, ctx.player().posY, @@ -60,6 +63,9 @@ public class ControllerBehavior extends Behavior implements IMessageListener { ctx.player().getHealth(), ctx.player().getFoodStats().getSaturationLevel(), ctx.player().getFoodStats().getFoodLevel(), + pathStart.getX(), + pathStart.getY(), + pathStart.getZ(), baritone.getPathingBehavior().getCurrent() != null, baritone.getPathingBehavior().getNext() != null, baritone.getPathingBehavior().getInProgress().isPresent(), From fdd758bc90fd3fc93685e7782837e9591e217485 Mon Sep 17 00:00:00 2001 From: Leijurv Date: Fri, 23 Nov 2018 11:46:47 -0800 Subject: [PATCH 2/2] too much log spam --- src/main/java/baritone/behavior/PathingBehavior.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/baritone/behavior/PathingBehavior.java b/src/main/java/baritone/behavior/PathingBehavior.java index 42186b5b..de973a5f 100644 --- a/src/main/java/baritone/behavior/PathingBehavior.java +++ b/src/main/java/baritone/behavior/PathingBehavior.java @@ -358,7 +358,7 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior, } if (MovementHelper.canWalkOn(ctx, possibleSupport.down()) && MovementHelper.canWalkThrough(ctx, possibleSupport) && MovementHelper.canWalkThrough(ctx, possibleSupport.up())) { // this is plausible - logDebug("Faking path start assuming player is standing off the edge of a block"); + //logDebug("Faking path start assuming player is standing off the edge of a block"); return possibleSupport; } } @@ -367,7 +367,7 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior, // !onGround // we're in the middle of a jump if (MovementHelper.canWalkOn(ctx, feet.down().down())) { - logDebug("Faking path start assuming player is midair and falling"); + //logDebug("Faking path start assuming player is midair and falling"); return feet.down(); } }