Merge branch '1.13.2' into 1.14.4

README.md

@@ -5,8 +5,9 @@
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/a73d037823b64a5faf597a18d71e3400)](https://www.codacy.com/app/leijurv/baritone?utm_source=github.com&utm_medium=referral&utm_content=cabaletta/baritone&utm_campaign=Badge_Grade)
 [![HitCount](http://hits.dwyl.com/cabaletta/baritone.svg)](http://hits.dwyl.com/cabaletta/baritone/)
 [![GitHub All Releases](https://img.shields.io/github/downloads/cabaletta/baritone/total.svg)](https://github.com/cabaletta/baritone/releases/)
-[![Minecraft](https://img.shields.io/badge/MC-1.12.2-green.svg)](https://github.com/cabaletta/baritone/tree/master/)
+[![Minecraft](https://img.shields.io/badge/MC-1.12.2-brightgreen.svg)](https://github.com/cabaletta/baritone/tree/master/)
 [![Minecraft](https://img.shields.io/badge/MC-1.13.2-brightgreen.svg)](https://github.com/cabaletta/baritone/tree/1.13.2/)
+[![Minecraft](https://img.shields.io/badge/MC-1.14.4-brightgreen.svg)](https://github.com/cabaletta/baritone/tree/1.14.4/)
 [![Code of Conduct](https://img.shields.io/badge/%E2%9D%A4-code%20of%20conduct-blue.svg?style=flat)](https://github.com/cabaletta/baritone/blob/master/CODE_OF_CONDUCT.md)
 [![Known Vulnerabilities](https://snyk.io/test/github/cabaletta/baritone/badge.svg?targetFile=build.gradle)](https://snyk.io/test/github/cabaletta/baritone?targetFile=build.gradle)
 [![Contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/cabaletta/baritone/issues/)
@@ -18,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/)
@@ -29,12 +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). 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

@@ -2,13 +2,17 @@
 
 The easiest way to install Baritone is to install [Impact](https://impactdevelopment.github.io/), which comes with Baritone.
 
+For 1.14.4, [click here](https://www.dropbox.com/s/rkml3hjokd3qv0m/1.14.4-Baritone.zip?dl=1).
+
 Once Baritone is installed, look [here](USAGE.md) for instructions on how to use it.
 
 ## Prebuilt official releases
 These releases are not always completely up to date with latest features, and are only released from `master`. (so if you want `backfill-2` branch for example, you'll have to build it yourself)
 
 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).

USAGE.md

@@ -18,14 +18,15 @@ To toggle a boolean setting, just say its name in chat (for example saying `allo
 
 Some common examples:
 - `thisway 1000` then `path` to go in the direction you're facing for a thousand blocks
-- `goal x y z` or `goal x z` or `goal y`, then `path` to go to a certain coordinate
+- `goal x y z` or `goal x z` or `goal y`, then `path` to set a goal to a certain coordinate then path to it
+- `goto x y z` or `goto x z` or `goto y` to go to a certain coordinate (in a single step, starts going immediately)
 - `goal` to set the goal to your player's feet
 - `goal clear` to clear the goal
 - `cancel` or `stop` to stop everything
 - `goto portal` or `goto ender_chest` or `goto block_type` to go to a block. (in Impact, `.goto` is an alias for `.b goto` for the most part)
 - `mine diamond_ore` to mine diamond ore (turn on the setting `legitMine` to only mine ores that it can actually see. It will explore randomly around y=11 until it finds them.)
 - `click` to click your destination on the screen. Right click path to on top of the block, left click to path into it (either at foot level or eye level), and left click and drag to clear all blocks from an area.
-- `follow playerName` to follow a player. `follow` to follow the entity you're looking at (only works if it hitting range). `followplayers` to follow any players in range (combine with Kill Aura for a fun time).
+- `follow playerName` to follow a player. `followplayers` to follow any players in range (combine with Kill Aura for a fun time). `followentities` to follow any entities. `followentity pig` to follow entities of a specific type.
 - `save waypointName` to save a waypoint. `goto waypointName` to go to it.
 - `build` to build a schematic. `build blah` will load `schematics/blah.schematic` and build it with the origin being your player feet. `build blah x y z` to set the origin. Any of those can be relative to your player (`~ 69 ~-420` would build at x=player x, y=69, z=player z-420).
 - `schematica` to build the schematic that is currently open in schematica

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

@@ -39,44 +39,19 @@
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.StringTextComponent;
+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.*;
 
-public class ExampleBaritoneControl implements Helper, AbstractGameEventListener {
-
- private static final String HELP_MSG =
- "baritone - Output settings into chat\n" +
- "settings - Same as baritone\n" +
- "goal - Create a goal (one number is '<Y>', two is '<X> <Z>', three is '<X> <Y> <Z>, 'clear' to clear)\n" +
- "path - Go towards goal\n" +
- "repack - (debug) Repacks chunk cache\n" +
- "rescan - (debug) Same as repack\n" +
- "axis - Paths towards the closest axis or diagonal axis, at y=120\n" +
- "cancel - Cancels current path\n" +
- "forcecancel - sudo cancel (only use if very glitched, try toggling 'pause' first)\n" +
- "gc - Calls System.gc();\n" +
- "invert - Runs away from the goal instead of towards it\n" +
- "follow - Follows a player 'follow username'\n" +
- "reloadall - (debug) Reloads chunk cache\n" +
- "saveall - (debug) Saves chunk cache\n" +
- "find - (debug) outputs how many blocks of a certain type are within the cache\n" +
- "mine - Paths to and mines specified blocks 'mine x_ore y_ore ...'\n" +
- "thisway - Creates a goal X blocks where you're facing\n" +
- "list - Lists waypoints under a category\n" +
- "get - Same as list\n" +
- "show - Same as list\n" +
- "save - Saves a waypoint (works but don't try to make sense of it)\n" +
- "delete - Deletes a waypoint\n" +
- "goto - Paths towards specified block or waypoint\n" +
- "spawn - Paths towards world spawn or your most recent bed right-click\n" +
- "sethome - Sets \"home\"\n" +
- "home - Paths towards \"home\" \n" +
- "costs - (debug) all movement costs from current location\n" +
- "damn - Daniel\n" +
- "Go to https://github.com/cabaletta/baritone/blob/master/USAGE.md for more information";
+import static org.apache.commons.lang3.StringUtils.isNumeric;
 
+public class ExampleBaritoneControl implements Helper, AbstractGameEventListener {
  private static final String COMMAND_PREFIX = "#";
 
  public final IBaritone baritone;
@@ -147,9 +122,12 @@ public boolean runCommand(String msg0) { // you may think this can be private, b
  return true;
  }
  if (msg.equals("") || msg.equals("help") || msg.equals("?")) {
- for (String line : HELP_MSG.split("\n")) {
- logDirect(line);
- }
+ ITextComponent component = MESSAGE_PREFIX.shallowCopy();
+ component.getStyle().setColor(TextFormatting.GRAY);
+ StringTextComponent helpLink = new StringTextComponent(" Click here for instructions on how to use Baritone (https://github.com/cabaletta/baritone/blob/master/USAGE.md)");
+ helpLink.getStyle().setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://github.com/cabaletta/baritone/blob/master/USAGE.md"));
+ component.appendSibling(helpLink);
+ BaritoneAPI.getSettings().logger.value.accept(component);
  return true;
  }
  if (msg.contains(" ")) {
@@ -266,7 +244,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();
@@ -376,7 +354,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;
  }
@@ -678,8 +657,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) {
@@ -694,18 +673,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");
@@ -717,4 +701,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.THE_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;
  }