deprecate 1.13.2

Fix SpongePowered Maven repo URL

.gitmessage

@@ -0,0 +1,31 @@
+<emoji> <title> (<ticket>)
+
+# 📝 Update README.md (WD-1234)
+# ✅ Add unit test for inputs (WD-1234)
+
+# <emoji> can be:
+# 🎨 :art: when improving structure of the code
+# ⚡️ :zap: when improving performance
+# 🔥 :fire: when removing code or files
+# ✨ :sparkles: when introducing new features
+# 🚧 :construction: when work in progress
+# 🔨 :hammer: when refactoring code
+# 📝 :memo: when writing docs
+# 💄 :lipstick: when updating the UI and style files
+# 📈 :chart_with_upwards_trend: when adding analytics or tracking code
+# 🌐 :globe_with_meridians: when adding internationalization and localization
+# ✏️ :pencil2: when fixing typos
+# 🚚 :truck: when moving or renaming files
+# ✅ :white_check_mark: when adding tests
+
+# 👌 :ok_hand: when updating code due to code review changes
+# 🐛 :bug: when fixing a bug
+# 🚑 :ambulance: when doing a critical hotfix
+# 🚨 :rotating_light: when removing linter warnings
+
+# 🔀 :twisted_rightwards_arrows: when merging branches
+# ⬆️ :arrow_up: when upgrading dependencies
+# ⬇️ :arrow_down: when downgrading dependencies
+# 🔧 :wrench: when changing configuration files
+# 🔖 :bookmark: when releasing / version tagging
+# 💚 :green_heart: when fixing the CI build

.travis.yml

@@ -10,7 +10,6 @@ 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

Dockerfile

@@ -1,7 +1,5 @@
 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
@@ -10,14 +8,8 @@ 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

README.md

