whoops, that was dumb

suggestion for zephreo to make multi destination parkour
Merge pull request #2185 from unrootexe/master
2020-11-25 01:19:53 -08:00 · 2020-11-25 01:14:23 -08:00 · 2020-11-19 23:56:45 -08:00 · 2020-11-16 17:18:32 +00:00 · 2020-11-11 17:53:26 -08:00 · 2020-10-30 22:39:30 -07:00
40 changed files with 902 additions and 144 deletions
--- a/.gitmessage
+++ b/.gitmessage
@@ -0,0 +1,31 @@
+<emoji> <title> (<ticket>)
+
+# 📝 Update README.md (WD-1234)
+# ✅ Add unit test for inputs (WD-1234)
+
+# <emoji> can be:
+# 🎨 :art: when improving structure of the code
+# ⚡️ :zap: when improving performance
+# 🔥 :fire: when removing code or files
+# ✨ :sparkles: when introducing new features
+# 🚧 :construction: when work in progress
+# 🔨 :hammer: when refactoring code
+# 📝 :memo: when writing docs
+# 💄 :lipstick: when updating the UI and style files
+# 📈 :chart_with_upwards_trend: when adding analytics or tracking code
+# 🌐 :globe_with_meridians: when adding internationalization and localization
+# ✏️ :pencil2: when fixing typos
+# 🚚 :truck: when moving or renaming files
+# ✅ :white_check_mark: when adding tests
+
+# 👌 :ok_hand: when updating code due to code review changes
+# 🐛 :bug: when fixing a bug
+# 🚑 :ambulance: when doing a critical hotfix
+# 🚨 :rotating_light: when removing linter warnings
+
+# 🔀 :twisted_rightwards_arrows: when merging branches
+# ⬆️ :arrow_up: when upgrading dependencies
+# ⬇️ :arrow_down: when downgrading dependencies
+# 🔧 :wrench: when changing configuration files
+# 🔖 :bookmark: when releasing / version tagging
+# 💚 :green_heart: when fixing the CI build
--- a/README.md
+++ b/README.md
@@ -21,27 +21,28 @@
 ![Lines of Code](https://tokei.rs/b1/github/cabaletta/baritone?category=code)
 [![GitHub contributors](https://img.shields.io/github/contributors/cabaletta/baritone.svg)](https://github.com/cabaletta/baritone/graphs/contributors/)
 [![GitHub commits](https://img.shields.io/github/commits-since/cabaletta/baritone/v1.0.0.svg)](https://github.com/cabaletta/baritone/commit/)
-[![Impact integration](https://img.shields.io/badge/Impact%20integration-v1.2.10%20/%20v1.3.5%20/%20v1.4.3-brightgreen.svg)](https://impactclient.net/)
+[![Impact integration](https://img.shields.io/badge/Impact%20integration-v1.2.14%20/%20v1.3.8%20/%20v1.4.6%20/%20v1.5.3-brightgreen.svg)](https://impactclient.net/)
+[![KAMI Blue integration](https://img.shields.io/badge/KAMI%20Blue%20integration-v1.2.14--master-green)](https://github.com/kami-blue/client)
 [![ForgeHax integration](https://img.shields.io/badge/ForgeHax%20%22integration%22-scuffed-yellow.svg)](https://github.com/fr1kin/ForgeHax/)
 [![Aristois add-on integration](https://img.shields.io/badge/Aristois%20add--on%20integration-v1.3.4%20/%20v1.4.1-green.svg)](https://gitlab.com/emc-mods-indrit/baritone_api)
-[![rootNET integration](https://img.shields.io/badge/rootNET%20integration-v1.2.11-green.svg)](https://rootnet.dev/)
-[![WWE integration](https://img.shields.io/badge/WWE%20%22integration%22-master%3F-green.svg)](https://wweclient.com/)
-[![Future integration](https://img.shields.io/badge/Future%20integration-Soon™%3F%3F%3F-red.svg)](https://futureclient.net/)
+[![rootNET integration](https://img.shields.io/badge/rootNET%20integration-v1.2.14-green.svg)](https://rootnet.dev/)
+[![Future integration](https://img.shields.io/badge/Future%20integration-v1.2.12%20%2F%20v1.3.6%20%2F%20v1.4.4-red)](https://futureclient.net/)
+[![RusherHack integration](https://img.shields.io/badge/RusherHack%20integration-v1.2.14-green)](https://rusherhack.org/)
 [![forthebadge](https://forthebadge.com/images/badges/built-with-swag.svg)](http://forthebadge.com/)
 [![forthebadge](https://forthebadge.com/images/badges/mom-made-pizza-rolls.svg)](http://forthebadge.com/)

 A Minecraft pathfinder bot. 

-Baritone is the pathfinding system used in [Impact](https://impactclient.net/) since 4.4. There's a [showcase video](https://youtu.be/CZkLXWo4Fg4) made by @Adovin#0730 on Baritone which I recommend. [Here's](https://www.youtube.com/watch?v=StquF69-_wI) a (very old!) video I made showing off what it can do.
+Baritone is the pathfinding system used in [Impact](https://impactclient.net/) since 4.4. There's a [showcase video](https://youtu.be/CZkLXWo4Fg4) made by @Adovin#0730 on Baritone which I recommend. [Here's](https://www.youtube.com/watch?v=StquF69-_wI) a (very old!) video I made showing off what it can do. [Tutorial playlist](https://www.youtube.com/playlist?list=PLnwnJ1qsS7CoQl9Si-RTluuzCo_4Oulpa)

-The easiest way to install Baritone is to install [Impact](https://impactclient.net/), which comes with Baritone. The second easiest way (for 1.12.2 only) is to install the v1.2.* forge api jar from [releases](https://github.com/cabaletta/baritone/releases). Otherwise, see [Installation & setup](SETUP.md). Once Baritone is installed, look [here](USAGE.md) for instructions on how to use it.
+The easiest way to install Baritone is to install [Impact](https://impactclient.net/), which comes with Baritone. The second easiest way (for 1.12.2 only) is to install the v1.2.* `api-forge` jar from [releases](https://github.com/cabaletta/baritone/releases). **For 1.12.2 Forge, just click [here](https://github.com/cabaletta/baritone/releases/download/v1.2.14/baritone-api-forge-1.2.14.jar)**. Otherwise, see [Installation & setup](SETUP.md). Once Baritone is installed, look [here](USAGE.md) for instructions on how to use it.

-For 1.15.2, [click here](https://www.youtube.com/watch?v=j1qKtCZFURM) and see description.
+For 1.15.2, [click here](https://www.youtube.com/watch?v=j1qKtCZFURM) and see description. If you need Forge 1.15.2, look [here](https://github.com/cabaletta/baritone/releases/tag/v1.5.3), follow the instructions, and get the `api-forge` jar.

 This project is an updated version of [MineBot](https://github.com/leijurv/MineBot/),
 the original version of the bot for Minecraft 1.8.9, rebuilt for 1.12.2 through 1.15.2. Baritone focuses on reliability and particularly performance (it's over [30x faster](https://github.com/cabaletta/baritone/pull/180#issuecomment-423822928) than MineBot at calculating paths).

-Have committed at least once a day from Aug 1 2018 to Aug 1 2019.
+Have committed at least once a day from Aug 1, 2018, to Aug 1, 2019.

 1Leijurv3DWTrGAfmmiTphjhXLvQiHg7K2

@@ -69,7 +70,7 @@ The API is heavily documented, you can find the Javadocs for the latest release
 Please note that usage of anything located outside of the ``baritone.api`` package is not supported by the API release
 jar.

-Below is an example of basic usage for changing some settings, and then pathing to a X/Z goal.
+Below is an example of basic usage for changing some settings, and then pathing to an X/Z goal.

 ```
 BaritoneAPI.getSettings().allowSprint.value = true;
@@ -82,12 +83,22 @@ BaritoneAPI.getProvider().getPrimaryBaritone().getCustomGoalProcess().setGoalAnd

 ## Can I use Baritone as a library in my custom utility client?

-That's what it's for, sure! (As long as usage is in compliance with the LGPL 3.0 License)
+That's what it's for, sure! (As long as usage complies with the LGPL 3.0 License)

 ## How is it so fast?

 Magic. (Hours of [leijurv](https://github.com/leijurv/) enduring excruciating pain)

+### Additional Special Thanks To:
+
+![YourKit-Logo](https://www.yourkit.com/images/yklogo.png)
+
+YourKit supports open source projects with innovative and intelligent tools for monitoring and profiling Java and .NET applications.
+
+YourKit is the creator of the [YourKit Java Profiler](https://www.yourkit.com/java/profiler/), [YourKit .NET Profiler](https://www.yourkit.com/.net/profiler/), and [YourKit YouMonitor](https://www.yourkit.com/youmonitor/).
+
+We thank them for granting Baritone an OSS license so that we can make our software the best it can be.
+
 ## Why is it called Baritone?

-It's named for FitMC's deep sultry voice. 
+It's named for FitMC's deep sultry voice.
--- a/SETUP.md
+++ b/SETUP.md
@@ -49,6 +49,27 @@ On Mac OSX and Linux, use `./gradlew` instead of `gradlew`.

 If you have errors with a package missing please make sure you have setup your environment, and are using Oracle JDK 8.

+To check which java you are using do 
+`java -version` in a command prompt or terminal.
+If you are using anything above OpenJDK 8, it might not work because the Java distributions above JDK 8 using may not have the needed javax classes.
+
+Open JDK 8 download: https://openjdk.java.net/install/
+#### macOS guide
+In order to get JDK 8, Try running the following command:
+`% /usr/libexec/java_home -V`
+If it doesn't work try this guide: https://stackoverflow.com/questions/46513639/how-to-downgrade-java-from-9-to-8-on-a-macos-eclipse-is-not-running-with-java-9
+
+If you see something like
+
+`% 1.8.0_VERSION, x86_64:	"Java SE 8"	/Library/Java/JavaVirtualMachines/jdk1.8.0_VERSION.jdk/Contents/Home`
+
+in the list then you've got JDK 8 installed. 
+In order to get JDK 8 running in the **current terminal window** you will have to run this command: 
+
+`% export JAVA_HOME=$(/usr/libexec/java_home -v 1.8)`
+
+To add OpenJDK 8 to your PATH add the export line to the end of your `.zshrc / .bashrc` if you want it to apply to each new terminal. If you're using bash change the .bachrc and if you're using zsh change the .zshrc
+
 Setting up the Environment:

 ```
--- a/USAGE.md
+++ b/USAGE.md
@@ -24,6 +24,8 @@ Watch this [showcase video](https://youtu.be/CZkLXWo4Fg4)!

 # Commands

+[Tutorial playlist](https://www.youtube.com/playlist?list=PLnwnJ1qsS7CoQl9Si-RTluuzCo_4Oulpa)
+
 **All** of these commands may need a prefix before them, as above ^.

 `help`
@@ -52,7 +54,7 @@ Some common examples:
 - `version` to get the version of Baritone you're running
 - `damn` daniel

-For the rest of the commands, you can take a look at the code [here](https://github.com/cabaletta/baritone/blob/master/src/api/java/baritone/api/utils/ExampleBaritoneControl.java).
+For the rest of the commands, you can take a look at the code [here](https://baritone.leijurv.com/baritone/api/Settings.html).

 All the settings and documentation are <a href="https://github.com/cabaletta/baritone/blob/master/src/api/java/baritone/api/Settings.java">here</a>. If you find HTML easier to read than Javadoc, you can look <a href="https://baritone.leijurv.com/baritone/api/Settings.html#field.detail">here</a>.

--- a/build.gradle
+++ b/build.gradle
@@ -117,6 +117,12 @@ javadoc {

 jar {
    from sourceSets.launch.output, sourceSets.api.output
+
+    if (!getProject().hasProperty("baritone.forge_build")) {
+        exclude "**/BaritoneForgeModXD.class"
+        exclude "**/mods.toml"
+    }
+
    preserveFileTimestamps = false
    reproducibleFileOrder = true

--- a/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java
+++ b/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java
@@ -21,13 +21,21 @@ import baritone.gradle.util.Determinizer;
 import baritone.gradle.util.MappingType;
 import baritone.gradle.util.ReobfWrapper;
 import org.apache.commons.io.IOUtils;
+import org.gradle.api.JavaVersion;
 import org.gradle.api.NamedDomainObjectContainer;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.Dependency;
+import org.gradle.api.internal.file.IdentityFileResolver;
 import org.gradle.api.internal.plugins.DefaultConvention;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.TaskAction;
+import org.gradle.api.tasks.TaskCollection;
+import org.gradle.api.tasks.compile.ForkOptions;
+import org.gradle.api.tasks.compile.JavaCompile;
 import org.gradle.internal.Pair;
+import org.gradle.internal.jvm.Jvm;
+import org.gradle.internal.jvm.inspection.DefaultJvmVersionDetector;
+import org.gradle.process.internal.DefaultExecActionFactory;

 import java.io.*;
 import java.lang.reflect.Field;
@@ -101,6 +109,101 @@ public class ProguardTask extends BaritoneGradleTask {
        }
    }

+    private String getJavaBinPathForProguard() throws Exception {
+        String path;
+        try {
+            path = findJavaPathByGradleConfig();
+            if (path != null) return path;
+        }
+        catch (Exception ex) {
+            System.err.println("Unable to find java by javaCompile options");
+            ex.printStackTrace();
+        }
+
+        try {
+            path = findJavaByJavaHome();
+            if (path != null) return path;
+        }
+        catch(Exception ex) {
+            System.err.println("Unable to find java by JAVA_HOME");
+            ex.printStackTrace();
+        }
+
+
+        path = findJavaByGradleCurrentRuntime();
+        if (path != null) return path;
+        
+        throw new Exception("Unable to find java to determine ProGuard libraryjars. Please specify forkOptions.executable in javaCompile," +
+                " JAVA_HOME environment variable, or make sure to run Gradle with the correct JDK (a v1.8 only)");
+    }
+
+    private String findJavaByGradleCurrentRuntime() {
+        String path = Jvm.current().getJavaExecutable().getAbsolutePath();
+
+        if (this.validateJavaVersion(path)) {
+            System.out.println("Using Gradle's runtime Java for ProGuard");
+            return path;
+        }
+        return null;
+    }
+
+    private String findJavaByJavaHome() {
+        final String javaHomeEnv = System.getenv("JAVA_HOME");
+        if (javaHomeEnv != null) {
+
+            String path = Jvm.forHome(new File(javaHomeEnv)).getJavaExecutable().getAbsolutePath();
+            if (this.validateJavaVersion(path)) {
+                System.out.println("Detected Java path by JAVA_HOME");
+                return path;
+            }
+        }
+        return null;
+    }
+
+    private String findJavaPathByGradleConfig() {
+        final TaskCollection<JavaCompile> javaCompiles = super.getProject().getTasks().withType(JavaCompile.class);
+
+        final JavaCompile compileTask = javaCompiles.iterator().next();
+        final ForkOptions forkOptions = compileTask.getOptions().getForkOptions();
+
+        if (forkOptions != null) {
+            String javacPath = forkOptions.getExecutable();
+            if (javacPath != null) {
+                File javacFile = new File(javacPath);
+                if (javacFile.exists()) {
+                    File[] maybeJava = javacFile.getParentFile().listFiles(new FilenameFilter() {
+                        @Override
+                        public boolean accept(File dir, String name) {
+                            return name.equals("java");
+                        }
+                    });
+
+                    if (maybeJava != null && maybeJava.length > 0) {
+                        String path = maybeJava[0].getAbsolutePath();
+                        if (this.validateJavaVersion(path)) {
+                            System.out.println("Detected Java path by forkOptions");
+                            return path;
+                        }
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    private boolean validateJavaVersion(String java) {
+        final JavaVersion javaVersion = new DefaultJvmVersionDetector(new DefaultExecActionFactory(new IdentityFileResolver())).getJavaVersion(java);
+
+        if (!javaVersion.getMajorVersion().equals("8")) {
+            System.out.println("Failed to validate Java version " + javaVersion.toString() + " [" + java + "] for ProGuard libraryjars");
+            // throw new RuntimeException("Java version incorrect: " + javaVersion.getMajorVersion() + " for " + java);
+            return false;
+        }
+
+        System.out.println("Validated Java version " + javaVersion.toString() + " [" + java + "] for ProGuard libraryjars");
+        return true;
+    }
+
    private void generateConfigs() throws Exception {
        Files.copy(getRelativeFile(PROGUARD_CONFIG_TEMPLATE), getTemporaryFile(PROGUARD_CONFIG_DEST), REPLACE_EXISTING);

@@ -110,7 +213,7 @@ public class ProguardTask extends BaritoneGradleTask {
        template.add(1, "-outjars " + this.getTemporaryFile(PROGUARD_EXPORT_PATH));

        // Acquire the RT jar using "java -verbose". This doesn't work on Java 9+
-        Process p = new ProcessBuilder("java", "-verbose").start();
+        Process p = new ProcessBuilder(this.getJavaBinPathForProguard(), "-verbose").start();
        String out = IOUtils.toString(p.getInputStream(), "UTF-8").split("\n")[0].split("Opened ")[1].replace("]", "");
        template.add(2, "-libraryjars '" + out + "'");

--- a/scripts/proguard.pro
+++ b/scripts/proguard.pro
@@ -23,6 +23,13 @@

 -keep class baritone.api.utils.MyChunkPos { *; } # even in standalone we need to keep this for gson reflect

+# Keep any class or member annotated with @KeepName so we dont have to put everything in the script
+-keep,allowobfuscation @interface baritone.KeepName
+-keep @baritone.KeepName class *
+-keepclassmembers class * {
+    @baritone.KeepName *;
+}
+
 # setting names are reflected from field names, so keep field names
 -keepclassmembers class baritone.api.Settings {
    public <fields>;    
--- a/src/api/java/baritone/api/Settings.java
+++ b/src/api/java/baritone/api/Settings.java
@@ -30,8 +30,8 @@ import java.awt.*;
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-import java.util.*;
 import java.util.List;
+import java.util.*;
 import java.util.function.Consumer;

 /**
@@ -61,6 +61,19 @@ public final class Settings {
     */
    public final Setting<Boolean> allowInventory = new Setting<>(false);

+    /**
+     * Disable baritone's auto-tool at runtime, but still assume that another mod will provide auto tool functionality
+     * <p>
+     * Specifically, path calculation will still assume that an auto tool will run at execution time, even though
+     * Baritone itself will not do that.
+     */
+    public final Setting<Boolean> assumeExternalAutoTool = new Setting<>(false);
+
+    /**
+     * If this setting is on, no auto tool will occur at all, not at calculation time nor execution time
+     */
+    public final Setting<Boolean> disableAutoTool = 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.
@@ -193,6 +206,15 @@ public final class Settings {

    )));

+    /**
+     * A list of blocks to become air
+     * <p>
+     * If a schematic asks for a block on this list, only air will be accepted at that location (and nothing on buildIgnoreBlocks)
+     */
+    public final Setting<List<Block>> okIfAir = new Setting<>(new ArrayList<>(Arrays.asList(
+
+    )));
+
    /**
     * If this is true, the builder will treat all non-air blocks as correct. It will only place new blocks.
     */
@@ -430,6 +452,11 @@ public final class Settings {
     */
    public final Setting<Boolean> simplifyUnloadedYCoord = new Setting<>(true);

+    /**
+     * Whenever a block changes, repack the whole chunk that it's in
+     */
+    public final Setting<Boolean> repackOnAnyBlockChange = new Setting<>(true);
+
    /**
     * If a movement takes this many ticks more than its initial cost estimate, cancel it
     */
@@ -502,6 +529,18 @@ public final class Settings {
     */
    public final Setting<Boolean> backfill = new Setting<>(false);

+    /**
+     * Shows popup message in the upper right corner, similarly to when you make an advancement
+     */
+    public final Setting<Boolean> logAsToast = new Setting<>(false);
+
+    /**
+     * The time of how long the message in the pop-up will display
+     * <p>
+     * If below 1000L (1sec), it's better to disable this
+     */
+    public final Setting<Long> toastTimer = new Setting<>(5000L);
+
    /**
     * Print all the debug messages to chat
     */
@@ -699,6 +738,23 @@ public final class Settings {
     */
    public final Setting<Integer> maxCachedWorldScanCount = new Setting<>(10);

+    /**
+     * Sets the minimum y level whilst mining - set to 0 to turn off.
+     */
+    public final Setting<Integer> minYLevelWhileMining = new Setting<>(0);
+
+    /**
+     * This will only allow baritone to mine exposed ores, can be used to stop ore obfuscators on servers that use them.
+     */
+    public final Setting<Boolean> allowOnlyExposedOres = new Setting<>(false);
+
+    /**
+     * When allowOnlyExposedOres is enabled this is the distance around to search.
+     * <p>
+     * It is recommended to keep this value low, as it dramatically increases calculation times.
+     */
+    public final Setting<Integer> allowOnlyExposedOresDistance = new Setting<>(1);
+
    /**
     * When GetToBlock doesn't know any locations for the desired block, explore randomly instead of giving up.
     */
@@ -752,6 +808,17 @@ public final class Settings {
     */
    public final Setting<Boolean> layerOrder = new Setting<>(false);

+    /**
+     * Start building the schematic at a specific layer.
+     * Can help on larger builds when schematic wants to break things its already built
+     */
+    public final Setting<Integer> startAtLayer = new Setting<>(0);
+
+    /**
+     * If a layer is unable to be constructed, just skip it.
+     */
+    public final Setting<Boolean> skipFailedLayers = new Setting<>(false);
+
    /**
     * How far to move before repeating the build. 0 to disable repeating on a certain axis, 0,0,0 to disable entirely
     */
@@ -1047,10 +1114,35 @@ public final class Settings {
    public final Setting<Boolean> renderSelectionCorners = new Setting<>(true);

    /**
-     * Desktop Notifications
+     * Desktop notifications
     */
    public final Setting<Boolean> desktopNotifications = new Setting<>(false);

+    /**
+     * Desktop notification on path complete
+     */
+    public final Setting<Boolean> notificationOnPathComplete = new Setting<>(true);
+
+    /**
+     * Desktop notification on farm fail
+     */
+    public final Setting<Boolean> notificationOnFarmFail = new Setting<>(true);
+
+    /**
+     * Desktop notification on build finished
+     */
+    public final Setting<Boolean> notificationOnBuildFinished = new Setting<>(true);
+
+    /**
+     * Desktop notification on explore finished
+     */
+    public final Setting<Boolean> notificationOnExploreFinished = new Setting<>(true);
+
+    /**
+     * Desktop notification on mine fail
+     */
+    public final Setting<Boolean> notificationOnMineFail = new Setting<>(true);
+
    /**
     * A map of lowercase setting field names to their respective setting
     */
--- a/src/api/java/baritone/api/command/datatypes/EntityClassById.java
+++ b/src/api/java/baritone/api/command/datatypes/EntityClassById.java
@@ -32,7 +32,19 @@ public enum EntityClassById implements IDatatypeFor<Class<? extends Entity>> {
    public Class<? extends Entity> get(IDatatypeContext ctx) throws CommandException {
        ResourceLocation id = new ResourceLocation(ctx.getConsumer().getString());
        Class<? extends Entity> entity;
-        if ((entity = EntityList.REGISTRY.getObject(id)) == null) {
+        try {
+            entity = EntityList.REGISTRY.getObject(id);
+        } catch(NoSuchFieldError e) {
+            // Forge removes EntityList.REGISTRY field and provides the getClass method as a replacement
+            // See https://github.com/MinecraftForge/MinecraftForge/blob/1.12.x/patches/minecraft/net/minecraft/entity/EntityList.java.patch
+            try {
+                entity = (Class<? extends Entity>) EntityList.class.getMethod("getClass", ResourceLocation.class).invoke(null, id);
+            } catch (Exception ex) {
+                throw new RuntimeException("EntityList.REGISTRY does not exist and failed to call the Forge-replacement method", ex);
+            }
+        }
+
+        if (entity == null) {
            throw new IllegalArgumentException("no entity found by that id");
        }
        return entity;
--- a/src/api/java/baritone/api/process/IBaritoneProcess.java
+++ b/src/api/java/baritone/api/process/IBaritoneProcess.java
@@ -75,7 +75,7 @@ public interface IBaritoneProcess {
     * to start eating this tick. {@code PauseForAutoEatProcess} should only actually right click once onTick is called with
     * {@code isSafeToCancel} true though.
     *
-     * @return Whethor or not if this control is temporary
+     * @return Whether or not if this control is temporary
     */
    boolean isTemporary();

--- a/src/api/java/baritone/api/utils/Helper.java
+++ b/src/api/java/baritone/api/utils/Helper.java
@@ -18,6 +18,7 @@
 package baritone.api.utils;

 import baritone.api.BaritoneAPI;
+import baritone.api.utils.gui.BaritoneToast;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TextComponentString;
@@ -63,6 +64,35 @@ public interface Helper {
        return prefix;
    }

+    /**
+     * Send a message to display as a toast popup
+     *
+     * @param title The title to display in the popup
+     * @param message The message to display in the popup
+     */
+    default void logToast(ITextComponent title, ITextComponent message) {
+        mc.addScheduledTask(() -> BaritoneToast.addOrUpdate(mc.getToastGui(), title, message, BaritoneAPI.getSettings().toastTimer.value));
+    }
+
+    /**
+     * Send a message to display as a toast popup
+     *
+     * @param title The title to display in the popup
+     * @param message The message to display in the popup
+     */
+    default void logToast(String title, String message) {
+        logToast(new TextComponentString(title), new TextComponentString(message));
+    }
+
+    /**
+     * Send a message to display as a toast popup
+     *
+     * @param message The message to display in the popup
+     */
+    default void logToast(String message) {
+        logToast(Helper.getPrefix(), new TextComponentString(message));
+    }
+
    /**
     * Send a message to chat only if chatDebug is on
     *
@@ -74,7 +104,31 @@ public interface Helper {
            //System.out.println(message);
            return;
        }
-        logDirect(message);
+        // We won't log debug chat into toasts
+        // Because only a madman would want that extreme spam -_-
+        logDirect(message, false);
+    }
+
+    /**
+     * Send components to chat with the [Baritone] prefix
+     *
+     * @param logAsToast Whether to log as a toast notification
+     * @param components The components to send
+     */
+    default void logDirect(boolean logAsToast, ITextComponent... components) {
+        ITextComponent component = new TextComponentString("");
+        if (!logAsToast) {
+            // If we are not logging as a Toast
+            // Append the prefix to the base component line
+            component.appendSibling(getPrefix());
+            component.appendSibling(new TextComponentString(" "));
+        }
+        Arrays.asList(components).forEach(component::appendSibling);
+        if (logAsToast) {
+            logToast(getPrefix(), component);
+        } else {
+            mc.addScheduledTask(() -> BaritoneAPI.getSettings().logger.value.accept(component));
+        }
    }

    /**
@@ -83,11 +137,23 @@ public interface Helper {
     * @param components The components to send
     */
    default void logDirect(ITextComponent... components) {
-        ITextComponent component = new TextComponentString("");
-        component.appendSibling(getPrefix());
-        component.appendSibling(new TextComponentString(" "));
-        Arrays.asList(components).forEach(component::appendSibling);
-        Minecraft.getMinecraft().addScheduledTask(() -> BaritoneAPI.getSettings().logger.value.accept(component));
+        logDirect(BaritoneAPI.getSettings().logAsToast.value, components);
+    }
+
+    /**
+     * 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 The message to display in chat
+     * @param color   The color to print that message in
+     * @param logAsToast Whether to log as a toast notification
+     */
+    default void logDirect(String message, TextFormatting color, boolean logAsToast) {
+        Stream.of(message.split("\n")).forEach(line -> {
+            ITextComponent component = new TextComponentString(line.replace("\t", "    "));
+            component.getStyle().setColor(color);
+            logDirect(logAsToast, component);
+        });
    }

    /**
@@ -98,11 +164,18 @@ public interface Helper {
     * @param color   The color to print that message in
     */
    default void logDirect(String message, TextFormatting color) {
-        Stream.of(message.split("\n")).forEach(line -> {
-            ITextComponent component = new TextComponentString(line.replace("\t", "    "));
-            component.getStyle().setColor(color);
-            logDirect(component);
-        });
+        logDirect(message, color, BaritoneAPI.getSettings().logAsToast.value);
+    }
+
+    /**
+     * 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 The message to display in chat
+     * @param logAsToast Whether to log as a toast notification
+     */
+    default void logDirect(String message, boolean logAsToast) {
+        logDirect(message, TextFormatting.GRAY, logAsToast);
    }

    /**
@@ -112,6 +185,6 @@ public interface Helper {
     * @param message The message to display in chat
     */
    default void logDirect(String message) {
-        logDirect(message, TextFormatting.GRAY);
+        logDirect(message, BaritoneAPI.getSettings().logAsToast.value);
    }
 }
--- a/src/api/java/baritone/api/utils/IPlayerContext.java
+++ b/src/api/java/baritone/api/utils/IPlayerContext.java
@@ -97,17 +97,4 @@ public interface IPlayerContext {
    default boolean isLookingAt(BlockPos pos) {
        return getSelectedBlock().equals(Optional.of(pos));
    }
-
-    /**
-     * Returns the entity that the crosshair is currently placed over. Updated once per tick.
-     *
-     * @return The entity
-     */
-    default Optional<Entity> getSelectedEntity() {
-        RayTraceResult result = objectMouseOver();
-        if (result != null && result.typeOfHit == RayTraceResult.Type.ENTITY) {
-            return Optional.of(result.entityHit);
-        }
-        return Optional.empty();
-    }
 }
--- a/src/api/java/baritone/api/utils/gui/BaritoneToast.java
+++ b/src/api/java/baritone/api/utils/gui/BaritoneToast.java
@@ -0,0 +1,74 @@
+/*
+ * 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.gui;
+
+import net.minecraft.client.gui.toasts.GuiToast;
+import net.minecraft.client.gui.toasts.IToast;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.text.ITextComponent;
+
+public class BaritoneToast implements IToast {
+    private String title;
+    private String subtitle;
+    private long firstDrawTime;
+    private boolean newDisplay;
+    private long totalShowTime;
+
+    public BaritoneToast(ITextComponent titleComponent, ITextComponent subtitleComponent, long totalShowTime) {
+        this.title = titleComponent.getFormattedText();
+        this.subtitle = subtitleComponent == null ? null : subtitleComponent.getFormattedText();
+        this.totalShowTime = totalShowTime;
+    }
+
+    public Visibility draw(GuiToast toastGui, long delta) {
+        if (this.newDisplay) {
+            this.firstDrawTime = delta;
+            this.newDisplay = false;
+        }
+
+        toastGui.getMinecraft().getTextureManager().bindTexture(new ResourceLocation("textures/gui/toasts.png"));
+        GlStateManager.color(1.0F, 1.0F, 1.0F, 255.0f);
+        toastGui.drawTexturedModalRect(0, 0, 0, 32, 160, 32);
+
+        if (this.subtitle == null) {
+            toastGui.getMinecraft().fontRenderer.drawString(this.title, 18, 12, -11534256);
+        } else {
+            toastGui.getMinecraft().fontRenderer.drawString(this.title, 18, 7, -11534256);
+            toastGui.getMinecraft().fontRenderer.drawString(this.subtitle, 18, 18, -16777216);
+        }
+
+        return delta - this.firstDrawTime < totalShowTime ? Visibility.SHOW : Visibility.HIDE;
+    }
+
+    public void setDisplayedText(ITextComponent titleComponent, ITextComponent subtitleComponent) {
+        this.title = titleComponent.getFormattedText();
+        this.subtitle = subtitleComponent == null ? null : subtitleComponent.getFormattedText();
+        this.newDisplay = true;
+    }
+
+    public static void addOrUpdate(GuiToast toast, ITextComponent title, ITextComponent subtitle, long totalShowTime) {
+        BaritoneToast baritonetoast = toast.getToast(BaritoneToast.class, new Object());
+
+        if (baritonetoast == null) {
+            toast.add(new BaritoneToast(title, subtitle, totalShowTime));
+        } else {
+            baritonetoast.setDisplayedText(title, subtitle);
+        }
+    }
+}
--- a/src/launch/java/baritone/launch/mixins/MixinNetHandlerPlayClient.java
+++ b/src/launch/java/baritone/launch/mixins/MixinNetHandlerPlayClient.java
@@ -17,14 +17,19 @@

 package baritone.launch.mixins;

+import baritone.Baritone;
 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
 import baritone.api.event.events.ChunkEvent;
 import baritone.api.event.events.type.EventState;
+import baritone.cache.CachedChunk;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.network.play.server.SPacketBlockChange;
 import net.minecraft.network.play.server.SPacketChunkData;
 import net.minecraft.network.play.server.SPacketCombatEvent;
+import net.minecraft.network.play.server.SPacketMultiBlockChange;
+import net.minecraft.util.math.ChunkPos;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -80,6 +85,68 @@ public class MixinNetHandlerPlayClient {
        }
    }

+    @Inject(
+            method = "handleBlockChange",
+            at = @At("RETURN")
+    )
+    private void postHandleBlockChange(SPacketBlockChange packetIn, CallbackInfo ci) {
+        if (!Baritone.settings().repackOnAnyBlockChange.value) {
+            return;
+        }
+        if (!CachedChunk.BLOCKS_TO_KEEP_TRACK_OF.contains(packetIn.getBlockState().getBlock())) {
+            return;
+        }
+        for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
+            EntityPlayerSP player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (NetHandlerPlayClient) (Object) this) {
+                ibaritone.getGameEventHandler().onChunkEvent(
+                        new ChunkEvent(
+                                EventState.POST,
+                                ChunkEvent.Type.POPULATE_FULL,
+                                packetIn.getBlockPosition().getX() >> 4,
+                                packetIn.getBlockPosition().getZ() >> 4
+                        )
+                );
+            }
+        }
+    }
+
+    @Inject(
+            method = "handleMultiBlockChange",
+            at = @At("RETURN")
+    )
+    private void postHandleMultiBlockChange(SPacketMultiBlockChange packetIn, CallbackInfo ci) {
+        if (!Baritone.settings().repackOnAnyBlockChange.value) {
+            return;
+        }
+        if (packetIn.getChangedBlocks().length == 0) {
+            return;
+        }
+        https://docs.oracle.com/javase/specs/jls/se7/html/jls-14.html#jls-14.15
+        {
+            for (SPacketMultiBlockChange.BlockUpdateData update : packetIn.getChangedBlocks()) {
+                if (CachedChunk.BLOCKS_TO_KEEP_TRACK_OF.contains(update.getBlockState().getBlock())) {
+                    break https;
+                }
+            }
+            return;
+        }
+        ChunkPos pos = new ChunkPos(packetIn.getChangedBlocks()[0].getPos());
+        for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
+            EntityPlayerSP player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (NetHandlerPlayClient) (Object) this) {
+                ibaritone.getGameEventHandler().onChunkEvent(
+                        new ChunkEvent(
+                                EventState.POST,
+                                ChunkEvent.Type.POPULATE_FULL,
+                                pos.x,
+                                pos.z
+                        )
+                );
+            }
+        }
+    }
+
    @Inject(
            method = "handleCombatEvent",
            at = @At(
--- a/src/main/java/baritone/Baritone.java
+++ b/src/main/java/baritone/Baritone.java
@@ -104,14 +104,14 @@ public class Baritone implements IBaritone {

        this.pathingControlManager = new PathingControlManager(this);
        {
-            followProcess = new FollowProcess(this);
-            mineProcess = new MineProcess(this);
-            customGoalProcess = new CustomGoalProcess(this); // very high iq
-            getToBlockProcess = new GetToBlockProcess(this);
-            builderProcess = new BuilderProcess(this);
-            exploreProcess = new ExploreProcess(this);
-            backfillProcess = new BackfillProcess(this);
-            farmProcess = new FarmProcess(this);
+            this.pathingControlManager.registerProcess(followProcess = new FollowProcess(this));
+            this.pathingControlManager.registerProcess(mineProcess = new MineProcess(this));
+            this.pathingControlManager.registerProcess(customGoalProcess = new CustomGoalProcess(this)); // very high iq
+            this.pathingControlManager.registerProcess(getToBlockProcess = new GetToBlockProcess(this));
+            this.pathingControlManager.registerProcess(builderProcess = new BuilderProcess(this));
+            this.pathingControlManager.registerProcess(exploreProcess = new ExploreProcess(this));
+            this.pathingControlManager.registerProcess(backfillProcess = new BackfillProcess(this));
+            this.pathingControlManager.registerProcess(farmProcess = new FarmProcess(this));
        }

        this.worldProvider = new WorldProvider();
--- a/src/main/java/baritone/BaritoneProvider.java
+++ b/src/main/java/baritone/BaritoneProvider.java
@@ -22,7 +22,7 @@ import baritone.api.IBaritoneProvider;
 import baritone.api.cache.IWorldScanner;
 import baritone.api.command.ICommandSystem;
 import baritone.api.schematic.ISchematicSystem;
-import baritone.command.BaritoneChatControl;
+import baritone.command.ExampleBaritoneControl;
 import baritone.cache.WorldScanner;
 import baritone.command.CommandSystem;
 import baritone.utils.schematic.SchematicSystem;
@@ -44,7 +44,7 @@ public final class BaritoneProvider implements IBaritoneProvider {
        this.all = Collections.singletonList(this.primary);

        // Setup chat control, just for the primary instance
-        new BaritoneChatControl(this.primary);
+        new ExampleBaritoneControl(this.primary);
    }

    @Override
--- a/src/main/java/baritone/KeepName.java
+++ b/src/main/java/baritone/KeepName.java
@@ -0,0 +1,21 @@
+/*
+ * 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;
+
+// Annotation for classes and class members that should not be renamed by proguard
+public @interface KeepName { }
--- a/src/main/java/baritone/cache/CachedWorld.java
+++ b/src/main/java/baritone/cache/CachedWorld.java
@@ -26,6 +26,7 @@ import baritone.api.utils.Helper;
 import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
 import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.chunk.Chunk;

 import java.io.IOException;
@@ -33,6 +34,8 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.LinkedBlockingQueue;

 /**
@@ -56,7 +59,17 @@ public final class CachedWorld implements ICachedWorld, Helper {
     */
    private final String directory;

-    private final LinkedBlockingQueue<Chunk> toPack = new LinkedBlockingQueue<>();
+    /**
+     * Queue of positions to pack. Refers to the toPackMap, in that every element of this queue will be a
+     * key in that map.
+     */
+    private final LinkedBlockingQueue<ChunkPos> toPackQueue = new LinkedBlockingQueue<>();
+
+    /**
+     * All chunk positions pending packing. This map will be updated in-place if a new update to the chunk occurs
+     * while waiting in the queue for the packer thread to get to it.
+     */
+    private final Map<ChunkPos, Chunk> toPackMap = new ConcurrentHashMap<>();

    private final int dimension;

@@ -89,10 +102,8 @@ public final class CachedWorld implements ICachedWorld, Helper {

    @Override
    public final void queueForPacking(Chunk chunk) {
-        try {
-            toPack.put(chunk);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
+        if (toPackMap.put(chunk.getPos(), chunk) == null) {
+            toPackQueue.add(chunk.getPos());
        }
    }

@@ -293,13 +304,9 @@ public final class CachedWorld implements ICachedWorld, Helper {

        public void run() {
            while (true) {
-                // TODO: Add CachedWorld unloading to remove the redundancy of having this
-                LinkedBlockingQueue<Chunk> queue = toPack;
-                if (queue == null) {
-                    break;
-                }
                try {
-                    Chunk chunk = queue.take();
+                    ChunkPos pos = toPackQueue.take();
+                    Chunk chunk = toPackMap.remove(pos);
                    CachedChunk cached = ChunkPacker.pack(chunk);
                    CachedWorld.this.updateCachedChunk(cached);
                    //System.out.println("Processed chunk at " + chunk.x + "," + chunk.z);
--- a/src/main/java/baritone/command/ExampleBaritoneControl.java
+++ b/src/main/java/baritone/command/ExampleBaritoneControl.java
@@ -49,12 +49,12 @@ import java.util.stream.Stream;

 import static baritone.api.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX;

-public class BaritoneChatControl implements Helper, AbstractGameEventListener {
+public class ExampleBaritoneControl implements Helper, AbstractGameEventListener {

    private static final Settings settings = BaritoneAPI.getSettings();
    private final ICommandManager manager;

-    public BaritoneChatControl(IBaritone baritone) {
+    public ExampleBaritoneControl(IBaritone baritone) {
        this.manager = baritone.getCommandManager();
        baritone.getGameEventHandler().registerEventListener(this);
    }
--- a/src/main/java/baritone/command/defaults/BuildCommand.java
+++ b/src/main/java/baritone/command/defaults/BuildCommand.java
@@ -46,7 +46,7 @@ public class BuildCommand extends Command {
    public void execute(String label, IArgConsumer args) throws CommandException {
        File file = args.getDatatypePost(RelativeFile.INSTANCE, schematicsDir).getAbsoluteFile();
        if (FilenameUtils.getExtension(file.getAbsolutePath()).isEmpty()) {
-            file = new File(file.getAbsolutePath() + "." + Baritone.settings().schematicFallbackExtension);
+            file = new File(file.getAbsolutePath() + "." + Baritone.settings().schematicFallbackExtension.value);
        }
        BetterBlockPos origin = ctx.playerFeet();
        BetterBlockPos buildOrigin;
--- a/src/main/java/baritone/command/defaults/DefaultCommands.java
+++ b/src/main/java/baritone/command/defaults/DefaultCommands.java
@@ -60,10 +60,11 @@ public final class DefaultCommands {
                new FindCommand(baritone),
                new MineCommand(baritone),
                new ClickCommand(baritone),
+                new SurfaceCommand(baritone),
                new ThisWayCommand(baritone),
                new WaypointsCommand(baritone),
                new CommandAlias(baritone, "sethome", "Sets your home waypoint", "waypoints save home"),
-                new CommandAlias(baritone, "home", "Set goal to your home waypoint", "waypoints goal home"),
+                new CommandAlias(baritone, "home", "Path to your home waypoint", "waypoints goto home"),
                new SelCommand(baritone)
        ));
        ExecutionControlCommands prc = new ExecutionControlCommands(baritone);
--- a/src/main/java/baritone/command/defaults/ExecutionControlCommands.java
+++ b/src/main/java/baritone/command/defaults/ExecutionControlCommands.java
@@ -79,7 +79,7 @@ public class ExecutionControlCommands {
                    }
                }
        );
-        pauseCommand = new Command(baritone, "pause") {
+        pauseCommand = new Command(baritone, "pause", "p") {
            @Override
            public void execute(String label, IArgConsumer args) throws CommandException {
                args.requireMax(0);
@@ -112,7 +112,7 @@ public class ExecutionControlCommands {
                );
            }
        };
-        resumeCommand = new Command(baritone, "resume") {
+        resumeCommand = new Command(baritone, "resume", "r") {
            @Override
            public void execute(String label, IArgConsumer args) throws CommandException {
                args.requireMax(0);
@@ -171,7 +171,7 @@ public class ExecutionControlCommands {
                );
            }
        };
-        cancelCommand = new Command(baritone, "cancel", "stop") {
+        cancelCommand = new Command(baritone, "cancel", "c", "stop") {
            @Override
            public void execute(String label, IArgConsumer args) throws CommandException {
                args.requireMax(0);
--- a/src/main/java/baritone/command/defaults/FollowCommand.java
+++ b/src/main/java/baritone/command/defaults/FollowCommand.java
@@ -17,6 +17,7 @@

 package baritone.command.defaults;

+import baritone.KeepName;
 import baritone.api.IBaritone;
 import baritone.api.command.Command;
 import baritone.api.command.datatypes.EntityClassById;
@@ -130,6 +131,7 @@ public class FollowCommand extends Command {
        );
    }

+    @KeepName
    private enum FollowGroup {
        ENTITIES(EntityLiving.class::isInstance),
        PLAYERS(EntityPlayer.class::isInstance); /* ,
@@ -142,6 +144,7 @@ public class FollowCommand extends Command {
        }
    }

+    @KeepName
    private enum FollowList {
        ENTITY(EntityClassById.INSTANCE),
        PLAYER(NearbyPlayer.INSTANCE);
--- a/src/main/java/baritone/command/defaults/GotoCommand.java
+++ b/src/main/java/baritone/command/defaults/GotoCommand.java
@@ -72,7 +72,7 @@ public class GotoCommand extends Command {
    @Override
    public List<String> getLongDesc() {
        return Arrays.asList(
-                "The got command tells Baritone to head towards a given goal or block.",
+                "The goto command tells Baritone to head towards a given goal or block.",
                "",
                "Wherever a coordinate is expected, you can use ~ just like in regular Minecraft commands. Or, you can just use regular numbers.",
                "",
--- a/src/main/java/baritone/command/defaults/SurfaceCommand.java
+++ b/src/main/java/baritone/command/defaults/SurfaceCommand.java
@@ -0,0 +1,89 @@
+/*
+ * 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.command.defaults;
+
+import baritone.api.IBaritone;
+import baritone.api.command.Command;
+import baritone.api.command.argument.IArgConsumer;
+import baritone.api.command.exception.CommandException;
+import baritone.api.pathing.goals.Goal;
+import baritone.api.pathing.goals.GoalBlock;
+import baritone.api.utils.BetterBlockPos;
+import net.minecraft.block.BlockAir;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Stream;
+
+public class SurfaceCommand extends Command {
+
+    protected SurfaceCommand(IBaritone baritone) {
+        super(baritone, "surface", "top");
+    }
+
+    @Override
+    public void execute(String label, IArgConsumer args) throws CommandException {
+        final BetterBlockPos playerPos = baritone.getPlayerContext().playerFeet();
+        final int surfaceLevel = baritone.getPlayerContext().world().getSeaLevel();
+        final int worldHeight = baritone.getPlayerContext().world().getActualHeight();
+
+        // Ensure this command will not run if you are above the surface level and the block above you is air
+        // As this would imply that your are already on the open surface
+        if (playerPos.getY() > surfaceLevel && mc.world.getBlockState(playerPos.up()).getBlock() instanceof BlockAir) {
+            logDirect("Already at surface");
+            return;
+        }
+
+        final int startingYPos = Math.max(playerPos.getY(), surfaceLevel);
+
+        for (int currentIteratedY = startingYPos; currentIteratedY < worldHeight; currentIteratedY++) {
+            final BetterBlockPos newPos = new BetterBlockPos(playerPos.getX(), currentIteratedY, playerPos.getZ());
+
+            if (!(mc.world.getBlockState(newPos).getBlock() instanceof BlockAir) && newPos.getY() > playerPos.getY()) {
+                Goal goal = new GoalBlock(newPos.up());
+                logDirect(String.format("Going to: %s", goal.toString()));
+                baritone.getCustomGoalProcess().setGoalAndPath(goal);
+                return;
+            }
+        }
+        logDirect("No higher location found");
+    }
+
+    @Override
+    public Stream<String> tabComplete(String label, IArgConsumer args) {
+        return Stream.empty();
+    }
+
+    @Override
+    public String getShortDesc() {
+        return "Used to get out of caves, mines, ...";
+    }
+
+    @Override
+    public List<String> getLongDesc() {
+        return Arrays.asList(
+                "The surface/top command tells Baritone to head towards the closest surface-like area.",
+                "",
+                "This can be the surface or the highest available air space, depending on circumstances.",
+                "",
+                "Usage:",
+                "> surface - Used to get out of caves, mines, ...",
+                "> top - Used to get out of caves, mines, ..."
+        );
+    }
+}
--- a/src/main/java/baritone/command/defaults/WaypointsCommand.java
+++ b/src/main/java/baritone/command/defaults/WaypointsCommand.java
@@ -235,6 +235,10 @@ public class WaypointsCommand extends Command {
                    Goal goal = new GoalBlock(waypoint.getLocation());
                    baritone.getCustomGoalProcess().setGoal(goal);
                    logDirect(String.format("Goal: %s", goal));
+                } else if (action == Action.GOTO) {
+                    Goal goal = new GoalBlock(waypoint.getLocation());
+                    baritone.getCustomGoalProcess().setGoalAndPath(goal);
+                    logDirect(String.format("Going to: %s", goal));
                }
            }
        }
@@ -292,7 +296,8 @@ public class WaypointsCommand extends Command {
                "> wp <s/save> <tag> <name> <pos> - Save the waypoint with the specified name and position.",
                "> wp <i/info/show> <tag> - Show info on a waypoint by tag.",
                "> wp <d/delete> <tag> - Delete a waypoint by tag.",
-                "> wp <g/goal/goto> <tag> - Set a goal to a waypoint by tag."
+                "> wp <g/goal> <tag> - Set a goal to a waypoint by tag.",
+                "> wp <goto> <tag> - Set a goal to a waypoint by tag and start pathing."
        );
    }

@@ -302,7 +307,8 @@ public class WaypointsCommand extends Command {
        SAVE("save", "s"),
        INFO("info", "show", "i"),
        DELETE("delete", "d"),
-        GOAL("goal", "goto", "g");
+        GOAL("goal", "g"),
+        GOTO("goto");
        private final String[] names;

        Action(String... names) {
--- a/src/main/java/baritone/pathing/calc/AStarPathFinder.java
+++ b/src/main/java/baritone/pathing/calc/AStarPathFinder.java
@@ -59,7 +59,7 @@ public final class AStarPathFinder extends AbstractNodeCostSearch {
            bestHeuristicSoFar[i] = startNode.estimatedCostToGoal;
            bestSoFar[i] = startNode;
        }
-        MutableMoveResult res = new MutableMoveResult();
+        MutableMoveResult mutableMoveResult = new MutableMoveResult();
        BetterWorldBorder worldBorder = new BetterWorldBorder(calcContext.world.getWorldBorder());
        long startTime = System.currentTimeMillis();
        boolean slowPath = Baritone.settings().slowPath.value;
@@ -112,52 +112,56 @@ public final class AStarPathFinder extends AbstractNodeCostSearch {
                if (currentNode.y + moves.yOffset > 256 || currentNode.y + moves.yOffset < 0) {
                    continue;
                }
-                res.reset();
-                moves.apply(calcContext, currentNode.x, currentNode.y, currentNode.z, res);
-                numMovementsConsidered++;
-                double actionCost = res.cost;
-                if (actionCost >= ActionCosts.COST_INF) {
-                    continue;
-                }
-                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;
-                }
-                if (!moves.dynamicXZ && (res.x != newX || res.z != newZ)) {
-                    throw new IllegalStateException(moves + " " + res.x + " " + newX + " " + res.z + " " + newZ);
-                }
-                if (!moves.dynamicY && res.y != currentNode.y + moves.yOffset) {
-                    throw new IllegalStateException(moves + " " + res.y + " " + (currentNode.y + moves.yOffset));
-                }
-                long hashCode = BetterBlockPos.longHash(res.x, res.y, res.z);
-                if (isFavoring) {
-                    // see issue #18
-                    actionCost *= favoring.calculate(hashCode);
-                }
-                PathNode neighbor = getNodeAtPosition(res.x, res.y, res.z, hashCode);
-                double tentativeCost = currentNode.cost + actionCost;
-                if (neighbor.cost - tentativeCost > minimumImprovement) {
-                    neighbor.previous = currentNode;
-                    neighbor.cost = tentativeCost;
-                    neighbor.combinedCost = tentativeCost + neighbor.estimatedCostToGoal;
-                    if (neighbor.isOpen()) {
-                        openSet.update(neighbor);
-                    } else {
-                        openSet.insert(neighbor);//dont double count, dont insert into open set if it's already there
+                mutableMoveResult.reset();
+                moves.apply(calcContext, currentNode.x, currentNode.y, currentNode.z, mutableMoveResult);
+                MutableMoveResult res = mutableMoveResult;
+                while (res != null) {
+                    numMovementsConsidered++;
+                    double actionCost = res.cost;
+                    if (actionCost >= ActionCosts.COST_INF) {
+                        continue;
                    }
-                    for (int i = 0; i < COEFFICIENTS.length; i++) {
-                        double heuristic = neighbor.estimatedCostToGoal + neighbor.cost / COEFFICIENTS[i];
-                        if (bestHeuristicSoFar[i] - heuristic > minimumImprovement) {
-                            bestHeuristicSoFar[i] = heuristic;
-                            bestSoFar[i] = neighbor;
-                            if (failing && getDistFromStartSq(neighbor) > MIN_DIST_PATH * MIN_DIST_PATH) {
-                                failing = false;
+                    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;
+                    }
+                    if (!moves.dynamicXZ && (res.x != newX || res.z != newZ)) {
+                        throw new IllegalStateException(moves + " " + res.x + " " + newX + " " + res.z + " " + newZ);
+                    }
+                    if (!moves.dynamicY && res.y != currentNode.y + moves.yOffset) {
+                        throw new IllegalStateException(moves + " " + res.y + " " + (currentNode.y + moves.yOffset));
+                    }
+                    long hashCode = BetterBlockPos.longHash(res.x, res.y, res.z);
+                    if (isFavoring) {
+                        // see issue #18
+                        actionCost *= favoring.calculate(hashCode);
+                    }
+                    PathNode neighbor = getNodeAtPosition(res.x, res.y, res.z, hashCode);
+                    double tentativeCost = currentNode.cost + actionCost;
+                    if (neighbor.cost - tentativeCost > minimumImprovement) {
+                        neighbor.previous = currentNode;
+                        neighbor.cost = tentativeCost;
+                        neighbor.combinedCost = tentativeCost + neighbor.estimatedCostToGoal;
+                        if (neighbor.isOpen()) {
+                            openSet.update(neighbor);
+                        } else {
+                            openSet.insert(neighbor);//dont double count, dont insert into open set if it's already there
+                        }
+                        for (int i = 0; i < COEFFICIENTS.length; i++) {
+                            double heuristic = neighbor.estimatedCostToGoal + neighbor.cost / COEFFICIENTS[i];
+                            if (bestHeuristicSoFar[i] - heuristic > minimumImprovement) {
+                                bestHeuristicSoFar[i] = heuristic;
+                                bestSoFar[i] = neighbor;
+                                if (failing && getDistFromStartSq(neighbor) > MIN_DIST_PATH * MIN_DIST_PATH) {
+                                    failing = false;
+                                }
                            }
                        }
                    }
+                    res = res.getNext();
                }
            }
        }
--- a/src/main/java/baritone/pathing/movement/MovementHelper.java
+++ b/src/main/java/baritone/pathing/movement/MovementHelper.java
@@ -432,7 +432,9 @@ public interface MovementHelper extends ActionCosts, Helper {
     * @param ts  previously calculated ToolSet
     */
    static void switchToBestToolFor(IPlayerContext ctx, IBlockState b, ToolSet ts, boolean preferSilkTouch) {
-        ctx.player().inventory.currentItem = ts.getBestSlot(b.getBlock(), preferSilkTouch);
+        if (!Baritone.settings().disableAutoTool.value && !Baritone.settings().assumeExternalAutoTool.value) {
+            ctx.player().inventory.currentItem = ts.getBestSlot(b.getBlock(), preferSilkTouch);
+        }
    }

    static void moveTowards(IPlayerContext ctx, MovementState state, BlockPos pos) {
@@ -560,4 +562,11 @@ public interface MovementHelper extends ActionCosts, Helper {
    enum PlaceResult {
        READY_TO_PLACE, ATTEMPTING, NO_OPTION;
    }
+    static boolean isTransparent(Block b) {
+
+        return b == Blocks.AIR ||
+                b == Blocks.FLOWING_LAVA ||
+                b == Blocks.FLOWING_WATER ||
+                b == Blocks.WATER;
+    }
 }
--- a/src/main/java/baritone/pathing/movement/movements/MovementDiagonal.java
+++ b/src/main/java/baritone/pathing/movement/movements/MovementDiagonal.java
@@ -31,6 +31,7 @@ import baritone.utils.pathing.MutableMoveResult;
 import com.google.common.collect.ImmutableSet;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
@@ -56,6 +57,35 @@ public class MovementDiagonal extends Movement {
        super(baritone, start, end, new BetterBlockPos[]{dir1, dir1.up(), dir2, dir2.up(), end, end.up()});
    }

+    @Override
+    protected boolean safeToCancel(MovementState state) {
+        //too simple. backfill does not work after cornering with this
+        //return MovementHelper.canWalkOn(ctx, ctx.playerFeet().down());
+        EntityPlayerSP player = ctx.player();
+        double offset = 0.25;
+        double x = player.posX;
+        double y = player.posY - 1;
+        double z = player.posZ;
+        //standard
+        if (ctx.playerFeet().equals(src)){
+            return true;
+        }
+        //both corners are walkable
+        if (MovementHelper.canWalkOn(ctx, new BlockPos(src.x, src.y - 1, dest.z))
+            && MovementHelper.canWalkOn(ctx, new BlockPos(dest.x, src.y - 1, src.z))){
+                return true;
+        }
+        //we are in a likely unwalkable corner, check for a supporting block
+        if (ctx.playerFeet().equals(new BetterBlockPos(src.x, src.y, dest.z))
+            || ctx.playerFeet().equals(new BetterBlockPos(dest.x, src.y, src.z))){
+                return (MovementHelper.canWalkOn(ctx, new BetterBlockPos(x + offset, y, z + offset))
+                   || MovementHelper.canWalkOn(ctx, new BetterBlockPos(x + offset, y, z - offset))
+                   || MovementHelper.canWalkOn(ctx, new BetterBlockPos(x - offset, y, z + offset))
+                   || MovementHelper.canWalkOn(ctx, new BetterBlockPos(x - offset, y, z - offset)));
+        }
+        return true;
+   }
+
    @Override
    public double calculateCost(CalculationContext context) {
        MutableMoveResult result = new MutableMoveResult();
--- a/src/main/java/baritone/pathing/movement/movements/MovementParkour.java
+++ b/src/main/java/baritone/pathing/movement/movements/MovementParkour.java
@@ -131,8 +131,14 @@ public class MovementParkour extends Movement {
                    res.y = y;
                    res.z = destZ;
                    res.cost = costFromJumpDistance(i) + context.jumpPenalty;
+                    // for example, right here, we might just do:
+                    res = res.nextPotentialDestination();
+                    // that like, marks this `res` as "done" and we've put in this movement option's data
                }
+                // and instead of this return
                return;
+                // we would just continue onto the rest of the loop, and if we find an alternate landing, we would just update `res` as normal, and everything would Just Work
+                // we could return ANY number of potential movement destinations like this, and as soon as we get each new one, we just pop it into the stack by writing to `res` then doing `res = res.nextPotentialDestination();`
            }
            if (!MovementHelper.fullyPassable(context, destX, y + 3, destZ)) {
                return;
--- a/src/main/java/baritone/process/BuilderProcess.java
+++ b/src/main/java/baritone/process/BuilderProcess.java
@@ -39,6 +39,7 @@ import baritone.pathing.movement.Movement;
 import baritone.pathing.movement.MovementHelper;
 import baritone.utils.BaritoneProcessHelper;
 import baritone.utils.BlockStateInterface;
+import baritone.utils.NotificationHelper;
 import baritone.utils.PathingCommandContext;
 import baritone.utils.schematic.MapArtSchematic;
 import baritone.utils.schematic.SchematicSystem;
@@ -97,7 +98,7 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
        }
        this.origin = new Vec3i(x, y, z);
        this.paused = false;
-        this.layer = 0;
+        this.layer = Baritone.settings().startAtLayer.value;
        this.numRepeats = 0;
        this.observedCompleted = new LongOpenHashSet();
    }
@@ -406,6 +407,9 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
            numRepeats++;
            if (repeat.equals(new Vec3i(0, 0, 0)) || (max != -1 && numRepeats >= max)) {
                logDirect("Done building");
+                if (Baritone.settings().desktopNotifications.value && Baritone.settings().notificationOnBuildFinished.value) {
+                    NotificationHelper.notify("Done building", false);
+                }
                onLostControl();
                return null;
            }
@@ -480,6 +484,11 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
        if (goal == null) {
            goal = assemble(bcc, approxPlaceable); // we're far away, so assume that we have our whole inventory to recalculate placeable properly
            if (goal == null) {
+                if (Baritone.settings().skipFailedLayers.value && Baritone.settings().buildInLayers.value && layer < realSchematic.heightY()) {
+                    logDirect("Skipping layer that I cannot construct! Layer #" + layer);
+                    layer++;
+                    return onTick(calcFailed, isSafeToCancel);
+                }
                logDirect("Unable to do it. Pausing. resume to resume, cancel to cancel");
                paused = true;
                return new PathingCommand(null, PathingCommandType.REQUEST_PAUSE);
@@ -743,7 +752,7 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
        name = null;
        schematic = null;
        realSchematic = null;
-        layer = 0;
+        layer = Baritone.settings().startAtLayer.value;
        numRepeats = 0;
        paused = false;
        observedCompleted = null;
@@ -773,10 +782,12 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
        if (desired == null) {
            return true;
        }
-        // TODO more complicated comparison logic I guess
        if (current.getBlock() instanceof BlockLiquid && Baritone.settings().okIfWater.value) {
            return true;
        }
+        if (current.getBlock() instanceof BlockAir && Baritone.settings().okIfAir.value.contains(desired.getBlock())) {
+            return true;
+        }
        if (desired.getBlock() instanceof BlockAir && Baritone.settings().buildIgnoreBlocks.value.contains(current.getBlock())) {
            return true;
        }
--- a/src/main/java/baritone/process/CustomGoalProcess.java
+++ b/src/main/java/baritone/process/CustomGoalProcess.java
@@ -23,6 +23,7 @@ import baritone.api.process.ICustomGoalProcess;
 import baritone.api.process.PathingCommand;
 import baritone.api.process.PathingCommandType;
 import baritone.utils.BaritoneProcessHelper;
+import baritone.utils.NotificationHelper;

 /**
 * As set by ExampleBaritoneControl or something idk
@@ -93,6 +94,9 @@ public final class CustomGoalProcess extends BaritoneProcessHelper implements IC
                    if (Baritone.settings().disconnectOnArrival.value) {
                        ctx.world().sendQuittingDisconnectingPacket();
                    }
+                    if (Baritone.settings().desktopNotifications.value && Baritone.settings().notificationOnPathComplete.value) {
+                        NotificationHelper.notify("Pathing complete", false);
+                    }
                    return new PathingCommand(this.goal, PathingCommandType.CANCEL_AND_SET_GOAL);
                }
                return new PathingCommand(this.goal, PathingCommandType.SET_GOAL_AND_PATH);
--- a/src/main/java/baritone/process/ExploreProcess.java
+++ b/src/main/java/baritone/process/ExploreProcess.java
@@ -29,6 +29,7 @@ import baritone.api.process.PathingCommandType;
 import baritone.api.utils.MyChunkPos;
 import baritone.cache.CachedWorld;
 import baritone.utils.BaritoneProcessHelper;
+import baritone.utils.NotificationHelper;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
@@ -83,12 +84,18 @@ public final class ExploreProcess extends BaritoneProcessHelper implements IExpl
    public PathingCommand onTick(boolean calcFailed, boolean isSafeToCancel) {
        if (calcFailed) {
            logDirect("Failed");
+            if (Baritone.settings().desktopNotifications.value && Baritone.settings().notificationOnExploreFinished.value) {
+                NotificationHelper.notify("Exploration failed", true);
+            }
            onLostControl();
            return null;
        }
        IChunkFilter filter = calcFilter();
        if (!Baritone.settings().disableCompletionCheck.value && filter.countRemain() == 0) {
            logDirect("Explored all chunks");
+            if (Baritone.settings().desktopNotifications.value && Baritone.settings().notificationOnExploreFinished.value) {
+                NotificationHelper.notify("Explored all chunks", false);
+            }
            onLostControl();
            return null;
        }
--- a/src/main/java/baritone/process/FarmProcess.java
+++ b/src/main/java/baritone/process/FarmProcess.java
@@ -31,6 +31,7 @@ import baritone.api.utils.input.Input;
 import baritone.cache.WorldScanner;
 import baritone.pathing.movement.MovementHelper;
 import baritone.utils.BaritoneProcessHelper;
+import baritone.utils.NotificationHelper;
 import net.minecraft.block.*;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
@@ -257,6 +258,9 @@ public final class FarmProcess extends BaritoneProcessHelper implements IFarmPro

        if (calcFailed) {
            logDirect("Farm failed");
+            if (Baritone.settings().desktopNotifications.value && Baritone.settings().notificationOnFarmFail.value) {
+                NotificationHelper.notify("Farm failed", true);
+            }
            onLostControl();
            return new PathingCommand(null, PathingCommandType.REQUEST_PAUSE);
        }
--- a/src/main/java/baritone/process/MineProcess.java
+++ b/src/main/java/baritone/process/MineProcess.java
@@ -30,6 +30,7 @@ import baritone.pathing.movement.CalculationContext;
 import baritone.pathing.movement.MovementHelper;
 import baritone.utils.BaritoneProcessHelper;
 import baritone.utils.BlockStateInterface;
+import baritone.utils.NotificationHelper;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockAir;
 import net.minecraft.block.BlockFalling;
@@ -88,10 +89,16 @@ public final class MineProcess extends BaritoneProcessHelper implements IMinePro
        if (calcFailed) {
            if (!knownOreLocations.isEmpty() && Baritone.settings().blacklistClosestOnFailure.value) {
                logDirect("Unable to find any path to " + filter + ", blacklisting presumably unreachable closest instance...");
+                if (Baritone.settings().desktopNotifications.value && Baritone.settings().notificationOnMineFail.value) {
+                    NotificationHelper.notify("Unable to find any path to " + filter + ", blacklisting presumably unreachable closest instance...", true);
+                }
                knownOreLocations.stream().min(Comparator.comparingDouble(ctx.player()::getDistanceSq)).ifPresent(blacklist::add);
                knownOreLocations.removeIf(blacklist::contains);
            } else {
                logDirect("Unable to find any path to " + filter + ", canceling mine");
+                if (Baritone.settings().desktopNotifications.value && Baritone.settings().notificationOnMineFail.value) {
+                    NotificationHelper.notify("Unable to find any path to " + filter + ", canceling mine", true);
+                }
                cancel();
                return null;
            }
@@ -221,6 +228,9 @@ public final class MineProcess extends BaritoneProcessHelper implements IMinePro
        locs.addAll(dropped);
        if (locs.isEmpty()) {
            logDirect("No locations for " + filter + " known, cancelling");
+            if (Baritone.settings().desktopNotifications.value && Baritone.settings().notificationOnMineFail.value) {
+                NotificationHelper.notify("No locations for " + filter + " known, cancelling", true);
+            }
            cancel();
            return;
        }
@@ -399,6 +409,16 @@ public final class MineProcess extends BaritoneProcessHelper implements IMinePro
                // remove any that are implausible to mine (encased in bedrock, or touching lava)
                .filter(pos -> MineProcess.plausibleToBreak(ctx, pos))

+                .filter(pos -> {
+                    if (Baritone.settings().allowOnlyExposedOres.value) {
+                        return isNextToAir(ctx, pos);
+                    } else {
+                        return true;
+                    }
+                })
+
+                .filter(pos -> pos.getY() >= Baritone.settings().minYLevelWhileMining.value)
+
                .filter(pos -> !blacklist.contains(pos))

                .sorted(Comparator.comparingDouble(ctx.getBaritone().getPlayerContext().player()::getDistanceSq))
@@ -410,6 +430,22 @@ public final class MineProcess extends BaritoneProcessHelper implements IMinePro
        return locs;
    }

+    public static boolean isNextToAir(CalculationContext ctx, BlockPos pos) {
+        int radius = Baritone.settings().allowOnlyExposedOresDistance.value;
+        for (int dx = -radius; dx <= radius; dx++) {
+            for (int dy = -radius; dy <= radius; dy++) {
+                for (int dz = -radius; dz <= radius; dz++) {
+                    if (Math.abs(dx) + Math.abs(dy) + Math.abs(dz) <= radius
+                            && MovementHelper.isTransparent(ctx.getBlock(pos.getX() + dx, pos.getY() + dy, pos.getZ() + dz))) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+
    public static boolean plausibleToBreak(CalculationContext ctx, BlockPos pos) {
        if (MovementHelper.getMiningDurationTicks(ctx, pos.getX(), pos.getY(), pos.getZ(), ctx.bsi.get0(pos), true) >= COST_INF) {
            return false;
--- a/src/main/java/baritone/utils/BaritoneProcessHelper.java
+++ b/src/main/java/baritone/utils/BaritoneProcessHelper.java
@@ -30,7 +30,6 @@ public abstract class BaritoneProcessHelper implements IBaritoneProcess, Helper
    public BaritoneProcessHelper(Baritone baritone) {
        this.baritone = baritone;
        this.ctx = baritone.getPlayerContext();
-        baritone.getPathingControlManager().registerProcess(this);
    }

    @Override
--- a/src/main/java/baritone/utils/GuiClick.java
+++ b/src/main/java/baritone/utils/GuiClick.java
@@ -20,7 +20,6 @@ package baritone.utils;
 import baritone.Baritone;
 import baritone.api.BaritoneAPI;
 import baritone.api.pathing.goals.GoalBlock;
-import baritone.api.pathing.goals.GoalTwoBlocks;
 import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.Helper;
 import net.minecraft.client.gui.GuiScreen;
@@ -43,8 +42,8 @@ import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 import java.util.Collections;

-import static org.lwjgl.opengl.GL11.*;
 import static baritone.api.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX;
+import static org.lwjgl.opengl.GL11.*;

 public class GuiClick extends GuiScreen {

@@ -79,24 +78,26 @@ public class GuiClick extends GuiScreen {

    @Override
    protected void mouseReleased(int mouseX, int mouseY, int mouseButton) {
-        if (mouseButton == 0) {
-            if (clickStart != null && !clickStart.equals(currentMouseOver)) {
-                BaritoneAPI.getProvider().getPrimaryBaritone().getSelectionManager().removeAllSelections();
-                BaritoneAPI.getProvider().getPrimaryBaritone().getSelectionManager().addSelection(BetterBlockPos.from(clickStart), BetterBlockPos.from(currentMouseOver));
-                ITextComponent component = new TextComponentString("Selection made! For usage: " + Baritone.settings().prefix.value + "help sel");
-                component.getStyle()
-                        .setColor(TextFormatting.WHITE)
-                        .setClickEvent(new ClickEvent(
-                                ClickEvent.Action.RUN_COMMAND,
-                                FORCE_COMMAND_PREFIX + "help sel"
-                        ));
-                Helper.HELPER.logDirect(component);
-                clickStart = null;
-            } else {
-                BaritoneAPI.getProvider().getPrimaryBaritone().getCustomGoalProcess().setGoalAndPath(new GoalTwoBlocks(currentMouseOver));
+        if (currentMouseOver != null) { //Catch this, or else a click into void will result in a crash
+            if (mouseButton == 0) {
+                if (clickStart != null && !clickStart.equals(currentMouseOver)) {
+                    BaritoneAPI.getProvider().getPrimaryBaritone().getSelectionManager().removeAllSelections();
+                    BaritoneAPI.getProvider().getPrimaryBaritone().getSelectionManager().addSelection(BetterBlockPos.from(clickStart), BetterBlockPos.from(currentMouseOver));
+                    ITextComponent component = new TextComponentString("Selection made! For usage: " + Baritone.settings().prefix.value + "help sel");
+                    component.getStyle()
+                            .setColor(TextFormatting.WHITE)
+                            .setClickEvent(new ClickEvent(
+                                    ClickEvent.Action.RUN_COMMAND,
+                                    FORCE_COMMAND_PREFIX + "help sel"
+                            ));
+                    Helper.HELPER.logDirect(component);
+                    clickStart = null;
+                } else {
+                    BaritoneAPI.getProvider().getPrimaryBaritone().getCustomGoalProcess().setGoalAndPath(new GoalBlock(currentMouseOver));
+                }
+            } else if (mouseButton == 1) {
+                BaritoneAPI.getProvider().getPrimaryBaritone().getCustomGoalProcess().setGoalAndPath(new GoalBlock(currentMouseOver.up()));
            }
-        } else if (mouseButton == 1) {
-            BaritoneAPI.getProvider().getPrimaryBaritone().getCustomGoalProcess().setGoalAndPath(new GoalBlock(currentMouseOver.up()));
        }
        clickStart = null;
    }
--- a/src/main/java/baritone/utils/IRenderer.java
+++ b/src/main/java/baritone/utils/IRenderer.java
@@ -45,7 +45,6 @@ public interface IRenderer {

    static void startLines(Color color, float alpha, float lineWidth, boolean ignoreDepth) {
        GlStateManager.enableBlend();
-        GlStateManager.disableLighting();
        GlStateManager.tryBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO);
        glColor(color, alpha);
        GlStateManager.glLineWidth(lineWidth);
@@ -68,7 +67,6 @@ public interface IRenderer {

        GlStateManager.depthMask(true);
        GlStateManager.enableTexture2D();
-        GlStateManager.enableLighting();
        GlStateManager.disableBlend();
    }

--- a/src/main/java/baritone/utils/ToolSet.java
+++ b/src/main/java/baritone/utils/ToolSet.java
@@ -96,12 +96,27 @@ public class ToolSet {
    }

    /**
-     * Calculate which tool on the hotbar is best for mining
+     * Calculate which tool on the hotbar is best for mining, depending on an override setting,
+     * related to auto tool movement cost, it will either return current selected slot, or the best slot.
     *
     * @param b the blockstate to be mined
     * @return An int containing the index in the tools array that worked best
     */
+
    public int getBestSlot(Block b, boolean preferSilkTouch) {
+        return getBestSlot(b, preferSilkTouch, false);
+    }
+
+    public int getBestSlot(Block b, boolean preferSilkTouch, boolean pathingCalculation) {
+
+        /*
+        If we actually want know what efficiency our held item has instead of the best one
+        possible, this lets us make pathing depend on the actual tool to be used (if auto tool is disabled)
+        */
+        if (Baritone.settings().disableAutoTool.value && pathingCalculation) {
+            return player.inventory.currentItem;
+        }
+
        int best = 0;
        double highestSpeed = Double.NEGATIVE_INFINITY;
        int lowestCost = Integer.MIN_VALUE;
@@ -137,7 +152,7 @@ public class ToolSet {
     * @return A double containing the destruction ticks with the best tool
     */
    private double getBestDestructionTime(Block b) {
-        ItemStack stack = player.inventory.getStackInSlot(getBestSlot(b, false));
+        ItemStack stack = player.inventory.getStackInSlot(getBestSlot(b, false, true));
        return calculateSpeedVsBlock(stack, b.getDefaultState()) * avoidanceMultiplier(b);
    }

--- a/src/main/java/baritone/utils/pathing/MutableMoveResult.java
+++ b/src/main/java/baritone/utils/pathing/MutableMoveResult.java
@@ -30,6 +30,8 @@ public final class MutableMoveResult {
    public int y;
    public int z;
    public double cost;
+    private MutableMoveResult next;
+    private boolean hasNext;

    public MutableMoveResult() {
        reset();
@@ -40,5 +42,24 @@ public final class MutableMoveResult {
        y = 0;
        z = 0;
        cost = ActionCosts.COST_INF;
+        hasNext = false;
+        if (next != null) {
+            next.reset();
+        }
+    }
+
+    public MutableMoveResult nextPotentialDestination() {
+        if (next == null) {
+            next = new MutableMoveResult(); // this is okay because it's one-time at the beginning (or near the beginning) of the calculation, instead of per-movement
+        }
+        hasNext = true;
+        return next;
+    }
+
+    public MutableMoveResult getNext() {
+        if (!hasNext) {
+            return null;
+        }
+        return next;
    }
 }
Author	SHA1	Message	Date
Leijurv	f0082990e9	whoops, that was dumb	2020-11-25 01:19:53 -08:00
Leijurv	4a489d29de	suggestion for zephreo to make multi destination parkour	2020-11-25 01:14:23 -08:00
Leijurv	6bec994a57	Merge pull request #2185 from unrootexe/master Update rootNET's supported version	2020-11-19 23:56:45 -08:00
unrootexe	a99206b6c2	Update rootNET's supported version rootNET supports the latest version of Baritone, this change reflects that	2020-11-16 17:18:32 +00:00
Leijurv	c491d67925	add setting to just skip layers that the builder fails to construct	2020-11-11 17:53:26 -08:00
Leijurv	320a5d64a3	well i guess technically there could be an ore at bedrock level lmao	2020-10-30 22:39:30 -07:00
Leijurv	b16a8ecf21	Merge pull request #2079 from scorbett123/limitedMineDistance add a minimum Y level during mining.	2020-10-30 22:35:26 -07:00
Leijurv	73265ef944	Merge pull request #2100 from GameCenterJerry/master added jdk 8 instructions for macOS in SETUP.md	2020-10-30 22:28:57 -07:00
Leijurv	3bbc141e9a	Merge pull request #2132 from ZacSharp/noForgeMod don't make non-forge jars valid mods (fixes #2124)	2020-10-30 22:28:03 -07:00
ZacSharp	9ca95e8e14	don't make non-forge jars valid mods (fixes #2124 )	2020-10-31 03:21:59 +01:00
Leijurv	6d51e10090	Merge pull request #1971 from krzys-h/fix-entity-follow-forge Fix "#entity follow <name>" under Forge	2020-10-23 18:54:11 -07:00
GameCenterJerry	14b75973b0	Update SETUP.md	2020-10-22 15:02:17 +11:00
GameCenterJerry	0bfd0bca0c	Update SETUP.md	2020-10-22 13:47:50 +11:00
GameCenterJerry	cafb810a1f	Update SETUP.md	2020-10-22 13:28:18 +11:00
GameCenterJerry	07704b3ec7	Update SETUP.md	2020-10-22 13:14:53 +11:00
GameCenterJerry	7032efcc05	added jdk 8 instructions for macOS added necessary commands and download links	2020-10-22 13:09:56 +11:00
Sam Corbett	bfb530e02b	add a minimum Y level. Signed-off-by: Sam Corbett <sam@corbettchocolates.com>	2020-10-16 17:02:02 +01:00
Leijurv	5a5d11922f	Merge pull request #1995 from scorbett123/exposedOres add mineOnlyExposedOres setting	2020-10-14 12:01:49 -07:00
scorbett123	39cfebeb34	fix formatting Signed-off-by: scorbett123 <sam@corbettchocolates.com>	2020-10-14 20:00:49 +01:00
Leijurv	950f47ccae	Merge pull request #1958 from CDAGaming/feature/toasts ✨ Added Toast API Support	2020-10-14 11:18:09 -07:00
CDAGaming	d2c625e1c9	Apply Review Comments	2020-10-14 13:14:23 -05:00
Leijurv	3f207b7041	Merge pull request #2076 from CDAGaming/feature/rendering-compat-fix 🐛 Fix a Rendering Conflict with some other Mods	2020-10-14 11:09:00 -07:00
Leijurv	8deb9e5a35	Merge pull request #1959 from CDAGaming/feature/top-command ✨ Added a top/surface command	2020-10-14 11:02:07 -07:00
Leijurv	5eeb33a6f5	Merge pull request #1845 from mariusdkm/master Fixing crash after clicking into the air using the #click command	2020-10-14 10:59:34 -07:00
CDAGaming	918f009e8a	🐛 Fix a Rendering Conflict with some other Mods In testing within Fabritone, it was found that these two lines (Which were previously used for an unknown optifine workaround) are no longer needed, and had no known side effects as of writing. This can be backported as needed, but details are unknown how far this can go down Future me PS: This PR is a superseed of my last one, erased during repo refactors, so now it lives on master branch. Testing recommended and can be up-ported/down-ported as you wish.	2020-10-12 12:52:05 -05:00
CDAGaming	d6665f1cd5	✨ Added Toast API Support This adds in a logAsToast and toastTimer option, and is a minified form of Indrit's initial implementation previously used from fabritone	2020-10-12 12:46:01 -05:00
CDAGaming	af29ed7146	✨ Added a top/surface command Superseeds PR #594	2020-10-12 12:44:12 -05:00
Leijurv	8ddc795158	Merge pull request #2020 from ZacSharp/wpgoto make `#wp goto` behave like `#wp goal` and `#path`	2020-09-29 16:55:50 -07:00
ZacSharp	8a572516fc	Update description of WaypointsCommand	2020-09-23 22:54:41 +02:00
ZacSharp	508dacac63	directly start pathing after `#home` just like servers directly teleport you after `/home` without waiting for something like `/teleport`	2020-09-18 22:41:33 +02:00
ZacSharp	13ca691f5d	make `#wp goto` behave like `#goto` It now is a combined `#wp goal` and `#path` just like `#goto` is `#goal` and `#path`	2020-09-16 20:19:55 +02:00
Leijurv	7e4d2c9b28	Update README.md	2020-09-15 12:43:34 -07:00
Brady	500c34c330	Merge pull request #2015 from babbaj/fix-troll-code Don't call onLostControl on processes that haven't been fully constructed	2020-09-13 17:46:23 -05:00
Babbaj	234fd3f75e	don't use getter	2020-09-13 18:45:50 -04:00
Babbaj	32ef30686b	Don't call onLostControl on processes that haven't been fully constructed	2020-09-13 18:21:22 -04:00
Leijurv	175df6ce7a	Update USAGE.md	2020-09-11 21:54:20 -07:00
Leijurv	96b874c099	Update README.md	2020-09-11 21:52:43 -07:00
Sam Corbett	612510550f	fix javadoc. Signed-off-by: Sam Corbett <sam@corbettchocolates.com>	2020-09-08 19:00:41 +01:00
Sam Corbett	80e4852f90	Merge https://github.com/cabaletta/baritone into exposedOres	2020-09-08 17:48:45 +01:00
Sam Corbett	071243b99a	move is transparent to movement helper and circle maker	2020-09-08 17:47:46 +01:00
Sam Corbett	547db3a6b4	make the ability to turn it off. Signed-off-by: Sam Corbett <sam@corbettchocolates.com>	2020-09-08 17:47:45 +01:00
scorbett123	063f698bd2	need to remove diagonals, however this does most of what you suggest. Signed-off-by: scorbett123 <sam@corbettchocolates.com>	2020-09-08 17:47:45 +01:00
scorbett123	bcbfca100f	add mineOnlyExposedOres setting Signed-off-by: scorbett123 <sam@corbettchocolates.com>	2020-09-08 17:47:45 +01:00
Leijurv	8206b1673c	Merge pull request #1988 from scorbett123/patch1 fix typo in java-doc x2	2020-09-07 13:18:52 -07:00
scorbett123	d7088c8eea	fix typo in java-doc x2 Signed-off-by: scorbett123 <sam@corbettchocolates.com>	2020-08-31 18:48:46 +01:00
Leijurv	bf723deced	Merge pull request #1964 from ZacSharp/master Fix MovementDiagonal being safeToCancel while cornering over air 2.0	2020-08-24 16:20:01 -07:00
ZacSharp	9636e69a6b	slightly better condition	2020-08-24 23:06:19 +02:00
krzys-h	ed91e2aa7b	Fix "#entity follow <name>" under Forge One of the Forge patches removes EntityList.REGISTRY and provides the getClass method as a replacement. The fix is based on a similar one I found in WorldDownloader Closes #1376 (and duplicates: #1777 and #1815)	2020-08-24 22:24:18 +02:00
ZacSharp	3c691bb498	But now it's working	2020-08-20 23:33:47 +02:00
ZacSharp	ea35a3478f	Codacity again for the same and syntax dab	2020-08-20 23:16:59 +02:00
ZacSharp	b7d1ba1fa5	Make Codacity happy	2020-08-20 23:11:55 +02:00
ZacSharp	5f686c1c12	improve isSafeToCancel in MovementDiagonal even more It did not return true early enough for backfill while cornering over air	2020-08-20 22:55:42 +02:00
Leijurv	4eea8308d7	Merge pull request #1956 from RealIndrit/patch-1 🔥 Get yeeted unused code	2020-08-18 11:14:25 -07:00
kuthy	7f9704592e	Made catch function wide	2020-08-18 15:40:12 +02:00
RealIndrit	523f13c430	🔥 Get yeeted unused code Removed an unused function that can't be used anyways, because RayTraceUtils cant detect entity hit...	2020-08-18 12:36:10 +02:00
Leijurv	1c8079c051	Merge pull request #1058 from ADShenoi/patch-1 The grammar mistakes were corrected	2020-08-17 16:40:56 -07:00
Leijurv	2abd024b3c	Merge branch 'master' into patch-1	2020-08-17 16:40:41 -07:00
Leijurv	7992b63aae	Merge pull request #1346 from aUniqueUser/master Make desktop notifications more useful	2020-08-17 16:38:36 -07:00
Leijurv	836ef3328c	Merge pull request #1541 from babbaj/keep-annotation Annotation for proguard -keep	2020-08-17 16:36:48 -07:00
Leijurv	c470dc1a17	Merge pull request #1158 from c0nn3r/master Create .gitmessage	2020-08-17 16:33:48 -07:00
Leijurv	97a1029a72	Merge pull request #1554 from ByteZ1337/master Fixed Typo	2020-08-17 16:17:47 -07:00
Leijurv	5f9602796a	Merge pull request #1876 from CorruptedSeal/master Update ExecutionControlCommands.java	2020-08-17 16:17:01 -07:00
Leijurv	02e7886e77	properly set isSafeToCancel in MovementDiagonal, fixes #1788	2020-08-17 16:15:56 -07:00
Leijurv	9851623557	anti-indrit-cringe	2020-08-17 16:03:04 -07:00
Leijurv	f0d2bae3d1	Merge pull request #1947 from RealIndrit/master Add auto tool setting	2020-08-17 15:57:37 -07:00
Leijurv	f3561cab47	SUPER cute code for repackOnAnyBlockChange	2020-08-17 15:54:42 -07:00
Leijurv	38d047dbd1	make the packer queue super cute and deduplicated	2020-08-17 15:19:11 -07:00
Leijurv	e6ba4ef309	we don't compile here	2020-08-17 15:00:57 -07:00
Leijurv	460833f7d6	Merge branch 'master' of github.com:cabaletta/baritone	2020-08-17 14:59:20 -07:00
RealIndrit	2eba22031a	Maybe dont have ignore cost calculation override auto tool?	2020-08-14 22:47:39 +02:00
RealIndrit	ac55de63e9	Maybe dont have ignore cost calculation override auto tool?	2020-08-14 17:55:10 +02:00
RealIndrit	88e2fba447	Ok, Im actually retarded	2020-08-14 17:11:31 +02:00
RealIndrit	94ac15a8fc	KEK False != True :clown:	2020-08-14 17:06:41 +02:00
RealIndrit	19355cb4f2	Added AutoToolMovement bypass setting for special usage cases, should not be used it not actually necessary	2020-08-14 10:58:15 +02:00
RealIndrit	e0ff16e2dd	Nice brainfart	2020-08-14 10:34:21 +02:00
RealIndrit	49db52673a	Lol	2020-08-14 10:25:51 +02:00
RealIndrit	f8872e1cd4	Everything can be traced back to getBestSlot();	2020-08-14 10:14:02 +02:00
RealIndrit	2ed3e10833	And we try this again, because wtf??	2020-08-13 23:20:30 +02:00
RealIndrit	2b6fe188ed	Why calculate stuff that isnt needed...	2020-08-13 22:47:40 +02:00
RealIndrit	2ddc2c3660	Add auto tool settings because 2 lines of code lols	2020-08-13 22:36:34 +02:00
Leijurv	b187d86074	fix orsond rock brain moment	2020-08-05 23:31:32 -07:00
Leijurv	727694fdd5	Merge pull request #1939 from orsondmc/startAtLayer Introduce startAtLayer	2020-08-05 23:28:52 -07:00
orsondmc	7081cf7172	Introduce startAtLayer to start building at a specific layer in the schematic. To be used only with buildWithLayers true.	2020-08-06 16:23:13 +10:00
Leijurv	a25afd5c13	Merge pull request #1895 from John200410/patch-1 add rusherhack integration badge	2020-07-29 12:57:41 -07:00
Leijurv	c180eb9975	Update README.md	2020-07-29 12:52:19 -07:00
Leijurv	9e45998a65	brady shouldn't merge PRs that don't compile, thanks cdagaming	2020-07-26 13:21:51 -07:00
John	2acf64a0d0	add rusherhack integration badge as of rusherhack v1.0 there is baritone API integration, similar to future's.	2020-07-20 03:12:24 -04:00
Brady	9d41367eff	Merge pull request #1873 from CorruptedSeal/master Update ProguardTask.java	2020-07-20 00:59:52 -05:00
Leijurv	b64dd8f25f	Merge pull request #1879 from elonmusksama/master updated compatible versions to future badge	2020-07-16 21:12:13 -07:00
elongated muskrat	cbb3483456	updated compatible versions to future badge updated the compatible versions to the future integrations badge	2020-07-16 14:35:17 -03:00
CorruptedSeal	6603e8b11e	Update ExecutionControlCommands.java	2020-07-16 03:45:23 -06:00
CorruptedSeal	d522f9dfa3	Update ProguardTask.java	2020-07-15 01:34:19 -06:00
CorruptedSeal	f02476ff3a	Update ProguardTask.java	2020-07-15 01:18:01 -06:00
Leijurv	eafca1e1fe	yourkit	2020-07-06 17:07:59 -07:00
kuthy	0055a059f7	Formated Code	2020-07-03 16:52:03 +02:00
kuthy	8262909063	Fixing crash after clicking into the air	2020-07-03 15:36:44 +02:00
Leijurv	e42c19bfec	thebes uwu	2020-06-27 22:25:47 -07:00
ByteZ1337	c41eb4afa0	Merge remote-tracking branch 'upstream/master'	2020-06-08 17:42:05 +02:00
Leijurv	80c8294f5f	maintain obscenely obvious pro impact bias in subconscious coloring	2020-06-04 11:32:20 -07:00
Leijurv	fc58673abd	Merge pull request #1709 from dominikaaaa/patch-1 Added blue badge to integrations badges	2020-06-04 11:31:28 -07:00
Dominika	ca831bc734	Added blue badge to integrations badges	2020-05-18 13:47:57 -04:00
Leijurv	a76cf0fe9a	brady more like brainletdy	2020-05-17 18:35:41 -07:00
Leijurv	688853c523	Merge pull request #1657 from babbaj/rename bring back ExampleBaritoneControl	2020-05-03 22:24:45 -07:00
Babbaj	806dc8f017	This had to be done	2020-05-04 01:15:18 -04:00
Leijurv	89ab78a329	Update README.md	2020-05-03 18:51:21 -07:00
Leijurv	3a7cb5e020	Merge pull request #1629 from dominikaaaa/patch-1 Fix broken API Settings link in USAGE. Close #1040	2020-04-27 16:59:56 -07:00
Leijurv	d0f594065d	Update README.md	2020-04-26 13:22:55 -07:00
Dominika	10677040e0	Fix broken API Settings link in USAGE. Close #1040	2020-04-26 15:22:24 -04:00
Leijurv	c2624bbaaf	Update README.md	2020-04-21 13:32:47 -07:00
ByteZ1337	ff3234fcdd	Fixed Typo Fixed Typo in the Long Description of the Goto Command	2020-04-13 20:39:56 +02:00
Babbaj	c32652394e	Annotation for proguard -keep	2020-04-12 03:01:24 -04:00
aUniqueUser	0434e1c5d3	Add more entries to MineProcess	2020-02-29 12:24:06 -05:00
aUniqueUser	4c79701d22	Make desktop notifications more useful	2020-02-29 11:28:18 -05:00
Conner Vercellino	0fba32853b	Create .gitmessage	2019-11-20 12:26:37 -08:00
ads123ads	9f5d9bceaa	The grammar mistakes were corrected	2019-10-15 15:34:22 +05:30