premature optimization

Never send chat message when using prefix

.travis.yml

@@ -9,6 +9,7 @@ install:
 - travis_retry docker build -t cabaletta/baritone .
 
 script:
+- docker run --rm cabaletta/baritone ./gradlew javadoc
 - docker run --name baritone cabaletta/baritone /bin/sh -c "set -e; /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 128x128x24 -ac +extension GLX +render; DISPLAY=:99 BARITONE_AUTO_TEST=true ./gradlew runClient"
 - docker cp baritone:/code/dist dist
 - ls dist

FEATURES.md

@@ -11,6 +11,7 @@
 - **Avoiding dangerous blocks** Obviously, it knows not to walk through fire or on magma, not to corner over lava (that deals some damage), not to break any blocks touching a liquid (it might drown), etc.
 - **Parkour** Sprint jumping over 1, 2, or 3 block gaps
 - **Parkour place** Sprint jumping over a 3 block gap and placing the block to land on while executing the jump. It's really cool.
+- **Pigs** It can sort of control pigs. I wouldn't rely on it though.
 
 # Pathing method
 Baritone uses A*, with some modifications: 
@@ -46,7 +47,6 @@ Things it doesn't have yet
 See <a href="https://github.com/cabaletta/baritone/issues">issues</a> for more.
 
 Things it may not ever have, from most likely to least likely =(
-- Pigs
 - Boats
 - Horses (2x3 path instead of 1x2)
 - Elytra

IMPACT.md

@@ -1 +0,0 @@
-Impact 4.4 is out. See <a href="INSTALL.md">INSTALL.md</a>

INSTALL.md

@@ -1,11 +1,10 @@
 # Integration between Baritone and Impact
 Impact 4.4 has Baritone included.
 
-These instructions apply to Impact 4.3 (and potentially other hacked clients).
+These instructions apply to Impact 4.3 (and potentially other "hacked clients").
 
 To run Baritone on Vanilla, just follow the instructions in the README (it's `./gradlew runClient`).
 
-
 ## An Introduction
 There are some basic steps to getting Baritone setup with Impact.
 - Acquiring a build of Baritone
@@ -26,14 +25,7 @@ Any official release will be GPG signed by leijurv (44A3EA646EADAC6A) and ZeroMe
 The build is fully deterministic and reproducible, and you can verify Travis did it properly by running `docker build --no-cache -t cabaletta/baritone . && docker run --rm cabaletta/baritone cat /code/dist/checksums.txt` 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).
 
 ### Building Baritone yourself
-There are a few steps to this
+You can either build Baritone through a command line or through IntelliJ's UI, information on that can be found [here](SETUP.md#building).
-- Clone this repository
-- Setup the project as instructed in the README
-- Run the ``build`` gradle task. You can either do this using IntelliJ's gradle UI or through a
-command line
-  - Windows: ``gradlew build``
-  - Mac/Linux: ``./gradlew build``
-- The build should be exported into ``/build/libs/baritone-X.Y.Z.jar``
 
 ## Placing Baritone in the libraries directory
 ``/libraries`` is a neat directory in your <a href="https://minecraft.gamepedia.com/.minecraft">Minecraft Installation Directory</a>

README.md

@@ -1,51 +1,42 @@
 # Baritone
 [![Build Status](https://travis-ci.com/cabaletta/baritone.svg?branch=master)](https://travis-ci.com/cabaletta/baritone)
 [![Release](https://img.shields.io/github/release/cabaletta/baritone.svg)](https://github.com/cabaletta/baritone/releases)
-[![License](https://img.shields.io/github/license/cabaletta/baritone.svg)](LICENSE)
+[![License](https://img.shields.io/badge/license-LGPL--3.0-green.svg)](LICENSE)
 [![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)
+[![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)
+[![Issues](https://img.shields.io/github/issues/cabaletta/baritone.svg)](https://github.com/cabaletta/baritone/issues/)
+[![GitHub issues-closed](https://img.shields.io/github/issues-closed/cabaletta/baritone.svg)](https://github.com/cabaletta/baritone/issues?q=is%3Aissue+is%3Aclosed)
+[![Pull Requests](https://img.shields.io/github/issues-pr/cabaletta/baritone.svg)](https://github.com/cabaletta/baritone/pulls/)
+![Code size](https://img.shields.io/github/languages/code-size/cabaletta/baritone.svg)
+![GitHub repo size](https://img.shields.io/github/repo-size/cabaletta/baritone.svg)
 [![Minecraft](https://img.shields.io/badge/MC-1.12.2-green.svg)](https://minecraft.gamepedia.com/1.12.2)
+[![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/)
+[![Asuna integration](https://img.shields.io/badge/Asuna%20integration-builder%20branch-brightgreen.svg)](https://github.com/EmotionalLove/Asuna/)
+[![Impact integration](https://img.shields.io/badge/Impact%20integration-v1.0.0--hotfix--4-green.svg)](https://impactdevelopment.github.io/)
+[![KAMI integration](https://img.shields.io/badge/KAMI%20integration-v1.0.0-orange.svg)](https://github.com/zeroeightysix/KAMI/)
+[![WWE integration](https://img.shields.io/badge/WWE%20%22integration%22-v1.0.0%3F%3F%20smh%20license%20violations-orange.svg)](https://wweclient.com/)
+[![Future integration](https://img.shields.io/badge/Future%20integration-Soon™%3F%3F%3F-red.svg)](https://futureclient.net/)
+[![ForgeHax integration](https://img.shields.io/badge/ForgeHax%20integration-Soon™-red.svg)](https://github.com/fr1kin/ForgeHax)
 
 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.
 
 This project is an updated version of [MineBot](https://github.com/leijurv/MineBot/),
-the original version of the bot for Minecraft 1.8, rebuilt for 1.12.2. Baritone focuses on reliability and particularly performance (it's over [29x faster](https://github.com/cabaletta/baritone/pull/180#issuecomment-423822928) than MineBot at calculating paths).
+the original version of the bot for Minecraft 1.8, rebuilt for 1.12.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).
 
 Here are some links to help to get started:
 
 - [Features](FEATURES.md)
 
+- [Setup](SETUP.md)
+
 - [Installation](INSTALL.md)
 
-There's also some useful information down below
+- [Javadocs](https://baritone.leijurv.com/)
-
-# Setup
-
-## Command Line
-On Mac OSX and Linux, use `./gradlew` instead of `gradlew`.
-
-Running Baritone:
-
-```
-$ gradlew runClient
-```
-
-Building Baritone:
-```
-$ gradlew build
-```
-
-For example, to replace out Impact 4.4's Baritone build with a customized one, switch to the `impact4.4-compat` branch, build Baritone as above then copy `dist/baritone-api-$VERSION$.jar` into `minecraft/libraries/cabaletta/baritone-api/1.0.0/baritone-api-1.0.0.jar`, replacing the jar that was previously there. You also need to edit `minecraft/versions/1.12.2-Impact_4.4/1.12.2-Impact_4.4.json`, find the line `"name": "cabaletta:baritone-api:1.0.0"`, remove the comma from the end, and entirely remove the line that's immediately after (starts with `"url"`). 
-
-## IntelliJ's Gradle UI
-- Open the project in IntelliJ as a Gradle project
-- Run the Gradle tasks `setupDecompWorkspace` then `genIntellijRuns`
-- Refresh the Gradle project (or, to be safe, just restart IntelliJ)
-- Select the "Minecraft Client" launch config
-- In `Edit Configurations...` you may need to select `baritone_launch` for `Use classpath of module:`.
 
 # Chat control
 [Defined Here](src/main/java/baritone/utils/ExampleBaritoneControl.java)
@@ -56,7 +47,7 @@ Quick start example: `thisway 1000` or `goal 70` to set the goal, `path` to actu
 
 ```
 BaritoneAPI.getSettings().allowSprint.value = true;
-BaritoneAPI.getSettings().pathTimeoutMS.value = 2000L;
+BaritoneAPI.getSettings().primaryTimeoutMS.value = 2000L;
 
 BaritoneAPI.getProvider().getPrimaryBaritone().getCustomGoalProcess().setGoalAndPath(new GoalXZ(10000, 20000));
 ```

SETUP.md

@@ -0,0 +1,79 @@
+# Setup
+
+- Clone or download Baritone
+
+  ![Image](https://i.imgur.com/kbqBtoN.png)
+  - If you choose to download, make sure you extract the ZIP archive.
+- Follow one of the instruction sets below, based on your preference
+
+## Command Line
+On Mac OSX and Linux, use `./gradlew` instead of `gradlew`.
+
+Setting up the Environment:
+
+```
+$ gradlew setupDecompWorkspace
+$ gradlew --refresh-dependencies
+```
+
+Running Baritone:
+
+```
+$ gradlew runClient
+```
+
+For information on how to build baritone, see [Building Baritone](#building-baritone)
+
+## IntelliJ
+- Open the project in IntelliJ as a Gradle project
+  
+  ![Image](https://i.imgur.com/jw7Q6vY.png)
+
+- Run the Gradle tasks `setupDecompWorkspace` then `genIntellijRuns`
+  
+  ![Image](https://i.imgur.com/QEfVvWP.png)
+
+- Refresh the Gradle project (or, to be safe, just restart IntelliJ)
+  
+  ![Image](https://i.imgur.com/3V7EdWr.png)
+
+- Select the "Minecraft Client" launch config
+  
+  ![Image](https://i.imgur.com/1qz2QGV.png)
+
+- Click on ``Edit Configurations...`` from the same dropdown and select the "Minecraft Client" config
+  
+  ![Image](https://i.imgur.com/s4ly0ZF.png)
+
+- In `Edit Configurations...` you need to select `baritone_launch` for `Use classpath of module:`.
+  
+  ![Image](https://i.imgur.com/hrLhG9u.png)
+
+# Building
+
+Make sure that you have properly [setup](#setup) the environment before trying to build it.
+
+## Command Line
+
+```
+$ gradlew build
+```
+
+## IntelliJ
+
+- Navigate to the gradle tasks on the right tab as follows
+
+  ![Image](https://i.imgur.com/PE6r9iN.png)
+
+- Right click on **build** and press **Run**
+
+## Artifacts
+
+Building Baritone will result in 3 artifacts created in the ``dist`` directory.
+
+- **API**: Only the non-api packages are obfuscated. This should be used in environments where other mods would like to use Baritone's features.
+- **Standalone**: Everything is obfuscated. This should be used in environments where there are no other mods present that would like to use Baritone's features.
+- **Unoptimized**: Nothing is obfuscated. This shouldn't be used ever in production.
+
+## More Info
+To replace out Impact 4.4's Baritone build with a customized one, switch to the `impact4.4-compat` branch, build Baritone as above then copy `dist/baritone-api-$VERSION$.jar` into `minecraft/libraries/cabaletta/baritone-api/1.0.0/baritone-api-1.0.0.jar`, replacing the jar that was previously there. You also need to edit `minecraft/versions/1.12.2-Impact_4.4/1.12.2-Impact_4.4.json`, find the line `"name": "cabaletta:baritone-api:1.0.0"`, remove the comma from the end, and entirely remove the line that's immediately after (starts with `"url"`). 

build.gradle

@@ -48,6 +48,7 @@ apply plugin: 'org.spongepowered.mixin'
 sourceCompatibility = targetCompatibility = '1.8'
 compileJava {
     sourceCompatibility = targetCompatibility = '1.8'
+    options.encoding = "UTF-8" // allow emoji in comments :^)
 }
 
 sourceSets {
@@ -98,6 +99,14 @@ mixin {
     add sourceSets.launch, 'mixins.baritone.refmap.json'
 }
 
+javadoc {
+    options.addStringOption('Xwerror', '-quiet') // makes the build fail on travis when there is a javadoc error
+    options.linkSource true
+    options.encoding "UTF-8" // allow emoji in comments :^)
+    source += sourceSets.api.allJava
+    classpath += sourceSets.api.compileClasspath
+}
+
 jar {
     from sourceSets.launch.output, sourceSets.api.output
     preserveFileTimestamps = false
@@ -107,7 +116,6 @@ jar {
 task proguard(type: ProguardTask) {
     url 'https://downloads.sourceforge.net/project/proguard/proguard/6.0/proguard6.0.3.zip'
     extract 'proguard6.0.3/lib/proguard.jar'
-    versionManifest 'https://launchermeta.mojang.com/mc/game/version_manifest.json'
 }
 
 task createDist(type: CreateDistTask, dependsOn: proguard)

buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java

@@ -18,21 +18,26 @@
 package baritone.gradle.task;
 
 import baritone.gradle.util.Determinizer;
-import com.google.gson.*;
+import baritone.gradle.util.MappingType;
+import baritone.gradle.util.ReobfWrapper;
 import org.apache.commons.io.IOUtils;
+import org.gradle.api.NamedDomainObjectContainer;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.Dependency;
+import org.gradle.api.internal.plugins.DefaultConvention;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.TaskAction;
 import org.gradle.internal.Pair;
 
 import java.io.*;
+import java.lang.reflect.Field;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
@@ -52,10 +57,6 @@ public class ProguardTask extends BaritoneGradleTask {
     @Input
     private String extract;
 
-    @Input
-    private String versionManifest;
-
-    private Map<String, String> versionDownloadMap;
     private List<String> requiredLibraries;
 
     @TaskAction
@@ -67,7 +68,6 @@ public class ProguardTask extends BaritoneGradleTask {
         downloadProguard();
         extractProguard();
         generateConfigs();
-        downloadVersionManifest();
         acquireDependencies();
         proguardApi();
         proguardStandalone();
@@ -132,20 +132,6 @@ public class ProguardTask extends BaritoneGradleTask {
         });
     }
 
-    private void downloadVersionManifest() throws Exception {
-        Path manifestJson = getTemporaryFile(VERSION_MANIFEST);
-        write(new URL(this.versionManifest).openStream(), manifestJson);
-
-        // Place all the versions in the map with their download URL
-        this.versionDownloadMap = new HashMap<>();
-        JsonObject json = readJson(Files.readAllLines(manifestJson)).getAsJsonObject();
-        JsonArray versions = json.getAsJsonArray("versions");
-        versions.forEach(element -> {
-            JsonObject object = element.getAsJsonObject();
-            this.versionDownloadMap.put(object.get("id").getAsString(), object.get("url").getAsString());
-        });
-    }
-
     private void acquireDependencies() throws Exception {
 
         // Create a map of all of the dependencies that we are able to access in this project
@@ -163,15 +149,13 @@ public class ProguardTask extends BaritoneGradleTask {
 
         // Iterate the required libraries to copy them to tempLibraries
         for (String lib : this.requiredLibraries) {
-            // Download the version jar from the URL acquired from the version manifest
+            // copy from the forgegradle cache
-            if (lib.startsWith("minecraft")) {
+            if (lib.equals("minecraft")) {
-                String version = lib.split("-")[1];
+                Path cachedJar = getMinecraftJar();
-                Path versionJar = getTemporaryFile("tempLibraries/" + lib + ".jar");
+                Path inTempDir = getTemporaryFile("tempLibraries/minecraft.jar");
-                if (!Files.exists(versionJar)) {
+                // TODO: maybe try not to copy every time
-                    JsonObject versionJson = PARSER.parse(new InputStreamReader(new URL(this.versionDownloadMap.get(version)).openStream())).getAsJsonObject();
+                Files.copy(cachedJar, inTempDir, REPLACE_EXISTING);
-                    String url = versionJson.getAsJsonObject("downloads").getAsJsonObject("client").getAsJsonPrimitive("url").getAsString();
+
-                    write(new URL(url).openStream(), versionJar);
-                }
                 continue;
             }
 
@@ -195,6 +179,89 @@ public class ProguardTask extends BaritoneGradleTask {
         }
     }
 
+    // a bunch of epic stuff to get the path to the cached jar
+    private Path getMinecraftJar() throws Exception {
+        MappingType mappingType;
+        try {
+            mappingType = getMappingType();
+        } catch (Exception e) {
+            System.err.println("Failed to get mapping type, assuming NOTCH.");
+            mappingType = MappingType.NOTCH;
+        }
+
+        String suffix;
+        switch (mappingType) {
+            case NOTCH:
+                suffix = "";
+                break;
+            case SEARGE:
+                suffix = "-srgBin";
+                break;
+            case CUSTOM:
+                throw new IllegalStateException("Custom mappings not supported!");
+            default:
+                throw new IllegalStateException("Unknown mapping type: " + mappingType);
+        }
+
+        DefaultConvention convention = (DefaultConvention) this.getProject().getConvention();
+        Object extension = convention.getAsMap().get("minecraft");
+        Objects.requireNonNull(extension);
+
+        // for some reason cant use Class.forName
+        Class<?> class_baseExtension = extension.getClass().getSuperclass().getSuperclass().getSuperclass(); // <-- cursed
+        Field f_replacer = class_baseExtension.getDeclaredField("replacer");
+        f_replacer.setAccessible(true);
+        Object replacer = f_replacer.get(extension);
+        Class<?> class_replacementProvider = replacer.getClass();
+        Field replacement_replaceMap = class_replacementProvider.getDeclaredField("replaceMap");
+        replacement_replaceMap.setAccessible(true);
+
+        Map<String, Object> replacements = (Map) replacement_replaceMap.get(replacer);
+        String cacheDir = replacements.get("CACHE_DIR").toString() + "/net/minecraft";
+        String mcVersion = replacements.get("MC_VERSION").toString();
+        String mcpInsert = replacements.get("MAPPING_CHANNEL").toString() + "/" + replacements.get("MAPPING_VERSION").toString();
+        String fullJarName = "minecraft-" + mcVersion + suffix + ".jar";
+
+        String baseDir = String.format("%s/minecraft/%s/", cacheDir, mcVersion);
+
+        String jarPath;
+        if (mappingType == MappingType.SEARGE) {
+            jarPath = String.format("%s/%s/%s", baseDir, mcpInsert, fullJarName);
+        } else {
+            jarPath = baseDir + fullJarName;
+        }
+        jarPath = jarPath
+                .replace("/", File.separator)
+                .replace("\\", File.separator); // hecking regex
+
+        return new File(jarPath).toPath();
+    }
+
+    // throws IllegalStateException if mapping type is ambiguous or it fails to find it
+    private MappingType getMappingType() {
+        // if it fails to find this then its probably a forgegradle version problem
+        Set<Object> reobf = (NamedDomainObjectContainer<Object>) this.getProject().getExtensions().getByName("reobf");
+
+        List<MappingType> mappingTypes = getUsedMappingTypes(reobf);
+        long mappingTypesUsed = mappingTypes.size();
+        if (mappingTypesUsed == 0) {
+            throw new IllegalStateException("Failed to find mapping type (no jar task?)");
+        }
+        if (mappingTypesUsed > 1) {
+            throw new IllegalStateException("Ambiguous mapping type (multiple jars with different mapping types?)");
+        }
+
+        return mappingTypes.get(0);
+    }
+
+    private List<MappingType> getUsedMappingTypes(Set<Object> reobf) {
+        return reobf.stream()
+                .map(ReobfWrapper::new)
+                .map(ReobfWrapper::getMappingType)
+                .distinct()
+                .collect(Collectors.toList());
+    }
+
     private void proguardApi() throws Exception {
         runProguard(getTemporaryFile(PROGUARD_API_CONFIG));
         Determinizer.determinize(this.proguardOut.toString(), this.artifactApiPath.toString());
@@ -219,10 +286,6 @@ public class ProguardTask extends BaritoneGradleTask {
         this.extract = extract;
     }
 
-    public void setVersionManifest(String versionManifest) {
-        this.versionManifest = versionManifest;
-    }
-
     private void runProguard(Path config) throws Exception {
         // Delete the existing proguard output file. Proguard probably handles this already, but why not do it ourselves
         if (Files.exists(this.proguardOut)) {
@@ -252,7 +315,7 @@ public class ProguardTask extends BaritoneGradleTask {
                 while ((line = reader.readLine()) != null) {
                     System.out.println(line);
                 }
-            } catch (final Exception e) {
+            } catch (Exception e) {
                 e.printStackTrace();
             }
         }).start();

buildSrc/src/main/java/baritone/gradle/util/MappingType.java

@@ -0,0 +1,29 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.gradle.util;
+
+/**
+ * All credits go to AsmLibGradle and its contributors.
+ *
+ * @see <a href="https://github.com/pozzed/AsmLibGradle/blob/8f917dbc3939eab7a3d9daf54d9d285fdf34f4b2/src/main/java/net/futureclient/asmlib/forgegradle/MappingType.java">Original Source</a>
+ */
+public enum MappingType {
+    SEARGE,
+    NOTCH,
+    CUSTOM // forgegradle
+}

buildSrc/src/main/java/baritone/gradle/util/ReobfWrapper.java

@@ -0,0 +1,63 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.gradle.util;
+
+import java.lang.reflect.Field;
+import java.util.Objects;
+
+/**
+ * All credits go to AsmLibGradle and its contributors.
+ *
+ * @see <a href="https://github.com/pozzed/AsmLibGradle/blob/8f917dbc3939eab7a3d9daf54d9d285fdf34f4b2/src/main/java/net/futureclient/asmlib/forgegradle/ReobfWrapper.java">Original Source</a>
+ */
+public class ReobfWrapper {
+
+    private final Object instance;
+    private final Class<?> type;
+
+    public ReobfWrapper(Object instance) {
+        this.instance = instance;
+        Objects.requireNonNull(instance);
+        this.type = instance.getClass();
+    }
+
+    public String getName() {
+        try {
+            Field nameField = type.getDeclaredField("name");
+            nameField.setAccessible(true);
+            return (String) nameField.get(this.instance);
+        } catch (ReflectiveOperationException ex) {
+            throw new IllegalStateException(ex);
+        }
+    }
+
+    public MappingType getMappingType() {
+        try {
+            Field enumField = type.getDeclaredField("mappingType");
+            enumField.setAccessible(true);
+            Enum<?> aEnum = (Enum<?>) enumField.get(this.instance);
+            MappingType mappingType = MappingType.values()[aEnum.ordinal()];
+            if (!aEnum.name().equals(mappingType.name())) {
+                throw new IllegalStateException("ForgeGradle ReobfMappingType is not equivalent to MappingType (version error?)");
+            }
+            return mappingType;
+        } catch (ReflectiveOperationException ex) {
+            throw new IllegalStateException(ex);
+        }
+    }
+}

scripts/proguard.pro

@@ -31,7 +31,8 @@
 
 # copy all necessary libraries into tempLibraries to build
 
--libraryjars 'tempLibraries/minecraft-1.12.2.jar'
+# The correct jar will be copied from the forgegradle cache based on the mapping type being compiled with
+-libraryjars 'tempLibraries/minecraft.jar'
 
 -libraryjars 'tempLibraries/SimpleTweaker-1.2.jar'
 

src/api/java/baritone/api/IBaritone.java

@@ -18,10 +18,10 @@
 package baritone.api;
 
 import baritone.api.behavior.ILookBehavior;
-import baritone.api.behavior.IMemoryBehavior;
 import baritone.api.behavior.IPathingBehavior;
 import baritone.api.cache.IWorldProvider;
 import baritone.api.event.listener.IEventBus;
+import baritone.api.pathing.calc.IPathingControlManager;
 import baritone.api.process.ICustomGoalProcess;
 import baritone.api.process.IFollowProcess;
 import baritone.api.process.IGetToBlockProcess;
@@ -47,12 +47,6 @@ public interface IBaritone {
      */
     ILookBehavior getLookBehavior();
 
-    /**
-     * @return The {@link IMemoryBehavior} instance
-     * @see IMemoryBehavior
-     */
-    IMemoryBehavior getMemoryBehavior();
-
     /**
      * @return The {@link IMineProcess} instance
      * @see IMineProcess
@@ -71,6 +65,8 @@ public interface IBaritone {
      */
     IWorldProvider getWorldProvider();
 
+    IPathingControlManager getPathingControlManager();
+
     IInputOverrideHandler getInputOverrideHandler();
 
     ICustomGoalProcess getCustomGoalProcess();

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

@@ -33,52 +33,67 @@ import java.util.function.Consumer;
  *
  * @author leijurv
  */
-public class Settings {
+public final class Settings {
 
     /**
      * Allow Baritone to break blocks
      */
-    public Setting<Boolean> allowBreak = new Setting<>(true);
+    public final Setting<Boolean> allowBreak = new Setting<>(true);
 
     /**
      * Allow Baritone to sprint
      */
-    public Setting<Boolean> allowSprint = new Setting<>(true);
+    public final Setting<Boolean> allowSprint = new Setting<>(true);
 
     /**
      * Allow Baritone to place blocks
      */
-    public Setting<Boolean> allowPlace = new Setting<>(true);
+    public final Setting<Boolean> allowPlace = new Setting<>(true);
+
+    /**
+     * Allow Baritone to move items in your inventory to your hotbar
+     */
+    public final Setting<Boolean> allowInventory = new Setting<>(false);
 
     /**
      * It doesn't actually take twenty ticks to place a block, this cost is so high
      * because we want to generally conserve blocks which might be limited
      */
-    public Setting<Double> blockPlacementPenalty = new Setting<>(20D);
+    public final Setting<Double> blockPlacementPenalty = new Setting<>(20D);
 
     /**
      * This is just a tiebreaker to make it less likely to break blocks if it can avoid it.
      * For example, fire has a break cost of 0, this makes it nonzero, so all else being equal
      * it will take an otherwise equivalent route that doesn't require it to put out fire.
      */
-    public Setting<Double> blockBreakAdditionalPenalty = new Setting<>(2D);
+    public final Setting<Double> blockBreakAdditionalPenalty = new Setting<>(2D);
+
+    /**
+     * Additional penalty for hitting the space bar (ascend, pillar, or parkour) because it uses hunger
+     */
+    public final Setting<Double> jumpPenalty = new Setting<>(2D);
+
+    /**
+     * Walking on water uses up hunger really quick, so penalize it
+     */
+    public final Setting<Double> walkOnWaterOnePenalty = new Setting<>(5D);
 
     /**
      * Allow Baritone to fall arbitrary distances and place a water bucket beneath it.
      * Reliability: questionable.
      */
-    public Setting<Boolean> allowWaterBucketFall = new Setting<>(true);
+    public final Setting<Boolean> allowWaterBucketFall = new Setting<>(true);
 
     /**
      * Allow Baritone to assume it can walk on still water just like any other block.
      * This functionality is assumed to be provided by a separate library that might have imported Baritone.
      */
-    public Setting<Boolean> assumeWalkOnWater = new Setting<>(false);
+    public final Setting<Boolean> assumeWalkOnWater = new Setting<>(false);
 
     /**
      * Assume step functionality; don't jump on an Ascend.
      */
-    public Setting<Boolean> assumeStep = new Setting<>(false);
+    public final Setting<Boolean> assumeStep = new Setting<>(false);
 
     /**
      * Assume safe walk functionality; don't sneak on a backplace traverse.
@@ -87,12 +102,28 @@ public class Settings {
      * it won't sneak right click, it'll just right click, which means it'll open the chest instead of placing
      * against it. That's why this defaults to off.
      */
-    public Setting<Boolean> assumeSafeWalk = new Setting<>(false);
+    public final Setting<Boolean> assumeSafeWalk = new Setting<>(false);
+
+    /**
+     * If true, parkour is allowed to make jumps when standing on blocks at the maximum height, so player feet is y=256
+     * <p>
+     * Defaults to false because this fails on constantiam
+     */
+    public final Setting<Boolean> allowJumpAt256 = new Setting<>(false);
+
+    /**
+     * Allow descending diagonally
+     * <p>
+     * Safer than allowParkour yet still slightly unsafe, can make contact with unchecked adjacent blocks, so it's unsafe in the nether.
+     * <p>
+     * For a generic "take some risks" mode I'd turn on this one, parkour, and parkour place.
+     */
+    public final Setting<Boolean> allowDiagonalDescend = new Setting<>(false);
 
     /**
      * Blocks that Baritone is allowed to place (as throwaway, for sneak bridging, pillaring, etc.)
      */
-    public Setting<List<Item>> acceptableThrowawayItems = new Setting<>(new ArrayList<>(Arrays.asList(
+    public final Setting<List<Item>> acceptableThrowawayItems = new Setting<>(new ArrayList<>(Arrays.asList(
             Item.getItemFromBlock(Blocks.DIRT),
             Item.getItemFromBlock(Blocks.COBBLESTONE),
             Item.getItemFromBlock(Blocks.NETHERRACK)
@@ -101,31 +132,37 @@ public 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
      */
-    public Setting<Boolean> allowVines = new Setting<>(false);
+    public final Setting<Boolean> allowVines = new Setting<>(false);
 
     /**
      * Slab behavior is complicated, disable this for higher path reliability. Leave enabled if you have bottom slabs
      * everywhere in your base.
      */
-    public Setting<Boolean> allowWalkOnBottomSlab = new Setting<>(true);
+    public final Setting<Boolean> allowWalkOnBottomSlab = new Setting<>(true);
 
     /**
      * You know what it is
      * <p>
      * But it's very unreliable and falls off when cornering like all the time so.
+     * <p>
+     * It also overshoots the landing pretty much always (making contact with the next block over), so be careful
      */
-    public Setting<Boolean> allowParkour = new Setting<>(false);
+    public final Setting<Boolean> allowParkour = new Setting<>(false);
 
     /**
-     * Like parkour, but even more unreliable!
+     * Actually pretty reliable.
+     * <p>
+     * Doesn't make it any more dangerous compared to just normal allowParkour th
      */
-    public Setting<Boolean> allowParkourPlace = new Setting<>(false);
+    public final Setting<Boolean> allowParkourPlace = new Setting<>(false);
 
     /**
      * For example, if you have Mining Fatigue or Haste, adjust the costs of breaking blocks accordingly.
      */
-    public Setting<Boolean> considerPotionEffects = new Setting<>(true);
+    public final Setting<Boolean> considerPotionEffects = new Setting<>(true);
 
     /**
      * This is the big A* setting.
@@ -142,95 +179,137 @@ public class Settings {
      * <p>
      * Finding the optimal path is worth it, so it's the default.
      */
-    public Setting<Double> costHeuristic = new Setting<>(3.5D);
+    public final Setting<Double> costHeuristic = new Setting<>(3.563);
 
     // a bunch of obscure internal A* settings that you probably don't want to change
     /**
      * The maximum number of times it will fetch outside loaded or cached chunks before assuming that
      * pathing has reached the end of the known area, and should therefore stop.
      */
-    public Setting<Integer> pathingMaxChunkBorderFetch = new Setting<>(50);
+    public final Setting<Integer> pathingMaxChunkBorderFetch = new Setting<>(50);
 
     /**
      * Set to 1.0 to effectively disable this feature
      *
      * @see <a href="https://github.com/cabaletta/baritone/issues/18">Issue #18</a>
      */
-    public Setting<Double> backtrackCostFavoringCoefficient = new Setting<>(0.5);
+    public final Setting<Double> backtrackCostFavoringCoefficient = new Setting<>(0.5);
+
+    /**
+     * Toggle the following 4 settings
+     * <p>
+     * They have a noticeable performance impact, so they default off
+     * <p>
+     * Specifically, building up the avoidance map on the main thread before pathing starts actually takes a noticeable
+     * amount of time, especially when there are a lot of mobs around, and your game jitters for like 200ms while doing so
+     */
+    public final Setting<Boolean> avoidance = new Setting<>(false);
+
+    /**
+     * Set to 1.0 to effectively disable this feature
+     * <p>
+     * Set below 1.0 to go out of your way to walk near mob spawners
+     */
+    public final Setting<Double> mobSpawnerAvoidanceCoefficient = new Setting<>(2.0);
+
+    public final Setting<Integer> mobSpawnerAvoidanceRadius = new Setting<>(16);
+
+    /**
+     * Set to 1.0 to effectively disable this feature
+     * <p>
+     * Set below 1.0 to go out of your way to walk near mobs
+     */
+    public final Setting<Double> mobAvoidanceCoefficient = new Setting<>(1.5);
+
+    public final Setting<Integer> mobAvoidanceRadius = new Setting<>(8);
+
+    /**
+     * When running a goto towards a container block (chest, ender chest, furnace, etc),
+     * right click and open it once you arrive.
+     */
+    public final Setting<Boolean> rightClickContainerOnArrival = new Setting<>(true);
+
+    /**
+     * When running a goto towards a nether portal block, walk all the way into the portal
+     * instead of stopping one block before.
+     */
+    public final Setting<Boolean> enterPortal = new Setting<>(true);
 
     /**
      * Don't repropagate cost improvements below 0.01 ticks. They're all just floating point inaccuracies,
      * and there's no point.
      */
-    public Setting<Boolean> minimumImprovementRepropagation = new Setting<>(true);
+    public final Setting<Boolean> minimumImprovementRepropagation = new Setting<>(true);
 
     /**
      * After calculating a path (potentially through cached chunks), artificially cut it off to just the part that is
      * entirely within currently loaded chunks. Improves path safety because cached chunks are heavily simplified.
+     * <p>
+     * This is much safer to leave off now, and makes pathing more efficient. More explanation in the issue.
      *
-     * @see <a href="https://github.com/cabaletta/baritone/issues/144">Issue #144</a>
+     * @see <a href="https://github.com/cabaletta/baritone/issues/114">Issue #114</a>
      */
-    public Setting<Boolean> cutoffAtLoadBoundary = new Setting<>(false);
+    public final Setting<Boolean> cutoffAtLoadBoundary = new Setting<>(false);
 
     /**
      * If a movement's cost increases by more than this amount between calculation and execution (due to changes
      * in the environment / world), cancel and recalculate
      */
-    public Setting<Double> maxCostIncrease = new Setting<>(10D);
+    public final Setting<Double> maxCostIncrease = new Setting<>(10D);
 
     /**
      * Stop 5 movements before anything that made the path COST_INF.
      * For example, if lava has spread across the path, don't walk right up to it then recalculate, it might
      * still be spreading lol
      */
-    public Setting<Integer> costVerificationLookahead = new Setting<>(5);
+    public final Setting<Integer> costVerificationLookahead = new Setting<>(5);
 
     /**
      * Static cutoff factor. 0.9 means cut off the last 10% of all paths, regardless of chunk load state
      */
-    public Setting<Double> pathCutoffFactor = new Setting<>(0.9);
+    public final Setting<Double> pathCutoffFactor = new Setting<>(0.9);
 
     /**
      * Only apply static cutoff for paths of at least this length (in terms of number of movements)
      */
-    public Setting<Integer> pathCutoffMinimumLength = new Setting<>(30);
+    public final Setting<Integer> pathCutoffMinimumLength = new Setting<>(30);
 
     /**
      * Start planning the next path once the remaining movements tick estimates sum up to less than this value
      */
-    public Setting<Integer> planningTickLookAhead = new Setting<>(150);
+    public final Setting<Integer> planningTickLookAhead = new Setting<>(150);
 
     /**
      * Default size of the Long2ObjectOpenHashMap used in pathing
      */
-    public Setting<Integer> pathingMapDefaultSize = new Setting<>(1024);
+    public final Setting<Integer> pathingMapDefaultSize = new Setting<>(1024);
 
     /**
      * Load factor coefficient for the Long2ObjectOpenHashMap used in pathing
      * <p>
      * Decrease for faster map operations, but higher memory usage
      */
-    public Setting<Float> pathingMapLoadFactor = new Setting<>(0.75f);
+    public final Setting<Float> pathingMapLoadFactor = new Setting<>(0.75f);
 
     /**
      * How far are you allowed to fall onto solid ground (without a water bucket)?
      * 3 won't deal any damage. But if you just want to get down the mountain quickly and you have
      * Feather Falling IV, you might set it a bit higher, like 4 or 5.
      */
-    public Setting<Integer> maxFallHeightNoWater = new Setting<>(3);
+    public final Setting<Integer> maxFallHeightNoWater = new Setting<>(3);
 
     /**
      * How far are you allowed to fall onto solid ground (with a water bucket)?
      * It's not that reliable, so I've set it below what would kill an unarmored player (23)
      */
-    public Setting<Integer> maxFallHeightBucket = new Setting<>(20);
+    public final Setting<Integer> maxFallHeightBucket = new Setting<>(20);
 
     /**
      * Is it okay to sprint through a descend followed by a diagonal?
      * The player overshoots the landing, but not enough to fall off. And the diagonal ensures that there isn't
      * lava or anything that's !canWalkInto in that space, so it's technically safe, just a little sketchy.
      */
-    public Setting<Boolean> allowOvershootDiagonalDescend = new Setting<>(true);
+    public final Setting<Boolean> allowOvershootDiagonalDescend = new Setting<>(true);
 
     /**
      * If your goal is a GoalBlock in an unloaded chunk, assume it's far enough away that the Y coord
@@ -239,125 +318,133 @@ public class Settings {
      * of considering the Y coord. The reasoning is that if your X and Z are 10,000 blocks away,
      * your Y coordinate's accuracy doesn't matter at all until you get much much closer.
      */
-    public Setting<Boolean> simplifyUnloadedYCoord = new Setting<>(true);
+    public final Setting<Boolean> simplifyUnloadedYCoord = new Setting<>(true);
 
     /**
      * If a movement takes this many ticks more than its initial cost estimate, cancel it
      */
-    public Setting<Integer> movementTimeoutTicks = new Setting<>(100);
+    public final Setting<Integer> movementTimeoutTicks = new Setting<>(100);
 
     /**
      * Pathing ends after this amount of time, but only if a path has been found
      * <p>
      * If no valid path (length above the minimum) has been found, pathing continues up until the failure timeout
      */
-    public Setting<Long> primaryTimeoutMS = new Setting<>(500L);
+    public final Setting<Long> primaryTimeoutMS = new Setting<>(500L);
 
     /**
      * Pathing can never take longer than this, even if that means failing to find any path at all
      */
-    public Setting<Long> failureTimeoutMS = new Setting<>(2000L);
+    public final Setting<Long> failureTimeoutMS = new Setting<>(2000L);
 
     /**
      * Planning ahead while executing a segment ends after this amount of time, but only if a path has been found
      * <p>
      * If no valid path (length above the minimum) has been found, pathing continues up until the failure timeout
      */
-    public Setting<Long> planAheadPrimaryTimeoutMS = new Setting<>(4000L);
+    public final Setting<Long> planAheadPrimaryTimeoutMS = new Setting<>(4000L);
 
     /**
      * Planning ahead while executing a segment can never take longer than this, even if that means failing to find any path at all
      */
-    public Setting<Long> planAheadFailureTimeoutMS = new Setting<>(5000L);
+    public final Setting<Long> planAheadFailureTimeoutMS = new Setting<>(5000L);
 
     /**
      * For debugging, consider nodes much much slower
      */
-    public Setting<Boolean> slowPath = new Setting<>(false);
+    public final Setting<Boolean> slowPath = new Setting<>(false);
 
     /**
      * Milliseconds between each node
      */
-    public Setting<Long> slowPathTimeDelayMS = new Setting<>(100L);
+    public final Setting<Long> slowPathTimeDelayMS = new Setting<>(100L);
 
     /**
      * The alternative timeout number when slowPath is on
      */
-    public Setting<Long> slowPathTimeoutMS = new Setting<>(40000L);
+    public final Setting<Long> slowPathTimeoutMS = new Setting<>(40000L);
 
     /**
      * The big one. Download all chunks in simplified 2-bit format and save them for better very-long-distance pathing.
      */
-    public Setting<Boolean> chunkCaching = new Setting<>(true);
+    public final Setting<Boolean> chunkCaching = new Setting<>(true);
 
     /**
      * On save, delete from RAM any cached regions that are more than 1024 blocks away from the player
      * <p>
-     * Temporarily disabled, see issue #248
+     * Temporarily disabled
+     *
+     * @see <a href="https://github.com/cabaletta/baritone/issues/248">Issue #248</a>
      */
-    public Setting<Boolean> pruneRegionsFromRAM = new Setting<>(false);
+    public final Setting<Boolean> pruneRegionsFromRAM = new Setting<>(false);
 
     /**
      * Print all the debug messages to chat
      */
-    public Setting<Boolean> chatDebug = new Setting<>(true);
+    public final Setting<Boolean> chatDebug = new Setting<>(true);
 
     /**
      * Allow chat based control of Baritone. Most likely should be disabled when Baritone is imported for use in
      * something else
      */
-    public Setting<Boolean> chatControl = new Setting<>(true);
+    public final Setting<Boolean> chatControl = new Setting<>(true);
 
     /**
      * A second override over chatControl to force it on
      */
-    public Setting<Boolean> removePrefix = new Setting<>(false);
+    public final Setting<Boolean> removePrefix = new Setting<>(false);
 
     /**
      * Render the path
      */
-    public Setting<Boolean> renderPath = new Setting<>(true);
+    public final Setting<Boolean> renderPath = new Setting<>(true);
 
     /**
      * Render the goal
      */
-    public Setting<Boolean> renderGoal = new Setting<>(true);
+    public final Setting<Boolean> renderGoal = new Setting<>(true);
 
     /**
      * Ignore depth when rendering the goal
      */
-    public Setting<Boolean> renderGoalIgnoreDepth = new Setting<>(true);
+    public final Setting<Boolean> renderGoalIgnoreDepth = new Setting<>(true);
+
+    /**
+     * Renders X/Z type Goals with the vanilla beacon beam effect. Combining this with
+     * {@link #renderGoalIgnoreDepth} will cause strange render clipping.
+     */
+    public final Setting<Boolean> renderGoalXZBeacon = new Setting<>(false);
 
     /**
      * Ignore depth when rendering the selection boxes (to break, to place, to walk into)
      */
-    public Setting<Boolean> renderSelectionBoxesIgnoreDepth = new Setting<>(true);
+    public final Setting<Boolean> renderSelectionBoxesIgnoreDepth = new Setting<>(true);
 
     /**
      * Ignore depth when rendering the path
      */
-    public Setting<Boolean> renderPathIgnoreDepth = new Setting<>(true);
+    public final Setting<Boolean> renderPathIgnoreDepth = new Setting<>(true);
 
     /**
      * Line width of the path when rendered, in pixels
      */
-    public Setting<Float> pathRenderLineWidthPixels = new Setting<>(5F);
+    public final Setting<Float> pathRenderLineWidthPixels = new Setting<>(5F);
 
     /**
      * Line width of the goal when rendered, in pixels
      */
-    public Setting<Float> goalRenderLineWidthPixels = new Setting<>(3F);
+    public final Setting<Float> goalRenderLineWidthPixels = new Setting<>(3F);
 
     /**
      * Start fading out the path at 20 movements ahead, and stop rendering it entirely 30 movements ahead.
      * Improves FPS.
      */
-    public Setting<Boolean> fadePath = new Setting<>(false);
+    public final Setting<Boolean> fadePath = new Setting<>(false);
 
     /**
      * Move without having to force the client-sided rotations
      */
-    public Setting<Boolean> freeLook = new Setting<>(true);
+    public final Setting<Boolean> freeLook = new Setting<>(true);
 
     /**
      * Will cause some minor behavioral differences to ensure that Baritone works on anticheats.
@@ -365,52 +452,43 @@ public class Settings {
      * At the moment this will silently set the player's rotations when using freeLook so you're not sprinting in
      * directions other than forward, which is picken up by more "advanced" anticheats like AAC, but not NCP.
      */
-    public Setting<Boolean> antiCheatCompatibility = new Setting<>(true);
+    public final Setting<Boolean> antiCheatCompatibility = new Setting<>(true);
 
     /**
      * Exclusively use cached chunks for pathing
      */
-    public Setting<Boolean> pathThroughCachedOnly = new Setting<>(false);
+    public final Setting<Boolean> pathThroughCachedOnly = new Setting<>(false);
 
     /**
      * Whether or not to use the "#" command prefix
      */
-    public Setting<Boolean> prefix = new Setting<>(false);
+    public final Setting<Boolean> prefix = new Setting<>(false);
-
-    /**
-     * {@code true}: can mine blocks when in inventory, chat, or tabbed away in ESC menu
-     * <p>
-     * {@code false}: works on cosmic prisons
-     * <p>
-     * LOL
-     */
-    public Setting<Boolean> leftClickWorkaround = new Setting<>(true);
 
     /**
      * Don't stop walking forward when you need to break blocks in your way
      */
-    public Setting<Boolean> walkWhileBreaking = new Setting<>(true);
+    public final Setting<Boolean> walkWhileBreaking = new Setting<>(true);
 
     /**
-     * If we are more than 500 movements into the current path, discard the oldest segments, as they are no longer useful
+     * If we are more than 300 movements into the current path, discard the oldest segments, as they are no longer useful
      */
-    public Setting<Integer> maxPathHistoryLength = new Setting<>(300);
+    public final Setting<Integer> maxPathHistoryLength = new Setting<>(300);
 
     /**
      * If the current path is too long, cut off this many movements from the beginning.
      */
-    public Setting<Integer> pathHistoryCutoffAmount = new Setting<>(50);
+    public final Setting<Integer> pathHistoryCutoffAmount = new Setting<>(50);
 
     /**
      * Rescan for the goal once every 5 ticks.
      * Set to 0 to disable.
      */
-    public Setting<Integer> mineGoalUpdateInterval = new Setting<>(5);
+    public final Setting<Integer> mineGoalUpdateInterval = new Setting<>(5);
 
     /**
      * While mining, should it also consider dropped items of the correct type as a pathing destination (as well as ore blocks)?
      */
-    public Setting<Boolean> mineScanDroppedItems = new Setting<>(true);
+    public final Setting<Boolean> mineScanDroppedItems = new Setting<>(true);
 
     /**
      * Cancel the current path if the goal has changed, and the path originally ended in the goal but doesn't anymore.
@@ -425,54 +503,54 @@ public class Settings {
      * <p>
      * Also on cosmic prisons this should be set to true since you don't actually mine the ore it just gets replaced with stone.
      */
-    public Setting<Boolean> cancelOnGoalInvalidation = new Setting<>(true);
+    public final Setting<Boolean> cancelOnGoalInvalidation = new Setting<>(true);
 
     /**
      * The "axis" command (aka GoalAxis) will go to a axis, or diagonal axis, at this Y level.
      */
-    public Setting<Integer> axisHeight = new Setting<>(120);
+    public final Setting<Integer> axisHeight = new Setting<>(120);
 
     /**
-     * Allow MineBehavior to use X-Ray to see where the ores are. Turn this option off to force it to mine "legit"
+     * Disallow MineBehavior from using X-Ray to see where the ores are. Turn this option on to force it to mine "legit"
      * where it will only mine an ore once it can actually see it, so it won't do or know anything that a normal player
-     * couldn't. If you don't want it to look like you're X-Raying, turn this off
+     * couldn't. If you don't want it to look like you're X-Raying, turn this on
      */
-    public Setting<Boolean> legitMine = new Setting<>(false);
+    public final Setting<Boolean> legitMine = new Setting<>(false);
 
     /**
      * What Y level to go to for legit strip mining
      */
-    public Setting<Integer> legitMineYLevel = new Setting<>(11);
+    public final Setting<Integer> legitMineYLevel = new Setting<>(11);
 
     /**
      * When mining block of a certain type, try to mine two at once instead of one.
      * If the block above is also a goal block, set GoalBlock instead of GoalTwoBlocks
      * If the block below is also a goal block, set GoalBlock to the position one down instead of GoalTwoBlocks
      */
-    public Setting<Boolean> forceInternalMining = new Setting<>(true);
+    public final Setting<Boolean> forceInternalMining = new Setting<>(true);
 
     /**
      * Modification to the previous setting, only has effect if forceInternalMining is true
      * If true, only apply the previous setting if the block adjacent to the goal isn't air.
      */
-    public Setting<Boolean> internalMiningAirException = new Setting<>(true);
+    public final Setting<Boolean> internalMiningAirException = new Setting<>(true);
 
     /**
      * The actual GoalNear is set this distance away from the entity you're following
      * <p>
      * For example, set followOffsetDistance to 5 and followRadius to 0 to always stay precisely 5 blocks north of your follow target.
      */
-    public Setting<Double> followOffsetDistance = new Setting<>(0D);
+    public final Setting<Double> followOffsetDistance = new Setting<>(0D);
 
     /**
-     * The actual GoalNear is set in this direction from the entity you're following
+     * The actual GoalNear is set in this direction from the entity you're following. This value is in degrees.
      */
-    public Setting<Float> followOffsetDirection = new Setting<>(0F);
+    public final Setting<Float> followOffsetDirection = new Setting<>(0F);
 
     /**
      * The radius (for the GoalNear) of how close to your target position you actually have to be
      */
-    public Setting<Integer> followRadius = new Setting<>(3);
+    public final Setting<Integer> followRadius = new Setting<>(3);
 
     /**
      * Cached chunks (regardless of if they're in RAM or saved to disk) expire and are deleted after this number of seconds
@@ -494,54 +572,55 @@ public class Settings {
      * has to build up that cache from scratch. But after it's gone through an area just once, the next time will have zero
      * backtracking, since the entire area is now known and cached.
      */
-    public Setting<Long> cachedChunksExpirySeconds = new Setting<>(-1L);
+    public final Setting<Long> cachedChunksExpirySeconds = new Setting<>(-1L);
 
     /**
      * The function that is called when Baritone will log to chat. This function can be added to
      * via {@link Consumer#andThen(Consumer)} or it can completely be overriden via setting
      * {@link Setting#value};
      */
-    public Setting<Consumer<ITextComponent>> logger = new Setting<>(Minecraft.getMinecraft().ingameGUI.getChatGUI()::printChatMessage);
+    public final Setting<Consumer<ITextComponent>> logger = new Setting<>(Minecraft.getMinecraft().ingameGUI.getChatGUI()::printChatMessage);
 
     /**
      * The color of the current path
      */
-    public Setting<Color> colorCurrentPath = new Setting<>(Color.RED);
+    public final Setting<Color> colorCurrentPath = new Setting<>(Color.RED);
 
     /**
      * The color of the next path
      */
-    public Setting<Color> colorNextPath = new Setting<>(Color.MAGENTA);
+    public final Setting<Color> colorNextPath = new Setting<>(Color.MAGENTA);
 
     /**
      * The color of the blocks to break
      */
-    public Setting<Color> colorBlocksToBreak = new Setting<>(Color.RED);
+    public final Setting<Color> colorBlocksToBreak = new Setting<>(Color.RED);
 
     /**
      * The color of the blocks to place
      */
-    public Setting<Color> colorBlocksToPlace = new Setting<>(Color.GREEN);
+    public final Setting<Color> colorBlocksToPlace = new Setting<>(Color.GREEN);
 
     /**
      * The color of the blocks to walk into
      */
-    public Setting<Color> colorBlocksToWalkInto = new Setting<>(Color.MAGENTA);
+    public final Setting<Color> colorBlocksToWalkInto = new Setting<>(Color.MAGENTA);
 
     /**
      * The color of the best path so far
      */
-    public Setting<Color> colorBestPathSoFar = new Setting<>(Color.BLUE);
+    public final Setting<Color> colorBestPathSoFar = new Setting<>(Color.BLUE);
 
     /**
      * The color of the path to the most recent considered node
      */
-    public Setting<Color> colorMostRecentConsidered = new Setting<>(Color.CYAN);
+    public final Setting<Color> colorMostRecentConsidered = new Setting<>(Color.CYAN);
 
     /**
      * The color of the goal box
      */
-    public Setting<Color> colorGoalBox = new Setting<>(Color.GREEN);
+    public final Setting<Color> colorGoalBox = new Setting<>(Color.GREEN);
+
 
     /**
      * A map of lowercase setting field names to their respective setting
@@ -553,6 +632,12 @@ public class Settings {
      */
     public final List<Setting<?>> allSettings;
 
+    public void reset() {
+        for (Setting setting : allSettings) {
+            setting.value = setting.defaultValue;
+        }
+    }
+
     public class Setting<T> {
         public T value;
         public final T defaultValue;

src/api/java/baritone/api/behavior/IPathingBehavior.java

@@ -37,7 +37,13 @@ public interface IPathingBehavior extends IBehavior {
      *
      * @return The estimated remaining ticks in the current segment.
      */
-    Optional<Double> ticksRemainingInSegment();
+    default Optional<Double> ticksRemainingInSegment() {
+        IPathExecutor current = getCurrent();
+        if (current == null) {
+            return Optional.empty();
+        }
+        return Optional.of(current.getPath().ticksRemainingFrom(current.getPosition()));
+    }
 
     /**
      * @return The current pathing goal
@@ -47,7 +53,9 @@ public interface IPathingBehavior extends IBehavior {
     /**
      * @return Whether or not a path is currently being executed.
      */
-    boolean isPathing();
+    default boolean isPathing() {
+        return getCurrent() != null;
+    }
 
     /**
      * Cancels the pathing behavior or the current path calculation, and all processes that could be controlling path.

src/api/java/baritone/api/cache/ICachedRegion.java

@@ -37,12 +37,12 @@ public interface ICachedRegion extends IBlockTypeAccess {
     boolean isCached(int blockX, int blockZ);
 
     /**
-     * The X coordinate of this region
+     * @return The X coordinate of this region
      */
     int getX();
 
     /**
-     * The Z coordinate of this region
+     * @return The Z coordinate of this region
      */
     int getZ();
 }

src/api/java/baritone/api/cache/IContainerMemory.java

@@ -15,9 +15,8 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.behavior;
+package baritone.api.cache;
 
-import baritone.api.behavior.memory.IRememberedInventory;
 import net.minecraft.util.math.BlockPos;
 
 import java.util.Map;
@@ -26,7 +25,7 @@ import java.util.Map;
  * @author Brady
  * @since 9/23/2018
  */
-public interface IMemoryBehavior extends IBehavior {
+public interface IContainerMemory {
 
     /**
      * Gets a remembered inventory by its block position.

src/api/java/baritone/api/cache/IRememberedInventory.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.behavior.memory;
+package baritone.api.cache;
 
 import net.minecraft.item.ItemStack;
 

src/api/java/baritone/api/cache/IWorldData.java

@@ -27,13 +27,19 @@ public interface IWorldData {
      * Returns the cached world for this world. A cached world is a simplified format
      * of a regular world, intended for use on multiplayer servers where chunks are not
      * traditionally stored to disk, allowing for long distance pathing with minimal disk usage.
+     *
+     * @return The cached world for this world
      */
     ICachedWorld getCachedWorld();
 
     /**
-     * Returns the waypoint collection for this world.
-     *
      * @return The waypoint collection for this world
      */
     IWaypointCollection getWaypoints();
+
+    /**
+     * @return The {@link IContainerMemory} instance
+     * @see IContainerMemory
+     */
+    IContainerMemory getContainerMemory();
 }

src/api/java/baritone/api/cache/IWorldScanner.java

@@ -20,6 +20,7 @@ package baritone.api.cache;
 import baritone.api.utils.IPlayerContext;
 import net.minecraft.block.Block;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.ChunkPos;
 
 import java.util.List;
 
@@ -42,4 +43,18 @@ public interface IWorldScanner {
      * @return The matching block positions
      */
     List<BlockPos> scanChunkRadius(IPlayerContext ctx, List<Block> blocks, int max, int yLevelThreshold, int maxSearchRadius);
+
+    /**
+     * Scans a single chunk for the specified blocks.
+     *
+     * @param ctx             The {@link IPlayerContext} containing player and world info that the
+     *                        scan is based upon
+     * @param blocks          The blocks to scan for
+     * @param pos             The position of the target chunk
+     * @param max             The maximum number of blocks to scan before cutoff
+     * @param yLevelThreshold If a block is found within this Y level, the current result will be
+     *                        returned, if the value is negative, then this condition doesn't apply.
+     * @return The matching block positions
+     */
+    List<BlockPos> scanChunk(IPlayerContext ctx, List<Block> blocks, ChunkPos pos, int max, int yLevelThreshold);
 }

src/api/java/baritone/api/event/events/BlockInteractEvent.java

@@ -20,7 +20,7 @@ package baritone.api.event.events;
 import net.minecraft.util.math.BlockPos;
 
 /**
- * Called when the local player interacts with a block, can be either {@link Type#BREAK} or {@link Type#USE}.
+ * Called when the local player interacts with a block, can be either {@link Type#START_BREAK} or {@link Type#USE}.
  *
  * @author Brady
  * @since 8/22/2018
@@ -59,9 +59,9 @@ public final class BlockInteractEvent {
     public enum Type {
 
         /**
-         * We're breaking the target block.
+         * We're starting to break the target block.
          */
-        BREAK,
+        START_BREAK,
 
         /**
          * We're right clicking on the target block. Either placing or interacting with.

src/api/java/baritone/api/event/events/ChatEvent.java

@@ -17,22 +17,20 @@
 
 package baritone.api.event.events;
 
-import baritone.api.event.events.type.ManagedPlayerEvent;
+import baritone.api.event.events.type.Cancellable;
-import net.minecraft.client.entity.EntityPlayerSP;
 
 /**
  * @author Brady
  * @since 8/1/2018
  */
-public final class ChatEvent extends ManagedPlayerEvent.Cancellable {
+public final class ChatEvent extends Cancellable {
 
     /**
      * The message being sent
      */
     private final String message;
 
-    public ChatEvent(EntityPlayerSP player, String message) {
+    public ChatEvent(String message) {
-        super(player);
         this.message = message;
     }
 

src/api/java/baritone/api/event/events/ChunkEvent.java

@@ -31,7 +31,9 @@ public final class ChunkEvent {
     private final EventState state;
 
     /**
-     * The type of chunk event that occurred;
+     * The type of chunk event that occurred
+     *
+     * @see Type
      */
     private final Type type;
 

src/api/java/baritone/api/event/events/PlayerUpdateEvent.java

@@ -18,22 +18,19 @@
 package baritone.api.event.events;
 
 import baritone.api.event.events.type.EventState;
-import baritone.api.event.events.type.ManagedPlayerEvent;
-import net.minecraft.client.entity.EntityPlayerSP;
 
 /**
  * @author Brady
  * @since 8/21/2018
  */
-public final class PlayerUpdateEvent extends ManagedPlayerEvent {
+public final class PlayerUpdateEvent {
 
     /**
      * The state of the event
      */
     private final EventState state;
 
-    public PlayerUpdateEvent(EntityPlayerSP player, EventState state) {
+    public PlayerUpdateEvent(EventState state) {
-        super(player);
         this.state = state;
     }
 

src/api/java/baritone/api/event/events/RotationMoveEvent.java

@@ -17,8 +17,6 @@
 
 package baritone.api.event.events;
 
-import baritone.api.event.events.type.ManagedPlayerEvent;
-import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 
@@ -26,7 +24,7 @@ import net.minecraft.entity.EntityLivingBase;
  * @author Brady
  * @since 8/21/2018
  */
-public final class RotationMoveEvent extends ManagedPlayerEvent {
+public final class RotationMoveEvent {
 
     /**
      * The type of event
@@ -38,8 +36,7 @@ public final class RotationMoveEvent extends ManagedPlayerEvent {
      */
     private float yaw;
 
-    public RotationMoveEvent(EntityPlayerSP player, Type type, float yaw) {
+    public RotationMoveEvent(Type type, float yaw) {
-        super(player);
         this.type = type;
         this.yaw = yaw;
     }

src/api/java/baritone/api/event/events/SprintStateEvent.java

@@ -15,13 +15,21 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils;
+package baritone.api.event.events;
 
 /**
  * @author Brady
- * @since 9/23/2018
+ * @since 1/18/2019
  */
-public class Logger {
+public final class SprintStateEvent {
 
+    private Boolean state;
 
+    public final void setState(boolean state) {
+        this.state = state;
+    }
+
+    public final Boolean getState() {
+        return this.state;
+    }
 }

src/api/java/baritone/api/event/events/type/ManagedPlayerEvent.java

@@ -1,61 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.event.events.type;
-
-import net.minecraft.client.entity.EntityPlayerSP;
-
-/**
- * An event that has a reference to a locally managed player.
- *
- * @author Brady
- * @since 10/11/2018
- */
-public class ManagedPlayerEvent {
-
-    protected final EntityPlayerSP player;
-
-    public ManagedPlayerEvent(EntityPlayerSP player) {
-        this.player = player;
-    }
-
-    public final EntityPlayerSP getPlayer() {
-        return this.player;
-    }
-
-    public static class Cancellable extends ManagedPlayerEvent implements ICancellable {
-
-        /**
-         * Whether or not this event has been cancelled
-         */
-        private boolean cancelled;
-
-        public Cancellable(EntityPlayerSP player) {
-            super(player);
-        }
-
-        @Override
-        public final void cancel() {
-            this.cancelled = true;
-        }
-
-        @Override
-        public final boolean isCancelled() {
-            return this.cancelled;
-        }
-    }
-}

src/api/java/baritone/api/event/listener/AbstractGameEventListener.java

@@ -36,9 +36,6 @@ public interface AbstractGameEventListener extends IGameEventListener {
     @Override
     default void onPlayerUpdate(PlayerUpdateEvent event) {}
 
-    @Override
-    default void onProcessKeyBinds() {}
-
     @Override
     default void onSendChatMessage(ChatEvent event) {}
 
@@ -60,6 +57,9 @@ public interface AbstractGameEventListener extends IGameEventListener {
     @Override
     default void onPlayerRotationMove(RotationMoveEvent event) {}
 
+    @Override
+    default void onPlayerSprintState(SprintStateEvent event) {}
+
     @Override
     default void onBlockInteract(BlockInteractEvent event) {}
 

src/api/java/baritone/api/event/listener/IGameEventListener.java

@@ -23,13 +23,9 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.gui.GuiGameOver;
 import net.minecraft.client.multiplayer.WorldClient;
-import net.minecraft.client.renderer.EntityRenderer;
 import net.minecraft.client.settings.GameSettings;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.network.NetworkManager;
 import net.minecraft.network.Packet;
-import net.minecraft.util.text.ITextComponent;
 
 /**
  * @author Brady
@@ -40,6 +36,7 @@ public interface IGameEventListener {
     /**
      * Run once per game tick before screen input is handled.
      *
+     * @param event The event
      * @see Minecraft#runTick()
      */
     void onTick(TickEvent event);
@@ -47,20 +44,15 @@ public interface IGameEventListener {
     /**
      * Run once per game tick from before and after the player rotation is sent to the server.
      *
+     * @param event The event
      * @see EntityPlayerSP#onUpdate()
      */
     void onPlayerUpdate(PlayerUpdateEvent event);
 
-    /**
-     * Run once per game tick from before keybinds are processed.
-     *
-     * @see Minecraft#processKeyBinds()
-     */
-    void onProcessKeyBinds();
-
     /**
      * Runs whenever the client player sends a message to the server.
      *
+     * @param event The event
      * @see EntityPlayerSP#sendChatMessage(String)
      */
     void onSendChatMessage(ChatEvent event);
@@ -68,6 +60,7 @@ public interface IGameEventListener {
     /**
      * Runs before and after whenever a chunk is either loaded, unloaded, or populated.
      *
+     * @param event The event
      * @see WorldClient#doPreChunk(int, int, boolean)
      */
     void onChunkEvent(ChunkEvent event);
@@ -77,13 +70,14 @@ public interface IGameEventListener {
      * <p>
      * <b>Note:</b> {@link GameSettings#anaglyph} has been removed in Minecraft 1.13
      *
-     * @see EntityRenderer#renderWorldPass(int, float, long)
+     * @param event The event
      */
     void onRenderPass(RenderEvent event);
 
     /**
      * Runs before and after whenever a new world is loaded
      *
+     * @param event The event
      * @see Minecraft#loadWorld(WorldClient, String)
      */
     void onWorldEvent(WorldEvent event);
@@ -91,7 +85,7 @@ public interface IGameEventListener {
     /**
      * Runs before a outbound packet is sent
      *
-     * @see NetworkManager#dispatchPacket(Packet, GenericFutureListener[])
+     * @param event The event
      * @see Packet
      * @see GenericFutureListener
      */
@@ -100,7 +94,7 @@ public interface IGameEventListener {
     /**
      * Runs before an inbound packet is processed
      *
-     * @see NetworkManager#dispatchPacket(Packet, GenericFutureListener[])
+     * @param event The event
      * @see Packet
      * @see GenericFutureListener
      */
@@ -110,31 +104,37 @@ public interface IGameEventListener {
      * Run once per game tick from before and after the player's moveRelative method is called
      * and before and after the player jumps.
      *
+     * @param event The event
      * @see Entity#moveRelative(float, float, float, float)
-     * @see EntityLivingBase#jump()
      */
     void onPlayerRotationMove(RotationMoveEvent event);
 
+    /**
+     * Called whenever the sprint keybind state is checked in {@link EntityPlayerSP#onLivingUpdate}
+     *
+     * @param event The event
+     * @see EntityPlayerSP#onLivingUpdate()
+     */
+    void onPlayerSprintState(SprintStateEvent event);
+
     /**
      * Called when the local player interacts with a block, whether it is breaking or opening/placing.
      *
-     * @see Minecraft#clickMouse()
+     * @param event The event
-     * @see Minecraft#rightClickMouse()
      */
     void onBlockInteract(BlockInteractEvent event);
 
     /**
      * Called when the local player dies, as indicated by the creation of the {@link GuiGameOver} screen.
      *
-     * @see GuiGameOver(ITextComponent)
+     * @see GuiGameOver
-     * @see ITextComponent
      */
     void onPlayerDeath();
 
     /**
      * When the pathfinder's state changes
      *
-     * @param event
+     * @param event The event
      */
     void onPathEvent(PathEvent event);
 }

src/api/java/baritone/api/pathing/calc/IPath.java

@@ -21,7 +21,6 @@ import baritone.api.Settings;
 import baritone.api.pathing.goals.Goal;
 import baritone.api.pathing.movement.IMovement;
 import baritone.api.utils.BetterBlockPos;
-import net.minecraft.world.World;
 
 import java.util.HashSet;
 import java.util.List;
@@ -52,6 +51,8 @@ public interface IPath {
     /**
      * This path is actually going to be executed in the world. Do whatever additional processing is required.
      * (as opposed to Path objects that are just constructed every frame for rendering)
+     *
+     * @return The result of path post processing
      */
     default IPath postProcess() {
         throw new UnsupportedOperationException();
@@ -109,8 +110,9 @@ public interface IPath {
     default double ticksRemainingFrom(int pathPosition) {
         double sum = 0;
         //this is fast because we aren't requesting recalculation, it's just cached
-        for (int i = pathPosition; i < movements().size(); i++) {
+        List<IMovement> movements = movements();
-            sum += movements().get(i).getCost();
+        for (int i = pathPosition; i < movements.size(); i++) {
+            sum += movements.get(i).getCost();
         }
         return sum;
     }
@@ -118,10 +120,13 @@ public interface IPath {
     /**
      * Cuts off this path at the loaded chunk border, and returns the resulting path. Default
      * implementation just returns this path, without the intended functionality.
+     * <p>
+     * The argument is supposed to be a BlockStateInterface LOL LOL LOL LOL LOL
      *
+     * @param bsi The block state lookup, highly cursed
      * @return The result of this cut-off operation
      */
-    default IPath cutoffAtLoadedChunks(World world) {
+    default IPath cutoffAtLoadedChunks(Object bsi) {
         throw new UnsupportedOperationException();
     }
 
@@ -129,6 +134,7 @@ public interface IPath {
      * Cuts off this path using the min length and cutoff factor settings, and returns the resulting path.
      * Default implementation just returns this path, without the intended functionality.
      *
+     * @param destination The end goal of this path
      * @return The result of this cut-off operation
      * @see Settings#pathCutoffMinimumLength
      * @see Settings#pathCutoffFactor

src/api/java/baritone/api/pathing/calc/IPathFinder.java

@@ -34,6 +34,8 @@ public interface IPathFinder {
     /**
      * Calculate the path in full. Will take several seconds.
      *
+     * @param primaryTimeout If a path is found, the path finder will stop after this amount of time
+     * @param failureTimeout If a path isn't found, the path finder will continue for this amount of time
      * @return The final path
      */
     PathCalculationResult calculate(long primaryTimeout, long failureTimeout);

src/api/java/baritone/api/pathing/calc/IPathingControlManager.java

@@ -22,10 +22,26 @@ import baritone.api.process.PathingCommand;
 
 import java.util.Optional;
 
+/**
+ * @author leijurv
+ */
 public interface IPathingControlManager {
+
+    /**
+     * Registers a process with this pathing control manager. See {@link IBaritoneProcess} for more details.
+     *
+     * @param process The process
+     * @see IBaritoneProcess
+     */
     void registerProcess(IBaritoneProcess process);
 
+    /**
+     * @return The most recent {@link IBaritoneProcess} that had control
+     */
     Optional<IBaritoneProcess> mostRecentInControl();
 
+    /**
+     * @return The most recent pathing command executed
+     */
     Optional<PathingCommand> mostRecentCommand();
 }

src/api/java/baritone/api/pathing/goals/Goal.java

@@ -30,6 +30,9 @@ public interface Goal {
      * Returns whether or not the specified position
      * meets the requirement for this goal based.
      *
+     * @param x The goal X position
+     * @param y The goal Y position
+     * @param z The goal Z position
      * @return Whether or not it satisfies this goal
      */
     boolean isInGoal(int x, int y, int z);
@@ -37,6 +40,9 @@ public interface Goal {
     /**
      * Estimate the number of ticks it will take to get to the goal
      *
+     * @param x The goal X position
+     * @param y The goal Y position
+     * @param z The goal Z position
      * @return The estimate number of ticks to satisfy the goal
      */
     double heuristic(int x, int y, int z);

src/api/java/baritone/api/pathing/movement/IMovement.java

@@ -20,8 +20,6 @@ package baritone.api.pathing.movement;
 import baritone.api.utils.BetterBlockPos;
 import net.minecraft.util.math.BlockPos;
 
-import java.util.List;
-
 /**
  * @author Brady
  * @since 10/8/2018
@@ -58,10 +56,4 @@ public interface IMovement {
     BetterBlockPos getDest();
 
     BlockPos getDirection();
-
-    List<BlockPos> toBreak();
-
-    List<BlockPos> toPlace();
-
-    List<BlockPos> toWalkInto();
 }

src/api/java/baritone/api/pathing/path/IPathExecutor.java

@@ -26,4 +26,6 @@ import baritone.api.pathing.calc.IPath;
 public interface IPathExecutor {
 
     IPath getPath();
+
+    int getPosition();
 }

src/api/java/baritone/api/process/IBaritoneProcess.java

@@ -17,7 +17,6 @@
 
 package baritone.api.process;
 
-import baritone.api.IBaritone;
 import baritone.api.behavior.IPathingBehavior;
 import baritone.api.event.events.PathEvent;
 
@@ -25,8 +24,10 @@ import baritone.api.event.events.PathEvent;
  * A process that can control the PathingBehavior.
  * <p>
  * Differences between a baritone process and a behavior:
- * Only one baritone process can be active at a time
+ * <ul>
- * PathingBehavior can only be controlled by a process
+ * <li>Only one baritone process can be active at a time</li>
+ * <li>PathingBehavior can only be controlled by a process</li>
+ * </ul>
  * <p>
  * That's it actually
  *
@@ -83,13 +84,6 @@ public interface IBaritoneProcess {
      */
     double priority();
 
-    /**
-     * Returns which bot this process is associated with. (5000000iq forward thinking)
-     *
-     * @return The Bot associated with this process
-     */
-    IBaritone associatedWith();
-
     /**
      * Returns a user-friendly name for this process. Suitable for a HUD.
      *

src/api/java/baritone/api/utils/IInputOverrideHandler.java

@@ -27,9 +27,7 @@ import net.minecraft.client.settings.KeyBinding;
  */
 public interface IInputOverrideHandler extends IBehavior {
 
-    default boolean isInputForcedDown(KeyBinding key) {
+    Boolean isInputForcedDown(KeyBinding key);
-        return isInputForcedDown(Input.getInputForBind(key));
-    }
 
     boolean isInputForcedDown(Input input);
 

src/api/java/baritone/api/utils/IPlayerContext.java

@@ -20,7 +20,6 @@ package baritone.api.utils;
 import baritone.api.cache.IWorldData;
 import net.minecraft.block.BlockSlab;
 import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.client.multiplayer.PlayerControllerMP;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.RayTraceResult;
@@ -37,7 +36,7 @@ public interface IPlayerContext {
 
     EntityPlayerSP player();
 
-    PlayerControllerMP playerController();
+    IPlayerController playerController();
 
     World world();
 

src/api/java/baritone/api/utils/IPlayerController.java

@@ -0,0 +1,46 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.api.utils;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.ClickType;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.GameType;
+
+/**
+ * @author Brady
+ * @since 12/14/2018
+ */
+public interface IPlayerController {
+
+    boolean onPlayerDamageBlock(BlockPos pos, EnumFacing side);
+
+    void resetBlockRemoving();
+
+    ItemStack windowClick(int windowId, int slotId, int mouseButton, ClickType type, EntityPlayer player);
+
+    void setGameType(GameType type);
+
+    GameType getGameType();
+
+    default double getBlockReachDistance() {
+        return this.getGameType().isCreative() ? 5.0F : 4.5F;
+    }
+}

src/api/java/baritone/api/utils/PathCalculationResult.java

@@ -19,6 +19,7 @@ package baritone.api.utils;
 
 import baritone.api.pathing.calc.IPath;
 
+import java.util.Objects;
 import java.util.Optional;
 
 public class PathCalculationResult {
@@ -31,11 +32,9 @@ public class PathCalculationResult {
     }
 
     public PathCalculationResult(Type type, IPath path) {
+        Objects.requireNonNull(type);
         this.path = path;
         this.type = type;
-        if (type == null) {
-            throw new IllegalArgumentException("come on");
-        }
     }
 
     public final Optional<IPath> getPath() {

src/api/java/baritone/api/utils/RayTraceUtils.java

@@ -34,7 +34,9 @@ public final class RayTraceUtils {
      * any entity collisions can be ignored, because this method will not recognize if an
      * entity is in the way or not. The local player's block reach distance will be used.
      *
-     * @param rotation The rotation to raytrace towards
+     * @param entity             The entity representing the raytrace source
+     * @param rotation           The rotation to raytrace towards
+     * @param blockReachDistance The block reach distance of the entity
      * @return The calculated raytrace result
      */
     public static RayTraceResult rayTraceTowards(Entity entity, Rotation rotation, double blockReachDistance) {

src/api/java/baritone/api/utils/Rotation.java

@@ -110,6 +110,17 @@ public class Rotation {
         );
     }
 
+    /**
+     * Is really close to
+     *
+     * @param other another rotation
+     * @return are they really close
+     */
+    public boolean isReallyCloseTo(Rotation other) {
+        float yawDiff = Math.abs(this.yaw - other.yaw); // you cant fool me
+        return (yawDiff < 0.01 || yawDiff > 359.9) && Math.abs(this.pitch - other.pitch) < 0.01;
+    }
+
     /**
      * Clamps the specified pitch value between -90 and 90.
      *
@@ -131,7 +142,7 @@ public class Rotation {
         if (newYaw < -180F) {
             newYaw += 360F;
         }
-        if (newYaw >= 180F) {
+        if (newYaw > 180F) {
             newYaw -= 360F;
         }
         return newYaw;

src/api/java/baritone/api/utils/RotationUtils.java

@@ -127,6 +127,16 @@ public final class RotationUtils {
         return new Vec3d((double) (f1 * f2), (double) f3, (double) (f * f2));
     }
 
+    /**
+     * @param ctx Context for the viewing entity
+     * @param pos The target block position
+     * @return The optional rotation
+     * @see #reachable(EntityPlayerSP, BlockPos, double)
+     */
+    public static Optional<Rotation> reachable(IPlayerContext ctx, BlockPos pos) {
+        return reachable(ctx.player(), pos, ctx.playerController().getBlockReachDistance());
+    }
+
     /**
      * Determines if the specified entity is able to reach the center of any of the sides
      * of the specified block. It first checks if the block center is reachable, and if so,
@@ -134,8 +144,9 @@ public final class RotationUtils {
      * side that is reachable. The return type will be {@link Optional#empty()} if the entity is
      * unable to reach any of the sides of the block.
      *
-     * @param entity The viewing entity
+     * @param entity             The viewing entity
-     * @param pos    The target block position
+     * @param pos                The target block position
+     * @param blockReachDistance The block reach distance of the entity
      * @return The optional rotation
      */
     public static Optional<Rotation> reachable(EntityPlayerSP entity, BlockPos pos, double blockReachDistance) {
@@ -178,9 +189,10 @@ public final class RotationUtils {
      * the given offsetted position. The return type will be {@link Optional#empty()} if
      * the entity is unable to reach the block with the offset applied.
      *
-     * @param entity    The viewing entity
+     * @param entity             The viewing entity
-     * @param pos       The target block position
+     * @param pos                The target block position
-     * @param offsetPos The position of the block with the offset applied.
+     * @param offsetPos          The position of the block with the offset applied.
+     * @param blockReachDistance The block reach distance of the entity
      * @return The optional rotation
      */
     public static Optional<Rotation> reachableOffset(Entity entity, BlockPos pos, Vec3d offsetPos, double blockReachDistance) {
@@ -202,8 +214,9 @@ public final class RotationUtils {
      * Determines if the specified entity is able to reach the specified block where it is
      * looking at the direct center of it's hitbox.
      *
-     * @param entity The viewing entity
+     * @param entity             The viewing entity
-     * @param pos    The target block position
+     * @param pos                The target block position
+     * @param blockReachDistance The block reach distance of the entity
      * @return The optional rotation
      */
     public static Optional<Rotation> reachableCenter(Entity entity, BlockPos pos, double blockReachDistance) {

src/api/java/baritone/api/utils/SettingsUtil.java

@@ -18,56 +18,77 @@
 package baritone.api.utils;
 
 import baritone.api.Settings;
-import net.minecraft.client.Minecraft;
 import net.minecraft.item.Item;
 import net.minecraft.util.ResourceLocation;
 
 import java.awt.*;
-import java.io.File;
+import java.io.BufferedReader;
-import java.io.FileOutputStream;
+import java.io.BufferedWriter;
-import java.util.*;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static net.minecraft.client.Minecraft.getMinecraft;
+
 public class SettingsUtil {
 
-    private static final File settingsFile = new File(new File(Minecraft.getMinecraft().gameDir, "baritone"), "settings.txt");
+    private static final Path SETTINGS_PATH = getMinecraft().gameDir.toPath().resolve("baritone").resolve("settings.txt");
+    private static final Pattern SETTING_PATTERN = Pattern.compile("^(?<setting>[^ ]+) +(?<value>[^ ]+)"); // 2 words separated by spaces
 
     private static final Map<Class<?>, SettingsIO> map;
 
+    private static boolean isComment(String line) {
+        return line.startsWith("#") || line.startsWith("//");
+    }
+
+    private static void forEachLine(Path file, Consumer<String> consumer) throws IOException {
+        try (BufferedReader scan = Files.newBufferedReader(file)) {
+            String line;
+            while ((line = scan.readLine()) != null) {
+                if (line.isEmpty() || isComment(line)) {
+                    continue;
+                }
+                consumer.accept(line);
+            }
+        }
+    }
+
     public static void readAndApply(Settings settings) {
-        try (Scanner scan = new Scanner(settingsFile)) {
+        try {
-            while (scan.hasNextLine()) {
+            forEachLine(SETTINGS_PATH, line -> {
-                String line = scan.nextLine();
+                Matcher matcher = SETTING_PATTERN.matcher(line);
-                if (line.isEmpty()) {
+                if (!matcher.matches()) {
-                    continue;
+                    System.out.println("Invalid syntax in setting file: " + line);
+                    return;
                 }
-                if (line.startsWith("#") || line.startsWith("//")) {
+
-                    continue;
+                String settingName = matcher.group("setting").toLowerCase();
-                }
+                String settingValue = matcher.group("value");
-                int space = line.indexOf(" ");
-                if (space == -1) {
-                    System.out.println("Skipping invalid line with no space: " + line);
-                    continue;
-                }
-                String settingName = line.substring(0, space).trim().toLowerCase();
-                String settingValue = line.substring(space).trim();
                 try {
                     parseAndApply(settings, settingName, settingValue);
                 } catch (Exception ex) {
-                    ex.printStackTrace();
                     System.out.println("Unable to parse line " + line);
+                    ex.printStackTrace();
                 }
-            }
+            });
         } catch (Exception ex) {
-            ex.printStackTrace();
             System.out.println("Exception while reading Baritone settings, some settings may be reset to default values!");
+            ex.printStackTrace();
         }
     }
 
     public static synchronized void save(Settings settings) {
-        try (FileOutputStream out = new FileOutputStream(settingsFile)) {
+        try (BufferedWriter out = Files.newBufferedWriter(SETTINGS_PATH)) {
             for (Settings.Setting setting : settings.allSettings) {
                 if (setting.get() == null) {
                     System.out.println("NULL SETTING?" + setting.getName());
@@ -83,11 +104,11 @@ public class SettingsUtil {
                 if (io == null) {
                     throw new IllegalStateException("Missing " + setting.getValueClass() + " " + setting + " " + setting.getName());
                 }
-                out.write((setting.getName() + " " + io.toString.apply(setting.get()) + "\n").getBytes());
+                out.write(setting.getName() + " " + io.toString.apply(setting.get()) + "\n");
             }
         } catch (Exception ex) {
+            System.out.println("Exception thrown while saving Baritone settings!");
             ex.printStackTrace();
-            System.out.println("Exception while saving Baritone settings!");
         }
     }
 

src/api/java/baritone/api/utils/VecUtils.java

@@ -36,7 +36,8 @@ public final class VecUtils {
     /**
      * Calculates the center of the block at the specified position's bounding box
      *
-     * @param pos The block position
+     * @param world The world that the block is in, used to provide the bounding box
+     * @param pos   The block position
      * @return The center of the block's bounding box
      * @see #getBlockPosCenter(BlockPos)
      */
@@ -81,10 +82,9 @@ public final class VecUtils {
      * @see #getBlockPosCenter(BlockPos)
      */
     public static double distanceToCenter(BlockPos pos, double x, double y, double z) {
-        Vec3d center = getBlockPosCenter(pos);
+        double xdiff = pos.getX() + 0.5 - x;
-        double xdiff = x - center.x;
+        double ydiff = pos.getY() + 0.5 - y;
-        double ydiff = y - center.y;
+        double zdiff = pos.getZ() + 0.5 - z;
-        double zdiff = z - center.z;
         return Math.sqrt(xdiff * xdiff + ydiff * ydiff + zdiff * zdiff);
     }
 

src/launch/java/baritone/launch/mixins/MixinEntity.java

@@ -52,7 +52,7 @@ public class MixinEntity {
     private void preMoveRelative(float strafe, float up, float forward, float friction, CallbackInfo ci) {
         // noinspection ConstantConditions
         if (EntityPlayerSP.class.isInstance(this)) {
-            this.motionUpdateRotationEvent = new RotationMoveEvent((EntityPlayerSP) (Object) this, RotationMoveEvent.Type.MOTION_UPDATE, this.rotationYaw);
+            this.motionUpdateRotationEvent = new RotationMoveEvent(RotationMoveEvent.Type.MOTION_UPDATE, this.rotationYaw);
             BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this).getGameEventHandler().onPlayerRotationMove(this.motionUpdateRotationEvent);
         }
     }

src/launch/java/baritone/launch/mixins/MixinEntityLivingBase.java

@@ -55,7 +55,7 @@ public abstract class MixinEntityLivingBase extends Entity {
     private void preMoveRelative(CallbackInfo ci) {
         // noinspection ConstantConditions
         if (EntityPlayerSP.class.isInstance(this)) {
-            this.jumpRotationEvent = new RotationMoveEvent((EntityPlayerSP) (Object) this, RotationMoveEvent.Type.JUMP, this.rotationYaw);
+            this.jumpRotationEvent = new RotationMoveEvent(RotationMoveEvent.Type.JUMP, this.rotationYaw);
             BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this).getGameEventHandler().onPlayerRotationMove(this.jumpRotationEvent);
         }
     }

src/launch/java/baritone/launch/mixins/MixinEntityPlayerSP.java

@@ -21,8 +21,11 @@ import baritone.api.BaritoneAPI;
 import baritone.api.behavior.IPathingBehavior;
 import baritone.api.event.events.ChatEvent;
 import baritone.api.event.events.PlayerUpdateEvent;
+import baritone.api.event.events.SprintStateEvent;
 import baritone.api.event.events.type.EventState;
+import baritone.behavior.LookBehavior;
 import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.entity.player.PlayerCapabilities;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -43,7 +46,7 @@ public class MixinEntityPlayerSP {
             cancellable = true
     )
     private void sendChatMessage(String msg, CallbackInfo ci) {
-        ChatEvent event = new ChatEvent((EntityPlayerSP) (Object) this, msg);
+        ChatEvent event = new ChatEvent(msg);
         BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this).getGameEventHandler().onSendChatMessage(event);
         if (event.isCancelled()) {
             ci.cancel();
@@ -60,7 +63,7 @@ public class MixinEntityPlayerSP {
             )
     )
     private void onPreUpdate(CallbackInfo ci) {
-        BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this).getGameEventHandler().onPlayerUpdate(new PlayerUpdateEvent((EntityPlayerSP) (Object) this, EventState.PRE));
+        BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this).getGameEventHandler().onPlayerUpdate(new PlayerUpdateEvent(EventState.PRE));
     }
 
     @Inject(
@@ -73,7 +76,7 @@ public class MixinEntityPlayerSP {
             )
     )
     private void onPostUpdate(CallbackInfo ci) {
-        BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this).getGameEventHandler().onPlayerUpdate(new PlayerUpdateEvent((EntityPlayerSP) (Object) this, EventState.POST));
+        BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this).getGameEventHandler().onPlayerUpdate(new PlayerUpdateEvent(EventState.POST));
     }
 
     @Redirect(
@@ -87,4 +90,27 @@ public class MixinEntityPlayerSP {
         IPathingBehavior pathingBehavior = BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this).getPathingBehavior();
         return !pathingBehavior.isPathing() && capabilities.allowFlying;
     }
+
+    @Redirect(
+            method = "onLivingUpdate",
+            at = @At(
+                    value = "INVOKE",
+                    target = "net/minecraft/client/settings/KeyBinding.isKeyDown()Z"
+            )
+    )
+    private boolean isKeyDown(KeyBinding keyBinding) {
+        SprintStateEvent event = new SprintStateEvent();
+        BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this).getGameEventHandler().onPlayerSprintState(event);
+        return event.getState() == null ? keyBinding.isKeyDown() : event.getState();
+    }
+
+    @Inject(
+            method = "updateRidden",
+            at = @At(
+                    value = "HEAD"
+            )
+    )
+    private void updateRidden(CallbackInfo cb) {
+        ((LookBehavior) BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this).getLookBehavior()).pig();
+    }
 }

src/launch/java/baritone/launch/mixins/MixinKeyBinding.java

@@ -18,8 +18,10 @@
 package baritone.launch.mixins;
 
 import baritone.api.BaritoneAPI;
+import baritone.utils.Helper;
 import net.minecraft.client.settings.KeyBinding;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@@ -31,6 +33,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 @Mixin(KeyBinding.class)
 public class MixinKeyBinding {
 
+    @Shadow
+    private int pressTime;
+
     @Inject(
             method = "isKeyDown",
             at = @At("HEAD"),
@@ -38,8 +43,26 @@ public class MixinKeyBinding {
     )
     private void isKeyDown(CallbackInfoReturnable<Boolean> cir) {
         // only the primary baritone forces keys
-        if (BaritoneAPI.getProvider().getPrimaryBaritone().getInputOverrideHandler().isInputForcedDown((KeyBinding) (Object) this)) {
+        Boolean force = BaritoneAPI.getProvider().getPrimaryBaritone().getInputOverrideHandler().isInputForcedDown((KeyBinding) (Object) this);
-            cir.setReturnValue(true);
+        if (force != null) {
+            cir.setReturnValue(force); // :sunglasses:
+        }
+    }
+
+    @Inject(
+            method = "isPressed",
+            at = @At("HEAD"),
+            cancellable = true
+    )
+    private void isPressed(CallbackInfoReturnable<Boolean> cir) {
+        // only the primary baritone forces keys
+        Boolean force = BaritoneAPI.getProvider().getPrimaryBaritone().getInputOverrideHandler().isInputForcedDown((KeyBinding) (Object) this);
+        if (force != null && !force) { // <-- cursed
+            if (pressTime > 0) {
+                Helper.HELPER.logDirect("You're trying to press this mouse button but I won't let you");
+                pressTime--;
+            }
+            cir.setReturnValue(force); // :sunglasses:
         }
     }
 }

src/launch/java/baritone/launch/mixins/MixinMinecraft.java

@@ -96,15 +96,6 @@ public class MixinMinecraft {
 
     }
 
-    @Inject(
-            method = "processKeyBinds",
-            at = @At("HEAD")
-    )
-    private void runTickKeyboard(CallbackInfo ci) {
-        // keyboard input is only the primary baritone
-        BaritoneAPI.getProvider().getPrimaryBaritone().getGameEventHandler().onProcessKeyBinds();
-    }
-
     @Inject(
             method = "loadWorld(Lnet/minecraft/client/multiplayer/WorldClient;Ljava/lang/String;)V",
             at = @At("HEAD")
@@ -164,7 +155,7 @@ public class MixinMinecraft {
     )
     private void onBlockBreak(CallbackInfo ci, BlockPos pos) {
         // clickMouse is only for the main player
-        BaritoneAPI.getProvider().getPrimaryBaritone().getGameEventHandler().onBlockInteract(new BlockInteractEvent(pos, BlockInteractEvent.Type.BREAK));
+        BaritoneAPI.getProvider().getPrimaryBaritone().getGameEventHandler().onBlockInteract(new BlockInteractEvent(pos, BlockInteractEvent.Type.START_BREAK));
     }
 
     @Inject(

src/main/java/baritone/Baritone.java

@@ -22,10 +22,7 @@ import baritone.api.IBaritone;
 import baritone.api.Settings;
 import baritone.api.event.listener.IEventBus;
 import baritone.api.utils.IPlayerContext;
-import baritone.behavior.Behavior;
+import baritone.behavior.*;
-import baritone.behavior.LookBehavior;
-import baritone.behavior.MemoryBehavior;
-import baritone.behavior.PathingBehavior;
 import baritone.cache.WorldProvider;
 import baritone.event.GameEventHandler;
 import baritone.process.CustomGoalProcess;
@@ -110,6 +107,7 @@ public class Baritone implements IBaritone {
             pathingBehavior = new PathingBehavior(this);
             lookBehavior = new LookBehavior(this);
             memoryBehavior = new MemoryBehavior(this);
+            new InventoryBehavior(this);
             inputOverrideHandler = new InputOverrideHandler(this);
             new ExampleBaritoneControl(this);
         }
@@ -131,6 +129,7 @@ public class Baritone implements IBaritone {
         this.initialized = true;
     }
 
+    @Override
     public PathingControlManager getPathingControlManager() {
         return this.pathingControlManager;
     }
@@ -164,6 +163,10 @@ public class Baritone implements IBaritone {
         return this.playerContext;
     }
 
+    public MemoryBehavior getMemoryBehavior() {
+        return this.memoryBehavior;
+    }
+
     @Override
     public FollowProcess getFollowProcess() {
         return this.followProcess;
@@ -174,11 +177,6 @@ public class Baritone implements IBaritone {
         return this.lookBehavior;
     }
 
-    @Override
-    public MemoryBehavior getMemoryBehavior() {
-        return this.memoryBehavior;
-    }
-
     @Override
     public MineProcess getMineProcess() {
         return this.mineProcess;

src/main/java/baritone/behavior/InventoryBehavior.java

@@ -0,0 +1,90 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.behavior;
+
+import baritone.Baritone;
+import baritone.api.event.events.TickEvent;
+import baritone.utils.ToolSet;
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.inventory.ClickType;
+import net.minecraft.item.ItemPickaxe;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.ItemTool;
+import net.minecraft.util.NonNullList;
+
+public class InventoryBehavior extends Behavior {
+    public InventoryBehavior(Baritone baritone) {
+        super(baritone);
+    }
+
+    @Override
+    public void onTick(TickEvent event) {
+        if (!Baritone.settings().allowInventory.get()) {
+            return;
+        }
+        if (event.getType() == TickEvent.Type.OUT) {
+            return;
+        }
+        if (ctx.player().openContainer != ctx.player().inventoryContainer) {
+            // we have a crafting table or a chest or something open
+            return;
+        }
+        if (firstValidThrowaway() >= 9) { // aka there are none on the hotbar, but there are some in main inventory
+            swapWithHotBar(firstValidThrowaway(), 8);
+        }
+        int pick = bestToolAgainst(Blocks.STONE, ItemPickaxe.class);
+        if (pick >= 9) {
+            swapWithHotBar(pick, 0);
+        }
+    }
+
+    private void swapWithHotBar(int inInventory, int inHotbar) {
+        ctx.playerController().windowClick(ctx.player().inventoryContainer.windowId, inInventory < 9 ? inInventory + 36 : inInventory, inHotbar, ClickType.SWAP, ctx.player());
+    }
+
+    private int firstValidThrowaway() { // TODO offhand idk
+        NonNullList<ItemStack> invy = ctx.player().inventory.mainInventory;
+        for (int i = 0; i < invy.size(); i++) {
+            if (Baritone.settings().acceptableThrowawayItems.get().contains(invy.get(i).getItem())) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    private int bestToolAgainst(Block against, Class<? extends ItemTool> klass) {
+        NonNullList<ItemStack> invy = ctx.player().inventory.mainInventory;
+        int bestInd = -1;
+        double bestSpeed = -1;
+        for (int i = 0; i < invy.size(); i++) {
+            ItemStack stack = invy.get(i);
+            if (stack.isEmpty()) {
+                continue;
+            }
+            if (klass.isInstance(stack.getItem())) {
+                double speed = ToolSet.calculateSpeedVsBlock(stack, against.getDefaultState()); // takes into account enchants
+                if (speed > bestSpeed) {
+                    bestSpeed = speed;
+                    bestInd = i;
+                }
+            }
+        }
+        return bestInd;
+    }
+}

src/main/java/baritone/behavior/LookBehavior.java

@@ -95,6 +95,12 @@ public final class LookBehavior extends Behavior implements ILookBehavior {
         }
     }
 
+    public void pig() {
+        if (this.target != null) {
+            ctx.player().rotationYaw = this.target.getYaw();
+        }
+    }
+
     @Override
     public void onPlayerRotationMove(RotationMoveEvent event) {
         if (this.target != null && !this.force) {

src/main/java/baritone/behavior/MemoryBehavior.java

@@ -18,16 +18,18 @@
 package baritone.behavior;
 
 import baritone.Baritone;
-import baritone.api.behavior.IMemoryBehavior;
-import baritone.api.behavior.memory.IRememberedInventory;
-import baritone.api.cache.IWorldData;
 import baritone.api.event.events.BlockInteractEvent;
 import baritone.api.event.events.PacketEvent;
 import baritone.api.event.events.PlayerUpdateEvent;
+import baritone.api.event.events.TickEvent;
 import baritone.api.event.events.type.EventState;
+import baritone.cache.ContainerMemory;
 import baritone.cache.Waypoint;
+import baritone.pathing.movement.CalculationContext;
 import baritone.utils.BlockStateInterface;
+import net.minecraft.block.Block;
 import net.minecraft.block.BlockBed;
+import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.Packet;
 import net.minecraft.network.play.client.CPacketCloseWindow;
@@ -36,22 +38,39 @@ import net.minecraft.network.play.server.SPacketCloseWindow;
 import net.minecraft.network.play.server.SPacketOpenWindow;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityLockable;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.text.TextComponentTranslation;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.*;
 
 /**
+ * doesn't work for horse inventories :^)
+ *
  * @author Brady
  * @since 8/6/2018
  */
-public final class MemoryBehavior extends Behavior implements IMemoryBehavior {
+public final class MemoryBehavior extends Behavior {
 
-    private final Map<IWorldData, WorldDataContainer> worldDataContainers = new HashMap<>();
+    private final List<FutureInventory> futureInventories = new ArrayList<>(); // this is per-bot
+
+    private Integer enderChestWindowId; // nae nae
 
     public MemoryBehavior(Baritone baritone) {
         super(baritone);
     }
 
+    @Override
+    public synchronized void onTick(TickEvent event) {
+        if (event.getType() == TickEvent.Type.OUT) {
+            enderChestWindowId = null;
+            futureInventories.clear();
+        }
+    }
+
     @Override
     public synchronized void onPlayerUpdate(PlayerUpdateEvent event) {
         if (event.getState() == EventState.PRE) {
@@ -68,19 +87,29 @@ public final class MemoryBehavior extends Behavior implements IMemoryBehavior {
                 CPacketPlayerTryUseItemOnBlock packet = event.cast();
 
                 TileEntity tileEntity = ctx.world().getTileEntity(packet.getPos());
+                // if tileEntity is an ender chest, we don't need to do anything. ender chests are treated the same regardless of what coordinate right clicked
 
                 // Ensure the TileEntity is a container of some sort
                 if (tileEntity instanceof TileEntityLockable) {
 
                     TileEntityLockable lockable = (TileEntityLockable) tileEntity;
                     int size = lockable.getSizeInventory();
+                    BlockPos position = tileEntity.getPos();
+                    BlockPos adj = neighboringConnectedBlock(position);
+                    System.out.println(position + " " + adj);
+                    if (adj != null) {
+                        size *= 2; // double chest or double trapped chest
+                        if (adj.getX() < position.getX() || adj.getZ() < position.getZ()) {
+                            position = adj; // standardize on the lower coordinate, regardless of which side of the large chest we right clicked
+                        }
+                    }
 
-                    this.getCurrentContainer().futureInventories.add(new FutureInventory(System.nanoTime() / 1000000L, size, lockable.getGuiID(), tileEntity.getPos()));
+                    this.futureInventories.add(new FutureInventory(System.nanoTime() / 1000000L, size, lockable.getGuiID(), position));
                 }
             }
 
             if (p instanceof CPacketCloseWindow) {
-                updateInventory();
+                getCurrent().save();
             }
         }
     }
@@ -92,27 +121,29 @@ public final class MemoryBehavior extends Behavior implements IMemoryBehavior {
         if (event.getState() == EventState.PRE) {
             if (p instanceof SPacketOpenWindow) {
                 SPacketOpenWindow packet = event.cast();
-
-                WorldDataContainer container = this.getCurrentContainer();
-
                 // Remove any entries that were created over a second ago, this should make up for INSANE latency
-                container.futureInventories.removeIf(i -> System.nanoTime() / 1000000L - i.time > 1000);
+                futureInventories.removeIf(i -> System.nanoTime() / 1000000L - i.time > 1000);
 
-                container.futureInventories.stream()
+                System.out.println("Received packet " + packet.getGuiId() + " " + packet.getEntityId() + " " + packet.getSlotCount() + " " + packet.getWindowId());
+                System.out.println(packet.getWindowTitle());
+                if (packet.getWindowTitle() instanceof TextComponentTranslation && ((TextComponentTranslation) packet.getWindowTitle()).getKey().equals("container.enderchest")) {
+                    // title is not customized (i.e. this isn't just a renamed shulker)
+                    enderChestWindowId = packet.getWindowId();
+                    return;
+                }
+                futureInventories.stream()
                         .filter(i -> i.type.equals(packet.getGuiId()) && i.slots == packet.getSlotCount())
                         .findFirst().ifPresent(matched -> {
                     // Remove the future inventory
-                    container.futureInventories.remove(matched);
+                    futureInventories.remove(matched);
 
                     // Setup the remembered inventory
-                    RememberedInventory inventory = container.rememberedInventories.computeIfAbsent(matched.pos, pos -> new RememberedInventory());
+                    getCurrentContainer().setup(matched.pos, packet.getWindowId(), packet.getSlotCount());
-                    inventory.windowId = packet.getWindowId();
-                    inventory.size = packet.getSlotCount();
                 });
             }
 
             if (p instanceof SPacketCloseWindow) {
-                updateInventory();
+                getCurrent().save();
             }
         }
     }
@@ -129,43 +160,42 @@ public final class MemoryBehavior extends Behavior implements IMemoryBehavior {
         baritone.getWorldProvider().getCurrentWorld().getWaypoints().addWaypoint(new Waypoint("death", Waypoint.Tag.DEATH, ctx.playerFeet()));
     }
 
-    private Optional<RememberedInventory> getInventoryFromWindow(int windowId) {
-        return this.getCurrentContainer().rememberedInventories.values().stream().filter(i -> i.windowId == windowId).findFirst();
-    }
 
     private void updateInventory() {
-        getInventoryFromWindow(ctx.player().openContainer.windowId).ifPresent(inventory -> {
+        int windowId = ctx.player().openContainer.windowId;
-            inventory.items.clear();
+        if (enderChestWindowId != null) {
-            inventory.items.addAll(ctx.player().openContainer.getInventory().subList(0, inventory.size));
+            if (windowId == enderChestWindowId) {
-        });
+                getCurrent().contents = ctx.player().openContainer.getInventory().subList(0, 27);
+            } else {
+                getCurrent().save();
+                enderChestWindowId = null;
+            }
+        }
+        if (getCurrentContainer() != null) {
+            getCurrentContainer().getInventoryFromWindow(windowId).ifPresent(inventory -> inventory.updateFromOpenWindow(ctx));
+        }
     }
 
-    private WorldDataContainer getCurrentContainer() {
+    private ContainerMemory getCurrentContainer() {
-        return this.worldDataContainers.computeIfAbsent(baritone.getWorldProvider().getCurrentWorld(), data -> new WorldDataContainer());
+        if (baritone.getWorldProvider().getCurrentWorld() == null) {
+            return null;
+        }
+        return (ContainerMemory) baritone.getWorldProvider().getCurrentWorld().getContainerMemory();
     }
 
-    @Override
+    private BlockPos neighboringConnectedBlock(BlockPos in) {
-    public final synchronized RememberedInventory getInventoryByPos(BlockPos pos) {
+        BlockStateInterface bsi = new CalculationContext(baritone).bsi;
-        return this.getCurrentContainer().rememberedInventories.get(pos);
+        Block block = bsi.get0(in).getBlock();
-    }
+        if (block != Blocks.TRAPPED_CHEST && block != Blocks.CHEST) {
-
+            return null; // other things that have contents, but can be placed adjacent without combining
-    @Override
+        }
-    public final synchronized Map<BlockPos, IRememberedInventory> getRememberedInventories() {
+        for (int i = 0; i < 4; i++) {
-        // make a copy since this map is modified from the packet thread
+            BlockPos adj = in.offset(EnumFacing.byHorizontalIndex(i));
-        return new HashMap<>(this.getCurrentContainer().rememberedInventories);
+            if (bsi.get0(adj).getBlock() == block) {
-    }
+                return adj;
-
+            }
-    private static final class WorldDataContainer {
+        }
-
+        return null;
-        /**
-         * Possible future inventories that we will be able to remember
-         */
-        private final List<FutureInventory> futureInventories = new ArrayList<>();
-
-        /**
-         * The current remembered inventories
-         */
-        private final Map<BlockPos, RememberedInventory> rememberedInventories = new HashMap<>();
     }
 
     /**
@@ -198,43 +228,51 @@ public final class MemoryBehavior extends Behavior implements IMemoryBehavior {
             this.slots = slots;
             this.type = type;
             this.pos = pos;
+            System.out.println("Future inventory created " + time + " " + slots + " " + type + " " + pos);
         }
     }
 
-    /**
+    public Optional<List<ItemStack>> echest() {
-     * An inventory that we are aware of.
+        return Optional.ofNullable(getCurrent().contents).map(Collections::unmodifiableList);
-     * <p>
+    }
-     * Associated with a {@link BlockPos} in {@link WorldDataContainer#rememberedInventories}.
-     */
-    public static class RememberedInventory implements IRememberedInventory {
 
-        /**
+    public EnderChestMemory getCurrent() {
-         * The list of items in the inventory
+        Path path = baritone.getWorldProvider().getCurrentWorld().directory;
-         */
+        return EnderChestMemory.getByServerAndPlayer(path.getParent(), ctx.player().getUniqueID());
-        private final List<ItemStack> items;
+    }
 
-        /**
+    public static class EnderChestMemory {
-         * The last known window ID of the inventory
+        private static final Map<Path, EnderChestMemory> memory = new HashMap<>();
-         */
+        private final Path enderChest;
-        private int windowId;
+        private List<ItemStack> contents;
 
-        /**
+        private EnderChestMemory(Path enderChest) {
-         * The size of the inventory
+            this.enderChest = enderChest;
-         */
+            System.out.println("Echest storing in " + enderChest);
-        private int size;
+            try {
-
+                this.contents = ContainerMemory.readItemStacks(Files.readAllBytes(enderChest));
-        private RememberedInventory() {
+            } catch (IOException e) {
-            this.items = new ArrayList<>();
+                e.printStackTrace();
+                System.out.println("CANNOT read echest =( =(");
+                this.contents = null;
+            }
         }
 
-        @Override
+        public synchronized void save() {
-        public final List<ItemStack> getContents() {
+            System.out.println("Saving");
-            return Collections.unmodifiableList(this.items);
+            if (contents != null) {
+                try {
+                    enderChest.getParent().toFile().mkdir();
+                    Files.write(enderChest, ContainerMemory.writeItemStacks(contents));
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    System.out.println("CANNOT save echest =( =(");
+                }
+            }
         }
 
-        @Override
+        private static synchronized EnderChestMemory getByServerAndPlayer(Path serverStorage, UUID player) {
-        public final int getSize() {
+            return memory.computeIfAbsent(serverStorage.resolve("echests").resolve(player.toString()), EnderChestMemory::new);
-            return this.size;
         }
     }
 }

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

@@ -19,10 +19,7 @@ package baritone.behavior;
 
 import baritone.Baritone;
 import baritone.api.behavior.IPathingBehavior;
-import baritone.api.event.events.PathEvent;
+import baritone.api.event.events.*;
-import baritone.api.event.events.PlayerUpdateEvent;
-import baritone.api.event.events.RenderEvent;
-import baritone.api.event.events.TickEvent;
 import baritone.api.pathing.calc.IPath;
 import baritone.api.pathing.goals.Goal;
 import baritone.api.pathing.goals.GoalXZ;
@@ -33,16 +30,17 @@ import baritone.pathing.calc.AStarPathFinder;
 import baritone.pathing.calc.AbstractNodeCostSearch;
 import baritone.pathing.movement.CalculationContext;
 import baritone.pathing.movement.MovementHelper;
-import baritone.pathing.path.CutoffPath;
 import baritone.pathing.path.PathExecutor;
 import baritone.utils.Helper;
 import baritone.utils.PathRenderer;
+import baritone.utils.pathing.Favoring;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.chunk.EmptyChunk;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.LinkedBlockingQueue;
-import java.util.stream.Collectors;
 
 public final class PathingBehavior extends Behavior implements IPathingBehavior, Helper {
 
@@ -95,6 +93,13 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
         dispatchEvents();
     }
 
+    @Override
+    public void onPlayerSprintState(SprintStateEvent event) {
+        if (current != null) {
+            event.setState(current.isSprinting());
+        }
+    }
+
     private void tickPath() {
         if (pauseRequestedLastTick && safeToCancel) {
             pauseRequestedLastTick = false;
@@ -119,7 +124,7 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
                     next = null;
                     return;
                 }
-                if (next != null && !next.getPath().positions().contains(ctx.playerFeet())) {
+                if (next != null && !next.getPath().positions().contains(ctx.playerFeet()) && !next.getPath().positions().contains(pathStart())) { // can contain either one
                     // if the current path failed, we may not actually be on the next one, so make sure
                     logDebug("Discarding next path as it does not contain current position");
                     // for example if we had a nicely planned ahead path that starts where current ends
@@ -135,16 +140,27 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
                     queuePathEvent(PathEvent.CONTINUING_ONTO_PLANNED_NEXT);
                     current = next;
                     next = null;
-                    current.onTick();
+                    current.onTick(); // don't waste a tick doing nothing, get started right away
                     return;
                 }
                 // at this point, current just ended, but we aren't in the goal and have no plan for the future
                 synchronized (pathCalcLock) {
                     if (inProgress != null) {
-                        queuePathEvent(PathEvent.PATH_FINISHED_NEXT_STILL_CALCULATING);
+                        // we are calculating
-                        // if we aren't calculating right now
+                        // are we calculating the right thing though? 🤔
-                        return;
+                        BetterBlockPos calcFrom = inProgress.getStart();
+                        // if current just succeeded, we should be standing in calcFrom, so that's cool and good
+                        // but if current just failed, we should discard this calculation since it doesn't start from where we're standing
+                        if (calcFrom.equals(ctx.playerFeet()) || calcFrom.equals(pathStart())) {
+                            // cool and good
+                            queuePathEvent(PathEvent.PATH_FINISHED_NEXT_STILL_CALCULATING);
+                            return;
+                        }
+                        // oh noes
+                        inProgress.cancel(); // cancellation doesn't dispatch any events
+                        inProgress = null; // this is safe since we hold both locks
                     }
+                    // we aren't calculating
                     queuePathEvent(PathEvent.CALC_STARTED);
                     findPathInNewThread(pathStart(), true);
                 }
@@ -174,11 +190,11 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
                     return;
                 }
                 if (goal == null || goal.isInGoal(current.getPath().getDest())) {
-                    // and this path dosen't get us all the way there
+                    // and this path doesn't get us all the way there
                     return;
                 }
                 if (ticksRemainingInSegment().get() < Baritone.settings().planningTickLookAhead.get()) {
-                    // and this path has 5 seconds or less left
+                    // and this path has 7.5 seconds or less left
                     logDebug("Path almost over. Planning ahead...");
                     queuePathEvent(PathEvent.NEXT_SEGMENT_CALC_STARTED);
                     findPathInNewThread(current.getPath().getDest(), false);
@@ -204,14 +220,6 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
         }
     }
 
-    @Override
-    public Optional<Double> ticksRemainingInSegment() {
-        if (current == null) {
-            return Optional.empty();
-        }
-        return Optional.of(current.getPath().ticksRemainingFrom(current.getPosition()));
-    }
-
     public void secretInternalSetGoal(Goal goal) {
         this.goal = goal;
     }
@@ -241,11 +249,6 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
         return Optional.ofNullable(inProgress);
     }
 
-    @Override
-    public boolean isPathing() {
-        return this.current != null;
-    }
-
     public boolean isSafeToCancel() {
         return current == null || safeToCancel;
     }
@@ -268,7 +271,7 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
         if (doIt) {
             secretInternalSegmentCancel();
         }
-        baritone.getPathingControlManager().cancelEverything();
+        baritone.getPathingControlManager().cancelEverything(); // regardless of if we can stop the current segment, we can still stop the processes
         return doIt;
     }
 
@@ -277,11 +280,13 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
     }
 
     public void softCancelIfSafe() {
-        if (!isSafeToCancel()) {
+        synchronized (pathPlanLock) {
-            return;
+            if (!isSafeToCancel()) {
+                return;
+            }
+            current = null;
+            next = null;
         }
-        current = null;
-        next = null;
         cancelRequested = true;
         getInProgress().ifPresent(AbstractNodeCostSearch::cancel); // only cancel ours
         // do everything BUT clear keys
@@ -290,8 +295,10 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
     // just cancel the current path
     public void secretInternalSegmentCancel() {
         queuePathEvent(PathEvent.CANCELED);
-        current = null;
+        synchronized (pathPlanLock) {
-        next = null;
+            current = null;
+            next = null;
+        }
         baritone.getInputOverrideHandler().clearAllKeys();
         getInProgress().ifPresent(AbstractNodeCostSearch::cancel);
         baritone.getInputOverrideHandler().getBlockBreakHelper().stopBreakingBlock();
@@ -300,7 +307,9 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
     public void forceCancel() { // NOT exposed on public api
         cancelEverything();
         secretInternalSegmentCancel();
-        inProgress = null;
+        synchronized (pathCalcLock) {
+            inProgress = null;
+        }
     }
 
     /**
@@ -330,12 +339,18 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
         }
     }
 
+    public void secretCursedFunctionDoNotCall(IPath path) {
+        synchronized (pathPlanLock) {
+            current = new PathExecutor(this, path);
+        }
+    }
+
     /**
      * See issue #209
      *
      * @return The starting {@link BlockPos} for a new path
      */
-    public BlockPos pathStart() { // TODO move to a helper or util class
+    public BetterBlockPos pathStart() { // TODO move to a helper or util class
         BetterBlockPos feet = ctx.playerFeet();
         if (!MovementHelper.canWalkOn(ctx, feet.down())) {
             if (ctx.player().onGround) {
@@ -405,9 +420,9 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
             primaryTimeout = Baritone.settings().planAheadPrimaryTimeoutMS.get();
             failureTimeout = Baritone.settings().planAheadFailureTimeoutMS.get();
         }
-        CalculationContext context = new CalculationContext(baritone); // not safe to create on the other thread, it looks up a lot of stuff in minecraft
+        CalculationContext context = new CalculationContext(baritone, true); // not safe to create on the other thread, it looks up a lot of stuff in minecraft
         AbstractNodeCostSearch pathfinder = createPathfinder(start, goal, current == null ? null : current.getPath(), context);
-        if (!Objects.equals(pathfinder.getGoal(), goal)) {
+        if (!Objects.equals(pathfinder.getGoal(), goal)) { // will return the exact same object if simplification didn't happen
             logDebug("Simplifying " + goal.getClass() + " to GoalXZ due to distance");
         }
         inProgress = pathfinder;
@@ -417,33 +432,8 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
             }
 
             PathCalculationResult calcResult = pathfinder.calculate(primaryTimeout, failureTimeout);
-            Optional<IPath> path = calcResult.getPath();
-            if (Baritone.settings().cutoffAtLoadBoundary.get()) {
-                path = path.map(p -> {
-                    IPath result = p.cutoffAtLoadedChunks(context.world());
-
-                    if (result instanceof CutoffPath) {
-                        logDebug("Cutting off path at edge of loaded chunks");
-                        logDebug("Length decreased by " + (p.length() - result.length()));
-                    } else {
-                        logDebug("Path ends within loaded chunks");
-                    }
-
-                    return result;
-                });
-            }
-
-            Optional<PathExecutor> executor = path.map(p -> {
-                IPath result = p.staticCutoff(goal);
-
-                if (result instanceof CutoffPath) {
-                    logDebug("Static cutoff " + p.length() + " to " + result.length());
-                }
-
-                return result;
-            }).map(p -> new PathExecutor(this, p));
-
             synchronized (pathPlanLock) {
+                Optional<PathExecutor> executor = calcResult.getPath().map(p -> new PathExecutor(PathingBehavior.this, p));
                 if (current == null) {
                     if (executor.isPresent()) {
                         queuePathEvent(PathEvent.CALC_FINISHED_NOW_EXECUTING);
@@ -463,7 +453,9 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
                             queuePathEvent(PathEvent.NEXT_CALC_FAILED);
                         }
                     } else {
-                        throw new IllegalStateException("I have no idea what to do with this path");
+                        //throw new IllegalStateException("I have no idea what to do with this path");
+                        // no point in throwing an exception here, and it gets it stuck with inProgress being not null
+                        logDirect("Warning: PathingBehaivor illegal state! Discarding invalid path!");
                     }
                 }
                 if (talkAboutIt && current != null && current.getPath() != null) {
@@ -484,15 +476,12 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
         Goal transformed = goal;
         if (Baritone.settings().simplifyUnloadedYCoord.get() && goal instanceof IGoalRenderPos) {
             BlockPos pos = ((IGoalRenderPos) goal).getGoalPos();
-            if (context.world().getChunk(pos) instanceof EmptyChunk) {
+            if (!context.bsi.worldContainsLoadedChunk(pos.getX(), pos.getZ())) {
                 transformed = new GoalXZ(pos.getX(), pos.getZ());
             }
         }
-        HashSet<Long> favoredPositions = null;
+        Favoring favoring = new Favoring(context.getBaritone().getPlayerContext(), previous);
-        if (Baritone.settings().backtrackCostFavoringCoefficient.get() != 1D && previous != null) {
+        return new AStarPathFinder(start.getX(), start.getY(), start.getZ(), transformed, favoring, context);
-            favoredPositions = previous.positions().stream().map(BetterBlockPos::longHash).collect(Collectors.toCollection(HashSet::new));
-        }
-        return new AStarPathFinder(start.getX(), start.getY(), start.getZ(), transformed, favoredPositions, context);
     }
 
     @Override

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

@@ -35,7 +35,7 @@ public final class CachedChunk {
 
     static {
         HashSet<Block> temp = new HashSet<>();
-        temp.add(Blocks.DIAMOND_ORE);
+        //temp.add(Blocks.DIAMOND_ORE);
         temp.add(Blocks.DIAMOND_BLOCK);
         //temp.add(Blocks.COAL_ORE);
         temp.add(Blocks.COAL_BLOCK);

src/main/java/baritone/cache/CachedWorld.java

@@ -179,8 +179,8 @@ public final class CachedWorld implements ICachedWorld, Helper {
             if (region == null) {
                 continue;
             }
-            int distX = (region.getX() * 512 + 256) - pruneCenter.getX();
+            int distX = (region.getX() << 9 + 256) - pruneCenter.getX();
-            int distZ = (region.getZ() * 512 + 256) - pruneCenter.getZ();
+            int distZ = (region.getZ() << 9 + 256) - pruneCenter.getZ();
             double dist = Math.sqrt(distX * distX + distZ * distZ);
             if (dist > 1024) {
                 logDebug("Deleting cached region " + region.getX() + "," + region.getZ() + " from ram");
@@ -215,7 +215,7 @@ public final class CachedWorld implements ICachedWorld, Helper {
         if (mostRecentlyModified == null) {
             return new BlockPos(0, 0, 0);
         }
-        return new BlockPos(mostRecentlyModified.x * 16 + 8, 0, mostRecentlyModified.z * 16 + 8);
+        return new BlockPos(mostRecentlyModified.x << 4 + 8, 0, mostRecentlyModified.z << 4 + 8);
     }
 
     private synchronized List<CachedRegion> allRegions() {
@@ -255,6 +255,10 @@ public final class CachedWorld implements ICachedWorld, Helper {
         });
     }
 
+    public void tryLoadFromDisk(int regionX, int regionZ) {
+        getOrCreateRegion(regionX, regionZ);
+    }
+
     /**
      * Returns the region ID based on the region coordinates. 0 will be
      * returned if the specified region coordinates are out of bounds.

src/main/java/baritone/cache/ChunkPacker.java

@@ -39,6 +39,8 @@ import java.util.*;
  */
 public final class ChunkPacker {
 
+    private static final Map<String, Block> resourceCache = new HashMap<>();
+
     private ChunkPacker() {}
 
     public static CachedChunk pack(Chunk chunk) {
@@ -91,10 +93,7 @@ public final class ChunkPacker {
         IBlockState[] blocks = new IBlockState[256];
 
         for (int z = 0; z < 16; z++) {
-            // @formatter:off
+            https://www.ibm.com/developerworks/library/j-perry-writing-good-java-code/index.html
-            https:
-//www.ibm.com/developerworks/library/j-perry-writing-good-java-code/index.html
-            // @formatter:on
             for (int x = 0; x < 16; x++) {
                 for (int y = 255; y >= 0; y--) {
                     int index = CachedChunk.getPositionIndex(x, y, z);
@@ -120,7 +119,7 @@ public final class ChunkPacker {
     }
 
     public static Block stringToBlock(String name) {
-        return Block.getBlockFromName(name.contains(":") ? name : "minecraft:" + name);
+        return resourceCache.computeIfAbsent(name, n -> Block.getBlockFromName(n.contains(":") ? n : "minecraft:" + n));
     }
 
     private static PathingBlockType getPathingBlockType(IBlockState state) {

src/main/java/baritone/cache/ContainerMemory.java

@@ -0,0 +1,176 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.cache;
+
+import baritone.api.cache.IContainerMemory;
+import baritone.api.cache.IRememberedInventory;
+import baritone.api.utils.IPlayerContext;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.util.math.BlockPos;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.*;
+
+public class ContainerMemory implements IContainerMemory {
+
+    private final Path saveTo;
+    /**
+     * The current remembered inventories
+     */
+    private final Map<BlockPos, RememberedInventory> inventories = new HashMap<>();
+
+
+    public ContainerMemory(Path saveTo) {
+        this.saveTo = saveTo;
+        try {
+            read(Files.readAllBytes(saveTo));
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            inventories.clear();
+        }
+    }
+
+    private void read(byte[] bytes) throws IOException {
+        PacketBuffer in = new PacketBuffer(Unpooled.wrappedBuffer(bytes));
+        int chests = in.readInt();
+        for (int i = 0; i < chests; i++) {
+            int x = in.readInt();
+            int y = in.readInt();
+            int z = in.readInt();
+            RememberedInventory rem = new RememberedInventory();
+            rem.items.addAll(readItemStacks(in));
+            rem.size = rem.items.size();
+            rem.windowId = -1;
+            if (rem.items.isEmpty()) {
+                continue; // this only happens if the list has no elements, not if the list has elements that are all empty item stacks
+            }
+            inventories.put(new BlockPos(x, y, z), rem);
+        }
+    }
+
+    public synchronized void save() throws IOException {
+        ByteBuf buf = Unpooled.buffer(0, Integer.MAX_VALUE);
+        PacketBuffer out = new PacketBuffer(buf);
+        out.writeInt(inventories.size());
+        for (Map.Entry<BlockPos, RememberedInventory> entry : inventories.entrySet()) {
+            out = new PacketBuffer(out.writeInt(entry.getKey().getX()));
+            out = new PacketBuffer(out.writeInt(entry.getKey().getY()));
+            out = new PacketBuffer(out.writeInt(entry.getKey().getZ()));
+            out = writeItemStacks(entry.getValue().getContents(), out);
+        }
+        Files.write(saveTo, out.array());
+    }
+
+    public synchronized void setup(BlockPos pos, int windowId, int slotCount) {
+        RememberedInventory inventory = inventories.computeIfAbsent(pos, x -> new RememberedInventory());
+        inventory.windowId = windowId;
+        inventory.size = slotCount;
+    }
+
+    public synchronized Optional<RememberedInventory> getInventoryFromWindow(int windowId) {
+        return inventories.values().stream().filter(i -> i.windowId == windowId).findFirst();
+    }
+
+    @Override
+    public final synchronized RememberedInventory getInventoryByPos(BlockPos pos) {
+        return inventories.get(pos);
+    }
+
+    @Override
+    public final synchronized Map<BlockPos, IRememberedInventory> getRememberedInventories() {
+        // make a copy since this map is modified from the packet thread
+        return new HashMap<>(inventories);
+    }
+
+    public static List<ItemStack> readItemStacks(byte[] bytes) throws IOException {
+        PacketBuffer in = new PacketBuffer(Unpooled.wrappedBuffer(bytes));
+        return readItemStacks(in);
+    }
+
+    public static List<ItemStack> readItemStacks(PacketBuffer in) throws IOException {
+        int count = in.readInt();
+        List<ItemStack> result = new ArrayList<>();
+        for (int i = 0; i < count; i++) {
+            result.add(in.readItemStack());
+        }
+        return result;
+    }
+
+    public static byte[] writeItemStacks(List<ItemStack> write) {
+        ByteBuf buf = Unpooled.buffer(0, Integer.MAX_VALUE);
+        PacketBuffer out = new PacketBuffer(buf);
+        out = writeItemStacks(write, out);
+        return out.array();
+    }
+
+    public static PacketBuffer writeItemStacks(List<ItemStack> write, PacketBuffer out2) {
+        PacketBuffer out = out2; // avoid reassigning an argument LOL
+        out = new PacketBuffer(out.writeInt(write.size()));
+        for (ItemStack stack : write) {
+            out = out.writeItemStack(stack);
+        }
+        return out;
+    }
+
+    /**
+     * An inventory that we are aware of.
+     * <p>
+     * Associated with a {@link BlockPos} in {@link ContainerMemory#inventories}.
+     */
+    public static class RememberedInventory implements IRememberedInventory {
+
+        /**
+         * The list of items in the inventory
+         */
+        private final List<ItemStack> items;
+
+        /**
+         * The last known window ID of the inventory
+         */
+        private int windowId;
+
+        /**
+         * The size of the inventory
+         */
+        private int size;
+
+        private RememberedInventory() {
+            this.items = new ArrayList<>();
+        }
+
+        @Override
+        public final List<ItemStack> getContents() {
+            return Collections.unmodifiableList(this.items);
+        }
+
+        @Override
+        public final int getSize() {
+            return this.size;
+        }
+
+        public void updateFromOpenWindow(IPlayerContext ctx) {
+            items.clear();
+            items.addAll(ctx.player().openContainer.getInventory().subList(0, size));
+        }
+    }
+}

src/main/java/baritone/cache/WaypointCollection.java

@@ -32,7 +32,7 @@ import java.util.stream.Collectors;
  *
  * @author leijurv
  */
-public class Waypoints implements IWaypointCollection {
+public class WaypointCollection implements IWaypointCollection {
 
     /**
      * Magic value to detect invalid waypoint files
@@ -42,7 +42,7 @@ public class Waypoints implements IWaypointCollection {
     private final Path directory;
     private final Map<IWaypoint.Tag, Set<IWaypoint>> waypoints;
 
-    Waypoints(Path directory) {
+    WaypointCollection(Path directory) {
         this.directory = directory;
         if (!Files.exists(directory)) {
             try {

src/main/java/baritone/cache/WorldData.java

@@ -19,9 +19,11 @@ package baritone.cache;
 
 import baritone.Baritone;
 import baritone.api.cache.ICachedWorld;
+import baritone.api.cache.IContainerMemory;
 import baritone.api.cache.IWaypointCollection;
 import baritone.api.cache.IWorldData;
 
+import java.io.IOException;
 import java.nio.file.Path;
 
 /**
@@ -32,7 +34,8 @@ import java.nio.file.Path;
 public class WorldData implements IWorldData {
 
     public final CachedWorld cache;
-    private final Waypoints waypoints;
+    private final WaypointCollection waypoints;
+    private final ContainerMemory containerMemory;
     //public final MapData map;
     public final Path directory;
     public final int dimension;
@@ -40,7 +43,8 @@ public class WorldData implements IWorldData {
     WorldData(Path directory, int dimension) {
         this.directory = directory;
         this.cache = new CachedWorld(directory.resolve("cache"), dimension);
-        this.waypoints = new Waypoints(directory.resolve("waypoints"));
+        this.waypoints = new WaypointCollection(directory.resolve("waypoints"));
+        this.containerMemory = new ContainerMemory(directory.resolve("containers"));
         this.dimension = dimension;
     }
 
@@ -49,6 +53,15 @@ public class WorldData implements IWorldData {
             System.out.println("Started saving the world in a new thread");
             cache.save();
         });
+        Baritone.getExecutor().execute(() -> {
+            System.out.println("Started saving saved containers in a new thread");
+            try {
+                containerMemory.save();
+            } catch (IOException e) {
+                e.printStackTrace();
+                System.out.println("Failed to save saved containers");
+            }
+        });
     }
 
     @Override
@@ -60,4 +73,9 @@ public class WorldData implements IWorldData {
     public IWaypointCollection getWaypoints() {
         return this.waypoints;
     }
+
+    @Override
+    public IContainerMemory getContainerMemory() {
+        return this.containerMemory;
+    }
 }

src/main/java/baritone/cache/WorldProvider.java

@@ -24,6 +24,7 @@ import baritone.utils.accessor.IAnvilChunkLoader;
 import baritone.utils.accessor.IChunkProviderServer;
 import net.minecraft.server.integrated.IntegratedServer;
 import net.minecraft.world.WorldServer;
+import org.apache.commons.lang3.SystemUtils;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -76,7 +77,11 @@ public class WorldProvider implements IWorldProvider, Helper {
             directory = new File(directory, "baritone");
             readme = directory;
         } else { // Otherwise, the server must be remote...
-            directory = new File(Baritone.getDir(), mc.getCurrentServerData().serverIP);
+            String folderName = mc.getCurrentServerData().serverIP;
+            if (SystemUtils.IS_OS_WINDOWS) {
+                folderName = folderName.replace(":", "_");
+            }
+            directory = new File(Baritone.getDir(), folderName);
             readme = Baritone.getDir();
         }
 
@@ -95,7 +100,9 @@ public class WorldProvider implements IWorldProvider, Helper {
         }
 
         System.out.println("Baritone world data dir: " + dir);
-        this.currentWorld = worldCache.computeIfAbsent(dir, d -> new WorldData(d, dimension));
+        synchronized (worldCache) {
+            this.currentWorld = worldCache.computeIfAbsent(dir, d -> new WorldData(d, dimension));
+        }
     }
 
     public final void closeWorld() {

src/main/java/baritone/cache/WorldScanner.java

@@ -23,11 +23,14 @@ import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.multiplayer.ChunkProviderClient;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.chunk.BlockStateContainer;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
 
-import java.util.LinkedList;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 public enum WorldScanner implements IWorldScanner {
@@ -39,7 +42,7 @@ public enum WorldScanner implements IWorldScanner {
         if (blocks.contains(null)) {
             throw new IllegalStateException("Invalid block name should have been caught earlier: " + blocks.toString());
         }
-        LinkedList<BlockPos> res = new LinkedList<>();
+        ArrayList<BlockPos> res = new ArrayList<>();
         if (blocks.isEmpty()) {
             return res;
         }
@@ -69,33 +72,7 @@ public enum WorldScanner implements IWorldScanner {
                         continue;
                     }
                     allUnloaded = false;
-                    ExtendedBlockStorage[] chunkInternalStorageArray = chunk.getBlockStorageArray();
+                    scanChunkInto(chunkX << 4, chunkZ << 4, chunk, blocks, res, max, yLevelThreshold, playerY);
-                    chunkX = chunkX << 4;
-                    chunkZ = chunkZ << 4;
-                    for (int y0 = 0; y0 < 16; y0++) {
-                        ExtendedBlockStorage extendedblockstorage = chunkInternalStorageArray[y0];
-                        if (extendedblockstorage == null) {
-                            continue;
-                        }
-                        int yReal = y0 << 4;
-                        BlockStateContainer bsc = extendedblockstorage.getData();
-                        // the mapping of BlockStateContainer.getIndex from xyz to index is y << 8 | z << 4 | x;
-                        // for better cache locality, iterate in that order
-                        for (int y = 0; y < 16; y++) {
-                            for (int z = 0; z < 16; z++) {
-                                for (int x = 0; x < 16; x++) {
-                                    IBlockState state = bsc.get(x, y, z);
-                                    if (blocks.contains(state.getBlock())) {
-                                        int yy = yReal | y;
-                                        res.add(new BlockPos(chunkX | x, yy, chunkZ | z));
-                                        if (Math.abs(yy - playerY) < yLevelThreshold) {
-                                            foundWithinY = true;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
                 }
             }
             if ((allUnloaded && foundChunks)
@@ -107,4 +84,51 @@ public enum WorldScanner implements IWorldScanner {
             searchRadiusSq++;
         }
     }
+
+    @Override
+    public List<BlockPos> scanChunk(IPlayerContext ctx, List<Block> blocks, ChunkPos pos, int max, int yLevelThreshold) {
+        if (blocks.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        ChunkProviderClient chunkProvider = (ChunkProviderClient) ctx.world().getChunkProvider();
+        Chunk chunk = chunkProvider.getLoadedChunk(pos.x, pos.z);
+        int playerY = ctx.playerFeet().getY();
+
+        if (chunk == null || chunk.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        ArrayList<BlockPos> res = new ArrayList<>();
+        scanChunkInto(pos.x << 4, pos.z << 4, chunk, blocks, res, max, yLevelThreshold, playerY);
+        return res;
+    }
+
+    public void scanChunkInto(int chunkX, int chunkZ, Chunk chunk, List<Block> search, Collection<BlockPos> result, int max, int yLevelThreshold, int playerY) {
+        ExtendedBlockStorage[] chunkInternalStorageArray = chunk.getBlockStorageArray();
+        for (int y0 = 0; y0 < 16; y0++) {
+            ExtendedBlockStorage extendedblockstorage = chunkInternalStorageArray[y0];
+            if (extendedblockstorage == null) {
+                continue;
+            }
+            int yReal = y0 << 4;
+            BlockStateContainer bsc = extendedblockstorage.getData();
+            // the mapping of BlockStateContainer.getIndex from xyz to index is y << 8 | z << 4 | x;
+            // for better cache locality, iterate in that order
+            for (int y = 0; y < 16; y++) {
+                for (int z = 0; z < 16; z++) {
+                    for (int x = 0; x < 16; x++) {
+                        IBlockState state = bsc.get(x, y, z);
+                        if (search.contains(state.getBlock())) {
+                            int yy = yReal | y;
+                            result.add(new BlockPos(chunkX | x, yy, chunkZ | z));
+                            if (result.size() >= max && Math.abs(yy - playerY) < yLevelThreshold) {
+                                return;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
 }

src/main/java/baritone/event/GameEventHandler.java

@@ -54,11 +54,6 @@ public final class GameEventHandler implements IEventBus, Helper {
         listeners.forEach(l -> l.onPlayerUpdate(event));
     }
 
-    @Override
-    public final void onProcessKeyBinds() {
-        listeners.forEach(IGameEventListener::onProcessKeyBinds);
-    }
-
     @Override
     public final void onSendChatMessage(ChatEvent event) {
         listeners.forEach(l -> l.onSendChatMessage(event));
@@ -126,6 +121,11 @@ public final class GameEventHandler implements IEventBus, Helper {
         listeners.forEach(l -> l.onPlayerRotationMove(event));
     }
 
+    @Override
+    public void onPlayerSprintState(SprintStateEvent event) {
+        listeners.forEach(l -> l.onPlayerSprintState(event));
+    }
+
     @Override
     public void onBlockInteract(BlockInteractEvent event) {
         listeners.forEach(l -> l.onBlockInteract(event));

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

@@ -25,11 +25,10 @@ import baritone.api.utils.BetterBlockPos;
 import baritone.pathing.calc.openset.BinaryHeapOpenSet;
 import baritone.pathing.movement.CalculationContext;
 import baritone.pathing.movement.Moves;
-import baritone.utils.Helper;
 import baritone.utils.pathing.BetterWorldBorder;
+import baritone.utils.pathing.Favoring;
 import baritone.utils.pathing.MutableMoveResult;
 
-import java.util.HashSet;
 import java.util.Optional;
 
 /**
@@ -37,14 +36,14 @@ import java.util.Optional;
  *
  * @author leijurv
  */
-public final class AStarPathFinder extends AbstractNodeCostSearch implements Helper {
+public final class AStarPathFinder extends AbstractNodeCostSearch {
 
-    private final HashSet<Long> favoredPositions;
+    private final Favoring favoring;
     private final CalculationContext calcContext;
 
-    public AStarPathFinder(int startX, int startY, int startZ, Goal goal, HashSet<Long> favoredPositions, CalculationContext context) {
+    public AStarPathFinder(int startX, int startY, int startZ, Goal goal, Favoring favoring, CalculationContext context) {
         super(startX, startY, startZ, goal, context);
-        this.favoredPositions = favoredPositions;
+        this.favoring = favoring;
         this.calcContext = context;
     }
 
@@ -55,17 +54,14 @@ public final class AStarPathFinder extends AbstractNodeCostSearch implements Hel
         startNode.combinedCost = startNode.estimatedCostToGoal;
         BinaryHeapOpenSet openSet = new BinaryHeapOpenSet();
         openSet.insert(startNode);
-        startNode.isOpen = true;
+        double[] bestHeuristicSoFar = new double[COEFFICIENTS.length];//keep track of the best node by the metric of (estimatedCostToGoal + cost / COEFFICIENTS[i])
-        bestSoFar = new PathNode[COEFFICIENTS.length];//keep track of the best node by the metric of (estimatedCostToGoal + cost / COEFFICIENTS[i])
-        double[] bestHeuristicSoFar = new double[COEFFICIENTS.length];
         for (int i = 0; i < bestHeuristicSoFar.length; i++) {
             bestHeuristicSoFar[i] = startNode.estimatedCostToGoal;
             bestSoFar[i] = startNode;
         }
         MutableMoveResult res = new MutableMoveResult();
-        HashSet<Long> favored = favoredPositions;
+        BetterWorldBorder worldBorder = new BetterWorldBorder(calcContext.world.getWorldBorder());
-        BetterWorldBorder worldBorder = new BetterWorldBorder(calcContext.world().getWorldBorder());
+        long startTime = System.currentTimeMillis();
-        long startTime = System.nanoTime() / 1000000L;
         boolean slowPath = Baritone.settings().slowPath.get();
         if (slowPath) {
             logDebug("slowPath is on, path timeout will be " + Baritone.settings().slowPathTimeoutMS.<Long>get() + "ms instead of " + primaryTimeout + "ms");
@@ -76,14 +72,16 @@ public final class AStarPathFinder extends AbstractNodeCostSearch implements Hel
         int numNodes = 0;
         int numMovementsConsidered = 0;
         int numEmptyChunk = 0;
-        boolean favoring = favored != null;
+        boolean isFavoring = !favoring.isEmpty();
+        int timeCheckInterval = 1 << 6;
         int pathingMaxChunkBorderFetch = Baritone.settings().pathingMaxChunkBorderFetch.get(); // grab all settings beforehand so that changing settings during pathing doesn't cause a crash or unpredictable behavior
-        double favorCoeff = Baritone.settings().backtrackCostFavoringCoefficient.get();
+        double minimumImprovement = Baritone.settings().minimumImprovementRepropagation.get() ? MIN_IMPROVEMENT : 0;
-        boolean minimumImprovementRepropagation = Baritone.settings().minimumImprovementRepropagation.get();
         while (!openSet.isEmpty() && numEmptyChunk < pathingMaxChunkBorderFetch && !cancelRequested) {
-            long now = System.nanoTime() / 1000000L;
+            if ((numNodes & (timeCheckInterval - 1)) == 0) { // only call this once every 64 nodes (about half a millisecond)
-            if (now - failureTimeoutTime >= 0 || (!failing && now - primaryTimeoutTime >= 0)) {
+                long now = System.currentTimeMillis(); // since nanoTime is slow on windows (takes many microseconds)
-                break;
+                if (now - failureTimeoutTime >= 0 || (!failing && now - primaryTimeoutTime >= 0)) {
+                    break;
+                }
             }
             if (slowPath) {
                 try {
@@ -92,11 +90,10 @@ public final class AStarPathFinder extends AbstractNodeCostSearch implements Hel
                 }
             }
             PathNode currentNode = openSet.removeLowest();
-            currentNode.isOpen = false;
             mostRecentConsidered = currentNode;
             numNodes++;
             if (goal.isInGoal(currentNode.x, currentNode.y, currentNode.z)) {
-                logDebug("Took " + (System.nanoTime() / 1000000L - startTime) + "ms, " + numMovementsConsidered + " movements considered");
+                logDebug("Took " + (System.currentTimeMillis() - startTime) + "ms, " + numMovementsConsidered + " movements considered");
                 return Optional.of(new Path(startNode, currentNode, numNodes, goal, calcContext));
             }
             for (Moves moves : Moves.values()) {
@@ -122,13 +119,13 @@ public final class AStarPathFinder extends AbstractNodeCostSearch implements Hel
                 if (actionCost >= ActionCosts.COST_INF) {
                     continue;
                 }
-                if (actionCost <= 0) {
+                if (actionCost <= 0 || Double.isNaN(actionCost)) {
                     throw new IllegalStateException(moves + " calculated implausible cost " + actionCost);
                 }
+                // check destination after verifying it's not COST_INF -- some movements return a static IMPOSSIBLE object with COST_INF and destination being 0,0,0 to avoid allocating a new result for every failed calculation
                 if (moves.dynamicXZ && !worldBorder.entirelyContains(res.x, res.z)) { // see issue #218
                     continue;
                 }
-                // check destination after verifying it's not COST_INF -- some movements return a static IMPOSSIBLE object with COST_INF and destination being 0,0,0 to avoid allocating a new result for every failed calculation
                 if (!moves.dynamicXZ && (res.x != newX || res.z != newZ)) {
                     throw new IllegalStateException(moves + " " + res.x + " " + newX + " " + res.z + " " + newZ);
                 }
@@ -136,39 +133,24 @@ public final class AStarPathFinder extends AbstractNodeCostSearch implements Hel
                     throw new IllegalStateException(moves + " " + res.y + " " + (currentNode.y + moves.yOffset));
                 }
                 long hashCode = BetterBlockPos.longHash(res.x, res.y, res.z);
-                if (favoring && favored.contains(hashCode)) {
+                if (isFavoring) {
                     // see issue #18
-                    actionCost *= favorCoeff;
+                    actionCost *= favoring.calculate(hashCode);
                 }
                 PathNode neighbor = getNodeAtPosition(res.x, res.y, res.z, hashCode);
                 double tentativeCost = currentNode.cost + actionCost;
-                if (tentativeCost < neighbor.cost) {
+                if (neighbor.cost - tentativeCost > minimumImprovement) {
-                    if (tentativeCost < 0) {
-                        throw new IllegalStateException(moves + " overflowed into negative " + actionCost + " " + neighbor.cost + " " + tentativeCost);
-                    }
-                    double improvementBy = neighbor.cost - tentativeCost;
-                    // there are floating point errors caused by random combinations of traverse and diagonal over a flat area
-                    // that means that sometimes there's a cost improvement of like 10 ^ -16
-                    // it's not worth the time to update the costs, decrease-key the heap, potentially repropagate, etc
-                    if (improvementBy < 0.01 && minimumImprovementRepropagation) {
-                        // who cares about a hundredth of a tick? that's half a millisecond for crying out loud!
-                        continue;
-                    }
                     neighbor.previous = currentNode;
                     neighbor.cost = tentativeCost;
                     neighbor.combinedCost = tentativeCost + neighbor.estimatedCostToGoal;
-                    if (neighbor.isOpen) {
+                    if (neighbor.isOpen()) {
                         openSet.update(neighbor);
                     } else {
-                        neighbor.isOpen = true;
                         openSet.insert(neighbor);//dont double count, dont insert into open set if it's already there
                     }
-                    for (int i = 0; i < bestSoFar.length; i++) {
+                    for (int i = 0; i < COEFFICIENTS.length; i++) {
                         double heuristic = neighbor.estimatedCostToGoal + neighbor.cost / COEFFICIENTS[i];
-                        if (heuristic < bestHeuristicSoFar[i]) {
+                        if (bestHeuristicSoFar[i] - heuristic > minimumImprovement) {
-                            if (bestHeuristicSoFar[i] - heuristic < 0.01 && minimumImprovementRepropagation) {
-                                continue;
-                            }
                             bestHeuristicSoFar[i] = heuristic;
                             bestSoFar[i] = neighbor;
                             if (getDistFromStartSq(neighbor) > MIN_DIST_PATH * MIN_DIST_PATH) {
@@ -185,29 +167,11 @@ public final class AStarPathFinder extends AbstractNodeCostSearch implements Hel
         System.out.println(numMovementsConsidered + " movements considered");
         System.out.println("Open set size: " + openSet.size());
         System.out.println("PathNode map size: " + mapSize());
-        System.out.println((int) (numNodes * 1.0 / ((System.nanoTime() / 1000000L - startTime) / 1000F)) + " nodes per second");
+        System.out.println((int) (numNodes * 1.0 / ((System.currentTimeMillis() - startTime) / 1000F)) + " nodes per second");
-        double bestDist = 0;
+        Optional<IPath> result = bestSoFar(true, numNodes);
-        for (int i = 0; i < bestSoFar.length; i++) {
+        if (result.isPresent()) {
-            if (bestSoFar[i] == null) {
+            logDebug("Took " + (System.currentTimeMillis() - startTime) + "ms, " + numMovementsConsidered + " movements considered");
-                continue;
-            }
-            double dist = getDistFromStartSq(bestSoFar[i]);
-            if (dist > bestDist) {
-                bestDist = dist;
-            }
-            if (dist > MIN_DIST_PATH * MIN_DIST_PATH) { // square the comparison since distFromStartSq is squared
-                logDebug("Took " + (System.nanoTime() / 1000000L - startTime) + "ms, A* cost coefficient " + COEFFICIENTS[i] + ", " + numMovementsConsidered + " movements considered");
-                if (COEFFICIENTS[i] >= 3) {
-                    System.out.println("Warning: cost coefficient is greater than three! Probably means that");
-                    System.out.println("the path I found is pretty terrible (like sneak-bridging for dozens of blocks)");
-                    System.out.println("But I'm going to do it anyway, because yolo");
-                }
-                System.out.println("Path goes for " + Math.sqrt(dist) + " blocks");
-                return Optional.of(new Path(startNode, bestSoFar[i], numNodes, goal, calcContext));
-            }
         }
-        logDebug("Even with a cost coefficient of " + COEFFICIENTS[COEFFICIENTS.length - 1] + ", I couldn't get more than " + Math.sqrt(bestDist) + " blocks");
+        return result;
-        logDebug("No path found =(");
-        return Optional.empty();
     }
 }

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

@@ -21,6 +21,7 @@ import baritone.Baritone;
 import baritone.api.pathing.calc.IPath;
 import baritone.api.pathing.calc.IPathFinder;
 import baritone.api.pathing.goals.Goal;
+import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.PathCalculationResult;
 import baritone.pathing.movement.CalculationContext;
 import baritone.utils.Helper;
@@ -33,7 +34,7 @@ import java.util.Optional;
  *
  * @author leijurv
  */
-public abstract class AbstractNodeCostSearch implements IPathFinder {
+public abstract class AbstractNodeCostSearch implements IPathFinder, Helper {
 
     protected final int startX;
     protected final int startY;
@@ -52,7 +53,7 @@ public abstract class AbstractNodeCostSearch implements IPathFinder {
 
     protected PathNode mostRecentConsidered;
 
-    protected PathNode[] bestSoFar;
+    protected final PathNode[] bestSoFar = new PathNode[COEFFICIENTS.length];
 
     private volatile boolean isFinished;
 
@@ -62,13 +63,23 @@ public abstract class AbstractNodeCostSearch implements IPathFinder {
      * This is really complicated and hard to explain. I wrote a comment in the old version of MineBot but it was so
      * long it was easier as a Google Doc (because I could insert charts).
      *
-     * @see <a href="https://docs.google.com/document/d/1WVHHXKXFdCR1Oz__KtK8sFqyvSwJN_H4lftkHFgmzlc/edit"></a>
+     * @see <a href="https://docs.google.com/document/d/1WVHHXKXFdCR1Oz__KtK8sFqyvSwJN_H4lftkHFgmzlc/edit">here</a>
      */
-    protected static final double[] COEFFICIENTS = {1.5, 2, 2.5, 3, 4, 5, 10}; // big TODO tune
+    protected static final double[] COEFFICIENTS = {1.5, 2, 2.5, 3, 4, 5, 10};
+
     /**
      * If a path goes less than 5 blocks and doesn't make it to its goal, it's not worth considering.
      */
-    protected final static double MIN_DIST_PATH = 5;
+    protected static final double MIN_DIST_PATH = 5;
+
+    /**
+     * there are floating point errors caused by random combinations of traverse and diagonal over a flat area
+     * that means that sometimes there's a cost improvement of like 10 ^ -16
+     * it's not worth the time to update the costs, decrease-key the heap, potentially repropagate, etc
+     * <p>
+     * who cares about a hundredth of a tick? that's half a millisecond for crying out loud!
+     */
+    protected static final double MIN_IMPROVEMENT = 0.01;
 
     AbstractNodeCostSearch(int startX, int startY, int startZ, Goal goal, CalculationContext context) {
         this.startX = startX;
@@ -86,18 +97,30 @@ public abstract class AbstractNodeCostSearch implements IPathFinder {
     @Override
     public synchronized PathCalculationResult calculate(long primaryTimeout, long failureTimeout) {
         if (isFinished) {
-            throw new IllegalStateException("Path Finder is currently in use, and cannot be reused!");
+            throw new IllegalStateException("Path finder cannot be reused!");
         }
         cancelRequested = false;
         try {
             IPath path = calculate0(primaryTimeout, failureTimeout).map(IPath::postProcess).orElse(null);
-            isFinished = true;
             if (cancelRequested) {
-                return new PathCalculationResult(PathCalculationResult.Type.CANCELLATION, path);
+                return new PathCalculationResult(PathCalculationResult.Type.CANCELLATION);
             }
             if (path == null) {
                 return new PathCalculationResult(PathCalculationResult.Type.FAILURE);
             }
+            int previousLength = path.length();
+            path = path.cutoffAtLoadedChunks(context.bsi);
+            if (path.length() < previousLength) {
+                Helper.HELPER.logDebug("Cutting off path at edge of loaded chunks");
+                Helper.HELPER.logDebug("Length decreased by " + (previousLength - path.length()));
+            } else {
+                Helper.HELPER.logDebug("Path ends within loaded chunks");
+            }
+            previousLength = path.length();
+            path = path.staticCutoff(goal);
+            if (path.length() < previousLength) {
+                Helper.HELPER.logDebug("Static cutoff " + previousLength + " to " + path.length());
+            }
             if (goal.isInGoal(path.getDest())) {
                 return new PathCalculationResult(PathCalculationResult.Type.SUCCESS_TO_GOAL, path);
             } else {
@@ -135,9 +158,14 @@ public abstract class AbstractNodeCostSearch implements IPathFinder {
      * for the node mapped to the specified pos. If no node is found,
      * a new node is created.
      *
+     * @param x        The x position of the node
+     * @param y        The y position of the node
+     * @param z        The z position of the node
+     * @param hashCode The hash code of the node, provided by {@link BetterBlockPos#longHash(int, int, int)}
      * @return The associated node
      * @see <a href="https://github.com/cabaletta/baritone/issues/107">Issue #107</a>
      */
+
     protected PathNode getNodeAtPosition(int x, int y, int z, long hashCode) {
         PathNode node = map.get(hashCode);
         if (node == null) {
@@ -152,25 +180,43 @@ public abstract class AbstractNodeCostSearch implements IPathFinder {
         return Optional.ofNullable(mostRecentConsidered).map(node -> new Path(startNode, node, 0, goal, context));
     }
 
-    protected int mapSize() {
-        return map.size();
-    }
-
     @Override
     public Optional<IPath> bestPathSoFar() {
+        return bestSoFar(false, 0);
+    }
+
+    protected Optional<IPath> bestSoFar(boolean logInfo, int numNodes) {
         if (startNode == null || bestSoFar == null) {
             return Optional.empty();
         }
-        for (int i = 0; i < bestSoFar.length; i++) {
+        double bestDist = 0;
+        for (int i = 0; i < COEFFICIENTS.length; i++) {
             if (bestSoFar[i] == null) {
                 continue;
             }
-            if (getDistFromStartSq(bestSoFar[i]) > MIN_DIST_PATH * MIN_DIST_PATH) { // square the comparison since distFromStartSq is squared
+            double dist = getDistFromStartSq(bestSoFar[i]);
-                return Optional.of(new Path(startNode, bestSoFar[i], 0, goal, context));
+            if (dist > bestDist) {
+                bestDist = dist;
+            }
+            if (dist > MIN_DIST_PATH * MIN_DIST_PATH) { // square the comparison since distFromStartSq is squared
+                if (logInfo) {
+                    if (COEFFICIENTS[i] >= 3) {
+                        System.out.println("Warning: cost coefficient is greater than three! Probably means that");
+                        System.out.println("the path I found is pretty terrible (like sneak-bridging for dozens of blocks)");
+                        System.out.println("But I'm going to do it anyway, because yolo");
+                    }
+                    System.out.println("Path goes for " + Math.sqrt(dist) + " blocks");
+                    logDebug("A* cost coefficient " + COEFFICIENTS[i]);
+                }
+                return Optional.of(new Path(startNode, bestSoFar[i], numNodes, goal, context));
             }
         }
         // instead of returning bestSoFar[0], be less misleading
         // if it actually won't find any path, don't make them think it will by rendering a dark blue that will never actually happen
+        if (logInfo) {
+            logDebug("Even with a cost coefficient of " + COEFFICIENTS[COEFFICIENTS.length - 1] + ", I couldn't get more than " + Math.sqrt(bestDist) + " blocks");
+            logDebug("No path found =(");
+        }
         return Optional.empty();
     }
 
@@ -183,4 +229,12 @@ public abstract class AbstractNodeCostSearch implements IPathFinder {
     public final Goal getGoal() {
         return goal;
     }
+
+    public BetterBlockPos getStart() {
+        return new BetterBlockPos(startX, startY, startZ);
+    }
+
+    protected int mapSize() {
+        return map.size();
+    }
 }

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

@@ -132,7 +132,9 @@ class Path extends PathBase {
             Movement move = moves.apply0(context, src);
             if (move.getDest().equals(dest)) {
                 // have to calculate the cost at calculation time so we can accurately judge whether a cost increase happened between cached calculation and real execution
-                move.override(cost);
+                // however, taking into account possible favoring that could skew the node cost, we really want the stricter limit of the two
+                // so we take the minimum of the path node cost difference, and the calculated cost
+                move.override(Math.min(move.calculateCost(context), cost));
                 return move;
             }
         }

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

@@ -58,12 +58,6 @@ public final class PathNode {
      */
     public PathNode previous;
 
-    /**
-     * Is this a member of the open set in A*? (only used during pathfinding)
-     * Instead of doing a costly member check in the open set, cache membership in each node individually too.
-     */
-    public boolean isOpen;
-
     /**
      * Where is this node in the array flattenization of the binary heap? Needed for decrease-key operations.
      */
@@ -73,12 +67,19 @@ public final class PathNode {
         this.previous = null;
         this.cost = ActionCosts.COST_INF;
         this.estimatedCostToGoal = goal.heuristic(x, y, z);
-        this.isOpen = false;
+        if (Double.isNaN(estimatedCostToGoal)) {
+            throw new IllegalStateException(goal + " calculated implausible heuristic");
+        }
+        this.heapPosition = -1;
         this.x = x;
         this.y = y;
         this.z = z;
     }
 
+    public boolean isOpen() {
+        return heapPosition != -1;
+    }
+
     /**
      * TODO: Possibly reimplement hashCode and equals. They are necessary for this class to function but they could be done better
      *

src/main/java/baritone/pathing/calc/openset/BinaryHeapOpenSet.java

@@ -59,7 +59,7 @@ public final class BinaryHeapOpenSet implements IOpenSet {
     @Override
     public final void insert(PathNode value) {
         if (size >= array.length - 1) {
-            array = Arrays.copyOf(array, array.length * 2);
+            array = Arrays.copyOf(array, array.length << 1);
         }
         size++;
         value.heapPosition = size;
@@ -72,6 +72,7 @@ public final class BinaryHeapOpenSet implements IOpenSet {
         int index = val.heapPosition;
         int parentInd = index >>> 1;
         double cost = val.combinedCost;
+        PathNode[] array = this.array;
         PathNode parentNode = array[parentInd];
         while (index > 1 && parentNode.combinedCost > cost) {
             array[index] = parentNode;
@@ -94,40 +95,50 @@ public final class BinaryHeapOpenSet implements IOpenSet {
         if (size == 0) {
             throw new IllegalStateException();
         }
+        PathNode[] array = this.array;
         PathNode result = array[1];
         PathNode val = array[size];
         array[1] = val;
         val.heapPosition = 1;
         array[size] = null;
-        size--;
+        int size = --this.size;
         result.heapPosition = -1;
         if (size < 2) {
             return result;
         }
         int index = 1;
-        int smallerChild = 2;
+        int smallerChild = 1;
         double cost = val.combinedCost;
-        do {
+        while ((smallerChild <<= 1) < size) {
             PathNode smallerChildNode = array[smallerChild];
+            PathNode otherChildNode = array[smallerChild + 1];
             double smallerChildCost = smallerChildNode.combinedCost;
-            if (smallerChild < size) {
+            double rightChildCost = otherChildNode.combinedCost;
-                PathNode rightChildNode = array[smallerChild + 1];
+            if (smallerChildCost > rightChildCost) {
-                double rightChildCost = rightChildNode.combinedCost;
+                smallerChild++;
-                if (smallerChildCost > rightChildCost) {
+                smallerChildCost = rightChildCost;
-                    smallerChild++;
+                smallerChildNode = otherChildNode;
-                    smallerChildCost = rightChildCost;
-                    smallerChildNode = rightChildNode;
-                }
             }
             if (cost <= smallerChildCost) {
-                break;
+                return result;
             }
             array[index] = smallerChildNode;
             array[smallerChild] = val;
             val.heapPosition = smallerChild;
             smallerChildNode.heapPosition = index;
             index = smallerChild;
-        } while ((smallerChild <<= 1) <= size);
+        }
+        // if we get here, then smallerChild >= size
+        // one last swap to check
+        if (smallerChild == size) {
+            PathNode onlyChildNode = array[smallerChild];
+            if (cost > onlyChildNode.combinedCost) {
+                array[index] = onlyChildNode;
+                array[smallerChild] = val;
+                val.heapPosition = smallerChild;
+                onlyChildNode.heapPosition = index;
+            }
+        }
         return result;
     }
 }

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

@@ -42,36 +42,50 @@ public class CalculationContext {
 
     private static final ItemStack STACK_BUCKET_WATER = new ItemStack(Items.WATER_BUCKET);
 
-    private final IBaritone baritone;
+    public final IBaritone baritone;
-    private final EntityPlayerSP player;
+    public final World world;
-    private final World world;
+    public final WorldData worldData;
-    private final WorldData worldData;
+    public final BlockStateInterface bsi;
-    private final BlockStateInterface bsi;
+    public final ToolSet toolSet;
-    private final ToolSet toolSet;
+    public final boolean hasWaterBucket;
-    private final boolean hasWaterBucket;
+    public final boolean hasThrowaway;
-    private final boolean hasThrowaway;
+    public final boolean canSprint;
-    private final boolean canSprint;
+    public final double placeBlockCost;
-    private final double placeBlockCost;
+    public final boolean allowBreak;
-    private final boolean allowBreak;
+    public final boolean allowParkour;
-    private final int maxFallHeightNoWater;
+    public final boolean allowParkourPlace;
-    private final int maxFallHeightBucket;
+    public final boolean allowJumpAt256;
-    private final double waterWalkSpeed;
+    public final boolean assumeWalkOnWater;
-    private final double breakBlockAdditionalCost;
+    public final boolean allowDiagonalDescend;
-    private final BetterWorldBorder worldBorder;
+    public final int maxFallHeightNoWater;
+    public final int maxFallHeightBucket;
+    public final double waterWalkSpeed;
+    public final double breakBlockAdditionalCost;
+    public final double jumpPenalty;
+    public final double walkOnWaterOnePenalty;
+    public final BetterWorldBorder worldBorder;
 
     public CalculationContext(IBaritone baritone) {
+        this(baritone, false);
+    }
+
+    public CalculationContext(IBaritone baritone, boolean forUseOnAnotherThread) {
         this.baritone = baritone;
-        this.player = baritone.getPlayerContext().player();
+        EntityPlayerSP player = baritone.getPlayerContext().player();
         this.world = baritone.getPlayerContext().world();
         this.worldData = (WorldData) baritone.getWorldProvider().getCurrentWorld();
-        this.bsi = new BlockStateInterface(world, worldData); // TODO TODO TODO
+        this.bsi = new BlockStateInterface(world, worldData, forUseOnAnotherThread); // TODO TODO TODO
-        // new CalculationContext() needs to happen, can't add an argument (i'll beat you), can we get the world provider from currentlyTicking?
         this.toolSet = new ToolSet(player);
         this.hasThrowaway = Baritone.settings().allowPlace.get() && MovementHelper.throwaway(baritone.getPlayerContext(), false);
         this.hasWaterBucket = Baritone.settings().allowWaterBucketFall.get() && InventoryPlayer.isHotbar(player.inventory.getSlotFor(STACK_BUCKET_WATER)) && !world.provider.isNether();
         this.canSprint = Baritone.settings().allowSprint.get() && player.getFoodStats().getFoodLevel() > 6;
         this.placeBlockCost = Baritone.settings().blockPlacementPenalty.get();
         this.allowBreak = Baritone.settings().allowBreak.get();
+        this.allowParkour = Baritone.settings().allowParkour.get();
+        this.allowParkourPlace = Baritone.settings().allowParkourPlace.get();
+        this.allowJumpAt256 = Baritone.settings().allowJumpAt256.get();
+        this.assumeWalkOnWater = Baritone.settings().assumeWalkOnWater.get();
+        this.allowDiagonalDescend = Baritone.settings().allowDiagonalDescend.get();
         this.maxFallHeightNoWater = Baritone.settings().maxFallHeightNoWater.get();
         this.maxFallHeightBucket = Baritone.settings().maxFallHeightBucket.get();
         int depth = EnchantmentHelper.getDepthStriderModifier(player);
@@ -81,6 +95,8 @@ public class CalculationContext {
         float mult = depth / 3.0F;
         this.waterWalkSpeed = ActionCosts.WALK_ONE_IN_WATER_COST * (1 - mult) + ActionCosts.WALK_ONE_BLOCK_COST * mult;
         this.breakBlockAdditionalCost = Baritone.settings().blockBreakAdditionalPenalty.get();
+        this.jumpPenalty = Baritone.settings().jumpPenalty.get();
+        this.walkOnWaterOnePenalty = Baritone.settings().walkOnWaterOnePenalty.get();
         // why cache these things here, why not let the movements just get directly from settings?
         // because if some movements are calculated one way and others are calculated another way,
         // then you get a wildly inconsistent path that isn't optimal for either scenario.
@@ -108,7 +124,7 @@ public class CalculationContext {
     }
 
     public boolean canPlaceThrowawayAt(int x, int y, int z) {
-        if (!hasThrowaway()) { // only true if allowPlace is true, see constructor
+        if (!hasThrowaway) { // only true if allowPlace is true, see constructor
             return false;
         }
         if (isPossiblyProtected(x, y, z)) {
@@ -118,7 +134,7 @@ public class CalculationContext {
     }
 
     public boolean canBreakAt(int x, int y, int z) {
-        if (!allowBreak()) {
+        if (!allowBreak) {
             return false;
         }
         return !isPossiblyProtected(x, y, z);
@@ -128,60 +144,4 @@ public class CalculationContext {
         // TODO more protection logic here; see #220
         return false;
     }
-
-    public World world() {
-        return world;
-    }
-
-    public EntityPlayerSP player() {
-        return player;
-    }
-
-    public BlockStateInterface bsi() {
-        return bsi;
-    }
-
-    public WorldData worldData() {
-        return worldData;
-    }
-
-    public ToolSet getToolSet() {
-        return toolSet;
-    }
-
-    public boolean hasWaterBucket() {
-        return hasWaterBucket;
-    }
-
-    public boolean hasThrowaway() {
-        return hasThrowaway;
-    }
-
-    public boolean canSprint() {
-        return canSprint;
-    }
-
-    public double placeBlockCost() {
-        return placeBlockCost;
-    }
-
-    public boolean allowBreak() {
-        return allowBreak;
-    }
-
-    public int maxFallHeightNoWater() {
-        return maxFallHeightNoWater;
-    }
-
-    public int maxFallHeightBucket() {
-        return maxFallHeightBucket;
-    }
-
-    public double waterWalkSpeed() {
-        return waterWalkSpeed;
-    }
-
-    public double breakBlockAdditionalCost() {
-        return breakBlockAdditionalCost;
-    }
 }

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

@@ -26,7 +26,6 @@ import baritone.utils.BlockStateInterface;
 import net.minecraft.block.BlockLiquid;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.chunk.EmptyChunk;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -35,7 +34,7 @@ import java.util.Optional;
 
 public abstract class Movement implements IMovement, MovementHelper {
 
-    protected static final EnumFacing[] HORIZONTALS = {EnumFacing.NORTH, EnumFacing.SOUTH, EnumFacing.EAST, EnumFacing.WEST};
+    protected static final EnumFacing[] HORIZONTALS_BUT_ALSO_DOWN____SO_EVERY_DIRECTION_EXCEPT_UP = {EnumFacing.NORTH, EnumFacing.SOUTH, EnumFacing.EAST, EnumFacing.WEST, EnumFacing.DOWN};
 
     protected final IBaritone baritone;
     protected final IPlayerContext ctx;
@@ -85,7 +84,7 @@ public abstract class Movement implements IMovement, MovementHelper {
         return cost;
     }
 
-    protected abstract double calculateCost(CalculationContext context);
+    public abstract double calculateCost(CalculationContext context);
 
     @Override
     public double recalculateCost() {
@@ -124,14 +123,11 @@ public abstract class Movement implements IMovement, MovementHelper {
                 baritone.getLookBehavior().updateTarget(
                         rotation,
                         currentState.getTarget().hasToForceRotations()));
-
+        baritone.getInputOverrideHandler().clearAllKeys();
-        // TODO: calculate movement inputs from latestState.getGoal().position
-        // latestState.getTarget().position.ifPresent(null);      NULL CONSUMER REALLY SHOULDN'T BE THE FINAL THING YOU SHOULD REALLY REPLACE THIS WITH ALMOST ACTUALLY ANYTHING ELSE JUST PLEASE DON'T LEAVE IT AS IT IS THANK YOU KANYE
-
         currentState.getInputStates().forEach((input, forced) -> {
             baritone.getInputOverrideHandler().setInputForceState(input, forced);
         });
-        currentState.getInputStates().replaceAll((input, forced) -> false);
+        currentState.getInputStates().clear();
 
         // If the current status indicates a completed movement
         if (currentState.getStatus().isComplete()) {
@@ -151,9 +147,10 @@ public abstract class Movement implements IMovement, MovementHelper {
                 somethingInTheWay = true;
                 Optional<Rotation> reachable = RotationUtils.reachable(ctx.player(), blockPos, ctx.playerController().getBlockReachDistance());
                 if (reachable.isPresent()) {
+                    Rotation rotTowardsBlock = reachable.get();
                     MovementHelper.switchToBestToolFor(ctx, BlockStateInterface.get(ctx, blockPos));
-                    state.setTarget(new MovementState.MovementTarget(reachable.get(), true));
+                    state.setTarget(new MovementState.MovementTarget(rotTowardsBlock, true));
-                    if (Objects.equals(ctx.getSelectedBlock().orElse(null), blockPos)) {
+                    if (Objects.equals(ctx.getSelectedBlock().orElse(null), blockPos) || ctx.playerRotations().isReallyCloseTo(rotTowardsBlock)) {
                         state.setInput(Input.CLICK_LEFT, true);
                     }
                     return false;
@@ -204,10 +201,10 @@ public abstract class Movement implements IMovement, MovementHelper {
     }
 
     /**
-     * Calculate latest movement state.
+     * Calculate latest movement state. Gets called once a tick.
-     * Gets called once a tick.
      *
-     * @return
+     * @param state The current state
+     * @return The new state
      */
     public MovementState updateState(MovementState state) {
         if (!prepared(state)) {
@@ -229,7 +226,7 @@ public abstract class Movement implements IMovement, MovementHelper {
     }
 
     public void checkLoadedChunk(CalculationContext context) {
-        calculatedWhileLoaded = !(context.world().getChunk(getDest()) instanceof EmptyChunk);
+        calculatedWhileLoaded = context.bsi.worldContainsLoadedChunk(dest.x, dest.z);
     }
 
     @Override
@@ -244,14 +241,13 @@ public abstract class Movement implements IMovement, MovementHelper {
         toWalkIntoCached = null;
     }
 
-    @Override
+    public List<BlockPos> toBreak(BlockStateInterface bsi) {
-    public List<BlockPos> toBreak() {
         if (toBreakCached != null) {
             return toBreakCached;
         }
         List<BlockPos> result = new ArrayList<>();
         for (BetterBlockPos positionToBreak : positionsToBreak) {
-            if (!MovementHelper.canWalkThrough(ctx, positionToBreak)) {
+            if (!MovementHelper.canWalkThrough(bsi, positionToBreak.x, positionToBreak.y, positionToBreak.z)) {
                 result.add(positionToBreak);
             }
         }
@@ -259,21 +255,19 @@ public abstract class Movement implements IMovement, MovementHelper {
         return result;
     }
 
-    @Override
+    public List<BlockPos> toPlace(BlockStateInterface bsi) {
-    public List<BlockPos> toPlace() {
         if (toPlaceCached != null) {
             return toPlaceCached;
         }
         List<BlockPos> result = new ArrayList<>();
-        if (positionToPlace != null && !MovementHelper.canWalkOn(ctx, positionToPlace)) {
+        if (positionToPlace != null && !MovementHelper.canWalkOn(bsi, positionToPlace.x, positionToPlace.y, positionToPlace.z)) {
             result.add(positionToPlace);
         }
         toPlaceCached = result;
         return result;
     }
 
-    @Override
+    public List<BlockPos> toWalkInto(BlockStateInterface bsi) { // overridden by movementdiagonal
-    public List<BlockPos> toWalkInto() { // overridden by movementdiagonal
         if (toWalkIntoCached == null) {
             toWalkIntoCached = new ArrayList<>();
         }

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

@@ -18,7 +18,9 @@
 package baritone.pathing.movement;
 
 import baritone.Baritone;
+import baritone.api.IBaritone;
 import baritone.api.pathing.movement.ActionCosts;
+import baritone.api.pathing.movement.MovementStatus;
 import baritone.api.utils.*;
 import baritone.api.utils.input.Input;
 import baritone.pathing.movement.MovementState.MovementTarget;
@@ -35,8 +37,10 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.NonNullList;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
+import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.world.chunk.EmptyChunk;
+import net.minecraft.util.math.Vec3d;
+
+import static baritone.pathing.movement.Movement.HORIZONTALS_BUT_ALSO_DOWN____SO_EVERY_DIRECTION_EXCEPT_UP;
 
 /**
  * Static helpers for cost calculation
@@ -70,7 +74,7 @@ public interface MovementHelper extends ActionCosts, Helper {
         if (block == Blocks.AIR) { // early return for most common case
             return true;
         }
-        if (block == Blocks.FIRE || block == Blocks.TRIPWIRE || block == Blocks.WEB || block == Blocks.END_PORTAL) {
+        if (block == Blocks.FIRE || block == Blocks.TRIPWIRE || block == Blocks.WEB || block == Blocks.END_PORTAL || block == Blocks.COCOA) {
             return false;
         }
         if (block instanceof BlockDoor || block instanceof BlockFenceGate) {
@@ -92,7 +96,11 @@ public interface MovementHelper extends ActionCosts, Helper {
             if (snow) {
                 // the check in BlockSnow.isPassable is layers < 5
                 // while actually, we want < 3 because 3 or greater makes it impassable in a 2 high ceiling
-                return state.getValue(BlockSnow.LAYERS) < 3;
+                if (state.getValue(BlockSnow.LAYERS) >= 3) {
+                    return false;
+                }
+                // ok, it's low enough we could walk through it, but is it supported?
+                return canWalkOn(bsi, x, y - 1, z);
             }
             if (trapdoor) {
                 return !state.getValue(BlockTrapDoor.OPEN); // see BlockTrapDoor.isPassable
@@ -122,7 +130,11 @@ public interface MovementHelper extends ActionCosts, Helper {
      * canWalkThrough but also won't impede movement at all. so not including doors or fence gates (we'd have to right click),
      * not including water, and not including ladders or vines or cobwebs (they slow us down)
      *
-     * @return
+     * @param context Calculation context to provide block state lookup
+     * @param x       The block's x position
+     * @param y       The block's y position
+     * @param z       The block's z position
+     * @return Whether or not the block at the specified position
      */
     static boolean fullyPassable(CalculationContext context, int x, int y, int z) {
         return fullyPassable(context.get(x, y, z));
@@ -139,6 +151,7 @@ public interface MovementHelper extends ActionCosts, Helper {
                 || block == Blocks.WEB
                 || block == Blocks.VINE
                 || block == Blocks.LADDER
+                || block == Blocks.COCOA
                 || block instanceof BlockDoor
                 || block instanceof BlockFenceGate
                 || block instanceof BlockSnow
@@ -151,7 +164,7 @@ public interface MovementHelper extends ActionCosts, Helper {
         return block.isPassable(null, null);
     }
 
-    static boolean isReplacable(int x, int y, int z, IBlockState state, World world) {
+    static boolean isReplacable(int x, int y, int z, IBlockState state, BlockStateInterface bsi) {
         // for MovementTraverse and MovementAscend
         // block double plant defaults to true when the block doesn't match, so don't need to check that case
         // all other overrides just return true or false
@@ -163,9 +176,13 @@ public interface MovementHelper extends ActionCosts, Helper {
          *     }
          */
         Block block = state.getBlock();
+        if (block == Blocks.AIR || isWater(block)) {
+            // early return for common cases hehe
+            return true;
+        }
         if (block instanceof BlockSnow) {
             // as before, default to true (mostly because it would otherwise make long distance pathing through snowy biomes impossible)
-            if (world.getChunk(x >> 4, z >> 4) instanceof EmptyChunk) {
+            if (!bsi.worldContainsLoadedChunk(x, z)) {
                 return true;
             }
             return state.getValue(BlockSnow.LAYERS) == 1;
@@ -238,7 +255,12 @@ public interface MovementHelper extends ActionCosts, Helper {
      * through? Includes water because we know that we automatically jump on
      * water
      *
-     * @return
+     * @param bsi   Block state provider
+     * @param x     The block's x position
+     * @param y     The block's y position
+     * @param z     The block's z position
+     * @param state The state of the block at the specified location
+     * @return Whether or not the specified block can be walked on
      */
     static boolean canWalkOn(BlockStateInterface bsi, int x, int y, int z, IBlockState state) {
         Block block = state.getBlock();
@@ -324,24 +346,24 @@ public interface MovementHelper extends ActionCosts, Helper {
 
     static double getMiningDurationTicks(CalculationContext context, int x, int y, int z, IBlockState state, boolean includeFalling) {
         Block block = state.getBlock();
-        if (!canWalkThrough(context.bsi(), x, y, z, state)) {
+        if (!canWalkThrough(context.bsi, x, y, z, state)) {
             if (!context.canBreakAt(x, y, z)) {
                 return COST_INF;
             }
-            if (avoidBreaking(context.bsi(), x, y, z, state)) {
+            if (avoidBreaking(context.bsi, x, y, z, state)) {
                 return COST_INF;
             }
             if (block instanceof BlockLiquid) {
                 return COST_INF;
             }
             double m = Blocks.CRAFTING_TABLE.equals(block) ? 10 : 1; // TODO see if this is still necessary. it's from MineBot when we wanted to penalize breaking its crafting table
-            double strVsBlock = context.getToolSet().getStrVsBlock(state);
+            double strVsBlock = context.toolSet.getStrVsBlock(state);
             if (strVsBlock <= 0) {
                 return COST_INF;
             }
 
             double result = m / strVsBlock;
-            result += context.breakBlockAdditionalCost();
+            result += context.breakBlockAdditionalCost;
             if (includeFalling) {
                 IBlockState above = context.get(x, y + 1, z);
                 if (above.getBlock() instanceof BlockFalling) {
@@ -362,7 +384,8 @@ public interface MovementHelper extends ActionCosts, Helper {
     /**
      * AutoTool for a specific block
      *
-     * @param b the blockstate to mine
+     * @param ctx The player context
+     * @param b   the blockstate to mine
      */
     static void switchToBestToolFor(IPlayerContext ctx, IBlockState b) {
         switchToBestToolFor(ctx, b, new ToolSet(ctx.player()));
@@ -371,8 +394,9 @@ public interface MovementHelper extends ActionCosts, Helper {
     /**
      * AutoTool for a specific block with precomputed ToolSet data
      *
-     * @param b  the blockstate to mine
+     * @param ctx The player context
-     * @param ts previously calculated ToolSet
+     * @param b   the blockstate to mine
+     * @param ts  previously calculated ToolSet
      */
     static void switchToBestToolFor(IPlayerContext ctx, IBlockState b, ToolSet ts) {
         ctx.player().inventory.currentItem = ts.getBestSlot(b.getBlock());
@@ -465,7 +489,50 @@ public interface MovementHelper extends ActionCosts, Helper {
     static boolean isFlowing(IBlockState state) {
         // Will be IFluidState in 1.13
         return state.getBlock() instanceof BlockLiquid
-                && state.getPropertyKeys().contains(BlockLiquid.LEVEL)
                 && state.getValue(BlockLiquid.LEVEL) != 0;
     }
+
+    static PlaceResult attemptToPlaceABlock(MovementState state, IBaritone baritone, BlockPos placeAt, boolean preferDown) {
+        IPlayerContext ctx = baritone.getPlayerContext();
+        boolean found = false;
+        for (int i = 0; i < 5; i++) {
+            BlockPos against1 = placeAt.offset(HORIZONTALS_BUT_ALSO_DOWN____SO_EVERY_DIRECTION_EXCEPT_UP[i]);
+            if (MovementHelper.canPlaceAgainst(ctx, against1)) {
+                //if (!((Baritone) baritone).getInventoryBehavior().selectThrowawayForLocation(placeAt.getX(), placeAt.getY(), placeAt.getZ())) { // get ready to place a throwaway block
+                if (!throwaway(ctx, true)) {
+                    Helper.HELPER.logDebug("bb pls get me some blocks. dirt or cobble");
+                    state.setStatus(MovementStatus.UNREACHABLE);
+                    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 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());
+                if (res != null && res.typeOfHit == RayTraceResult.Type.BLOCK && res.getBlockPos().equals(against1) && res.getBlockPos().offset(res.sideHit).equals(placeAt)) {
+                    state.setTarget(new MovementState.MovementTarget(place, true));
+                    found = true;
+
+                    if (!preferDown) {
+                        // if preferDown is true, we want the last option
+                        // if preferDown is false, we want the first
+                        break;
+                    }
+                }
+            }
+        }
+        if (ctx.getSelectedBlock().isPresent()) {
+            BlockPos selectedBlock = ctx.getSelectedBlock().get();
+            EnumFacing side = ctx.objectMouseOver().sideHit;
+            // only way for selectedBlock.equals(placeAt) to be true is if it's replacable
+            if (selectedBlock.equals(placeAt) || (MovementHelper.canPlaceAgainst(ctx, selectedBlock) && selectedBlock.offset(side).equals(placeAt))) {
+                return PlaceResult.READY_TO_PLACE;
+            }
+        }
+        return found ? PlaceResult.ATTEMPTING : PlaceResult.NO_OPTION;
+    }
+
+    enum PlaceResult {
+        READY_TO_PLACE, ATTEMPTING, NO_OPTION;
+    }
 }

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

@@ -20,7 +20,6 @@ package baritone.pathing.movement;
 import baritone.api.pathing.movement.MovementStatus;
 import baritone.api.utils.Rotation;
 import baritone.api.utils.input.Input;
-import net.minecraft.util.math.Vec3d;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -29,7 +28,6 @@ import java.util.Optional;
 public class MovementState {
 
     private MovementStatus status;
-    private MovementTarget goal = new MovementTarget();
     private MovementTarget target = new MovementTarget();
     private final Map<Input, Boolean> inputState = new HashMap<>();
 
@@ -42,15 +40,6 @@ public class MovementState {
         return status;
     }
 
-    public MovementTarget getGoal() {
-        return this.goal;
-    }
-
-    public MovementState setGoal(MovementTarget goal) {
-        this.goal = goal;
-        return this;
-    }
-
     public MovementTarget getTarget() {
         return this.target;
     }
@@ -65,23 +54,12 @@ public class MovementState {
         return this;
     }
 
-    public boolean getInput(Input input) {
-        return this.inputState.getOrDefault(input, false);
-    }
-
     public Map<Input, Boolean> getInputStates() {
         return this.inputState;
     }
 
     public static class MovementTarget {
 
-        /**
-         * Necessary movement to achieve
-         * <p>
-         * TODO: Decide desiredMovement type
-         */
-        public Vec3d position;
-
         /**
          * Yaw and pitch angles that must be matched
          */
@@ -95,27 +73,14 @@ public class MovementState {
         private boolean forceRotations;
 
         public MovementTarget() {
-            this(null, null, false);
+            this(null, false);
-        }
-
-        public MovementTarget(Vec3d position) {
-            this(position, null, false);
         }
 
         public MovementTarget(Rotation rotation, boolean forceRotations) {
-            this(null, rotation, forceRotations);
-        }
-
-        public MovementTarget(Vec3d position, Rotation rotation, boolean forceRotations) {
-            this.position = position;
             this.rotation = rotation;
             this.forceRotations = forceRotations;
         }
 
-        public final Optional<Vec3d> getPosition() {
-            return Optional.ofNullable(this.position);
-        }
-
         public final Optional<Rotation> getRotation() {
             return Optional.ofNullable(this.rotation);
         }

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

@@ -220,51 +220,59 @@ public enum Moves {
         }
     },
 
-    DIAGONAL_NORTHEAST(+1, 0, -1) {
+    DIAGONAL_NORTHEAST(+1, 0, -1, false, true) {
         @Override
         public Movement apply0(CalculationContext context, BetterBlockPos src) {
-            return new MovementDiagonal(context.getBaritone(), src, EnumFacing.NORTH, EnumFacing.EAST);
+            MutableMoveResult res = new MutableMoveResult();
+            apply(context, src.x, src.y, src.z, res);
+            return new MovementDiagonal(context.getBaritone(), src, EnumFacing.NORTH, EnumFacing.EAST, res.y - src.y);
         }
 
         @Override
-        public double cost(CalculationContext context, int x, int y, int z) {
+        public void apply(CalculationContext context, int x, int y, int z, MutableMoveResult result) {
-            return MovementDiagonal.cost(context, x, y, z, x + 1, z - 1);
+            MovementDiagonal.cost(context, x, y, z, x + 1, z - 1, result);
         }
     },
 
-    DIAGONAL_NORTHWEST(-1, 0, -1) {
+    DIAGONAL_NORTHWEST(-1, 0, -1, false, true) {
         @Override
         public Movement apply0(CalculationContext context, BetterBlockPos src) {
-            return new MovementDiagonal(context.getBaritone(), src, EnumFacing.NORTH, EnumFacing.WEST);
+            MutableMoveResult res = new MutableMoveResult();
+            apply(context, src.x, src.y, src.z, res);
+            return new MovementDiagonal(context.getBaritone(), src, EnumFacing.NORTH, EnumFacing.WEST, res.y - src.y);
         }
 
         @Override
-        public double cost(CalculationContext context, int x, int y, int z) {
+        public void apply(CalculationContext context, int x, int y, int z, MutableMoveResult result) {
-            return MovementDiagonal.cost(context, x, y, z, x - 1, z - 1);
+            MovementDiagonal.cost(context, x, y, z, x - 1, z - 1, result);
         }
     },
 
-    DIAGONAL_SOUTHEAST(+1, 0, +1) {
+    DIAGONAL_SOUTHEAST(+1, 0, +1, false, true) {
         @Override
         public Movement apply0(CalculationContext context, BetterBlockPos src) {
-            return new MovementDiagonal(context.getBaritone(), src, EnumFacing.SOUTH, EnumFacing.EAST);
+            MutableMoveResult res = new MutableMoveResult();
+            apply(context, src.x, src.y, src.z, res);
+            return new MovementDiagonal(context.getBaritone(), src, EnumFacing.SOUTH, EnumFacing.EAST, res.y - src.y);
         }
 
         @Override
-        public double cost(CalculationContext context, int x, int y, int z) {
+        public void apply(CalculationContext context, int x, int y, int z, MutableMoveResult result) {
-            return MovementDiagonal.cost(context, x, y, z, x + 1, z + 1);
+            MovementDiagonal.cost(context, x, y, z, x + 1, z + 1, result);
         }
     },
 
-    DIAGONAL_SOUTHWEST(-1, 0, +1) {
+    DIAGONAL_SOUTHWEST(-1, 0, +1, false, true) {
         @Override
         public Movement apply0(CalculationContext context, BetterBlockPos src) {
-            return new MovementDiagonal(context.getBaritone(), src, EnumFacing.SOUTH, EnumFacing.WEST);
+            MutableMoveResult res = new MutableMoveResult();
+            apply(context, src.x, src.y, src.z, res);
+            return new MovementDiagonal(context.getBaritone(), src, EnumFacing.SOUTH, EnumFacing.WEST, res.y - src.y);
         }
 
         @Override
-        public double cost(CalculationContext context, int x, int y, int z) {
+        public void apply(CalculationContext context, int x, int y, int z, MutableMoveResult result) {
-            return MovementDiagonal.cost(context, x, y, z, x - 1, z + 1);
+            MovementDiagonal.cost(context, x, y, z, x - 1, z + 1, result);
         }
     },
 

src/main/java/baritone/pathing/movement/movements/MovementAscend.java

@@ -21,7 +21,6 @@ import baritone.Baritone;
 import baritone.api.IBaritone;
 import baritone.api.pathing.movement.MovementStatus;
 import baritone.api.utils.BetterBlockPos;
-import baritone.api.utils.RotationUtils;
 import baritone.api.utils.input.Input;
 import baritone.pathing.movement.CalculationContext;
 import baritone.pathing.movement.Movement;
@@ -32,10 +31,6 @@ import net.minecraft.block.BlockFalling;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec3d;
-
-import java.util.Objects;
 
 public class MovementAscend extends Movement {
 
@@ -52,41 +47,28 @@ public class MovementAscend extends Movement {
     }
 
     @Override
-    protected double calculateCost(CalculationContext context) {
+    public double calculateCost(CalculationContext context) {
         return cost(context, src.x, src.y, src.z, dest.x, dest.z);
     }
 
     public static double cost(CalculationContext context, int x, int y, int z, int destX, int destZ) {
-        IBlockState srcDown = context.get(x, y - 1, z);
-        if (srcDown.getBlock() == Blocks.LADDER || srcDown.getBlock() == Blocks.VINE) {
-            return COST_INF;
-        }
-        // we can jump from soul sand, but not from a bottom slab
-        boolean jumpingFromBottomSlab = MovementHelper.isBottomSlab(srcDown);
         IBlockState toPlace = context.get(destX, y, destZ);
-        boolean jumpingToBottomSlab = MovementHelper.isBottomSlab(toPlace);
-
-        if (jumpingFromBottomSlab && !jumpingToBottomSlab) {
-            return COST_INF;// the only thing we can ascend onto from a bottom slab is another bottom slab
-        }
         boolean hasToPlace = false;
-        if (!MovementHelper.canWalkOn(context.bsi(), destX, y, destZ, toPlace)) {
+        if (!MovementHelper.canWalkOn(context.bsi, destX, y, destZ, toPlace)) {
             if (!context.canPlaceThrowawayAt(destX, y, destZ)) {
                 return COST_INF;
             }
-            if (toPlace.getBlock() != Blocks.AIR && !MovementHelper.isWater(toPlace.getBlock()) && !MovementHelper.isReplacable(destX, y, destZ, toPlace, context.world())) {
+            if (!MovementHelper.isReplacable(destX, y, destZ, toPlace, context.bsi)) {
                 return COST_INF;
             }
-            // TODO: add ability to place against .down() as well as the cardinal directions
+            for (int i = 0; i < 5; i++) {
-            // useful for when you are starting a staircase without anything to place against
+                int againstX = destX + HORIZONTALS_BUT_ALSO_DOWN____SO_EVERY_DIRECTION_EXCEPT_UP[i].getXOffset();
-            // Counterpoint to the above TODO ^ you should move then pillar instead of ascend
+                int againstY = y + HORIZONTALS_BUT_ALSO_DOWN____SO_EVERY_DIRECTION_EXCEPT_UP[i].getYOffset();
-            for (int i = 0; i < 4; i++) {
+                int againstZ = destZ + HORIZONTALS_BUT_ALSO_DOWN____SO_EVERY_DIRECTION_EXCEPT_UP[i].getZOffset();
-                int againstX = destX + HORIZONTALS[i].getXOffset();
+                if (againstX == x && againstZ == z) { // we might be able to backplace now, but it doesn't matter because it will have been broken by the time we'd need to use it
-                int againstZ = destZ + HORIZONTALS[i].getZOffset();
-                if (againstX == x && againstZ == z) {
                     continue;
                 }
-                if (MovementHelper.canPlaceAgainst(context.bsi(), againstX, y, againstZ)) {
+                if (MovementHelper.canPlaceAgainst(context.bsi, againstX, againstY, againstZ)) {
                     hasToPlace = true;
                     break;
                 }
@@ -95,8 +77,8 @@ public class MovementAscend extends Movement {
                 return COST_INF;
             }
         }
-        IBlockState srcUp2 = null;
+        IBlockState srcUp2 = context.get(x, y + 2, z); // used lower down anyway
-        if (context.get(x, y + 3, z).getBlock() instanceof BlockFalling && (MovementHelper.canWalkThrough(context.bsi(), x, y + 1, z) || !((srcUp2 = context.get(x, y + 2, z)).getBlock() instanceof BlockFalling))) {//it would fall on us and possibly suffocate us
+        if (context.get(x, y + 3, z).getBlock() instanceof BlockFalling && (MovementHelper.canWalkThrough(context.bsi, x, y + 1, z) || !(srcUp2.getBlock() instanceof BlockFalling))) {//it would fall on us and possibly suffocate us
             // HOWEVER, we assume that we're standing in the start position
             // that means that src and src.up(1) are both air
             // maybe they aren't now, but they will be by the time this starts
@@ -114,32 +96,41 @@ public class MovementAscend extends Movement {
             // it's possible srcUp is AIR from the start, and srcUp2 is falling
             // and in that scenario, when we arrive and break srcUp2, that lets srcUp3 fall on us and suffocate us
         }
+        IBlockState srcDown = context.get(x, y - 1, z);
+        if (srcDown.getBlock() == Blocks.LADDER || srcDown.getBlock() == Blocks.VINE) {
+            return COST_INF;
+        }
+        // we can jump from soul sand, but not from a bottom slab
+        boolean jumpingFromBottomSlab = MovementHelper.isBottomSlab(srcDown);
+        boolean jumpingToBottomSlab = MovementHelper.isBottomSlab(toPlace);
+        if (jumpingFromBottomSlab && !jumpingToBottomSlab) {
+            return COST_INF;// the only thing we can ascend onto from a bottom slab is another bottom slab
+        }
         double walk;
         if (jumpingToBottomSlab) {
             if (jumpingFromBottomSlab) {
                 walk = Math.max(JUMP_ONE_BLOCK_COST, WALK_ONE_BLOCK_COST); // we hit space immediately on entering this action
+                walk += context.jumpPenalty;
             } else {
                 walk = WALK_ONE_BLOCK_COST; // we don't hit space we just walk into the slab
             }
         } else {
+            // jumpingFromBottomSlab must be false
             if (toPlace.getBlock() == Blocks.SOUL_SAND) {
                 walk = WALK_ONE_OVER_SOUL_SAND_COST;
             } else {
-                walk = WALK_ONE_BLOCK_COST;
+                walk = Math.max(JUMP_ONE_BLOCK_COST, WALK_ONE_BLOCK_COST);
             }
+            walk += context.jumpPenalty;
         }
 
-        // cracks knuckles
+        double totalCost = walk;
-
-        double totalCost = 0;
-        totalCost += walk;
         if (hasToPlace) {
-            totalCost += context.placeBlockCost();
+            totalCost += context.placeBlockCost;
         }
-        if (srcUp2 == null) {
+        // start with srcUp2 since we already have its state
-            srcUp2 = context.get(x, y + 2, z);
+        // includeFalling isn't needed because of the falling check above -- if srcUp3 is falling we will have already exited with COST_INF if we'd actually have to break it
-        }
+        totalCost += MovementHelper.getMiningDurationTicks(context, x, y + 2, z, srcUp2, false);
-        totalCost += MovementHelper.getMiningDurationTicks(context, x, y + 2, z, srcUp2, false); // TODO MAKE ABSOLUTELY SURE we don't need includeFalling here, from the falling check above
         if (totalCost >= COST_INF) {
             return COST_INF;
         }
@@ -166,55 +157,30 @@ public class MovementAscend extends Movement {
 
         IBlockState jumpingOnto = BlockStateInterface.get(ctx, positionToPlace);
         if (!MovementHelper.canWalkOn(ctx, positionToPlace, jumpingOnto)) {
-            for (int i = 0; i < 4; i++) {
+            ticksWithoutPlacement++;
-                BlockPos anAgainst = positionToPlace.offset(HORIZONTALS[i]);
+            if (MovementHelper.attemptToPlaceABlock(state, baritone, dest.down(), false) == PlaceResult.READY_TO_PLACE) {
-                if (anAgainst.equals(src)) {
+                state.setInput(Input.SNEAK, true);
-                    continue;
+                if (ctx.player().isSneaking()) {
-                }
+                    state.setInput(Input.CLICK_RIGHT, true);
-                if (MovementHelper.canPlaceAgainst(ctx, anAgainst)) {
-                    if (!MovementHelper.throwaway(ctx, true)) {//get ready to place a throwaway block
-                        return state.setStatus(MovementStatus.UNREACHABLE);
-                    }
-                    double faceX = (dest.getX() + anAgainst.getX() + 1.0D) * 0.5D;
-                    double faceY = (dest.getY() + anAgainst.getY()) * 0.5D;
-                    double faceZ = (dest.getZ() + anAgainst.getZ() + 1.0D) * 0.5D;
-                    state.setTarget(new MovementState.MovementTarget(RotationUtils.calcRotationFromVec3d(ctx.playerHead(), new Vec3d(faceX, faceY, faceZ), ctx.playerRotations()), true));
-                    EnumFacing side = ctx.objectMouseOver().sideHit;
-
-                    ctx.getSelectedBlock().ifPresent(selectedBlock -> {
-                        if (Objects.equals(selectedBlock, anAgainst) && selectedBlock.offset(side).equals(positionToPlace)) {
-                            ticksWithoutPlacement++;
-                            state.setInput(Input.SNEAK, true);
-                            if (ctx.player().isSneaking()) {
-                                state.setInput(Input.CLICK_RIGHT, true);
-                            }
-                            if (ticksWithoutPlacement > 10) {
-                                // After 10 ticks without placement, we might be standing in the way, move back
-                                state.setInput(Input.MOVE_BACK, true);
-                            }
-                        } else {
-                            state.setInput(Input.CLICK_LEFT, true); // break whatever replaceable block is in the way
-                        }
-                        //System.out.println("Trying to look at " + anAgainst + ", actually looking at" + selectedBlock);
-                    });
-                    return state;
                 }
             }
-            return state.setStatus(MovementStatus.UNREACHABLE);
+            if (ticksWithoutPlacement > 10) {
+                // After 10 ticks without placement, we might be standing in the way, move back
+                state.setInput(Input.MOVE_BACK, true);
+            }
+
+            return state;
         }
         MovementHelper.moveTowards(ctx, state, dest);
         if (MovementHelper.isBottomSlab(jumpingOnto) && !MovementHelper.isBottomSlab(BlockStateInterface.get(ctx, src.down()))) {
             return state; // don't jump while walking from a non double slab into a bottom slab
         }
 
-        if (Baritone.settings().assumeStep.get()) {
+        if (Baritone.settings().assumeStep.get() || ctx.playerFeet().equals(src.up())) {
+            // no need to hit space if we're already jumping
             return state;
         }
 
-        if (ctx.playerFeet().equals(src.up())) {
-            return state; // no need to hit space if we're already jumping
-        }
-
         if (headBonkClear()) {
             return state.setInput(Input.JUMP, true);
         }

src/main/java/baritone/pathing/movement/movements/MovementDescend.java

@@ -17,7 +17,6 @@
 
 package baritone.pathing.movement.movements;
 
-import baritone.Baritone;
 import baritone.api.IBaritone;
 import baritone.api.pathing.movement.MovementStatus;
 import baritone.api.utils.BetterBlockPos;
@@ -53,7 +52,7 @@ public class MovementDescend extends Movement {
     }
 
     @Override
-    protected double calculateCost(CalculationContext context) {
+    public double calculateCost(CalculationContext context) {
         MutableMoveResult result = new MutableMoveResult();
         cost(context, src.x, src.y, src.z, dest.x, dest.z, result);
         if (result.y != dest.y) {
@@ -63,11 +62,6 @@ public class MovementDescend extends Movement {
     }
 
     public static void cost(CalculationContext context, int x, int y, int z, int destX, int destZ, MutableMoveResult res) {
-        Block fromDown = context.get(x, y - 1, z).getBlock();
-        if (fromDown == Blocks.LADDER || fromDown == Blocks.VINE) {
-            return;
-        }
-
         double totalCost = 0;
         IBlockState destDown = context.get(destX, y - 1, destZ);
         totalCost += MovementHelper.getMiningDurationTicks(context, destX, y - 1, destZ, destDown, false);
@@ -83,6 +77,11 @@ public class MovementDescend extends Movement {
             return;
         }
 
+        Block fromDown = context.get(x, y - 1, z).getBlock();
+        if (fromDown == Blocks.LADDER || fromDown == Blocks.VINE) {
+            return;
+        }
+
         // A
         //SA
         // A
@@ -94,7 +93,7 @@ public class MovementDescend extends Movement {
         //C, D, etc determine the length of the fall
 
         IBlockState below = context.get(destX, y - 2, destZ);
-        if (!MovementHelper.canWalkOn(context.bsi(), destX, y - 2, destZ, below)) {
+        if (!MovementHelper.canWalkOn(context.bsi, destX, y - 2, destZ, below)) {
             dynamicFallCost(context, x, y, z, destX, destZ, totalCost, below, res);
             return;
         }
@@ -107,7 +106,7 @@ public class MovementDescend extends Movement {
         double walk = WALK_OFF_BLOCK_COST;
         if (fromDown == Blocks.SOUL_SAND) {
             // use this ratio to apply the soul sand speed penalty to our 0.8 block distance
-            walk = WALK_ONE_OVER_SOUL_SAND_COST;
+            walk *= WALK_ONE_OVER_SOUL_SAND_COST / WALK_ONE_BLOCK_COST;
         }
         totalCost += walk + Math.max(FALL_N_BLOCKS_COST[1], CENTER_AFTER_FALL_COST);
         res.x = destX;
@@ -116,66 +115,81 @@ public class MovementDescend extends Movement {
         res.cost = totalCost;
     }
 
-    public static void dynamicFallCost(CalculationContext context, int x, int y, int z, int destX, int destZ, double frontBreak, IBlockState below, MutableMoveResult res) {
+    public static boolean dynamicFallCost(CalculationContext context, int x, int y, int z, int destX, int destZ, double frontBreak, IBlockState below, MutableMoveResult res) {
         if (frontBreak != 0 && context.get(destX, y + 2, destZ).getBlock() instanceof BlockFalling) {
             // if frontBreak is 0 we can actually get through this without updating the falling block and making it actually fall
             // but if frontBreak is nonzero, we're breaking blocks in front, so don't let anything fall through this column,
             // and potentially replace the water we're going to fall into
-            return;
+            return false;
         }
-        if (!MovementHelper.canWalkThrough(context.bsi(), destX, y - 2, destZ, below) && below.getBlock() != Blocks.WATER) {
+        if (!MovementHelper.canWalkThrough(context.bsi, destX, y - 2, destZ, below) && below.getBlock() != Blocks.WATER) {
-            return;
+            return false;
         }
+        double costSoFar = 0;
+        int effectiveStartHeight = y;
         for (int fallHeight = 3; true; fallHeight++) {
             int newY = y - fallHeight;
             if (newY < 0) {
                 // when pathing in the end, where you could plausibly fall into the void
                 // this check prevents it from getting the block at y=-1 and crashing
-                return;
+                return false;
             }
             IBlockState ontoBlock = context.get(destX, newY, destZ);
-            double tentativeCost = WALK_OFF_BLOCK_COST + FALL_N_BLOCKS_COST[fallHeight] + frontBreak;
+            int unprotectedFallHeight = fallHeight - (y - effectiveStartHeight); // equal to fallHeight - y + effectiveFallHeight, which is equal to -newY + effectiveFallHeight, which is equal to effectiveFallHeight - newY
-            if (ontoBlock.getBlock() == Blocks.WATER && !MovementHelper.isFlowing(ontoBlock) && context.getBlock(destX, newY + 1, destZ) != Blocks.WATERLILY) { // TODO flowing check required here?
+            double tentativeCost = WALK_OFF_BLOCK_COST + FALL_N_BLOCKS_COST[unprotectedFallHeight] + frontBreak + costSoFar;
+            if ((ontoBlock.getBlock() == Blocks.WATER || ontoBlock.getBlock() == Blocks.FLOWING_WATER) && context.getBlock(destX, newY + 1, destZ) != Blocks.WATERLILY) {
                 // lilypads are canWalkThrough, but we can't end a fall that should be broken by water if it's covered by a lilypad
                 // however, don't return impossible in the lilypad scenario, because we could still jump right on it (water that's below a lilypad is canWalkOn so it works)
-                if (Baritone.settings().assumeWalkOnWater.get()) {
+                if (context.assumeWalkOnWater) {
-                    return; // TODO fix
+                    return false; // TODO fix
+                }
+                if (MovementHelper.isFlowing(ontoBlock)) {
+                    return false; // TODO flowing check required here?
+                }
+                if (!MovementHelper.canWalkOn(context.bsi, destX, newY - 1, destZ)) {
+                    // we could punch right through the water into something else
+                    return false;
                 }
                 // found a fall into water
                 res.x = destX;
                 res.y = newY;
                 res.z = destZ;
                 res.cost = tentativeCost;// TODO incorporate water swim up cost?
-                return;
+                return false;
             }
-            if (ontoBlock.getBlock() == Blocks.FLOWING_WATER) {
+            if (unprotectedFallHeight <= 11 && (ontoBlock.getBlock() == Blocks.VINE || ontoBlock.getBlock() == Blocks.LADDER)) {
-                return;
+                // if fall height is greater than or equal to 11, we don't actually grab on to vines or ladders. the more you know
-            }
+                // this effectively "resets" our falling speed
-            if (MovementHelper.canWalkThrough(context.bsi(), destX, newY, destZ, ontoBlock)) {
+                costSoFar += FALL_N_BLOCKS_COST[unprotectedFallHeight - 1];// we fall until the top of this block (not including this block)
+                costSoFar += LADDER_DOWN_ONE_COST;
+                effectiveStartHeight = newY;
                 continue;
             }
-            if (!MovementHelper.canWalkOn(context.bsi(), destX, newY, destZ, ontoBlock)) {
+            if (MovementHelper.canWalkThrough(context.bsi, destX, newY, destZ, ontoBlock)) {
-                return;
+                continue;
+            }
+            if (!MovementHelper.canWalkOn(context.bsi, destX, newY, destZ, ontoBlock)) {
+                return false;
             }
             if (MovementHelper.isBottomSlab(ontoBlock)) {
-                return; // falling onto a half slab is really glitchy, and can cause more fall damage than we'd expect
+                return false; // falling onto a half slab is really glitchy, and can cause more fall damage than we'd expect
             }
-            if (context.hasWaterBucket() && fallHeight <= context.maxFallHeightBucket() + 1) {
+            if (unprotectedFallHeight <= context.maxFallHeightNoWater + 1) {
-                res.x = destX;
-                res.y = newY + 1;// this is the block we're falling onto, so dest is +1
-                res.z = destZ;
-                res.cost = tentativeCost + context.placeBlockCost();
-                return;
-            }
-            if (fallHeight <= context.maxFallHeightNoWater() + 1) {
                 // fallHeight = 4 means onto.up() is 3 blocks down, which is the max
                 res.x = destX;
                 res.y = newY + 1;
                 res.z = destZ;
                 res.cost = tentativeCost;
-                return;
+                return false;
+            }
+            if (context.hasWaterBucket && unprotectedFallHeight <= context.maxFallHeightBucket + 1) {
+                res.x = destX;
+                res.y = newY + 1;// this is the block we're falling onto, so dest is +1
+                res.z = destZ;
+                res.cost = tentativeCost + context.placeBlockCost;
+                return true;
             } else {
-                return;
+                return false;
             }
         }
     }
@@ -218,8 +232,7 @@ public class MovementDescend extends Movement {
             if (numTicks++ < 20) {
                 MovementHelper.moveTowards(ctx, state, fakeDest);
                 if (fromStart > 1.25) {
-                    state.setInput(Input.MOVE_FORWARD, false);
+                    state.getTarget().rotation = new Rotation(state.getTarget().rotation.getYaw() + 180F, state.getTarget().rotation.getPitch());
-                    state.setInput(Input.MOVE_BACK, true);
                 }
             } else {
                 MovementHelper.moveTowards(ctx, state, dest);

src/main/java/baritone/pathing/movement/movements/MovementDiagonal.java

@@ -25,6 +25,8 @@ import baritone.pathing.movement.CalculationContext;
 import baritone.pathing.movement.Movement;
 import baritone.pathing.movement.MovementHelper;
 import baritone.pathing.movement.MovementState;
+import baritone.utils.BlockStateInterface;
+import baritone.utils.pathing.MutableMoveResult;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
@@ -38,13 +40,13 @@ public class MovementDiagonal extends Movement {
 
     private static final double SQRT_2 = Math.sqrt(2);
 
-    public MovementDiagonal(IBaritone baritone, BetterBlockPos start, EnumFacing dir1, EnumFacing dir2) {
+    public MovementDiagonal(IBaritone baritone, BetterBlockPos start, EnumFacing dir1, EnumFacing dir2, int dy) {
-        this(baritone, start, start.offset(dir1), start.offset(dir2), dir2);
+        this(baritone, start, start.offset(dir1), start.offset(dir2), dir2, dy);
         // super(start, start.offset(dir1).offset(dir2), new BlockPos[]{start.offset(dir1), start.offset(dir1).up(), start.offset(dir2), start.offset(dir2).up(), start.offset(dir1).offset(dir2), start.offset(dir1).offset(dir2).up()}, new BlockPos[]{start.offset(dir1).offset(dir2).down()});
     }
 
-    private MovementDiagonal(IBaritone baritone, BetterBlockPos start, BetterBlockPos dir1, BetterBlockPos dir2, EnumFacing drr2) {
+    private MovementDiagonal(IBaritone baritone, BetterBlockPos start, BetterBlockPos dir1, BetterBlockPos dir2, EnumFacing drr2, int dy) {
-        this(baritone, start, dir1.offset(drr2), dir1, dir2);
+        this(baritone, start, dir1.offset(drr2).up(dy), dir1, dir2);
     }
 
     private MovementDiagonal(IBaritone baritone, BetterBlockPos start, BetterBlockPos end, BetterBlockPos dir1, BetterBlockPos dir2) {
@@ -52,38 +54,49 @@ public class MovementDiagonal extends Movement {
     }
 
     @Override
-    protected double calculateCost(CalculationContext context) {
+    public double calculateCost(CalculationContext context) {
-        return cost(context, src.x, src.y, src.z, dest.x, dest.z);
+        MutableMoveResult result = new MutableMoveResult();
+        cost(context, src.x, src.y, src.z, dest.x, dest.z, result);
+        if (result.y != dest.y) {
+            return COST_INF; // doesn't apply to us, this position is incorrect
+        }
+        return result.cost;
     }
 
-    public static double cost(CalculationContext context, int x, int y, int z, int destX, int destZ) {
+    public static void cost(CalculationContext context, int x, int y, int z, int destX, int destZ, MutableMoveResult res) {
-        Block fromDown = context.get(x, y - 1, z).getBlock();
-        if (fromDown == Blocks.LADDER || fromDown == Blocks.VINE) {
-            return COST_INF;
-        }
         IBlockState destInto = context.get(destX, y, destZ);
-        if (!MovementHelper.canWalkThrough(context.bsi(), destX, y, destZ, destInto) || !MovementHelper.canWalkThrough(context.bsi(), destX, y + 1, destZ)) {
+        if (!MovementHelper.canWalkThrough(context.bsi, destX, y, destZ, destInto) || !MovementHelper.canWalkThrough(context.bsi, destX, y + 1, destZ)) {
-            return COST_INF;
+            return;
         }
         IBlockState destWalkOn = context.get(destX, y - 1, destZ);
-        if (!MovementHelper.canWalkOn(context.bsi(), destX, y - 1, destZ, destWalkOn)) {
+        boolean descend = false;
-            return COST_INF;
+        if (!MovementHelper.canWalkOn(context.bsi, destX, y - 1, destZ, destWalkOn)) {
+            descend = true;
+            if (!context.allowDiagonalDescend || !MovementHelper.canWalkOn(context.bsi, destX, y - 2, destZ) || !MovementHelper.canWalkThrough(context.bsi, destX, y - 1, destZ, destWalkOn)) {
+                return;
+            }
         }
         double multiplier = WALK_ONE_BLOCK_COST;
         // For either possible soul sand, that affects half of our walking
         if (destWalkOn.getBlock() == Blocks.SOUL_SAND) {
             multiplier += (WALK_ONE_OVER_SOUL_SAND_COST - WALK_ONE_BLOCK_COST) / 2;
+        } else if (destWalkOn.getBlock() == Blocks.WATER) {
+            multiplier += context.walkOnWaterOnePenalty * SQRT_2;
+        }
+        Block fromDown = context.get(x, y - 1, z).getBlock();
+        if (fromDown == Blocks.LADDER || fromDown == Blocks.VINE) {
+            return;
         }
         if (fromDown == Blocks.SOUL_SAND) {
             multiplier += (WALK_ONE_OVER_SOUL_SAND_COST - WALK_ONE_BLOCK_COST) / 2;
         }
         Block cuttingOver1 = context.get(x, y - 1, destZ).getBlock();
         if (cuttingOver1 == Blocks.MAGMA || MovementHelper.isLava(cuttingOver1)) {
-            return COST_INF;
+            return;
         }
         Block cuttingOver2 = context.get(destX, y - 1, z).getBlock();
         if (cuttingOver2 == Blocks.MAGMA || MovementHelper.isLava(cuttingOver2)) {
-            return COST_INF;
+            return;
         }
         IBlockState pb0 = context.get(x, y, destZ);
         IBlockState pb2 = context.get(destX, y, z);
@@ -92,46 +105,61 @@ public class MovementDiagonal extends Movement {
         if (optionA != 0 && optionB != 0) {
             // check these one at a time -- if pb0 and pb2 were nonzero, we already know that (optionA != 0 && optionB != 0)
             // so no need to check pb1 as well, might as well return early here
-            return COST_INF;
+            return;
         }
         IBlockState pb1 = context.get(x, y + 1, destZ);
         optionA += MovementHelper.getMiningDurationTicks(context, x, y + 1, destZ, pb1, true);
         if (optionA != 0 && optionB != 0) {
             // same deal, if pb1 makes optionA nonzero and option B already was nonzero, pb3 can't affect the result
-            return COST_INF;
+            return;
         }
         IBlockState pb3 = context.get(destX, y + 1, z);
         if (optionA == 0 && ((MovementHelper.avoidWalkingInto(pb2.getBlock()) && pb2.getBlock() != Blocks.WATER) || (MovementHelper.avoidWalkingInto(pb3.getBlock()) && pb3.getBlock() != Blocks.WATER))) {
             // at this point we're done calculating optionA, so we can check if it's actually possible to edge around in that direction
-            return COST_INF;
+            return;
         }
         optionB += MovementHelper.getMiningDurationTicks(context, destX, y + 1, z, pb3, true);
         if (optionA != 0 && optionB != 0) {
             // and finally, if the cost is nonzero for both ways to approach this diagonal, it's not possible
-            return COST_INF;
+            return;
         }
         if (optionB == 0 && ((MovementHelper.avoidWalkingInto(pb0.getBlock()) && pb0.getBlock() != Blocks.WATER) || (MovementHelper.avoidWalkingInto(pb1.getBlock()) && pb1.getBlock() != Blocks.WATER))) {
             // and now that option B is fully calculated, see if we can edge around that way
-            return COST_INF;
+            return;
         }
         boolean water = false;
-        if (MovementHelper.isWater(context.getBlock(x, y, z)) || MovementHelper.isWater(destInto.getBlock())) {
+        Block startIn = context.getBlock(x, y, z);
+        if (MovementHelper.isWater(startIn) || MovementHelper.isWater(destInto.getBlock())) {
             // Ignore previous multiplier
             // Whatever we were walking on (possibly soul sand) doesn't matter as we're actually floating on water
             // Not even touching the blocks below
-            multiplier = context.waterWalkSpeed();
+            multiplier = context.waterWalkSpeed;
             water = true;
         }
         if (optionA != 0 || optionB != 0) {
             multiplier *= SQRT_2 - 0.001; // TODO tune
+            if (startIn == Blocks.LADDER || startIn == Blocks.VINE) {
+                // edging around doesn't work if doing so would climb a ladder or vine instead of moving sideways
+                return;
+            }
+        } else {
+            // only can sprint if not edging around
+            if (context.canSprint && !water) {
+                // If we aren't edging around anything, and we aren't in water
+                // We can sprint =D
+                // Don't check for soul sand, since we can sprint on that too
+                multiplier *= SPRINT_MULTIPLIER;
+            }
         }
-        if (context.canSprint() && !water) {
+        res.cost = multiplier * SQRT_2;
-            // If we aren't edging around anything, and we aren't in water
+        if (descend) {
-            // We can sprint =D
+            res.cost += Math.max(FALL_N_BLOCKS_COST[1], CENTER_AFTER_FALL_COST);
-            // Don't check for soul sand, since we can sprint on that too
+            res.y = y - 1;
-            multiplier *= SPRINT_MULTIPLIER;
+        } else {
+            res.y = y;
         }
-        return multiplier * SQRT_2;
+        res.x = destX;
+        res.z = destZ;
     }
 
     @Override
@@ -158,13 +186,13 @@ public class MovementDiagonal extends Movement {
     }
 
     @Override
-    public List<BlockPos> toBreak() {
+    public List<BlockPos> toBreak(BlockStateInterface bsi) {
         if (toBreakCached != null) {
             return toBreakCached;
         }
         List<BlockPos> result = new ArrayList<>();
         for (int i = 4; i < 6; i++) {
-            if (!MovementHelper.canWalkThrough(ctx, positionsToBreak[i])) {
+            if (!MovementHelper.canWalkThrough(bsi, positionsToBreak[i].x, positionsToBreak[i].y, positionsToBreak[i].z)) {
                 result.add(positionsToBreak[i]);
             }
         }
@@ -173,13 +201,13 @@ public class MovementDiagonal extends Movement {
     }
 
     @Override
-    public List<BlockPos> toWalkInto() {
+    public List<BlockPos> toWalkInto(BlockStateInterface bsi) {
         if (toWalkIntoCached == null) {
             toWalkIntoCached = new ArrayList<>();
         }
         List<BlockPos> result = new ArrayList<>();
         for (int i = 0; i < 4; i++) {
-            if (!MovementHelper.canWalkThrough(ctx, positionsToBreak[i])) {
+            if (!MovementHelper.canWalkThrough(bsi, positionsToBreak[i].x, positionsToBreak[i].y, positionsToBreak[i].z)) {
                 result.add(positionsToBreak[i]);
             }
         }

src/main/java/baritone/pathing/movement/movements/MovementDownward.java

@@ -43,22 +43,21 @@ public class MovementDownward extends Movement {
     }
 
     @Override
-    protected double calculateCost(CalculationContext context) {
+    public double calculateCost(CalculationContext context) {
         return cost(context, src.x, src.y, src.z);
     }
 
     public static double cost(CalculationContext context, int x, int y, int z) {
-        if (!MovementHelper.canWalkOn(context.bsi(), x, y - 2, z)) {
+        if (!MovementHelper.canWalkOn(context.bsi, x, y - 2, z)) {
             return COST_INF;
         }
-        IBlockState d = context.get(x, y - 1, z);
+        IBlockState down = context.get(x, y - 1, z);
-        Block td = d.getBlock();
+        Block downBlock = down.getBlock();
-        boolean ladder = td == Blocks.LADDER || td == Blocks.VINE;
+        if (downBlock == Blocks.LADDER || downBlock == Blocks.VINE) {
-        if (ladder) {
             return LADDER_DOWN_ONE_COST;
         } else {
             // we're standing on it, while it might be block falling, it'll be air by the time we get here in the movement
-            return FALL_N_BLOCKS_COST[1] + MovementHelper.getMiningDurationTicks(context, x, y - 1, z, d, false);
+            return FALL_N_BLOCKS_COST[1] + MovementHelper.getMiningDurationTicks(context, x, y - 1, z, down, false);
         }
     }
 

src/main/java/baritone/pathing/movement/movements/MovementFall.java

@@ -17,7 +17,6 @@
 
 package baritone.pathing.movement.movements;
 
-import baritone.Baritone;
 import baritone.api.IBaritone;
 import baritone.api.pathing.movement.MovementStatus;
 import baritone.api.utils.BetterBlockPos;
@@ -31,12 +30,20 @@ import baritone.pathing.movement.MovementHelper;
 import baritone.pathing.movement.MovementState;
 import baritone.pathing.movement.MovementState.MovementTarget;
 import baritone.utils.pathing.MutableMoveResult;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockLadder;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.math.Vec3i;
+
+import java.util.Optional;
 
 public class MovementFall extends Movement {
 
@@ -48,7 +55,7 @@ public class MovementFall extends Movement {
     }
 
     @Override
-    protected double calculateCost(CalculationContext context) {
+    public double calculateCost(CalculationContext context) {
         MutableMoveResult result = new MutableMoveResult();
         MovementDescend.cost(context, src.x, src.y, src.z, dest.x, dest.z, result);
         if (result.y != dest.y) {
@@ -57,6 +64,12 @@ public class MovementFall extends Movement {
         return result.cost;
     }
 
+    private boolean willPlaceBucket() {
+        CalculationContext context = new CalculationContext(baritone);
+        MutableMoveResult result = new MutableMoveResult();
+        return MovementDescend.dynamicFallCost(context, src.x, src.y, src.z, dest.x, dest.z, 0, context.get(dest.x, src.y - 2, dest.z), result);
+    }
+
     @Override
     public MovementState updateState(MovementState state) {
         super.updateState(state);
@@ -67,7 +80,9 @@ public class MovementFall extends Movement {
         BlockPos playerFeet = ctx.playerFeet();
         Rotation toDest = RotationUtils.calcRotationFromVec3d(ctx.playerHead(), VecUtils.getBlockPosCenter(dest));
         Rotation targetRotation = null;
-        if (!MovementHelper.isWater(ctx, dest) && src.getY() - dest.getY() > Baritone.settings().maxFallHeightNoWater.get() && !playerFeet.equals(dest)) {
+        Block destBlock = ctx.world().getBlockState(dest).getBlock();
+        boolean isWater = destBlock == Blocks.WATER || destBlock == Blocks.FLOWING_WATER;
+        if (!isWater && willPlaceBucket() && !playerFeet.equals(dest)) {
             if (!InventoryPlayer.isHotbar(ctx.player().inventory.getSlotFor(STACK_BUCKET_WATER)) || ctx.world().provider.isNether()) {
                 return state.setStatus(MovementStatus.UNREACHABLE);
             }
@@ -78,7 +93,7 @@ public class MovementFall extends Movement {
                 targetRotation = new Rotation(toDest.getYaw(), 90.0F);
 
                 RayTraceResult trace = ctx.objectMouseOver();
-                if (trace != null && trace.typeOfHit == RayTraceResult.Type.BLOCK && ctx.player().rotationPitch > 89.0F) {
+                if (trace != null && trace.typeOfHit == RayTraceResult.Type.BLOCK && (trace.getBlockPos().equals(dest) || trace.getBlockPos().equals(dest.down()))) {
                     state.setInput(Input.CLICK_RIGHT, true);
                 }
             }
@@ -88,8 +103,8 @@ public class MovementFall extends Movement {
         } else {
             state.setTarget(new MovementTarget(toDest, false));
         }
-        if (playerFeet.equals(dest) && (ctx.player().posY - playerFeet.getY() < 0.094 || MovementHelper.isWater(ctx, dest))) { // 0.094 because lilypads
+        if (playerFeet.equals(dest) && (ctx.player().posY - playerFeet.getY() < 0.094 || isWater)) { // 0.094 because lilypads
-            if (MovementHelper.isWater(ctx, dest)) {
+            if (isWater) { // only match water, not flowing water (which we cannot pick up with a bucket)
                 if (InventoryPlayer.isHotbar(ctx.player().inventory.getSlotFor(STACK_BUCKET_EMPTY))) {
                     ctx.player().inventory.currentItem = ctx.player().inventory.getSlotFor(STACK_BUCKET_EMPTY);
                     if (ctx.player().motionY >= 0) {
@@ -107,12 +122,40 @@ public class MovementFall extends Movement {
             }
         }
         Vec3d destCenter = VecUtils.getBlockPosCenter(dest); // we are moving to the 0.5 center not the edge (like if we were falling on a ladder)
-        if (Math.abs(ctx.player().posX - destCenter.x) > 0.15 || Math.abs(ctx.player().posZ - destCenter.z) > 0.15) {
+        if (Math.abs(ctx.player().posX + ctx.player().motionX - destCenter.x) > 0.1 || Math.abs(ctx.player().posZ + ctx.player().motionZ - destCenter.z) > 0.1) {
+            if (!ctx.player().onGround && Math.abs(ctx.player().motionY) > 0.4) {
+                state.setInput(Input.SNEAK, true);
+            }
             state.setInput(Input.MOVE_FORWARD, true);
         }
+        Vec3i avoid = Optional.ofNullable(avoid()).map(EnumFacing::getDirectionVec).orElse(null);
+        if (avoid == null) {
+            avoid = src.subtract(dest);
+        } else {
+            double dist = Math.abs(avoid.getX() * (destCenter.x - avoid.getX() / 2.0 - ctx.player().posX)) + Math.abs(avoid.getZ() * (destCenter.z - avoid.getZ() / 2.0 - ctx.player().posZ));
+            if (dist < 0.6) {
+                state.setInput(Input.MOVE_FORWARD, true);
+            } else if (!ctx.player().onGround) {
+                state.setInput(Input.SNEAK, false);
+            }
+        }
+        if (targetRotation == null) {
+            Vec3d destCenterOffset = new Vec3d(destCenter.x + 0.125 * avoid.getX(), destCenter.y, destCenter.z + 0.125 * avoid.getZ());
+            state.setTarget(new MovementTarget(RotationUtils.calcRotationFromVec3d(ctx.playerHead(), destCenterOffset), false));
+        }
         return state;
     }
 
+    private EnumFacing avoid() {
+        for (int i = 0; i < 15; i++) {
+            IBlockState state = ctx.world().getBlockState(ctx.playerFeet().down(i));
+            if (state.getBlock() == Blocks.LADDER) {
+                return state.getValue(BlockLadder.FACING);
+            }
+        }
+        return null;
+    }
+
     @Override
     public boolean safeToCancel(MovementState state) {
         // if we haven't started walking off the edge yet, or if we're in the process of breaking blocks before doing the fall

src/main/java/baritone/pathing/movement/movements/MovementParkour.java

@@ -17,35 +17,24 @@
 
 package baritone.pathing.movement.movements;
 
-import baritone.Baritone;
 import baritone.api.IBaritone;
 import baritone.api.pathing.movement.MovementStatus;
 import baritone.api.utils.BetterBlockPos;
-import baritone.api.utils.RayTraceUtils;
-import baritone.api.utils.Rotation;
-import baritone.api.utils.RotationUtils;
 import baritone.api.utils.input.Input;
 import baritone.pathing.movement.CalculationContext;
 import baritone.pathing.movement.Movement;
 import baritone.pathing.movement.MovementHelper;
 import baritone.pathing.movement.MovementState;
 import baritone.utils.BlockStateInterface;
-import baritone.utils.Helper;
 import baritone.utils.pathing.MutableMoveResult;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockStairs;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.math.Vec3d;
-
-import java.util.Objects;
 
 public class MovementParkour extends Movement {
 
-    private static final EnumFacing[] HORIZONTALS_BUT_ALSO_DOWN____SO_EVERY_DIRECTION_EXCEPT_UP = {EnumFacing.NORTH, EnumFacing.SOUTH, EnumFacing.EAST, EnumFacing.WEST, EnumFacing.DOWN};
     private static final BetterBlockPos[] EMPTY = new BetterBlockPos[]{};
 
     private final EnumFacing direction;
@@ -65,24 +54,25 @@ public class MovementParkour extends Movement {
     }
 
     public static void cost(CalculationContext context, int x, int y, int z, EnumFacing dir, MutableMoveResult res) {
-        if (!Baritone.settings().allowParkour.get()) {
+        if (!context.allowParkour) {
             return;
         }
-        IBlockState standingOn = context.get(x, y - 1, z);
+        if (y == 256 && !context.allowJumpAt256) {
-        if (standingOn.getBlock() == Blocks.VINE || standingOn.getBlock() == Blocks.LADDER || standingOn.getBlock() instanceof BlockStairs || MovementHelper.isBottomSlab(standingOn)) {
-            return;
-        }
-        int xDiff = dir.getXOffset();
-        int zDiff = dir.getZOffset();
-        IBlockState adj = context.get(x + xDiff, y - 1, z + zDiff);
-        if (MovementHelper.avoidWalkingInto(adj.getBlock()) && adj.getBlock() != Blocks.WATER && adj.getBlock() != Blocks.FLOWING_WATER) { // magma sucks
-            return;
-        }
-        if (MovementHelper.canWalkOn(context.bsi(), x + xDiff, y - 1, z + zDiff, adj)) { // don't parkour if we could just traverse (for now)
             return;
         }
 
+        int xDiff = dir.getXOffset();
+        int zDiff = dir.getZOffset();
         if (!MovementHelper.fullyPassable(context, x + xDiff, y, z + zDiff)) {
+            // most common case at the top -- the adjacent block isn't air
+            return;
+        }
+        IBlockState adj = context.get(x + xDiff, y - 1, z + zDiff);
+        if (MovementHelper.canWalkOn(context.bsi, x + xDiff, y - 1, z + zDiff, adj)) { // don't parkour if we could just traverse (for now)
+            // second most common case -- we could just traverse not parkour
+            return;
+        }
+        if (MovementHelper.avoidWalkingInto(adj.getBlock()) && adj.getBlock() != Blocks.WATER && adj.getBlock() != Blocks.FLOWING_WATER) { // magma sucks
             return;
         }
         if (!MovementHelper.fullyPassable(context, x + xDiff, y + 1, z + zDiff)) {
@@ -94,11 +84,15 @@ public class MovementParkour extends Movement {
         if (!MovementHelper.fullyPassable(context, x, y + 2, z)) {
             return;
         }
+        IBlockState standingOn = context.get(x, y - 1, z);
+        if (standingOn.getBlock() == Blocks.VINE || standingOn.getBlock() == Blocks.LADDER || standingOn.getBlock() instanceof BlockStairs || MovementHelper.isBottomSlab(standingOn)) {
+            return;
+        }
         int maxJump;
         if (standingOn.getBlock() == Blocks.SOUL_SAND) {
             maxJump = 2; // 1 block gap
         } else {
-            if (context.canSprint()) {
+            if (context.canSprint) {
                 maxJump = 4;
             } else {
                 maxJump = 3;
@@ -111,44 +105,41 @@ public class MovementParkour extends Movement {
                     return;
                 }
             }
-            if (MovementHelper.canWalkOn(context.bsi(), x + xDiff * i, y - 1, z + zDiff * i)) {
+            if (MovementHelper.canWalkOn(context.bsi, x + xDiff * i, y - 1, z + zDiff * i)) {
                 res.x = x + xDiff * i;
                 res.y = y;
                 res.z = z + zDiff * i;
-                res.cost = costFromJumpDistance(i);
+                res.cost = costFromJumpDistance(i) + context.jumpPenalty;
                 return;
             }
         }
         if (maxJump != 4) {
             return;
         }
-        if (!Baritone.settings().allowParkourPlace.get()) {
+        if (!context.allowParkourPlace) {
-            return;
-        }
-        if (!Baritone.settings().allowPlace.get()) {
-            Helper.HELPER.logDirect("allowParkourPlace enabled but allowPlace disabled?");
             return;
         }
         int destX = x + 4 * xDiff;
         int destZ = z + 4 * zDiff;
-        IBlockState toPlace = context.get(destX, y - 1, destZ);
         if (!context.canPlaceThrowawayAt(destX, y - 1, destZ)) {
             return;
         }
-        if (toPlace.getBlock() != Blocks.AIR && !MovementHelper.isWater(toPlace.getBlock()) && !MovementHelper.isReplacable(destX, y - 1, destZ, toPlace, context.world())) {
+        IBlockState toReplace = context.get(destX, y - 1, destZ);
+        if (!MovementHelper.isReplacable(destX, y - 1, destZ, toReplace, context.bsi)) {
             return;
         }
         for (int i = 0; i < 5; i++) {
             int againstX = destX + HORIZONTALS_BUT_ALSO_DOWN____SO_EVERY_DIRECTION_EXCEPT_UP[i].getXOffset();
+            int againstY = y - 1 + HORIZONTALS_BUT_ALSO_DOWN____SO_EVERY_DIRECTION_EXCEPT_UP[i].getYOffset();
             int againstZ = destZ + HORIZONTALS_BUT_ALSO_DOWN____SO_EVERY_DIRECTION_EXCEPT_UP[i].getZOffset();
             if (againstX == x + xDiff * 3 && againstZ == z + zDiff * 3) { // we can't turn around that fast
                 continue;
             }
-            if (MovementHelper.canPlaceAgainst(context.bsi(), againstX, y - 1, againstZ)) {
+            if (MovementHelper.canPlaceAgainst(context.bsi, againstX, againstY, againstZ)) {
                 res.x = destX;
                 res.y = y;
                 res.z = destZ;
-                res.cost = costFromJumpDistance(4) + context.placeBlockCost();
+                res.cost = costFromJumpDistance(4) + context.placeBlockCost + context.jumpPenalty;
                 return;
             }
         }
@@ -169,7 +160,7 @@ public class MovementParkour extends Movement {
 
 
     @Override
-    protected double calculateCost(CalculationContext context) {
+    public double calculateCost(CalculationContext context) {
         MutableMoveResult res = new MutableMoveResult();
         cost(context, src.x, src.y, src.z, direction, res);
         if (res.x != dest.x || res.z != dest.z) {
@@ -212,34 +203,9 @@ public class MovementParkour extends Movement {
             }
         } else if (!ctx.playerFeet().equals(src)) {
             if (ctx.playerFeet().equals(src.offset(direction)) || ctx.player().posY - ctx.playerFeet().getY() > 0.0001) {
-
+                if (!MovementHelper.canWalkOn(ctx, dest.down()) && !ctx.player().onGround && MovementHelper.attemptToPlaceABlock(state, baritone, dest.down(), true) == PlaceResult.READY_TO_PLACE) {
-                if (!MovementHelper.canWalkOn(ctx, dest.down()) && !ctx.player().onGround) {
+                    // go in the opposite order to check DOWN before all horizontals -- down is preferable because you don't have to look to the side while in midair, which could mess up the trajectory
-                    BlockPos positionToPlace = dest.down();
+                    state.setInput(Input.CLICK_RIGHT, true);
-                    for (int i = 0; i < 5; i++) {
-                        BlockPos against1 = positionToPlace.offset(HORIZONTALS_BUT_ALSO_DOWN____SO_EVERY_DIRECTION_EXCEPT_UP[i]);
-                        if (against1.up().equals(src.offset(direction, 3))) { // we can't turn around that fast
-                            continue;
-                        }
-                        if (MovementHelper.canPlaceAgainst(ctx, against1)) {
-                            if (!MovementHelper.throwaway(ctx, true)) {//get ready to place a throwaway block
-                                return state.setStatus(MovementStatus.UNREACHABLE);
-                            }
-                            double faceX = (dest.getX() + against1.getX() + 1.0D) * 0.5D;
-                            double faceY = (dest.getY() + against1.getY()) * 0.5D;
-                            double faceZ = (dest.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());
-                            if (res != null && res.typeOfHit == RayTraceResult.Type.BLOCK && res.getBlockPos().equals(against1) && res.getBlockPos().offset(res.sideHit).equals(dest.down())) {
-                                state.setTarget(new MovementState.MovementTarget(place, true));
-                            }
-                            ctx.getSelectedBlock().ifPresent(selectedBlock -> {
-                                EnumFacing side = ctx.objectMouseOver().sideHit;
-                                if (Objects.equals(selectedBlock, against1) && selectedBlock.offset(side).equals(dest.down())) {
-                                    state.setInput(Input.CLICK_RIGHT, true);
-                                }
-                            });
-                        }
-                    }
                 }
                 if (dist == 3) { // this is a 2 block gap, dest = src + direction * 3
                     double xDiff = (src.x + 0.5) - ctx.player().posX;

src/main/java/baritone/pathing/movement/movements/MovementPillar.java

@@ -35,6 +35,8 @@ import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 
+import java.util.Objects;
+
 public class MovementPillar extends Movement {
 
     public MovementPillar(IBaritone baritone, BetterBlockPos start, BetterBlockPos end) {
@@ -42,38 +44,44 @@ public class MovementPillar extends Movement {
     }
 
     @Override
-    protected double calculateCost(CalculationContext context) {
+    public double calculateCost(CalculationContext context) {
         return cost(context, src.x, src.y, src.z);
     }
 
     public static double cost(CalculationContext context, int x, int y, int z) {
-        Block fromDown = context.get(x, y, z).getBlock();
+        Block from = context.get(x, y, z).getBlock();
-        boolean ladder = fromDown instanceof BlockLadder || fromDown instanceof BlockVine;
+        boolean ladder = from == Blocks.LADDER || from == Blocks.VINE;
-        IBlockState fromDownDown = context.get(x, y - 1, z);
+        IBlockState fromDown = context.get(x, y - 1, z);
         if (!ladder) {
-            if (fromDownDown.getBlock() instanceof BlockLadder || fromDownDown.getBlock() instanceof BlockVine) {
+            if (fromDown.getBlock() == Blocks.LADDER || fromDown.getBlock() == Blocks.VINE) {
-                return COST_INF;
+                return COST_INF; // can't pillar from a ladder or vine onto something that isn't also climbable
             }
-            if (fromDownDown.getBlock() instanceof BlockSlab && !((BlockSlab) fromDownDown.getBlock()).isDouble() && fromDownDown.getValue(BlockSlab.HALF) == BlockSlab.EnumBlockHalf.BOTTOM) {
+            if (fromDown.getBlock() instanceof BlockSlab && !((BlockSlab) fromDown.getBlock()).isDouble() && fromDown.getValue(BlockSlab.HALF) == BlockSlab.EnumBlockHalf.BOTTOM) {
                 return COST_INF; // can't pillar up from a bottom slab onto a non ladder
             }
         }
-        if (fromDown instanceof BlockVine && !hasAgainst(context, x, y, z)) {
+        if (from == Blocks.VINE && !hasAgainst(context, x, y, z)) { // TODO this vine can't be climbed, but we could place a pillar still since vines are replacable, no? perhaps the pillar jump would be impossible because of the slowdown actually.
             return COST_INF;
         }
         IBlockState toBreak = context.get(x, y + 2, z);
         Block toBreakBlock = toBreak.getBlock();
-        if (toBreakBlock instanceof BlockFenceGate) {
+        if (toBreakBlock instanceof BlockFenceGate) { // see issue #172
             return COST_INF;
         }
         Block srcUp = null;
-        if (MovementHelper.isWater(toBreakBlock) && MovementHelper.isWater(fromDown)) {
+        if (MovementHelper.isWater(toBreakBlock) && MovementHelper.isWater(from)) { // TODO should this also be allowed if toBreakBlock is air?
             srcUp = context.get(x, y + 1, z).getBlock();
             if (MovementHelper.isWater(srcUp)) {
-                return LADDER_UP_ONE_COST;
+                return LADDER_UP_ONE_COST; // allow ascending pillars of water, but only if we're already in one
             }
         }
-        if (!ladder && !context.canPlaceThrowawayAt(x, y, z)) {
+        if (!ladder && !context.canPlaceThrowawayAt(x, y, z)) { // we need to place a block where we started to jump on it
+            return COST_INF;
+        }
+        if (from instanceof BlockLiquid || (fromDown.getBlock() instanceof BlockLiquid && context.assumeWalkOnWater)) {
+            // otherwise, if we're standing in water, we cannot pillar
+            // if we're standing on water and assumeWalkOnWater is true, we cannot pillar
+            // if we're standing on water and assumeWalkOnWater is false, we must have ascended to here, or sneak backplaced, so it is possible to pillar again
             return COST_INF;
         }
         double hardness = MovementHelper.getMiningDurationTicks(context, x, y + 2, z, toBreak, true);
@@ -81,10 +89,10 @@ public class MovementPillar extends Movement {
             return COST_INF;
         }
         if (hardness != 0) {
-            if (toBreakBlock instanceof BlockLadder || toBreakBlock instanceof BlockVine) {
+            if (toBreakBlock == Blocks.LADDER || toBreakBlock == Blocks.VINE) {
                 hardness = 0; // we won't actually need to break the ladder / vine because we're going to use it
             } else {
-                IBlockState check = context.get(x, y + 3, z);
+                IBlockState check = context.get(x, y + 3, z); // the block on top of the one we're going to break, could it fall on us?
                 if (check.getBlock() instanceof BlockFalling) {
                     // see MovementAscend's identical check for breaking a falling block above our head
                     if (srcUp == null) {
@@ -103,13 +111,10 @@ public class MovementPillar extends Movement {
                 //}
             }
         }
-        if (fromDown instanceof BlockLiquid || fromDownDown.getBlock() instanceof BlockLiquid) {//can't pillar on water or in water
-            return COST_INF;
-        }
         if (ladder) {
             return LADDER_UP_ONE_COST + hardness * 5;
         } else {
-            return JUMP_ONE_BLOCK_COST + context.placeBlockCost() + hardness;
+            return JUMP_ONE_BLOCK_COST + context.placeBlockCost + context.jumpPenalty + hardness;
         }
     }
 
@@ -156,8 +161,8 @@ public class MovementPillar extends Movement {
             }
             return state;
         }
-        boolean ladder = fromDown.getBlock() instanceof BlockLadder || fromDown.getBlock() instanceof BlockVine;
+        boolean ladder = fromDown.getBlock() == Blocks.LADDER || fromDown.getBlock() == Blocks.VINE;
-        boolean vine = fromDown.getBlock() instanceof BlockVine;
+        boolean vine = fromDown.getBlock() == Blocks.VINE;
         Rotation rotation = RotationUtils.calcRotationFromVec3d(ctx.player().getPositionEyes(1.0F),
                 VecUtils.getBlockPosCenter(positionToPlace),
                 new Rotation(ctx.player().rotationYaw, ctx.player().rotationPitch));
@@ -221,7 +226,7 @@ public class MovementPillar extends Movement {
                 if (!(fr instanceof BlockAir || fr.isReplaceable(ctx.world(), src))) {
                     state.setInput(Input.CLICK_LEFT, true);
                     blockIsThere = false;
-                } else if (ctx.player().isSneaking()) { // 1 tick after we're able to place
+                } else if (ctx.player().isSneaking() && (Objects.equals(src.down(), ctx.objectMouseOver().getBlockPos()) || Objects.equals(src, ctx.objectMouseOver().getBlockPos()))) {
                     state.setInput(Input.CLICK_RIGHT, true);
                 }
             }

src/main/java/baritone/pathing/movement/movements/MovementTraverse.java

@@ -30,10 +30,12 @@ import baritone.pathing.movement.Movement;
 import baritone.pathing.movement.MovementHelper;
 import baritone.pathing.movement.MovementState;
 import baritone.utils.BlockStateInterface;
-import net.minecraft.block.*;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockDoor;
+import net.minecraft.block.BlockFenceGate;
+import net.minecraft.block.BlockSlab;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
-import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 
@@ -57,7 +59,7 @@ public class MovementTraverse extends Movement {
     }
 
     @Override
-    protected double calculateCost(CalculationContext context) {
+    public double calculateCost(CalculationContext context) {
         return cost(context, src.x, src.y, src.z, dest.x, dest.z);
     }
 
@@ -66,27 +68,29 @@ public class MovementTraverse extends Movement {
         IBlockState pb1 = context.get(destX, y, destZ);
         IBlockState destOn = context.get(destX, y - 1, destZ);
         Block srcDown = context.getBlock(x, y - 1, z);
-        if (MovementHelper.canWalkOn(context.bsi(), destX, y - 1, destZ, destOn)) {//this is a walk, not a bridge
+        if (MovementHelper.canWalkOn(context.bsi, destX, y - 1, destZ, destOn)) {//this is a walk, not a bridge
             double WC = WALK_ONE_BLOCK_COST;
             boolean water = false;
             if (MovementHelper.isWater(pb0.getBlock()) || MovementHelper.isWater(pb1.getBlock())) {
-                WC = context.waterWalkSpeed();
+                WC = context.waterWalkSpeed;
                 water = true;
             } else {
                 if (destOn.getBlock() == Blocks.SOUL_SAND) {
                     WC += (WALK_ONE_OVER_SOUL_SAND_COST - WALK_ONE_BLOCK_COST) / 2;
+                } else if (destOn.getBlock() == Blocks.WATER) {
+                    WC += context.walkOnWaterOnePenalty;
                 }
                 if (srcDown == Blocks.SOUL_SAND) {
                     WC += (WALK_ONE_OVER_SOUL_SAND_COST - WALK_ONE_BLOCK_COST) / 2;
                 }
             }
-            double hardness1 = MovementHelper.getMiningDurationTicks(context, destX, y + 1, destZ, pb0, true);
+            double hardness1 = MovementHelper.getMiningDurationTicks(context, destX, y, destZ, pb1, false);
             if (hardness1 >= COST_INF) {
                 return COST_INF;
             }
-            double hardness2 = MovementHelper.getMiningDurationTicks(context, destX, y, destZ, pb1, false);
+            double hardness2 = MovementHelper.getMiningDurationTicks(context, destX, y + 1, destZ, pb0, true); // only include falling on the upper block to break
             if (hardness1 == 0 && hardness2 == 0) {
-                if (!water && context.canSprint()) {
+                if (!water && context.canSprint) {
                     // If there's nothing in the way, and this isn't water, and we aren't sneak placing
                     // We can sprint =D
                     // Don't check for soul sand, since we can sprint on that too
@@ -103,42 +107,43 @@ public class MovementTraverse extends Movement {
             if (srcDown == Blocks.LADDER || srcDown == Blocks.VINE) {
                 return COST_INF;
             }
-            if (destOn.getBlock().equals(Blocks.AIR) || MovementHelper.isReplacable(destX, y - 1, destZ, destOn, context.world())) {
+            if (MovementHelper.isReplacable(destX, y - 1, destZ, destOn, context.bsi)) {
                 boolean throughWater = MovementHelper.isWater(pb0.getBlock()) || MovementHelper.isWater(pb1.getBlock());
                 if (MovementHelper.isWater(destOn.getBlock()) && throughWater) {
+                    // this happens when assume walk on water is true and this is a traverse in water, which isn't allowed
                     return COST_INF;
                 }
                 if (!context.canPlaceThrowawayAt(destX, y - 1, destZ)) {
                     return COST_INF;
                 }
-                double hardness1 = MovementHelper.getMiningDurationTicks(context, destX, y, destZ, pb0, false);
+                double hardness1 = MovementHelper.getMiningDurationTicks(context, destX, y, destZ, pb1, false);
                 if (hardness1 >= COST_INF) {
                     return COST_INF;
                 }
-                double hardness2 = MovementHelper.getMiningDurationTicks(context, destX, y + 1, destZ, pb1, true);
+                double hardness2 = MovementHelper.getMiningDurationTicks(context, destX, y + 1, destZ, pb0, true); // only include falling on the upper block to break
-
+                double WC = throughWater ? context.waterWalkSpeed : WALK_ONE_BLOCK_COST;
-                double WC = throughWater ? context.waterWalkSpeed() : WALK_ONE_BLOCK_COST;
+                for (int i = 0; i < 5; i++) {
-                for (int i = 0; i < 4; i++) {
+                    int againstX = destX + HORIZONTALS_BUT_ALSO_DOWN____SO_EVERY_DIRECTION_EXCEPT_UP[i].getXOffset();
-                    int againstX = destX + HORIZONTALS[i].getXOffset();
+                    int againstY = y - 1 + HORIZONTALS_BUT_ALSO_DOWN____SO_EVERY_DIRECTION_EXCEPT_UP[i].getYOffset();
-                    int againstZ = destZ + HORIZONTALS[i].getZOffset();
+                    int againstZ = destZ + HORIZONTALS_BUT_ALSO_DOWN____SO_EVERY_DIRECTION_EXCEPT_UP[i].getZOffset();
-                    if (againstX == x && againstZ == z) {
+                    if (againstX == x && againstZ == z) { // this would be a backplace
                         continue;
                     }
-                    if (MovementHelper.canPlaceAgainst(context.bsi(), againstX, y - 1, againstZ)) {
+                    if (MovementHelper.canPlaceAgainst(context.bsi, againstX, againstY, againstZ)) { // found a side place option
-                        return WC + context.placeBlockCost() + hardness1 + hardness2;
+                        return WC + context.placeBlockCost + hardness1 + hardness2;
                     }
                 }
+                // now that we've checked all possible directions to side place, we actually need to backplace
                 if (srcDown == Blocks.SOUL_SAND || (srcDown instanceof BlockSlab && !((BlockSlab) srcDown).isDouble())) {
-                    return COST_INF; // can't sneak and backplace against soul sand or half slabs =/
+                    return COST_INF; // can't sneak and backplace against soul sand or half slabs (regardless of whether it's top half or bottom half) =/
                 }
                 if (srcDown == Blocks.FLOWING_WATER || srcDown == Blocks.WATER) {
                     return COST_INF; // this is obviously impossible
                 }
-                WC = WC * SNEAK_ONE_BLOCK_COST / WALK_ONE_BLOCK_COST;//since we are placing, we are sneaking
+                WC = WC * (SNEAK_ONE_BLOCK_COST / WALK_ONE_BLOCK_COST);//since we are sneak backplacing, we are sneaking lol
-                return WC + context.placeBlockCost() + hardness1 + hardness2;
+                return WC + context.placeBlockCost + hardness1 + hardness2;
             }
             return COST_INF;
-            // Out.log("Can't walk on " + Baritone.get(positionsToPlace[0]).getBlock());
         }
     }
 
@@ -180,7 +185,7 @@ public class MovementTraverse extends Movement {
         state.setInput(Input.SNEAK, false);
 
         Block fd = BlockStateInterface.get(ctx, src.down()).getBlock();
-        boolean ladder = fd instanceof BlockLadder || fd instanceof BlockVine;
+        boolean ladder = fd == Blocks.LADDER || fd == Blocks.VINE;
         IBlockState pb0 = BlockStateInterface.get(ctx, positionsToBreak[0]);
         IBlockState pb1 = BlockStateInterface.get(ctx, positionsToBreak[1]);
 
@@ -233,7 +238,7 @@ public class MovementTraverse extends Movement {
                 state.setInput(Input.SPRINT, true);
             }
             Block destDown = BlockStateInterface.get(ctx, dest.down()).getBlock();
-            if (whereAmI.getY() != dest.getY() && ladder && (destDown instanceof BlockVine || destDown instanceof BlockLadder)) {
+            if (whereAmI.getY() != dest.getY() && ladder && (destDown == Blocks.VINE || destDown == Blocks.LADDER)) {
                 new MovementPillar(baritone, dest.down(), dest).updateState(state); // i'm sorry
                 return state;
             }
@@ -241,53 +246,45 @@ public class MovementTraverse extends Movement {
             return state;
         } else {
             wasTheBridgeBlockAlwaysThere = false;
-            for (int i = 0; i < 4; i++) {
+            Block standingOn = BlockStateInterface.get(ctx, ctx.playerFeet().down()).getBlock();
-                BlockPos against1 = dest.offset(HORIZONTALS[i]);
+            if (standingOn.equals(Blocks.SOUL_SAND) || standingOn instanceof BlockSlab) { // see issue #118
-                if (against1.equals(src)) {
+                double dist = Math.max(Math.abs(dest.getX() + 0.5 - ctx.player().posX), Math.abs(dest.getZ() + 0.5 - ctx.player().posZ));
-                    continue;
+                if (dist < 0.85) { // 0.5 + 0.3 + epsilon
-                }
+                    MovementHelper.moveTowards(ctx, state, dest);
-                against1 = against1.down();
+                    return state.setInput(Input.MOVE_FORWARD, false)
-                if (MovementHelper.canPlaceAgainst(ctx, against1)) {
+                            .setInput(Input.MOVE_BACK, true);
-                    if (!MovementHelper.throwaway(ctx, true)) { // get ready to place a throwaway block
-                        logDebug("bb pls get me some blocks. dirt or cobble");
-                        return state.setStatus(MovementStatus.UNREACHABLE);
-                    }
-                    if (!Baritone.settings().assumeSafeWalk.get()) {
-                        state.setInput(Input.SNEAK, true);
-                    }
-                    Block standingOn = BlockStateInterface.get(ctx, ctx.playerFeet().down()).getBlock();
-                    if (standingOn.equals(Blocks.SOUL_SAND) || standingOn instanceof BlockSlab) { // see issue #118
-                        double dist = Math.max(Math.abs(dest.getX() + 0.5 - ctx.player().posX), Math.abs(dest.getZ() + 0.5 - ctx.player().posZ));
-                        if (dist < 0.85) { // 0.5 + 0.3 + epsilon
-                            MovementHelper.moveTowards(ctx, state, dest);
-                            return state.setInput(Input.MOVE_FORWARD, false)
-                                    .setInput(Input.MOVE_BACK, true);
-                        }
-                    }
-                    state.setInput(Input.MOVE_BACK, false);
-                    double faceX = (dest.getX() + against1.getX() + 1.0D) * 0.5D;
-                    double faceY = (dest.getY() + against1.getY()) * 0.5D;
-                    double faceZ = (dest.getZ() + against1.getZ() + 1.0D) * 0.5D;
-                    state.setTarget(new MovementState.MovementTarget(RotationUtils.calcRotationFromVec3d(ctx.playerHead(), new Vec3d(faceX, faceY, faceZ), ctx.playerRotations()), true));
-
-                    EnumFacing side = ctx.objectMouseOver().sideHit;
-                    if (Objects.equals(ctx.getSelectedBlock().orElse(null), against1) && (ctx.player().isSneaking() || Baritone.settings().assumeSafeWalk.get()) && ctx.getSelectedBlock().get().offset(side).equals(positionToPlace)) {
-                        return state.setInput(Input.CLICK_RIGHT, true);
-                    }
-                    //System.out.println("Trying to look at " + against1 + ", actually looking at" + RayTraceUtils.getSelectedBlock());
-                    return state.setInput(Input.CLICK_LEFT, true);
                 }
             }
-            if (!Baritone.settings().assumeSafeWalk.get()) {
+            double dist1 = Math.max(Math.abs(ctx.player().posX - (dest.getX() + 0.5D)), Math.abs(ctx.player().posZ - (dest.getZ() + 0.5D)));
+            PlaceResult p = MovementHelper.attemptToPlaceABlock(state, baritone, dest.down(), false);
+            if ((p == PlaceResult.READY_TO_PLACE || dist1 < 0.6) && !Baritone.settings().assumeSafeWalk.get()) {
                 state.setInput(Input.SNEAK, true);
             }
+            switch (p) {
+                case READY_TO_PLACE: {
+                    if (ctx.player().isSneaking() || Baritone.settings().assumeSafeWalk.get()) {
+                        state.setInput(Input.CLICK_RIGHT, true);
+                    }
+                    return state;
+                }
+                case ATTEMPTING: {
+                    if (dist1 > 0.83) {
+                        // might need to go forward a bit
+                        float yaw = RotationUtils.calcRotationFromVec3d(ctx.playerHead(), VecUtils.getBlockPosCenter(dest), ctx.playerRotations()).getYaw();
+                        if (Math.abs(state.getTarget().rotation.getYaw() - yaw) < 0.1) {
+                            // but only if our attempted place is straight ahead
+                            return state.setInput(Input.MOVE_FORWARD, true);
+                        }
+                    } else if (ctx.playerRotations().isReallyCloseTo(state.getTarget().rotation)) {
+                        // well i guess theres something in the way
+                        return state.setInput(Input.CLICK_LEFT, true);
+                    }
+                    return state;
+                }
+            }
             if (whereAmI.equals(dest)) {
                 // If we are in the block that we are trying to get to, we are sneaking over air and we need to place a block beneath us against the one we just walked off of
                 // Out.log(from + " " + to + " " + faceX + "," + faceY + "," + faceZ + " " + whereAmI);
-                if (!MovementHelper.throwaway(ctx, true)) {// get ready to place a throwaway block
-                    logDebug("bb pls get me some blocks. dirt or cobble");
-                    return state.setStatus(MovementStatus.UNREACHABLE);
-                }
                 double faceX = (dest.getX() + src.getX() + 1.0D) * 0.5D;
                 double faceY = (dest.getY() + src.getY() - 1.0D) * 0.5D;
                 double faceZ = (dest.getZ() + src.getZ() + 1.0D) * 0.5D;
@@ -296,25 +293,26 @@ public class MovementTraverse extends Movement {
 
                 Rotation backToFace = RotationUtils.calcRotationFromVec3d(ctx.playerHead(), new Vec3d(faceX, faceY, faceZ), ctx.playerRotations());
                 float pitch = backToFace.getPitch();
-                double dist = Math.max(Math.abs(ctx.player().posX - faceX), Math.abs(ctx.player().posZ - faceZ));
+                double dist2 = Math.max(Math.abs(ctx.player().posX - faceX), Math.abs(ctx.player().posZ - faceZ));
-                if (dist < 0.29) {
+                if (dist2 < 0.29) { // see issue #208
                     float yaw = RotationUtils.calcRotationFromVec3d(VecUtils.getBlockPosCenter(dest), ctx.playerHead(), ctx.playerRotations()).getYaw();
                     state.setTarget(new MovementState.MovementTarget(new Rotation(yaw, pitch), true));
                     state.setInput(Input.MOVE_BACK, true);
                 } else {
                     state.setTarget(new MovementState.MovementTarget(backToFace, true));
                 }
-                state.setInput(Input.SNEAK, true);
                 if (Objects.equals(ctx.getSelectedBlock().orElse(null), goalLook)) {
                     return state.setInput(Input.CLICK_RIGHT, true); // wait to right click until we are able to place
                 }
                 // Out.log("Trying to look at " + goalLook + ", actually looking at" + Baritone.whatAreYouLookingAt());
-                return state.setInput(Input.CLICK_LEFT, true);
+                if (ctx.playerRotations().isReallyCloseTo(state.getTarget().rotation)) {
-            } else {
+                    state.setInput(Input.CLICK_LEFT, true);
-                MovementHelper.moveTowards(ctx, state, positionsToBreak[0]);
+                }
                 return state;
-                // TODO MovementManager.moveTowardsBlock(to); // move towards not look at because if we are bridging for a couple blocks in a row, it is faster if we dont spin around and walk forwards then spin around and place backwards for every block
             }
+            MovementHelper.moveTowards(ctx, state, positionsToBreak[0]);
+            return state;
+            // TODO MovementManager.moveTowardsBlock(to); // move towards not look at because if we are bridging for a couple blocks in a row, it is faster if we dont spin around and walk forwards then spin around and place backwards for every block
         }
     }
 

src/main/java/baritone/pathing/path/PathExecutor.java

@@ -30,10 +30,12 @@ import baritone.api.utils.input.Input;
 import baritone.behavior.PathingBehavior;
 import baritone.pathing.calc.AbstractNodeCostSearch;
 import baritone.pathing.movement.CalculationContext;
+import baritone.pathing.movement.Movement;
 import baritone.pathing.movement.MovementHelper;
 import baritone.pathing.movement.movements.*;
 import baritone.utils.BlockStateInterface;
 import baritone.utils.Helper;
+import net.minecraft.block.BlockLiquid;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.Tuple;
 import net.minecraft.util.math.BlockPos;
@@ -77,6 +79,8 @@ public class PathExecutor implements IPathExecutor, Helper {
     private PathingBehavior behavior;
     private IPlayerContext ctx;
 
+    private boolean sprintNextTick;
+
     public PathExecutor(PathingBehavior behavior, IPath path) {
         this.behavior = behavior;
         this.ctx = behavior.ctx;
@@ -108,7 +112,6 @@ public class PathExecutor implements IPathExecutor, Helper {
                 return false;
             }
 
-            //System.out.println("Should be at " + whereShouldIBe + " actually am at " + whereAmI);
             if (!Blocks.AIR.equals(BlockStateInterface.getBlock(ctx, whereAmI.down()))) {//do not skip if standing on air, because our position isn't stable to skip
                 for (int i = 0; i < pathPosition - 1 && 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))) {
@@ -186,22 +189,23 @@ public class PathExecutor implements IPathExecutor, Helper {
             }
         }*/
         //long start = System.nanoTime() / 1000000L;
+        BlockStateInterface bsi = new BlockStateInterface(ctx);
         for (int i = pathPosition - 10; i < pathPosition + 10; i++) {
             if (i < 0 || i >= path.movements().size()) {
                 continue;
             }
-            IMovement m = path.movements().get(i);
+            Movement m = (Movement) path.movements().get(i);
-            HashSet<BlockPos> prevBreak = new HashSet<>(m.toBreak());
+            HashSet<BlockPos> prevBreak = new HashSet<>(m.toBreak(bsi));
-            HashSet<BlockPos> prevPlace = new HashSet<>(m.toPlace());
+            HashSet<BlockPos> prevPlace = new HashSet<>(m.toPlace(bsi));
-            HashSet<BlockPos> prevWalkInto = new HashSet<>(m.toWalkInto());
+            HashSet<BlockPos> prevWalkInto = new HashSet<>(m.toWalkInto(bsi));
             m.resetBlockCache();
-            if (!prevBreak.equals(new HashSet<>(m.toBreak()))) {
+            if (!prevBreak.equals(new HashSet<>(m.toBreak(bsi)))) {
                 recalcBP = true;
             }
-            if (!prevPlace.equals(new HashSet<>(m.toPlace()))) {
+            if (!prevPlace.equals(new HashSet<>(m.toPlace(bsi)))) {
                 recalcBP = true;
             }
-            if (!prevWalkInto.equals(new HashSet<>(m.toWalkInto()))) {
+            if (!prevWalkInto.equals(new HashSet<>(m.toWalkInto(bsi)))) {
                 recalcBP = true;
             }
         }
@@ -210,9 +214,10 @@ public class PathExecutor implements IPathExecutor, Helper {
             HashSet<BlockPos> newPlace = new HashSet<>();
             HashSet<BlockPos> newWalkInto = new HashSet<>();
             for (int i = pathPosition; i < path.movements().size(); i++) {
-                newBreak.addAll(path.movements().get(i).toBreak());
+                Movement movement = (Movement) path.movements().get(i);
-                newPlace.addAll(path.movements().get(i).toPlace());
+                newBreak.addAll(movement.toBreak(bsi));
-                newWalkInto.addAll(path.movements().get(i).toWalkInto());
+                newPlace.addAll(movement.toPlace(bsi));
+                newWalkInto.addAll(movement.toWalkInto(bsi));
             }
             toBreak = newBreak;
             toPlace = newPlace;
@@ -266,7 +271,10 @@ public class PathExecutor implements IPathExecutor, Helper {
             onTick();
             return true;
         } else {
-            sprintIfRequested();
+            sprintNextTick = shouldSprintNextTick();
+            if (!sprintNextTick) {
+                ctx.player().setSprinting(false); // letting go of control doesn't make you stop sprinting actually
+            }
             ticksOnCurrent++;
             if (ticksOnCurrent > currentMovementOriginalCostEstimate + Baritone.settings().movementTimeoutTicks.get()) {
                 // only cancel if the total time has exceeded the initial estimate
@@ -344,31 +352,41 @@ public class PathExecutor implements IPathExecutor, Helper {
 
     /**
      * Regardless of current path position, snap to the current player feet if possible
+     *
+     * @return Whether or not it was possible to snap to the current player feet
      */
     public boolean snipsnapifpossible() {
+        if (!ctx.player().onGround && !(ctx.world().getBlockState(ctx.playerFeet()).getBlock() instanceof BlockLiquid)) {
+            // if we're falling in the air, and not in water, don't splice
+            return false;
+        } else {
+            // we are either onGround or in liquid
+            if (ctx.player().motionY < -0.1) {
+                // if we are strictly moving downwards (not stationary)
+                // we could be falling through water, which could be unsafe to splice
+                return false; // so don't
+            }
+        }
         int index = path.positions().indexOf(ctx.playerFeet());
         if (index == -1) {
             return false;
         }
-        pathPosition = index;
+        pathPosition = index; // jump directly to current position
         clearKeys();
         return true;
     }
 
-    private void sprintIfRequested() {
+    private boolean shouldSprintNextTick() {
         // first and foremost, if allowSprint is off, or if we don't have enough hunger, don't try and sprint
-        if (!new CalculationContext(behavior.baritone).canSprint()) {
+        if (!new CalculationContext(behavior.baritone).canSprint) {
             behavior.baritone.getInputOverrideHandler().setInputForceState(Input.SPRINT, false);
-            ctx.player().setSprinting(false);
+            return false;
-            return;
         }
 
         // if the movement requested sprinting, then we're done
-        if (behavior.baritone.getInputOverrideHandler().isInputForcedDown(mc.gameSettings.keyBindSprint)) {
+        if (behavior.baritone.getInputOverrideHandler().isInputForcedDown(Input.SPRINT)) {
-            if (!ctx.player().isSprinting()) {
+            behavior.baritone.getInputOverrideHandler().setInputForceState(Input.SPRINT, false);
-                ctx.player().setSprinting(true);
+            return true;
-            }
-            return;
         }
 
         // we'll take it from here, no need for minecraft to see we're holding down control and sprint for us
@@ -376,36 +394,32 @@ public class PathExecutor implements IPathExecutor, Helper {
 
         // however, descend doesn't request sprinting, beceause it doesn't know the context of what movement comes after it
         IMovement current = path.movements().get(pathPosition);
-        if (current instanceof MovementDescend && pathPosition < path.length() - 2) {
+        if (current instanceof MovementDescend) {
 
             if (((MovementDescend) current).safeMode()) {
                 logDebug("Sprinting would be unsafe");
-                ctx.player().setSprinting(false);
+                return false;
-                return;
             }
 
-            IMovement next = path.movements().get(pathPosition + 1);
+            if (pathPosition < path.length() - 2) {
-            if (next instanceof MovementAscend && current.getDirection().up().equals(next.getDirection().down())) {
+                IMovement next = path.movements().get(pathPosition + 1);
-                // a descend then an ascend in the same direction
+                if (next instanceof MovementAscend && current.getDirection().up().equals(next.getDirection().down())) {
-                if (!ctx.player().isSprinting()) {
+                    // a descend then an ascend in the same direction
-                    ctx.player().setSprinting(true);
-                }
-                pathPosition++;
-                // okay to skip clearKeys and / or onChangeInPathPosition here since this isn't possible to repeat, since it's asymmetric
-                logDebug("Skipping descend to straight ascend");
-                return;
-            }
-            if (canSprintInto(ctx, current, next)) {
-                if (ctx.playerFeet().equals(current.getDest())) {
                     pathPosition++;
-                    onChangeInPathPosition();
+                    // okay to skip clearKeys and / or onChangeInPathPosition here since this isn't possible to repeat, since it's asymmetric
+                    logDebug("Skipping descend to straight ascend");
+                    return true;
                 }
-                if (!ctx.player().isSprinting()) {
+                if (canSprintInto(ctx, current, next)) {
-                    ctx.player().setSprinting(true);
+                    if (ctx.playerFeet().equals(current.getDest())) {
+                        pathPosition++;
+                        onChangeInPathPosition();
+                        onTick();
+                    }
+                    return true;
                 }
-                return;
+                //logDebug("Turning off sprinting " + movement + " " + next + " " + movement.getDirection() + " " + next.getDirection().down() + " " + next.getDirection().down().equals(movement.getDirection()));
             }
-            //logDebug("Turning off sprinting " + movement + " " + next + " " + movement.getDirection() + " " + next.getDirection().down() + " " + next.getDirection().down().equals(movement.getDirection()));
         }
         if (current instanceof MovementAscend && pathPosition != 0) {
             IMovement prev = path.movements().get(pathPosition - 1);
@@ -413,14 +427,11 @@ public class PathExecutor implements IPathExecutor, Helper {
                 BlockPos center = current.getSrc().up();
                 if (ctx.player().posY >= center.getY()) { // playerFeet adds 0.1251 to account for soul sand
                     behavior.baritone.getInputOverrideHandler().setInputForceState(Input.JUMP, false);
-                    if (!ctx.player().isSprinting()) {
+                    return true;
-                        ctx.player().setSprinting(true);
-                    }
-                    return;
                 }
             }
         }
-        ctx.player().setSprinting(false);
+        return false;
     }
 
     private static boolean canSprintInto(IPlayerContext ctx, IMovement current, IMovement next) {
@@ -450,6 +461,7 @@ public class PathExecutor implements IPathExecutor, Helper {
         failed = true;
     }
 
+    @Override
     public int getPosition() {
         return pathPosition;
     }
@@ -515,4 +527,8 @@ public class PathExecutor implements IPathExecutor, Helper {
     public Set<BlockPos> toWalkInto() {
         return Collections.unmodifiableSet(toWalkInto);
     }
+
+    public boolean isSprinting() {
+        return sprintNextTick;
+    }
 }

src/main/java/baritone/pathing/path/SplicedPath.java

@@ -62,13 +62,15 @@ public class SplicedPath extends PathBase {
         return numNodes;
     }
 
+    @Override
+    public int length() {
+        return path.size();
+    }
+
     public static Optional<SplicedPath> trySplice(IPath first, IPath second, boolean allowOverlapCutoff) {
         if (second == null || first == null) {
             return Optional.empty();
         }
-        if (!Objects.equals(first.getGoal(), second.getGoal())) {
-            return Optional.empty();
-        }
         if (!first.getDest().equals(second.getSrc())) {
             return Optional.empty();
         }
@@ -77,6 +79,7 @@ public class SplicedPath extends PathBase {
         for (int i = 0; i < first.length() - 1; i++) { // overlap in the very last element is fine (and required) so only go up to first.length() - 1
             if (secondPos.contains(first.positions().get(i))) {
                 firstPositionInSecond = i;
+                break;
             }
         }
         if (firstPositionInSecond != -1) {

src/main/java/baritone/process/CustomGoalProcess.java

@@ -52,7 +52,9 @@ public class CustomGoalProcess extends BaritoneProcessHelper implements ICustomG
     @Override
     public void setGoal(Goal goal) {
         this.goal = goal;
-        this.state = State.GOAL_SET;
+        if (this.state == State.NONE) {
+            this.state = State.GOAL_SET;
+        }
     }
 
     @Override
@@ -74,7 +76,7 @@ public class CustomGoalProcess extends BaritoneProcessHelper implements ICustomG
     public PathingCommand onTick(boolean calcFailed, boolean isSafeToCancel) {
         switch (this.state) {
             case GOAL_SET:
-                if (!baritone.getPathingBehavior().isPathing() && Objects.equals(baritone.getPathingBehavior().getGoal(), this.goal)) {
+                if (!baritone.getPathingBehavior().isPathing() && Objects.equals(baritone.getPathingBehavior().getGoal() + "", this.goal + "")) {
                     this.state = State.NONE;
                 }
                 return new PathingCommand(this.goal, PathingCommandType.CANCEL_AND_SET_GOAL);

src/main/java/baritone/process/FollowProcess.java

@@ -57,7 +57,6 @@ public final class FollowProcess extends BaritoneProcessHelper implements IFollo
     }
 
     private Goal towards(Entity following) {
-        // lol this is trashy but it works
         BlockPos pos;
         if (Baritone.settings().followOffsetDistance.get() == 0) {
             pos = new BlockPos(following);
@@ -79,7 +78,7 @@ public final class FollowProcess extends BaritoneProcessHelper implements IFollo
         if (entity.equals(ctx.player())) {
             return false;
         }
-        return ctx.world().loadedEntityList.contains(entity) || ctx.world().playerEntities.contains(entity);
+        return ctx.world().loadedEntityList.contains(entity);
     }
 
     private void scanWorld() {

src/main/java/baritone/process/GetToBlockProcess.java

@@ -21,19 +21,27 @@ import baritone.Baritone;
 import baritone.api.pathing.goals.Goal;
 import baritone.api.pathing.goals.GoalComposite;
 import baritone.api.pathing.goals.GoalGetToBlock;
+import baritone.api.pathing.goals.GoalTwoBlocks;
 import baritone.api.process.IGetToBlockProcess;
 import baritone.api.process.PathingCommand;
 import baritone.api.process.PathingCommandType;
+import baritone.api.utils.Rotation;
+import baritone.api.utils.RotationUtils;
+import baritone.api.utils.input.Input;
 import baritone.pathing.movement.CalculationContext;
 import baritone.utils.BaritoneProcessHelper;
 import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.inventory.ContainerPlayer;
 import net.minecraft.util.math.BlockPos;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 
 public class GetToBlockProcess extends BaritoneProcessHelper implements IGetToBlockProcess {
+
     private Block gettingTo;
     private List<BlockPos> knownLocations;
 
@@ -45,8 +53,8 @@ public class GetToBlockProcess extends BaritoneProcessHelper implements IGetToBl
 
     @Override
     public void getToBlock(Block block) {
+        onLostControl();
         gettingTo = block;
-        knownLocations = null;
         rescan(new ArrayList<>(), new CalculationContext(baritone));
     }
 
@@ -77,12 +85,19 @@ public class GetToBlockProcess extends BaritoneProcessHelper implements IGetToBl
         int mineGoalUpdateInterval = Baritone.settings().mineGoalUpdateInterval.get();
         if (mineGoalUpdateInterval != 0 && tickCount++ % mineGoalUpdateInterval == 0) { // big brain
             List<BlockPos> current = new ArrayList<>(knownLocations);
-            CalculationContext context = new CalculationContext(baritone);
+            CalculationContext context = new CalculationContext(baritone, true);
             Baritone.getExecutor().execute(() -> rescan(current, context));
         }
-        Goal goal = new GoalComposite(knownLocations.stream().map(GoalGetToBlock::new).toArray(Goal[]::new));
+        Goal goal = new GoalComposite(knownLocations.stream().map(this::createGoal).toArray(Goal[]::new));
-        if (goal.isInGoal(ctx.playerFeet())) {
+        if (goal.isInGoal(ctx.playerFeet()) && isSafeToCancel) {
-            onLostControl();
+            // we're there
+            if (rightClickOnArrival(gettingTo)) {
+                if (rightClick()) {
+                    onLostControl();
+                }
+            } else {
+                onLostControl();
+            }
         }
         return new PathingCommand(goal, PathingCommandType.REVALIDATE_GOAL_AND_PATH);
     }
@@ -91,6 +106,7 @@ public class GetToBlockProcess extends BaritoneProcessHelper implements IGetToBl
     public void onLostControl() {
         gettingTo = null;
         knownLocations = null;
+        baritone.getInputOverrideHandler().clearAllKeys();
     }
 
     @Override
@@ -101,4 +117,41 @@ public class GetToBlockProcess extends BaritoneProcessHelper implements IGetToBl
     private void rescan(List<BlockPos> known, CalculationContext context) {
         knownLocations = MineProcess.searchWorld(context, Collections.singletonList(gettingTo), 64, known);
     }
+
+    private Goal createGoal(BlockPos pos) {
+        return walkIntoInsteadOfAdjacent(gettingTo) ? new GoalTwoBlocks(pos) : new GoalGetToBlock(pos);
+    }
+
+    private boolean rightClick() {
+        for (BlockPos pos : knownLocations) {
+            Optional<Rotation> reachable = RotationUtils.reachable(ctx.player(), pos, ctx.playerController().getBlockReachDistance());
+            if (reachable.isPresent()) {
+                baritone.getLookBehavior().updateTarget(reachable.get(), true);
+                if (knownLocations.contains(ctx.getSelectedBlock().orElse(null))) {
+                    baritone.getInputOverrideHandler().setInputForceState(Input.CLICK_RIGHT, true); // TODO find some way to right click even if we're in an ESC menu
+                    System.out.println(ctx.player().openContainer);
+                    if (!(ctx.player().openContainer instanceof ContainerPlayer)) {
+                        return true;
+                    }
+                }
+                return false; // trying to right click, will do it next tick or so
+            }
+        }
+        logDirect("Arrived but failed to right click open");
+        return true;
+    }
+
+    private boolean walkIntoInsteadOfAdjacent(Block block) {
+        if (!Baritone.settings().enterPortal.get()) {
+            return false;
+        }
+        return block == Blocks.PORTAL;
+    }
+
+    private boolean rightClickOnArrival(Block block) {
+        if (!Baritone.settings().rightClickContainerOnArrival.get()) {
+            return false;
+        }
+        return block == Blocks.CRAFTING_TABLE || block == Blocks.FURNACE || block == Blocks.ENDER_CHEST || block == Blocks.CHEST || block == Blocks.TRAPPED_CHEST;
+    }
 }

src/main/java/baritone/process/MineProcess.java

@@ -39,7 +39,6 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.chunk.EmptyChunk;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -89,20 +88,20 @@ public final class MineProcess extends BaritoneProcessHelper implements IMinePro
         int mineGoalUpdateInterval = Baritone.settings().mineGoalUpdateInterval.get();
         if (mineGoalUpdateInterval != 0 && tickCount++ % mineGoalUpdateInterval == 0) { // big brain
             List<BlockPos> curr = new ArrayList<>(knownOreLocations);
-            CalculationContext context = new CalculationContext(baritone);
+            CalculationContext context = new CalculationContext(baritone, true);
             Baritone.getExecutor().execute(() -> rescan(curr, context));
         }
         if (Baritone.settings().legitMine.get()) {
             addNearby();
         }
-        Goal goal = updateGoal();
+        PathingCommand command = updateGoal();
-        if (goal == null) {
+        if (command == null) {
             // none in range
             // maybe say something in chat? (ahem impact)
             cancel();
             return null;
         }
-        return new PathingCommand(goal, PathingCommandType.FORCE_REVALIDATE_GOAL_AND_PATH);
+        return command;
     }
 
     @Override
@@ -115,17 +114,18 @@ public final class MineProcess extends BaritoneProcessHelper implements IMinePro
         return "Mine " + mining;
     }
 
-    private Goal updateGoal() {
+    private PathingCommand updateGoal() {
+        boolean legit = Baritone.settings().legitMine.get();
         List<BlockPos> locs = knownOreLocations;
         if (!locs.isEmpty()) {
             List<BlockPos> locs2 = prune(new CalculationContext(baritone), new ArrayList<>(locs), mining, ORE_LOCATIONS_COUNT);
             // can't reassign locs, gotta make a new var locs2, because we use it in a lambda right here, and variables you use in a lambda must be effectively final
             Goal goal = new GoalComposite(locs2.stream().map(loc -> coalesce(ctx, loc, locs2)).toArray(Goal[]::new));
             knownOreLocations = locs2;
-            return goal;
+            return new PathingCommand(goal, legit ? PathingCommandType.FORCE_REVALIDATE_GOAL_AND_PATH : PathingCommandType.REVALIDATE_GOAL_AND_PATH);
         }
         // we don't know any ore locations at the moment
-        if (!Baritone.settings().legitMine.get()) {
+        if (!legit) {
             return null;
         }
         // only in non-Xray mode (aka legit mode) do we do this
@@ -150,7 +150,7 @@ public final class MineProcess extends BaritoneProcessHelper implements IMinePro
                 }
             };
         }
-        return branchPointRunaway;
+        return new PathingCommand(branchPointRunaway, PathingCommandType.REVALIDATE_GOAL_AND_PATH);
     }
 
     private void rescan(List<BlockPos> already, CalculationContext context) {
@@ -210,7 +210,7 @@ public final class MineProcess extends BaritoneProcessHelper implements IMinePro
         //long b = System.currentTimeMillis();
         for (Block m : mining) {
             if (CachedChunk.BLOCKS_TO_KEEP_TRACK_OF.contains(m)) {
-                locs.addAll(ctx.worldData().getCachedWorld().getLocationsOf(ChunkPacker.blockToString(m), 1, ctx.getBaritone().getPlayerContext().playerFeet().getX(), ctx.getBaritone().getPlayerContext().playerFeet().getZ(), 1));
+                locs.addAll(ctx.worldData.getCachedWorld().getLocationsOf(ChunkPacker.blockToString(m), 1, ctx.getBaritone().getPlayerContext().playerFeet().getX(), ctx.getBaritone().getPlayerContext().playerFeet().getZ(), 2));
             } else {
                 uninteresting.add(m);
             }
@@ -249,16 +249,17 @@ public final class MineProcess extends BaritoneProcessHelper implements IMinePro
     }
 
     public static List<BlockPos> prune(CalculationContext ctx, List<BlockPos> locs2, List<Block> mining, int max) {
-        List<BlockPos> dropped = droppedItemsScan(mining, ctx.world());
+        List<BlockPos> dropped = droppedItemsScan(mining, ctx.world);
         List<BlockPos> locs = locs2
                 .stream()
                 .distinct()
 
                 // remove any that are within loaded chunks that aren't actually what we want
-                .filter(pos -> ctx.world().getChunk(pos) instanceof EmptyChunk || mining.contains(ctx.getBlock(pos.getX(), pos.getY(), pos.getZ())) || dropped.contains(pos))
+
+                .filter(pos -> !ctx.bsi.worldContainsLoadedChunk(pos.getX(), pos.getZ()) || mining.contains(ctx.getBlock(pos.getX(), pos.getY(), pos.getZ())) || dropped.contains(pos))
 
                 // remove any that are implausible to mine (encased in bedrock, or touching lava)
-                .filter(pos -> MineProcess.plausibleToBreak(ctx.bsi(), pos))
+                .filter(pos -> MineProcess.plausibleToBreak(ctx.bsi, pos))
 
                 .sorted(Comparator.comparingDouble(ctx.getBaritone().getPlayerContext().playerFeet()::distanceSq))
                 .collect(Collectors.toList());

src/main/java/baritone/utils/BaritoneAutoTest.java

@@ -32,6 +32,15 @@ import net.minecraft.world.GameType;
 import net.minecraft.world.WorldSettings;
 import net.minecraft.world.WorldType;
 
+/**
+ * Responsible for automatically testing Baritone's pathing algorithm by automatically creating a world with a specific
+ * seed, setting a specified goal, and only allowing a certain amount of ticks to pass before the pathing test is
+ * considered a failure. In order to test locally, docker may be used, or through an IDE: Create a run config which runs
+ * in a separate directory from the primary one (./run), and set the enrivonmental variable {@code BARITONE_AUTO_TEST}
+ * to {@code true}.
+ *
+ * @author leijurv, Brady
+ */
 public class BaritoneAutoTest implements AbstractGameEventListener, Helper {
 
     public static final BaritoneAutoTest INSTANCE = new BaritoneAutoTest();
@@ -39,8 +48,8 @@ public class BaritoneAutoTest implements AbstractGameEventListener, Helper {
     public static final boolean ENABLE_AUTO_TEST = "true".equals(System.getenv("BARITONE_AUTO_TEST"));
     private static final long TEST_SEED = -928872506371745L;
     private static final BlockPos STARTING_POSITION = new BlockPos(0, 65, 0);
-    private static final Goal GOAL = new GoalBlock(69, 121, 420);
+    private static final Goal GOAL = new GoalBlock(69, 69, 420);
-    private static final int MAX_TICKS = 3500;
+    private static final int MAX_TICKS = 3300;
 
     /**
      * Called right after the {@link GameSettings} object is created in the {@link Minecraft} instance.

src/main/java/baritone/utils/BaritoneProcessHelper.java

@@ -23,16 +23,10 @@ import baritone.api.utils.IPlayerContext;
 
 public abstract class BaritoneProcessHelper implements IBaritoneProcess, Helper {
 
-    public static final double DEFAULT_PRIORITY = 0;
-
     protected final Baritone baritone;
     protected final IPlayerContext ctx;
     private final double priority;
 
-    public BaritoneProcessHelper(Baritone baritone) {
-        this(baritone, DEFAULT_PRIORITY);
-    }
-
     public BaritoneProcessHelper(Baritone baritone, double priority) {
         this.baritone = baritone;
         this.ctx = baritone.getPlayerContext();
@@ -40,11 +34,6 @@ public abstract class BaritoneProcessHelper implements IBaritoneProcess, Helper
         baritone.getPathingControlManager().registerProcess(this);
     }
 
-    @Override
-    public Baritone associatedWith() {
-        return baritone;
-    }
-
     @Override
     public boolean isTemporary() {
         return false;

src/main/java/baritone/utils/BlockBreakHelper.java

@@ -17,8 +17,6 @@
 
 package baritone.utils;
 
-import baritone.Baritone;
-import baritone.api.BaritoneAPI;
 import baritone.api.utils.IPlayerContext;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
@@ -31,11 +29,6 @@ import net.minecraft.util.math.RayTraceResult;
  */
 public final class BlockBreakHelper implements Helper {
 
-    /**
-     * The last block that we tried to break, if this value changes
-     * between attempts, then we re-initialize the breaking process.
-     */
-    private BlockPos lastBlock;
     private boolean didBreakLastTick;
 
     private IPlayerContext playerContext;
@@ -45,42 +38,20 @@ public final class BlockBreakHelper implements Helper {
     }
 
     public void tryBreakBlock(BlockPos pos, EnumFacing side) {
-        if (!pos.equals(lastBlock)) {
-            playerContext.playerController().clickBlock(pos, side);
-        }
         if (playerContext.playerController().onPlayerDamageBlock(pos, side)) {
             playerContext.player().swingArm(EnumHand.MAIN_HAND);
         }
-        lastBlock = pos;
     }
 
     public void stopBreakingBlock() {
-        if (playerContext.playerController() != null) {
+        // The player controller will never be null, but the player can be
+        if (playerContext.player() != null) {
             playerContext.playerController().resetBlockRemoving();
         }
-        lastBlock = null;
     }
 
-    private boolean fakeBreak() {
-        if (playerContext != BaritoneAPI.getProvider().getPrimaryBaritone().getPlayerContext()) {
-            // for a non primary player, we need to fake break always, CLICK_LEFT has no effect
-            return true;
-        }
-        if (!Baritone.settings().leftClickWorkaround.get()) {
-            // if this setting is false, we CLICK_LEFT regardless of gui status
-            return false;
-        }
-        return mc.currentScreen != null;
-    }
-
-    public boolean tick(boolean isLeftClick) {
-        if (!fakeBreak()) {
-            if (didBreakLastTick) {
-                stopBreakingBlock();
-            }
-            return isLeftClick;
-        }
 
+    public void tick(boolean isLeftClick) {
         RayTraceResult trace = playerContext.objectMouseOver();
         boolean isBlockTrace = trace != null && trace.typeOfHit == RayTraceResult.Type.BLOCK;
 
@@ -91,6 +62,5 @@ public final class BlockBreakHelper implements Helper {
             stopBreakingBlock();
             didBreakLastTick = false;
         }
-        return false; // fakeBreak is true so no matter what we aren't forcing CLICK_LEFT
     }
 }

src/main/java/baritone/utils/BlockStateInterface.java

@@ -23,6 +23,7 @@ import baritone.cache.CachedRegion;
 import baritone.cache.WorldData;
 import baritone.utils.accessor.IChunkProviderClient;
 import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
+import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
@@ -45,15 +46,27 @@ public class BlockStateInterface {
     private Chunk prev = null;
     private CachedRegion prevCached = null;
 
+    private final boolean useTheRealWorld;
+
     private static final IBlockState AIR = Blocks.AIR.getDefaultState();
 
     public BlockStateInterface(IPlayerContext ctx) {
-        this(ctx.world(), (WorldData) ctx.worldData());
+        this(ctx, false);
     }
 
-    public BlockStateInterface(World world, WorldData worldData) {
+    public BlockStateInterface(IPlayerContext ctx, boolean copyLoadedChunks) {
+        this(ctx.world(), (WorldData) ctx.worldData(), copyLoadedChunks);
+    }
+
+    public BlockStateInterface(World world, WorldData worldData, boolean copyLoadedChunks) {
         this.worldData = worldData;
-        this.loadedChunks = ((IChunkProviderClient) world.getChunkProvider()).loadedChunks();
+        Long2ObjectMap<Chunk> worldLoaded = ((IChunkProviderClient) world.getChunkProvider()).loadedChunks();
+        if (copyLoadedChunks) {
+            this.loadedChunks = new Long2ObjectOpenHashMap<>(worldLoaded); // make a copy that we can safely access from another thread
+        } else {
+            this.loadedChunks = worldLoaded; // this will only be used on the main thread
+        }
+        this.useTheRealWorld = !Baritone.settings().pathThroughCachedOnly.get();
         if (!Minecraft.getMinecraft().isCallingFromMinecraftThread()) {
             throw new IllegalStateException();
         }
@@ -84,7 +97,7 @@ public class BlockStateInterface {
             return AIR;
         }
 
-        if (!Baritone.settings().pathThroughCachedOnly.get()) {
+        if (useTheRealWorld) {
             Chunk cached = prev;
             // there's great cache locality in block state lookups
             // generally it's within each movement

src/main/java/baritone/utils/ExampleBaritoneControl.java

@@ -19,6 +19,7 @@ package baritone.utils;
 
 import baritone.Baritone;
 import baritone.api.Settings;
+import baritone.api.cache.IRememberedInventory;
 import baritone.api.cache.IWaypoint;
 import baritone.api.event.events.ChatEvent;
 import baritone.api.pathing.goals.*;
@@ -32,10 +33,12 @@ import baritone.pathing.movement.CalculationContext;
 import baritone.pathing.movement.Movement;
 import baritone.pathing.movement.Moves;
 import baritone.process.CustomGoalProcess;
+import baritone.utils.pathing.SegmentedCalculator;
 import net.minecraft.block.Block;
 import net.minecraft.client.multiplayer.ChunkProviderClient;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.chunk.Chunk;
 
@@ -74,6 +77,8 @@ public class ExampleBaritoneControl extends Behavior implements Helper {
                     "costs - (debug) all movement costs from current location\n" +
                     "damn - Daniel ";
 
+    private static final String COMMAND_PREFIX = "#";
+
     public ExampleBaritoneControl(Baritone baritone) {
         super(baritone);
     }
@@ -85,17 +90,20 @@ public class ExampleBaritoneControl extends Behavior implements Helper {
         }
         String msg = event.getMessage();
         if (Baritone.settings().prefix.get()) {
-            if (!msg.startsWith("#")) {
+            if (msg.startsWith(COMMAND_PREFIX)) {
-                return;
+                if (!runCommand(msg.substring(COMMAND_PREFIX.length()))) {
+                    logDirect("Invalid command");
+                }
+                event.cancel(); // always cancel if using prefix
+            }
+        } else {
+            if (runCommand(msg)) {
+                event.cancel();
             }
-            msg = msg.substring(1);
-        }
-        if (runCommand(msg)) {
-            event.cancel();
         }
     }
 
-    public boolean runCommand(String msg0) {
+    public boolean runCommand(String msg0) { // you may think this can be private, but impcat calls it from .b =)
         String msg = msg0.toLowerCase(Locale.US).trim(); // don't reassign the argument LOL
         PathingBehavior pathingBehavior = baritone.getPathingBehavior();
         CustomGoalProcess customGoalProcess = baritone.getCustomGoalProcess();
@@ -118,7 +126,7 @@ public class ExampleBaritoneControl extends Behavior implements Helper {
             for (String line : HELP_MSG.split("\n")) {
                 logDirect(line);
             }
-            return false;
+            return true;
         }
         if (msg.contains(" ")) {
             String[] data = msg.split(" ");
@@ -202,6 +210,23 @@ public class ExampleBaritoneControl extends Behavior implements Helper {
             }
             return true;
         }
+        if (msg.equals("fullpath")) {
+            if (pathingBehavior.getGoal() == null) {
+                logDirect("No goal.");
+            } else {
+                logDirect("Started segmented calculator");
+                SegmentedCalculator.calculateSegmentsThreaded(pathingBehavior.pathStart(), pathingBehavior.getGoal(), new CalculationContext(baritone, true), ipath -> {
+                    logDirect("Found a path");
+                    logDirect("Ends at " + ipath.getDest());
+                    logDirect("Length " + ipath.length());
+                    logDirect("Estimated time " + ipath.ticksRemainingFrom(0));
+                    pathingBehavior.secretCursedFunctionDoNotCall(ipath); // it's okay when *I* do it
+                }, () -> {
+                    logDirect("Path calculation failed, no path");
+                });
+            }
+            return true;
+        }
         if (msg.equals("repack") || msg.equals("rescan")) {
             ChunkProviderClient cli = (ChunkProviderClient) ctx.world().getChunkProvider();
             int playerChunkX = ctx.playerFeet().getX() >> 4;
@@ -259,6 +284,38 @@ public class ExampleBaritoneControl extends Behavior implements Helper {
             });
             return true;
         }
+        if (msg.equals("reset")) {
+            Baritone.settings().reset();
+            logDirect("Baritone settings reset");
+            return true;
+        }
+        if (msg.equals("echest")) {
+            Optional<List<ItemStack>> contents = baritone.getMemoryBehavior().echest();
+            if (contents.isPresent()) {
+                logDirect("echest contents:");
+                log(contents.get());
+            } else {
+                logDirect("echest contents unknown");
+            }
+            return true;
+        }
+        if (msg.equals("chests")) {
+            System.out.println(baritone.getWorldProvider());
+            System.out.println(baritone.getWorldProvider().getCurrentWorld());
+
+            System.out.println(baritone.getWorldProvider().getCurrentWorld().getContainerMemory());
+
+            System.out.println(baritone.getWorldProvider().getCurrentWorld().getContainerMemory().getRememberedInventories());
+
+            System.out.println(baritone.getWorldProvider().getCurrentWorld().getContainerMemory().getRememberedInventories().entrySet());
+
+            System.out.println(baritone.getWorldProvider().getCurrentWorld().getContainerMemory().getRememberedInventories().entrySet());
+            for (Map.Entry<BlockPos, IRememberedInventory> entry : baritone.getWorldProvider().getCurrentWorld().getContainerMemory().getRememberedInventories().entrySet()) {
+                logDirect(entry.getKey() + "");
+                log(entry.getValue().getContents());
+            }
+            return true;
+        }
         if (msg.startsWith("followplayers")) {
             baritone.getFollowProcess().follow(EntityPlayer.class::isInstance); // O P P A
             logDirect("Following any players");
@@ -468,4 +525,12 @@ public class ExampleBaritoneControl extends Behavior implements Helper {
         }
         return false;
     }
+
+    private void log(List<ItemStack> stacks) {
+        for (ItemStack stack : stacks) {
+            if (!stack.isEmpty()) {
+                logDirect(stack.getCount() + "x " + stack.getDisplayName() + "@" + stack.getItemDamage());
+            }
+        }
+    }
 }

src/main/java/baritone/utils/Helper.java

@@ -47,7 +47,7 @@ public interface Helper {
     /**
      * Send a message to chat only if chatDebug is on
      *
-     * @param message
+     * @param message The message to display in chat
      */
     default void logDebug(String message) {
         if (!Baritone.settings().chatDebug.get()) {
@@ -61,12 +61,12 @@ public interface Helper {
     /**
      * Send a message to chat regardless of chatDebug (should only be used for critically important messages, or as a direct response to a chat command)
      *
-     * @param message
+     * @param message The message to display in chat
      */
     default void logDirect(String message) {
         ITextComponent component = MESSAGE_PREFIX.createCopy();
         component.getStyle().setColor(TextFormatting.GRAY);
         component.appendSibling(new TextComponentString(" " + message));
-        Baritone.settings().logger.get().accept(component);
+        Minecraft.getMinecraft().addScheduledTask(() -> Baritone.settings().logger.get().accept(component));
     }
 }

src/main/java/baritone/utils/InputOverrideHandler.java

@@ -18,12 +18,15 @@
 package baritone.utils;
 
 import baritone.Baritone;
+import baritone.api.BaritoneAPI;
 import baritone.api.event.events.TickEvent;
 import baritone.api.utils.IInputOverrideHandler;
 import baritone.api.utils.input.Input;
 import baritone.behavior.Behavior;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.settings.KeyBinding;
-import org.lwjgl.input.Keyboard;
+import net.minecraft.util.MovementInput;
+import net.minecraft.util.MovementInputFromOptions;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -57,8 +60,18 @@ public final class InputOverrideHandler extends Behavior implements IInputOverri
      * @return Whether or not it is being forced down
      */
     @Override
-    public final boolean isInputForcedDown(KeyBinding key) {
+    public final Boolean isInputForcedDown(KeyBinding key) {
-        return isInputForcedDown(Input.getInputForBind(key));
+        Input input = Input.getInputForBind(key);
+        if (input == null || !inControl()) {
+            return null;
+        }
+        if (input == Input.CLICK_LEFT) {
+            return false;
+        }
+        if (input == Input.CLICK_RIGHT) {
+            return isInputForcedDown(Input.CLICK_RIGHT);
+        }
+        return null;
     }
 
     /**
@@ -91,29 +104,25 @@ public final class InputOverrideHandler extends Behavior implements IInputOverri
         this.inputForceStateMap.clear();
     }
 
-    @Override
-    public final void onProcessKeyBinds() {
-        // Simulate the key being held down this tick
-        for (Input input : Input.values()) {
-            KeyBinding keyBinding = input.getKeyBinding();
-
-            if (isInputForcedDown(keyBinding) && !keyBinding.isKeyDown()) {
-                int keyCode = keyBinding.getKeyCode();
-
-                if (keyCode < Keyboard.KEYBOARD_SIZE) {
-                    KeyBinding.onTick(keyCode < 0 ? keyCode + 100 : keyCode);
-                }
-            }
-        }
-    }
-
     @Override
     public final void onTick(TickEvent event) {
         if (event.getType() == TickEvent.Type.OUT) {
             return;
         }
-        boolean stillClick = blockBreakHelper.tick(isInputForcedDown(Input.CLICK_LEFT));
+        blockBreakHelper.tick(isInputForcedDown(Input.CLICK_LEFT));
-        setInputForceState(Input.CLICK_LEFT, stillClick);
+
+        MovementInput desired = inControl()
+                ? new PlayerMovementInput(this)
+                : new MovementInputFromOptions(Minecraft.getMinecraft().gameSettings);
+
+        if (ctx.player().movementInput.getClass() != desired.getClass()) {
+            ctx.player().movementInput = desired; // only set it if it was previously incorrect
+            // gotta do it this way, or else it constantly thinks you're beginning a double tap W sprint lol
+        }
+    }
+
+    private boolean inControl() {
+        return baritone.getPathingBehavior().isPathing() || baritone != BaritoneAPI.getProvider().getPrimaryBaritone();
     }
 
     public BlockBreakHelper getBlockBreakHelper() {

src/main/java/baritone/utils/PathRenderer.java

@@ -21,10 +21,7 @@ import baritone.Baritone;
 import baritone.api.BaritoneAPI;
 import baritone.api.event.events.RenderEvent;
 import baritone.api.pathing.calc.IPath;
-import baritone.api.pathing.goals.Goal;
+import baritone.api.pathing.goals.*;
-import baritone.api.pathing.goals.GoalComposite;
-import baritone.api.pathing.goals.GoalTwoBlocks;
-import baritone.api.pathing.goals.GoalXZ;
 import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.interfaces.IGoalRenderPos;
 import baritone.behavior.PathingBehavior;
@@ -33,6 +30,7 @@ import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.tileentity.TileEntityBeaconRenderer;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.entity.Entity;
 import net.minecraft.init.Blocks;
@@ -218,8 +216,9 @@ public final class PathRenderer implements Helper {
         double renderPosX = player.lastTickPosX + (player.posX - player.lastTickPosX) * (double) partialTicks;
         double renderPosY = player.lastTickPosY + (player.posY - player.lastTickPosY) * (double) partialTicks;
         double renderPosZ = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * (double) partialTicks;
+        BlockStateInterface bsi = new BlockStateInterface(BaritoneAPI.getProvider().getPrimaryBaritone().getPlayerContext()); // TODO this assumes same dimension between primary baritone and render view? is this safe?
         positions.forEach(pos -> {
-            IBlockState state = BlockStateInterface.get(BaritoneAPI.getProvider().getPrimaryBaritone().getPlayerContext(), pos);
+            IBlockState state = bsi.get0(pos);
             AxisAlignedBB toDraw;
             if (state.getBlock().equals(Blocks.AIR)) {
                 toDraw = Blocks.DIRT.getDefaultState().getSelectedBoundingBox(player.world, pos);
@@ -282,14 +281,14 @@ public final class PathRenderer implements Helper {
             minZ = goalPos.getZ() + 0.002 - renderPosZ;
             maxZ = goalPos.getZ() + 1 - 0.002 - renderPosZ;
             double y = MathHelper.cos((float) (((float) ((System.nanoTime() / 100000L) % 20000L)) / 20000F * Math.PI * 2));
-            if (goal instanceof GoalTwoBlocks) {
+            if (goal instanceof GoalGetToBlock || goal instanceof GoalTwoBlocks) {
                 y /= 2;
             }
             y1 = 1 + y + goalPos.getY() - renderPosY;
             y2 = 1 - y + goalPos.getY() - renderPosY;
             minY = goalPos.getY() - renderPosY;
             maxY = minY + 2;
-            if (goal instanceof GoalTwoBlocks) {
+            if (goal instanceof GoalGetToBlock || goal instanceof GoalTwoBlocks) {
                 y1 -= 0.5;
                 y2 -= 0.5;
                 maxY--;
@@ -297,6 +296,31 @@ public final class PathRenderer implements Helper {
         } else if (goal instanceof GoalXZ) {
             GoalXZ goalPos = (GoalXZ) goal;
 
+            if (Baritone.settings().renderGoalXZBeacon.get()) {
+                mc.getTextureManager().bindTexture(TileEntityBeaconRenderer.TEXTURE_BEACON_BEAM);
+
+                if (Baritone.settings().renderGoalIgnoreDepth.get()) {
+                    GlStateManager.disableDepth();
+                }
+
+                TileEntityBeaconRenderer.renderBeamSegment(
+                        goalPos.getX() - renderPosX,
+                        -renderPosY,
+                        goalPos.getZ() - renderPosZ,
+                        partialTicks,
+                        1.0,
+                        player.world.getTotalWorldTime(),
+                        0,
+                        256,
+                        color.getColorComponents(null)
+                );
+
+                if (Baritone.settings().renderGoalIgnoreDepth.get()) {
+                    GlStateManager.enableDepth();
+                }
+                return;
+            }
+
             minX = goalPos.getX() + 0.002 - renderPosX;
             maxX = goalPos.getX() + 1 - 0.002 - renderPosX;
             minZ = goalPos.getZ() + 0.002 - renderPosZ;

src/main/java/baritone/utils/PathingControlManager.java

@@ -29,7 +29,7 @@ import baritone.pathing.path.PathExecutor;
 import net.minecraft.util.math.BlockPos;
 
 import java.util.*;
-import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class PathingControlManager implements IPathingControlManager {
     private final Baritone baritone;
@@ -64,8 +64,7 @@ public class PathingControlManager implements IPathingControlManager {
         command = null;
         for (IBaritoneProcess proc : processes) {
             proc.onLostControl();
-            if (proc.isActive() && !proc.isTemporary()) { // it's okay for a temporary thing (like combat pause) to maintain control even if you say to cancel
+            if (proc.isActive() && !proc.isTemporary()) { // it's okay only for a temporary thing (like combat pause) to maintain control even if you say to cancel
-                // but not for a non temporary thing
                 throw new IllegalStateException(proc.displayName());
             }
         }
@@ -83,11 +82,12 @@ public class PathingControlManager implements IPathingControlManager {
 
     public void preTick() {
         inControlLastTick = inControlThisTick;
-        command = doTheStuff();
+        PathingBehavior p = baritone.getPathingBehavior();
+        command = executeProcesses();
         if (command == null) {
+            p.cancelSegmentIfSafe();
             return;
         }
-        PathingBehavior p = baritone.getPathingBehavior();
         switch (command.commandType) {
             case REQUEST_PAUSE:
                 p.requestPause();
@@ -170,32 +170,30 @@ public class PathingControlManager implements IPathingControlManager {
     }
 
 
-    public PathingCommand doTheStuff() {
+    public PathingCommand executeProcesses() {
-        List<IBaritoneProcess> inContention = processes.stream().filter(IBaritoneProcess::isActive).sorted(Comparator.comparingDouble(IBaritoneProcess::priority)).collect(Collectors.toList());
+        Stream<IBaritoneProcess> inContention = processes.stream()
-        boolean found = false;
+                .filter(IBaritoneProcess::isActive)
-        boolean cancelOthers = false;
+                .sorted(Comparator.comparingDouble(IBaritoneProcess::priority).reversed());
-        PathingCommand exec = null;
+
-        for (int i = inContention.size() - 1; i >= 0; i--) { // truly a gamer moment
+
-            IBaritoneProcess proc = inContention.get(i);
+        Iterator<IBaritoneProcess> iterator = inContention.iterator();
-            if (found) {
+        while (iterator.hasNext()) {
-                if (cancelOthers) {
+            IBaritoneProcess proc = iterator.next();
-                    proc.onLostControl();
+
+            PathingCommand exec = proc.onTick(Objects.equals(proc, inControlLastTick) && baritone.getPathingBehavior().calcFailedLastTick(), baritone.getPathingBehavior().isSafeToCancel());
+            if (exec == null) {
+                if (proc.isActive()) {
+                    throw new IllegalStateException(proc.displayName() + " returned null PathingCommand");
                 }
+                proc.onLostControl();
             } else {
-                exec = proc.onTick(Objects.equals(proc, inControlLastTick) && baritone.getPathingBehavior().calcFailedLastTick(), baritone.getPathingBehavior().isSafeToCancel());
-                if (exec == null) {
-                    if (proc.isActive()) {
-                        throw new IllegalStateException(proc.displayName());
-                    }
-                    proc.onLostControl();
-                    continue;
-                }
-                //System.out.println("Executing command " + exec.commandType + " " + exec.goal + " from " + proc.displayName());
                 inControlThisTick = proc;
-                found = true;
+                if (!proc.isTemporary()) {
-                cancelOthers = !proc.isTemporary();
+                    iterator.forEachRemaining(IBaritoneProcess::onLostControl);
+                }
+                return exec;
             }
         }
-        return exec;
+        return null;
     }
 }

src/main/java/baritone/utils/PlayerMovementInput.java

@@ -0,0 +1,57 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.utils;
+
+import baritone.api.utils.input.Input;
+import net.minecraft.util.MovementInput;
+
+public class PlayerMovementInput extends MovementInput {
+    private final InputOverrideHandler handler;
+
+    public PlayerMovementInput(InputOverrideHandler handler) {
+        this.handler = handler;
+    }
+
+    public void updatePlayerMoveState() {
+        this.moveStrafe = 0.0F;
+        this.moveForward = 0.0F;
+
+        jump = handler.isInputForcedDown(Input.JUMP); // oppa
+
+        if (this.forwardKeyDown = handler.isInputForcedDown(Input.MOVE_FORWARD)) {
+            this.moveForward++;
+        }
+
+        if (this.backKeyDown = handler.isInputForcedDown(Input.MOVE_BACK)) {
+            this.moveForward--;
+        }
+
+        if (this.leftKeyDown = handler.isInputForcedDown(Input.MOVE_LEFT)) {
+            this.moveStrafe++;
+        }
+
+        if (this.rightKeyDown = handler.isInputForcedDown(Input.MOVE_RIGHT)) {
+            this.moveStrafe--;
+        }
+
+        if (this.sneak = handler.isInputForcedDown(Input.SNEAK)) {
+            this.moveStrafe *= 0.3D;
+            this.moveForward *= 0.3D;
+        }
+    }
+}

src/main/java/baritone/utils/ToolSet.java

@@ -103,7 +103,7 @@ public class ToolSet {
         IBlockState blockState = b.getDefaultState();
         for (byte i = 0; i < 9; i++) {
             ItemStack itemStack = player.inventory.getStackInSlot(i);
-            double v = calculateStrVsBlock(itemStack, blockState);
+            double v = calculateSpeedVsBlock(itemStack, blockState);
             if (v > value) {
                 value = v;
                 best = i;
@@ -128,17 +128,18 @@ public class ToolSet {
      */
     private double getBestDestructionTime(Block b) {
         ItemStack stack = player.inventory.getStackInSlot(getBestSlot(b));
-        return calculateStrVsBlock(stack, b.getDefaultState());
+        return calculateSpeedVsBlock(stack, b.getDefaultState());
     }
 
     /**
      * Calculates how long would it take to mine the specified block given the best tool
      * in this toolset is used. A negative value is returned if the specified block is unbreakable.
      *
+     * @param item  the item to mine it with
      * @param state the blockstate to be mined
      * @return how long it would take in ticks
      */
-    private double calculateStrVsBlock(ItemStack item, IBlockState state) {
+    public static double calculateSpeedVsBlock(ItemStack item, IBlockState state) {
         float hardness = state.getBlockHardness(null, null);
         if (hardness < 0) {
             return -1;
@@ -154,11 +155,10 @@ public class ToolSet {
 
         speed /= hardness;
         if (state.getMaterial().isToolNotRequired() || (!item.isEmpty() && item.canHarvestBlock(state))) {
-            speed /= 30;
+            return speed / 30;
         } else {
-            speed /= 100;
+            return speed / 100;
         }
-        return speed;
     }
 
     /**
@@ -180,7 +180,7 @@ public class ToolSet {
                     speed *= 0.09;
                     break;
                 case 2:
-                    speed *= 0.0027;
+                    speed *= 0.0027; // you might think that 0.09*0.3 = 0.027 so that should be next, that would make too much sense. it's 0.0027.
                     break;
                 default:
                     speed *= 0.00081;

src/main/java/baritone/utils/pathing/Avoidance.java

@@ -0,0 +1,87 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.utils.pathing;
+
+import baritone.Baritone;
+import baritone.api.utils.BetterBlockPos;
+import baritone.api.utils.IPlayerContext;
+import it.unimi.dsi.fastutil.longs.Long2DoubleOpenHashMap;
+import net.minecraft.entity.monster.EntityMob;
+import net.minecraft.util.math.BlockPos;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class Avoidance {
+    private final int centerX;
+    private final int centerY;
+    private final int centerZ;
+    private final double coefficient;
+    private final int radius;
+    private final int radiusSq;
+
+    public Avoidance(BlockPos center, double coefficient, int radius) {
+        this(center.getX(), center.getY(), center.getZ(), coefficient, radius);
+    }
+
+    public Avoidance(int centerX, int centerY, int centerZ, double coefficient, int radius) {
+        this.centerX = centerX;
+        this.centerY = centerY;
+        this.centerZ = centerZ;
+        this.coefficient = coefficient;
+        this.radius = radius;
+        this.radiusSq = radius * radius;
+    }
+
+    public double coefficient(int x, int y, int z) {
+        int xDiff = x - centerX;
+        int yDiff = y - centerY;
+        int zDiff = z - centerZ;
+        return xDiff * xDiff + yDiff * yDiff + zDiff * zDiff <= radiusSq ? coefficient : 1.0D;
+    }
+
+    public static List<Avoidance> create(IPlayerContext ctx) {
+        if (!Baritone.settings().avoidance.get()) {
+            return Collections.emptyList();
+        }
+        List<Avoidance> res = new ArrayList<>();
+        double mobSpawnerCoeff = Baritone.settings().mobSpawnerAvoidanceCoefficient.get();
+        double mobCoeff = Baritone.settings().mobAvoidanceCoefficient.get();
+        if (mobSpawnerCoeff != 1.0D) {
+            ctx.worldData().getCachedWorld().getLocationsOf("mob_spawner", 1, ctx.playerFeet().x, ctx.playerFeet().z, 2).forEach(mobspawner -> res.add(new Avoidance(mobspawner, mobSpawnerCoeff, Baritone.settings().mobSpawnerAvoidanceRadius.get())));
+        }
+        if (mobCoeff != 1.0D) {
+            ctx.world().loadedEntityList.stream().filter(entity -> entity instanceof EntityMob).forEach(entity -> res.add(new Avoidance(new BlockPos(entity), mobCoeff, Baritone.settings().mobAvoidanceRadius.get())));
+        }
+        return res;
+    }
+
+    public void applySpherical(Long2DoubleOpenHashMap map) {
+        for (int x = -radius; x <= radius; x++) {
+            for (int y = -radius; y <= radius; y++) {
+                for (int z = -radius; z <= radius; z++) {
+                    if (x * x + y * y + z * z <= radius * radius) {
+                        long hash = BetterBlockPos.longHash(centerX + x, centerY + y, centerZ + z);
+                        map.put(hash, map.get(hash) * coefficient);
+                    }
+                }
+            }
+        }
+    }
+}

src/main/java/baritone/utils/pathing/Favoring.java

@@ -0,0 +1,53 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.utils.pathing;
+
+import baritone.Baritone;
+import baritone.api.pathing.calc.IPath;
+import baritone.api.utils.BetterBlockPos;
+import baritone.api.utils.IPlayerContext;
+import it.unimi.dsi.fastutil.longs.Long2DoubleOpenHashMap;
+
+public final class Favoring {
+    private final Long2DoubleOpenHashMap favorings;
+
+    public Favoring(IPlayerContext ctx, IPath previous) {
+        this(previous);
+        for (Avoidance avoid : Avoidance.create(ctx)) {
+            avoid.applySpherical(favorings);
+        }
+        System.out.println("Favoring size: " + favorings.size());
+    }
+
+    public Favoring(IPath previous) { // create one just from previous path, no mob avoidances
+        favorings = new Long2DoubleOpenHashMap();
+        favorings.defaultReturnValue(1.0D);
+        double coeff = Baritone.settings().backtrackCostFavoringCoefficient.get();
+        if (coeff != 1D && previous != null) {
+            previous.positions().forEach(pos -> favorings.put(BetterBlockPos.longHash(pos), coeff));
+        }
+    }
+
+    public boolean isEmpty() {
+        return favorings.isEmpty();
+    }
+
+    public double calculate(long hash) {
+        return favorings.get(hash);
+    }
+}