@@ -1,93 +1 @@
-# Baritone
-[![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/)
-
-[![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&utm_medium=referral&utm_content=cabaletta/baritone&utm_campaign=Badge_Grade)
-[![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. 
+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.

SETUP.md

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

USAGE.md

@@ -24,6 +24,8 @@ Watch this [showcase video](https://youtu.be/CZkLXWo4Fg4)!
 
 # Commands
 
+[Tutorial playlist](https://www.youtube.com/playlist?list=PLnwnJ1qsS7CoQl9Si-RTluuzCo_4Oulpa)
+
 **All** of these commands may need a prefix before them, as above ^.
 
 `help`
@@ -38,8 +40,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 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.
+- `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).
 - `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).
@@ -52,7 +54,7 @@ Some common examples:
 - `version` to get the version of Baritone you're running
 - `damn` daniel
 
-For the rest of the commands, you can take a look at the code [here](https://github.com/cabaletta/baritone/blob/master/src/api/java/baritone/api/utils/ExampleBaritoneControl.java).
+For the rest of the commands, you can take a look at the code [here](https://baritone.leijurv.com/baritone/api/Settings.html).
 
 All the settings and documentation are <a href="https://github.com/cabaletta/baritone/blob/master/src/api/java/baritone/api/Settings.java">here</a>. If you find HTML easier to read than Javadoc, you can look <a href="https://baritone.leijurv.com/baritone/api/Settings.html#field.detail">here</a>.
 

build.gradle

@@ -16,7 +16,7 @@
  */
 
 group 'baritone'
-version '1.4.6'
+version '1.3.8'
 
 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: '20190307-1.13.1'
     reobfMappings 'notch'
 
     runs {
@@ -127,8 +127,8 @@ repositories {
     mavenCentral()
 
     maven {
-        name = 'spongepowered-repo'
-        url = 'http://repo.spongepowered.org/maven/'
+        name = 'SpongePowered'
+        url = 'https://repo.spongepowered.org/repository/maven-public/'
     }
 
     maven {
@@ -138,7 +138,7 @@ repositories {
 }
 
 dependencies {
-    minecraft 'com.github.ImpactDevelopment:Vanilla:1.14.4'
+    minecraft 'com.github.ImpactDevelopment:Vanilla:1.13.2'
 
     runtime launchCompile('net.minecraft:launchwrapper:1.12') {
         exclude module: 'lwjgl'
@@ -172,6 +172,12 @@ javadoc {
 
 jar {
     from sourceSets.launch.output, sourceSets.api.output
+
+    if (!getProject().hasProperty("baritone.forge_build")) {
+        exclude "**/BaritoneForgeModXD.class"
+        exclude "**/mods.toml"
+    }
+
     preserveFileTimestamps = false
     reproducibleFileOrder = true
 

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

@@ -22,6 +22,21 @@ 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;
@@ -86,6 +101,101 @@ public class ProguardTask extends BaritoneGradleTask {
         }
     }
 
+    private String getJavaBinPathForProguard() throws Exception {
+        String path;
+        try {
+            path = findJavaPathByGradleConfig();
+            if (path != null) return path;
+        }
+        catch (Exception ex) {
+            System.err.println("Unable to find java by javaCompile options");
+            ex.printStackTrace();
+        }
+
+        try {
+            path = findJavaByJavaHome();
+            if (path != null) return path;
+        }
+        catch(Exception ex) {
+            System.err.println("Unable to find java by JAVA_HOME");
+            ex.printStackTrace();
+        }
+
+
+        path = findJavaByGradleCurrentRuntime();
+        if (path != null) return path;
+        
+        throw new Exception("Unable to find java to determine ProGuard libraryjars. Please specify forkOptions.executable in javaCompile," +
+                " JAVA_HOME environment variable, or make sure to run Gradle with the correct JDK (a v1.8 only)");
+    }
+
+    private String findJavaByGradleCurrentRuntime() {
+        String path = Jvm.current().getJavaExecutable().getAbsolutePath();
+
+        if (this.validateJavaVersion(path)) {
+            System.out.println("Using Gradle's runtime Java for ProGuard");
+            return path;
+        }
+        return null;
+    }
+
+    private String findJavaByJavaHome() {
+        final String javaHomeEnv = System.getenv("JAVA_HOME");
+        if (javaHomeEnv != null) {
+
+            String path = Jvm.forHome(new File(javaHomeEnv)).getJavaExecutable().getAbsolutePath();
+            if (this.validateJavaVersion(path)) {
+                System.out.println("Detected Java path by JAVA_HOME");
+                return path;
+            }
+        }
+        return null;
+    }
+
+    private String findJavaPathByGradleConfig() {
+        final TaskCollection<JavaCompile> javaCompiles = super.getProject().getTasks().withType(JavaCompile.class);
+
+        final JavaCompile compileTask = javaCompiles.iterator().next();
+        final ForkOptions forkOptions = compileTask.getOptions().getForkOptions();
+
+        if (forkOptions != null) {
+            String javacPath = forkOptions.getExecutable();
+            if (javacPath != null) {
+                File javacFile = new File(javacPath);
+                if (javacFile.exists()) {
+                    File[] maybeJava = javacFile.getParentFile().listFiles(new FilenameFilter() {
+                        @Override
+                        public boolean accept(File dir, String name) {
+                            return name.equals("java");
+                        }
+                    });
+
+                    if (maybeJava != null && maybeJava.length > 0) {
+                        String path = maybeJava[0].getAbsolutePath();
+                        if (this.validateJavaVersion(path)) {
+                            System.out.println("Detected Java path by forkOptions");
+                            return path;
+                        }
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    private boolean validateJavaVersion(String java) {
+        final JavaVersion javaVersion = new DefaultJvmVersionDetector(new DefaultExecActionFactory(new IdentityFileResolver())).getJavaVersion(java);
+
+        if (!javaVersion.getMajorVersion().equals("8")) {
+            System.out.println("Failed to validate Java version " + javaVersion.toString() + " [" + java + "] for ProGuard libraryjars");
+            // throw new RuntimeException("Java version incorrect: " + javaVersion.getMajorVersion() + " for " + java);
+            return false;
+        }
+
+        System.out.println("Validated Java version " + javaVersion.toString() + " [" + java + "] for ProGuard libraryjars");
+        return true;
+    }
+
     private void generateConfigs() throws Exception {
         Files.copy(getRelativeFile(PROGUARD_CONFIG_TEMPLATE), getTemporaryFile(PROGUARD_CONFIG_DEST), REPLACE_EXISTING);
 
@@ -95,7 +205,7 @@ public class ProguardTask extends BaritoneGradleTask {
         template.add(1, "-outjars " + this.getTemporaryFile(PROGUARD_EXPORT_PATH));
 
         // Acquire the RT jar using "java -verbose". This doesn't work on Java 9+
-        Process p = new ProcessBuilder("java", "-verbose").start();
+        Process p = new ProcessBuilder(this.getJavaBinPathForProguard(), "-verbose").start();
         String out = IOUtils.toString(p.getInputStream(), "UTF-8").split("\n")[0].split("Opened ")[1].replace("]", "");
         template.add(2, "-libraryjars '" + out + "'");
 

scripts/proguard.pro

@@ -25,6 +25,13 @@
 
 -keep class baritone.api.utils.MyChunkPos { *; } # even in standalone we need to keep this for gson reflect
 
+# Keep any class or member annotated with @KeepName so we dont have to put everything in the script
+-keep,allowobfuscation @interface baritone.KeepName
+-keep @baritone.KeepName class *
+-keepclassmembers class * {
+    @baritone.KeepName *;
+}
+
 # setting names are reflected from field names, so keep field names
 -keepclassmembers class baritone.api.Settings {
     public <fields>;    

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

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 net.minecraft.client.entity.player.ClientPlayerEntity;
 import baritone.api.schematic.ISchematicSystem;
+import net.minecraft.client.entity.EntityPlayerSP;
 
 import java.util.List;
 import java.util.Objects;
@@ -47,19 +47,19 @@ public interface IBaritoneProvider {
      * returned by {@link #getPrimaryBaritone()}.
      *
      * @return All active {@link IBaritone} instances.
-     * @see #getBaritoneForPlayer(ClientPlayerEntity)
+     * @see #getBaritoneForPlayer(EntityPlayerSP)
      */
     List<IBaritone> getAllBaritones();
 
     /**
-     * Provides the {@link IBaritone} instance for a given {@link ClientPlayerEntity}. This will likely be
+     * Provides the {@link IBaritone} instance for a given {@link EntityPlayerSP}. This will likely be
      * replaced with or be overloaded in addition to {@code #getBaritoneForUser(IBaritoneUser)} when
      * {@code bot-system} is merged into {@code master}.
      *
      * @param player The player
      * @return The {@link IBaritone} instance.
      */
-    default IBaritone getBaritoneForPlayer(ClientPlayerEntity player) {
+    default IBaritone getBaritoneForPlayer(EntityPlayerSP player) {
         for (IBaritone baritone : getAllBaritones()) {
             if (Objects.equals(player, baritone.getPlayerContext().player())) {
                 return baritone;

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

@@ -20,8 +20,8 @@ package baritone.api;
 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.TypeUtils;
 import net.minecraft.block.Block;
-import net.minecraft.block.Blocks;
 import net.minecraft.client.Minecraft;
+import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.util.math.Vec3i;
 import net.minecraft.util.text.ITextComponent;
@@ -30,8 +30,8 @@ import java.awt.*;
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-import java.util.*;
 import java.util.List;
+import java.util.*;
 import java.util.function.Consumer;
 
 /**
@@ -61,6 +61,19 @@ public final class Settings {
      */
     public final Setting<Boolean> allowInventory = new Setting<>(false);
 
+    /**
+     * Disable baritone's auto-tool at runtime, but still assume that another mod will provide auto tool functionality
+     * <p>
+     * Specifically, path calculation will still assume that an auto tool will run at execution time, even though
+     * Baritone itself will not do that.
+     */
+    public final Setting<Boolean> assumeExternalAutoTool = new Setting<>(false);
+
+    /**
+     * If this setting is on, no auto tool will occur at all, not at calculation time nor execution time
+     */
+    public final Setting<Boolean> disableAutoTool = new Setting<>(false);
+
     /**
      * It doesn't actually take twenty ticks to place a block, this cost is so high
      * because we want to generally conserve blocks which might be limited.
@@ -178,7 +191,9 @@ public final class Settings {
             Blocks.CRAFTING_TABLE,
             Blocks.FURNACE,
             Blocks.CHEST,
-            Blocks.TRAPPED_CHEST
+            Blocks.TRAPPED_CHEST,
+            Blocks.SIGN,
+            Blocks.WALL_SIGN
     )));
 
     /**
@@ -190,6 +205,15 @@ public final class Settings {
 
     )));
 
+    /**
+     * A list of blocks to become air
+     * <p>
+     * If a schematic asks for a block on this list, only air will be accepted at that location (and nothing on buildIgnoreBlocks)
+     */
+    public final Setting<List<Block>> okIfAir = new Setting<>(new ArrayList<>(Arrays.asList(
+
+    )));
+
     /**
      * If this is true, the builder will treat all non-air blocks as correct. It will only place new blocks.
      */
@@ -432,6 +456,11 @@ public final class Settings {
      */
     public final Setting<Boolean> simplifyUnloadedYCoord = new Setting<>(true);
 
+    /**
+     * Whenever a block changes, repack the whole chunk that it's in
+     */
+    public final Setting<Boolean> repackOnAnyBlockChange = new Setting<>(true);
+
     /**
      * If a movement takes this many ticks more than its initial cost estimate, cancel it
      */
@@ -504,6 +533,18 @@ public final class Settings {
      */
     public final Setting<Boolean> backfill = new Setting<>(false);
 
+    /**
+     * Shows popup message in the upper right corner, similarly to when you make an advancement
+     */
+    public final Setting<Boolean> logAsToast = new Setting<>(false);
+
+    /**
+     * The time of how long the message in the pop-up will display
+     * <p>
+     * If below 1000L (1sec), it's better to disable this
+     */
+    public final Setting<Long> toastTimer = new Setting<>(5000L);
+
     /**
      * Print all the debug messages to chat
      */
@@ -701,6 +742,23 @@ public final class Settings {
      */
     public final Setting<Integer> maxCachedWorldScanCount = new Setting<>(10);
 
+    /**
+     * Sets the minimum y level whilst mining - set to 0 to turn off.
+     */
+    public final Setting<Integer> minYLevelWhileMining = new Setting<>(0);
+
+    /**
+     * This will only allow baritone to mine exposed ores, can be used to stop ore obfuscators on servers that use them.
+     */
+    public final Setting<Boolean> allowOnlyExposedOres = new Setting<>(false);
+
+    /**
+     * When allowOnlyExposedOres is enabled this is the distance around to search.
+     * <p>
+     * It is recommended to keep this value low, as it dramatically increases calculation times.
+     */
+    public final Setting<Integer> allowOnlyExposedOresDistance = new Setting<>(1);
+
     /**
      * When GetToBlock doesn't know any locations for the desired block, explore randomly instead of giving up.
      */
@@ -754,6 +812,17 @@ public final class Settings {
      */
     public final Setting<Boolean> layerOrder = new Setting<>(false);
 
+    /**
+     * Start building the schematic at a specific layer.
+     * Can help on larger builds when schematic wants to break things its already built
+     */
+    public final Setting<Integer> startAtLayer = new Setting<>(0);
+
+    /**
+     * If a layer is unable to be constructed, just skip it.
+     */
+    public final Setting<Boolean> skipFailedLayers = new Setting<>(false);
+
     /**
      * How far to move before repeating the build. 0 to disable repeating on a certain axis, 0,0,0 to disable entirely
      */
@@ -1049,10 +1118,35 @@ public final class Settings {
     public final Setting<Boolean> renderSelectionCorners = new Setting<>(true);
 
     /**
-     * Desktop Notifications
+     * Desktop notifications
      */
     public final Setting<Boolean> desktopNotifications = new Setting<>(false);
 
+    /**
+     * Desktop notification on path complete
+     */
+    public final Setting<Boolean> notificationOnPathComplete = new Setting<>(true);
+
+    /**
+     * Desktop notification on farm fail
+     */
+    public final Setting<Boolean> notificationOnFarmFail = new Setting<>(true);
+
+    /**
+     * Desktop notification on build finished
+     */
+    public final Setting<Boolean> notificationOnBuildFinished = new Setting<>(true);
+
+    /**
+     * Desktop notification on explore finished
+     */
+    public final Setting<Boolean> notificationOnExploreFinished = new Setting<>(true);
+
+    /**
+     * Desktop notification on mine fail
+     */
+    public final Setting<Boolean> notificationOnMineFail = new Setting<>(true);
+
     /**
      * A map of lowercase setting field names to their respective setting
      */

src/api/java/baritone/api/cache/IBlockTypeAccess.java

@@ -17,7 +17,7 @@
 
 package baritone.api.cache;
 
-import net.minecraft.block.BlockState;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.util.math.BlockPos;
 
 /**
@@ -26,9 +26,9 @@ import net.minecraft.util.math.BlockPos;
  */
 public interface IBlockTypeAccess {
 
-    BlockState getBlock(int x, int y, int z);
+    IBlockState getBlock(int x, int y, int z);
 
-    default BlockState getBlock(BlockPos pos) {
+    default IBlockState getBlock(BlockPos pos) {
         return getBlock(pos.getX(), pos.getY(), pos.getZ());
     }
 }

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
      */

src/api/java/baritone/api/command/Command.java

@@ -34,9 +34,8 @@ 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.
  *
- * @see ICommand
- *
  * @author LoganDark
+ * @see ICommand
  */
 public abstract class Command implements ICommand {
 

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
      */

src/api/java/baritone/api/command/argument/IArgConsumer.java

@@ -18,8 +18,6 @@
 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;
@@ -27,7 +25,9 @@ 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 net.minecraft.util.Direction;
+import baritone.api.command.exception.CommandTooManyArgumentsException;
+import baritone.api.utils.Helper;
+import net.minecraft.util.EnumFacing;
 
 import java.util.Deque;
 import java.util.LinkedList;
@@ -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)
@@ -404,8 +404,8 @@ public interface IArgConsumer {
     /**
      * Gets an enum value from the enum class with the same name as the next argument's value
      * <p>
-     * For example if you getEnum as an {@link Direction}, and the next argument's value is "up", this will return
-     * {@link Direction#UP}
+     * For example if you getEnum as an {@link EnumFacing}, and the next argument's value is "up", this will return
+     * {@link EnumFacing#UP}
      *
      * @param enumClass The enum class to search
      * @return An enum constant of that class with the same name as the next argument's value
@@ -419,8 +419,8 @@ public interface IArgConsumer {
     /**
      * Gets an enum value from the enum class with the same name as the next argument's value
      * <p>
-     * For example if you getEnum as an {@link Direction}, and the next argument's value is "up", this will return
-     * {@link Direction#UP}
+     * For example if you getEnum as an {@link EnumFacing}, and the next argument's value is "up", this will return
+     * {@link EnumFacing#UP}
      *
      * @param enumClass The enum class to search
      * @param def       The default value
@@ -436,8 +436,8 @@ public interface IArgConsumer {
     /**
      * Gets an enum value from the enum class with the same name as the next argument's value
      * <p>
-     * For example if you getEnum as an {@link Direction}, and the next argument's value is "up", this will return
-     * {@link Direction#UP}
+     * For example if you getEnum as an {@link EnumFacing}, and the next argument's value is "up", this will return
+     * {@link EnumFacing#UP}
      *
      * @param enumClass The enum class to search
      * @return An enum constant of that class with the same name as the next argument's value, or {@code null} if it
@@ -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)

src/api/java/baritone/api/command/argument/ICommandArgument.java

@@ -19,7 +19,7 @@ package baritone.api.command.argument;
 
 import baritone.api.command.argparser.IArgParser;
 import baritone.api.command.exception.CommandInvalidTypeException;
-import net.minecraft.util.Direction;
+import net.minecraft.util.EnumFacing;
 
 /**
  * A {@link ICommandArgument} is an immutable object representing one command argument. It contains data on the index of
@@ -50,8 +50,8 @@ public interface ICommandArgument {
     /**
      * Gets an enum value from the enum class with the same name as this argument's value
      * <p>
-     * For example if you getEnum as an {@link Direction}, and this argument's value is "up", it will return {@link
-     * Direction#UP}
+     * For example if you getEnum as an {@link EnumFacing}, and this argument's value is "up", it will return {@link
+     * EnumFacing#UP}
      *
      * @param enumClass The enum class to search
      * @return An enum constant of that class with the same name as this argument's value
@@ -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;
 

src/api/java/baritone/api/command/datatypes/BlockById.java

@@ -20,8 +20,9 @@ package baritone.api.command.datatypes;
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
 import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.registry.Registry;
+import net.minecraft.util.registry.IRegistry;
 
 import java.util.stream.Stream;
 
@@ -32,7 +33,7 @@ public enum BlockById implements IDatatypeFor<Block> {
     public Block get(IDatatypeContext ctx) throws CommandException {
         ResourceLocation id = new ResourceLocation(ctx.getConsumer().getString());
         Block block;
-        if ((block = Registry.BLOCK.getValue(id).orElse(null)) == null) {
+        if ((block = IRegistry.BLOCK.get(id)) == Blocks.AIR) {
             throw new IllegalArgumentException("no block found by that id");
         }
         return block;
@@ -42,7 +43,7 @@ public enum BlockById implements IDatatypeFor<Block> {
     public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
         return new TabCompleteHelper()
                 .append(
-                        Registry.BLOCK.keySet()
+                        IRegistry.BLOCK.keySet()
                                 .stream()
                                 .map(Object::toString)
                 )

src/api/java/baritone/api/command/datatypes/EntityClassById.java

@@ -21,7 +21,7 @@ import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
 import net.minecraft.entity.EntityType;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.registry.Registry;
+import net.minecraft.util.registry.IRegistry;
 
 import java.util.stream.Stream;
 
@@ -32,7 +32,7 @@ public enum EntityClassById implements IDatatypeFor<EntityType> {
     public EntityType get(IDatatypeContext ctx) throws CommandException {
         ResourceLocation id = new ResourceLocation(ctx.getConsumer().getString());
         EntityType entity;
-        if ((entity = Registry.ENTITY_TYPE.getValue(id).orElse(null)) == null) {
+        if ((entity = IRegistry.ENTITY_TYPE.get(id)) == null) {
             throw new IllegalArgumentException("no entity found by that id");
         }
         return entity;
@@ -41,7 +41,7 @@ public enum EntityClassById implements IDatatypeFor<EntityType> {
     @Override
     public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
         return new TabCompleteHelper()
-                .append(Registry.ENTITY_TYPE.stream().map(Object::toString))
+                .append(IRegistry.ENTITY_TYPE.stream().map(Object::toString))
                 .filterPrefixNamespaced(ctx.getConsumer().getString())
                 .sortAlphabetically()
                 .stream();

src/api/java/baritone/api/command/datatypes/ForBlockOptionalMeta.java

@@ -17,8 +17,8 @@
 
 package baritone.api.command.datatypes;
 
-import baritone.api.utils.BlockOptionalMeta;
 import baritone.api.command.exception.CommandException;
+import baritone.api.utils.BlockOptionalMeta;
 
 import java.util.stream.Stream;
 

src/api/java/baritone/api/command/datatypes/ForEnumFacing.java

@@ -17,26 +17,26 @@
 
 package baritone.api.command.datatypes;
 
-import baritone.api.command.helpers.TabCompleteHelper;
 import baritone.api.command.exception.CommandException;
-import net.minecraft.util.Direction;
+import baritone.api.command.helpers.TabCompleteHelper;
+import net.minecraft.util.EnumFacing;
 
 import java.util.Locale;
 import java.util.stream.Stream;
 
-public enum ForDirection implements IDatatypeFor<Direction> {
+public enum ForEnumFacing implements IDatatypeFor<EnumFacing> {
     INSTANCE;
 
     @Override
-    public Direction get(IDatatypeContext ctx) throws CommandException {
-        return Direction.valueOf(ctx.getConsumer().getString().toUpperCase(Locale.US));
+    public EnumFacing get(IDatatypeContext ctx) throws CommandException {
+        return EnumFacing.valueOf(ctx.getConsumer().getString().toUpperCase(Locale.US));
     }
 
     @Override
     public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
         return new TabCompleteHelper()
-                .append(Stream.of(Direction.values())
-                        .map(Direction::getName).map(String::toLowerCase))
+                .append(Stream.of(EnumFacing.values())
+                        .map(EnumFacing::getName).map(String::toLowerCase))
                 .filterPrefix(ctx.getConsumer().getString())
                 .stream();
     }

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.helpers.TabCompleteHelper;
 import baritone.api.command.exception.CommandException;
+import baritone.api.command.helpers.TabCompleteHelper;
 
 import java.util.Comparator;
 import java.util.stream.Stream;

src/api/java/baritone/api/command/datatypes/IDatatypeContext.java

@@ -24,9 +24,8 @@ 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.
  *
- * @see IDatatype
- *
  * @author Brady
+ * @see IDatatype
  * @since 9/26/2019
  */
 public interface IDatatypeContext {

src/api/java/baritone/api/command/datatypes/IDatatypeFor.java

@@ -34,11 +34,10 @@ 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;
 }

src/api/java/baritone/api/command/datatypes/NearbyPlayer.java

@@ -20,7 +20,7 @@ package baritone.api.command.datatypes;
 import baritone.api.IBaritone;
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
-import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.text.ITextComponent;
 
 import java.util.List;
@@ -30,11 +30,11 @@ import java.util.stream.Stream;
  * An {@link IDatatype} used to resolve nearby players, those within
  * render distance of the target {@link IBaritone} instance.
  */
-public enum NearbyPlayer implements IDatatypeFor<PlayerEntity> {
+public enum NearbyPlayer implements IDatatypeFor<EntityPlayer> {
     INSTANCE;
 
     @Override
-    public PlayerEntity get(IDatatypeContext ctx) throws CommandException {
+    public EntityPlayer get(IDatatypeContext ctx) throws CommandException {
         final String username = ctx.getConsumer().getString();
         return getPlayers(ctx).stream()
                 .filter(s -> s.getName().getString().equalsIgnoreCase(username))
@@ -44,13 +44,13 @@ public enum NearbyPlayer implements IDatatypeFor<PlayerEntity> {
     @Override
     public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
         return new TabCompleteHelper()
-                .append(getPlayers(ctx).stream().map(PlayerEntity::getName).map(ITextComponent::getString))
+                .append(getPlayers(ctx).stream().map(EntityPlayer::getName).map(ITextComponent::getString))
                 .filterPrefix(ctx.getConsumer().getString())
                 .sortAlphabetically()
                 .stream();
     }
 
-    private static List<? extends PlayerEntity> getPlayers(IDatatypeContext ctx) {
-        return ctx.getBaritone().getPlayerContext().world().getPlayers();
+    private static List<EntityPlayer> getPlayers(IDatatypeContext ctx) {
+        return ctx.getBaritone().getPlayerContext().world().playerEntities;
     }
 }

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.utils.BetterBlockPos;
 import baritone.api.command.exception.CommandException;
+import baritone.api.utils.BetterBlockPos;
 
 import java.util.stream.Stream;
 

src/api/java/baritone/api/command/datatypes/RelativeGoal.java

@@ -18,16 +18,13 @@
 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> {

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;

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;

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;

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();

src/api/java/baritone/api/command/exception/ICommandException.java

@@ -38,8 +38,8 @@ import static baritone.api.utils.Helper.HELPER;
 public interface ICommandException {
 
     /**
-     * @see Exception#getMessage()
      * @return The exception details
+     * @see Exception#getMessage()
      */
     String getMessage();
 

src/api/java/baritone/api/command/helpers/Paginator.java

@@ -17,12 +17,12 @@
 
 package baritone.api.command.helpers;
 
-import baritone.api.utils.Helper;
+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.utils.Helper;
 import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.StringTextComponent;
+import net.minecraft.util.text.TextComponentString;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.util.text.event.ClickEvent;
 import net.minecraft.util.text.event.HoverEvent;
@@ -74,7 +74,7 @@ public class Paginator<E> implements Helper {
         }
         boolean hasPrevPage = commandPrefix != null && validPage(page - 1);
         boolean hasNextPage = commandPrefix != null && validPage(page + 1);
-        ITextComponent prevPageComponent = new StringTextComponent("<<");
+        ITextComponent prevPageComponent = new TextComponentString("<<");
         if (hasPrevPage) {
             prevPageComponent.getStyle()
                     .setClickEvent(new ClickEvent(
@@ -83,12 +83,12 @@ public class Paginator<E> implements Helper {
                     ))
                     .setHoverEvent(new HoverEvent(
                             HoverEvent.Action.SHOW_TEXT,
-                            new StringTextComponent("Click to view previous page")
+                            new TextComponentString("Click to view previous page")
                     ));
         } else {
             prevPageComponent.getStyle().setColor(TextFormatting.DARK_GRAY);
         }
-        ITextComponent nextPageComponent = new StringTextComponent(">>");
+        ITextComponent nextPageComponent = new TextComponentString(">>");
         if (hasNextPage) {
             nextPageComponent.getStyle()
                     .setClickEvent(new ClickEvent(
@@ -97,12 +97,12 @@ public class Paginator<E> implements Helper {
                     ))
                     .setHoverEvent(new HoverEvent(
                             HoverEvent.Action.SHOW_TEXT,
-                            new StringTextComponent("Click to view next page")
+                            new TextComponentString("Click to view next page")
                     ));
         } else {
             nextPageComponent.getStyle().setColor(TextFormatting.DARK_GRAY);
         }
-        ITextComponent pagerComponent = new StringTextComponent("");
+        ITextComponent pagerComponent = new TextComponentString("");
         pagerComponent.getStyle().setColor(TextFormatting.GRAY);
         pagerComponent.appendSibling(prevPageComponent);
         pagerComponent.appendText(" | ");

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.event.events.TabCompleteEvent;
-import baritone.api.utils.SettingsUtil;
 import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.manager.ICommandManager;
+import baritone.api.event.events.TabCompleteEvent;
+import baritone.api.utils.SettingsUtil;
 import net.minecraft.util.ResourceLocation;
 
 import java.util.Comparator;
@@ -236,7 +236,6 @@ 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) {

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

@@ -19,7 +19,7 @@ package baritone.api.event.events;
 
 import baritone.api.event.events.type.EventState;
 import net.minecraft.network.NetworkManager;
-import net.minecraft.network.IPacket;
+import net.minecraft.network.Packet;
 
 /**
  * @author Brady
@@ -31,9 +31,9 @@ public final class PacketEvent {
 
     private final EventState state;
 
-    private final IPacket<?> packet;
+    private final Packet<?> packet;
 
-    public PacketEvent(NetworkManager networkManager, EventState state, IPacket<?> packet) {
+    public PacketEvent(NetworkManager networkManager, EventState state, Packet<?> packet) {
         this.networkManager = networkManager;
         this.state = state;
         this.packet = packet;
@@ -47,12 +47,12 @@ public final class PacketEvent {
         return this.state;
     }
 
-    public final IPacket<?> getPacket() {
+    public final Packet<?> getPacket() {
         return this.packet;
     }
 
     @SuppressWarnings("unchecked")
-    public final <T extends IPacket<?>> T cast() {
+    public final <T extends Packet<?>> T cast() {
         return (T) this.packet;
     }
 }

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

@@ -18,8 +18,7 @@
 package baritone.api.event.events;
 
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.util.math.Vec3d;
+import net.minecraft.entity.EntityLivingBase;
 
 /**
  * @author Brady
@@ -70,14 +69,14 @@ public final class RotationMoveEvent {
         /**
          * Called when the player's motion is updated.
          *
-         * @see Entity#moveRelative(float, Vec3d)
+         * @see Entity#moveRelative(float, float, float, float)
          */
         MOTION_UPDATE,
 
         /**
          * Called when the player jumps.
          *
-         * @see LivingEntity
+         * @see EntityLivingBase#jump
          */
         JUMP
     }

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

@@ -18,7 +18,6 @@
 package baritone.api.event.events;
 
 import baritone.api.event.events.type.Cancellable;
-import baritone.api.event.events.type.Overrideable;
 
 /**
  * @author LoganDark

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

@@ -18,7 +18,7 @@
 package baritone.api.event.events;
 
 import baritone.api.event.events.type.EventState;
-import net.minecraft.client.world.ClientWorld;
+import net.minecraft.client.multiplayer.WorldClient;
 
 /**
  * @author Brady
@@ -29,14 +29,14 @@ public final class WorldEvent {
     /**
      * The new world that is being loaded. {@code null} if being unloaded.
      */
-    private final ClientWorld world;
+    private final WorldClient world;
 
     /**
      * The state of the event
      */
     private final EventState state;
 
-    public WorldEvent(ClientWorld world, EventState state) {
+    public WorldEvent(WorldClient world, EventState state) {
         this.world = world;
         this.state = state;
     }
@@ -44,7 +44,7 @@ public final class WorldEvent {
     /**
      * @return The new world that is being loaded. {@code null} if being unloaded.
      */
-    public final ClientWorld getWorld() {
+    public final WorldClient getWorld() {
         return this.world;
     }
 

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

@@ -19,12 +19,12 @@ package baritone.api.event.listener;
 
 import baritone.api.event.events.*;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.player.ClientPlayerEntity;
-import net.minecraft.client.gui.screen.DeathScreen;
-import net.minecraft.client.world.ClientWorld;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.GuiGameOver;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.multiplayer.WorldClient;
 import net.minecraft.entity.Entity;
-import net.minecraft.network.IPacket;
-import net.minecraft.util.math.Vec3d;
+import net.minecraft.network.Packet;
 
 /**
  * @author Brady
@@ -44,7 +44,7 @@ public interface IGameEventListener {
      * Run once per game tick from before and after the player rotation is sent to the server.
      *
      * @param event The event
-     * @see ClientPlayerEntity#tick()
+     * @see EntityPlayerSP#tick()
      */
     void onPlayerUpdate(PlayerUpdateEvent event);
 
@@ -52,7 +52,7 @@ public interface IGameEventListener {
      * Runs whenever the client player sends a message to the server.
      *
      * @param event The event
-     * @see ClientPlayerEntity#sendChatMessage(String)
+     * @see EntityPlayerSP#sendChatMessage(String)
      */
     void onSendChatMessage(ChatEvent event);
 
@@ -81,7 +81,7 @@ public interface IGameEventListener {
      * Runs before and after whenever a new world is loaded
      *
      * @param event The event
-     * @see Minecraft#loadWorld(ClientWorld)
+     * @see Minecraft#loadWorld(WorldClient, GuiScreen)
      */
     void onWorldEvent(WorldEvent event);
 
@@ -89,7 +89,7 @@ public interface IGameEventListener {
      * Runs before a outbound packet is sent
      *
      * @param event The event
-     * @see IPacket
+     * @see Packet
      */
     void onSendPacket(PacketEvent event);
 
@@ -97,7 +97,7 @@ public interface IGameEventListener {
      * Runs before an inbound packet is processed
      *
      * @param event The event
-     * @see IPacket
+     * @see Packet
      */
     void onReceivePacket(PacketEvent event);
 
@@ -106,15 +106,15 @@ public interface IGameEventListener {
      * and before and after the player jumps.
      *
      * @param event The event
-     * @see Entity#moveRelative(float, Vec3d)
+     * @see Entity#moveRelative(float, float, float, float)
      */
     void onPlayerRotationMove(RotationMoveEvent event);
 
     /**
-     * Called whenever the sprint keybind state is checked in {@link ClientPlayerEntity#livingTick}
+     * Called whenever the sprint keybind state is checked in {@link EntityPlayerSP#livingTick}
      *
      * @param event The event
-     * @see ClientPlayerEntity#livingTick()
+     * @see EntityPlayerSP#livingTick()
      */
     void onPlayerSprintState(SprintStateEvent event);
 
@@ -126,9 +126,9 @@ public interface IGameEventListener {
     void onBlockInteract(BlockInteractEvent event);
 
     /**
-     * Called when the local player dies, as indicated by the creation of the {@link DeathScreen} screen.
+     * Called when the local player dies, as indicated by the creation of the {@link GuiGameOver} screen.
      *
-     * @see DeathScreen
+     * @see GuiGameOver
      */
     void onPlayerDeath();
 

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

@@ -31,7 +31,7 @@ public class GoalRunAway implements Goal {
 
     private final BlockPos[] from;
 
-    private final double distanceSq;
+    private final int distanceSq;
 
     private final Integer maintainY;
 
@@ -44,7 +44,7 @@ public class GoalRunAway implements Goal {
             throw new IllegalArgumentException();
         }
         this.from = from;
-        this.distanceSq = distance * distance;
+        this.distanceSq = (int) (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();
-            double distSq = diffX * diffX + diffZ * diffZ;
+            int distSq = diffX * diffX + diffZ * diffZ;
             if (distSq < distanceSq) {
                 return false;
             }

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

@@ -18,7 +18,7 @@
 package baritone.api.pathing.goals;
 
 import baritone.api.utils.SettingsUtil;
-import net.minecraft.util.Direction;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 
 /**
@@ -32,7 +32,7 @@ public class GoalStrictDirection implements Goal {
     public final int dx;
     public final int dz;
 
-    public GoalStrictDirection(BlockPos origin, Direction direction) {
+    public GoalStrictDirection(BlockPos origin, EnumFacing direction) {
         x = origin.getX();
         y = origin.getY();
         z = origin.getZ();

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

@@ -75,7 +75,7 @@ public interface IBaritoneProcess {
      * to start eating this tick. {@code PauseForAutoEatProcess} should only actually right click once onTick is called with
      * {@code isSafeToCancel} true though.
      *
-     * @return Whethor or not if this control is temporary
+     * @return Whether or not if this control is temporary
      */
     boolean isTemporary();
 

src/api/java/baritone/api/process/IBuilderProcess.java

@@ -18,7 +18,7 @@
 package baritone.api.process;
 
 import baritone.api.schematic.ISchematic;
-import net.minecraft.block.BlockState;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3i;
@@ -71,5 +71,5 @@ public interface IBuilderProcess extends IBaritoneProcess {
      * schematics, for example, to pick a state that the builder process will be happy with, because any variation will
      * cause it to give up. This is updated every tick, but only while the builder process is active.
      */
-    List<BlockState> getApproxPlaceable();
+    List<IBlockState> getApproxPlaceable();
 }

src/api/java/baritone/api/process/IFarmProcess.java

@@ -17,7 +17,29 @@
 
 package baritone.api.process;
 
+import net.minecraft.util.math.BlockPos;
+
 public interface IFarmProcess extends IBaritoneProcess {
 
-    void farm();
+    /**
+     * 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);}
 }

src/api/java/baritone/api/schematic/CompositeSchematic.java

@@ -17,7 +17,7 @@
 
 package baritone.api.schematic;
 
-import net.minecraft.block.BlockState;
+import net.minecraft.block.state.IBlockState;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -47,7 +47,7 @@ public class CompositeSchematic extends AbstractSchematic {
         recalcArr();
     }
 
-    private CompositeSchematicEntry getSchematic(int x, int y, int z, BlockState currentState) {
+    private CompositeSchematicEntry getSchematic(int x, int y, int z, IBlockState currentState) {
         for (CompositeSchematicEntry entry : schematicArr) {
             if (x >= entry.x && y >= entry.y && z >= entry.z &&
                     entry.schematic.inSchematic(x - entry.x, y - entry.y, z - entry.z, currentState)) {
@@ -58,13 +58,13 @@ public class CompositeSchematic extends AbstractSchematic {
     }
 
     @Override
-    public boolean inSchematic(int x, int y, int z, BlockState currentState) {
+    public boolean inSchematic(int x, int y, int z, IBlockState currentState) {
         CompositeSchematicEntry entry = getSchematic(x, y, z, currentState);
         return entry != null && entry.schematic.inSchematic(x - entry.x, y - entry.y, z - entry.z, currentState);
     }
 
     @Override
-    public BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable) {
+    public IBlockState desiredState(int x, int y, int z, IBlockState current, List<IBlockState> approxPlaceable) {
         CompositeSchematicEntry entry = getSchematic(x, y, z, current);
         if (entry == null) {
             throw new IllegalStateException("couldn't find schematic for this position");

src/api/java/baritone/api/schematic/FillSchematic.java

@@ -18,8 +18,8 @@
 package baritone.api.schematic;
 
 import baritone.api.utils.BlockOptionalMeta;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.Blocks;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
 
 import java.util.List;
 
@@ -32,7 +32,7 @@ public class FillSchematic extends AbstractSchematic {
         this.bom = bom;
     }
 
-    public FillSchematic(int x, int y, int z, BlockState state) {
+    public FillSchematic(int x, int y, int z, IBlockState state) {
         this(x, y, z, new BlockOptionalMeta(state.getBlock()));
     }
 
@@ -41,13 +41,13 @@ public class FillSchematic extends AbstractSchematic {
     }
 
     @Override
-    public BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable) {
+    public IBlockState desiredState(int x, int y, int z, IBlockState current, List<IBlockState> approxPlaceable) {
         if (bom.matches(current)) {
             return current;
         } else if (current.getBlock() != Blocks.AIR) {
             return Blocks.AIR.getDefaultState();
         }
-        for (BlockState placeable : approxPlaceable) {
+        for (IBlockState placeable : approxPlaceable) {
             if (bom.matches(placeable)) {
                 return placeable;
             }

src/api/java/baritone/api/schematic/ISchematic.java

@@ -17,8 +17,8 @@
 
 package baritone.api.schematic;
 
-import net.minecraft.block.BlockState;
-import net.minecraft.util.Direction;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.EnumFacing;
 
 import java.util.List;
 
@@ -44,11 +44,11 @@ public interface ISchematic {
      * @param currentState The current state of that block in the world, or null
      * @return Whether or not the specified position is within the bounds of this schematic
      */
-    default boolean inSchematic(int x, int y, int z, BlockState currentState) {
+    default boolean inSchematic(int x, int y, int z, IBlockState currentState) {
         return x >= 0 && x < widthX() && y >= 0 && y < heightY() && z >= 0 && z < lengthZ();
     }
 
-    default int size(Direction.Axis axis) {
+    default int size(EnumFacing.Axis axis) {
         switch (axis) {
             case X:
                 return widthX();
@@ -71,7 +71,7 @@ public interface ISchematic {
      * @param approxPlaceable The list of blockstates estimated to be placeable
      * @return The desired block state at the specified position
      */
-    BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable);
+    IBlockState desiredState(int x, int y, int z, IBlockState current, List<IBlockState> approxPlaceable);
 
     /**
      * @return The width (X axis length) of this schematic

src/api/java/baritone/api/schematic/IStaticSchematic.java

@@ -17,21 +17,20 @@
 
 package baritone.api.schematic;
 
-import net.minecraft.block.BlockState;
+import net.minecraft.block.state.IBlockState;
 
 /**
  * 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 {
 
     /**
-     * Gets the {@link BlockState} for a given position in this schematic. It should be guaranteed
+     * Gets the {@link IBlockState} for a given position in this schematic. It should be guaranteed
      * that the return value of this method will not change given that the parameters are the same.
      *
      * @param x The X block position
@@ -39,19 +38,19 @@ public interface IStaticSchematic extends ISchematic {
      * @param z The Z block position
      * @return The desired state at the specified position.
      */
-    BlockState getDirect(int x, int y, int z);
+    IBlockState getDirect(int x, int y, int z);
 
     /**
-     * Returns an {@link BlockState} array of size {@link #heightY()} which contains all
-     * desired block states in the specified vertical column. The index of {@link BlockState}s
+     * Returns an {@link IBlockState} array of size {@link #heightY()} which contains all
+     * desired block states in the specified vertical column. The index of {@link IBlockState}s
      * in the array are equivalent to their Y position in the schematic.
      *
      * @param x The X column position
      * @param z The Z column position
-     * @return An {@link BlockState} array
+     * @return An {@link IBlockState} array
      */
-    default BlockState[] getColumn(int x, int z) {
-        BlockState[] column = new BlockState[this.heightY()];
+    default IBlockState[] getColumn(int x, int z) {
+        IBlockState[] column = new IBlockState[this.heightY()];
         for (int i = 0; i < this.heightY(); i++) {
             column[i] = getDirect(x, i, z);
         }

src/api/java/baritone/api/schematic/MaskSchematic.java

@@ -17,7 +17,7 @@
 
 package baritone.api.schematic;
 
-import net.minecraft.block.BlockState;
+import net.minecraft.block.state.IBlockState;
 
 import java.util.List;
 
@@ -30,15 +30,15 @@ public abstract class MaskSchematic extends AbstractSchematic {
         this.schematic = schematic;
     }
 
-    protected abstract boolean partOfMask(int x, int y, int z, BlockState currentState);
+    protected abstract boolean partOfMask(int x, int y, int z, IBlockState currentState);
 
     @Override
-    public boolean inSchematic(int x, int y, int z, BlockState currentState) {
+    public boolean inSchematic(int x, int y, int z, IBlockState currentState) {
         return schematic.inSchematic(x, y, z, currentState) && partOfMask(x, y, z, currentState);
     }
 
     @Override
-    public BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable) {
+    public IBlockState desiredState(int x, int y, int z, IBlockState current, List<IBlockState> approxPlaceable) {
         return schematic.desiredState(x, y, z, current, approxPlaceable);
     }
 }

src/api/java/baritone/api/schematic/ReplaceSchematic.java

@@ -18,7 +18,7 @@
 package baritone.api.schematic;
 
 import baritone.api.utils.BlockOptionalMetaLookup;
-import net.minecraft.block.BlockState;
+import net.minecraft.block.state.IBlockState;
 
 public class ReplaceSchematic extends MaskSchematic {
 
@@ -32,7 +32,7 @@ public class ReplaceSchematic extends MaskSchematic {
     }
 
     @Override
-    protected boolean partOfMask(int x, int y, int z, BlockState currentState) {
+    protected boolean partOfMask(int x, int y, int z, IBlockState currentState) {
         if (cache[x][y][z] == null) {
             cache[x][y][z] = filter.has(currentState);
         }

src/api/java/baritone/api/schematic/ShellSchematic.java

@@ -17,7 +17,7 @@
 
 package baritone.api.schematic;
 
-import net.minecraft.block.BlockState;
+import net.minecraft.block.state.IBlockState;
 
 public class ShellSchematic extends MaskSchematic {
 
@@ -26,7 +26,7 @@ public class ShellSchematic extends MaskSchematic {
     }
 
     @Override
-    protected boolean partOfMask(int x, int y, int z, BlockState currentState) {
+    protected boolean partOfMask(int x, int y, int z, IBlockState currentState) {
         return x == 0 || y == 0 || z == 0 || x == widthX() - 1 || y == heightY() - 1 || z == lengthZ() - 1;
     }
 }

src/api/java/baritone/api/schematic/WallsSchematic.java

@@ -17,7 +17,7 @@
 
 package baritone.api.schematic;
 
-import net.minecraft.block.BlockState;
+import net.minecraft.block.state.IBlockState;
 
 public class WallsSchematic extends MaskSchematic {
 
@@ -26,7 +26,7 @@ public class WallsSchematic extends MaskSchematic {
     }
 
     @Override
-    protected boolean partOfMask(int x, int y, int z, BlockState currentState) {
+    protected boolean partOfMask(int x, int y, int z, IBlockState currentState) {
         return x == 0 || z == 0 || x == widthX() - 1 || z == lengthZ() - 1;
     }
 }

src/api/java/baritone/api/selection/ISelection.java

@@ -18,7 +18,7 @@
 package baritone.api.selection;
 
 import baritone.api.utils.BetterBlockPos;
-import net.minecraft.util.Direction;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.Vec3i;
 
@@ -65,7 +65,7 @@ public interface ISelection {
      * @param blocks    How many blocks to expand it.
      * @return A new selection, expanded as specified.
      */
-    ISelection expand(Direction direction, int blocks);
+    ISelection expand(EnumFacing direction, int blocks);
 
     /**
      * Returns a new {@link ISelection} contracted in the specified direction by the specified number of blocks.
@@ -77,7 +77,7 @@ public interface ISelection {
      * @param blocks    How many blocks to contract it.
      * @return A new selection, contracted as specified.
      */
-    ISelection contract(Direction direction, int blocks);
+    ISelection contract(EnumFacing direction, int blocks);
 
     /**
      * Returns a new {@link ISelection} shifted in the specified direction by the specified number of blocks. This moves
@@ -87,5 +87,5 @@ public interface ISelection {
      * @param blocks    How many blocks to shift it.
      * @return A new selection, shifted as specified.
      */
-    ISelection shift(Direction direction, int blocks);
+    ISelection shift(EnumFacing direction, int blocks);
 }

src/api/java/baritone/api/selection/ISelectionManager.java

@@ -18,7 +18,7 @@
 package baritone.api.selection;
 
 import baritone.api.utils.BetterBlockPos;
-import net.minecraft.util.Direction;
+import net.minecraft.util.EnumFacing;
 
 /**
  * The selection manager handles setting Baritone's selections. You can set the selection here, as well as retrieving
@@ -87,7 +87,7 @@ public interface ISelectionManager {
      * @param blocks    How many blocks to expand it.
      * @return The new selection, expanded as specified.
      */
-    ISelection expand(ISelection selection, Direction direction, int blocks);
+    ISelection expand(ISelection selection, EnumFacing direction, int blocks);
 
     /**
      * Replaces the specified {@link ISelection} with one contracted in the specified direction by the specified number
@@ -101,7 +101,7 @@ public interface ISelectionManager {
      * @param blocks    How many blocks to contract it.
      * @return The new selection, contracted as specified.
      */
-    ISelection contract(ISelection selection, Direction direction, int blocks);
+    ISelection contract(ISelection selection, EnumFacing direction, int blocks);
 
     /**
      * Replaces the specified {@link ISelection} with one shifted in the specified direction by the specified number of
@@ -112,5 +112,5 @@ public interface ISelectionManager {
      * @param blocks    How many blocks to shift it.
      * @return The new selection, shifted as specified.
      */
-    ISelection shift(ISelection selection, Direction direction, int blocks);
+    ISelection shift(ISelection selection, EnumFacing direction, int blocks);
 }

src/api/java/baritone/api/utils/BetterBlockPos.java

@@ -17,7 +17,7 @@
 
 package baritone.api.utils;
 
-import net.minecraft.util.Direction;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3i;
@@ -120,10 +120,10 @@ public final class BetterBlockPos extends BlockPos {
         // this is unimaginably faster than blockpos.up
         // that literally calls
         // this.up(1)
-        // which calls this.offset(Direction.UP, 1)
+        // which calls this.offset(EnumFacing.UP, 1)
         // which does return n == 0 ? this : new BlockPos(this.getX() + facing.getXOffset() * n, this.getY() + facing.getYOffset() * n, this.getZ() + facing.getZOffset() * n);
 
-        // how many function calls is that? up(), up(int), offset(Direction, int), new BlockPos, getX, getXOffset, getY, getYOffset, getZ, getZOffset
+        // how many function calls is that? up(), up(int), offset(EnumFacing, int), new BlockPos, getX, getXOffset, getY, getYOffset, getZ, getZOffset
         // that's ten.
         // this is one function call.
         return new BetterBlockPos(x, y + 1, z);
@@ -148,13 +148,13 @@ public final class BetterBlockPos extends BlockPos {
     }
 
     @Override
-    public BetterBlockPos offset(Direction dir) {
+    public BetterBlockPos offset(EnumFacing dir) {
         Vec3i vec = dir.getDirectionVec();
         return new BetterBlockPos(x + vec.getX(), y + vec.getY(), z + vec.getZ());
     }
 
     @Override
-    public BetterBlockPos offset(Direction dir, int dist) {
+    public BetterBlockPos offset(EnumFacing dir, int dist) {
         if (dist == 0) {
             return this;
         }

src/api/java/baritone/api/utils/BlockOptionalMeta.java

@@ -19,34 +19,26 @@ package baritone.api.utils;
 
 import baritone.api.utils.accessor.IItemStack;
 import com.google.common.collect.ImmutableSet;
-import io.netty.util.concurrent.ThreadPerTaskExecutor;
-import net.minecraft.block.*;
-import net.minecraft.item.Item;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.ItemStack;
-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 net.minecraft.util.registry.IRegistry;
 
 import javax.annotation.Nonnull;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.regex.MatchResult;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 public final class BlockOptionalMeta {
 
     private final Block block;
-    private final Set<BlockState> blockstates;
+    private final Set<IBlockState> blockstates;
     private final ImmutableSet<Integer> stateHashes;
     private final ImmutableSet<Integer> stackHashes;
     private static final Pattern pattern = Pattern.compile("^(.+?)(?::(\\d+))?$");
-    private static LootTableManager manager;
-    private static Map<Block, List<Item>> drops = new HashMap<>();
 
     public BlockOptionalMeta(@Nonnull Block block) {
         this.block = block;
@@ -66,36 +58,36 @@ public final class BlockOptionalMeta {
 
         ResourceLocation id = new ResourceLocation(matchResult.group(1));
 
-        if (!Registry.BLOCK.containsKey(id)) {
+        if (!IRegistry.BLOCK.containsKey(id)) {
             throw new IllegalArgumentException("Invalid block ID");
         }
 
-        block = Registry.BLOCK.getValue(id).orElse(null);
+        block = IRegistry.BLOCK.get(id);
         blockstates = getStates(block);
         stateHashes = getStateHashes(blockstates);
         stackHashes = getStackHashes(blockstates);
     }
 
-    private static Set<BlockState> getStates(@Nonnull Block block) {
+    private static Set<IBlockState> getStates(@Nonnull Block block) {
         return new HashSet<>(block.getStateContainer().getValidStates());
     }
 
-    private static ImmutableSet<Integer> getStateHashes(Set<BlockState> blockstates) {
+    private static ImmutableSet<Integer> getStateHashes(Set<IBlockState> blockstates) {
         return ImmutableSet.copyOf(
                 blockstates.stream()
-                        .map(BlockState::hashCode)
+                        .map(IBlockState::hashCode)
                         .toArray(Integer[]::new)
         );
     }
 
-    private static ImmutableSet<Integer> getStackHashes(Set<BlockState> blockstates) {
+    private static ImmutableSet<Integer> getStackHashes(Set<IBlockState> blockstates) {
         //noinspection ConstantConditions
         return ImmutableSet.copyOf(
                 blockstates.stream()
-                        .flatMap(state -> drops(state.getBlock())
-                                .stream()
-                                .map(item -> new ItemStack(item, 1))
-                        )
+                        .map(state -> new ItemStack(
+                                state.getBlock().getItemDropped(state, null, null, 0).asItem(),
+                                1
+                        ))
                         .map(stack -> ((IItemStack) (Object) stack).getBaritoneHash())
                         .toArray(Integer[]::new)
         );
@@ -109,7 +101,7 @@ public final class BlockOptionalMeta {
         return block == this.block;
     }
 
-    public boolean matches(@Nonnull BlockState blockstate) {
+    public boolean matches(@Nonnull IBlockState blockstate) {
         Block block = blockstate.getBlock();
         return block == this.block && stateHashes.contains(blockstate.hashCode());
     }
@@ -128,40 +120,11 @@ public final class BlockOptionalMeta {
         return String.format("BlockOptionalMeta{block=%s}", block);
     }
 
-    public BlockState getAnyBlockState() {
+    public IBlockState getAnyBlockState() {
         if (blockstates.size() > 0) {
             return blockstates.iterator().next();
         }
 
         return null;
     }
-
-    public static LootTableManager getManager() {
-        if (manager == null) {
-            ResourcePackList rpl = new ResourcePackList<>(ResourcePackInfo::new);
-            rpl.addPackFinder(new ServerPackFinder());
-            rpl.reloadPacksFromFinders();
-            IResourcePack thePack = ((ResourcePackInfo) rpl.getAllPacks().iterator().next()).getResourcePack();
-            IReloadableResourceManager resourceManager = new SimpleReloadableResourceManager(ResourcePackType.SERVER_DATA, null);
-            manager = new LootTableManager();
-            resourceManager.addReloadListener(manager);
-            try {
-                resourceManager.reloadResourcesAndThen(new ThreadPerTaskExecutor(Thread::new), new ThreadPerTaskExecutor(Thread::new), Collections.singletonList(thePack), CompletableFuture.completedFuture(Unit.INSTANCE)).get();
-            } catch (Exception exception) {
-                throw new RuntimeException(exception);
-            }
-        }
-        return manager;
-    }
-
-    private static synchronized List<Item> drops(Block b) {
-        return drops.computeIfAbsent(b, block -> {
-            ResourceLocation lootTableLocation = block.getLootTable();
-            if (lootTableLocation == LootTables.EMPTY) {
-                return Collections.emptyList();
-            } else {
-                return getManager().getLootTableFromLocation(lootTableLocation).generate(new LootContext.Builder(null).withRandom(new Random()).withParameter(LootParameters.POSITION, BlockPos.ZERO).withParameter(LootParameters.TOOL, ItemStack.EMPTY).withNullableParameter(LootParameters.BLOCK_ENTITY, null).withParameter(LootParameters.BLOCK_STATE, block.getDefaultState()).build(LootParameterSets.BLOCK)).stream().map(ItemStack::getItem).collect(Collectors.toList());
-            }
-        });
-    }
 }

src/api/java/baritone/api/utils/BlockOptionalMetaLookup.java

@@ -18,7 +18,7 @@
 package baritone.api.utils;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.ItemStack;
 
 import java.util.Arrays;
@@ -61,7 +61,7 @@ public class BlockOptionalMetaLookup {
         return false;
     }
 
-    public boolean has(BlockState state) {
+    public boolean has(IBlockState state) {
         for (BlockOptionalMeta bom : boms) {
             if (bom.matches(state)) {
                 return true;

src/api/java/baritone/api/utils/BlockUtils.java

@@ -19,7 +19,7 @@ package baritone.api.utils;
 
 import net.minecraft.block.Block;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.registry.Registry;
+import net.minecraft.util.registry.IRegistry;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -29,7 +29,7 @@ public class BlockUtils {
     private static transient Map<String, Block> resourceCache = new HashMap<>();
 
     public static String blockToString(Block block) {
-        ResourceLocation loc = Registry.BLOCK.getKey(block);
+        ResourceLocation loc = IRegistry.BLOCK.getKey(block);
         String name = loc.getPath(); // normally, only write the part after the minecraft:
         if (!loc.getNamespace().equals("minecraft")) {
             // Baritone is running on top of forge with mods installed, perhaps?
@@ -57,7 +57,7 @@ public class BlockUtils {
         if (resourceCache.containsKey(name)) {
             return null; // cached as null
         }
-        block = Registry.BLOCK.getValue(ResourceLocation.tryCreate(name.contains(":") ? name : "minecraft:" + name)).orElse(null);
+        block = IRegistry.BLOCK.get(ResourceLocation.tryCreate(name.contains(":") ? name : "minecraft:" + name));
         Map<String, Block> copy = new HashMap<>(resourceCache); // read only copy is safe, wont throw concurrentmodification
         copy.put(name, block);
         resourceCache = copy;

src/api/java/baritone/api/utils/Helper.java

@@ -18,9 +18,10 @@
 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;
+import net.minecraft.util.text.TextComponentString;
 import net.minecraft.util.text.TextFormatting;
 
 import java.util.Arrays;
@@ -50,11 +51,11 @@ public interface Helper {
         // Inner text component
         final Calendar now = Calendar.getInstance();
         final boolean xd = now.get(Calendar.MONTH) == Calendar.APRIL && now.get(Calendar.DAY_OF_MONTH) <= 3;
-        ITextComponent baritone = new StringTextComponent(xd ? "Baritoe" : BaritoneAPI.getSettings().shortBaritonePrefix.value ? "B" : "Baritone");
+        ITextComponent baritone = new TextComponentString(xd ? "Baritoe" : BaritoneAPI.getSettings().shortBaritonePrefix.value ? "B" : "Baritone");
         baritone.getStyle().setColor(TextFormatting.LIGHT_PURPLE);
 
         // Outer brackets
-        ITextComponent prefix = new StringTextComponent("");
+        ITextComponent prefix = new TextComponentString("");
         prefix.getStyle().setColor(TextFormatting.DARK_PURPLE);
         prefix.appendText("[");
         prefix.appendSibling(baritone);
@@ -63,6 +64,35 @@ public interface Helper {
         return prefix;
     }
 
+    /**
+     * Send a message to display as a toast popup
+     *
+     * @param title   The title to display in the popup
+     * @param message The message to display in the popup
+     */
+    default void logToast(ITextComponent title, ITextComponent message) {
+        mc.addScheduledTask(() -> BaritoneToast.addOrUpdate(mc.getToastGui(), title, message, BaritoneAPI.getSettings().toastTimer.value));
+    }
+
+    /**
+     * Send a message to display as a toast popup
+     *
+     * @param title   The title to display in the popup
+     * @param message The message to display in the popup
+     */
+    default void logToast(String title, String message) {
+        logToast(new TextComponentString(title), new TextComponentString(message));
+    }
+
+    /**
+     * Send a message to display as a toast popup
+     *
+     * @param message The message to display in the popup
+     */
+    default void logToast(String message) {
+        logToast(Helper.getPrefix(), new TextComponentString(message));
+    }
+
     /**
      * Send a message to chat only if chatDebug is on
      *
@@ -74,7 +104,31 @@ public interface Helper {
             //System.out.println(message);
             return;
         }
-        logDirect(message);
+        // We won't log debug chat into toasts
+        // Because only a madman would want that extreme spam -_-
+        logDirect(message, false);
+    }
+
+    /**
+     * Send components to chat with the [Baritone] prefix
+     *
+     * @param logAsToast Whether to log as a toast notification
+     * @param components The components to send
+     */
+    default void logDirect(boolean logAsToast, ITextComponent... components) {
+        ITextComponent component = new TextComponentString("");
+        if (!logAsToast) {
+            // If we are not logging as a Toast
+            // Append the prefix to the base component line
+            component.appendSibling(getPrefix());
+            component.appendSibling(new TextComponentString(" "));
+        }
+        Arrays.asList(components).forEach(component::appendSibling);
+        if (logAsToast) {
+            logToast(getPrefix(), component);
+        } else {
+            mc.addScheduledTask(() -> BaritoneAPI.getSettings().logger.value.accept(component));
+        }
     }
 
     /**
@@ -83,11 +137,23 @@ public interface Helper {
      * @param components The components to send
      */
     default void logDirect(ITextComponent... components) {
-        ITextComponent component = new StringTextComponent("");
-        component.appendSibling(getPrefix());
-        component.appendSibling(new StringTextComponent(" "));
-        Arrays.asList(components).forEach(component::appendSibling);
-        mc.execute(() -> BaritoneAPI.getSettings().logger.value.accept(component));
+        logDirect(BaritoneAPI.getSettings().logAsToast.value, components);
+    }
+
+    /**
+     * Send a message to chat regardless of chatDebug (should only be used for critically important messages, or as a
+     * direct response to a chat command)
+     *
+     * @param message    The message to display in chat
+     * @param color      The color to print that message in
+     * @param logAsToast Whether to log as a toast notification
+     */
+    default void logDirect(String message, TextFormatting color, boolean logAsToast) {
+        Stream.of(message.split("\n")).forEach(line -> {
+            ITextComponent component = new TextComponentString(line.replace("\t", "    "));
+            component.getStyle().setColor(color);
+            logDirect(logAsToast, component);
+        });
     }
 
     /**
@@ -98,11 +164,18 @@ public interface Helper {
      * @param color   The color to print that message in
      */
     default void logDirect(String message, TextFormatting color) {
-        Stream.of(message.split("\n")).forEach(line -> {
-            ITextComponent component = new StringTextComponent(line.replace("\t", "    "));
-            component.getStyle().setColor(color);
-            logDirect(component);
-        });
+        logDirect(message, color, BaritoneAPI.getSettings().logAsToast.value);
+    }
+
+    /**
+     * Send a message to chat regardless of chatDebug (should only be used for critically important messages, or as a
+     * direct response to a chat command)
+     *
+     * @param message    The message to display in chat
+     * @param logAsToast Whether to log as a toast notification
+     */
+    default void logDirect(String message, boolean logAsToast) {
+        logDirect(message, TextFormatting.GRAY, logAsToast);
     }
 
     /**
@@ -112,6 +185,6 @@ public interface Helper {
      * @param message The message to display in chat
      */
     default void logDirect(String message) {
-        logDirect(message, TextFormatting.GRAY);
+        logDirect(message, BaritoneAPI.getSettings().logAsToast.value);
     }
 }

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

@@ -18,16 +18,14 @@
 package baritone.api.utils;
 
 import baritone.api.cache.IWorldData;
-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.*;
+import net.minecraft.block.BlockSlab;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 
 import java.util.Optional;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
 
 /**
  * @author Brady
@@ -35,21 +33,12 @@ import java.util.stream.StreamSupport;
  */
 public interface IPlayerContext {
 
-    ClientPlayerEntity player();
+    EntityPlayerSP player();
 
     IPlayerController playerController();
 
     World world();
 
-    default Iterable<Entity> entities() {
-        return ((ClientWorld) world()).getAllEntities();
-    }
-
-    default Stream<Entity> entitiesStream() {
-        return StreamSupport.stream(entities().spliterator(), false);
-    }
-
-
     IWorldData worldData();
 
     RayTraceResult objectMouseOver();
@@ -67,7 +56,7 @@ public interface IPlayerContext {
         // this does not impact performance at all since we're not null checking constantly
         // if there is an exception, the only overhead is Java generating the exception object... so we can ignore it
         try {
-            if (world().getBlockState(feet).getBlock() instanceof SlabBlock) {
+            if (world().getBlockState(feet).getBlock() instanceof BlockSlab) {
                 return feet.up();
             }
         } catch (NullPointerException ignored) {}
@@ -88,7 +77,7 @@ public interface IPlayerContext {
     }
 
     static double eyeHeight(boolean ifSneaking) {
-        return ifSneaking ? 1.27 : 1.62;
+        return ifSneaking ? 1.54 : 1.62;
     }
 
     /**
@@ -98,8 +87,8 @@ public interface IPlayerContext {
      */
     default Optional<BlockPos> getSelectedBlock() {
         RayTraceResult result = objectMouseOver();
-        if (result != null && result.getType() == RayTraceResult.Type.BLOCK) {
-            return Optional.of(((BlockRayTraceResult) result).getPos());
+        if (result != null && result.type == RayTraceResult.Type.BLOCK) {
+            return Optional.of(result.getBlockPos());
         }
         return Optional.empty();
     }
@@ -107,17 +96,4 @@ public interface IPlayerContext {
     default boolean isLookingAt(BlockPos pos) {
         return getSelectedBlock().equals(Optional.of(pos));
     }
-
-    /**
-     * Returns the entity that the crosshair is currently placed over. Updated once per tick.
-     *
-     * @return The entity
-     */
-    default Optional<Entity> getSelectedEntity() {
-        RayTraceResult result = objectMouseOver();
-        if (result != null && result.getType() == RayTraceResult.Type.ENTITY) {
-            return Optional.of(((EntityRayTraceResult) result).getEntity());
-        }
-        return Optional.empty();
-    }
 }

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

@@ -17,16 +17,16 @@
 
 package baritone.api.utils;
 
-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.client.entity.EntityPlayerSP;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.ClickType;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.ActionResultType;
-import net.minecraft.util.Direction;
-import net.minecraft.util.Hand;
+import net.minecraft.util.EnumActionResult;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.BlockRayTraceResult;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.GameType;
 import net.minecraft.world.World;
 
@@ -40,19 +40,19 @@ public interface IPlayerController {
 
     boolean hasBrokenBlock();
 
-    boolean onPlayerDamageBlock(BlockPos pos, Direction side);
+    boolean onPlayerDamageBlock(BlockPos pos, EnumFacing side);
 
     void resetBlockRemoving();
 
-    ItemStack windowClick(int windowId, int slotId, int mouseButton, ClickType type, PlayerEntity player);
+    ItemStack windowClick(int windowId, int slotId, int mouseButton, ClickType type, EntityPlayer player);
 
     GameType getGameType();
 
-    ActionResultType processRightClickBlock(ClientPlayerEntity player, World world, Hand hand, BlockRayTraceResult result);
+    EnumActionResult processRightClickBlock(EntityPlayerSP player, World world, BlockPos pos, EnumFacing direction, Vec3d vec, EnumHand hand);
 
-    ActionResultType processRightClick(ClientPlayerEntity player, World world, Hand hand);
+    EnumActionResult processRightClick(EntityPlayerSP player, World world, EnumHand hand);
 
-    boolean clickBlock(BlockPos loc, Direction face);
+    boolean clickBlock(BlockPos loc, EnumFacing face);
 
     void setHittingBlock(boolean hittingBlock);
 

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

@@ -18,7 +18,7 @@
 package baritone.api.utils;
 
 import net.minecraft.entity.Entity;
-import net.minecraft.util.math.RayTraceContext;
+import net.minecraft.util.math.RayTraceFluidMode;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.math.Vec3d;
 
@@ -57,7 +57,7 @@ public final class RayTraceUtils {
                 direction.y * blockReachDistance,
                 direction.z * blockReachDistance
         );
-        return entity.world.rayTraceBlocks(new RayTraceContext(start, end, RayTraceContext.BlockMode.OUTLINE, RayTraceContext.FluidMode.NONE, entity));
+        return entity.world.rayTraceBlocks(start, end, RayTraceFluidMode.NEVER, false, true);
     }
 
     public static Vec3d inferSneakingEyePosition(Entity entity) {

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

@@ -19,12 +19,15 @@ package baritone.api.utils;
 
 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.FireBlock;
-import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.block.BlockFire;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.Direction;
-import net.minecraft.util.math.*;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.math.shapes.VoxelShape;
 import net.minecraft.util.math.shapes.VoxelShapes;
 
@@ -137,7 +140,7 @@ public final class RotationUtils {
      * @param ctx Context for the viewing entity
      * @param pos The target block position
      * @return The optional rotation
-     * @see #reachable(ClientPlayerEntity, BlockPos, double)
+     * @see #reachable(EntityPlayerSP, BlockPos, double)
      */
     public static Optional<Rotation> reachable(IPlayerContext ctx, BlockPos pos) {
         return reachable(ctx.player(), pos, ctx.playerController().getBlockReachDistance());
@@ -159,11 +162,11 @@ public final class RotationUtils {
      * @param blockReachDistance The block reach distance of the entity
      * @return The optional rotation
      */
-    public static Optional<Rotation> reachable(ClientPlayerEntity entity, BlockPos pos, double blockReachDistance) {
+    public static Optional<Rotation> reachable(EntityPlayerSP entity, BlockPos pos, double blockReachDistance) {
         return reachable(entity, pos, blockReachDistance, false);
     }
 
-    public static Optional<Rotation> reachable(ClientPlayerEntity entity, BlockPos pos, double blockReachDistance, boolean wouldSneak) {
+    public static Optional<Rotation> reachable(EntityPlayerSP entity, BlockPos pos, double blockReachDistance, boolean wouldSneak) {
         IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer(entity);
         if (baritone.getPlayerContext().isLookingAt(pos)) {
             /*
@@ -180,7 +183,7 @@ public final class RotationUtils {
             if (wouldSneak) {
                 // the concern here is: what if we're looking at it now, but as soon as we start sneaking we no longer are
                 RayTraceResult result = RayTraceUtils.rayTraceTowards(entity, hypothetical, blockReachDistance, true);
-                if (result != null && result.getType() == RayTraceResult.Type.BLOCK && ((BlockRayTraceResult) result).getPos().equals(pos)) {
+                if (result != null && result.type == RayTraceResult.Type.BLOCK && result.getBlockPos().equals(pos)) {
                     return Optional.of(hypothetical); // yes, if we sneaked we would still be looking at the block
                 }
             } else {
@@ -193,15 +196,15 @@ public final class RotationUtils {
             return possibleRotation;
         }
 
-        BlockState state = entity.world.getBlockState(pos);
+        IBlockState state = entity.world.getBlockState(pos);
         VoxelShape shape = state.getShape(entity.world, pos);
         if (shape.isEmpty()) {
             shape = VoxelShapes.fullCube();
         }
         for (Vec3d sideOffset : BLOCK_SIDE_MULTIPLIERS) {
-            double xDiff = shape.getStart(Direction.Axis.X) * sideOffset.x + shape.getEnd(Direction.Axis.X) * (1 - sideOffset.x);
-            double yDiff = shape.getStart(Direction.Axis.Y) * sideOffset.y + shape.getEnd(Direction.Axis.Y) * (1 - sideOffset.y);
-            double zDiff = shape.getStart(Direction.Axis.Z) * sideOffset.z + shape.getEnd(Direction.Axis.Z) * (1 - sideOffset.z);
+            double xDiff = shape.getStart(EnumFacing.Axis.X) * sideOffset.x + shape.getEnd(EnumFacing.Axis.X) * (1 - sideOffset.x);
+            double yDiff = shape.getStart(EnumFacing.Axis.Y) * sideOffset.y + shape.getEnd(EnumFacing.Axis.Y) * (1 - sideOffset.y);
+            double zDiff = shape.getStart(EnumFacing.Axis.Z) * sideOffset.z + shape.getEnd(EnumFacing.Axis.Z) * (1 - sideOffset.z);
             possibleRotation = reachableOffset(entity, pos, new Vec3d(pos).add(xDiff, yDiff, zDiff), blockReachDistance, wouldSneak);
             if (possibleRotation.isPresent()) {
                 return possibleRotation;
@@ -226,11 +229,11 @@ public final class RotationUtils {
         Rotation rotation = calcRotationFromVec3d(eyes, offsetPos, new Rotation(entity.rotationYaw, entity.rotationPitch));
         RayTraceResult result = RayTraceUtils.rayTraceTowards(entity, rotation, blockReachDistance, wouldSneak);
         //System.out.println(result);
-        if (result != null && result.getType() == RayTraceResult.Type.BLOCK) {
-            if (((BlockRayTraceResult) result).getPos().equals(pos)) {
+        if (result != null && result.type == RayTraceResult.Type.BLOCK) {
+            if (result.getBlockPos().equals(pos)) {
                 return Optional.of(rotation);
             }
-            if (entity.world.getBlockState(pos).getBlock() instanceof FireBlock && ((BlockRayTraceResult) result).getPos().equals(pos.down())) {
+            if (entity.world.getBlockState(pos).getBlock() instanceof BlockFire && result.getBlockPos().equals(pos.down())) {
                 return Optional.of(rotation);
             }
         }

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

@@ -22,10 +22,10 @@ import baritone.api.Settings;
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.Item;
-import net.minecraft.util.Direction;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.Vec3i;
-import net.minecraft.util.registry.Registry;
+import net.minecraft.util.registry.IRegistry;
 
 import java.awt.*;
 import java.io.BufferedReader;
@@ -218,7 +218,7 @@ public class SettingsUtil {
         FLOAT(Float.class, Float::parseFloat),
         LONG(Long.class, Long::parseLong),
         STRING(String.class, String::new),
-        DIRECTION(Direction.class, Direction::byName),
+        ENUMFACING(EnumFacing.class, EnumFacing::byName),
         COLOR(
                 Color.class,
                 str -> new Color(Integer.parseInt(str.split(",")[0]), Integer.parseInt(str.split(",")[1]), Integer.parseInt(str.split(",")[2])),
@@ -236,8 +236,8 @@ public class SettingsUtil {
         ),
         ITEM(
                 Item.class,
-                str -> Registry.ITEM.getOrDefault(new ResourceLocation(str.trim())), // TODO this now returns AIR on failure instead of null, is that an issue?
-                item -> Registry.ITEM.getKey(item).toString()
+                str -> IRegistry.ITEM.get(new ResourceLocation(str.trim())),
+                item -> IRegistry.ITEM.getKey(item).toString()
         ),
         LIST() {
             @Override

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

@@ -17,10 +17,10 @@
 
 package baritone.api.utils;
 
-import net.minecraft.block.BlockState;
-import net.minecraft.block.FireBlock;
+import net.minecraft.block.BlockFire;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.Direction;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.math.shapes.VoxelShape;
@@ -43,18 +43,18 @@ public final class VecUtils {
      * @see #getBlockPosCenter(BlockPos)
      */
     public static Vec3d calculateBlockCenter(World world, BlockPos pos) {
-        BlockState b = world.getBlockState(pos);
+        IBlockState b = world.getBlockState(pos);
         VoxelShape shape = b.getCollisionShape(world, pos);
         if (shape.isEmpty()) {
             return getBlockPosCenter(pos);
         }
-        double xDiff = (shape.getStart(Direction.Axis.X) + shape.getEnd(Direction.Axis.X)) / 2;
-        double yDiff = (shape.getStart(Direction.Axis.Y) + shape.getEnd(Direction.Axis.Y)) / 2;
-        double zDiff = (shape.getStart(Direction.Axis.Z) + shape.getEnd(Direction.Axis.Z)) / 2;
+        double xDiff = (shape.getStart(EnumFacing.Axis.X) + shape.getEnd(EnumFacing.Axis.X)) / 2;
+        double yDiff = (shape.getStart(EnumFacing.Axis.Y) + shape.getEnd(EnumFacing.Axis.Y)) / 2;
+        double zDiff = (shape.getStart(EnumFacing.Axis.Z) + shape.getEnd(EnumFacing.Axis.Z)) / 2;
         if (Double.isNaN(xDiff) || Double.isNaN(yDiff) || Double.isNaN(zDiff)) {
             throw new IllegalStateException(b + " " + pos + " " + shape);
         }
-        if (b.getBlock() instanceof FireBlock) {//look at bottom of fire when putting it out
+        if (b.getBlock() instanceof BlockFire) {//look at bottom of fire when putting it out
             yDiff = 0;
         }
         return new Vec3d(

src/api/java/baritone/api/utils/gui/BaritoneToast.java

@@ -0,0 +1,74 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.api.utils.gui;
+
+import net.minecraft.client.gui.toasts.GuiToast;
+import net.minecraft.client.gui.toasts.IToast;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.text.ITextComponent;
+
+public class BaritoneToast implements IToast {
+    private String title;
+    private String subtitle;
+    private long firstDrawTime;
+    private boolean newDisplay;
+    private long totalShowTime;
+
+    public BaritoneToast(ITextComponent titleComponent, ITextComponent subtitleComponent, long totalShowTime) {
+        this.title = titleComponent.getFormattedText();
+        this.subtitle = subtitleComponent == null ? null : subtitleComponent.getFormattedText();
+        this.totalShowTime = totalShowTime;
+    }
+
+    public Visibility draw(GuiToast toastGui, long delta) {
+        if (this.newDisplay) {
+            this.firstDrawTime = delta;
+            this.newDisplay = false;
+        }
+
+        toastGui.getMinecraft().getTextureManager().bindTexture(new ResourceLocation("textures/gui/toasts.png"));
+        GlStateManager.color4f(1.0F, 1.0F, 1.0F, 255.0f);
+        toastGui.drawTexturedModalRect(0, 0, 0, 32, 160, 32);
+
+        if (this.subtitle == null) {
+            toastGui.getMinecraft().fontRenderer.drawString(this.title, 18, 12, -11534256);
+        } else {
+            toastGui.getMinecraft().fontRenderer.drawString(this.title, 18, 7, -11534256);
+            toastGui.getMinecraft().fontRenderer.drawString(this.subtitle, 18, 18, -16777216);
+        }
+
+        return delta - this.firstDrawTime < totalShowTime ? Visibility.SHOW : Visibility.HIDE;
+    }
+
+    public void setDisplayedText(ITextComponent titleComponent, ITextComponent subtitleComponent) {
+        this.title = titleComponent.getFormattedText();
+        this.subtitle = subtitleComponent == null ? null : subtitleComponent.getFormattedText();
+        this.newDisplay = true;
+    }
+
+    public static void addOrUpdate(GuiToast toast, ITextComponent title, ITextComponent subtitle, long totalShowTime) {
+        BaritoneToast baritonetoast = toast.getToast(BaritoneToast.class, new Object());
+
+        if (baritonetoast == null) {
+            toast.add(new BaritoneToast(title, subtitle, totalShowTime));
+        } else {
+            baritonetoast.setDisplayedText(title, subtitle);
+        }
+    }
+}

src/launch/java/baritone/launch/mixins/MixinAnvilChunkLoader.java

@@ -17,32 +17,27 @@
 
 package baritone.launch.mixins;
 
-import baritone.utils.accessor.IEntityRenderManager;
-import net.minecraft.client.renderer.entity.EntityRendererManager;
+import baritone.utils.accessor.IAnvilChunkLoader;
+import net.minecraft.world.chunk.storage.AnvilChunkLoader;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
-@Mixin(EntityRendererManager.class)
-public class MixinEntityRenderManager implements IEntityRenderManager {
+import java.io.File;
+
+/**
+ * @author Brady
+ * @since 9/4/2018
+ */
+@Mixin(AnvilChunkLoader.class)
+public class MixinAnvilChunkLoader implements IAnvilChunkLoader {
+
     @Shadow
-    private double renderPosX;
-    @Shadow
-    private double renderPosY;
-    @Shadow
-    private double renderPosZ;
+    @Final
+    private File chunkSaveLocation;
 
     @Override
-    public double renderPosX() {
-        return renderPosX;
-    }
-
-    @Override
-    public double renderPosY() {
-        return renderPosY;
-    }
-
-    @Override
-    public double renderPosZ() {
-        return renderPosZ;
+    public File getChunkSaveLocation() {
+        return this.chunkSaveLocation;
     }
 }

src/launch/java/baritone/launch/mixins/MixinBlockStateContainer.java

@@ -19,7 +19,7 @@ package baritone.launch.mixins;
 
 import baritone.utils.accessor.IBitArray;
 import baritone.utils.accessor.IBlockStateContainer;
-import net.minecraft.block.BlockState;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.util.BitArray;
 import net.minecraft.world.chunk.BlockStateContainer;
 import net.minecraft.world.chunk.IBlockStatePalette;
@@ -33,10 +33,10 @@ public abstract class MixinBlockStateContainer implements IBlockStateContainer {
     protected BitArray storage;
 
     @Shadow
-    protected IBlockStatePalette<BlockState> palette;
+    protected IBlockStatePalette<IBlockState> palette;
 
     @Override
-    public BlockState getAtPalette(int index) {
+    public IBlockState getAtPalette(int index) {
         return palette.get(index);
     }
 

src/launch/java/baritone/launch/mixins/MixinChunkArray.java

@@ -1,92 +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.launch.mixins;
-
-import baritone.utils.accessor.IChunkArray;
-import net.minecraft.util.math.ChunkPos;
-import net.minecraft.world.chunk.Chunk;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-import java.util.concurrent.atomic.AtomicReferenceArray;
-
-@Mixin(targets = "net.minecraft.client.multiplayer.ClientChunkProvider$ChunkArray")
-public abstract class MixinChunkArray implements IChunkArray {
-    @Shadow
-    private AtomicReferenceArray<Chunk> chunks;
-    @Shadow
-    private int viewDistance;
-    @Shadow
-    private int sideLength;
-    @Shadow
-    private int centerX;
-    @Shadow
-    private int centerZ;
-    @Shadow
-    private int loaded;
-
-    @Shadow
-    protected abstract boolean inView(int x, int z);
-
-    @Shadow
-    protected abstract int getIndex(int x, int z);
-
-    @Shadow
-    protected abstract void replace(int index, Chunk chunk);
-
-    @Override
-    public int centerX() {
-        return centerX;
-    }
-
-    @Override
-    public int centerZ() {
-        return centerZ;
-    }
-
-    @Override
-    public int viewDistance() {
-        return viewDistance;
-    }
-
-    @Override
-    public AtomicReferenceArray<Chunk> getChunks() {
-        return chunks;
-    }
-
-    @Override
-    public void copyFrom(IChunkArray other) {
-        centerX = other.centerX();
-        centerZ = other.centerZ();
-
-        AtomicReferenceArray<Chunk> copyingFrom = other.getChunks();
-        for (int k = 0; k < copyingFrom.length(); ++k) {
-            Chunk chunk = copyingFrom.get(k);
-            if (chunk != null) {
-                ChunkPos chunkpos = chunk.getPos();
-                if (inView(chunkpos.x, chunkpos.z)) {
-                    int index = getIndex(chunkpos.x, chunkpos.z);
-                    if (chunks.get(index) != null) {
-                        throw new IllegalStateException("Doing this would mutate the client's REAL loaded chunks?!");
-                    }
-                    replace(index, chunk);
-                }
-            }
-        }
-    }
-}

src/launch/java/baritone/launch/mixins/MixinChunkProviderClient.java

@@ -0,0 +1,39 @@
+/*
+ * 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.launch.mixins;
+
+import baritone.utils.accessor.IChunkProviderClient;
+import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
+import net.minecraft.client.multiplayer.ChunkProviderClient;
+import net.minecraft.world.chunk.Chunk;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+@Mixin(ChunkProviderClient.class)
+public class MixinChunkProviderClient implements IChunkProviderClient {
+
+    @Shadow
+    @Final
+    private Long2ObjectMap<Chunk> loadedChunks;
+
+    @Override
+    public Long2ObjectMap<Chunk> loadedChunks() {
+        return this.loadedChunks;
+    }
+}

src/launch/java/baritone/launch/mixins/MixinChunkProviderServer.java

@@ -0,0 +1,42 @@
+/*
+ * 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.launch.mixins;
+
+import baritone.utils.accessor.IChunkProviderServer;
+import net.minecraft.world.chunk.storage.IChunkLoader;
+import net.minecraft.world.gen.ChunkProviderServer;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+/**
+ * @author Brady
+ * @since 9/4/2018
+ */
+@Mixin(ChunkProviderServer.class)
+public class MixinChunkProviderServer implements IChunkProviderServer {
+
+    @Shadow
+    @Final
+    private IChunkLoader chunkLoader;
+
+    @Override
+    public IChunkLoader getChunkLoader() {
+        return this.chunkLoader;
+    }
+}

src/launch/java/baritone/launch/mixins/MixinChunkRenderContainer.java

@@ -0,0 +1,55 @@
+/*
+ * 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.launch.mixins;
+
+import baritone.Baritone;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.ChunkRenderContainer;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.chunk.RenderChunk;
+import net.minecraft.util.math.BlockPos;
+import org.lwjgl.opengl.GL14;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import static org.lwjgl.opengl.GL11.GL_ONE;
+import static org.lwjgl.opengl.GL11.GL_ZERO;
+import static org.lwjgl.opengl.GL14.GL_CONSTANT_ALPHA;
+import static org.lwjgl.opengl.GL14.GL_ONE_MINUS_CONSTANT_ALPHA;
+
+@Mixin(ChunkRenderContainer.class)
+public class MixinChunkRenderContainer {
+
+    @Redirect( // avoid creating CallbackInfo at all costs; this is called 40k times per second
+            method = "preRenderChunk",
+            at = @At(
+                    value = "INVOKE",
+                    target = "net/minecraft/client/renderer/chunk/RenderChunk.getPosition()Lnet/minecraft/util/math/BlockPos;"
+            )
+    )
+    private BlockPos getPosition(RenderChunk renderChunkIn) {
+        if (Baritone.settings().renderCachedChunks.value && !Minecraft.getInstance().isSingleplayer() && Minecraft.getInstance().world.getChunk(renderChunkIn.getPosition()).isEmpty()) {
+            GlStateManager.enableAlphaTest();
+            GlStateManager.enableBlend();
+            GL14.glBlendColor(0, 0, 0, Baritone.settings().cachedChunksOpacity.value);
+            GlStateManager.blendFuncSeparate(GL_CONSTANT_ALPHA, GL_ONE_MINUS_CONSTANT_ALPHA, GL_ONE, GL_ZERO);
+        }
+        return renderChunkIn.getPosition();
+    }
+}

src/launch/java/baritone/launch/mixins/MixinChunkRenderWorker.java

@@ -0,0 +1,57 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.launch.mixins;
+
+import baritone.Baritone;
+import baritone.api.BaritoneAPI;
+import baritone.api.utils.IPlayerContext;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.chunk.ChunkRenderWorker;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(ChunkRenderWorker.class)
+public abstract class MixinChunkRenderWorker {
+
+    @Shadow
+    protected abstract boolean isChunkExisting(BlockPos pos, World worldIn);
+
+    @Redirect(
+            method = "processTask",
+            at = @At(
+                    value = "INVOKE",
+                    target = "net/minecraft/client/renderer/chunk/ChunkRenderWorker.isChunkExisting(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/World;)Z"
+            )
+    )
+    private boolean isChunkExisting(ChunkRenderWorker worker, BlockPos pos, World world) {
+        if (Baritone.settings().renderCachedChunks.value && !Minecraft.getInstance().isSingleplayer()) {
+            Baritone baritone = (Baritone) BaritoneAPI.getProvider().getPrimaryBaritone();
+            IPlayerContext ctx = baritone.getPlayerContext();
+            if (ctx.player() != null && ctx.world() != null && baritone.bsi != null) {
+                return baritone.bsi.isLoaded(pos.getX(), pos.getZ()) || this.isChunkExisting(pos, world);
+            }
+        }
+
+        return this.isChunkExisting(pos, world);
+    }
+}
+

src/launch/java/baritone/launch/mixins/MixinClientChunkProvider.java

@@ -1,61 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.launch.mixins;
-
-import baritone.utils.accessor.IChunkArray;
-import baritone.utils.accessor.IClientChunkProvider;
-import net.minecraft.client.multiplayer.ClientChunkProvider;
-import net.minecraft.client.world.ClientWorld;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-import java.lang.reflect.Field;
-import java.util.Arrays;
-
-@Mixin(ClientChunkProvider.class)
-public class MixinClientChunkProvider implements IClientChunkProvider {
-
-    @Shadow
-    private ClientWorld world;
-
-    @Override
-    public ClientChunkProvider createThreadSafeCopy() {
-        IChunkArray arr = extractReferenceArray();
-        ClientChunkProvider result = new ClientChunkProvider(world, arr.viewDistance() - 3); // -3 because its adds 3 for no reason lmao
-        IChunkArray copyArr = ((IClientChunkProvider) result).extractReferenceArray();
-        copyArr.copyFrom(arr);
-        if (copyArr.viewDistance() != arr.viewDistance()) {
-            throw new IllegalStateException(copyArr.viewDistance() + " " + arr.viewDistance());
-        }
-        return result;
-    }
-
-    @Override
-    public IChunkArray extractReferenceArray() {
-        for (Field f : ClientChunkProvider.class.getDeclaredFields()) {
-            if (IChunkArray.class.isAssignableFrom(f.getType())) {
-                try {
-                    return (IChunkArray) f.get(this);
-                } catch (IllegalAccessException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-        }
-        throw new RuntimeException(Arrays.toString(ClientChunkProvider.class.getDeclaredFields()));
-    }
-}

src/launch/java/baritone/launch/mixins/MixinClientPlayNetHandler.java

@@ -1,130 +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.launch.mixins;
-
-import baritone.api.BaritoneAPI;
-import baritone.api.IBaritone;
-import baritone.api.event.events.ChunkEvent;
-import baritone.api.event.events.type.EventState;
-import net.minecraft.client.entity.player.ClientPlayerEntity;
-import net.minecraft.client.network.play.ClientPlayNetHandler;
-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;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-/**
- * @author Brady
- * @since 8/3/2018
- */
-@Mixin(ClientPlayNetHandler.class)
-public class MixinClientPlayNetHandler {
-
-    // unused lol
-    /*@Inject(
-            method = "handleChunkData",
-            at = @At(
-                    value = "INVOKE",
-                    target = "net/minecraft/client/multiplayer/ChunkProviderClient.func_212474_a(IILnet/minecraft/network/PacketBuffer;IZ)Lnet/minecraft/world/chunk/Chunk;"
-            )
-    )
-    private void preRead(SPacketChunkData packetIn, CallbackInfo ci) {
-        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.PRE,
-                                packetIn.isFullChunk() ? ChunkEvent.Type.POPULATE_FULL : ChunkEvent.Type.POPULATE_PARTIAL,
-                                packetIn.getChunkX(),
-                                packetIn.getChunkZ()
-                        )
-                );
-            }
-        }
-    }*/
-
-    @Inject(
-            method = "handleChunkData",
-            at = @At("RETURN")
-    )
-    private void postHandleChunkData(SChunkDataPacket packetIn, CallbackInfo ci) {
-        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,
-                                packetIn.isFullChunk() ? ChunkEvent.Type.POPULATE_FULL : ChunkEvent.Type.POPULATE_PARTIAL,
-                                packetIn.getChunkX(),
-                                packetIn.getChunkZ()
-                        )
-                );
-            }
-        }
-    }
-
-    @Inject(
-            method = "processChunkUnload",
-            at = @At("HEAD")
-    )
-    private void preChunkUnload(SUnloadChunkPacket packet, CallbackInfo ci) {
-        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.PRE, ChunkEvent.Type.UNLOAD, packet.getX(), packet.getZ())
-                );
-            }
-        }
-    }
-
-    @Inject(
-            method = "processChunkUnload",
-            at = @At("RETURN")
-    )
-    private void postChunkUnload(SUnloadChunkPacket packet, CallbackInfo ci) {
-        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.UNLOAD, packet.getX(), packet.getZ())
-                );
-            }
-        }
-    }
-
-    @Inject(
-            method = "handleCombatEvent",
-            at = @At(
-                    value = "INVOKE",
-                    target = "net/minecraft/client/Minecraft.displayGuiScreen(Lnet/minecraft/client/gui/screen/Screen;)V"
-            )
-    )
-    private void onPlayerDeath(SCombatPacket packetIn, CallbackInfo ci) {
-        for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            ClientPlayerEntity player = ibaritone.getPlayerContext().player();
-            if (player != null && player.connection == (ClientPlayNetHandler) (Object) this) {
-                ibaritone.getGameEventHandler().onPlayerDeath();
-            }
-        }
-    }
-}

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

@@ -1,60 +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.launch.mixins;
-
-import baritone.api.BaritoneAPI;
-import baritone.api.event.events.RotationMoveEvent;
-import net.minecraft.client.entity.player.ClientPlayerEntity;
-import net.minecraft.entity.Entity;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(Entity.class)
-public class MixinEntity {
-
-    @Shadow
-    private float rotationYaw;
-
-    float yawRestore;
-
-    @Inject(
-            method = "moveRelative",
-            at = @At("HEAD")
-    )
-    private void moveRelativeHead(CallbackInfo info) {
-        this.yawRestore = this.rotationYaw;
-        // noinspection ConstantConditions
-        if (!ClientPlayerEntity.class.isInstance(this) || BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this) == null) {
-            return;
-        }
-        RotationMoveEvent motionUpdateRotationEvent = new RotationMoveEvent(RotationMoveEvent.Type.MOTION_UPDATE, this.rotationYaw);
-        BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this).getGameEventHandler().onPlayerRotationMove(motionUpdateRotationEvent);
-        this.rotationYaw = motionUpdateRotationEvent.getYaw();
-    }
-
-    @Inject(
-            method = "moveRelative",
-            at = @At("RETURN")
-    )
-    private void moveRelativeReturn(CallbackInfo info) {
-        this.rotationYaw = this.yawRestore;
-    }
-}

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

@@ -20,11 +20,10 @@ package baritone.launch.mixins;
 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
 import baritone.api.event.events.RotationMoveEvent;
-import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
 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;
@@ -38,15 +37,15 @@ import static org.spongepowered.asm.lib.Opcodes.GETFIELD;
  * @author Brady
  * @since 9/10/2018
  */
-@Mixin(LivingEntity.class)
-public abstract class MixinLivingEntity extends Entity {
+@Mixin(EntityLivingBase.class)
+public abstract class MixinEntityLivingBase extends Entity {
 
     /**
      * Event called to override the movement direction when jumping
      */
     private RotationMoveEvent jumpRotationEvent;
 
-    public MixinLivingEntity(EntityType<?> entityTypeIn, World worldIn) {
+    public MixinEntityLivingBase(EntityType<?> entityTypeIn, World worldIn) {
         super(entityTypeIn, worldIn);
     }
 
@@ -56,8 +55,8 @@ public abstract class MixinLivingEntity extends Entity {
     )
     private void preMoveRelative(CallbackInfo ci) {
         // noinspection ConstantConditions
-        if (ClientPlayerEntity.class.isInstance(this)) {
-            IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
+        if (EntityPlayerSP.class.isInstance(this)) {
+            IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this);
             if (baritone != null) {
                 this.jumpRotationEvent = new RotationMoveEvent(RotationMoveEvent.Type.JUMP, this.rotationYaw);
                 baritone.getGameEventHandler().onPlayerRotationMove(this.jumpRotationEvent);
@@ -70,15 +69,34 @@ public abstract class MixinLivingEntity extends Entity {
             at = @At(
                     value = "FIELD",
                     opcode = GETFIELD,
-                    target = "net/minecraft/entity/LivingEntity.rotationYaw:F"
+                    target = "net/minecraft/entity/EntityLivingBase.rotationYaw:F"
             )
     )
-    private float overrideYaw(LivingEntity self) {
-        if (self instanceof ClientPlayerEntity && BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this) != null) {
+    private float overrideYaw(EntityLivingBase self) {
+        if (self instanceof EntityPlayerSP && BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this) != null) {
             return this.jumpRotationEvent.getYaw();
         }
         return self.rotationYaw;
     }
 
-
+    @Redirect(
+            method = "travel",
+            at = @At(
+                    value = "INVOKE",
+                    target = "net/minecraft/entity/EntityLivingBase.moveRelative(FFFF)V"
+            )
+    )
+    private void travel(EntityLivingBase self, float strafe, float up, float forward, float friction) {
+        // noinspection ConstantConditions
+        if (!EntityPlayerSP.class.isInstance(this) || BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this) == null) {
+            moveRelative(strafe, up, forward, friction);
+            return;
+        }
+        RotationMoveEvent motionUpdateRotationEvent = new RotationMoveEvent(RotationMoveEvent.Type.MOTION_UPDATE, this.rotationYaw);
+        BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this).getGameEventHandler().onPlayerRotationMove(motionUpdateRotationEvent);
+        float originalYaw = this.rotationYaw;
+        this.rotationYaw = motionUpdateRotationEvent.getYaw();
+        this.moveRelative(strafe, up, forward, friction);
+        this.rotationYaw = originalYaw;
+    }
 }

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

@@ -24,9 +24,9 @@ import baritone.api.event.events.PlayerUpdateEvent;
 import baritone.api.event.events.SprintStateEvent;
 import baritone.api.event.events.type.EventState;
 import baritone.behavior.LookBehavior;
-import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.settings.KeyBinding;
-import net.minecraft.entity.player.PlayerAbilities;
+import net.minecraft.entity.player.PlayerCapabilities;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -37,8 +37,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
  * @author Brady
  * @since 8/1/2018
  */
-@Mixin(ClientPlayerEntity.class)
-public class MixinClientPlayerEntity {
+@Mixin(EntityPlayerSP.class)
+public class MixinEntityPlayerSP {
 
     @Inject(
             method = "sendChatMessage",
@@ -47,7 +47,7 @@ public class MixinClientPlayerEntity {
     )
     private void sendChatMessage(String msg, CallbackInfo ci) {
         ChatEvent event = new ChatEvent(msg);
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this);
         if (baritone == null) {
             return;
         }
@@ -61,13 +61,13 @@ public class MixinClientPlayerEntity {
             method = "tick",
             at = @At(
                     value = "INVOKE",
-                    target = "net/minecraft/client/entity/player/ClientPlayerEntity.isPassenger()Z",
+                    target = "net/minecraft/client/entity/EntityPlayerSP.isPassenger()Z",
                     shift = At.Shift.BY,
                     by = -3
             )
     )
     private void onPreUpdate(CallbackInfo ci) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this);
         if (baritone != null) {
             baritone.getGameEventHandler().onPlayerUpdate(new PlayerUpdateEvent(EventState.PRE));
         }
@@ -77,13 +77,13 @@ public class MixinClientPlayerEntity {
             method = "tick",
             at = @At(
                     value = "INVOKE",
-                    target = "net/minecraft/client/entity/player/ClientPlayerEntity.onUpdateWalkingPlayer()V",
+                    target = "net/minecraft/client/entity/EntityPlayerSP.onUpdateWalkingPlayer()V",
                     shift = At.Shift.BY,
                     by = 2
             )
     )
     private void onPostUpdate(CallbackInfo ci) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this);
         if (baritone != null) {
             baritone.getGameEventHandler().onPlayerUpdate(new PlayerUpdateEvent(EventState.POST));
         }
@@ -93,11 +93,11 @@ public class MixinClientPlayerEntity {
             method = "livingTick",
             at = @At(
                     value = "FIELD",
-                    target = "net/minecraft/entity/player/PlayerAbilities.allowFlying:Z"
+                    target = "net/minecraft/entity/player/PlayerCapabilities.allowFlying:Z"
             )
     )
-    private boolean isAllowFlying(PlayerAbilities capabilities) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
+    private boolean isAllowFlying(PlayerCapabilities capabilities) {
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this);
         if (baritone == null) {
             return capabilities.allowFlying;
         }
@@ -112,7 +112,7 @@ public class MixinClientPlayerEntity {
             )
     )
     private boolean isKeyDown(KeyBinding keyBinding) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this);
         if (baritone == null) {
             return keyBinding.isKeyDown();
         }
@@ -135,7 +135,7 @@ public class MixinClientPlayerEntity {
             )
     )
     private void updateRidden(CallbackInfo cb) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this);
         if (baritone != null) {
             ((LookBehavior) baritone.getLookBehavior()).pig();
         }

src/launch/java/baritone/launch/mixins/MixinGameRenderer.java

@@ -33,7 +33,7 @@ public class MixinGameRenderer {
             method = "updateCameraAndRender(FJ)V",
             at = @At(
                     value = "INVOKE_STRING",
-                    target = "Lnet/minecraft/profiler/IProfiler;endStartSection(Ljava/lang/String;)V",
+                    target = "Lnet/minecraft/profiler/Profiler;endStartSection(Ljava/lang/String;)V",
                     args = {"ldc=hand"}
             )
     )

src/launch/java/baritone/launch/mixins/MixinGuiChat.java

@@ -22,8 +22,8 @@ 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.widget.TextFieldWidget;
+import net.minecraft.client.gui.GuiChat;
+import net.minecraft.client.gui.GuiTextField;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -40,11 +40,11 @@ import java.util.stream.Stream;
  * @author Brady
  * @since 10/9/2019
  */
-@Mixin(ChatScreen.class)
-public class MixinChatScreen {
+@Mixin(GuiChat.class)
+public class MixinGuiChat {
 
     @Shadow
-    protected TextFieldWidget inputField;
+    protected GuiTextField inputField;
 
     @Shadow
     @Final

src/launch/java/baritone/launch/mixins/MixinGuiScreen.java

@@ -18,16 +18,16 @@
 package baritone.launch.mixins;
 
 import baritone.utils.accessor.IGuiScreen;
-import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.GuiScreen;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
 
 import java.net.URI;
 
-@Mixin(Screen.class)
-public abstract class MixinScreen implements IGuiScreen {
+@Mixin(GuiScreen.class)
+public abstract class MixinGuiScreen implements IGuiScreen {
 
     @Override
-    @Invoker("openLink")
-    public abstract void openLinkInvoker(URI url);
+    @Invoker("openWebLink")
+    public abstract void openLink(URI url);
 }

src/launch/java/baritone/launch/mixins/MixinLootContext.java

@@ -1,59 +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.launch.mixins;
-
-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.LootTableManager;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-@Mixin(LootContext.Builder.class)
-public class MixinLootContext {
-
-    @Redirect(
-            method = "build",
-            at = @At(
-                    value = "INVOKE",
-                    target = "net/minecraft/world/server/ServerWorld.getServer()Lnet/minecraft/server/MinecraftServer;"
-            )
-    )
-    private MinecraftServer getServer(ServerWorld world) {
-        if (world == null) {
-            return null;
-        }
-        return world.getServer();
-    }
-
-    @Redirect(
-            method = "build",
-            at = @At(
-                    value = "INVOKE",
-                    target = "net/minecraft/server/MinecraftServer.getLootTableManager()Lnet/minecraft/world/storage/loot/LootTableManager;"
-            )
-    )
-    private LootTableManager getLootTableManager(MinecraftServer server) {
-        if (server == null) {
-            return BlockOptionalMeta.getManager();
-        }
-        return server.getLootTableManager();
-    }
-}

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

@@ -23,15 +23,14 @@ 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.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.multiplayer.WorldClient;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.ActionResultType;
-import net.minecraft.util.Hand;
-import net.minecraft.util.math.BlockRayTraceResult;
+import net.minecraft.util.EnumActionResult;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.BlockPos;
 import org.spongepowered.asm.lib.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -51,9 +50,9 @@ import java.util.function.BiFunction;
 public class MixinMinecraft {
 
     @Shadow
-    public ClientPlayerEntity player;
+    public EntityPlayerSP player;
     @Shadow
-    public ClientWorld world;
+    public WorldClient world;
 
     @Inject(
             method = "init",
@@ -63,23 +62,12 @@ public class MixinMinecraft {
         BaritoneAPI.getProvider().getPrimaryBaritone();
     }
 
-    @Inject(
-            method = "init",
-            at = @At(
-                    value = "INVOKE",
-                    target = "net/minecraft/client/Minecraft.startTimerHackThread()V"
-            )
-    )
-    private void preInit(CallbackInfo ci) {
-        BaritoneAutoTest.INSTANCE.onPreInit();
-    }
-
     @Inject(
             method = "runTick",
             at = @At(
                     value = "FIELD",
                     opcode = Opcodes.GETFIELD,
-                    target = "net/minecraft/client/Minecraft.currentScreen:Lnet/minecraft/client/gui/screen/Screen;",
+                    target = "net/minecraft/client/Minecraft.currentScreen:Lnet/minecraft/client/gui/GuiScreen;",
                     ordinal = 5,
                     shift = At.Shift.BY,
                     by = -3
@@ -100,10 +88,10 @@ public class MixinMinecraft {
     }
 
     @Inject(
-            method = "loadWorld(Lnet/minecraft/client/world/ClientWorld;)V",
+            method = "loadWorld(Lnet/minecraft/client/multiplayer/WorldClient;Lnet/minecraft/client/gui/GuiScreen;)V",
             at = @At("HEAD")
     )
-    private void preLoadWorld(ClientWorld world, CallbackInfo ci) {
+    private void preLoadWorld(WorldClient world, GuiScreen loadingScreen, CallbackInfo ci) {
         // If we're unloading the world but one doesn't exist, ignore it
         if (this.world == null && world == null) {
             return;
@@ -120,10 +108,10 @@ public class MixinMinecraft {
     }
 
     @Inject(
-            method = "loadWorld(Lnet/minecraft/client/world/ClientWorld;)V",
+            method = "loadWorld(Lnet/minecraft/client/multiplayer/WorldClient;Lnet/minecraft/client/gui/GuiScreen;)V",
             at = @At("RETURN")
     )
-    private void postLoadWorld(ClientWorld world, CallbackInfo ci) {
+    private void postLoadWorld(WorldClient world, GuiScreen loadingScreen, CallbackInfo ci) {
         // still fire event for both null, as that means we've just finished exiting a world
 
         // mc.world changing is only the primary baritone
@@ -140,24 +128,37 @@ public class MixinMinecraft {
             at = @At(
                     value = "FIELD",
                     opcode = Opcodes.GETFIELD,
-                    target = "net/minecraft/client/gui/screen/Screen.passEvents:Z"
+                    target = "net/minecraft/client/gui/GuiScreen.allowUserInput:Z"
             )
     )
-    private boolean passEvents(Screen screen) {
+    private boolean isAllowUserInput(GuiScreen screen) {
         // allow user input is only the primary baritone
-        return (BaritoneAPI.getProvider().getPrimaryBaritone().getPathingBehavior().isPathing() && player != null) || screen.passEvents;
+        return (BaritoneAPI.getProvider().getPrimaryBaritone().getPathingBehavior().isPathing() && player != null) || screen.allowUserInput;
+    }
+
+    @Inject(
+            method = "clickMouse",
+            at = @At(
+                    value = "INVOKE",
+                    target = "net/minecraft/client/multiplayer/PlayerControllerMP.clickBlock(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/EnumFacing;)Z"
+            ),
+            locals = LocalCapture.CAPTURE_FAILHARD
+    )
+    private void onBlockBreak(CallbackInfo ci, BlockPos pos) {
+        // clickMouse is only for the main player
+        BaritoneAPI.getProvider().getPrimaryBaritone().getGameEventHandler().onBlockInteract(new BlockInteractEvent(pos, BlockInteractEvent.Type.START_BREAK));
     }
 
     @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/EntityPlayerSP.swingArm(Lnet/minecraft/util/EnumHand;)V"
             ),
             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, EnumHand var1[], int var2, int var3, EnumHand enumhand, ItemStack itemstack, BlockPos blockpos, int i, EnumActionResult enumactionresult) {
         // rightClickMouse is only for the main player
-        BaritoneAPI.getProvider().getPrimaryBaritone().getGameEventHandler().onBlockInteract(new BlockInteractEvent(raytrace.getPos(), BlockInteractEvent.Type.USE));
+        BaritoneAPI.getProvider().getPrimaryBaritone().getGameEventHandler().onBlockInteract(new BlockInteractEvent(blockpos, BlockInteractEvent.Type.USE));
     }
 }

src/launch/java/baritone/launch/mixins/MixinNetHandlerPlayClient.java

@@ -0,0 +1,192 @@
+/*
+ * 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.launch.mixins;
+
+import baritone.Baritone;
+import baritone.api.BaritoneAPI;
+import baritone.api.IBaritone;
+import baritone.api.event.events.ChunkEvent;
+import baritone.api.event.events.type.EventState;
+import baritone.cache.CachedChunk;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.network.play.server.*;
+import net.minecraft.util.math.ChunkPos;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+/**
+ * @author Brady
+ * @since 8/3/2018
+ */
+@Mixin(NetHandlerPlayClient.class)
+public class MixinNetHandlerPlayClient {
+
+    @Inject(
+            method = "handleChunkData",
+            at = @At(
+                    value = "INVOKE",
+                    target = "net/minecraft/client/multiplayer/ChunkProviderClient.func_212474_a(IILnet/minecraft/network/PacketBuffer;IZ)Lnet/minecraft/world/chunk/Chunk;"
+            )
+    )
+    private void preRead(SPacketChunkData packetIn, CallbackInfo ci) {
+        for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
+            EntityPlayerSP player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (NetHandlerPlayClient) (Object) this) {
+                ibaritone.getGameEventHandler().onChunkEvent(
+                        new ChunkEvent(
+                                EventState.PRE,
+                                packetIn.isFullChunk() ? ChunkEvent.Type.POPULATE_FULL : ChunkEvent.Type.POPULATE_PARTIAL,
+                                packetIn.getChunkX(),
+                                packetIn.getChunkZ()
+                        )
+                );
+            }
+        }
+    }
+
+    @Inject(
+            method = "handleChunkData",
+            at = @At("RETURN")
+    )
+    private void postHandleChunkData(SPacketChunkData packetIn, CallbackInfo ci) {
+        for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
+            EntityPlayerSP player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (NetHandlerPlayClient) (Object) this) {
+                ibaritone.getGameEventHandler().onChunkEvent(
+                        new ChunkEvent(
+                                EventState.POST,
+                                packetIn.isFullChunk() ? ChunkEvent.Type.POPULATE_FULL : ChunkEvent.Type.POPULATE_PARTIAL,
+                                packetIn.getChunkX(),
+                                packetIn.getChunkZ()
+                        )
+                );
+            }
+        }
+    }
+
+    @Inject(
+            method = "processChunkUnload",
+            at = @At("HEAD")
+    )
+    private void preChunkUnload(SPacketUnloadChunk packet, CallbackInfo ci) {
+        for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
+            EntityPlayerSP player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (NetHandlerPlayClient) (Object) this) {
+                ibaritone.getGameEventHandler().onChunkEvent(
+                        new ChunkEvent(EventState.PRE, ChunkEvent.Type.UNLOAD, packet.getX(), packet.getZ())
+                );
+            }
+        }
+    }
+
+    @Inject(
+            method = "processChunkUnload",
+            at = @At("RETURN")
+    )
+    private void postChunkUnload(SPacketUnloadChunk packet, CallbackInfo ci) {
+        for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
+            EntityPlayerSP player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (NetHandlerPlayClient) (Object) this) {
+                ibaritone.getGameEventHandler().onChunkEvent(
+                        new ChunkEvent(EventState.POST, ChunkEvent.Type.UNLOAD, packet.getX(), packet.getZ())
+                );
+            }
+        }
+    }
+
+    @Inject(
+            method = "handleBlockChange",
+            at = @At("RETURN")
+    )
+    private void postHandleBlockChange(SPacketBlockChange packetIn, CallbackInfo ci) {
+        if (!Baritone.settings().repackOnAnyBlockChange.value) {
+            return;
+        }
+        if (!CachedChunk.BLOCKS_TO_KEEP_TRACK_OF.contains(packetIn.getState().getBlock())) {
+            return;
+        }
+        for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
+            EntityPlayerSP player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (NetHandlerPlayClient) (Object) this) {
+                ibaritone.getGameEventHandler().onChunkEvent(
+                        new ChunkEvent(
+                                EventState.POST,
+                                ChunkEvent.Type.POPULATE_FULL,
+                                packetIn.getPos().getX() >> 4,
+                                packetIn.getPos().getZ() >> 4
+                        )
+                );
+            }
+        }
+    }
+
+    @Inject(
+            method = "handleMultiBlockChange",
+            at = @At("RETURN")
+    )
+    private void postHandleMultiBlockChange(SPacketMultiBlockChange packetIn, CallbackInfo ci) {
+        if (!Baritone.settings().repackOnAnyBlockChange.value) {
+            return;
+        }
+        if (packetIn.getChangedBlocks().length == 0) {
+            return;
+        }
+        https://docs.oracle.com/javase/specs/jls/se7/html/jls-14.html#jls-14.15
+        {
+            for (SPacketMultiBlockChange.BlockUpdateData update : packetIn.getChangedBlocks()) {
+                if (CachedChunk.BLOCKS_TO_KEEP_TRACK_OF.contains(update.getBlockState().getBlock())) {
+                    break https;
+                }
+            }
+            return;
+        }
+        ChunkPos pos = new ChunkPos(packetIn.getChangedBlocks()[0].getPos());
+        for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
+            EntityPlayerSP player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (NetHandlerPlayClient) (Object) this) {
+                ibaritone.getGameEventHandler().onChunkEvent(
+                        new ChunkEvent(
+                                EventState.POST,
+                                ChunkEvent.Type.POPULATE_FULL,
+                                pos.x,
+                                pos.z
+                        )
+                );
+            }
+        }
+    }
+
+    @Inject(
+            method = "handleCombatEvent",
+            at = @At(
+                    value = "INVOKE",
+                    target = "net/minecraft/client/Minecraft.displayGuiScreen(Lnet/minecraft/client/gui/GuiScreen;)V"
+            )
+    )
+    private void onPlayerDeath(SPacketCombatEvent packetIn, CallbackInfo ci) {
+        for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
+            EntityPlayerSP player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (NetHandlerPlayClient) (Object) this) {
+                ibaritone.getGameEventHandler().onPlayerDeath();
+            }
+        }
+    }
+}

src/launch/java/baritone/launch/mixins/MixinNetworkManager.java

@@ -25,9 +25,9 @@ import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GenericFutureListener;
-import net.minecraft.network.IPacket;
+import net.minecraft.network.EnumPacketDirection;
 import net.minecraft.network.NetworkManager;
-import net.minecraft.network.PacketDirection;
+import net.minecraft.network.Packet;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -47,14 +47,14 @@ public class MixinNetworkManager {
 
     @Shadow
     @Final
-    private PacketDirection direction;
+    private EnumPacketDirection direction;
 
     @Inject(
             method = "dispatchPacket",
             at = @At("HEAD")
     )
-    private void preDispatchPacket(IPacket<?> inPacket, final GenericFutureListener<? extends Future<? super Void>> futureListeners, CallbackInfo ci) {
-        if (this.direction != PacketDirection.CLIENTBOUND) {
+    private void preDispatchPacket(Packet<?> inPacket, final GenericFutureListener<? extends Future<? super Void>> futureListeners, CallbackInfo ci) {
+        if (this.direction != EnumPacketDirection.CLIENTBOUND) {
             return;
         }
 
@@ -69,8 +69,8 @@ public class MixinNetworkManager {
             method = "dispatchPacket",
             at = @At("RETURN")
     )
-    private void postDispatchPacket(IPacket<?> inPacket, final GenericFutureListener<? extends Future<? super Void>> futureListeners, CallbackInfo ci) {
-        if (this.direction != PacketDirection.CLIENTBOUND) {
+    private void postDispatchPacket(Packet<?> inPacket, final GenericFutureListener<? extends Future<? super Void>> futureListeners, CallbackInfo ci) {
+        if (this.direction != EnumPacketDirection.CLIENTBOUND) {
             return;
         }
 
@@ -85,11 +85,11 @@ public class MixinNetworkManager {
             method = "channelRead0",
             at = @At(
                     value = "INVOKE",
-                    target = "net/minecraft/network/NetworkManager.processPacket(Lnet/minecraft/network/IPacket;Lnet/minecraft/network/INetHandler;)V"
+                    target = "net/minecraft/network/NetworkManager.processPacket(Lnet/minecraft/network/Packet;Lnet/minecraft/network/INetHandler;)V"
             )
     )
-    private void preProcessPacket(ChannelHandlerContext context, IPacket<?> packet, CallbackInfo ci) {
-        if (this.direction != PacketDirection.CLIENTBOUND) {
+    private void preProcessPacket(ChannelHandlerContext context, Packet<?> packet, CallbackInfo ci) {
+        if (this.direction != EnumPacketDirection.CLIENTBOUND) {
             return;
         }
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
@@ -103,8 +103,8 @@ public class MixinNetworkManager {
             method = "channelRead0",
             at = @At("RETURN")
     )
-    private void postProcessPacket(ChannelHandlerContext context, IPacket<?> packet, CallbackInfo ci) {
-        if (!this.channel.isOpen() || this.direction != PacketDirection.CLIENTBOUND) {
+    private void postProcessPacket(ChannelHandlerContext context, Packet<?> packet, CallbackInfo ci) {
+        if (!this.channel.isOpen() || this.direction != EnumPacketDirection.CLIENTBOUND) {
             return;
         }
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {

src/launch/java/baritone/launch/mixins/MixinPlayerControllerMP.java

@@ -18,14 +18,14 @@
 package baritone.launch.mixins;
 
 import baritone.utils.accessor.IPlayerControllerMP;
-import net.minecraft.client.multiplayer.PlayerController;
+import net.minecraft.client.multiplayer.PlayerControllerMP;
 import net.minecraft.util.math.BlockPos;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.asm.mixin.gen.Invoker;
 
-@Mixin(PlayerController.class)
-public abstract class MixinPlayerController implements IPlayerControllerMP {
+@Mixin(PlayerControllerMP.class)
+public abstract class MixinPlayerControllerMP implements IPlayerControllerMP {
 
     @Accessor
     @Override

src/launch/java/baritone/launch/mixins/MixinRenderChunk.java

@@ -0,0 +1,57 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.launch.mixins;
+
+import baritone.Baritone;
+import baritone.api.BaritoneAPI;
+import baritone.api.utils.IPlayerContext;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.chunk.RenderChunk;
+import net.minecraft.client.renderer.chunk.RenderChunkCache;
+import net.minecraft.util.math.BlockPos;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+/**
+ * @author Brady
+ * @since 1/29/2019
+ */
+@Mixin(RenderChunk.class)
+public class MixinRenderChunk {
+
+    @Redirect(
+            method = "rebuildChunk",
+            at = @At(
+                    value = "INVOKE",
+                    target = "net/minecraft/client/renderer/chunk/RenderChunkCache.getBlockState(Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/block/state/IBlockState;"
+            )
+    )
+    private IBlockState getBlockState(RenderChunkCache chunkCache, BlockPos pos) {
+        if (Baritone.settings().renderCachedChunks.value && !Minecraft.getInstance().isSingleplayer()) {
+            Baritone baritone = (Baritone) BaritoneAPI.getProvider().getPrimaryBaritone();
+            IPlayerContext ctx = baritone.getPlayerContext();
+            if (ctx.player() != null && ctx.world() != null && baritone.bsi != null) {
+                return baritone.bsi.get0(pos);
+            }
+        }
+
+        return chunkCache.getBlockState(pos);
+    }
+}

src/launch/java/baritone/launch/mixins/MixinRenderChunkCache.java

@@ -0,0 +1,47 @@
+/*
+ * 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.launch.mixins;
+
+import baritone.Baritone;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.chunk.RenderChunkCache;
+import net.minecraft.world.chunk.Chunk;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(RenderChunkCache.class)
+public class MixinRenderChunkCache {
+
+    @Redirect(
+            method = "generateCache",
+            at = @At(
+                    value = "INVOKE",
+                    target = "net/minecraft/world/chunk/Chunk.isEmptyBetween(II)Z"
+            )
+    )
+    private static boolean isEmpty(Chunk chunk, int yStart, int yEnd) {
+        if (!chunk.isEmptyBetween(yStart, yEnd)) {
+            return false;
+        }
+        if (chunk.isEmpty() && Baritone.settings().renderCachedChunks.value && Minecraft.getInstance().getIntegratedServer() == null) {
+            return false;
+        }
+        return true;
+    }
+}

src/launch/java/baritone/launch/mixins/MixinRenderList.java

@@ -0,0 +1,47 @@
+/*
+ * 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.launch.mixins;
+
+import baritone.Baritone;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.RenderList;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import static org.lwjgl.opengl.GL11.*;
+
+@Mixin(RenderList.class)
+public class MixinRenderList {
+
+    @Redirect( // avoid creating CallbackInfo at all costs; this is called 40k times per second
+            method = "renderChunkLayer",
+            at = @At(
+                    value = "INVOKE",
+                    target = "net/minecraft/client/renderer/GlStateManager.popMatrix()V"
+            )
+    )
+    private void popMatrix() {
+        if (Baritone.settings().renderCachedChunks.value && !Minecraft.getInstance().isSingleplayer()) {
+            // reset the blend func to normal (not dependent on constant alpha)
+            GlStateManager.blendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO);
+        }
+        GlStateManager.popMatrix();
+    }
+}

src/launch/java/baritone/launch/mixins/MixinVboRenderList.java

@@ -0,0 +1,47 @@
+/*
+ * 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.launch.mixins;
+
+import baritone.Baritone;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.VboRenderList;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import static org.lwjgl.opengl.GL11.*;
+
+@Mixin(VboRenderList.class)
+public class MixinVboRenderList {
+
+    @Redirect( // avoid creating CallbackInfo at all costs; this is called 40k times per second
+            method = "renderChunkLayer",
+            at = @At(
+                    value = "INVOKE",
+                    target = "net/minecraft/client/renderer/GlStateManager.popMatrix()V"
+            )
+    )
+    private void popMatrix() {
+        if (Baritone.settings().renderCachedChunks.value && !Minecraft.getInstance().isSingleplayer()) {
+            // reset the blend func to normal (not dependent on constant alpha)
+            GlStateManager.blendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO);
+        }
+        GlStateManager.popMatrix();
+    }
+}

src/launch/resources/mixins.baritone.json

@@ -8,22 +8,26 @@
     "maxShiftBy": 2
   },
   "client": [
+    "MixinAnvilChunkLoader",
     "MixinBitArray",
     "MixinBlockStateContainer",
-    "MixinChatScreen",
-    "MixinChunkArray",
-    "MixinClientChunkProvider",
-    "MixinClientPlayerEntity",
-    "MixinClientPlayNetHandler",
-    "MixinEntity",
-    "MixinEntityRenderManager",
+    "MixinChunkProviderClient",
+    "MixinChunkProviderServer",
+    "MixinChunkRenderContainer",
+    "MixinChunkRenderWorker",
+    "MixinEntityLivingBase",
+    "MixinEntityPlayerSP",
     "MixinGameRenderer",
+    "MixinGuiChat",
+    "MixinGuiScreen",
     "MixinItemStack",
-    "MixinLivingEntity",
-    "MixinLootContext",
     "MixinMinecraft",
+    "MixinNetHandlerPlayClient",
     "MixinNetworkManager",
-    "MixinPlayerController",
-    "MixinScreen"
+    "MixinPlayerControllerMP",
+    "MixinRenderChunk",
+    "MixinRenderChunkCache",
+    "MixinRenderList",
+    "MixinVboRenderList"
   ]
 }

src/main/java/baritone/Baritone.java

@@ -25,11 +25,14 @@ 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.*;
-import baritone.command.manager.CommandManager;
+import baritone.utils.BlockStateInterface;
+import baritone.utils.GuiClick;
+import baritone.utils.InputOverrideHandler;
+import baritone.utils.PathingControlManager;
 import baritone.utils.player.PrimaryPlayerContext;
 import net.minecraft.client.Minecraft;
 
@@ -104,23 +107,19 @@ public class Baritone implements IBaritone {
 
         this.pathingControlManager = new PathingControlManager(this);
         {
-            followProcess = new FollowProcess(this);
-            mineProcess = new MineProcess(this);
-            customGoalProcess = new CustomGoalProcess(this); // very high iq
-            getToBlockProcess = new GetToBlockProcess(this);
-            builderProcess = new BuilderProcess(this);
-            exploreProcess = new ExploreProcess(this);
-            backfillProcess = new BackfillProcess(this);
-            farmProcess = new FarmProcess(this);
+            this.pathingControlManager.registerProcess(followProcess = new FollowProcess(this));
+            this.pathingControlManager.registerProcess(mineProcess = new MineProcess(this));
+            this.pathingControlManager.registerProcess(customGoalProcess = new CustomGoalProcess(this)); // very high iq
+            this.pathingControlManager.registerProcess(getToBlockProcess = new GetToBlockProcess(this));
+            this.pathingControlManager.registerProcess(builderProcess = new BuilderProcess(this));
+            this.pathingControlManager.registerProcess(exploreProcess = new ExploreProcess(this));
+            this.pathingControlManager.registerProcess(backfillProcess = new BackfillProcess(this));
+            this.pathingControlManager.registerProcess(farmProcess = new FarmProcess(this));
         }
 
         this.worldProvider = new WorldProvider();
         this.selectionManager = new SelectionManager(this);
         this.commandManager = new CommandManager(this);
-
-        if (BaritoneAutoTest.ENABLE_AUTO_TEST) {
-            this.gameEventHandler.registerEventListener(BaritoneAutoTest.INSTANCE);
-        }
     }
 
     @Override
@@ -218,7 +217,7 @@ public class Baritone implements IBaritone {
         new Thread(() -> {
             try {
                 Thread.sleep(100);
-                Helper.mc.execute(() -> Helper.mc.displayGuiScreen(new GuiClick()));
+                Helper.mc.addScheduledTask(() -> Helper.mc.displayGuiScreen(new GuiClick()));
             } catch (Exception ignored) {}
         }).start();
     }

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

src/main/java/baritone/KeepName.java

@@ -15,13 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.accessor;
+package baritone;
 
-public interface IEntityRenderManager {
-
-    double renderPosX();
-
-    double renderPosY();
-
-    double renderPosZ();
-}
+// Annotation for classes and class members that should not be renamed by proguard
+public @interface KeepName {}

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

@@ -21,16 +21,13 @@ import baritone.Baritone;
 import baritone.api.event.events.TickEvent;
 import baritone.utils.ToolSet;
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.Blocks;
-import net.minecraft.client.entity.player.ClientPlayerEntity;
-import net.minecraft.inventory.container.ClickType;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.init.Blocks;
+import net.minecraft.inventory.ClickType;
 import net.minecraft.item.*;
-import net.minecraft.util.Direction;
-import net.minecraft.util.Hand;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.NonNullList;
-import net.minecraft.util.math.BlockRayTraceResult;
-import net.minecraft.util.math.Vec3d;
 
 import java.util.ArrayList;
 import java.util.OptionalInt;
@@ -51,14 +48,14 @@ public final class InventoryBehavior extends Behavior {
         if (event.getType() == TickEvent.Type.OUT) {
             return;
         }
-        if (ctx.player().openContainer != ctx.player().container) {
+        if (ctx.player().openContainer != ctx.player().inventoryContainer) {
             // we have a crafting table or a chest or something open
             return;
         }
         if (firstValidThrowaway() >= 9) { // aka there are none on the hotbar, but there are some in main inventory
             swapWithHotBar(firstValidThrowaway(), 8);
         }
-        int pick = bestToolAgainst(Blocks.STONE, PickaxeItem.class);
+        int pick = bestToolAgainst(Blocks.STONE, ItemPickaxe.class);
         if (pick >= 9) {
             swapWithHotBar(pick, 0);
         }
@@ -93,7 +90,7 @@ public final class InventoryBehavior extends Behavior {
     }
 
     private void swapWithHotBar(int inInventory, int inHotbar) {
-        ctx.playerController().windowClick(ctx.player().container.windowId, inInventory < 9 ? inInventory + 36 : inInventory, inHotbar, ClickType.SWAP, ctx.player());
+        ctx.playerController().windowClick(ctx.player().inventoryContainer.windowId, inInventory < 9 ? inInventory + 36 : inInventory, inHotbar, ClickType.SWAP, ctx.player());
     }
 
     private int firstValidThrowaway() { // TODO offhand idk
@@ -106,7 +103,7 @@ public final class InventoryBehavior extends Behavior {
         return -1;
     }
 
-    private int bestToolAgainst(Block against, Class<? extends ToolItem> cla$$) {
+    private int bestToolAgainst(Block against, Class<? extends ItemTool> cla$$) {
         NonNullList<ItemStack> invy = ctx.player().inventory.mainInventory;
         int bestInd = -1;
         double bestSpeed = -1;
@@ -136,11 +133,11 @@ 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)) {}))))) {
+        IBlockState maybe = baritone.getBuilderProcess().placeAt(x, y, z, baritone.bsi.get0(x, y, z));
+        if (maybe != null && throwaway(select, stack -> stack.getItem() instanceof ItemBlock && maybe.equals(((ItemBlock) stack.getItem()).getBlock().getStateForPlacement(new BlockItemUseContext(new ItemUseContext(ctx.player(), stack, ctx.playerFeet(), EnumFacing.UP, (float) ctx.player().posX, (float) ctx.player().posY, (float) ctx.player().posZ)))))) {
             return true; // gotem
         }
-        if (maybe != null && throwaway(select, stack -> stack.getItem() instanceof BlockItem && ((BlockItem) stack.getItem()).getBlock().equals(maybe.getBlock()))) {
+        if (maybe != null && throwaway(select, stack -> stack.getItem() instanceof ItemBlock && ((ItemBlock) stack.getItem()).getBlock().equals(maybe.getBlock()))) {
             return true;
         }
         for (Item item : Baritone.settings().acceptableThrowawayItems.value) {
@@ -152,7 +149,7 @@ public final class InventoryBehavior extends Behavior {
     }
 
     public boolean throwaway(boolean select, Predicate<? super ItemStack> desired) {
-        ClientPlayerEntity p = ctx.player();
+        EntityPlayerSP p = ctx.player();
         NonNullList<ItemStack> inv = p.inventory.mainInventory;
         for (int i = 0; i < 9; i++) {
             ItemStack item = inv.get(i);
@@ -176,7 +173,7 @@ public final class InventoryBehavior extends Behavior {
             // so not a shovel, not a hoe, not a block, etc
             for (int i = 0; i < 9; i++) {
                 ItemStack item = inv.get(i);
-                if (item.isEmpty() || item.getItem() instanceof PickaxeItem) {
+                if (item.isEmpty() || item.getItem() instanceof ItemPickaxe) {
                     if (select) {
                         p.inventory.currentItem = i;
                     }

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

@@ -20,20 +20,32 @@ package baritone.behavior;
 import baritone.Baritone;
 import baritone.api.cache.Waypoint;
 import baritone.api.event.events.BlockInteractEvent;
+import baritone.api.event.events.PacketEvent;
+import baritone.api.event.events.PlayerUpdateEvent;
+import baritone.api.event.events.TickEvent;
+import baritone.api.event.events.type.EventState;
 import baritone.api.utils.BetterBlockPos;
 import baritone.cache.ContainerMemory;
 import baritone.utils.BlockStateInterface;
-import net.minecraft.block.BedBlock;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockBed;
+import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
+import net.minecraft.network.Packet;
+import net.minecraft.network.play.client.CPacketCloseWindow;
+import net.minecraft.network.play.client.CPacketPlayerTryUseItemOnBlock;
+import net.minecraft.network.play.server.SPacketCloseWindow;
+import net.minecraft.network.play.server.SPacketOpenWindow;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityLockable;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.text.TextComponentTranslation;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
+import java.util.*;
 
 /**
  * doesn't work for horse inventories :^)
@@ -43,13 +55,111 @@ import java.util.UUID;
  */
 public final class MemoryBehavior extends Behavior {
 
+    private final List<FutureInventory> futureInventories = new ArrayList<>(); // this is per-bot
+
+    private Integer enderChestWindowId; // nae nae
+
     public MemoryBehavior(Baritone baritone) {
         super(baritone);
     }
 
+    @Override
+    public synchronized void onTick(TickEvent event) {
+        if (!Baritone.settings().containerMemory.value) {
+            return;
+        }
+        if (event.getType() == TickEvent.Type.OUT) {
+            enderChestWindowId = null;
+            futureInventories.clear();
+        }
+    }
+
+    @Override
+    public synchronized void onPlayerUpdate(PlayerUpdateEvent event) {
+        if (event.getState() == EventState.PRE) {
+            updateInventory();
+        }
+    }
+
+    @Override
+    public synchronized void onSendPacket(PacketEvent event) {
+        if (!Baritone.settings().containerMemory.value) {
+            return;
+        }
+        Packet p = event.getPacket();
+
+        if (event.getState() == EventState.PRE) {
+            if (p instanceof CPacketPlayerTryUseItemOnBlock) {
+                CPacketPlayerTryUseItemOnBlock packet = event.cast();
+
+                TileEntity tileEntity = ctx.world().getTileEntity(packet.getPos());
+                // if tileEntity is an ender chest, we don't need to do anything. ender chests are treated the same regardless of what coordinate right clicked
+
+                // Ensure the TileEntity is a container of some sort
+                if (tileEntity instanceof TileEntityLockable) {
+
+                    TileEntityLockable lockable = (TileEntityLockable) tileEntity;
+                    int size = lockable.getSizeInventory();
+                    BetterBlockPos position = BetterBlockPos.from(tileEntity.getPos());
+                    BetterBlockPos adj = BetterBlockPos.from(neighboringConnectedBlock(position));
+                    System.out.println(position + " " + adj);
+                    if (adj != null) {
+                        size *= 2; // double chest or double trapped chest
+                        if (adj.getX() < position.getX() || adj.getZ() < position.getZ()) {
+                            position = adj; // standardize on the lower coordinate, regardless of which side of the large chest we right clicked
+                        }
+                    }
+
+                    this.futureInventories.add(new FutureInventory(System.nanoTime() / 1000000L, size, lockable.getGuiID(), position));
+                }
+            }
+
+            if (p instanceof CPacketCloseWindow) {
+                getCurrent().save();
+            }
+        }
+    }
+
+    @Override
+    public synchronized void onReceivePacket(PacketEvent event) {
+        if (!Baritone.settings().containerMemory.value) {
+            return;
+        }
+        Packet p = event.getPacket();
+
+        if (event.getState() == EventState.PRE) {
+            if (p instanceof SPacketOpenWindow) {
+                SPacketOpenWindow packet = event.cast();
+                // Remove any entries that were created over a second ago, this should make up for INSANE latency
+                futureInventories.removeIf(i -> System.nanoTime() / 1000000L - i.time > 1000);
+
+                System.out.println("Received packet " + packet.getGuiId() + " " + packet.getEntityId() + " " + packet.getSlotCount() + " " + packet.getWindowId());
+                System.out.println(packet.getWindowTitle());
+                if (packet.getWindowTitle() instanceof TextComponentTranslation && ((TextComponentTranslation) packet.getWindowTitle()).getKey().equals("container.enderchest")) {
+                    // title is not customized (i.e. this isn't just a renamed shulker)
+                    enderChestWindowId = packet.getWindowId();
+                    return;
+                }
+                futureInventories.stream()
+                        .filter(i -> i.type.equals(packet.getGuiId()) && i.slots == packet.getSlotCount())
+                        .findFirst().ifPresent(matched -> {
+                    // Remove the future inventory
+                    futureInventories.remove(matched);
+
+                    // Setup the remembered inventory
+                    getCurrentContainer().setup(matched.pos, packet.getWindowId(), packet.getSlotCount());
+                });
+            }
+
+            if (p instanceof SPacketCloseWindow) {
+                getCurrent().save();
+            }
+        }
+    }
+
     @Override
     public void onBlockInteract(BlockInteractEvent event) {
-        if (event.getType() == BlockInteractEvent.Type.USE && BlockStateInterface.getBlock(ctx, event.getPos()) instanceof BedBlock) {
+        if (event.getType() == BlockInteractEvent.Type.USE && BlockStateInterface.getBlock(ctx, event.getPos()) instanceof BlockBed) {
             baritone.getWorldProvider().getCurrentWorld().getWaypoints().addWaypoint(new Waypoint("bed", Waypoint.Tag.BED, BetterBlockPos.from(event.getPos())));
         }
     }
@@ -59,6 +169,86 @@ public final class MemoryBehavior extends Behavior {
         baritone.getWorldProvider().getCurrentWorld().getWaypoints().addWaypoint(new Waypoint("death", Waypoint.Tag.DEATH, ctx.playerFeet()));
     }
 
+
+    private void updateInventory() {
+        if (!Baritone.settings().containerMemory.value) {
+            return;
+        }
+        int windowId = ctx.player().openContainer.windowId;
+        if (enderChestWindowId != null) {
+            if (windowId == enderChestWindowId) {
+                getCurrent().contents = ctx.player().openContainer.getInventory().subList(0, 27);
+            } else {
+                getCurrent().save();
+                enderChestWindowId = null;
+            }
+        }
+        if (getCurrentContainer() != null) {
+            getCurrentContainer().getInventoryFromWindow(windowId).ifPresent(inventory -> inventory.updateFromOpenWindow(ctx));
+        }
+    }
+
+    private ContainerMemory getCurrentContainer() {
+        if (baritone.getWorldProvider().getCurrentWorld() == null) {
+            return null;
+        }
+        return (ContainerMemory) baritone.getWorldProvider().getCurrentWorld().getContainerMemory();
+    }
+
+    private BlockPos neighboringConnectedBlock(BlockPos in) {
+        BlockStateInterface bsi = baritone.bsi;
+        Block block = bsi.get0(in).getBlock();
+        if (block != Blocks.TRAPPED_CHEST && block != Blocks.CHEST) {
+            return null; // other things that have contents, but can be placed adjacent without combining
+        }
+        for (int i = 0; i < 4; i++) {
+            BlockPos adj = in.offset(EnumFacing.byHorizontalIndex(i));
+            if (bsi.get0(adj).getBlock() == block) {
+                return adj;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * An inventory that we are not yet fully aware of, but are expecting to exist at some point in the future.
+     */
+    private static final class FutureInventory {
+
+        /**
+         * The time that we initially expected the inventory to be provided, in milliseconds
+         */
+        private final long time;
+
+        /**
+         * The amount of slots in the inventory
+         */
+        private final int slots;
+
+        /**
+         * The type of inventory
+         */
+        private final String type;
+
+        /**
+         * The position of the inventory container
+         */
+        private final BlockPos pos;
+
+        private FutureInventory(long time, int slots, String type, BlockPos pos) {
+            this.time = time;
+            this.slots = slots;
+            this.type = type;
+            this.pos = pos;
+            // betterblockpos has censoring
+            System.out.println("Future inventory created " + time + " " + slots + " " + type + " " + BetterBlockPos.from(pos));
+        }
+    }
+
+    public Optional<List<ItemStack>> echest() {
+        return Optional.ofNullable(getCurrent().contents).map(Collections::unmodifiableList);
+    }
+
     public EnderChestMemory getCurrent() {
         Path path = baritone.getWorldProvider().getCurrentWorld().directory;
         return EnderChestMemory.getByServerAndPlayer(path.getParent(), ctx.player().getUniqueID());

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

@@ -22,8 +22,8 @@ import baritone.utils.pathing.PathingBlockType;
 import com.google.common.collect.ImmutableSet;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.Blocks;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 
 import java.util.ArrayList;
@@ -143,7 +143,7 @@ public final class CachedChunk {
     /**
      * The block names of each surface level block for generating an overview
      */
-    private final BlockState[] overview;
+    private final IBlockState[] overview;
 
     private final int[] heightMap;
 
@@ -151,7 +151,7 @@ public final class CachedChunk {
 
     public final long cacheTimestamp;
 
-    CachedChunk(int x, int z, BitSet data, BlockState[] overview, Map<String, List<BlockPos>> specialBlockLocations, long cacheTimestamp) {
+    CachedChunk(int x, int z, BitSet data, IBlockState[] overview, Map<String, List<BlockPos>> specialBlockLocations, long cacheTimestamp) {
         validateSize(data);
 
         this.x = x;
@@ -178,7 +178,7 @@ public final class CachedChunk {
         }
     }
 
-    public final BlockState getBlock(int x, int y, int z, int dimension) {
+    public final IBlockState getBlock(int x, int y, int z, int dimension) {
         int index = getPositionIndex(x, y, z);
         PathingBlockType type = getType(index);
         int internalPos = z << 4 | x;
@@ -234,7 +234,7 @@ public final class CachedChunk {
         }
     }
 
-    public final BlockState[] getOverview() {
+    public final IBlockState[] getOverview() {
         return overview;
     }
 

src/main/java/baritone/cache/CachedRegion.java

@@ -20,7 +20,7 @@ package baritone.cache;
 import baritone.Baritone;
 import baritone.api.cache.ICachedRegion;
 import baritone.api.utils.BlockUtils;
-import net.minecraft.block.BlockState;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.util.math.BlockPos;
 
 import java.io.*;
@@ -75,7 +75,7 @@ public final class CachedRegion implements ICachedRegion {
     }
 
     @Override
-    public final BlockState getBlock(int x, int y, int z) {
+    public final IBlockState getBlock(int x, int y, int z) {
         CachedChunk chunk = chunks[x >> 4][z >> 4];
         if (chunk != null) {
             return chunk.getBlock(x & 15, y, z & 15, dimension);
@@ -216,7 +216,7 @@ public final class CachedRegion implements ICachedRegion {
                 boolean[][] present = new boolean[32][32];
                 BitSet[][] bitSets = new BitSet[32][32];
                 Map<String, List<BlockPos>>[][] location = new Map[32][32];
-                BlockState[][][] overview = new BlockState[32][32][];
+                IBlockState[][][] overview = new IBlockState[32][32][];
                 long[][] cacheTimestamp = new long[32][32];
                 for (int x = 0; x < 32; x++) {
                     for (int z = 0; z < 32; z++) {
@@ -227,7 +227,7 @@ public final class CachedRegion implements ICachedRegion {
                                 in.readFully(bytes);
                                 bitSets[x][z] = BitSet.valueOf(bytes);
                                 location[x][z] = new HashMap<>();
-                                overview[x][z] = new BlockState[256];
+                                overview[x][z] = new IBlockState[256];
                                 present[x][z] = true;
                                 break;
                             case CHUNK_NOT_PRESENT: