Merge branch 'master' into 1.13.2

README.md

@@ -19,8 +19,9 @@
 ![Lines of Code](https://tokei.rs/b1/github/cabaletta/baritone?category=code)
 [![GitHub contributors](https://img.shields.io/github/contributors/cabaletta/baritone.svg)](https://github.com/cabaletta/baritone/graphs/contributors/)
 [![GitHub commits](https://img.shields.io/github/commits-since/cabaletta/baritone/v1.0.0.svg)](https://github.com/cabaletta/baritone/commit/)
-[![Impact integration](https://img.shields.io/badge/Impact%20integration-v1.2.6%20/%20v1.3.2-brightgreen.svg)](https://impactdevelopment.github.io/)
+[![Impact integration](https://img.shields.io/badge/Impact%20integration-v1.2.8%20/%20v1.3.4-brightgreen.svg)](https://impactdevelopment.github.io/)
 [![ForgeHax integration](https://img.shields.io/badge/ForgeHax%20%22integration%22-scuffed-yellow.svg)](https://github.com/fr1kin/ForgeHax/)
+[![Aristois add-on integration](https://img.shields.io/badge/Aristois%20add--on%20integration-v1.3.4-green.svg)](https://gitlab.com/emc-mods-indrit/baritone_api)
 [![WWE integration](https://img.shields.io/badge/WWE%20%22integration%22-master%3F-green.svg)](https://wweclient.com/)
 [![Future integration](https://img.shields.io/badge/Future%20integration-Soon™%3F%3F%3F-red.svg)](https://futureclient.net/)
 [![forthebadge](https://forthebadge.com/images/badges/built-with-swag.svg)](http://forthebadge.com/)
@@ -30,14 +31,14 @@ A Minecraft pathfinder bot.
 
 Baritone is the pathfinding system used in [Impact](https://impactdevelopment.github.io/) since 4.4. There's a [showcase video](https://www.youtube.com/watch?v=yI8hgW_m6dQ) made by @Adovin#3153 on Baritone's integration into Impact. [Here's](https://www.youtube.com/watch?v=StquF69-_wI) a video I made showing off what it can do.
 
-The easiest way to install Baritone is to install [Impact](https://impactdevelopment.github.io/), which comes with Baritone. The second easiest way (for 1.12.2 only) is to install the forge jar from [releases](https://github.com/cabaletta/baritone/releases). Otherwise, see [Installation & setup](SETUP.md). Once Baritone is installed, look [here](USAGE.md) for instructions on how to use it.
+The easiest way to install Baritone is to install [Impact](https://impactdevelopment.github.io/), which comes with Baritone. The second easiest way (for 1.12.2 only) is to install the v1.2.* forge api jar from [releases](https://github.com/cabaletta/baritone/releases). Otherwise, see [Installation & setup](SETUP.md). Once Baritone is installed, look [here](USAGE.md) for instructions on how to use it.
 
-For 1.14.4, [click here](https://www.dropbox.com/s/rkml3hjokd3qv0m/1.14.4-Baritone.zip?dl=1).
+For 1.14.4, [click here](https://www.dropbox.com/s/rkml3hjokd3qv0m/1.14.4-Baritone.zip?dl=1). Or [with optifine](https://github.com/cabaletta/baritone/issues/797).
 
 This project is an updated version of [MineBot](https://github.com/leijurv/MineBot/),
 the original version of the bot for Minecraft 1.8.9, rebuilt for 1.12.2 and 1.13.2. Baritone focuses on reliability and particularly performance (it's over [30x faster](https://github.com/cabaletta/baritone/pull/180#issuecomment-423822928) than MineBot at calculating paths).
 
-Have committed at least once a day for the last 11 months =D 🦀
+Have committed at least once a day from Aug 1 2018 to Aug 1 2019.
 
 1Leijurv3DWTrGAfmmiTphjhXLvQiHg7K2
 

SETUP.md

@@ -11,6 +11,8 @@ These releases are not always completely up to date with latest features, and ar
 
 Link to the releases page: [Releases](https://github.com/cabaletta/baritone/releases)
 
+v1.2.* is for 1.12.2, v1.3.* is for 1.13.2
+
 Any official release will be GPG signed by leijurv (44A3EA646EADAC6A) and ZeroMemes (73A788379A197567). Please verify that the hash of the file you download is in `checksums.txt` and that `checksums_signed.asc` is a valid signature by those two public keys of `checksums.txt`. 
 
 The build is fully deterministic and reproducible, and you can verify Travis did it properly by running `docker build --no-cache -t cabaletta/baritone .` yourself and comparing the shasum. This works identically on Travis, Mac, and Linux (if you have docker on Windows, I'd be grateful if you could let me know if it works there too).

build.gradle

@@ -70,7 +70,7 @@ sourceSets {
  schematica_api {
  compileClasspath += main.compileClasspath
  }
- 
+
  main {
  compileClasspath += schematica_api.output
  }

src/api/java/baritone/api/Settings.java

@@ -124,6 +124,13 @@ public final class Settings {
  */
  public final Setting<Boolean> allowJumpAt256 = new Setting<>(false);
 
+ /**
+ * This should be monetized it's so good
+ * <p>
+ * Defaults to true, but only actually takes effect if allowParkour is also true
+ */
+ public final Setting<Boolean> allowParkourAscend = new Setting<>(true);
+
  /**
  * Allow descending diagonally
  * <p>
@@ -178,7 +185,7 @@ public final class Settings {
  * Enables some more advanced vine features. They're honestly just gimmicks and won't ever be needed in real
  * pathing scenarios. And they can cause Baritone to get trapped indefinitely in a strange scenario.
  * <p>
- * Never turn this on lol
+ * Almost never turn this on lol
  */
  public final Setting<Boolean> allowVines = new Setting<>(false);
 

src/api/java/baritone/api/utils/ExampleBaritoneControl.java

@@ -44,10 +44,13 @@
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.util.text.event.ClickEvent;
 import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.dimension.DimensionType;
 
 import java.nio.file.Path;
 import java.util.*;
 
+import static org.apache.commons.lang3.StringUtils.isNumeric;
+
 public class ExampleBaritoneControl implements Helper, AbstractGameEventListener {
  private static final String COMMAND_PREFIX = "#";
 
@@ -258,7 +261,7 @@ public boolean runCommand(String msg0) { // you may think this can be private, b
  try {
  String[] coords = msg.substring("build".length()).trim().split(" ");
  file = coords[0] + ".schematic";
- origin = new BlockPos(parseOrDefault(coords[1], ctx.playerFeet().x), parseOrDefault(coords[2], ctx.playerFeet().y), parseOrDefault(coords[3], ctx.playerFeet().z));
+ origin = new BlockPos(parseOrDefault(coords[1], ctx.playerFeet().x, 1), parseOrDefault(coords[2], ctx.playerFeet().y, 1), parseOrDefault(coords[3], ctx.playerFeet().z, 1));
  } catch (Exception ex) {
  file = msg.substring(5).trim() + ".schematic";
  origin = ctx.playerFeet();
@@ -368,7 +371,8 @@ public boolean isInGoal(int x, int y, int z) {
  }
  if (msg.equals("render")) {
  BetterBlockPos pf = ctx.playerFeet();
- Minecraft.getInstance().worldRenderer.markBlockRangeForRenderUpdate(pf.x - 500, pf.y - 500, pf.z - 500, pf.x + 500, pf.y + 500, pf.z + 500);
+ int dist = (Minecraft.getInstance().gameSettings.renderDistanceChunks + 1) * 16;
+ Minecraft.getInstance().worldRenderer.markBlockRangeForRenderUpdate(pf.x - dist, pf.y - 256, pf.z - dist, pf.x + dist, pf.y + 256, pf.z + dist);
  logDirect("okay");
  return true;
  }
@@ -670,8 +674,8 @@ public boolean isInGoal(int x, int y, int z) {
  return false;
  }
 
- private int parseOrDefault(String str, int i) {
- return str.equals("~") ? i : str.startsWith("~") ? Integer.parseInt(str.substring(1)) + i : Integer.parseInt(str);
+ private int parseOrDefault(String str, int i, double dimensionFactor) {
+ return str.equals("~") ? i : str.startsWith("~") ? (int) (Integer.parseInt(str.substring(1)) * dimensionFactor) + i : (int) (Integer.parseInt(str) * dimensionFactor);
  }
 
  private void log(List<ItemStack> stacks) {
@@ -686,18 +690,23 @@ private Goal parseGoal(String[] params) {
  Goal goal;
  try {
  BetterBlockPos playerFeet = ctx.playerFeet();
- switch (params.length) {
+
+ int length = params.length - 1; // length has to be smaller when a dimension parameter is added
+ if (params.length < 1 || (isNumeric(params[params.length - 1]) || params[params.length - 1].startsWith("~"))) {
+ length = params.length;
+ }
+ switch (length) {
  case 0:
  goal = new GoalBlock(playerFeet);
  break;
  case 1:
- goal = new GoalYLevel(parseOrDefault(params[0], playerFeet.y));
+ goal = new GoalYLevel(parseOrDefault(params[0], playerFeet.y, 1));
  break;
  case 2:
- goal = new GoalXZ(parseOrDefault(params[0], playerFeet.x), parseOrDefault(params[1], playerFeet.z));
+ goal = new GoalXZ(parseOrDefault(params[0], playerFeet.x, calculateDimensionFactor(params[params.length - 1])), parseOrDefault(params[1], playerFeet.z, calculateDimensionFactor(params[params.length - 1])));
  break;
  case 3:
- goal = new GoalBlock(new BlockPos(parseOrDefault(params[0], playerFeet.x), parseOrDefault(params[1], playerFeet.y), parseOrDefault(params[2], playerFeet.z)));
+ goal = new GoalBlock(new BlockPos(parseOrDefault(params[0], playerFeet.x, calculateDimensionFactor(params[params.length - 1])), parseOrDefault(params[1], playerFeet.y, 1), parseOrDefault(params[2], playerFeet.z, calculateDimensionFactor(params[params.length - 1]))));
  break;
  default:
  logDirect("unable to understand lol");
@@ -709,4 +718,23 @@ private Goal parseGoal(String[] params) {
  }
  return goal;
  }
+
+
+ private double calculateDimensionFactor(String to) {
+ return Math.pow(8, ctx.world().dimension.getType().getId() - getDimensionByName(to.toLowerCase()).getId());
+ }
+
+ private DimensionType getDimensionByName(String name) {
+ if ("the_end".contains(name)) {
+ return DimensionType.THE_END;
+ }
+ if ("the_overworld".contains(name) || "surface".contains(name)) {
+ return DimensionType.OVERWORLD;
+ }
+ if ("the_nether".contains(name) || "hell".contains(name)) {
+ return DimensionType.NETHER;
+ }
+ return ctx.world().dimension.getType();
+ }
+
 }

src/api/java/baritone/api/utils/MyChunkPos.java

@@ -27,7 +27,7 @@ public class MyChunkPos {
  @SerializedName("x")
  public int x;
 
- @SerializedName("y")
+ @SerializedName("z")
  public int z;
 
  @Override

src/main/java/baritone/Baritone.java

@@ -148,12 +148,12 @@ public InputOverrideHandler getInputOverrideHandler() {
  }
 
  @Override
- public CustomGoalProcess getCustomGoalProcess() { // Iffy
+ public CustomGoalProcess getCustomGoalProcess() {
  return this.customGoalProcess;
  }
 
  @Override
- public GetToBlockProcess getGetToBlockProcess() { // Iffy
+ public GetToBlockProcess getGetToBlockProcess() {
  return this.getToBlockProcess;
  }
 

src/main/java/baritone/behavior/PathingBehavior.java

@@ -135,7 +135,6 @@ private void tickPath() {
  ) {
  // when it was *just* started, currentBest will be empty so we need to also check calcFrom since that's always present
  inProgress.cancel(); // cancellation doesn't dispatch any events
- inProgress = null; // this is safe since we hold both locks
  }
  }
  }
@@ -339,7 +338,7 @@ public void softCancelIfSafe() {
  }
 
  // just cancel the current path
- public void secretInternalSegmentCancel() {
+ private void secretInternalSegmentCancel() {
  queuePathEvent(PathEvent.CANCELED);
  synchronized (pathPlanLock) {
  getInProgress().ifPresent(AbstractNodeCostSearch::cancel);
@@ -361,12 +360,6 @@ public void forceCancel() { // exposed on public api because :sob:
  }
  }
 
- /*public void secretCursedFunctionDoNotCall(IPath path) {
- synchronized (pathPlanLock) {
- current = new PathExecutor(this, path);
- }
- }*/
-
  public CalculationContext secretInternalGetCalculationContext() {
  return context;
  }
@@ -495,7 +488,7 @@ private void findPathInNewThread(final BlockPos start, final boolean talkAboutIt
  }
  }
  if (talkAboutIt && current != null && current.getPath() != null) {
- if (goal == null || goal.isInGoal(current.getPath().getDest())) {
+ if (goal.isInGoal(current.getPath().getDest())) {
  logDebug("Finished finding a path from " + start + " to " + goal + ". " + current.getPath().getNumNodesConsidered() + " nodes considered");
  } else {
  logDebug("Found path segment from " + start + " towards " + goal + ". " + current.getPath().getNumNodesConsidered() + " nodes considered");
@@ -508,7 +501,7 @@ private void findPathInNewThread(final BlockPos start, final boolean talkAboutIt
  });
  }
 
- public static AbstractNodeCostSearch createPathfinder(BlockPos start, Goal goal, IPath previous, CalculationContext context) {
+ private static AbstractNodeCostSearch createPathfinder(BlockPos start, Goal goal, IPath previous, CalculationContext context) {
  Goal transformed = goal;
  if (Baritone.settings().simplifyUnloadedYCoord.value && goal instanceof IGoalRenderPos) {
  BlockPos pos = ((IGoalRenderPos) goal).getGoalPos();

src/main/java/baritone/cache/CachedChunk.java

@@ -199,8 +199,17 @@ public final IBlockState getBlock(int x, int y, int z, int dimension) {
  }
  }
 
- if (type == PathingBlockType.SOLID && y == 127 && dimension == -1) {
- return Blocks.BEDROCK.getDefaultState();
+ if (type == PathingBlockType.SOLID) {
+ if (y == 127 && dimension == -1) {
+ // nether roof is always unbreakable
+ return Blocks.BEDROCK.getDefaultState();
+ }
+ if (y < 5 && dimension == 0) {
+ // solid blocks below 5 are commonly bedrock
+ // however, returning bedrock always would be a little yikes
+ // discourage paths that include breaking blocks below 5 a little more heavily just so that it takes paths breaking what's known to be stone (at 5 or above) instead of what could maybe be bedrock (below 5)
+ return Blocks.OBSIDIAN.getDefaultState();
+ }
  }
  return ChunkPacker.pathingTypeToBlock(type, dimension);
  }

src/main/java/baritone/pathing/calc/AStarPathFinder.java

@@ -76,6 +76,7 @@ protected Optional<IPath> calculate0(long primaryTimeout, long failureTimeout) {
  int timeCheckInterval = 1 << 6;
  int pathingMaxChunkBorderFetch = Baritone.settings().pathingMaxChunkBorderFetch.value; // grab all settings beforehand so that changing settings during pathing doesn't cause a crash or unpredictable behavior
  double minimumImprovement = Baritone.settings().minimumImprovementRepropagation.value ? MIN_IMPROVEMENT : 0;
+ Moves[] allMoves = Moves.values();
  while (!openSet.isEmpty() && numEmptyChunk < pathingMaxChunkBorderFetch && !cancelRequested) {
  if ((numNodes & (timeCheckInterval - 1)) == 0) { // only call this once every 64 nodes (about half a millisecond)
  long now = System.currentTimeMillis(); // since nanoTime is slow on windows (takes many microseconds)
@@ -95,7 +96,7 @@ protected Optional<IPath> calculate0(long primaryTimeout, long failureTimeout) {
  logDebug("Took " + (System.currentTimeMillis() - startTime) + "ms, " + numMovementsConsidered + " movements considered");
  return Optional.of(new Path(startNode, currentNode, numNodes, goal, calcContext));
  }
- for (Moves moves : Moves.values()) {
+ for (Moves moves : allMoves) {
  int newX = currentNode.x + moves.xOffset;
  int newZ = currentNode.z + moves.zOffset;
  if ((newX >> 4 != currentNode.x >> 4 || newZ >> 4 != currentNode.z >> 4) && !calcContext.isLoaded(newX, newZ)) {

src/main/java/baritone/pathing/calc/AbstractNodeCostSearch.java

@@ -127,7 +127,7 @@ public synchronized PathCalculationResult calculate(long primaryTimeout, long fa
  return new PathCalculationResult(PathCalculationResult.Type.SUCCESS_SEGMENT, path);
  }
  } catch (Exception e) {
- Helper.HELPER.logDebug("Pathing exception: " + e);
+ Helper.HELPER.logDirect("Pathing exception: " + e);
  e.printStackTrace();
  return new PathCalculationResult(PathCalculationResult.Type.EXCEPTION);
  } finally {

src/main/java/baritone/pathing/calc/Path.java

@@ -72,28 +72,9 @@ class Path extends PathBase {
  this.start = new BetterBlockPos(start.x, start.y, start.z);
  this.end = new BetterBlockPos(end.x, end.y, end.z);
  this.numNodes = numNodes;
- this.path = new ArrayList<>();
  this.movements = new ArrayList<>();
- this.nodes = new ArrayList<>();
  this.goal = goal;
  this.context = context;
- assemblePath(end);
- }
-
- @Override
- public Goal getGoal() {
- return goal;
- }
-
- /**
- * Assembles this path given the end node.
- *
- * @param end The end node
- */
- private void assemblePath(PathNode end) {
- if (!path.isEmpty() || !movements.isEmpty()) {
- throw new IllegalStateException();
- }
  PathNode current = end;
  LinkedList<BetterBlockPos> tempPath = new LinkedList<>();
  LinkedList<PathNode> tempNodes = new LinkedList<>();
@@ -107,8 +88,13 @@ private void assemblePath(PathNode end) {
  // Can't directly convert from the PathNode pseudo linked list to an array because we don't know how long it is
  // inserting into a LinkedList<E> keeps track of length, then when we addall (which calls .toArray) it's able
  // to performantly do that conversion since it knows the length.
- path.addAll(tempPath);
- nodes.addAll(tempNodes);
+ this.path = new ArrayList<>(tempPath);
+ this.nodes = new ArrayList<>(tempNodes);
+ }
+
+ @Override
+ public Goal getGoal() {
+ return goal;
  }
 
  private boolean assembleMovements() {

src/main/java/baritone/pathing/movement/CalculationContext.java

@@ -58,6 +58,7 @@ public class CalculationContext {
  public final boolean allowParkour;
  public final boolean allowParkourPlace;
  public final boolean allowJumpAt256;
+ public final boolean allowParkourAscend;
  public final boolean assumeWalkOnWater;
  public final boolean allowDiagonalDescend;
  public final boolean allowDownward;
@@ -90,6 +91,7 @@ public CalculationContext(IBaritone baritone, boolean forUseOnAnotherThread) {
  this.allowParkour = Baritone.settings().allowParkour.value;
  this.allowParkourPlace = Baritone.settings().allowParkourPlace.value;
  this.allowJumpAt256 = Baritone.settings().allowJumpAt256.value;
+ this.allowParkourAscend = Baritone.settings().allowParkourAscend.value;
  this.assumeWalkOnWater = Baritone.settings().assumeWalkOnWater.value;
  this.allowDiagonalDescend = Baritone.settings().allowDiagonalDescend.value;
  this.allowDownward = Baritone.settings().allowDownward.value;

src/main/java/baritone/pathing/movement/MovementHelper.java

@@ -520,7 +520,7 @@ static PlaceResult attemptToPlaceABlock(MovementState state, IBaritone baritone,
  return PlaceResult.NO_OPTION;
  }
  double faceX = (placeAt.getX() + against1.getX() + 1.0D) * 0.5D;
- double faceY = (placeAt.getY() + against1.getY() + 1.0D) * 0.5D;
+ double faceY = (placeAt.getY() + against1.getY() + 0.5D) * 0.5D;
  double faceZ = (placeAt.getZ() + against1.getZ() + 1.0D) * 0.5D;
  Rotation place = RotationUtils.calcRotationFromVec3d(ctx.playerHead(), new Vec3d(faceX, faceY, faceZ), ctx.playerRotations());
  RayTraceResult res = RayTraceUtils.rayTraceTowards(ctx.player(), place, ctx.playerController().getBlockReachDistance());