v1.5.2

Merge branch '1.14.4' into 1.15.2
2020-03-25 17:51:56 -07:00 · 2020-03-25 17:51:42 -07:00 · 2020-03-14 12:35:33 -07:00 · 2020-03-14 12:25:46 -07:00 · 2020-03-07 20:45:07 -06:00 · 2020-03-02 17:15:01 -06:00
133 changed files with 855 additions and 1477 deletions
--- a/.gitmessage
+++ b/.gitmessage
@@ -1,31 +0,0 @@
-<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/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ install:

 script:
 - docker run --name baritone cabaletta/baritone ./gradlew javadoc
+#- docker run --name baritone cabaletta/baritone /bin/sh -c "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 128x128x24 -ac +extension GLX +render; DISPLAY=:99 BARITONE_AUTO_TEST=true ./gradlew runAutoTest; cat /code/autotest/success"
 - docker cp baritone:/code/dist dist
 - ls dist
 - cat dist/checksums.txt
--- a/8
+++ b/8
@@ -1,5 +1,7 @@
 FROM debian:stretch

+RUN echo 'deb http://deb.debian.org/debian stretch-backports main' > /etc/apt/sources.list.d/stretch-backports.list
+
 ENV DEBIAN_FRONTEND noninteractive

 RUN apt update -y
@@ -8,8 +10,14 @@ RUN apt install \
          openjdk-8-jdk \
          --assume-yes

+RUN apt install -qq --assume-yes mesa-utils libgl1-mesa-glx libxcursor1 libxrandr2 libxxf86vm1 x11-xserver-utils xfonts-base xserver-common
+
 COPY . /code

 WORKDIR /code

+# this .deb is specially patched to support lwjgl
+# source: https://github.com/tectonicus/tectonicus/issues/60#issuecomment-154239173
+RUN dpkg -i scripts/xvfb_1.16.4-1_amd64.deb
+
 RUN ./gradlew build
--- a/README.md
+++ b/README.md
@@ -1 +1,92 @@
-This branch of Baritone is deprecated. It will no longer recieve updates. Updates to older versions of Minecraft will not be merged into this branch, even if a newer branch is not deprecated (this branch will be skipped). Bug reports that only affect deprecated branches will not be addressed.
+# Baritone
+[![Build Status](https://travis-ci.com/cabaletta/baritone.svg?branch=master)](https://travis-ci.com/cabaletta/baritone/)
+[![Release](https://img.shields.io/github/release/cabaletta/baritone.svg)](https://github.com/cabaletta/baritone/releases/)
+[![License](https://img.shields.io/badge/license-LGPL--3.0%20with%20anime%20exception-green.svg)](LICENSE)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/a73d037823b64a5faf597a18d71e3400)](https://www.codacy.com/app/leijurv/baritone?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=cabaletta/baritone&amp;utm_campaign=Badge_Grade)
+[![HitCount](http://hits.dwyl.com/cabaletta/baritone.svg)](http://hits.dwyl.com/cabaletta/baritone/)
+[![GitHub All Releases](https://img.shields.io/github/downloads/cabaletta/baritone/total.svg)](https://github.com/cabaletta/baritone/releases/)
+[![Minecraft](https://img.shields.io/badge/MC-1.12.2-brightgreen.svg)](https://github.com/cabaletta/baritone/tree/master/)
+[![Minecraft](https://img.shields.io/badge/MC-1.13.2-brightgreen.svg)](https://github.com/cabaletta/baritone/tree/1.13.2/)
+[![Minecraft](https://img.shields.io/badge/MC-1.14.4-brightgreen.svg)](https://github.com/cabaletta/baritone/tree/1.14.4/)
+[![Minecraft](https://img.shields.io/badge/MC-1.15.2-brightgreen.svg)](https://github.com/cabaletta/baritone/tree/1.15.2/)
+[![Code of Conduct](https://img.shields.io/badge/%E2%9D%A4-code%20of%20conduct-blue.svg?style=flat)](https://github.com/cabaletta/baritone/blob/master/CODE_OF_CONDUCT.md)
+[![Known Vulnerabilities](https://snyk.io/test/github/cabaletta/baritone/badge.svg?targetFile=build.gradle)](https://snyk.io/test/github/cabaletta/baritone?targetFile=build.gradle)
+[![Contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/cabaletta/baritone/issues/)
+[![Issues](https://img.shields.io/github/issues/cabaletta/baritone.svg)](https://github.com/cabaletta/baritone/issues/)
+[![GitHub issues-closed](https://img.shields.io/github/issues-closed/cabaletta/baritone.svg)](https://github.com/cabaletta/baritone/issues?q=is%3Aissue+is%3Aclosed)
+[![Pull Requests](https://img.shields.io/github/issues-pr/cabaletta/baritone.svg)](https://github.com/cabaletta/baritone/pulls/)
+![Code size](https://img.shields.io/github/languages/code-size/cabaletta/baritone.svg)
+![GitHub repo size](https://img.shields.io/github/repo-size/cabaletta/baritone.svg)
+![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/)
+[![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/)
+[![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.
+
+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.
+
+For 1.15.2, [click here](https://www.youtube.com/watch?v=j1qKtCZFURM) and see description.
+
+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.
+
+1Leijurv3DWTrGAfmmiTphjhXLvQiHg7K2
+
+# Getting Started
+
+Here are some links to help to get started:
+
+- [Features](FEATURES.md)
+
+- [Installation & setup](SETUP.md)
+
+- [API Javadocs](https://baritone.leijurv.com/)
+
+- [Settings](https://baritone.leijurv.com/baritone/api/Settings.html#field.detail)
+
+- [Usage (chat control)](USAGE.md)
+
+## Stars over time
+
+[![Stargazers over time](https://starchart.cc/cabaletta/baritone.svg)](https://starchart.cc/cabaletta/baritone)
+
+# API
+
+The API is heavily documented, you can find the Javadocs for the latest release [here](https://baritone.leijurv.com/).
+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.
+
+```
+BaritoneAPI.getSettings().allowSprint.value = true;
+BaritoneAPI.getSettings().primaryTimeoutMS.value = 2000L;
+
+BaritoneAPI.getProvider().getPrimaryBaritone().getCustomGoalProcess().setGoalAndPath(new GoalXZ(10000, 20000));
+```
+
+# FAQ
+
+## 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)
+
+## How is it so fast?
+
+Magic. (Hours of [leijurv](https://github.com/leijurv/) enduring excruciating pain)
+
+## Why is it called Baritone?
+
+It's named for FitMC's deep sultry voice. 
--- a/SETUP.md
+++ b/SETUP.md
@@ -2,7 +2,7 @@

 The easiest way to install Baritone is to install [Impact](https://impactclient.net/), which comes with Baritone.

-You can also use a custom version json for Minecraft, with the [1.14.4](https://www.dropbox.com/s/rkml3hjokd3qv0m/1.14.4-Baritone.zip?dl=1) version or the [1.15.2](https://www.dropbox.com/s/8rx6f0kts9hvd4f/1.15.2-Baritone.zip?dl=1) version
+For 1.14.4, [click here](https://www.dropbox.com/s/rkml3hjokd3qv0m/1.14.4-Baritone.zip?dl=1).

 Once Baritone is installed, look [here](USAGE.md) for instructions on how to use it.

@@ -49,27 +49,6 @@ 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:

 ```
@@ -83,12 +62,6 @@ Building Baritone:
 $ gradlew build
 ```

-For minecraft 1.15.2+, run the following instead to include the Forge jars:
-
-```
-$ gradlew build -Pbaritone.forge_build
-```
-
 Running Baritone:

 ```
--- a/USAGE.md
+++ b/USAGE.md
@@ -24,8 +24,6 @@ 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`
@@ -40,8 +38,8 @@ Some common examples:
 - `goal clear` to clear the goal
 - `cancel` or `stop` to stop everything
 - `goto portal` or `goto ender_chest` or `goto block_type` to go to a block. (in Impact, `.goto` is an alias for `.b goto` for the most part)
- `mine diamond_ore iron_ore` to mine diamond ore or iron ore (turn on the setting `legitMine` to only mine ores that it can actually see. It will explore randomly around y=11 until it finds them.) An amount of blocks can also be specified, for example, `mine 64 diamond_ore`.
- `click` to click your destination on the screen. Right click path to on top of the block, left click to path into it (either at foot level or eye level), and left click and drag to select an area (`#help sel` to see what you can do with that selection).
+- `mine diamond_ore iron_ore` to mine diamond ore or iron ore (turn on the setting `legitMine` to only mine ores that it can actually see. It will explore randomly around y=11 until it finds them.) An amount of blocks can also be specified, for example, `mine diamond_ore 64`.
+- `click` to click your destination on the screen. Right click path to on top of the block, left click to path into it (either at foot level or eye level), and left click and drag to clear all blocks from an area.
 - `follow player playerName` to follow a player. `follow players` to follow any players in range (combine with Kill Aura for a fun time). `follow entities` to follow any entities. `follow entity pig` to follow entities of a specific type.
 - `wp` for waypoints. A "tag" is like "home" (created automatically on right clicking a bed) or "death" (created automatically on death) or "user" (has to be created manually). So you might want `#wp save user coolbiome`, then to set the goal `#wp goal coolbiome` then `#path` to path to it. For death, `#wp goal death` will list waypoints under the "death" tag (remember stuff is clickable!)
 - `build` to build a schematic. `build blah.schematic` will load `schematics/blah.schematic` and build it with the origin being your player feet. `build blah.schematic x y z` to set the origin. Any of those can be relative to your player (`~ 69 ~-420` would build at x=player x, y=69, z=player z-420).
@@ -54,7 +52,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://baritone.leijurv.com/baritone/api/Settings.html).
+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).

 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
@@ -16,7 +16,7 @@
 */

 group 'baritone'
-version '1.4.6'
+version '1.5.2'

 buildscript {
    repositories {
@@ -82,7 +82,7 @@ task sourceJar(type: Jar, dependsOn: classes) {
 }

 minecraft {
-    mappings channel: 'snapshot', version: '20190814-1.14.3'
+    mappings channel: 'snapshot', version: '20200213-1.15.1'
    reobfMappings 'notch'

    runs {
@@ -127,8 +127,8 @@ repositories {
    mavenCentral()

    maven {
-        name = 'SpongePowered'
-        url = 'https://repo.spongepowered.org/repository/maven-public/'
+        name = 'spongepowered-repo'
+        url = 'http://repo.spongepowered.org/maven/'
    }

    maven {
@@ -138,7 +138,7 @@ repositories {
 }

 dependencies {
-    minecraft 'com.github.ImpactDevelopment:Vanilla:1.14.4'
+    minecraft 'com.github.ImpactDevelopment:Vanilla:1.15.2'

    runtime launchCompile('net.minecraft:launchwrapper:1.12') {
        exclude module: 'lwjgl'
@@ -172,12 +172,6 @@ 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
@@ -22,21 +22,6 @@ import org.apache.commons.io.IOUtils;
 import org.gradle.api.plugins.JavaPluginConvention;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.TaskAction;
-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.net.URL;
@@ -101,101 +86,6 @@ 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);

@@ -205,7 +95,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(this.getJavaBinPathForProguard(), "-verbose").start();
+        Process p = new ProcessBuilder("java", "-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
@@ -25,13 +25,6 @@

 -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/scripts/xvfb_1.16.4-1_amd64.deb
+++ b/scripts/xvfb_1.16.4-1_amd64.deb
--- a/src/api/java/baritone/api/IBaritone.java
+++ b/src/api/java/baritone/api/IBaritone.java
@@ -20,13 +20,13 @@ package baritone.api;
 import baritone.api.behavior.ILookBehavior;
 import baritone.api.behavior.IPathingBehavior;
 import baritone.api.cache.IWorldProvider;
-import baritone.api.command.manager.ICommandManager;
 import baritone.api.event.listener.IEventBus;
 import baritone.api.pathing.calc.IPathingControlManager;
 import baritone.api.process.*;
 import baritone.api.selection.ISelectionManager;
 import baritone.api.utils.IInputOverrideHandler;
 import baritone.api.utils.IPlayerContext;
+import baritone.api.command.manager.ICommandManager;

 /**
 * @author Brady
--- a/src/api/java/baritone/api/IBaritoneProvider.java
+++ b/src/api/java/baritone/api/IBaritoneProvider.java
@@ -20,8 +20,8 @@ package baritone.api;
 import baritone.api.cache.IWorldScanner;
 import baritone.api.command.ICommand;
 import baritone.api.command.ICommandSystem;
-import baritone.api.schematic.ISchematicSystem;
 import net.minecraft.client.entity.player.ClientPlayerEntity;
+import baritone.api.schematic.ISchematicSystem;

 import java.util.List;
 import java.util.Objects;
--- a/src/api/java/baritone/api/Settings.java
+++ b/src/api/java/baritone/api/Settings.java
@@ -61,19 +61,6 @@ 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.
@@ -203,15 +190,6 @@ 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.
     */
@@ -454,11 +432,6 @@ 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
     */
@@ -531,18 +504,6 @@ 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
     */
@@ -740,23 +701,6 @@ 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.
     */
@@ -810,17 +754,6 @@ 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
     */
@@ -1025,6 +958,11 @@ public final class Settings {
     */
    public final Setting<Consumer<ITextComponent>> logger = new Setting<>(Minecraft.getInstance().ingameGUI.getChatGUI()::printChatMessage);

+    /**
+     * Print out ALL command exceptions as a stack trace to stdout, even simple syntax errors
+     */
+    public final Setting<Boolean> verboseCommandExceptions = new Setting<>(false);
+
    /**
     * The size of the box that is rendered when the current goal is a GoalYLevel
     */
@@ -1116,35 +1054,10 @@ 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/cache/IWorldScanner.java
+++ b/src/api/java/baritone/api/cache/IWorldScanner.java
@@ -88,7 +88,7 @@ public interface IWorldScanner {
     * Queues the chunks in a square formation around the specified player, using the specified
     * range, which represents 1/2 the square's dimensions, where the player is in the center.
     *
-     * @param ctx   The player, describing the origin
+     * @param ctx The player, describing the origin
     * @param range The range to repack
     * @return The amount of chunks successfully queued for repacking
     */
--- a/src/api/java/baritone/api/command/Command.java
+++ b/src/api/java/baritone/api/command/Command.java
@@ -34,8 +34,9 @@ import java.util.stream.Stream;
 * So basically, you should use it because it provides a small amount of boilerplate,
 * but you're not forced to use it.
 *
- * @author LoganDark
 * @see ICommand
+ *
+ * @author LoganDark
 */
 public abstract class Command implements ICommand {

--- a/src/api/java/baritone/api/command/argparser/IArgParserManager.java
+++ b/src/api/java/baritone/api/command/argparser/IArgParserManager.java
@@ -46,8 +46,8 @@ public interface IArgParserManager {
    /**
     * Attempt to parse the specified argument with a stateless {@link IArgParser} that outputs the specified class.
     *
-     * @param type The type to try and parse the argument into.
-     * @param arg  The argument to parse.
+     * @param type  The type to try and parse the argument into.
+     * @param arg   The argument to parse.
     * @return An instance of the specified class.
     * @throws CommandInvalidTypeException If the parsing failed
     */
--- a/src/api/java/baritone/api/command/argument/IArgConsumer.java
+++ b/src/api/java/baritone/api/command/argument/IArgConsumer.java
@@ -18,6 +18,8 @@
 package baritone.api.command.argument;

 import baritone.api.command.ICommand;
+import baritone.api.command.exception.CommandTooManyArgumentsException;
+import baritone.api.utils.Helper;
 import baritone.api.command.argparser.IArgParser;
 import baritone.api.command.datatypes.IDatatype;
 import baritone.api.command.datatypes.IDatatypeFor;
@@ -25,8 +27,6 @@ import baritone.api.command.datatypes.IDatatypePost;
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.exception.CommandInvalidTypeException;
 import baritone.api.command.exception.CommandNotEnoughArgumentsException;
-import baritone.api.command.exception.CommandTooManyArgumentsException;
-import baritone.api.utils.Helper;
 import net.minecraft.util.Direction;

 import java.util.Deque;
@@ -223,7 +223,7 @@ public interface IArgConsumer {
     * @param type  The type to peek as
     * @param index The index to peek
     * @return An instance of the specified type
-     * @throws CommandInvalidTypeException If the parsing failed
+     * @throws CommandInvalidTypeException     If the parsing failed
     * @see IArgParser
     * @see #peekAs(Class)
     * @see #peekAsOrDefault(Class, Object, int)
@@ -240,7 +240,7 @@ public interface IArgConsumer {
     *
     * @param type The type to peek as
     * @return An instance of the specified type
-     * @throws CommandInvalidTypeException If the parsing failed
+     * @throws CommandInvalidTypeException     If the parsing failed
     * @see IArgParser
     * @see #peekAs(Class, int)
     * @see #peekAsOrDefault(Class, Object)
@@ -458,7 +458,7 @@ public interface IArgConsumer {
     *
     * @param type The type to peek as
     * @return An instance of the specified type
-     * @throws CommandInvalidTypeException If the parsing failed
+     * @throws CommandInvalidTypeException     If the parsing failed
     * @see IArgParser
     * @see #get()
     * @see #getAsOrDefault(Class, Object)
--- a/src/api/java/baritone/api/command/argument/ICommandArgument.java
+++ b/src/api/java/baritone/api/command/argument/ICommandArgument.java
@@ -87,7 +87,7 @@ public interface ICommandArgument {
     *
     * @param type The class to parse this argument into
     * @return An instance of the specified type
-     * @throws CommandInvalidTypeException If the parsing failed
+     * @throws CommandInvalidTypeException     If the parsing failed
     */
    <T, S> T getAs(Class<T> type, Class<S> stateType, S state) throws CommandInvalidTypeException;

--- a/src/api/java/baritone/api/command/datatypes/ForBlockOptionalMeta.java
+++ b/src/api/java/baritone/api/command/datatypes/ForBlockOptionalMeta.java
@@ -17,8 +17,8 @@

 package baritone.api.command.datatypes;

-import baritone.api.command.exception.CommandException;
 import baritone.api.utils.BlockOptionalMeta;
+import baritone.api.command.exception.CommandException;

 import java.util.stream.Stream;

--- a/src/api/java/baritone/api/command/datatypes/ForDirection.java
+++ b/src/api/java/baritone/api/command/datatypes/ForDirection.java
@@ -17,8 +17,8 @@

 package baritone.api.command.datatypes;

-import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
+import baritone.api.command.exception.CommandException;
 import net.minecraft.util.Direction;

 import java.util.Locale;
--- a/src/api/java/baritone/api/command/datatypes/ForWaypoints.java
+++ b/src/api/java/baritone/api/command/datatypes/ForWaypoints.java
@@ -20,8 +20,8 @@ package baritone.api.command.datatypes;
 import baritone.api.IBaritone;
 import baritone.api.cache.IWaypoint;
 import baritone.api.cache.IWaypointCollection;
-import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
+import baritone.api.command.exception.CommandException;

 import java.util.Comparator;
 import java.util.stream.Stream;
--- a/src/api/java/baritone/api/command/datatypes/IDatatypeContext.java
+++ b/src/api/java/baritone/api/command/datatypes/IDatatypeContext.java
@@ -24,8 +24,9 @@ import baritone.api.command.argument.IArgConsumer;
 * Provides an {@link IDatatype} with contextual information so
 * that it can perform the desired operation on the target level.
 *
- * @author Brady
 * @see IDatatype
+ *
+ * @author Brady
 * @since 9/26/2019
 */
 public interface IDatatypeContext {
--- a/src/api/java/baritone/api/command/datatypes/IDatatypeFor.java
+++ b/src/api/java/baritone/api/command/datatypes/IDatatypeFor.java
@@ -34,10 +34,11 @@ public interface IDatatypeFor<T> extends IDatatype {
     * if the expected input does not conform to a parseable value. As far as a {@link CommandException} being
     * thrown is concerned, see the note below for specifics.
     *
+     * @see IDatatypeContext
+     *
     * @param ctx The context
     * @return The parsed data-type
     * @throws CommandException If there was an issue parsing using another type or arguments could not be polled.
-     * @see IDatatypeContext
     */
    T get(IDatatypeContext ctx) throws CommandException;
 }
--- a/src/api/java/baritone/api/command/datatypes/RelativeBlockPos.java
+++ b/src/api/java/baritone/api/command/datatypes/RelativeBlockPos.java
@@ -18,8 +18,8 @@
 package baritone.api.command.datatypes;

 import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.exception.CommandException;
 import baritone.api.utils.BetterBlockPos;
+import baritone.api.command.exception.CommandException;

 import java.util.stream.Stream;

--- a/src/api/java/baritone/api/command/datatypes/RelativeGoal.java
+++ b/src/api/java/baritone/api/command/datatypes/RelativeGoal.java
@@ -18,13 +18,16 @@
 package baritone.api.command.datatypes;

 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.pathing.goals.GoalXZ;
 import baritone.api.pathing.goals.GoalYLevel;
 import baritone.api.utils.BetterBlockPos;
+import baritone.api.command.exception.CommandException;
+import net.minecraft.util.math.MathHelper;

+import java.util.ArrayList;
+import java.util.List;
 import java.util.stream.Stream;

 public enum RelativeGoal implements IDatatypePost<Goal, BetterBlockPos> {
--- a/src/api/java/baritone/api/command/datatypes/RelativeGoalBlock.java
+++ b/src/api/java/baritone/api/command/datatypes/RelativeGoalBlock.java
@@ -18,9 +18,9 @@
 package baritone.api.command.datatypes;

 import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.exception.CommandException;
 import baritone.api.pathing.goals.GoalBlock;
 import baritone.api.utils.BetterBlockPos;
+import baritone.api.command.exception.CommandException;
 import net.minecraft.util.math.MathHelper;

 import java.util.stream.Stream;
--- a/src/api/java/baritone/api/command/datatypes/RelativeGoalXZ.java
+++ b/src/api/java/baritone/api/command/datatypes/RelativeGoalXZ.java
@@ -18,9 +18,9 @@
 package baritone.api.command.datatypes;

 import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.exception.CommandException;
 import baritone.api.pathing.goals.GoalXZ;
 import baritone.api.utils.BetterBlockPos;
+import baritone.api.command.exception.CommandException;
 import net.minecraft.util.math.MathHelper;

 import java.util.stream.Stream;
--- a/src/api/java/baritone/api/command/datatypes/RelativeGoalYLevel.java
+++ b/src/api/java/baritone/api/command/datatypes/RelativeGoalYLevel.java
@@ -18,9 +18,9 @@
 package baritone.api.command.datatypes;

 import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.exception.CommandException;
 import baritone.api.pathing.goals.GoalYLevel;
 import baritone.api.utils.BetterBlockPos;
+import baritone.api.command.exception.CommandException;
 import net.minecraft.util.math.MathHelper;

 import java.util.stream.Stream;
--- a/src/api/java/baritone/api/command/exception/CommandUnhandledException.java
+++ b/src/api/java/baritone/api/command/exception/CommandUnhandledException.java
@@ -38,7 +38,7 @@ public class CommandUnhandledException extends RuntimeException implements IComm
    @Override
    public void handle(ICommand command, List<ICommandArgument> args) {
        HELPER.logDirect("An unhandled exception occurred. " +
-                        "The error is in your game's log, please report this at https://github.com/cabaletta/baritone/issues",
+                "The error is in your game's log, please report this at https://github.com/cabaletta/baritone/issues",
                TextFormatting.RED);

        this.printStackTrace();
--- a/src/api/java/baritone/api/command/exception/ICommandException.java
+++ b/src/api/java/baritone/api/command/exception/ICommandException.java
@@ -38,8 +38,8 @@ import static baritone.api.utils.Helper.HELPER;
 public interface ICommandException {

    /**
-     * @return The exception details
     * @see Exception#getMessage()
+     * @return The exception details
     */
    String getMessage();

--- a/src/api/java/baritone/api/command/helpers/Paginator.java
+++ b/src/api/java/baritone/api/command/helpers/Paginator.java
@@ -17,10 +17,10 @@

 package baritone.api.command.helpers;

-import baritone.api.command.argument.IArgConsumer;
+import baritone.api.utils.Helper;
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.exception.CommandInvalidTypeException;
-import baritone.api.utils.Helper;
+import baritone.api.command.argument.IArgConsumer;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.util.text.TextFormatting;
--- a/src/api/java/baritone/api/command/helpers/TabCompleteHelper.java
+++ b/src/api/java/baritone/api/command/helpers/TabCompleteHelper.java
@@ -19,10 +19,10 @@ package baritone.api.command.helpers;

 import baritone.api.BaritoneAPI;
 import baritone.api.Settings;
-import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.manager.ICommandManager;
 import baritone.api.event.events.TabCompleteEvent;
 import baritone.api.utils.SettingsUtil;
+import baritone.api.command.argument.IArgConsumer;
+import baritone.api.command.manager.ICommandManager;
 import net.minecraft.util.ResourceLocation;

 import java.util.Comparator;
@@ -236,6 +236,7 @@ public class TabCompleteHelper {
     * Appends every command in the specified {@link ICommandManager} to this {@link TabCompleteHelper}
     *
     * @param manager A command manager
+     *
     * @return This {@link TabCompleteHelper}
     */
    public TabCompleteHelper addCommands(ICommandManager manager) {
--- a/src/api/java/baritone/api/event/events/PacketEvent.java
+++ b/src/api/java/baritone/api/event/events/PacketEvent.java
@@ -18,8 +18,8 @@
 package baritone.api.event.events;

 import baritone.api.event.events.type.EventState;
-import net.minecraft.network.IPacket;
 import net.minecraft.network.NetworkManager;
+import net.minecraft.network.IPacket;

 /**
 * @author Brady
--- a/src/api/java/baritone/api/event/events/RenderEvent.java
+++ b/src/api/java/baritone/api/event/events/RenderEvent.java
@@ -17,6 +17,9 @@

 package baritone.api.event.events;

+import com.mojang.blaze3d.matrix.MatrixStack;
+import net.minecraft.client.renderer.Matrix4f;
+
 /**
 * @author Brady
 * @since 8/5/2018
@@ -28,8 +31,13 @@ public final class RenderEvent {
     */
    private final float partialTicks;

-    public RenderEvent(float partialTicks) {
+    private final Matrix4f projectionMatrix;
+    private final MatrixStack modelViewStack;
+
+    public RenderEvent(float partialTicks, MatrixStack modelViewStack, Matrix4f projectionMatrix) {
        this.partialTicks = partialTicks;
+        this.modelViewStack = modelViewStack;
+        this.projectionMatrix = projectionMatrix;
    }

    /**
@@ -38,4 +46,12 @@ public final class RenderEvent {
    public final float getPartialTicks() {
        return this.partialTicks;
    }
+
+    public MatrixStack getModelViewStack() {
+        return this.modelViewStack;
+    }
+
+    public Matrix4f getProjectionMatrix() {
+        return this.projectionMatrix;
+    }
 }
--- a/src/api/java/baritone/api/event/events/TabCompleteEvent.java
+++ b/src/api/java/baritone/api/event/events/TabCompleteEvent.java
@@ -18,6 +18,7 @@
 package baritone.api.event.events;

 import baritone.api.event.events.type.Cancellable;
+import baritone.api.event.events.type.Overrideable;

 /**
 * @author LoganDark
--- a/src/api/java/baritone/api/pathing/goals/GoalRunAway.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalRunAway.java
@@ -31,7 +31,7 @@ public class GoalRunAway implements Goal {

    private final BlockPos[] from;

-    private final int distanceSq;
+    private final double distanceSq;

    private final Integer maintainY;

@@ -44,7 +44,7 @@ public class GoalRunAway implements Goal {
            throw new IllegalArgumentException();
        }
        this.from = from;
-        this.distanceSq = (int) (distance * distance);
+        this.distanceSq = distance * distance;
        this.maintainY = maintainY;
    }

@@ -56,7 +56,7 @@ public class GoalRunAway implements Goal {
        for (BlockPos p : from) {
            int diffX = x - p.getX();
            int diffZ = z - p.getZ();
-            int distSq = diffX * diffX + diffZ * diffZ;
+            double distSq = diffX * diffX + diffZ * diffZ;
            if (distSq < distanceSq) {
                return false;
            }
--- 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 Whether or not if this control is temporary
+     * @return Whethor or not if this control is temporary
     */
    boolean isTemporary();

--- a/src/api/java/baritone/api/process/IFarmProcess.java
+++ b/src/api/java/baritone/api/process/IFarmProcess.java
@@ -17,29 +17,7 @@

 package baritone.api.process;

-import net.minecraft.util.math.BlockPos;
-
 public interface IFarmProcess extends IBaritoneProcess {

-    /**
-     * Begin to search for crops to farm with in specified aria
-     * from specified location.
-     *
-     * @param range The distance from center to farm from
-     * @param pos   The center position to base the range from
-     */
-    void farm(int range, BlockPos pos);
-
-    /**
-     * Begin to search for nearby crops to farm.
-     */
-    default void farm() {farm(0, null);}
-
-    /**
-     * Begin to search for crops to farm with in specified aria
-     * from the position the command was executed.
-     *
-     * @param range The distance to search for crops to farm
-     */
-    default void farm(int range) {farm(range, null);}
+    void farm();
 }
--- a/src/api/java/baritone/api/schematic/IStaticSchematic.java
+++ b/src/api/java/baritone/api/schematic/IStaticSchematic.java
@@ -22,9 +22,10 @@ import net.minecraft.block.BlockState;
 /**
 * A static schematic is capable of providing the desired state at a given position without
 * additional context. Schematics of this type are expected to have non-varying contents.
+ * 
+ * @see #getDirect(int, int, int) 
 *
 * @author Brady
- * @see #getDirect(int, int, int)
 * @since 12/24/2019
 */
 public interface IStaticSchematic extends ISchematic {
--- a/src/api/java/baritone/api/utils/BlockOptionalMeta.java
+++ b/src/api/java/baritone/api/utils/BlockOptionalMeta.java
@@ -28,7 +28,6 @@ import net.minecraft.resources.*;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.Unit;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.registry.Registry;
 import net.minecraft.world.storage.loot.*;

 import javax.annotation.Nonnull;
@@ -47,6 +46,7 @@ public final class BlockOptionalMeta {
    private final ImmutableSet<Integer> stackHashes;
    private static final Pattern pattern = Pattern.compile("^(.+?)(?::(\\d+))?$");
    private static LootTableManager manager;
+    private static LootPredicateManager predicate = new LootPredicateManager();
    private static Map<Block, List<Item>> drops = new HashMap<>();

    public BlockOptionalMeta(@Nonnull Block block) {
@@ -65,13 +65,7 @@ public final class BlockOptionalMeta {

        MatchResult matchResult = matcher.toMatchResult();

-        ResourceLocation id = new ResourceLocation(matchResult.group(1));
-
-        if (!Registry.BLOCK.containsKey(id)) {
-            throw new IllegalArgumentException("Invalid block ID");
-        }
-
-        block = Registry.BLOCK.getValue(id).orElse(null);
+        block = BlockUtils.stringToBlockRequired(matchResult.group(1));
        blockstates = getStates(block);
        stateHashes = getStateHashes(blockstates);
        stackHashes = getStackHashes(blockstates);
@@ -144,7 +138,7 @@ public final class BlockOptionalMeta {
            rpl.reloadPacksFromFinders();
            IResourcePack thePack = ((ResourcePackInfo) rpl.getAllPacks().iterator().next()).getResourcePack();
            IReloadableResourceManager resourceManager = new SimpleReloadableResourceManager(ResourcePackType.SERVER_DATA, null);
-            manager = new LootTableManager();
+            manager = new LootTableManager(predicate);
            resourceManager.addReloadListener(manager);
            try {
                resourceManager.reloadResourcesAndThen(new ThreadPerTaskExecutor(Thread::new), new ThreadPerTaskExecutor(Thread::new), Collections.singletonList(thePack), CompletableFuture.completedFuture(Unit.INSTANCE)).get();
@@ -155,6 +149,10 @@ public final class BlockOptionalMeta {
        return manager;
    }

+    public static LootPredicateManager getPredicateManager() {
+        return predicate;
+    }
+
    private static synchronized List<Item> drops(Block b) {
        return drops.computeIfAbsent(b, block -> {
            ResourceLocation lootTableLocation = block.getLootTable();
--- a/src/api/java/baritone/api/utils/Helper.java
+++ b/src/api/java/baritone/api/utils/Helper.java
@@ -18,7 +18,6 @@
 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.StringTextComponent;
@@ -64,35 +63,6 @@ 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.execute(() -> 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 StringTextComponent(title), new StringTextComponent(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 StringTextComponent(message));
-    }
-
    /**
     * Send a message to chat only if chatDebug is on
     *
@@ -104,27 +74,7 @@ public interface Helper {
            //System.out.println(message);
            return;
        }
-        // 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 StringTextComponent("");
-        component.appendSibling(getPrefix());
-        component.appendSibling(new StringTextComponent(" "));
-        Arrays.asList(components).forEach(component::appendSibling);
-        if (logAsToast) {
-            logToast(getPrefix(), component);
-        } else {
-            mc.execute(() -> BaritoneAPI.getSettings().logger.value.accept(component));
-        }
+        logDirect(message);
    }

    /**
@@ -133,23 +83,11 @@ public interface Helper {
     * @param components The components to send
     */
    default void logDirect(ITextComponent... components) {
-        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 StringTextComponent(line.replace("\t", "    "));
-            component.getStyle().setColor(color);
-            logDirect(logAsToast, component);
-        });
+        ITextComponent component = new StringTextComponent("");
+        component.appendSibling(getPrefix());
+        component.appendSibling(new StringTextComponent(" "));
+        Arrays.asList(components).forEach(component::appendSibling);
+        mc.execute(() -> BaritoneAPI.getSettings().logger.value.accept(component));
    }

    /**
@@ -160,18 +98,11 @@ public interface Helper {
     * @param color   The color to print that message in
     */
    default void logDirect(String message, TextFormatting color) {
-        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);
+        Stream.of(message.split("\n")).forEach(line -> {
+            ITextComponent component = new StringTextComponent(line.replace("\t", "    "));
+            component.getStyle().setColor(color);
+            logDirect(component);
+        });
    }

    /**
@@ -181,6 +112,6 @@ public interface Helper {
     * @param message The message to display in chat
     */
    default void logDirect(String message) {
-        logDirect(message, BaritoneAPI.getSettings().logAsToast.value);
+        logDirect(message, TextFormatting.GRAY);
    }
 }
--- a/src/api/java/baritone/api/utils/IPlayerContext.java
+++ b/src/api/java/baritone/api/utils/IPlayerContext.java
@@ -22,10 +22,7 @@ import net.minecraft.block.SlabBlock;
 import net.minecraft.client.entity.player.ClientPlayerEntity;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.BlockRayTraceResult;
-import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.math.*;
 import net.minecraft.world.World;

 import java.util.Optional;
@@ -59,7 +56,7 @@ public interface IPlayerContext {

    default BetterBlockPos playerFeet() {
        // TODO find a better way to deal with soul sand!!!!!
-        BetterBlockPos feet = new BetterBlockPos(player().posX, player().posY + 0.1251, player().posZ);
+        BetterBlockPos feet = new BetterBlockPos(player().getPositionVec().x, player().getPositionVec().y + 0.1251, player().getPositionVec().z);

        // sometimes when calling this from another thread or while world is null, it'll throw a NullPointerException
        // that causes the game to immediately crash
@@ -79,11 +76,11 @@ public interface IPlayerContext {
    }

    default Vec3d playerFeetAsVec() {
-        return new Vec3d(player().posX, player().posY, player().posZ);
+        return new Vec3d(player().getPositionVec().x, player().getPositionVec().y, player().getPositionVec().z);
    }

    default Vec3d playerHead() {
-        return new Vec3d(player().posX, player().posY + player().getEyeHeight(), player().posZ);
+        return new Vec3d(player().getPositionVec().x, player().getPositionVec().y + player().getEyeHeight(), player().getPositionVec().z);
    }

    default Rotation playerRotations() {
@@ -110,4 +107,17 @@ 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.getType() == RayTraceResult.Type.ENTITY) {
+            return Optional.of(((EntityRayTraceResult) result).getEntity());
+        }
+        return Optional.empty();
+    }
 }
--- a/src/api/java/baritone/api/utils/IPlayerController.java
+++ b/src/api/java/baritone/api/utils/IPlayerController.java
@@ -17,10 +17,10 @@

 package baritone.api.utils;

-import baritone.api.BaritoneAPI;
 import net.minecraft.client.entity.player.ClientPlayerEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.inventory.container.ClickType;
+import baritone.api.BaritoneAPI;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ActionResultType;
 import net.minecraft.util.Direction;
--- a/src/api/java/baritone/api/utils/RayTraceUtils.java
+++ b/src/api/java/baritone/api/utils/RayTraceUtils.java
@@ -61,6 +61,6 @@ public final class RayTraceUtils {
    }

    public static Vec3d inferSneakingEyePosition(Entity entity) {
-        return new Vec3d(entity.posX, entity.posY + IPlayerContext.eyeHeight(true), entity.posZ);
+        return new Vec3d(entity.getPosX(), entity.getPosY() + IPlayerContext.eyeHeight(true), entity.getPosZ());
    }
 }
--- a/src/api/java/baritone/api/utils/VecUtils.java
+++ b/src/api/java/baritone/api/utils/VecUtils.java
@@ -105,7 +105,7 @@ public final class VecUtils {
     * @see #getBlockPosCenter(BlockPos)
     */
    public static double entityDistanceToCenter(Entity entity, BlockPos pos) {
-        return distanceToCenter(pos, entity.posX, entity.posY, entity.posZ);
+        return distanceToCenter(pos, entity.getPositionVec().x, entity.getPositionVec().y, entity.getPositionVec().z);
    }

    /**
@@ -118,6 +118,6 @@ public final class VecUtils {
     * @see #getBlockPosCenter(BlockPos)
     */
    public static double entityFlatDistanceToCenter(Entity entity, BlockPos pos) {
-        return distanceToCenter(pos, entity.posX, pos.getY() + 0.5, entity.posZ);
+        return distanceToCenter(pos, entity.getPositionVec().x, pos.getY() + 0.5, entity.getPositionVec().z);
    }
 }
--- a/src/api/java/baritone/api/utils/gui/BaritoneToast.java
+++ b/src/api/java/baritone/api/utils/gui/BaritoneToast.java
@@ -1,74 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.utils.gui;
-
-import com.mojang.blaze3d.platform.GlStateManager;
-import net.minecraft.client.gui.toasts.IToast;
-import net.minecraft.client.gui.toasts.ToastGui;
-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(ToastGui toastGui, long delta) {
-        if (this.newDisplay) {
-            this.firstDrawTime = delta;
-            this.newDisplay = false;
-        }
-
-        toastGui.getMinecraft().getTextureManager().bindTexture(new ResourceLocation("textures/gui/toasts.png"));
-        GlStateManager.color4f(1.0F, 1.0F, 1.0F, 255.0f);
-        toastGui.blit(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(ToastGui 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/MixinClientPlayNetHandler.java
+++ b/src/launch/java/baritone/launch/mixins/MixinClientPlayNetHandler.java
@@ -17,16 +17,15 @@

 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.player.ClientPlayerEntity;
 import net.minecraft.client.network.play.ClientPlayNetHandler;
-import net.minecraft.network.play.server.*;
-import net.minecraft.util.math.ChunkPos;
+import net.minecraft.network.play.server.SChunkDataPacket;
+import net.minecraft.network.play.server.SCombatPacket;
+import net.minecraft.network.play.server.SUnloadChunkPacket;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -113,69 +112,6 @@ public class MixinClientPlayNetHandler {
        }
    }

-    @Inject(
-            method = "handleBlockChange",
-            at = @At("RETURN")
-    )
-    private void postHandleBlockChange(SChangeBlockPacket packetIn, CallbackInfo ci) {
-        if (!Baritone.settings().repackOnAnyBlockChange.value) {
-            return;
-        }
-        if (!CachedChunk.BLOCKS_TO_KEEP_TRACK_OF.contains(packetIn.getState().getBlock())) {
-            return;
-        }
-        for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            ClientPlayerEntity player = ibaritone.getPlayerContext().player();
-            if (player != null && player.connection == (ClientPlayNetHandler) (Object) this) {
-                ibaritone.getGameEventHandler().onChunkEvent(
-                        new ChunkEvent(
-                                EventState.POST,
-                                ChunkEvent.Type.POPULATE_FULL,
-                                packetIn.getPos().getX() >> 4,
-                                packetIn.getPos().getZ() >> 4
-                        )
-                );
-            }
-        }
-    }
-
-    @Inject(
-            method = "handleMultiBlockChange",
-            at = @At("RETURN")
-    )
-    private void postHandleMultiBlockChange(SMultiBlockChangePacket 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 (SMultiBlockChangePacket.UpdateData 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()) {
-            ClientPlayerEntity player = ibaritone.getPlayerContext().player();
-            if (player != null && player.connection == (ClientPlayNetHandler) (Object) this) {
-                ibaritone.getGameEventHandler().onChunkEvent(
-                        new ChunkEvent(
-                                EventState.POST,
-                                ChunkEvent.Type.POPULATE_FULL,
-                                pos.x,
-                                pos.z
-                        )
-                );
-            }
-        }
-    }
-
    @Inject(
            method = "handleCombatEvent",
            at = @At(
--- a/src/launch/java/baritone/launch/mixins/MixinCommandSuggestionHelper.java
+++ b/src/launch/java/baritone/launch/mixins/MixinCommandSuggestionHelper.java
@@ -22,7 +22,7 @@ import baritone.api.event.events.TabCompleteEvent;
 import com.mojang.brigadier.context.StringRange;
 import com.mojang.brigadier.suggestion.Suggestion;
 import com.mojang.brigadier.suggestion.Suggestions;
-import net.minecraft.client.gui.screen.ChatScreen;
+import net.minecraft.client.gui.CommandSuggestionHelper;
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -40,27 +40,28 @@ import java.util.stream.Stream;
 * @author Brady
 * @since 10/9/2019
 */
-@Mixin(ChatScreen.class)
-public class MixinChatScreen {
-
-    @Shadow
-    protected TextFieldWidget inputField;
+@Mixin(CommandSuggestionHelper.class)
+public class MixinCommandSuggestionHelper {

    @Shadow
    @Final
-    protected List<String> commandUsage;
+    private TextFieldWidget field_228095_d_;

    @Shadow
-    private CompletableFuture<Suggestions> pendingSuggestions;
+    @Final
+    private List<String> field_228103_l_;
+
+    @Shadow
+    private CompletableFuture<Suggestions> field_228107_p_;

    @Inject(
-            method = "updateSuggestion",
+            method = "func_228111_a_",
            at = @At("HEAD"),
            cancellable = true
    )
    private void preUpdateSuggestion(CallbackInfo ci) {
        // Anything that is present in the input text before the cursor position
-        String prefix = this.inputField.getText().substring(0, Math.min(this.inputField.getText().length(), this.inputField.getCursorPosition()));
+        String prefix = this.field_228095_d_.getText().substring(0, Math.min(this.field_228095_d_.getText().length(), this.field_228095_d_.getCursorPosition()));

        TabCompleteEvent event = new TabCompleteEvent(prefix);
        BaritoneAPI.getProvider().getPrimaryBaritone().getGameEventHandler().onPreTabComplete(event);
@@ -74,14 +75,14 @@ public class MixinChatScreen {
            ci.cancel();

            // TODO: Support populating the command usage
-            this.commandUsage.clear();
+            this.field_228103_l_.clear();

            if (event.completions.length == 0) {
-                this.pendingSuggestions = Suggestions.empty();
+                this.field_228107_p_ = Suggestions.empty();
            } else {
-                int offset = this.inputField.getText().endsWith(" ")
-                        ? this.inputField.getCursorPosition()
-                        : this.inputField.getText().lastIndexOf(" ") + 1; // If there is no space this is still 0 haha yes
+                int offset = this.field_228095_d_.getText().endsWith(" ")
+                        ? this.field_228095_d_.getCursorPosition()
+                        : this.field_228095_d_.getText().lastIndexOf(" ") + 1; // If there is no space this is still 0 haha yes

                List<Suggestion> suggestionList = Stream.of(event.completions)
                        .map(s -> new Suggestion(StringRange.between(offset, offset + s.length()), s))
@@ -91,8 +92,8 @@ public class MixinChatScreen {
                        StringRange.between(offset, offset + suggestionList.stream().mapToInt(s -> s.getText().length()).max().orElse(0)),
                        suggestionList);

-                this.pendingSuggestions = new CompletableFuture<>();
-                this.pendingSuggestions.complete(suggestions);
+                this.field_228107_p_ = new CompletableFuture<>();
+                this.field_228107_p_.complete(suggestions);
            }
        }
    }
--- a/src/launch/java/baritone/launch/mixins/MixinEntityRenderManager.java
+++ b/src/launch/java/baritone/launch/mixins/MixinEntityRenderManager.java
@@ -20,29 +20,23 @@ package baritone.launch.mixins;
 import baritone.utils.accessor.IEntityRenderManager;
 import net.minecraft.client.renderer.entity.EntityRendererManager;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;

@Mixin(EntityRendererManager.class)
 public class MixinEntityRenderManager implements IEntityRenderManager {
-    @Shadow
-    private double renderPosX;
-    @Shadow
-    private double renderPosY;
-    @Shadow
-    private double renderPosZ;
+

    @Override
    public double renderPosX() {
-        return renderPosX;
+        return ((EntityRendererManager) (Object) this).info.getProjectedView().x;
    }

    @Override
    public double renderPosY() {
-        return renderPosY;
+        return ((EntityRendererManager) (Object) this).info.getProjectedView().y;
    }

    @Override
    public double renderPosZ() {
-        return renderPosZ;
+        return ((EntityRendererManager) (Object) this).info.getProjectedView().z;
    }
 }
--- a/src/launch/java/baritone/launch/mixins/MixinLivingEntity.java
+++ b/src/launch/java/baritone/launch/mixins/MixinLivingEntity.java
@@ -24,6 +24,7 @@ import net.minecraft.client.entity.player.ClientPlayerEntity;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.LivingEntity;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
--- a/src/launch/java/baritone/launch/mixins/MixinLootContext.java
+++ b/src/launch/java/baritone/launch/mixins/MixinLootContext.java
@@ -21,6 +21,7 @@ import baritone.api.utils.BlockOptionalMeta;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.server.ServerWorld;
 import net.minecraft.world.storage.loot.LootContext;
+import net.minecraft.world.storage.loot.LootPredicateManager;
 import net.minecraft.world.storage.loot.LootTableManager;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -56,4 +57,18 @@ public class MixinLootContext {
        }
        return server.getLootTableManager();
    }
+
+    @Redirect(
+            method = "build",
+            at = @At(
+                    value = "INVOKE",
+                    target = "net/minecraft/server/MinecraftServer.func_229736_aP_()Lnet/minecraft/world/storage/loot/LootPredicateManager;"
+            )
+    )
+    private LootPredicateManager getLootPredicateManager(MinecraftServer server) {
+        if (server == null) {
+            return BlockOptionalMeta.getPredicateManager();
+        }
+        return server.func_229736_aP_();
+    }
 }
--- a/src/launch/java/baritone/launch/mixins/MixinMinecraft.java
+++ b/src/launch/java/baritone/launch/mixins/MixinMinecraft.java
@@ -19,18 +19,14 @@ package baritone.launch.mixins;

 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
-import baritone.api.event.events.BlockInteractEvent;
 import baritone.api.event.events.TickEvent;
 import baritone.api.event.events.WorldEvent;
 import baritone.api.event.events.type.EventState;
+import baritone.utils.BaritoneAutoTest;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.player.ClientPlayerEntity;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.world.ClientWorld;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ActionResultType;
-import net.minecraft.util.Hand;
-import net.minecraft.util.math.BlockRayTraceResult;
 import org.spongepowered.asm.lib.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -38,7 +34,6 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;

 import java.util.function.BiFunction;

@@ -55,13 +50,21 @@ public class MixinMinecraft {
    public ClientWorld world;

    @Inject(
-            method = "init",
+            method = "<init>",
            at = @At("RETURN")
    )
    private void postInit(CallbackInfo ci) {
        BaritoneAPI.getProvider().getPrimaryBaritone();
    }

+    @Inject(
+            method = "startTimerHackThread",
+            at = @At("HEAD")
+    )
+    private void preInit(CallbackInfo ci) {
+        BaritoneAutoTest.INSTANCE.onPreInit();
+    }
+
    @Inject(
            method = "runTick",
            at = @At(
@@ -136,16 +139,24 @@ public class MixinMinecraft {
        return (BaritoneAPI.getProvider().getPrimaryBaritone().getPathingBehavior().isPathing() && player != null) || screen.passEvents;
    }

-    @Inject(
+    // TODO
+    // FIXME
+    // bradyfix
+    // i cant mixin
+    // lol
+    // https://discordapp.com/channels/208753003996512258/503692253881958400/674760939681349652
+    // https://discordapp.com/channels/208753003996512258/503692253881958400/674756457966862376
+    /*@Inject(
            method = "rightClickMouse",
            at = @At(
                    value = "INVOKE",
-                    target = "net/minecraft/client/entity/player/ClientPlayerEntity.swingArm(Lnet/minecraft/util/Hand;)V"
+                    target = "net/minecraft/client/entity/player/ClientPlayerEntity.swingArm(Lnet/minecraft/util/Hand;)V",
+                    ordinal = 1
            ),
            locals = LocalCapture.CAPTURE_FAILHARD
    )
-    private void onBlockUse(CallbackInfo ci, Hand var1[], int var2, int var3, Hand enumhand, ItemStack itemstack, BlockRayTraceResult raytrace, int i, ActionResultType enumactionresult) {
+    private void onBlockUse(CallbackInfo ci, Hand var1[], int var2, int var3, Hand enumhand, ItemStack itemstack, EntityRayTraceResult rt, Entity ent, ActionResultType art, BlockRayTraceResult raytrace, int i, ActionResultType enumactionresult) {
        // rightClickMouse is only for the main player
        BaritoneAPI.getProvider().getPrimaryBaritone().getGameEventHandler().onBlockInteract(new BlockInteractEvent(raytrace.getPos(), BlockInteractEvent.Type.USE));
-    }
+    }*/
 }
--- a/src/launch/java/baritone/launch/mixins/MixinBlockStateContainer.java
+++ b/src/launch/java/baritone/launch/mixins/MixinBlockStateContainer.java
@@ -18,22 +18,22 @@
 package baritone.launch.mixins;

 import baritone.utils.accessor.IBitArray;
-import baritone.utils.accessor.IBlockStateContainer;
+import baritone.utils.accessor.IPalettedContainer;
 import net.minecraft.block.BlockState;
 import net.minecraft.util.BitArray;
-import net.minecraft.world.chunk.BlockStateContainer;
-import net.minecraft.world.chunk.IBlockStatePalette;
+import net.minecraft.util.palette.IPalette;
+import net.minecraft.util.palette.PalettedContainer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

-@Mixin(BlockStateContainer.class)
-public abstract class MixinBlockStateContainer implements IBlockStateContainer {
+@Mixin(PalettedContainer.class)
+public abstract class MixinPalettedContainer implements IPalettedContainer {

    @Shadow
    protected BitArray storage;

    @Shadow
-    protected IBlockStatePalette<BlockState> palette;
+    protected IPalette<BlockState> palette;

    @Override
    public BlockState getAtPalette(int index) {
--- a/src/launch/java/baritone/launch/mixins/MixinWorldRenderer.java
+++ b/src/launch/java/baritone/launch/mixins/MixinWorldRenderer.java
@@ -20,26 +20,29 @@ package baritone.launch.mixins;
 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
 import baritone.api.event.events.RenderEvent;
-import net.minecraft.client.renderer.GameRenderer;
+import com.mojang.blaze3d.matrix.MatrixStack;
+import net.minecraft.client.renderer.*;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.LocalCapture;

-@Mixin(GameRenderer.class)
-public class MixinGameRenderer {
+/**
+ * @author Brady
+ * @since 2/13/2020
+ */
+@Mixin(WorldRenderer.class)
+public class MixinWorldRenderer {

    @Inject(
-            method = "updateCameraAndRender(FJ)V",
-            at = @At(
-                    value = "INVOKE_STRING",
-                    target = "Lnet/minecraft/profiler/IProfiler;endStartSection(Ljava/lang/String;)V",
-                    args = {"ldc=hand"}
-            )
+            method = "updateCameraAndRender",
+            at = @At("RETURN"),
+            locals = LocalCapture.CAPTURE_FAILSOFT
    )
-    private void renderWorldPass(float partialTicks, long finishTimeNano, CallbackInfo ci) {
+    private void onStartHand(MatrixStack matrixStackIn, float partialTicks, long finishTimeNano, boolean drawBlockOutline, ActiveRenderInfo activeRenderInfoIn, GameRenderer gameRendererIn, LightTexture lightmapIn, Matrix4f projectionIn, CallbackInfo ci) {
        for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            ibaritone.getGameEventHandler().onRenderPass(new RenderEvent(partialTicks));
+            ibaritone.getGameEventHandler().onRenderPass(new RenderEvent(partialTicks, matrixStackIn, projectionIn));
        }
    }
-}
+}
--- a/src/launch/resources/mixins.baritone.json
+++ b/src/launch/resources/mixins.baritone.json
@@ -9,21 +9,21 @@
  },
  "client": [
    "MixinBitArray",
-    "MixinBlockStateContainer",
-    "MixinChatScreen",
    "MixinChunkArray",
    "MixinClientChunkProvider",
    "MixinClientPlayerEntity",
    "MixinClientPlayNetHandler",
+    "MixinCommandSuggestionHelper",
    "MixinEntity",
    "MixinEntityRenderManager",
-    "MixinGameRenderer",
    "MixinItemStack",
    "MixinLivingEntity",
    "MixinLootContext",
    "MixinMinecraft",
    "MixinNetworkManager",
+    "MixinPalettedContainer",
    "MixinPlayerController",
-    "MixinScreen"
+    "MixinScreen",
+    "MixinWorldRenderer"
  ]
 }
--- a/src/main/java/baritone/Baritone.java
+++ b/src/main/java/baritone/Baritone.java
@@ -25,14 +25,11 @@ import baritone.api.utils.Helper;
 import baritone.api.utils.IPlayerContext;
 import baritone.behavior.*;
 import baritone.cache.WorldProvider;
-import baritone.command.manager.CommandManager;
 import baritone.event.GameEventHandler;
 import baritone.process.*;
 import baritone.selection.SelectionManager;
-import baritone.utils.BlockStateInterface;
-import baritone.utils.GuiClick;
-import baritone.utils.InputOverrideHandler;
-import baritone.utils.PathingControlManager;
+import baritone.utils.*;
+import baritone.command.manager.CommandManager;
 import baritone.utils.player.PrimaryPlayerContext;
 import net.minecraft.client.Minecraft;

@@ -107,19 +104,23 @@ public class Baritone implements IBaritone {

        this.pathingControlManager = new PathingControlManager(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));
+            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.worldProvider = new WorldProvider();
        this.selectionManager = new SelectionManager(this);
        this.commandManager = new CommandManager(this);
+
+        if (BaritoneAutoTest.ENABLE_AUTO_TEST) {
+            this.gameEventHandler.registerEventListener(BaritoneAutoTest.INSTANCE);
+        }
    }

    @Override
--- a/src/main/java/baritone/BaritoneProvider.java
+++ b/src/main/java/baritone/BaritoneProvider.java
@@ -22,9 +22,9 @@ 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.cache.WorldScanner;
 import baritone.command.CommandSystem;
-import baritone.command.ExampleBaritoneControl;
 import baritone.utils.schematic.SchematicSystem;

 import java.util.Collections;
@@ -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 ExampleBaritoneControl(this.primary);
+        new BaritoneChatControl(this.primary);
    }

    @Override
--- a/src/main/java/baritone/KeepName.java
+++ b/src/main/java/baritone/KeepName.java
@@ -1,21 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone;
-
-// Annotation for classes and class members that should not be renamed by proguard
-public @interface KeepName {}
--- a/src/main/java/baritone/behavior/InventoryBehavior.java
+++ b/src/main/java/baritone/behavior/InventoryBehavior.java
@@ -137,7 +137,7 @@ public final class InventoryBehavior extends Behavior {

    public boolean selectThrowawayForLocation(boolean select, int x, int y, int z) {
        BlockState maybe = baritone.getBuilderProcess().placeAt(x, y, z, baritone.bsi.get0(x, y, z));
-        if (maybe != null && throwaway(select, stack -> stack.getItem() instanceof BlockItem && maybe.equals(((BlockItem) stack.getItem()).getBlock().getStateForPlacement(new BlockItemUseContext(new ItemUseContext(ctx.world(), ctx.player(), Hand.MAIN_HAND, stack, new BlockRayTraceResult(new Vec3d(ctx.player().posX, ctx.player().posY, ctx.player().posZ), Direction.UP, ctx.playerFeet(), false)) {}))))) {
+        if (maybe != null && throwaway(select, stack -> stack.getItem() instanceof BlockItem && maybe.equals(((BlockItem) stack.getItem()).getBlock().getStateForPlacement(new BlockItemUseContext(new ItemUseContext(ctx.world(), ctx.player(), Hand.MAIN_HAND, stack, new BlockRayTraceResult(new Vec3d(ctx.player().getPositionVec().x, ctx.player().getPositionVec().y, ctx.player().getPositionVec().z), Direction.UP, ctx.playerFeet(), false)) {}))))) {
            return true; // gotem
        }
        if (maybe != null && throwaway(select, stack -> stack.getItem() instanceof BlockItem && ((BlockItem) stack.getItem()).getBlock().equals(maybe.getBlock()))) {
--- a/src/main/java/baritone/behavior/PathingBehavior.java
+++ b/src/main/java/baritone/behavior/PathingBehavior.java
@@ -381,8 +381,8 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
        BetterBlockPos feet = ctx.playerFeet();
        if (!MovementHelper.canWalkOn(ctx, feet.down())) {
            if (ctx.player().onGround) {
-                double playerX = ctx.player().posX;
-                double playerZ = ctx.player().posZ;
+                double playerX = ctx.player().getPositionVec().x;
+                double playerZ = ctx.player().getPositionVec().z;
                ArrayList<BetterBlockPos> closest = new ArrayList<>();
                for (int dx = -1; dx <= 1; dx++) {
                    for (int dz = -1; dz <= 1; dz++) {
--- a/src/main/java/baritone/cache/CachedWorld.java
+++ b/src/main/java/baritone/cache/CachedWorld.java
@@ -26,7 +26,6 @@ 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;
@@ -34,8 +33,6 @@ 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;

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

-    /**
-     * 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 LinkedBlockingQueue<Chunk> toPack = new LinkedBlockingQueue<>();

    private final int dimension;

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

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

@@ -304,9 +293,13 @@ 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 {
-                    ChunkPos pos = toPackQueue.take();
-                    Chunk chunk = toPackMap.remove(pos);
+                    Chunk chunk = queue.take();
                    CachedChunk cached = ChunkPacker.pack(chunk);
                    CachedWorld.this.updateCachedChunk(cached);
                    //System.out.println("Processed chunk at " + chunk.x + "," + chunk.z);
--- a/src/main/java/baritone/cache/ChunkPacker.java
+++ b/src/main/java/baritone/cache/ChunkPacker.java
@@ -23,7 +23,7 @@ import baritone.utils.pathing.PathingBlockType;
 import net.minecraft.block.*;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.chunk.BlockStateContainer;
+import net.minecraft.util.palette.PalettedContainer;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.ChunkSection;

@@ -59,7 +59,7 @@ public final class ChunkPacker {
                    // since a bitset is initialized to all zero, and air is saved as zeros
                    continue;
                }
-                BlockStateContainer<BlockState> bsc = extendedblockstorage.getData();
+                PalettedContainer<BlockState> bsc = extendedblockstorage.getData();
                int yReal = y0 << 4;
                // the mapping of BlockStateContainer.getIndex from xyz to index is y << 8 | z << 4 | x;
                // for better cache locality, iterate in that order
--- a/src/main/java/baritone/cache/WorldScanner.java
+++ b/src/main/java/baritone/cache/WorldScanner.java
@@ -22,7 +22,7 @@ import baritone.api.cache.IWorldScanner;
 import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.BlockOptionalMetaLookup;
 import baritone.api.utils.IPlayerContext;
-import baritone.utils.accessor.IBlockStateContainer;
+import baritone.utils.accessor.IPalettedContainer;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.multiplayer.ClientChunkProvider;
 import net.minecraft.util.math.BlockPos;
@@ -155,7 +155,7 @@ public enum WorldScanner implements IWorldScanner {
                continue;
            }
            int yReal = y0 << 4;
-            IBlockStateContainer bsc = (IBlockStateContainer) section.getData();
+            IPalettedContainer bsc = (IPalettedContainer) section.getData();
            // storageArray uses an optimized algorithm that's faster than getAt
            // creating this array and then using getAtPalette is faster than even getFast(int index)
            int[] storage = bsc.storageArray();
--- a/src/main/java/baritone/command/ExampleBaritoneControl.java
+++ b/src/main/java/baritone/command/ExampleBaritoneControl.java
@@ -20,20 +20,20 @@ package baritone.command;
 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
 import baritone.api.Settings;
-import baritone.api.command.argument.ICommandArgument;
-import baritone.api.command.exception.CommandNotEnoughArgumentsException;
-import baritone.api.command.exception.CommandNotFoundException;
-import baritone.api.command.helpers.TabCompleteHelper;
-import baritone.api.command.manager.ICommandManager;
+import baritone.utils.accessor.IGuiScreen;
 import baritone.api.event.events.ChatEvent;
 import baritone.api.event.events.TabCompleteEvent;
 import baritone.api.event.listener.AbstractGameEventListener;
 import baritone.api.utils.Helper;
 import baritone.api.utils.SettingsUtil;
+import baritone.api.command.argument.ICommandArgument;
+import baritone.api.command.exception.CommandNotEnoughArgumentsException;
+import baritone.api.command.exception.CommandNotFoundException;
 import baritone.command.argument.ArgConsumer;
+import baritone.api.command.helpers.TabCompleteHelper;
+import baritone.api.command.manager.ICommandManager;
 import baritone.command.argument.CommandArguments;
 import baritone.command.manager.CommandManager;
-import baritone.utils.accessor.IGuiScreen;
 import net.minecraft.util.Tuple;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.StringTextComponent;
@@ -49,12 +49,12 @@ import java.util.stream.Stream;

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

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

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

-    public ExampleBaritoneControl(IBaritone baritone) {
+    public BaritoneChatControl(IBaritone baritone) {
        this.manager = baritone.getCommandManager();
        baritone.getGameEventHandler().registerEventListener(this);
    }
--- a/src/main/java/baritone/command/CommandSystem.java
+++ b/src/main/java/baritone/command/CommandSystem.java
@@ -18,8 +18,8 @@
 package baritone.command;

 import baritone.api.command.ICommandSystem;
-import baritone.api.command.argparser.IArgParserManager;
 import baritone.command.argparser.ArgParserManager;
+import baritone.api.command.argparser.IArgParserManager;

 /**
 * @author Brady
--- a/src/main/java/baritone/command/argument/ArgConsumer.java
+++ b/src/main/java/baritone/command/argument/ArgConsumer.java
@@ -17,6 +17,7 @@

 package baritone.command.argument;

+import baritone.Baritone;
 import baritone.api.IBaritone;
 import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.argument.ICommandArgument;
@@ -316,6 +317,9 @@ public class ArgConsumer implements IArgConsumer {
        try {
            return datatype.apply(this.context, original);
        } catch (Exception e) {
+            if (Baritone.settings().verboseCommandExceptions.value) {
+                e.printStackTrace();
+            }
            throw new CommandInvalidTypeException(hasAny() ? peek() : consumed(), datatype.getClass().getSimpleName(), e);
        }
    }
@@ -345,6 +349,9 @@ public class ArgConsumer implements IArgConsumer {
        try {
            return datatype.get(this.context);
        } catch (Exception e) {
+            if (Baritone.settings().verboseCommandExceptions.value) {
+                e.printStackTrace();
+            }
            throw new CommandInvalidTypeException(hasAny() ? peek() : consumed(), datatype.getClass().getSimpleName(), e);
        }
    }
--- a/src/main/java/baritone/command/argument/CommandArgument.java
+++ b/src/main/java/baritone/command/argument/CommandArgument.java
@@ -17,9 +17,9 @@

 package baritone.command.argument;

+import baritone.command.argparser.ArgParserManager;
 import baritone.api.command.argument.ICommandArgument;
 import baritone.api.command.exception.CommandInvalidTypeException;
-import baritone.command.argparser.ArgParserManager;

 import java.util.stream.Stream;

--- a/src/main/java/baritone/command/argument/CommandArguments.java
+++ b/src/main/java/baritone/command/argument/CommandArguments.java
@@ -48,9 +48,9 @@ public final class CommandArguments {
        int lastEnd = -1;
        while (argMatcher.find()) {
            args.add(new CommandArgument(
-                    args.size(),
-                    argMatcher.group(),
-                    string.substring(argMatcher.start())
+                args.size(),
+                argMatcher.group(),
+                string.substring(argMatcher.start())
            ));
            lastEnd = argMatcher.end();
        }
--- a/src/main/java/baritone/command/defaults/AxisCommand.java
+++ b/src/main/java/baritone/command/defaults/AxisCommand.java
@@ -18,11 +18,11 @@
 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.GoalAxis;
+import baritone.api.command.Command;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.argument.IArgConsumer;

 import java.util.Arrays;
 import java.util.List;
--- a/src/main/java/baritone/command/defaults/BlacklistCommand.java
+++ b/src/main/java/baritone/command/defaults/BlacklistCommand.java
@@ -18,11 +18,11 @@
 package baritone.command.defaults;

 import baritone.api.IBaritone;
+import baritone.api.process.IGetToBlockProcess;
 import baritone.api.command.Command;
-import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.exception.CommandInvalidStateException;
-import baritone.api.process.IGetToBlockProcess;
+import baritone.api.command.argument.IArgConsumer;

 import java.util.Arrays;
 import java.util.List;
--- a/src/main/java/baritone/command/defaults/BuildCommand.java
+++ b/src/main/java/baritone/command/defaults/BuildCommand.java
@@ -26,6 +26,7 @@ import baritone.api.command.datatypes.RelativeFile;
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.exception.CommandInvalidStateException;
 import baritone.api.utils.BetterBlockPos;
+import net.minecraft.client.Minecraft;
 import org.apache.commons.io.FilenameUtils;

 import java.io.File;
@@ -45,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.value);
+            file = new File(file.getAbsolutePath() + "." + Baritone.settings().schematicFallbackExtension);
        }
        BetterBlockPos origin = ctx.playerFeet();
        BetterBlockPos buildOrigin;
--- a/src/main/java/baritone/command/defaults/ChestsCommand.java
+++ b/src/main/java/baritone/command/defaults/ChestsCommand.java
@@ -19,11 +19,11 @@ package baritone.command.defaults;

 import baritone.api.IBaritone;
 import baritone.api.cache.IRememberedInventory;
+import baritone.api.utils.BetterBlockPos;
 import baritone.api.command.Command;
-import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.exception.CommandInvalidStateException;
-import baritone.api.utils.BetterBlockPos;
+import baritone.api.command.argument.IArgConsumer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.ITextComponent;
--- a/src/main/java/baritone/command/defaults/ClickCommand.java
+++ b/src/main/java/baritone/command/defaults/ClickCommand.java
@@ -19,8 +19,8 @@ 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.command.argument.IArgConsumer;

 import java.util.Arrays;
 import java.util.List;
--- a/src/main/java/baritone/command/defaults/ComeCommand.java
+++ b/src/main/java/baritone/command/defaults/ComeCommand.java
@@ -18,11 +18,11 @@
 package baritone.command.defaults;

 import baritone.api.IBaritone;
+import baritone.api.pathing.goals.GoalBlock;
 import baritone.api.command.Command;
-import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.exception.CommandInvalidStateException;
-import baritone.api.pathing.goals.GoalBlock;
+import baritone.api.command.argument.IArgConsumer;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.math.BlockPos;

--- a/src/main/java/baritone/command/defaults/DefaultCommands.java
+++ b/src/main/java/baritone/command/defaults/DefaultCommands.java
@@ -60,11 +60,10 @@ 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", "Path to your home waypoint", "waypoints goto home"),
+                new CommandAlias(baritone, "home", "Set goal to your home waypoint", "waypoints goal 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", "p") {
+        pauseCommand = new Command(baritone, "pause") {
            @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", "r") {
+        resumeCommand = new Command(baritone, "resume") {
            @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", "c", "stop") {
+        cancelCommand = new Command(baritone, "cancel", "stop") {
            @Override
            public void execute(String label, IArgConsumer args) throws CommandException {
                args.requireMax(0);
--- a/src/main/java/baritone/command/defaults/ExploreCommand.java
+++ b/src/main/java/baritone/command/defaults/ExploreCommand.java
@@ -18,11 +18,11 @@
 package baritone.command.defaults;

 import baritone.api.IBaritone;
+import baritone.api.pathing.goals.GoalXZ;
 import baritone.api.command.Command;
-import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.datatypes.RelativeGoalXZ;
 import baritone.api.command.exception.CommandException;
-import baritone.api.pathing.goals.GoalXZ;
+import baritone.api.command.argument.IArgConsumer;

 import java.util.Arrays;
 import java.util.List;
--- a/src/main/java/baritone/command/defaults/ExploreFilterCommand.java
+++ b/src/main/java/baritone/command/defaults/ExploreFilterCommand.java
@@ -19,11 +19,11 @@ package baritone.command.defaults;

 import baritone.api.IBaritone;
 import baritone.api.command.Command;
-import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.datatypes.RelativeFile;
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.exception.CommandInvalidStateException;
 import baritone.api.command.exception.CommandInvalidTypeException;
+import baritone.api.command.argument.IArgConsumer;
 import com.google.gson.JsonSyntaxException;

 import java.io.File;
--- a/src/main/java/baritone/command/defaults/FarmCommand.java
+++ b/src/main/java/baritone/command/defaults/FarmCommand.java
@@ -18,13 +18,9 @@
 package baritone.command.defaults;

 import baritone.api.IBaritone;
-import baritone.api.cache.IWaypoint;
 import baritone.api.command.Command;
-import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.datatypes.ForWaypoints;
 import baritone.api.command.exception.CommandException;
-import baritone.api.command.exception.CommandInvalidStateException;
-import baritone.api.utils.BetterBlockPos;
+import baritone.api.command.argument.IArgConsumer;

 import java.util.Arrays;
 import java.util.List;
@@ -38,30 +34,8 @@ public class FarmCommand extends Command {

    @Override
    public void execute(String label, IArgConsumer args) throws CommandException {
-        args.requireMax(2);
-        int range = 0;
-        BetterBlockPos origin = null;
-        //range
-        if (args.has(1)) {
-            range = args.getAs(Integer.class);
-        }
-        //waypoint
-        if (args.has(1)) {
-            IWaypoint[] waypoints = args.getDatatypeFor(ForWaypoints.INSTANCE);
-            IWaypoint waypoint = null;
-            switch (waypoints.length) {
-                case 0:
-                    throw new CommandInvalidStateException("No waypoints found");
-                case 1:
-                    waypoint = waypoints[0];
-                    break;
-                default:
-                    throw new CommandInvalidStateException("Multiple waypoints were found");
-            }
-            origin = waypoint.getLocation();
-        }
-
-        baritone.getFarmProcess().farm(range, origin);
+        args.requireMax(0);
+        baritone.getFarmProcess().farm();
        logDirect("Farming");
    }

@@ -81,9 +55,7 @@ public class FarmCommand extends Command {
                "The farm command starts farming nearby plants. It harvests mature crops and plants new ones.",
                "",
                "Usage:",
-                "> farm - farms every crop it can find.",
-                "> farm <range> - farm crops within range from the starting position.",
-                "> farm <range> <waypoint> - farm crops within range from waypoint."
+                "> farm"
        );
    }
 }
--- a/src/main/java/baritone/command/defaults/FindCommand.java
+++ b/src/main/java/baritone/command/defaults/FindCommand.java
@@ -18,11 +18,11 @@
 package baritone.command.defaults;

 import baritone.api.IBaritone;
+import baritone.api.utils.BetterBlockPos;
 import baritone.api.command.Command;
-import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.datatypes.BlockById;
 import baritone.api.command.exception.CommandException;
-import baritone.api.utils.BetterBlockPos;
+import baritone.api.command.argument.IArgConsumer;
 import net.minecraft.block.Block;
 import net.minecraft.util.registry.Registry;

--- a/src/main/java/baritone/command/defaults/FollowCommand.java
+++ b/src/main/java/baritone/command/defaults/FollowCommand.java
@@ -17,14 +17,13 @@

 package baritone.command.defaults;

-import baritone.KeepName;
 import baritone.api.IBaritone;
 import baritone.api.command.Command;
-import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.datatypes.EntityClassById;
 import baritone.api.command.datatypes.IDatatypeFor;
 import baritone.api.command.datatypes.NearbyPlayer;
 import baritone.api.command.exception.CommandException;
+import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.helpers.TabCompleteHelper;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
@@ -133,7 +132,6 @@ public class FollowCommand extends Command {
        );
    }

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

-    @KeepName
    private enum FollowList {
        ENTITY(EntityClassById.INSTANCE),
        PLAYER(NearbyPlayer.INSTANCE);
--- a/src/main/java/baritone/command/defaults/ForceCancelCommand.java
+++ b/src/main/java/baritone/command/defaults/ForceCancelCommand.java
@@ -20,8 +20,8 @@ package baritone.command.defaults;
 import baritone.api.IBaritone;
 import baritone.api.behavior.IPathingBehavior;
 import baritone.api.command.Command;
-import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.exception.CommandException;
+import baritone.api.command.argument.IArgConsumer;

 import java.util.Arrays;
 import java.util.List;
--- a/src/main/java/baritone/command/defaults/GcCommand.java
+++ b/src/main/java/baritone/command/defaults/GcCommand.java
@@ -19,8 +19,8 @@ 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.command.argument.IArgConsumer;

 import java.util.Arrays;
 import java.util.List;
--- a/src/main/java/baritone/command/defaults/GoalCommand.java
+++ b/src/main/java/baritone/command/defaults/GoalCommand.java
@@ -18,15 +18,15 @@
 package baritone.command.defaults;

 import baritone.api.IBaritone;
-import baritone.api.command.Command;
-import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.datatypes.RelativeCoordinate;
-import baritone.api.command.datatypes.RelativeGoal;
-import baritone.api.command.exception.CommandException;
-import baritone.api.command.helpers.TabCompleteHelper;
 import baritone.api.pathing.goals.Goal;
 import baritone.api.process.ICustomGoalProcess;
 import baritone.api.utils.BetterBlockPos;
+import baritone.api.command.Command;
+import baritone.api.command.datatypes.RelativeCoordinate;
+import baritone.api.command.datatypes.RelativeGoal;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.argument.IArgConsumer;
+import baritone.api.command.helpers.TabCompleteHelper;

 import java.util.Arrays;
 import java.util.List;
--- a/src/main/java/baritone/command/defaults/GotoCommand.java
+++ b/src/main/java/baritone/command/defaults/GotoCommand.java
@@ -19,12 +19,12 @@ package baritone.command.defaults;

 import baritone.api.IBaritone;
 import baritone.api.command.Command;
-import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.datatypes.BlockById;
 import baritone.api.command.datatypes.ForBlockOptionalMeta;
 import baritone.api.command.datatypes.RelativeCoordinate;
 import baritone.api.command.datatypes.RelativeGoal;
 import baritone.api.command.exception.CommandException;
+import baritone.api.command.argument.IArgConsumer;
 import baritone.api.pathing.goals.Goal;
 import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.BlockOptionalMeta;
@@ -72,7 +72,7 @@ public class GotoCommand extends Command {
    @Override
    public List<String> getLongDesc() {
        return Arrays.asList(
-                "The goto command tells Baritone to head towards a given goal or block.",
+                "The got 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/HelpCommand.java
+++ b/src/main/java/baritone/command/defaults/HelpCommand.java
@@ -20,9 +20,9 @@ package baritone.command.defaults;
 import baritone.api.IBaritone;
 import baritone.api.command.Command;
 import baritone.api.command.ICommand;
-import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.exception.CommandNotFoundException;
+import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.helpers.Paginator;
 import baritone.api.command.helpers.TabCompleteHelper;
 import net.minecraft.util.text.ITextComponent;
--- a/src/main/java/baritone/command/defaults/InvertCommand.java
+++ b/src/main/java/baritone/command/defaults/InvertCommand.java
@@ -18,13 +18,13 @@
 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.command.exception.CommandInvalidStateException;
 import baritone.api.pathing.goals.Goal;
 import baritone.api.pathing.goals.GoalInverted;
 import baritone.api.process.ICustomGoalProcess;
+import baritone.api.command.Command;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.exception.CommandInvalidStateException;
+import baritone.api.command.argument.IArgConsumer;

 import java.util.Arrays;
 import java.util.List;
--- a/src/main/java/baritone/command/defaults/MineCommand.java
+++ b/src/main/java/baritone/command/defaults/MineCommand.java
@@ -18,12 +18,12 @@
 package baritone.command.defaults;

 import baritone.api.IBaritone;
+import baritone.api.utils.BlockOptionalMeta;
 import baritone.api.command.Command;
-import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.datatypes.BlockById;
 import baritone.api.command.datatypes.ForBlockOptionalMeta;
 import baritone.api.command.exception.CommandException;
-import baritone.api.utils.BlockOptionalMeta;
+import baritone.api.command.argument.IArgConsumer;
 import baritone.cache.WorldScanner;

 import java.util.ArrayList;
--- a/src/main/java/baritone/command/defaults/PathCommand.java
+++ b/src/main/java/baritone/command/defaults/PathCommand.java
@@ -19,8 +19,8 @@ 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.command.argument.IArgConsumer;
 import baritone.api.process.ICustomGoalProcess;
 import baritone.cache.WorldScanner;

--- a/src/main/java/baritone/command/defaults/ProcCommand.java
+++ b/src/main/java/baritone/command/defaults/ProcCommand.java
@@ -18,13 +18,13 @@
 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.command.exception.CommandInvalidStateException;
 import baritone.api.pathing.calc.IPathingControlManager;
 import baritone.api.process.IBaritoneProcess;
 import baritone.api.process.PathingCommand;
+import baritone.api.command.Command;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.exception.CommandInvalidStateException;
+import baritone.api.command.argument.IArgConsumer;

 import java.util.Arrays;
 import java.util.List;
--- a/src/main/java/baritone/command/defaults/ReloadAllCommand.java
+++ b/src/main/java/baritone/command/defaults/ReloadAllCommand.java
@@ -19,8 +19,8 @@ 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.command.argument.IArgConsumer;

 import java.util.Arrays;
 import java.util.List;
--- a/src/main/java/baritone/command/defaults/RenderCommand.java
+++ b/src/main/java/baritone/command/defaults/RenderCommand.java
@@ -18,10 +18,10 @@
 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.utils.BetterBlockPos;
+import baritone.api.command.Command;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.argument.IArgConsumer;

 import java.util.Arrays;
 import java.util.List;
--- a/src/main/java/baritone/command/defaults/RepackCommand.java
+++ b/src/main/java/baritone/command/defaults/RepackCommand.java
@@ -19,8 +19,8 @@ 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.command.argument.IArgConsumer;
 import baritone.cache.WorldScanner;

 import java.util.Arrays;
--- a/src/main/java/baritone/command/defaults/SaveAllCommand.java
+++ b/src/main/java/baritone/command/defaults/SaveAllCommand.java
@@ -19,8 +19,8 @@ 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.command.argument.IArgConsumer;

 import java.util.Arrays;
 import java.util.List;
--- a/src/main/java/baritone/command/defaults/SchematicaCommand.java
+++ b/src/main/java/baritone/command/defaults/SchematicaCommand.java
@@ -19,8 +19,8 @@ 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.command.argument.IArgConsumer;

 import java.util.Arrays;
 import java.util.List;
--- a/src/main/java/baritone/command/defaults/SelCommand.java
+++ b/src/main/java/baritone/command/defaults/SelCommand.java
@@ -19,15 +19,6 @@ package baritone.command.defaults;

 import baritone.Baritone;
 import baritone.api.IBaritone;
-import baritone.api.command.Command;
-import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.datatypes.ForBlockOptionalMeta;
-import baritone.api.command.datatypes.ForDirection;
-import baritone.api.command.datatypes.RelativeBlockPos;
-import baritone.api.command.exception.CommandException;
-import baritone.api.command.exception.CommandInvalidStateException;
-import baritone.api.command.exception.CommandInvalidTypeException;
-import baritone.api.command.helpers.TabCompleteHelper;
 import baritone.api.event.events.RenderEvent;
 import baritone.api.event.listener.AbstractGameEventListener;
 import baritone.api.schematic.*;
@@ -36,6 +27,16 @@ import baritone.api.selection.ISelectionManager;
 import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.BlockOptionalMeta;
 import baritone.api.utils.BlockOptionalMetaLookup;
+import baritone.api.schematic.ISchematic;
+import baritone.api.command.Command;
+import baritone.api.command.datatypes.ForBlockOptionalMeta;
+import baritone.api.command.datatypes.ForDirection;
+import baritone.api.command.datatypes.RelativeBlockPos;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.exception.CommandInvalidStateException;
+import baritone.api.command.exception.CommandInvalidTypeException;
+import baritone.api.command.argument.IArgConsumer;
+import baritone.api.command.helpers.TabCompleteHelper;
 import baritone.utils.IRenderer;
 import net.minecraft.block.Blocks;
 import net.minecraft.util.Direction;
@@ -67,7 +68,7 @@ public class SelCommand extends Command {
                float lineWidth = Baritone.settings().selectionLineWidth.value;
                boolean ignoreDepth = Baritone.settings().renderSelectionIgnoreDepth.value;
                IRenderer.startLines(color, opacity, lineWidth, ignoreDepth);
-                IRenderer.drawAABB(new AxisAlignedBB(pos1, pos1.add(1, 1, 1)));
+                IRenderer.drawAABB(event.getModelViewStack(), new AxisAlignedBB(pos1, pos1.add(1, 1, 1)));
                IRenderer.endLines(ignoreDepth);
            }
        });
--- a/src/main/java/baritone/command/defaults/SetCommand.java
+++ b/src/main/java/baritone/command/defaults/SetCommand.java
@@ -20,13 +20,13 @@ package baritone.command.defaults;
 import baritone.Baritone;
 import baritone.api.IBaritone;
 import baritone.api.Settings;
+import baritone.api.utils.SettingsUtil;
 import baritone.api.command.Command;
-import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.exception.CommandInvalidTypeException;
+import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.helpers.Paginator;
 import baritone.api.command.helpers.TabCompleteHelper;
-import baritone.api.utils.SettingsUtil;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.util.text.TextFormatting;
@@ -39,9 +39,9 @@ import java.util.Locale;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

-import static baritone.api.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX;
 import static baritone.api.utils.SettingsUtil.settingTypeToString;
 import static baritone.api.utils.SettingsUtil.settingValueToString;
+import static baritone.api.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX;

 public class SetCommand extends Command {

--- a/src/main/java/baritone/command/defaults/SurfaceCommand.java
+++ b/src/main/java/baritone/command/defaults/SurfaceCommand.java
@@ -1,89 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.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.AirBlock;
-
-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 AirBlock) {
-            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 AirBlock) && 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/ThisWayCommand.java
+++ b/src/main/java/baritone/command/defaults/ThisWayCommand.java
@@ -18,10 +18,10 @@
 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.GoalXZ;
+import baritone.api.command.Command;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.argument.IArgConsumer;

 import java.util.Arrays;
 import java.util.List;
--- a/src/main/java/baritone/command/defaults/TunnelCommand.java
+++ b/src/main/java/baritone/command/defaults/TunnelCommand.java
@@ -77,7 +77,7 @@ public class TunnelCommand extends Command {
                    default:
                        throw new IllegalStateException("Unexpected value: " + enumFacing);
                }
-                logDirect(String.format("Creating a tunnel %s block(s) high, %s block(s) wide, and %s block(s) deep", height + 1, width + 1, depth));
+                logDirect(String.format("Creating a tunnel %s block(s) high, %s block(s) wide, and %s block(s) deep", height+1, width+1, depth));
                baritone.getBuilderProcess().clearArea(corner1, corner2);
            }
        } else {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Leijurv	2d421e66dc	v1.5.2	2020-03-25 17:51:56 -07:00
Leijurv	e8370f1348	Merge branch '1.14.4' into 1.15.2	2020-03-25 17:51:42 -07:00
Leijurv	e926ff2a16	Merge branch '1.14.4' into 1.15.2	2020-03-14 12:35:33 -07:00
Leijurv	500643aec7	Merge branch '1.14.4' into 1.15.2	2020-03-14 12:25:46 -07:00
Brady	369d726a96	Merge branch '1.14.4' into 1.15.2	2020-03-07 20:45:07 -06:00
Brady	e0bd82d7ff	lol?	2020-03-02 17:15:01 -06:00
Leijurv	5ec4b89caa	Merge branch '1.14.4' into 1.15.2	2020-02-24 19:28:51 -08:00
Leijurv	2d941f6264	Merge branch '1.14.4' into 1.15.2	2020-02-24 19:02:20 -08:00
Leijurv	606e9bf97c	v1.5.1	2020-02-14 15:28:37 -08:00
Leijurv	47ae75a9d6	Merge branch '1.14.4' into 1.15.2	2020-02-14 15:26:34 -08:00
Leijurv	b3ba129fc5	honey is stupid lets just not	2020-02-13 18:59:08 -08:00
Leijurv	746b7b5c88	not unscuffed, just differently scuffed	2020-02-13 18:57:32 -08:00
Brady	db2f6ec78d	Update mappings to 20200213-1.15.1	2020-02-13 14:44:29 -06:00
Leijurv	96bcabff8b	v1.5.0	2020-02-13 12:04:29 -08:00
Leijurv	0a1fe857dc	cant walk through honey blocks	2020-02-13 12:03:09 -08:00
Brady	49aaa55172	Fix click	2020-02-09 13:38:46 -06:00
Leijurv	e03e251541	fix crouching	2020-02-05 17:45:22 -08:00
Leijurv	f5380881f4	brady fix mixins im incompetent	2020-02-05 16:10:55 -08:00
Leijurv	a022778fb6	cursed but fixes blockoptionalmeta	2020-02-05 15:14:32 -08:00
Leijurv	8543a99fba	compiles and can path	2020-02-05 14:54:03 -08:00
Brady	997888fe85	Merge branch '1.14.4' into 1.15.1	2020-01-10 20:15:43 -06:00
Brady	2d2030ecdf	Fix renderGoalXZBeacon	2020-01-10 20:07:33 -06:00
Brady	a3dec3a47e	Render stuff should be fixed now. There is likely a better solution, but I think this is fine in order to keep things in-line with the development over at Mojang.	2020-01-10 19:37:00 -06:00
Brady	eb348120d9	Fix Mixins	2020-01-10 18:59:57 -06:00
Brady	27cb708d40	Fix some render stuff but it's still broken	2020-01-09 20:09:49 -06:00
Leijurv	36bbe430d4	add fixmes	2020-01-09 17:27:28 -08:00
Leijurv	80952e091d	comment out anything that isn't instantly obvious how to fix (e.g. anything involving rendering)	2020-01-09 17:15:05 -08:00