deprecate 1.14.4

2022-02-02 00:13:57 -08:00
150 changed files with 1711 additions and 4433 deletions
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -11,7 +11,7 @@ Operating system:
 Java version:
 Minecraft version:
 Baritone version:
-Other mods (if used): 
+Forge mods (if used): 

 ## Exception, error or logs
 Please find your `latest.log` or `debug.log` in this folder and attach it to the issue
--- a/.github/workflows/gradle_build.yml
+++ b/.github/workflows/gradle_build.yml
@@ -1,45 +0,0 @@
-# This workflow will build a Java project with Gradle
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
-
-name: Java CI with Gradle
-
-on:
-  push:
-  pull_request:
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 8
-      uses: actions/setup-java@v3
-      with:
-        java-version: '8'
-        distribution: 'temurin'
-        
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-      
-    - name: Build with Gradle
-      run: ./gradlew build
-      
-    - name: Build (fabric) with Gradle
-      run: ./gradlew build -Pbaritone.fabric_build
-
-    - name: Build (forge) with Gradle
-      run: ./gradlew build -Pbaritone.forge_build
-
-    - name: Archive Artifacts
-      uses: actions/upload-artifact@v3
-      with:
-        name: Artifacts
-        path: dist/
-        
-    - name: Archive mapping.txt
-      uses: actions/upload-artifact@v3
-      with:
-        name: Mappings
-        path: build/tmp/proguard/mapping.txt
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -1,26 +0,0 @@
-
-name: Tests
-
-on:
-  push:
-  pull_request:
-
-jobs:
-  test:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 8
-      uses: actions/setup-java@v3
-      with:
-        java-version: '8'
-        distribution: 'temurin'
-        
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-      
-    - name: Executing tests
-      run: ./gradlew test
-    
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
 run/
 autotest/
 dist/
-volderyarn/

 # Gradle
 build/
@@ -21,15 +20,6 @@ classes/
 *.iws
 /logs/

-# Eclipse Files
-.classpath
-.project
-.settings/
-baritone_Client.launch
-
 # Copyright Files
 !/.idea/copyright/Baritone.xml
 !/.idea/copyright/profiles_settings.xml
-
-.vscode/launch.json
-
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,14 +0,0 @@
-image: java:8
-
-before_script:
-  - which java
-  - which javac
-
-build:
-  script:
-    - ./gradlew build
-    - ./gradlew build -Pbaritone.forge_build
-  artifacts:
-    paths:
-      - dist/*
-    expire_in: 1 week
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,28 @@
+language: java
+
+sudo: required
+
+services:
+- docker
+
+install:
+- travis_retry docker build -t cabaletta/baritone .
+
+script:
+- docker run --name baritone cabaletta/baritone ./gradlew javadoc
+- docker cp baritone:/code/dist dist
+- ls dist
+- cat dist/checksums.txt
+
+deploy:
+  provider: releases
+  api_key:
+    secure: YOuiXoJNpB4bW89TQoY2IGXg0tqOKls55YMXsSPU6Mx8WzRu8CjjO/A8KA9nGfNrKM+NucjiKr/h53O2Dp2uyy0i0SLvav/G0MaBMeB1NlPRwFopi6tVPNaoZsvr8NW4BIURhspckYLpOTYWnfmOkIv8q7AxrjUZWPKDlq0dte20UxEqUE6msHJ7U9XlKo/4fX40kvWMfwGI2hTyAtL0cRT1QPsd+uW3OQjAPcQj+jKaWld46V8pBK8g9Qde9mo8HC9NBv97zw1bBF1EFkynW569kElHvaS2Opl2QLGaf66guDbpnqDpGHMhQrDdxsZHJ4RksyITn+8A9UArmbkU35BxKqBeQqOWxod2+M0axdLh1pvX43Q1t9n7RiZBf7GvV8vkXL5Sjf8v6Y4LqkJGhvQkTUwpH+0knwrE761DMCtBC34AiWG70D4u7msmhurkflr9kmRHSj/3lyJ1Q2lkt8L+FOAlQBVs64vXTsfgc6Yge7N0O3UD5hCkrDNoz3BzhNBdCkbdxdKCGip71UZgUNkPy9o3ui8jATNj9ypx3+U8ovqP0XWlJqUZmyeXyNGW9NrLeCkRLTlLnZ/dv6OPONa1oAu4TwF1w5A+TGRFZcZjH/PnZKZDQ1OYQOR6drLKRYdr2unvuf5KUKUGqZ7aYtLGhP0rBvGWddRV7DSmX/s=
+  all_branches: true
+  file_glob: true
+  file:
+  - dist/*
+  skip_cleanup: true
+  on:
+    tags: true
+    repo: cabaletta/baritone
--- a/2
+++ b/2
@@ -13,5 +13,3 @@ COPY . /code
 WORKDIR /code

 RUN ./gradlew build
-RUN ./gradlew build -Pbaritone.forge_build
-RUN ./gradlew build -Pbaritone.fabric_build
--- a/README.md
+++ b/README.md
@@ -1,129 +1 @@
-# Baritone
-<p align="center">
-  <a href="https://github.com/cabaletta/baritone/releases/"><img src="https://img.shields.io/github/downloads/cabaletta/baritone/total.svg" alt="GitHub All Releases"/></a>
-</p>
-
-<p align="center">
-  <a href="https://github.com/cabaletta/baritone/tree/master"><img src="https://img.shields.io/badge/MC-1.12.2-brightgreen.svg" alt="Minecraft"/></a>
-  <a href="https://github.com/cabaletta/baritone/tree/1.13.2"><img src="https://img.shields.io/badge/MC-1.13.2-yellow.svg" alt="Minecraft"/></a>
-  <a href="https://github.com/cabaletta/baritone/tree/1.14.4"><img src="https://img.shields.io/badge/MC-1.14.4-yellow.svg" alt="Minecraft"/></a>
-  <a href="https://github.com/cabaletta/baritone/tree/1.15.2"><img src="https://img.shields.io/badge/MC-1.15.2-yellow.svg" alt="Minecraft"/></a>
-  <a href="https://github.com/cabaletta/baritone/tree/1.16.5"><img src="https://img.shields.io/badge/MC-1.16.5-brightgreen.svg" alt="Minecraft"/></a>
-  <a href="https://github.com/cabaletta/baritone/tree/1.17.1"><img src="https://img.shields.io/badge/MC-1.17.1-brightgreen.svg" alt="Minecraft"/></a>
-  <a href="https://github.com/cabaletta/baritone/tree/1.18.2"><img src="https://img.shields.io/badge/MC-1.18.2-brightgreen.svg" alt="Minecraft"/></a>
-</p>
-
-<p align="center">
-  <a href="https://travis-ci.com/cabaletta/baritone/"><img src="https://travis-ci.com/cabaletta/baritone.svg?branch=master" alt="Build Status"/></a>
-  <a href="https://github.com/cabaletta/baritone/releases/"><img src="https://img.shields.io/github/release/cabaletta/baritone.svg" alt="Release"/></a>
-  <a href="LICENSE"><img src="https://img.shields.io/badge/license-LGPL--3.0%20with%20anime%20exception-green.svg" alt="License"/></a>
-  <a href="https://www.codacy.com/gh/cabaletta/baritone/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=cabaletta/baritone&amp;utm_campaign=Badge_Grade"><img src="https://app.codacy.com/project/badge/Grade/cadab857dab049438b6e28b3cfc5570e" alt="Codacy Badge"/></a>
-  <a href="https://github.com/cabaletta/baritone/blob/master/CODE_OF_CONDUCT.md"><img src="https://img.shields.io/badge/%E2%9D%A4-code%20of%20conduct-blue.svg?style=flat" alt="Code of Conduct"/></a>
-  <a href="https://snyk.io/test/github/cabaletta/baritone?targetFile=build.gradle"><img src="https://snyk.io/test/github/cabaletta/baritone/badge.svg?targetFile=build.gradle" alt="Known Vulnerabilities"/></a>
-  <a href="https://github.com/cabaletta/baritone/issues/"><img src="https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat" alt="Contributions welcome"/></a>
-  <a href="https://github.com/cabaletta/baritone/issues/"><img src="https://img.shields.io/github/issues/cabaletta/baritone.svg" alt="Issues"/></a>
-  <a href="https://github.com/cabaletta/baritone/issues?q=is%3Aissue+is%3Aclosed"><img src="https://img.shields.io/github/issues-closed/cabaletta/baritone.svg" alt="GitHub issues-closed"/></a>
-  <a href="https://github.com/cabaletta/baritone/pulls/"><img src="https://img.shields.io/github/issues-pr/cabaletta/baritone.svg" alt="Pull Requests"/></a>
-  <a href="https://github.com/cabaletta/baritone/graphs/contributors/"><img src="https://img.shields.io/github/contributors/cabaletta/baritone.svg" alt="GitHub contributors"/></a>
-  <a href="https://github.com/cabaletta/baritone/commit/"><img src="https://img.shields.io/github/commits-since/cabaletta/baritone/v1.0.0.svg" alt="GitHub commits"/></a>
-  <img src="https://img.shields.io/github/languages/code-size/cabaletta/baritone.svg" alt="Code size"/>
-  <img src="https://img.shields.io/github/repo-size/cabaletta/baritone.svg" alt="GitHub repo size"/>
-  <img src="https://tokei.rs/b1/github/cabaletta/baritone?category=code" alt="Lines of Code"/>
-</p>
-
-<p align="center">
-  <a href="https://impactclient.net/"><img src="https://img.shields.io/badge/Impact%20integration-v1.2.14%20/%20v1.3.8%20/%20v1.4.6%20/%20v1.5.3%20/%20v1.6.3-brightgreen.svg" alt="Impact integration"/></a>
-  <a href="https://github.com/kami-blue/client"><img src="https://img.shields.io/badge/KAMI%20Blue%20integration-v1.2.14--master-green" alt="KAMI Blue integration"/></a>
-  <a href="https://github.com/fr1kin/ForgeHax/"><img src="https://img.shields.io/badge/ForgeHax%20%22integration%22-scuffed-yellow.svg" alt="ForgeHax integration"/></a>
-  <a href="https://aristois.net/"><img src="https://img.shields.io/badge/Aristois%20add--on%20integration-v1.6.3-green.svg" alt="Aristois add-on integration"/></a>
-  <a href="https://rootnet.dev/"><img src="https://img.shields.io/badge/rootNET%20integration-v1.2.14-green.svg" alt="rootNET integration"/></a>
-  <a href="https://futureclient.net/"><img src="https://img.shields.io/badge/Future%20integration-v1.2.12%20%2F%20v1.3.6%20%2F%20v1.4.4-red" alt="Future integration"/></a>
-  <a href="https://rusherhack.org/"><img src="https://img.shields.io/badge/RusherHack%20integration-v1.2.14-green" alt="RusherHack integration"/></a>
-</p>
-
-<p align="center">
-  <a href="http://forthebadge.com/"><img src="https://forthebadge.com/images/badges/built-with-swag.svg" alt="forthebadge"/></a>
-  <a href="http://forthebadge.com/"><img src="https://forthebadge.com/images/badges/mom-made-pizza-rolls.svg" alt="forthebadge"/></a>
-</p>
-
-A Minecraft pathfinder bot.
-
-[**Baritone Discord Server**](http://discord.gg/s6fRBAUpmr)
-
-Baritone is the pathfinding system used in [Impact](https://impactclient.net/) since 4.4. There's a [showcase video](https://youtu.be/CZkLXWo4Fg4) made by @Adovin#0730 on Baritone which I recommend. [Here's](https://www.youtube.com/watch?v=StquF69-_wI) a (very old!) video I made showing off what it can do.
-
-[Tutorial playlist](https://www.youtube.com/playlist?list=PLnwnJ1qsS7CoQl9Si-RTluuzCo_4Oulpa)
-
-The easiest way to install Baritone is to install [Impact](https://impactclient.net/), which comes with Baritone. The second easiest way (for 1.12.2 only) is to 
-install the v1.2.* `api-forge` jar from [releases](https://github.com/cabaletta/baritone/releases). **For 1.12.2 Forge, just click 
-[here](https://github.com/cabaletta/baritone/releases/download/v1.2.17/baritone-api-forge-1.2.17.jar)**. Otherwise, see [Installation & setup](SETUP.md). Once Baritone is installed, look [here](USAGE.md) for instructions on how to use it.
-
-For 1.16.5, [click here](https://www.youtube.com/watch?v=_4eVJ9Qz2J8) and see description. If you need Forge or Fabric 1.16.5, look [here](https://github.com/cabaletta/baritone/releases/tag/v1.6.3) and get the `api-forge` or `api-fabric` jar. **For 1.16.5 Fabric, just click [here](https://github.com/cabaletta/baritone/releases/download/v1.6.3/baritone-api-fabric-1.6.3.jar)**.
-
-If you need Forge or Fabric 1.17.1, look [here](https://github.com/cabaletta/baritone/releases/tag/v1.7.2) and get the `api-forge` or `api-fabric` jar. **For 1.17.1 Fabric, just click [here](https://github.com/cabaletta/baritone/releases/download/v1.7.2/baritone-api-fabric-1.7.2.jar)**.
-
-If you need Forge or Fabric 1.18.2, look [here](https://github.com/cabaletta/baritone/releases/tag/v1.8.3) and get the `api-forge` or `api-fabric` jar. **For 1.18.2 Fabric, just click [here](https://github.com/cabaletta/baritone/releases/download/v1.8.3/baritone-api-fabric-1.8.3.jar)**. **For 1.18.2 Forge, just click [here](https://github.com/cabaletta/baritone/releases/download/v1.8.3/baritone-api-forge-1.8.3.jar)**.
-
-This project is an updated version of [MineBot](https://github.com/leijurv/MineBot/),
-the original version of the bot for Minecraft 1.8.9, rebuilt for 1.12.2 onwards. 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 an X/Z goal.
-
-```java
-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 complies with the LGPL 3.0 License)
-
-## How is it so fast?
-
-Magic. (Hours of [leijurv](https://github.com/leijurv/) enduring excruciating pain)
-
-### Additional Special Thanks To:
-
-![YourKit-Logo](https://www.yourkit.com/images/yklogo.png)
-
-YourKit supports open source projects with innovative and intelligent tools for monitoring and profiling Java and .NET applications.
-
-YourKit is the creator of the [YourKit Java Profiler](https://www.yourkit.com/java/profiler/), [YourKit .NET Profiler](https://www.yourkit.com/.net/profiler/), and [YourKit YouMonitor](https://www.yourkit.com/youmonitor/).
-
-We thank them for granting Baritone an OSS license so that we can make our software the best it can be.
-
-## Why is it called Baritone?
-
-It's named for FitMC's deep sultry voice.
+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.
--- a/SETUP.md
+++ b/SETUP.md
@@ -2,7 +2,7 @@

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

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

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

@@ -11,9 +11,9 @@ These releases are not always completely up to date with latest features, and ar

 Link to the releases page: [Releases](https://github.com/cabaletta/baritone/releases)

-v1.2.* is for 1.12.2, v1.3.* is for 1.13.2, v1.4.* is for 1.14.4, v1.5.* is for 1.15.2, v1.6.* is for 1.16.5, v1.7.* is for 1.17.1, v1.8.* is for 1.18.1
+v1.2.* is for 1.12.2, v1.3.* is for 1.13.2

-Any official release will be GPG signed by leijurv (44A3EA646EADAC6A). Please verify that the hash of the file you download is in `checksums.txt` and that `checksums_signed.asc` is a valid signature by that public keys of `checksums.txt`. 
+Any official release will be GPG signed by leijurv (44A3EA646EADAC6A) and ZeroMemes (73A788379A197567). Please verify that the hash of the file you download is in `checksums.txt` and that `checksums_signed.asc` is a valid signature by those two public keys of `checksums.txt`. 

 The build is fully deterministic and reproducible, and you can verify Travis did it properly by running `docker build --no-cache -t cabaletta/baritone .` yourself and comparing the shasum. This works identically on Travis, Mac, and Linux (if you have docker on Windows, I'd be grateful if you could let me know if it works there too).

@@ -22,16 +22,20 @@ The build is fully deterministic and reproducible, and you can verify Travis did

 Building Baritone will result in 5 artifacts created in the ``dist`` directory. These are the same as the artifacts created in the [releases](https://github.com/cabaletta/baritone/releases).

-**The Forge and Fabric releases can simply be added as a Forge/Fabric mods.**
+**The Forge release can simply be added as a Forge mod.**

 If another one of your Forge mods has a Baritone integration, you want `baritone-api-forge-VERSION.jar`. Otherwise, you want `baritone-standalone-forge-VERSION.jar`

 - **API**: Only the non-api packages are obfuscated. This should be used in environments where other mods would like to use Baritone's features.
- **Forge/Fabric API**: Same as API, but packaged for Forge/Fabric. This should be used where another mod has a Baritone integration.
+- **Forge API**: Same as API, but packaged for Forge. This should be used where another mod has a Baritone integration.
 - **Standalone**: Everything is obfuscated. This should be used in environments where there are no other mods present that would like to use Baritone's features.
- **Forge/Fabric Standalone**: Same as Standalone, but packaged for Forge/Fabric. This should be used when Baritone is your only Forge/Fabric mod, or none of your other Forge/Fabric mods integrate with Baritone.
+- **Forge Standalone**: Same as Standalone, but packaged for Forge. This should be used when Baritone is your only Forge mod, or none of your other Forge mods integrate with Baritone.
 - **Unoptimized**: Nothing is obfuscated. This shouldn't be used ever in production.
- **Forge/Fabric Unoptimized**: Same as Unoptimized, but packaged for Forge/Fabric.
+
+## More Info
+To replace out Impact 4.5's Baritone build with a customized one, build Baritone as above then copy & **rename** `dist/baritone-api-$VERSION$.jar` into `minecraft/libraries/cabaletta/baritone-api/1.2/baritone-api-1.2.jar`, replacing the jar that was previously there. You also need to edit `minecraft/versions/1.12.2-Impact_4.5/1.12.2-Impact_4.5.json`, find the line `"name": "cabaletta:baritone-api:1.2"`, remove the comma from the end, and **entirely remove the NEXT line** (starts with `"url"`). **Restart your launcher** then load as normal. 
+
+You can verify whether or not it worked by running `.b version` in chat (only valid in Impact). It should print out the version that you downloaded. Note: The version that comes with 4.5 is `v1.2.3`.

 ## Build it yourself
 - Clone or download Baritone
@@ -43,13 +47,13 @@ If another one of your Forge mods has a Baritone integration, you want `baritone
 ## Command Line
 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 for 1.12.2-1.16.5, JDK 16 for 1.17.1, and JDK 17 for 1.18.1.
+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 for 1.12.2-1.16.5, it might not work because the Java distributions above JDK 8 using may not have the needed javax classes.
+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 download: https://openjdk.java.net/install/
+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`
@@ -85,12 +89,6 @@ For minecraft 1.15.2+, run the following instead to include the Forge jars:
 $ gradlew build -Pbaritone.forge_build
 ```

-Do this instead for Fabric jars:
-
-```
-$ gradlew build -Pbaritone.fabric_build
-```
-
 Running Baritone:

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

 To toggle a boolean setting, just say its name in chat (for example saying `allowBreak` toggles whether Baritone will consider breaking blocks). For a numeric setting, say its name then the new value (like `primaryTimeoutMS 250`). It's case insensitive. To reset a setting to its default value, say `acceptableThrowawayItems reset`. To reset all settings, say `reset`. To see all settings that have been modified from their default values, say `modified`.

-Commands in Baritone:
+Some common examples:
 - `thisway 1000` then `path` to go in the direction you're facing for a thousand blocks
 - `goal x y z` or `goal x z` or `goal y`, then `path` to set a goal to a certain coordinate then path to it
 - `goto x y z` or `goto x z` or `goto y` to go to a certain coordinate (in a single step, starts going immediately)
 - `goal` to set the goal to your player's feet
 - `goal clear` to clear the goal
- `cancel` or `stop` to stop everything, `forcecancel` is also an option
+- `cancel` or `stop` to stop everything
 - `goto portal` or `goto ender_chest` or `goto block_type` to go to a block. (in Impact, `.goto` is an alias for `.b goto` for the most part)
 - `mine diamond_ore iron_ore` to mine diamond ore or iron ore (turn on the setting `legitMine` to only mine ores that it can actually see. It will explore randomly around y=11 until it finds them.) An amount of blocks can also be specified, for example, `mine 64 diamond_ore`.
 - `click` to click your destination on the screen. Right click path to on top of the block, left click to path into it (either at foot level or eye level), and left click and drag to select an area (`#help sel` to see what you can do with that selection).
@@ -47,23 +47,15 @@ Commands in Baritone:
 - `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).
 - `schematica` to build the schematic that is currently open in schematica
 - `tunnel` to dig and make a tunnel, 1x2. It will only deviate from the straight line if necessary such as to avoid lava. For a dumber tunnel that is really just cleararea, you can `tunnel 3 2 100`, to clear an area 3 high, 2 wide, and 100 deep.
- `farm` to automatically harvest, replant, or bone meal crops. Use `farm <range>` or `farm <range> <waypoint>` to limit the max distance from the starting point or a waypoint. 
+- `farm` to automatically harvest, replant, or bone meal crops
 - `axis` to go to an axis or diagonal axis at y=120 (`axisHeight` is a configurable setting, defaults to 120).
 - `explore x z` to explore the world from the origin of x,z. Leave out x and z to default to player feet. This will continually path towards the closest chunk to the origin that it's never seen before. `explorefilter filter.json` with optional invert can be used to load in a list of chunks to load.
 - `invert` to invert the current goal and path. This gets as far away from it as possible, instead of as close as possible. For example, do `goal` then `invert` to run as far as possible from where you're standing at the start.
- `come` tells Baritone to head towards your camera, useful when freecam doesn't move your player position.
- `blacklist` will stop baritone from going to the closest block so it won't attempt to get to it.
- `eta` to get information about the estimated time until the next segment and the goal, be aware that the ETA to your goal is really unprecise.
- `proc` to view miscellaneous information about the process currently controlling Baritone.
- `repack` to re-cache the chunks around you.
- `gc` to call `System.gc()` which may free up some memory.
- `render` to fix glitched chunk rendering without having to reload all of them.
- `reloadall` to reload Baritone's world cache or `saveall` to save Baritone's world cache.
- `find` to search through Baritone's cache and attempt to find the location of the block.
- `surface` or `top` to tell Baritone to head towards the closest surface-like area, this can be the surface or highest available air space.
 - `version` to get the version of Baritone you're running
 - `damn` daniel

+For the rest of the commands, you can take a look at the code [here](https://baritone.leijurv.com/baritone/api/Settings.html).
+
 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>.

 There are about a hundred settings, but here are some fun / interesting / important ones that you might want to look at changing in normal usage of Baritone. The documentation for each can be found at the above links.
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@
 */

 group 'baritone'
-version '1.6.4'
+version '1.4.6'

 buildscript {
    repositories {
@@ -28,46 +28,22 @@ buildscript {
            name = 'impactdevelopment-repo'
            url = 'https://impactdevelopment.github.io/maven/'
        }
-        maven {
-            url = 'https://www.dogforce-games.com/maven/'
-        }
-        maven {
-            url = 'https://maven.fabricmc.net/'
-        }
-        maven {
-            url = 'https://libraries.minecraft.net/'
-        }
-        mavenCentral()
        jcenter()
    }

    dependencies {
        classpath group: 'com.github.ImpactDevelopment', name: 'ForgeGradle', version: '3.0.115'
        classpath group: 'com.github.ImpactDevelopment', name: 'MixinGradle', version: '0.6.2'
-        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.7-SNAPSHOT'
    }
 }

-
-import baritone.gradle.fabric.CreateVolderYarn
 import baritone.gradle.task.CreateDistTask
 import baritone.gradle.task.ProguardTask
-import net.minecraftforge.gradle.userdev.tasks.RenameJarInPlace
 import org.apache.tools.ant.taskdefs.condition.Os

 apply plugin: 'java'
-apply plugin: 'maven'
-
-def mcpVersion = [channel: 'snapshot', version: '20201028-1.16.3']
-
-if (getProject().hasProperty("baritone.fabric_build")) {
-    CreateVolderYarn.genMappings("1.16.5", mcpVersion)
-    apply plugin: 'fabric-loom'
-} else {
-    apply plugin: 'net.minecraftforge.gradle'
-    apply plugin: 'org.spongepowered.mixin'
-}
-
+apply plugin: 'net.minecraftforge.gradle'
+apply plugin: 'org.spongepowered.mixin'

 sourceCompatibility = targetCompatibility = '1.8'
 compileJava {
@@ -75,7 +51,6 @@ compileJava {
    options.encoding = "UTF-8" // allow emoji in comments :^)
 }

-
 sourceSets {
    api {
        compileClasspath += main.compileClasspath
@@ -105,59 +80,46 @@ task sourceJar(type: Jar, dependsOn: classes) {
    classifier = 'sources'
    from sourceSets.api.allSource
 }
-if (getProject().hasProperty("baritone.fabric_build")) {
-    minecraft.refmapName = "mixins.baritone.refmap.json"
-} else {
-    minecraft {
-        mappings mcpVersion

-        if (getProject().hasProperty("baritone.forge_build")) {
-            reobfMappings 'searge'
-        } else {
-            reobfMappings 'notch'
-        }
+minecraft {
+    mappings channel: 'snapshot', version: '20190814-1.14.3'
+    reobfMappings 'notch'

-        runs {
-            client {
-                workingDirectory project.file('run')
-                source sourceSets.launch
+    runs {
+        client {
+            workingDirectory project.file('run')
+            source sourceSets.launch

-                main 'baritone.launch.LaunchTesting'
+            main 'baritone.launch.LaunchTesting'

-                environment 'assetIndex', '{asset_index}'
-                environment 'assetDirectory', downloadAssets.output
-                environment 'nativesDirectory', extractNatives.output
+            environment 'assetIndex', '{asset_index}'
+            environment 'assetDirectory', downloadAssets.output
+            environment 'nativesDirectory', extractNatives.output

-                environment 'tweakClass', 'baritone.launch.BaritoneTweaker'
+            environment 'tweakClass', 'baritone.launch.BaritoneTweaker'

-                if (Os.isFamily(Os.FAMILY_MAC)) {
-                    jvmArgs "-XstartOnFirstThread"
-                }
-            }
-
-            autoTest {
-                workingDirectory project.file('autotest')
-                source sourceSets.launch
-
-                main 'baritone.launch.LaunchTesting'
-
-                environment 'assetIndex', '{asset_index}'
-                environment 'assetDirectory', downloadAssets.output
-                environment 'nativesDirectory', extractNatives.output
-
-                environment 'tweakClass', 'baritone.launch.BaritoneTweaker'
-                environment 'BARITONE_AUTO_TEST', 'true'
-
-                if (Os.isFamily(Os.FAMILY_MAC)) {
-                    jvmArgs "-XstartOnFirstThread"
-                }
+            if (Os.isFamily(Os.FAMILY_MAC)) {
+                jvmArgs "-XstartOnFirstThread"
            }
        }
-    }

-    mixin {
-        defaultObfuscationEnv searge
-        add sourceSets.launch, 'mixins.baritone.refmap.json'
+        autoTest {
+            workingDirectory project.file('autotest')
+            source sourceSets.launch
+
+            main 'baritone.launch.LaunchTesting'
+
+            environment 'assetIndex', '{asset_index}'
+            environment 'assetDirectory', downloadAssets.output
+            environment 'nativesDirectory', extractNatives.output
+
+            environment 'tweakClass', 'baritone.launch.BaritoneTweaker'
+            environment 'BARITONE_AUTO_TEST', 'true'
+
+            if (Os.isFamily(Os.FAMILY_MAC)) {
+                jvmArgs "-XstartOnFirstThread"
+            }
+        }
    }
 }

@@ -168,49 +130,38 @@ repositories {
        name = 'SpongePowered'
        url = 'https://repo.spongepowered.org/repository/maven-public/'
    }
+
    maven {
        name = 'impactdevelopment-repo'
        url = 'https://impactdevelopment.github.io/maven/'
    }
-    maven {
-        url = 'https://www.dogforce-games.com/maven/'
-    }
 }

 dependencies {
-    if (getProject().hasProperty("baritone.fabric_build")) {
-        minecraft "com.mojang:minecraft:1.16.5"
-        mappings fileTree(dir: "./build/volderyarn", include: "**.jar")
-        modImplementation "net.fabricmc:fabric-loader:0.9.1+build.205"
+    minecraft 'com.github.ImpactDevelopment:Vanilla:1.14.4'

-        // this makes it compile with the forge tweak stuff
-        implementation 'com.github.ImpactDevelopment:SimpleTweaker:1.2'
-        implementation('net.minecraft:launchwrapper:1.12') {
-            exclude module: 'lwjgl'
-        }
-
-        implementation 'com.google.code.findbugs:jsr305:3.0.2'
-    } else {
-        minecraft 'com.github.ImpactDevelopment:Vanilla:1.16.5'
-
-        runtime launchCompile('net.minecraft:launchwrapper:1.12') {
-            exclude module: 'lwjgl'
-        }
-        runtime launchCompile('org.ow2.asm:asm-debug-all:5.2')
-        runtime launchCompile('com.github.ImpactDevelopment:SimpleTweaker:1.2')
-        runtime launchCompile('org.spongepowered:mixin:0.8.3') {
-            // Mixin includes a lot of dependencies that are too up-to-date
-            exclude module: 'launchwrapper'
-            exclude module: 'guava'
-            exclude module: 'gson'
-            exclude module: 'commons-io'
-            exclude module: 'log4j-core'
-        }
+    runtime launchCompile('net.minecraft:launchwrapper:1.12') {
+        exclude module: 'lwjgl'
+    }
+    runtime launchCompile('org.ow2.asm:asm-debug-all:5.2')
+    runtime launchCompile('com.github.ImpactDevelopment:SimpleTweaker:1.2')
+    runtime launchCompile('org.spongepowered:mixin:0.7.11-SNAPSHOT') {
+        // Mixin includes a lot of dependencies that are too up-to-date
+        exclude module: 'launchwrapper'
+        exclude module: 'guava'
+        exclude module: 'gson'
+        exclude module: 'commons-io'
+        exclude module: 'log4j-core'
    }

    testImplementation 'junit:junit:4.12'
 }

+mixin {
+    defaultObfuscationEnv searge
+    add sourceSets.launch, 'mixins.baritone.refmap.json'
+}
+
 javadoc {
    options.addStringOption('Xwerror', '-quiet') // makes the build fail on travis when there is a javadoc error
    options.linkSource true
@@ -219,25 +170,6 @@ javadoc {
    classpath += sourceSets.api.compileClasspath
 }

-if (getProject().hasProperty("baritone.fabric_build")) {
-    // skidded from fabric-example-mod (comments and all)
-    tasks.withType(JavaCompile).configureEach {
-        // ensure that the encoding is set to UTF-8, no matter what the system default is
-        // this fixes some edge cases with special characters not displaying correctly
-        // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-        // If Javadoc is generated, this must be specified in that task too.
-        it.options.encoding = "UTF-8"
-
-        // The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
-        // JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
-        // We'll use that if it's available, but otherwise we'll use the older option.
-        def targetVersion = 8
-        if (JavaVersion.current().isJava9Compatible()) {
-            it.options.release = targetVersion
-        }
-    }
-}
-
 jar {
    from sourceSets.launch.output, sourceSets.api.output

@@ -249,113 +181,21 @@ jar {
    preserveFileTimestamps = false
    reproducibleFileOrder = true

-    if (getProject().hasProperty("baritone.fabric_build")) {
-        filesMatching("fabric.mod.json") {
-            expand "version": version
-        }
-    } else {
-        exclude("fabric.mod.json")
-    }
-
-
    manifest {
        attributes(
                'MixinConfigs': 'mixins.baritone.json',
-                "MixinConnector": "baritone.launch.BaritoneMixinConnector",

                'Implementation-Title': 'Baritone',
-                'Implementation-Version': version,
+                'Implementation-Version': version
        )
    }
 }

-// skidded from ProguardTask
-File getClientJar() {
-    return project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("launch").getRuntimeClasspath().getFiles()
-            .stream()
-            .filter({ f -> f.toString().endsWith("client-extra.jar") })
-            .map({ f -> new File(f.getParentFile(), "client.jar") })
-            .findFirst()
-            .get()
+task proguard(type: ProguardTask) {
+    url 'https://downloads.sourceforge.net/project/proguard/proguard/6.0/proguard6.0.3.zip'
+    extract 'proguard6.0.3/lib/proguard.jar'
 }

-File getClientJarFabric() {
-    return project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("launch").getRuntimeClasspath().getFiles()
-            .stream()
-            .filter({ f -> f.getName().endsWith("-v2.jar") && f.getName().startsWith("minecraft-") })
-            .map({ f -> new File(f.getParentFile().getParentFile(), f.getName().toString().replace("mapped", "intermediary")) })
-            .findFirst()
-            .get()
-}
+task createDist(type: CreateDistTask, dependsOn: proguard)

-if (getProject().hasProperty("baritone.fabric_build")) {
-    task copyMcJar(type: Copy) {
-        def mcJar = { getClientJarFabric() }
-
-        from mcJar
-        into 'build/createMcIntermediaryJar/'
-        rename { 'client.jar' }
-    }
-
-    task proguard(type: ProguardTask, dependsOn: copyMcJar) {
-        url 'https://downloads.sourceforge.net/project/proguard/proguard/6.0/proguard6.0.3.zip'
-        extract 'proguard6.0.3/lib/proguard.jar'
-    }
-
-    task createDist(type: CreateDistTask, dependsOn: proguard)
-
-} else {
-    task copyMcJar(type: Copy) {
-        def mcJar = { getClientJar() }
-
-        from mcJar
-        into 'build/createMcSrgJar/'
-        rename { 'client-srg.jar' }
-    }
-
-    task createSrgMc(type: RenameJarInPlace) {
-        setInput(new File(copyMcJar.getOutputs().getFiles().getSingleFile(), "client-srg.jar"))
-        setClasspath(files({ getClientJar() }))
-
-        // fork
-        setMappingType(net.minecraftforge.gradle.common.util.MappingFile.Mapping.SEARGE)
-        setJarTask('trans alaska pipeline')
-    }
-
-    project.afterEvaluate {
-        createSrgMc.dependsOn(extractSrg, copyMcJar)
-        createSrgMc.setMappings(extractSrg.getOutput())
-    }
-
-
-    task proguard(type: ProguardTask, dependsOn: createSrgMc) { // TODO: dont need to create srg mc if doing notch build
-        url 'https://downloads.sourceforge.net/project/proguard/proguard/6.0/proguard6.0.3.zip'
-        extract 'proguard6.0.3/lib/proguard.jar'
-    }
-
-    task createDist(type: CreateDistTask, dependsOn: proguard)
-
-}
 build.finalizedBy(createDist)
-
-install {
-    def jarApiName = String.format("%s-api-%s", rootProject.name, version.toString())
-    def jarApiForgeName = String.format("%s-api-forge-%s", rootProject.name, version.toString())
-    def jarSAName = String.format("%s-standalone-%s", rootProject.name, version.toString())
-    def jarSAForgeName = String.format("%s-standalone-forge-%s", rootProject.name, version.toString())
-
-    artifacts {
-        archives file("$buildDir/libs/"+jarApiName+".jar")
-        archives file("$buildDir/libs/"+jarApiForgeName+".jar")
-        archives file("$buildDir/libs/"+jarSAName+".jar")
-        archives file("$buildDir/libs/"+jarSAForgeName+".jar")
-    }
-    repositories.mavenInstaller {
-		addFilter('api') { artifact, file -> artifact.name == "baritone-api" }
-		addFilter('api-forge') { artifact, file -> artifact.name == "baritone-api-forge" }
-		addFilter('standalone') { artifact, file -> artifact.name == "baritone-standalone" }
-		addFilter('standalone-forge') { artifact, file -> artifact.name == "baritone-standalone-forge" }
-    }
-}
-
-install.dependsOn(build)
--- a/buildSrc/src/main/java/baritone/gradle/fabric/CreateVolderYarn.java
+++ b/buildSrc/src/main/java/baritone/gradle/fabric/CreateVolderYarn.java
@@ -1,259 +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.gradle.fabric;
-
-import java.io.*;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-import java.util.zip.ZipOutputStream;
-
-/**
- * @Author Wagyourtail
- */
-public class CreateVolderYarn {
-    public static String VOLDERYARNFOLDER = "./build/volderyarn/";
-    public static String VOLDERYARN = "volderyarn-%s-%s-%s.jar";
-
-    public static void genMappings(String mcVersion, Map<String, String> mcpVersion) throws IOException {
-        //download yarn intermediary
-        URL intURL = new URL(String.format("https://maven.fabricmc.net/net/fabricmc/intermediary/%s/intermediary-%s-v2.jar", mcVersion, mcVersion));
-        String intermediary = readZipContentFromURL(intURL, "mappings/mappings.tiny").get("mappings/mappings.tiny");
-        Map<String, ClassData> mappings = parseTinyMap(intermediary);
-
-        //download srg
-        URL srgURL = new URL(String.format("https://files.minecraftforge.net/maven/de/oceanlabs/mcp/mcp_config/%s/mcp_config-%s.zip", mcVersion, mcVersion));
-        String tsrg = readZipContentFromURL(srgURL, "config/joined.tsrg").get("config/joined.tsrg");
-        MCPData mcpData = addTSRGData(mappings, tsrg);
-
-        //download mcp
-        URL mcpURL = new URL(String.format("https://files.minecraftforge.net/maven/de/oceanlabs/mcp/mcp_%s/%s/mcp_%s-%s.zip", mcpVersion.get("channel"), mcpVersion.get("version"), mcpVersion.get("channel"), mcpVersion.get("version")));
-        Map<String, String> mcpfiles = readZipContentFromURL(mcpURL, "fields.csv", "methods.csv");
-        addMCPData(mcpData, mcpfiles.get("fields.csv"), mcpfiles.get("methods.csv"));
-
-        StringBuilder builder = new StringBuilder("tiny\t2\t0\tintermediary\tnamed");
-        for (ClassData clazz : mappings.values()) {
-            builder.append("\n").append(clazz.getIntToMCP());
-        }
-
-        File outputFolder = new File(VOLDERYARNFOLDER);
-        if (!outputFolder.exists() && !outputFolder.mkdirs())
-            throw new RuntimeException("Failed to create dir for volderyarn mappings.");
-
-        for (File f : outputFolder.listFiles()) {
-            if (!f.isDirectory()) f.delete();
-        }
-
-        File outputFile = new File(outputFolder, String.format(VOLDERYARN, mcVersion, mcpVersion.get("channel"), mcpVersion.get("version")));
-        if (!outputFile.getParentFile().exists()) {
-            if (!outputFile.getParentFile().mkdir())
-                throw new FileNotFoundException("Failed to create folder for volderyarn!");
-        }
-
-        try (ZipOutputStream output = new ZipOutputStream(new FileOutputStream(outputFile))) {
-            output.putNextEntry(new ZipEntry("mappings/mappings.tiny"));
-            byte[] outData = builder.toString().getBytes(StandardCharsets.UTF_8);
-            output.write(outData, 0, outData.length);
-        }
-    }
-
-    private static Map<String, ClassData> parseTinyMap(String map) {
-        Map<String, ClassData> mappings = new LinkedHashMap<>();
-        ClassData clazzdata = null;
-        for (String line : map.split("\n")) {
-            String[] parts = line.trim().split("\t");
-            switch (parts[0]) {
-                case "c":
-                    mappings.put(parts[1], clazzdata = new ClassData(mappings, parts[1], parts[2]));
-                    break;
-                case "m":
-                    assert clazzdata != null;
-                    clazzdata.addMethod(parts[2], parts[1], parts[3]);
-                    break;
-                case "f":
-                    assert clazzdata != null;
-                    clazzdata.addField(parts[2], parts[1], parts[3]);
-                    break;
-                default:
-            }
-        }
-        return mappings;
-    }
-
-    private static MCPData addTSRGData(Map<String, ClassData> mappings, String tsrg) {
-        MCPData mcpData = new MCPData();
-        String[] classes = String.join("\t", tsrg.split("\n\t")).split("\n");
-        for (String c : classes) {
-            String[] lines = c.split("\t");
-            String[] classData = lines[0].split("\\s+");
-            ClassData clazz = mappings.get(classData[0]);
-            if (clazz == null) continue;
-            clazz.mcpName = classData[1];
-            for (int i = 1; i < lines.length; ++i) {
-                String[] lineData = lines[i].split("\\s+");
-                //method
-                if (lineData.length == 3) {
-                    if (!mcpData.methods.containsKey(lineData[2])) mcpData.methods.put(lineData[2], new LinkedList<>());
-                    MethodData d = clazz.methods.get(lineData[0] + lineData[1]);
-                    if (d == null) continue;
-                    d.mcpName = lineData[2];
-                    mcpData.methods.get(lineData[2]).add(d);
-                    //field
-                } else {
-                    if (!mcpData.fields.containsKey(lineData[1])) mcpData.fields.put(lineData[1], new LinkedList<>());
-                    FieldData d = clazz.fields.get(lineData[0]);
-                    if (d == null) continue;
-                    d.mcpName = lineData[1];
-                    mcpData.fields.get(lineData[1]).add(d);
-                }
-            }
-        }
-        return mcpData;
-    }
-
-    private static void addMCPData(MCPData mcpData, String fields, String methods) {
-        for (String field : fields.split("\n")) {
-            String[] fieldData = field.split(",");
-            mcpData.fields.getOrDefault(fieldData[0].trim(), new LinkedList<>()).forEach(f -> f.mcpName = fieldData[1].trim());
-        }
-
-        for (String method : methods.split("\n")) {
-            String[] methodData = method.split(",");
-            mcpData.methods.getOrDefault(methodData[0].trim(), new LinkedList<>()).forEach(m -> m.mcpName = methodData[1].trim());
-        }
-    }
-
-    private static Map<String, String> readZipContentFromURL(URL remote, String... files) throws IOException {
-        try (ZipInputStream is = new ZipInputStream(new BufferedInputStream(remote.openStream(), 1024))) {
-            byte[] buff = new byte[1024];
-            ZipEntry entry;
-            Set<String> fileList = new HashSet<>(Arrays.asList(files));
-            Map<String, String> fileContents = new HashMap<>();
-            while ((entry = is.getNextEntry()) != null) {
-                if (fileList.contains(entry.getName())) {
-                    StringBuilder builder = new StringBuilder();
-                    int read;
-                    while ((read = is.read(buff, 0, 1024)) > 0) {
-                        builder.append(new String(buff, 0, read));
-                    }
-                    fileContents.put(entry.getName(), builder.toString());
-                }
-            }
-            return fileContents;
-        }
-    }
-
-    private static class ClassData {
-        final Map<String, ClassData> classMap;
-        final String obf;
-        final String intermediary;
-        String mcpName;
-
-        final Map<String, MethodData> methods = new LinkedHashMap<>();
-        final Map<String, FieldData> fields = new LinkedHashMap<>();
-
-        public ClassData(Map<String, ClassData> classMap, String obf, String intermediary) {
-            this.classMap = classMap;
-            this.obf = obf;
-            this.intermediary = intermediary;
-        }
-
-        public void addMethod(String obf, String obfSig, String intermediary) {
-            methods.put(obf + obfSig, new MethodData(classMap, obf, obfSig, intermediary));
-        }
-
-        public void addField(String obf, String obfSig, String intermediary) {
-            fields.put(obf, new FieldData(classMap, obf, obfSig, intermediary));
-        }
-
-        public String getIntToMCP() {
-            StringBuilder builder = new StringBuilder("c\t").append(intermediary).append("\t").append(mcpName);
-            for (MethodData method : methods.values()) {
-                builder.append("\n\tm\t").append(method.getIntermediarySig()).append("\t").append(method.intermediary).append("\t").append(method.mcpName);
-            }
-            for (FieldData field : fields.values()) {
-                builder.append("\n\tf\t").append(field.getIntermediarySig()).append("\t").append(field.intermediary).append("\t").append(field.mcpName);
-            }
-            return builder.toString();
-        }
-    }
-
-    private static class MethodData {
-        final Map<String, ClassData> classMap;
-        final String obf;
-        final String intermediary;
-        String mcpName;
-
-        final String obfSig;
-
-        public MethodData(Map<String, ClassData> classMap, String obf, String obfSig, String intermediary) {
-            this.classMap = classMap;
-            this.obf = obf;
-            this.obfSig = obfSig;
-            this.intermediary = intermediary;
-        }
-
-        public String getIntermediarySig() {
-            int offset = 0;
-            Matcher m = Pattern.compile("L(.+?);").matcher(obfSig);
-            String intSig = obfSig;
-            while (m.find()) {
-                if (!classMap.containsKey(m.group(1))) continue;
-                String intName = classMap.get(m.group(1)).intermediary;
-                intSig = intSig.substring(0, m.start(1) + offset) + intName + intSig.substring(m.end(1) + offset);
-                offset += intName.length() - m.group(1).length();
-            }
-            return intSig;
-        }
-    }
-
-    private static class FieldData {
-        final Map<String, ClassData> classMap;
-        final String obf;
-        final String intermediary;
-        String mcpName;
-
-        final String obfSig;
-
-        public FieldData(Map<String, ClassData> classMap, String obf, String obfSig, String intermediary) {
-            this.classMap = classMap;
-            this.obf = obf;
-            this.obfSig = obfSig;
-            this.intermediary = intermediary;
-        }
-
-        public String getIntermediarySig() {
-            Matcher m = Pattern.compile("(\\[*)L(.+?);").matcher(obfSig);
-            if (m.find()) {
-                if (!classMap.containsKey(m.group(2))) return obfSig;
-                return m.group(1) + "L" + classMap.get(m.group(2)).intermediary + ";";
-            } else {
-                return obfSig;
-            }
-        }
-    }
-
-    private static class MCPData {
-        final Map<String, List<MethodData>> methods = new HashMap<>();
-        final Map<String, List<FieldData>> fields = new HashMap<>();
-    }
-}
--- a/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java
+++ b/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java
@@ -20,7 +20,6 @@ package baritone.gradle.task;
 import org.gradle.api.DefaultTask;

 import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -41,53 +40,31 @@ class BaritoneGradleTask extends DefaultTask {
            PROGUARD_STANDALONE_CONFIG      = "standalone.pro",
            PROGUARD_EXPORT_PATH            = "proguard_out.jar",

-            ARTIFACT_STANDARD           = "%s-%s.jar",
-            ARTIFACT_UNOPTIMIZED        = "%s-unoptimized-%s.jar",
-            ARTIFACT_API                = "%s-api-%s.jar",
-            ARTIFACT_STANDALONE         = "%s-standalone-%s.jar",
-            ARTIFACT_FORGE_UNOPTIMIZED  = "%s-unoptimized-forge-%s.jar",
-            ARTIFACT_FORGE_API          = "%s-api-forge-%s.jar",
-            ARTIFACT_FORGE_STANDALONE   = "%s-standalone-forge-%s.jar",
-            ARTIFACT_FABRIC_UNOPTIMIZED = "%s-unoptimized-fabric-%s.jar",
-            ARTIFACT_FABRIC_API         = "%s-api-fabric-%s.jar",
-            ARTIFACT_FABRIC_STANDALONE  = "%s-standalone-fabric-%s.jar";
+            ARTIFACT_STANDARD         = "%s-%s.jar",
+            ARTIFACT_UNOPTIMIZED      = "%s-unoptimized-%s.jar",
+            ARTIFACT_API              = "%s-api-%s.jar",
+            ARTIFACT_STANDALONE       = "%s-standalone-%s.jar";

    protected String artifactName, artifactVersion;
-    protected final Path
-        artifactPath,
-        artifactUnoptimizedPath, artifactApiPath, artifactStandalonePath, // these are different for forge builds
-        proguardOut;
+    protected Path artifactPath, artifactUnoptimizedPath, artifactApiPath, artifactStandalonePath, proguardOut;

-    public BaritoneGradleTask() {
+    protected void verifyArtifacts() throws IllegalStateException {
        this.artifactName = getProject().getName();
        this.artifactVersion = getProject().getVersion().toString();

-        this.artifactPath = this.getBuildFile(formatVersion(ARTIFACT_STANDARD));
-
-        if (getProject().hasProperty("baritone.forge_build")) {
-            this.artifactUnoptimizedPath = this.getBuildFile(formatVersion(ARTIFACT_FORGE_UNOPTIMIZED));
-            this.artifactApiPath         = this.getBuildFile(formatVersion(ARTIFACT_FORGE_API));
-            this.artifactStandalonePath  = this.getBuildFile(formatVersion(ARTIFACT_FORGE_STANDALONE));
-        } else if (getProject().hasProperty("baritone.fabric_build")) {
-            this.artifactUnoptimizedPath = this.getBuildFile(formatVersion(ARTIFACT_FABRIC_UNOPTIMIZED));
-            this.artifactApiPath         = this.getBuildFile(formatVersion(ARTIFACT_FABRIC_API));
-            this.artifactStandalonePath  = this.getBuildFile(formatVersion(ARTIFACT_FABRIC_STANDALONE));
-        } else {
-            this.artifactUnoptimizedPath = this.getBuildFile(formatVersion(ARTIFACT_UNOPTIMIZED));
-            this.artifactApiPath         = this.getBuildFile(formatVersion(ARTIFACT_API));
-            this.artifactStandalonePath  = this.getBuildFile(formatVersion(ARTIFACT_STANDALONE));
-        }
+        this.artifactPath                = this.getBuildFile(formatVersion(ARTIFACT_STANDARD));
+        this.artifactUnoptimizedPath     = this.getBuildFile(formatVersion(ARTIFACT_UNOPTIMIZED));
+        this.artifactApiPath             = this.getBuildFile(formatVersion(ARTIFACT_API));
+        this.artifactStandalonePath      = this.getBuildFile(formatVersion(ARTIFACT_STANDALONE));

        this.proguardOut = this.getTemporaryFile(PROGUARD_EXPORT_PATH);
-    }

-    protected void verifyArtifacts() throws IllegalStateException {
        if (!Files.exists(this.artifactPath)) {
            throw new IllegalStateException("Artifact not found! Run build first!");
        }
    }

-    protected void write(InputStream stream, Path file) throws IOException {
+    protected void write(InputStream stream, Path file) throws Exception {
        if (Files.exists(file)) {
            Files.delete(file);
        }
--- a/buildSrc/src/main/java/baritone/gradle/task/CreateDistTask.java
+++ b/buildSrc/src/main/java/baritone/gradle/task/CreateDistTask.java
@@ -23,9 +23,9 @@ import javax.xml.bind.DatatypeConverter;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.security.MessageDigest;
-import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;

 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;

@@ -42,9 +42,9 @@ public class CreateDistTask extends BaritoneGradleTask {
        super.verifyArtifacts();

        // Define the distribution file paths
-        Path api = getRelativeFile("dist/" + getFileName(artifactApiPath));
-        Path standalone = getRelativeFile("dist/" + getFileName(artifactStandalonePath));
-        Path unoptimized = getRelativeFile("dist/" + getFileName(artifactUnoptimizedPath));
+        Path api             = getRelativeFile("dist/" + formatVersion(ARTIFACT_API));
+        Path standalone      = getRelativeFile("dist/" + formatVersion(ARTIFACT_STANDALONE));
+        Path unoptimized     = getRelativeFile("dist/" + formatVersion(ARTIFACT_UNOPTIMIZED));

        // NIO will not automatically create directories
        Path dir = getRelativeFile("dist/");
@@ -53,14 +53,12 @@ public class CreateDistTask extends BaritoneGradleTask {
        }

        // Copy build jars to dist/
-        // TODO: dont copy files that dont exist
-        Files.copy(this.artifactApiPath, api, REPLACE_EXISTING);
-        Files.copy(this.artifactStandalonePath, standalone, REPLACE_EXISTING);
-        Files.copy(this.artifactUnoptimizedPath, unoptimized, REPLACE_EXISTING);
+        Files.copy(this.artifactApiPath,             api,             REPLACE_EXISTING);
+        Files.copy(this.artifactStandalonePath,      standalone,      REPLACE_EXISTING);
+        Files.copy(this.artifactUnoptimizedPath,     unoptimized,     REPLACE_EXISTING);

        // Calculate all checksums and format them like "shasum"
-        List<String> shasum = getAllDistJars().stream()
-                .filter(Files::exists)
+        List<String> shasum = Stream.of(api, standalone, unoptimized)
                .map(path -> sha1(path) + "  " + path.getFileName().toString())
                .collect(Collectors.toList());

@@ -70,24 +68,6 @@ public class CreateDistTask extends BaritoneGradleTask {
        Files.write(getRelativeFile("dist/checksums.txt"), shasum);
    }

-    private static String getFileName(Path p) {
-        return p.getFileName().toString();
-    }
-
-    private List<Path> getAllDistJars() {
-        return Arrays.asList(
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_API)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_FABRIC_API)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_API)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_STANDALONE)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_FABRIC_STANDALONE)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_STANDALONE)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_UNOPTIMIZED)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_FABRIC_UNOPTIMIZED)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_UNOPTIMIZED))
-        );
-    }
-
    private static synchronized String sha1(Path path) {
        try {
            if (SHA1_DIGEST == null) {
--- a/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java
+++ b/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java
@@ -201,38 +201,26 @@ public class ProguardTask extends BaritoneGradleTask {

        // Setup the template that will be used to derive the API and Standalone configs
        List<String> template = Files.readAllLines(getTemporaryFile(PROGUARD_CONFIG_DEST));
-        template.add(0, "-injars '" + this.artifactPath.toString() + "'");
-        template.add(1, "-outjars '" + this.getTemporaryFile(PROGUARD_EXPORT_PATH) + "'");
+        template.add(0, "-injars " + this.artifactPath.toString());
+        template.add(1, "-outjars " + this.getTemporaryFile(PROGUARD_EXPORT_PATH));

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

-        {
-            final Stream<File> libraries;
-            {
-                // Discover all of the libraries that we will need to acquire from gradle
-                final Stream<File> dependencies = acquireDependencies()
-                    // remove MCP mapped jar
-                    .filter(f -> !f.toString().endsWith("-recomp.jar"))
-                    // go from the extra to the original downloaded client
-                    .map(f -> f.toString().endsWith("client-extra.jar") ? new File(f.getParentFile(), "client.jar") : f);
-
-                if (getProject().hasProperty("baritone.forge_build")) {
-                    libraries = dependencies
-                        .map(f -> f.toString().endsWith("client.jar") ? getSrgMcJar() : f);
-                } else if (getProject().hasProperty("baritone.fabric_build")) {
-                    libraries = dependencies
-                        .map(f -> f.getName().endsWith("-v2.jar") && f.getName().startsWith("minecraft-") ? getSrgMcJar() : f);
-                } else {
-                    libraries = dependencies;
-                }
+        // Discover all of the libraries that we will need to acquire from gradle
+        acquireDependencies().forEach(f -> {
+            if (f.toString().endsWith("-recomp.jar")) {
+                // remove MCP mapped jar
+                return;
            }
-            libraries.forEach(f -> {
-                template.add(2, "-libraryjars '" + f + "'");
-            });
-        }
+            if (f.toString().endsWith("client-extra.jar")) {
+                // go from the extra to the original downloaded client
+                f = new File(f.getParentFile(), "client.jar");
+            }
+            template.add(2, "-libraryjars '" + f + "'");
+        });

        // API config doesn't require any changes from the changes that we made to the template
        Files.write(getTemporaryFile(PROGUARD_API_CONFIG), template);
@@ -243,14 +231,8 @@ public class ProguardTask extends BaritoneGradleTask {
        Files.write(getTemporaryFile(PROGUARD_STANDALONE_CONFIG), standalone);
    }

-    private File getSrgMcJar() {
-        return getProject().getTasks().findByName("copyMcJar").getOutputs().getFiles().getSingleFile();
-    }
-
    private Stream<File> acquireDependencies() {
-        return getProject().getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("launch").getRuntimeClasspath().getFiles()
-            .stream()
-            .filter(File::isFile);
+        return getProject().getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("launch").getRuntimeClasspath().getFiles().stream().filter(File::isFile);
    }

    private void proguardApi() throws Exception {
@@ -283,15 +265,9 @@ public class ProguardTask extends BaritoneGradleTask {
            Files.delete(this.proguardOut);
        }

-        // Make paths relative to work directory; fixes spaces in path to config, @"" doesn't work
-        Path workingDirectory = getTemporaryFile("");
-        Path proguardJar = workingDirectory.relativize(getTemporaryFile(PROGUARD_JAR));
-        config = workingDirectory.relativize(config);
-        
-        // Honestly, if you still have spaces in your path at this point, you're SOL.
-
+        Path proguardJar = getTemporaryFile(PROGUARD_JAR);
        Process p = new ProcessBuilder("java", "-jar", proguardJar.toString(), "@" + config.toString())
-                .directory(workingDirectory.toFile()) // Set the working directory to the temporary folder]
+                .directory(getTemporaryFile("").toFile()) // Set the working directory to the temporary folder]
                .start();

        // We can't do output inherit process I/O with gradle for some reason and have it work, so we have to do this
--- a/scripts/proguard.pro
+++ b/scripts/proguard.pro
@@ -1,6 +1,5 @@
 -keepattributes Signature
 -keepattributes *Annotation*
-keepattributes InnerClasses

 -optimizationpasses 5
 -verbose
@@ -17,10 +16,7 @@
 -dontwarn org.lwjgl.**
 # also lwjgl lol
 -dontwarn module-info
-# we dont have forge
-dontwarn baritone.launch.BaritoneForgeModXD

-# please do not change the comment below
 -keep class baritone.api.** { *; } # this is the keep api

 # service provider needs these class names
@@ -28,7 +24,6 @@
 -keep class baritone.api.IBaritoneProvider

 -keep class baritone.api.utils.MyChunkPos { *; } # even in standalone we need to keep this for gson reflect
-keepname class baritone.api.utils.BlockOptionalMeta # this name is exposed to the user, so we need to keep it in all builds

 # Keep any class or member annotated with @KeepName so we dont have to put everything in the script
 -keep,allowobfuscation @interface baritone.KeepName
@@ -47,10 +42,9 @@

 #try to keep usage of schematica in separate classes
 -keep class baritone.utils.schematic.schematica.**
-keep class baritone.utils.schematic.litematica.**
 #proguard doesnt like it when it cant find our fake schematica classes
 -dontwarn baritone.utils.schematic.schematica.**
-dontwarn baritone.utils.schematic.litematica.**
+

 # Keep - Applications. Keep all application classes, along with their 'main'
 # methods.
@@ -340,5 +334,3 @@
    public java.lang.String substring(int);
    public java.lang.String substring(int,int);
 }
-
-printmapping mapping.txt
--- a/src/api/java/baritone/api/BaritoneAPI.java
+++ b/src/api/java/baritone/api/BaritoneAPI.java
@@ -19,6 +19,9 @@ package baritone.api;

 import baritone.api.utils.SettingsUtil;

+import java.util.Iterator;
+import java.util.ServiceLoader;
+
 /**
 * Exposes the {@link IBaritoneProvider} instance and the {@link Settings} instance for API usage.
 *
@@ -34,11 +37,9 @@ public final class BaritoneAPI {
        settings = new Settings();
        SettingsUtil.readAndApply(settings);

-        try {
-            provider = (IBaritoneProvider) Class.forName("baritone.BaritoneProvider").newInstance();
-        } catch (ReflectiveOperationException ex) {
-            throw new RuntimeException(ex);
-        }
+        ServiceLoader<IBaritoneProvider> baritoneLoader = ServiceLoader.load(IBaritoneProvider.class);
+        Iterator<IBaritoneProvider> instances = baritoneLoader.iterator();
+        provider = instances.next();
    }

    public static IBaritoneProvider getProvider() {
--- a/src/api/java/baritone/api/Settings.java
+++ b/src/api/java/baritone/api/Settings.java
@@ -17,15 +17,13 @@

 package baritone.api;

-import baritone.api.utils.NotificationHelper;
 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.TypeUtils;
-import baritone.api.utils.gui.BaritoneToast;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.Item;
-import net.minecraft.util.math.vector.Vector3i;
+import net.minecraft.util.math.Vec3i;
 import net.minecraft.util.text.ITextComponent;

 import java.awt.*;
@@ -34,7 +32,6 @@ import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.List;
 import java.util.*;
-import java.util.function.BiConsumer;
 import java.util.function.Consumer;

 /**
@@ -49,11 +46,6 @@ public final class Settings {
     */
    public final Setting<Boolean> allowBreak = new Setting<>(true);

-    /**
-     * Blocks that baritone will be allowed to break even with allowBreak set to false
-     */
-    public final Setting<List<Block>> allowBreakAnyway = new Setting<>(new ArrayList<>());
-
    /**
     * Allow Baritone to sprint
     */
@@ -78,9 +70,9 @@ public final class Settings {
    public final Setting<Boolean> assumeExternalAutoTool = new Setting<>(false);

    /**
-     * Automatically select the best available tool
+     * If this setting is on, no auto tool will occur at all, not at calculation time nor execution time
     */
-    public final Setting<Boolean> autoTool = new Setting<>(true);
+    public final Setting<Boolean> disableAutoTool = new Setting<>(false);

    /**
     * It doesn't actually take twenty ticks to place a block, this cost is so high
@@ -107,13 +99,6 @@ public final class Settings {
     */
    public final Setting<Double> walkOnWaterOnePenalty = new Setting<>(3D);

-    /**
-     * Don't allow breaking blocks next to liquids.
-     * <p>
-     * Enable if you have mods adding custom fluid physics.
-     */
-    public final Setting<Boolean> strictLiquidCheck = new Setting<>(false);
-
    /**
     * Allow Baritone to fall arbitrary distances and place a water bucket beneath it.
     * Reliability: questionable.
@@ -123,8 +108,6 @@ public final class Settings {
    /**
     * Allow Baritone to assume it can walk on still water just like any other block.
     * This functionality is assumed to be provided by a separate library that might have imported Baritone.
-     * <p>
-     * Note: This will prevent some usage of the frostwalker enchantment, like pillaring up from water.
     */
    public final Setting<Boolean> assumeWalkOnWater = new Setting<>(false);

@@ -204,13 +187,6 @@ public final class Settings {
    /**
     * Blocks that Baritone is not allowed to break
     */
-    public final Setting<List<Block>> blocksToDisallowBreaking = new Setting<>(new ArrayList<>(
-            // Leave Empty by Default
-    ));
-
-    /**
-     * blocks that baritone shouldn't break, but can if it needs to.
-     */
    public final Setting<List<Block>> blocksToAvoidBreaking = new Setting<>(new ArrayList<>(Arrays.asList( // TODO can this be a HashSet or ImmutableSet?
            Blocks.CRAFTING_TABLE,
            Blocks.FURNACE,
@@ -218,11 +194,6 @@ public final class Settings {
            Blocks.TRAPPED_CHEST
    )));

-    /**
-     * this multiplies the break speed, if set above 1 it's "encourage breaking" instead
-     */
-    public final Setting<Double> avoidBreakingMultiplier = new Setting<>(.1);
-
    /**
     * A list of blocks to be treated as if they're air.
     * <p>
@@ -232,40 +203,6 @@ public final class Settings {

    )));

-    /**
-     * A list of blocks to be treated as correct.
-     * <p>
-     * If a schematic asks for any block on this list at a certain position, it will be treated as correct, regardless of what it currently is.
-     */
-    public final Setting<List<Block>> buildSkipBlocks = new Setting<>(new ArrayList<>(Arrays.asList(
-
-    )));
-
-    /**
-     * A mapping of blocks to blocks treated as correct in their position
-     * <p>
-     * If a schematic asks for a block on this mapping, all blocks on the mapped list will be accepted at that location as well
-     * <p>
-     * Syntax same as <a href="https://baritone.leijurv.com/baritone/api/Settings.html#buildSubstitutes">buildSubstitutes</a>
-     */
-    public final Setting<Map<Block, List<Block>>> buildValidSubstitutes = new Setting<>(new HashMap<>());
-
-    /**
-     * A mapping of blocks to blocks to be built instead
-     * <p>
-     * If a schematic asks for a block on this mapping, Baritone will place the first placeable block in the mapped list
-     * <p>
-     * Usage Syntax:
-     * <pre>
-     *      sourceblockA->blockToSubstituteA1,blockToSubstituteA2,...blockToSubstituteAN,sourceBlockB->blockToSubstituteB1,blockToSubstituteB2,...blockToSubstituteBN,...sourceBlockX->blockToSubstituteX1,blockToSubstituteX2...blockToSubstituteXN
-     * </pre>
-     * Example:
-     * <pre>
-     *     stone->cobblestone,andesite,oak_planks->birch_planks,acacia_planks,glass
-     * </pre>
-     */
-    public final Setting<Map<Block, List<Block>>> buildSubstitutes = new Setting<>(new HashMap<>());
-
    /**
     * A list of blocks to become air
     * <p>
@@ -280,17 +217,6 @@ public final class Settings {
     */
    public final Setting<Boolean> buildIgnoreExisting = new Setting<>(false);

-    /**
-     * If this is true, the builder will ignore directionality of certain blocks like glazed terracotta.
-     */
-    public final Setting<Boolean> buildIgnoreDirection = new Setting<>(false);
-
-    /**
-     * A list of names of block properties the builder will ignore.
-     */
-    public final Setting<List<String>> buildIgnoreProperties = new Setting<>(new ArrayList<>(Arrays.asList(
-    )));
-
    /**
     * If this setting is true, Baritone will never break a block that is adjacent to an unsupported falling block.
     * <p>
@@ -418,9 +344,6 @@ public final class Settings {
     */
    public final Setting<Double> mobSpawnerAvoidanceCoefficient = new Setting<>(2.0);

-    /**
-     * Distance to avoid mob spawners.
-     */
    public final Setting<Integer> mobSpawnerAvoidanceRadius = new Setting<>(16);

    /**
@@ -430,9 +353,6 @@ public final class Settings {
     */
    public final Setting<Double> mobAvoidanceCoefficient = new Setting<>(1.5);

-    /**
-     * Distance to avoid mobs.
-     */
    public final Setting<Integer> mobAvoidanceRadius = new Setting<>(8);

    /**
@@ -583,17 +503,6 @@ public final class Settings {
     */
    public final Setting<Long> slowPathTimeoutMS = new Setting<>(40000L);

-
-    /**
-     * allows baritone to save bed waypoints when interacting with beds
-     */
-    public final Setting<Boolean> doBedWaypoints = new Setting<>(true);
-
-    /**
-     * allows baritone to save death waypoints
-     */
-    public final Setting<Boolean> doDeathWaypoints = new Setting<>(true);
-
    /**
     * The big one. Download all chunks in simplified 2-bit format and save them for better very-long-distance pathing.
     */
@@ -610,6 +519,13 @@ public final class Settings {
     */
    public final Setting<Boolean> pruneRegionsFromRAM = new Setting<>(true);

+    /**
+     * Remember the contents of containers (chests, echests, furnaces)
+     * <p>
+     * Really buggy since the packet stuff is multithreaded badly thanks to brady
+     */
+    public final Setting<Boolean> containerMemory = new Setting<>(false);
+
    /**
     * Fill in blocks behind you
     */
@@ -658,12 +574,6 @@ public final class Settings {
     */
    public final Setting<Boolean> renderGoal = new Setting<>(true);

-    /**
-     * Render the goal as a sick animated thingy instead of just a box
-     * (also controls animation of GoalXZ if {@link #renderGoalXZBeacon} is enabled)
-     */
-    public final Setting<Boolean> renderGoalAnimated = new Setting<>(true);
-
    /**
     * Render selection boxes
     */
@@ -733,7 +643,7 @@ public final class Settings {

    /**
     * When GetToBlockProcess or MineProcess fails to calculate a path, instead of just giving up, mark the closest instance
-     * of that block as "unreachable" and go towards the next closest. GetToBlock expands this search to the whole "vein"; MineProcess does not.
+     * of that block as "unreachable" and go towards the next closest. GetToBlock expands this seaarch to the whole "vein"; MineProcess does not.
     * This is because MineProcess finds individual impossible blocks (like one block in a vein that has gravel on top then lava, so it can't break)
     * Whereas GetToBlock should blacklist the whole "vein" if it can't get to any of them.
     */
@@ -788,16 +698,6 @@ public final class Settings {
     */
    public final Setting<Boolean> censorRanCommands = new Setting<>(false);

-    /**
-     * Stop using tools just before they are going to break.
-     */
-    public final Setting<Boolean> itemSaver = new Setting<>(false);
-
-    /**
-     * Durability to leave on the tool when using itemSaver
-     */
-    public final Setting<Integer> itemSaverThreshold = new Setting<>(10);
-
    /**
     * Always prefer silk touch tools over regular tools. This will not sacrifice speed, but it will always prefer silk
     * touch tools over other tools of the same speed. This includes always choosing ANY silk touch tool over your hand.
@@ -858,7 +758,7 @@ public final class Settings {
    public final Setting<Integer> allowOnlyExposedOresDistance = new Setting<>(1);

    /**
-     * When GetToBlock or non-legit Mine doesn't know any locations for the desired block, explore randomly instead of giving up.
+     * When GetToBlock doesn't know any locations for the desired block, explore randomly instead of giving up.
     */
    public final Setting<Boolean> exploreForBlocks = new Setting<>(true);

@@ -910,11 +810,6 @@ public final class Settings {
     */
    public final Setting<Boolean> layerOrder = new Setting<>(false);

-    /**
-     * How high should the individual layers be?
-     */
-    public final Setting<Integer> layerHeight = new Setting<>(1);
-
    /**
     * Start building the schematic at a specific layer.
     * Can help on larger builds when schematic wants to break things its already built
@@ -926,28 +821,16 @@ public final class Settings {
     */
    public final Setting<Boolean> skipFailedLayers = new Setting<>(false);

-    /**
-     * Only build the selected part of schematics
-     */
-    public final Setting<Boolean> buildOnlySelection = 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
     */
-    public final Setting<Vector3i> buildRepeat = new Setting<>(new Vector3i(0, 0, 0));
+    public final Setting<Vec3i> buildRepeat = new Setting<>(new Vec3i(0, 0, 0));

    /**
     * How many times to buildrepeat. -1 for infinite.
     */
    public final Setting<Integer> buildRepeatCount = new Setting<>(-1);

-    /**
-     * Don't notify schematics that they are moved.
-     * e.g. replacing will replace the same spots for every repetition
-     * Mainly for backward compatibility.
-     */
-    public final Setting<Boolean> buildRepeatSneaky = new Setting<>(true);
-
    /**
     * Allow standing above a block while mining it, in BuilderProcess
     * <p>
@@ -1056,7 +939,6 @@ public final class Settings {
     * Disallow MineBehavior from using X-Ray to see where the ores are. Turn this option on to force it to mine "legit"
     * where it will only mine an ore once it can actually see it, so it won't do or know anything that a normal player
     * couldn't. If you don't want it to look like you're X-Raying, turn this on
-     * This will always explore, regardless of exploreForBlocks
     */
    public final Setting<Boolean> legitMine = new Setting<>(false);

@@ -1141,26 +1023,7 @@ public final class Settings {
     * via {@link Consumer#andThen(Consumer)} or it can completely be overriden via setting
     * {@link Setting#value};
     */
-    public final Setting<Consumer<ITextComponent>> logger = new Setting<>(msg -> Minecraft.getInstance().ingameGUI.getChatGUI().printChatMessage(msg));
-
-    /**
-     * The function that is called when Baritone will send a desktop notification. This function can be added to
-     * via {@link Consumer#andThen(Consumer)} or it can completely be overriden via setting
-     * {@link Setting#value};
-     */
-    public final Setting<BiConsumer<String, Boolean>> notifier = new Setting<>(NotificationHelper::notify);
-
-    /**
-     * The function that is called when Baritone will show a toast. This function can be added to
-     * via {@link Consumer#andThen(Consumer)} or it can completely be overriden via setting
-     * {@link Setting#value};
-     */
-    public final Setting<BiConsumer<ITextComponent, ITextComponent>> toaster = new Setting<>(BaritoneToast::addOrUpdate);
-
-    /**
-     * Print out ALL command exceptions as a stack trace to stdout, even simple syntax errors
-     */
-    public final Setting<Boolean> verboseCommandExceptions = new Setting<>(false);
+    public final Setting<Consumer<ITextComponent>> logger = new Setting<>(Minecraft.getInstance().ingameGUI.getChatGUI()::printChatMessage);

    /**
     * The size of the box that is rendered when the current goal is a GoalYLevel
@@ -1252,11 +1115,6 @@ public final class Settings {
     */
    public final Setting<Boolean> renderSelectionCorners = new Setting<>(true);

-    /**
-     * Use sword to mine.
-     */
-    public final Setting<Boolean> useSwordToMine = new Setting<>(true);
-
    /**
     * Desktop notifications
     */
--- a/src/api/java/baritone/api/behavior/IPathingBehavior.java
+++ b/src/api/java/baritone/api/behavior/IPathingBehavior.java
@@ -58,15 +58,6 @@ public interface IPathingBehavior extends IBehavior {
        return Optional.of(current.getPath().ticksRemainingFrom(start));
    }

-    /**
-     * Returns the estimated remaining ticks to the current goal.
-     * Given that the return type is an optional, {@link Optional#empty()}
-     * will be returned in the case that there is no current goal.
-     *
-     * @return The estimated remaining ticks to the current goal.
-     */
-    Optional<Double> estimatedTicksToGoal();
-
    /**
     * @return The current pathing goal
     */
--- a/src/schematica_api/java/fi/dy/masa/litematica/schematic/placement/SchematicPlacementUnloaded.java
+++ b/src/schematica_api/java/fi/dy/masa/litematica/schematic/placement/SchematicPlacementUnloaded.java
@@ -15,29 +15,30 @@
 * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
 */

-package fi.dy.masa.litematica.schematic.placement;
+package baritone.api.cache;

 import net.minecraft.util.math.BlockPos;

-import javax.annotation.Nullable;
-import java.io.File;
+import java.util.Map;

-public class SchematicPlacementUnloaded {
-    protected String name = "?";
-    @Nullable
-    protected File schematicFile;
-    protected BlockPos origin = BlockPos.ZERO;
+/**
+ * @author Brady
+ * @since 9/23/2018
+ */
+public interface IContainerMemory {

-    public String getName() {
-        return this.name;
-    }
+    /**
+     * Gets a remembered inventory by its block position.
+     *
+     * @param pos The position of the container block
+     * @return The remembered inventory
+     */
+    IRememberedInventory getInventoryByPos(BlockPos pos);

-    @Nullable
-    public File getSchematicFile() {
-        return this.schematicFile;
-    }
-
-    public BlockPos getOrigin() {
-        return this.origin;
-    }
-}
+    /**
+     * Gets the map of all block positions to their remembered inventories.
+     *
+     * @return Map of block positions to their respective remembered inventories
+     */
+    Map<BlockPos, IRememberedInventory> getRememberedInventories();
+}
--- a/src/main/java/baritone/utils/accessor/ISodiumChunkArray.java
+++ b/src/main/java/baritone/utils/accessor/ISodiumChunkArray.java
@@ -15,12 +15,25 @@
 * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
 */

-package baritone.utils.accessor;
+package baritone.api.cache;

-import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
-import it.unimi.dsi.fastutil.objects.ObjectIterator;
+import net.minecraft.item.ItemStack;

-public interface ISodiumChunkArray extends IChunkArray {
-    
-    ObjectIterator<Long2ObjectMap.Entry<Object>> callIterator();
+import java.util.List;
+
+/**
+ * @author Brady
+ * @since 9/23/2018
+ */
+public interface IRememberedInventory {
+
+    /**
+     * @return The contents of this inventory
+     */
+    List<ItemStack> getContents();
+
+    /**
+     * @return The number of slots in this inventory
+     */
+    int getSize();
 }
--- a/src/api/java/baritone/api/cache/IWorldData.java
+++ b/src/api/java/baritone/api/cache/IWorldData.java
@@ -37,4 +37,9 @@ public interface IWorldData {
     */
    IWaypointCollection getWaypoints();

+    /**
+     * @return The {@link IContainerMemory} instance
+     * @see IContainerMemory
+     */
+    IContainerMemory getContainerMemory();
 }
--- a/src/api/java/baritone/api/command/datatypes/BlockById.java
+++ b/src/api/java/baritone/api/command/datatypes/BlockById.java
@@ -32,7 +32,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.getOptional(id).orElse(null)) == null) {
+        if ((block = Registry.BLOCK.getValue(id).orElse(null)) == null) {
            throw new IllegalArgumentException("no block found by that id");
        }
        return block;
--- a/src/api/java/baritone/api/command/datatypes/EntityClassById.java
+++ b/src/api/java/baritone/api/command/datatypes/EntityClassById.java
@@ -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.getOptional(id).orElse(null)) == null) {
+        if ((entity = Registry.ENTITY_TYPE.getValue(id).orElse(null)) == null) {
            throw new IllegalArgumentException("no entity found by that id");
        }
        return entity;
--- a/src/api/java/baritone/api/command/datatypes/ForDirection.java
+++ b/src/api/java/baritone/api/command/datatypes/ForDirection.java
@@ -36,7 +36,7 @@ public enum ForDirection implements IDatatypeFor<Direction> {
    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
        return new TabCompleteHelper()
                .append(Stream.of(Direction.values())
-                        .map(Direction::getName2).map(String::toLowerCase))
+                        .map(Direction::getName).map(String::toLowerCase))
                .filterPrefix(ctx.getConsumer().getString())
                .stream();
    }
--- a/src/api/java/baritone/api/command/datatypes/RelativeCoordinate.java
+++ b/src/api/java/baritone/api/command/datatypes/RelativeCoordinate.java
@@ -26,8 +26,7 @@ import java.util.stream.Stream;

 public enum RelativeCoordinate implements IDatatypePost<Double, Double> {
    INSTANCE;
-    private static String ScalesAliasRegex = "[kKmM]";
-    private static Pattern PATTERN = Pattern.compile("^(~?)([+-]?(?:\\d+(?:\\.\\d*)?|\\.\\d+)(" + ScalesAliasRegex + "?)|)$");
+    private static Pattern PATTERN = Pattern.compile("^(~?)([+-]?(?:\\d+(?:\\.\\d*)?|\\.\\d+)([k-k]?)|)$");

    @Override
    public Double apply(IDatatypeContext ctx, Double origin) throws CommandException {
@@ -42,15 +41,11 @@ public enum RelativeCoordinate implements IDatatypePost<Double, Double> {

        boolean isRelative = !matcher.group(1).isEmpty();

-        double offset = matcher.group(2).isEmpty() ? 0 : Double.parseDouble(matcher.group(2).replaceAll(ScalesAliasRegex, ""));
+        double offset = matcher.group(2).isEmpty() ? 0 : Double.parseDouble(matcher.group(2).replaceAll("k", ""));

-        if (matcher.group(2).toLowerCase().contains("k")) {
+        if (matcher.group(2).contains("k")) {
            offset *= 1000;
        }
-        if (matcher.group(2).toLowerCase().contains("m")) {
-            offset *= 1000000;
-        }
-

        if (isRelative) {
            return origin + offset;
--- a/src/api/java/baritone/api/command/datatypes/RelativeFile.java
+++ b/src/api/java/baritone/api/command/datatypes/RelativeFile.java
@@ -83,10 +83,10 @@ public enum RelativeFile implements IDatatypePost<File, File> {
        boolean useParent = !currentPathStringThing.isEmpty() && !currentPathStringThing.endsWith(File.separator);
        File currentFile = currentPath.isAbsolute() ? currentPath.toFile() : new File(base, currentPathStringThing);
        return Stream.of(Objects.requireNonNull(getCanonicalFileUnchecked(
-                        useParent
-                                ? currentFile.getParentFile()
-                                : currentFile
-                ).listFiles()))
+                useParent
+                        ? currentFile.getParentFile()
+                        : currentFile
+        ).listFiles()))
                .map(f -> (currentPath.isAbsolute() ? f : basePath.relativize(f.toPath()).toString()) +
                        (f.isDirectory() ? File.separator : ""))
                .filter(s -> s.toLowerCase(Locale.US).startsWith(currentPathStringThing.toLowerCase(Locale.US)))
--- a/src/api/java/baritone/api/command/helpers/Paginator.java
+++ b/src/api/java/baritone/api/command/helpers/Paginator.java
@@ -23,7 +23,6 @@ import baritone.api.command.exception.CommandInvalidTypeException;
 import baritone.api.utils.Helper;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.StringTextComponent;
-import net.minecraft.util.text.TextComponent;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.util.text.event.ClickEvent;
 import net.minecraft.util.text.event.HoverEvent;
@@ -75,9 +74,9 @@ public class Paginator<E> implements Helper {
        }
        boolean hasPrevPage = commandPrefix != null && validPage(page - 1);
        boolean hasNextPage = commandPrefix != null && validPage(page + 1);
-        TextComponent prevPageComponent = new StringTextComponent("<<");
+        ITextComponent prevPageComponent = new StringTextComponent("<<");
        if (hasPrevPage) {
-            prevPageComponent.setStyle(prevPageComponent.getStyle()
+            prevPageComponent.getStyle()
                    .setClickEvent(new ClickEvent(
                            ClickEvent.Action.RUN_COMMAND,
                            String.format("%s %d", commandPrefix, page - 1)
@@ -85,13 +84,13 @@ public class Paginator<E> implements Helper {
                    .setHoverEvent(new HoverEvent(
                            HoverEvent.Action.SHOW_TEXT,
                            new StringTextComponent("Click to view previous page")
-                    )));
+                    ));
        } else {
-            prevPageComponent.setStyle(prevPageComponent.getStyle().setFormatting(TextFormatting.DARK_GRAY));
+            prevPageComponent.getStyle().setColor(TextFormatting.DARK_GRAY);
        }
-        TextComponent nextPageComponent = new StringTextComponent(">>");
+        ITextComponent nextPageComponent = new StringTextComponent(">>");
        if (hasNextPage) {
-            nextPageComponent.setStyle(nextPageComponent.getStyle()
+            nextPageComponent.getStyle()
                    .setClickEvent(new ClickEvent(
                            ClickEvent.Action.RUN_COMMAND,
                            String.format("%s %d", commandPrefix, page + 1)
@@ -99,16 +98,16 @@ public class Paginator<E> implements Helper {
                    .setHoverEvent(new HoverEvent(
                            HoverEvent.Action.SHOW_TEXT,
                            new StringTextComponent("Click to view next page")
-                    )));
+                    ));
        } else {
-            nextPageComponent.setStyle(nextPageComponent.getStyle().setFormatting(TextFormatting.DARK_GRAY));
+            nextPageComponent.getStyle().setColor(TextFormatting.DARK_GRAY);
        }
-        TextComponent pagerComponent = new StringTextComponent("");
-        pagerComponent.setStyle(pagerComponent.getStyle().setFormatting(TextFormatting.GRAY));
-        pagerComponent.append(prevPageComponent);
-        pagerComponent.appendString(" | ");
-        pagerComponent.append(nextPageComponent);
-        pagerComponent.appendString(String.format(" %d/%d", page, getMaxPage()));
+        ITextComponent pagerComponent = new StringTextComponent("");
+        pagerComponent.getStyle().setColor(TextFormatting.GRAY);
+        pagerComponent.appendSibling(prevPageComponent);
+        pagerComponent.appendText(" | ");
+        pagerComponent.appendSibling(nextPageComponent);
+        pagerComponent.appendText(String.format(" %d/%d", page, getMaxPage()));
        logDirect(pagerComponent);
    }

--- a/src/api/java/baritone/api/command/helpers/TabCompleteHelper.java
+++ b/src/api/java/baritone/api/command/helpers/TabCompleteHelper.java
@@ -253,8 +253,8 @@ public class TabCompleteHelper {
    public TabCompleteHelper addSettings() {
        return append(
                BaritoneAPI.getSettings().allSettings.stream()
-                        .filter(s -> !SettingsUtil.javaOnlySetting(s))
                        .map(Settings.Setting::getName)
+                        .filter(s -> !s.equalsIgnoreCase("logger"))
                        .sorted(String.CASE_INSENSITIVE_ORDER)
        );
    }
--- a/src/api/java/baritone/api/command/registry/Registry.java
+++ b/src/api/java/baritone/api/command/registry/Registry.java
@@ -84,7 +84,7 @@ public class Registry<V> {
     * @param entry The entry to unregister.
     */
    public void unregister(V entry) {
-        if (!registered(entry)) {
+        if (registered(entry)) {
            return;
        }
        _entries.remove(entry);
--- a/src/api/java/baritone/api/event/events/RenderEvent.java
+++ b/src/api/java/baritone/api/event/events/RenderEvent.java
@@ -17,9 +17,6 @@

 package baritone.api.event.events;

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

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

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

 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;

 /**
 * @author Brady
@@ -70,7 +70,7 @@ public final class RotationMoveEvent {
        /**
         * Called when the player's motion is updated.
         *
-         * @see Entity#moveRelative(float, Vector3d)
+         * @see Entity#moveRelative(float, Vec3d)
         */
        MOTION_UPDATE,

--- a/src/api/java/baritone/api/event/listener/IGameEventListener.java
+++ b/src/api/java/baritone/api/event/listener/IGameEventListener.java
@@ -24,7 +24,7 @@ import net.minecraft.client.gui.screen.DeathScreen;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.Entity;
 import net.minecraft.network.IPacket;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;

 /**
 * @author Brady
@@ -106,7 +106,7 @@ public interface IGameEventListener {
     * and before and after the player jumps.
     *
     * @param event The event
-     * @see Entity#moveRelative(float, Vector3d)
+     * @see Entity#moveRelative(float, Vec3d)
     */
    void onPlayerRotationMove(RotationMoveEvent event);

--- a/src/api/java/baritone/api/pathing/goals/Goal.java
+++ b/src/api/java/baritone/api/pathing/goals/Goal.java
@@ -54,18 +54,4 @@ public interface Goal {
    default double heuristic(BlockPos pos) {
        return heuristic(pos.getX(), pos.getY(), pos.getZ());
    }
-
-    /**
-     * Returns the heuristic at the goal.
-     * i.e. {@code heuristic() == heuristic(x,y,z)}
-     * when {@code isInGoal(x,y,z) == true}
-     * This is needed by {@code PathingBehavior#estimatedTicksToGoal} because
-     * some Goals actually do not have a heuristic of 0 when that condition is met
-     *
-     * @return The estimate number of ticks to satisfy the goal when the goal
-     * is already satisfied
-     */
-    default double heuristic() {
-        return 0;
-    }
 }
--- a/src/api/java/baritone/api/pathing/goals/GoalBlock.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalBlock.java
@@ -87,9 +87,9 @@ public class GoalBlock implements Goal, IGoalRenderPos {
    public static double calculate(double xDiff, int yDiff, double zDiff) {
        double heuristic = 0;

-        // if yDiff is 1 that means that currentY-goalY==1 which means that we're 1 block above where we should be
-        // therefore going from 0,yDiff,0 to a GoalYLevel of 0 is accurate
-        heuristic += GoalYLevel.calculate(0, yDiff);
+        // if yDiff is 1 that means that pos.getY()-this.y==1 which means that we're 1 block below where we should be
+        // therefore going from 0,0,0 to a GoalYLevel of pos.getY()-this.y is accurate
+        heuristic += GoalYLevel.calculate(yDiff, 0);

        //use the pythagorean and manhattan mixture from GoalXZ
        heuristic += GoalXZ.calculate(xDiff, zDiff);
--- a/src/api/java/baritone/api/pathing/goals/GoalComposite.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalComposite.java
@@ -57,16 +57,6 @@ public class GoalComposite implements Goal {
        return min;
    }

-    @Override
-    public double heuristic() {
-        double min = Double.MAX_VALUE;
-        for (Goal g : goals) {
-            // just take the highest value that is guaranteed to be inside the goal
-            min = Math.min(min, g.heuristic());
-        }
-        return min;
-    }
-
    @Override
    public String toString() {
        return "GoalComposite" + Arrays.toString(goals);
--- a/src/api/java/baritone/api/pathing/goals/GoalInverted.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalInverted.java
@@ -45,11 +45,6 @@ public class GoalInverted implements Goal {
        return -origin.heuristic(x, y, z);
    }

-    @Override
-    public double heuristic() {
-        return Double.NEGATIVE_INFINITY;
-    }
-
    @Override
    public String toString() {
        return String.format("GoalInverted{%s}", origin.toString());
--- a/src/api/java/baritone/api/pathing/goals/GoalNear.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalNear.java
@@ -19,8 +19,6 @@ package baritone.api.pathing.goals;

 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.interfaces.IGoalRenderPos;
-import it.unimi.dsi.fastutil.doubles.DoubleIterator;
-import it.unimi.dsi.fastutil.doubles.DoubleOpenHashSet;
 import net.minecraft.util.math.BlockPos;

 public class GoalNear implements Goal, IGoalRenderPos {
@@ -53,34 +51,6 @@ public class GoalNear implements Goal, IGoalRenderPos {
        return GoalBlock.calculate(xDiff, yDiff, zDiff);
    }

-    @Override
-    public double heuristic() {// TODO less hacky solution
-        int range = (int) Math.ceil(Math.sqrt(rangeSq));
-        DoubleOpenHashSet maybeAlwaysInside = new DoubleOpenHashSet(); // see pull request #1978
-        double minOutside = Double.POSITIVE_INFINITY;
-        for (int dx = -range; dx <= range; dx++) {
-            for (int dy = -range; dy <= range; dy++) {
-                for (int dz = -range; dz <= range; dz++) {
-                    double h = heuristic(x + dx, y + dy, z + dz);
-                    if (h < minOutside && isInGoal(x + dx, y + dy, z + dz)) {
-                        maybeAlwaysInside.add(h);
-                    } else {
-                        minOutside = Math.min(minOutside, h);
-                    }
-                }
-            }
-        }
-        double maxInside = Double.NEGATIVE_INFINITY;
-        DoubleIterator it = maybeAlwaysInside.iterator();
-        while (it.hasNext()) {
-            double inside = it.nextDouble();
-            if (inside < minOutside) {
-                maxInside = Math.max(maxInside, inside);
-            }
-        }
-        return maxInside;
-    }
-
    @Override
    public BlockPos getGoalPos() {
        return new BlockPos(x, y, z);
--- a/src/api/java/baritone/api/pathing/goals/GoalRunAway.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalRunAway.java
@@ -18,8 +18,6 @@
 package baritone.api.pathing.goals;

 import baritone.api.utils.SettingsUtil;
-import it.unimi.dsi.fastutil.doubles.DoubleIterator;
-import it.unimi.dsi.fastutil.doubles.DoubleOpenHashSet;
 import net.minecraft.util.math.BlockPos;

 import java.util.Arrays;
@@ -67,7 +65,7 @@ public class GoalRunAway implements Goal {
    }

    @Override
-    public double heuristic(int x, int y, int z) {// mostly copied from GoalBlock
+    public double heuristic(int x, int y, int z) {//mostly copied from GoalBlock
        double min = Double.MAX_VALUE;
        for (BlockPos p : from) {
            double h = GoalXZ.calculate(p.getX() - x, p.getZ() - z);
@@ -82,48 +80,6 @@ public class GoalRunAway implements Goal {
        return min;
    }

-    @Override
-    public double heuristic() {// TODO less hacky solution
-        int distance = (int) Math.ceil(Math.sqrt(distanceSq));
-        int minX = Integer.MAX_VALUE;
-        int minY = Integer.MAX_VALUE;
-        int minZ = Integer.MAX_VALUE;
-        int maxX = Integer.MIN_VALUE;
-        int maxY = Integer.MIN_VALUE;
-        int maxZ = Integer.MIN_VALUE;
-        for (BlockPos p : from) {
-            minX = Math.min(minX, p.getX() - distance);
-            minY = Math.min(minY, p.getY() - distance);
-            minZ = Math.min(minZ, p.getZ() - distance);
-            maxX = Math.max(minX, p.getX() + distance);
-            maxY = Math.max(minY, p.getY() + distance);
-            maxZ = Math.max(minZ, p.getZ() + distance);
-        }
-        DoubleOpenHashSet maybeAlwaysInside = new DoubleOpenHashSet(); // see pull request #1978
-        double minOutside = Double.POSITIVE_INFINITY;
-        for (int x = minX; x <= maxX; x++) {
-            for (int y = minY; y <= maxY; y++) {
-                for (int z = minZ; z <= maxZ; z++) {
-                    double h = heuristic(x, y, z);
-                    if (h < minOutside && isInGoal(x, y, z)) {
-                        maybeAlwaysInside.add(h);
-                    } else {
-                        minOutside = Math.min(minOutside, h);
-                    }
-                }
-            }
-        }
-        double maxInside = Double.NEGATIVE_INFINITY;
-        DoubleIterator it = maybeAlwaysInside.iterator();
-        while (it.hasNext()) {
-            double inside = it.nextDouble();
-            if (inside < minOutside) {
-                maxInside = Math.max(maxInside, inside);
-            }
-        }
-        return maxInside;
-    }
-
    @Override
    public String toString() {
        if (maintainY != null) {
--- a/src/api/java/baritone/api/pathing/goals/GoalStrictDirection.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalStrictDirection.java
@@ -64,11 +64,6 @@ public class GoalStrictDirection implements Goal {
        return heuristic;
    }

-    @Override
-    public double heuristic() {
-        return Double.NEGATIVE_INFINITY;
-    }
-
    @Override
    public String toString() {
        return String.format(
--- a/src/api/java/baritone/api/pathing/goals/GoalXZ.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalXZ.java
@@ -21,7 +21,7 @@ import baritone.api.BaritoneAPI;
 import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.SettingsUtil;
 import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;

 /**
 * Useful for long-range goals that don't have a specific Y level.
@@ -94,7 +94,7 @@ public class GoalXZ implements Goal {
        return (diagonal + straight) * BaritoneAPI.getSettings().costHeuristic.value; // big TODO tune
    }

-    public static GoalXZ fromDirection(Vector3d origin, float yaw, double distance) {
+    public static GoalXZ fromDirection(Vec3d origin, float yaw, double distance) {
        float theta = (float) Math.toRadians(yaw);
        double x = origin.x - MathHelper.sin(theta) * distance;
        double z = origin.z + MathHelper.cos(theta) * distance;
--- a/src/api/java/baritone/api/process/IBuilderProcess.java
+++ b/src/api/java/baritone/api/process/IBuilderProcess.java
@@ -21,7 +21,7 @@ import baritone.api.schematic.ISchematic;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Vector3i;
+import net.minecraft.util.math.Vec3i;

 import java.io.File;
 import java.util.List;
@@ -39,7 +39,7 @@ public interface IBuilderProcess extends IBaritoneProcess {
     * @param schematic The object representation of the schematic
     * @param origin    The origin position of the schematic being built
     */
-    void build(String name, ISchematic schematic, Vector3i origin);
+    void build(String name, ISchematic schematic, Vec3i origin);

    /**
     * Requests a build for the specified schematic, labeled as specified, with the specified origin.
@@ -49,7 +49,7 @@ public interface IBuilderProcess extends IBaritoneProcess {
     * @param origin    The origin position of the schematic being built
     * @return Whether or not the schematic was able to load from file
     */
-    boolean build(String name, File schematic, Vector3i origin);
+    boolean build(String name, File schematic, Vec3i origin);

    default boolean build(String schematicFile, BlockPos origin) {
        File file = new File(new File(Minecraft.getInstance().gameDir, "schematics"), schematicFile);
@@ -58,8 +58,6 @@ public interface IBuilderProcess extends IBaritoneProcess {

    void buildOpenSchematic();

-    void buildOpenLitematic(int i);
-
    void pause();

    boolean isPaused();
--- a/src/api/java/baritone/api/schematic/CompositeSchematic.java
+++ b/src/api/java/baritone/api/schematic/CompositeSchematic.java
@@ -71,11 +71,4 @@ public class CompositeSchematic extends AbstractSchematic {
        }
        return entry.schematic.desiredState(x - entry.x, y - entry.y, z - entry.z, current, approxPlaceable);
    }
-
-    @Override
-    public void reset() {
-        for (CompositeSchematicEntry entry : schematicArr) {
-            entry.schematic.reset();
-        }
-    }
 }
--- a/src/api/java/baritone/api/schematic/FillSchematic.java
+++ b/src/api/java/baritone/api/schematic/FillSchematic.java
@@ -19,6 +19,7 @@ package baritone.api.schematic;

 import baritone.api.utils.BlockOptionalMeta;
 import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;

 import java.util.List;

@@ -43,6 +44,8 @@ public class FillSchematic extends AbstractSchematic {
    public BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable) {
        if (bom.matches(current)) {
            return current;
+        } else if (current.getBlock() != Blocks.AIR) {
+            return Blocks.AIR.getDefaultState();
        }
        for (BlockState placeable : approxPlaceable) {
            if (bom.matches(placeable)) {
--- a/src/api/java/baritone/api/schematic/ISchematic.java
+++ b/src/api/java/baritone/api/schematic/ISchematic.java
@@ -73,11 +73,6 @@ public interface ISchematic {
     */
    BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable);

-    /**
-     * Resets possible caches to avoid wrong behavior when moving the schematic around
-     */
-    default void reset() {}
-
    /**
     * @return The width (X axis length) of this schematic
     */
--- a/src/api/java/baritone/api/schematic/ReplaceSchematic.java
+++ b/src/api/java/baritone/api/schematic/ReplaceSchematic.java
@@ -31,18 +31,6 @@ public class ReplaceSchematic extends MaskSchematic {
        this.cache = new Boolean[widthX()][heightY()][lengthZ()];
    }

-    @Override
-    public void reset() {
-        // it's final, can't use this.cache = new Boolean[widthX()][heightY()][lengthZ()]
-        for (int x = 0; x < cache.length; x++) {
-            for (int y = 0; y < cache[0].length; y++) {
-                for (int z = 0; z < cache[0][0].length; z++) {
-                    cache[x][y][z] = null;
-                }
-            }
-        }
-    }
-
    @Override
    protected boolean partOfMask(int x, int y, int z, BlockState currentState) {
        if (cache[x][y][z] == null) {
--- a/src/api/java/baritone/api/schematic/SubstituteSchematic.java
+++ b/src/api/java/baritone/api/schematic/SubstituteSchematic.java
@@ -1,91 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.schematic;
-
-import net.minecraft.block.AirBlock;
-import net.minecraft.block.Block;
-import net.minecraft.block.Blocks;
-import net.minecraft.block.BlockState;
-import net.minecraft.state.Property;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class SubstituteSchematic extends AbstractSchematic {
-
-    private final ISchematic schematic;
-    private final Map<Block, List<Block>> substitutions;
-    private final Map<BlockState, Map<Block, BlockState>> blockStateCache = new HashMap<>();
-
-    public SubstituteSchematic(ISchematic schematic, Map<Block, List<Block>> substitutions) {
-        super(schematic.widthX(), schematic.heightY(), schematic.lengthZ());
-        this.schematic = schematic;
-        this.substitutions = substitutions;
-    }
-
-    @Override
-    public boolean inSchematic(int x, int y, int z, BlockState currentState) {
-        return schematic.inSchematic(x, y, z, currentState);
-    }
-
-    @Override
-    public BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable) {
-        BlockState desired = schematic.desiredState(x, y, z, current, approxPlaceable);
-        Block desiredBlock = desired.getBlock();
-        if (!substitutions.containsKey(desiredBlock)) {
-            return desired;
-        }
-        List<Block> substitutes = substitutions.get(desiredBlock);
-        if (substitutes.contains(current.getBlock()) && !(current.getBlock() instanceof AirBlock)) {// don't preserve air, it's almost always there and almost never wanted
-            return withBlock(desired, current.getBlock());
-        }
-        for (Block substitute : substitutes) {
-            if (substitute instanceof AirBlock) {
-                return current.getBlock() instanceof AirBlock ? current : Blocks.AIR.getDefaultState(); // can always "place" air
-            }
-            for (BlockState placeable : approxPlaceable) {
-                if (substitute.equals(placeable.getBlock())) {
-                    return withBlock(desired, placeable.getBlock());
-                }
-            }
-        }
-        return substitutes.get(0).getDefaultState();
-    }
-
-    private BlockState withBlock(BlockState state, Block block) {
-        if (blockStateCache.containsKey(state) && blockStateCache.get(state).containsKey(block)) {
-            return blockStateCache.get(state).get(block);
-        }
-        Collection<Property<?>> properties = state.getBlock().getStateContainer().getProperties();
-        BlockState newState = block.getDefaultState();
-        for (Property<?> property : properties) {
-            try {
-                newState = copySingleProp(state, newState, property);
-            } catch (IllegalArgumentException e) { //property does not exist for target block
-            }
-        }
-        blockStateCache.computeIfAbsent(state, s -> new HashMap<Block, BlockState>()).put(block, newState);
-        return newState;
-    }
-
-    private <T extends Comparable<T>> BlockState copySingleProp(BlockState fromState, BlockState toState, Property<T> prop) {
-        return toState.with(prop, fromState.get(prop));
-    }
-}
--- a/src/api/java/baritone/api/selection/ISelection.java
+++ b/src/api/java/baritone/api/selection/ISelection.java
@@ -20,7 +20,7 @@ package baritone.api.selection;
 import baritone.api.utils.BetterBlockPos;
 import net.minecraft.util.Direction;
 import net.minecraft.util.math.AxisAlignedBB;
-import net.minecraft.util.math.vector.Vector3i;
+import net.minecraft.util.math.Vec3i;

 /**
 * A selection is an immutable object representing the current selection. The selection is commonly used for certain
@@ -51,7 +51,7 @@ public interface ISelection {
    /**
     * @return The size of this ISelection.
     */
-    Vector3i size();
+    Vec3i size();

    /**
     * @return An {@link AxisAlignedBB} encompassing all blocks in this selection.
--- a/src/api/java/baritone/api/utils/BetterBlockPos.java
+++ b/src/api/java/baritone/api/utils/BetterBlockPos.java
@@ -20,7 +20,7 @@ package baritone.api.utils;
 import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.math.vector.Vector3i;
+import net.minecraft.util.math.Vec3i;

 import javax.annotation.Nonnull;

@@ -149,7 +149,7 @@ public final class BetterBlockPos extends BlockPos {

    @Override
    public BetterBlockPos offset(Direction dir) {
-        Vector3i vec = dir.getDirectionVec();
+        Vec3i vec = dir.getDirectionVec();
        return new BetterBlockPos(x + vec.getX(), y + vec.getY(), z + vec.getZ());
    }

@@ -158,7 +158,7 @@ public final class BetterBlockPos extends BlockPos {
        if (dist == 0) {
            return this;
        }
-        Vector3i vec = dir.getDirectionVec();
+        Vec3i vec = dir.getDirectionVec();
        return new BetterBlockPos(x + vec.getX() * dist, y + vec.getY() * dist, z + vec.getZ() * dist);
    }

--- a/src/api/java/baritone/api/utils/BlockOptionalMeta.java
+++ b/src/api/java/baritone/api/utils/BlockOptionalMeta.java
@@ -24,12 +24,12 @@ import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.loot.*;
 import net.minecraft.resources.*;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.Unit;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.registry.Registry;
+import net.minecraft.world.storage.loot.*;

 import javax.annotation.Nonnull;
 import java.util.*;
@@ -37,6 +37,7 @@ import java.util.concurrent.CompletableFuture;
 import java.util.regex.MatchResult;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;

 public final class BlockOptionalMeta {

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

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

        MatchResult matchResult = matcher.toMatchResult();

-        block = BlockUtils.stringToBlockRequired(matchResult.group(1));
+        ResourceLocation id = new ResourceLocation(matchResult.group(1));
+
+        if (!Registry.BLOCK.containsKey(id)) {
+            throw new IllegalArgumentException("Invalid block ID");
+        }
+
+        block = Registry.BLOCK.getValue(id).orElse(null);
        blockstates = getStates(block);
        stateHashes = getStateHashes(blockstates);
        stackHashes = getStackHashes(blockstates);
@@ -133,11 +139,12 @@ public final class BlockOptionalMeta {

    public static LootTableManager getManager() {
        if (manager == null) {
-            ResourcePackList rpl = new ResourcePackList(ResourcePackInfo::new, new ServerPackFinder());
+            ResourcePackList rpl = new ResourcePackList<>(ResourcePackInfo::new);
+            rpl.addPackFinder(new ServerPackFinder());
            rpl.reloadPacksFromFinders();
-            IResourcePack thePack = rpl.getAllPacks().iterator().next().getResourcePack();
-            IReloadableResourceManager resourceManager = new SimpleReloadableResourceManager(ResourcePackType.SERVER_DATA);
-            manager = new LootTableManager(predicate);
+            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();
@@ -148,30 +155,13 @@ public final class BlockOptionalMeta {
        return manager;
    }

-    public static LootPredicateManager getPredicateManager() {
-        return predicate;
-    }
-
    private static synchronized List<Item> drops(Block b) {
        return drops.computeIfAbsent(b, block -> {
            ResourceLocation lootTableLocation = block.getLootTable();
            if (lootTableLocation == LootTables.EMPTY) {
                return Collections.emptyList();
            } else {
-                List<Item> items = new ArrayList<>();
-
-                // the other overload for generate doesnt work in forge because forge adds code that requires a non null world
-                getManager().getLootTableFromLocation(lootTableLocation).generate(
-                        new LootContext.Builder(null)
-                                .withRandom(new Random())
-                                .withParameter(LootParameters.field_237457_g_, Vector3d.copy(BlockPos.NULL_VECTOR))
-                                .withParameter(LootParameters.TOOL, ItemStack.EMPTY)
-                                .withNullableParameter(LootParameters.BLOCK_ENTITY, null)
-                                .withParameter(LootParameters.BLOCK_STATE, block.getDefaultState())
-                                .build(LootParameterSets.BLOCK),
-                        stack -> items.add(stack.getItem())
-                );
-                return items;
+                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());
            }
        });
    }
--- a/src/api/java/baritone/api/utils/BlockUtils.java
+++ b/src/api/java/baritone/api/utils/BlockUtils.java
@@ -57,7 +57,7 @@ public class BlockUtils {
        if (resourceCache.containsKey(name)) {
            return null; // cached as null
        }
-        block = Registry.BLOCK.getOptional(ResourceLocation.tryCreate(name.contains(":") ? name : "minecraft:" + name)).orElse(null);
+        block = Registry.BLOCK.getValue(ResourceLocation.tryCreate(name.contains(":") ? name : "minecraft:" + name)).orElse(null);
        Map<String, Block> copy = new HashMap<>(resourceCache); // read only copy is safe, wont throw concurrentmodification
        copy.put(name, block);
        resourceCache = copy;
--- a/src/api/java/baritone/api/utils/Helper.java
+++ b/src/api/java/baritone/api/utils/Helper.java
@@ -18,10 +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.TextComponent;
 import net.minecraft.util.text.TextFormatting;

 import java.util.Arrays;
@@ -51,15 +51,15 @@ 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;
-        TextComponent baritone = new StringTextComponent(xd ? "Baritoe" : BaritoneAPI.getSettings().shortBaritonePrefix.value ? "B" : "Baritone");
-        baritone.setStyle(baritone.getStyle().setFormatting(TextFormatting.LIGHT_PURPLE));
+        ITextComponent baritone = new StringTextComponent(xd ? "Baritoe" : BaritoneAPI.getSettings().shortBaritonePrefix.value ? "B" : "Baritone");
+        baritone.getStyle().setColor(TextFormatting.LIGHT_PURPLE);

        // Outer brackets
-        TextComponent prefix = new StringTextComponent("");
-        prefix.setStyle(baritone.getStyle().setFormatting(TextFormatting.DARK_PURPLE));
-        prefix.appendString("[");
-        prefix.append(baritone);
-        prefix.appendString("]");
+        ITextComponent prefix = new StringTextComponent("");
+        prefix.getStyle().setColor(TextFormatting.DARK_PURPLE);
+        prefix.appendText("[");
+        prefix.appendSibling(baritone);
+        prefix.appendText("]");

        return prefix;
    }
@@ -71,7 +71,7 @@ public interface Helper {
     * @param message The message to display in the popup
     */
    default void logToast(ITextComponent title, ITextComponent message) {
-        mc.execute(() -> BaritoneAPI.getSettings().toaster.value.accept(title, message));
+        mc.execute(() -> BaritoneToast.addOrUpdate(mc.getToastGui(), title, message, BaritoneAPI.getSettings().toastTimer.value));
    }

    /**
@@ -93,48 +93,6 @@ public interface Helper {
        logToast(Helper.getPrefix(), new StringTextComponent(message));
    }

-    /**
-     * Send a message as a desktop notification
-     *
-     * @param message The message to display in the notification
-     */
-    default void logNotification(String message) {
-        logNotification(message, false);
-    }
-
-    /**
-     * Send a message as a desktop notification
-     *
-     * @param message The message to display in the notification
-     * @param error   Whether to log as an error
-     */
-    default void logNotification(String message, boolean error) {
-        if (BaritoneAPI.getSettings().desktopNotifications.value) {
-            logNotificationDirect(message, error);
-        }
-    }
-
-    /**
-     * Send a message as a desktop notification regardless of desktopNotifications
-     * (should only be used for critically important messages)
-     *
-     * @param message The message to display in the notification
-     */
-    default void logNotificationDirect(String message) {
-        logNotificationDirect(message, false);
-    }
-
-    /**
-     * Send a message as a desktop notification regardless of desktopNotifications
-     * (should only be used for critically important messages)
-     *
-     * @param message The message to display in the notification
-     * @param error   Whether to log as an error
-     */
-    default void logNotificationDirect(String message, boolean error) {
-        mc.execute(() -> BaritoneAPI.getSettings().notifier.value.accept(message, error));
-    }
-
    /**
     * Send a message to chat only if chatDebug is on
     *
@@ -158,10 +116,10 @@ public interface Helper {
     * @param components The components to send
     */
    default void logDirect(boolean logAsToast, ITextComponent... components) {
-        TextComponent component = new StringTextComponent("");
-        component.append(getPrefix());
-        component.append(new StringTextComponent(" "));
-        Arrays.asList(components).forEach(component::append);
+        ITextComponent component = new StringTextComponent("");
+        component.appendSibling(getPrefix());
+        component.appendSibling(new StringTextComponent(" "));
+        Arrays.asList(components).forEach(component::appendSibling);
        if (logAsToast) {
            logToast(getPrefix(), component);
        } else {
@@ -188,8 +146,8 @@ public interface Helper {
     */
    default void logDirect(String message, TextFormatting color, boolean logAsToast) {
        Stream.of(message.split("\n")).forEach(line -> {
-            TextComponent component = new StringTextComponent(line.replace("\t", "    "));
-            component.setStyle(component.getStyle().setFormatting(color));
+            ITextComponent component = new StringTextComponent(line.replace("\t", "    "));
+            component.getStyle().setColor(color);
            logDirect(logAsToast, component);
        });
    }
--- a/src/api/java/baritone/api/utils/IPlayerContext.java
+++ b/src/api/java/baritone/api/utils/IPlayerContext.java
@@ -25,7 +25,7 @@ import net.minecraft.entity.Entity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.BlockRayTraceResult;
 import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;

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

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

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

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

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

    default Rotation playerRotations() {
--- a/src/api/java/baritone/api/utils/RayTraceUtils.java
+++ b/src/api/java/baritone/api/utils/RayTraceUtils.java
@@ -20,7 +20,7 @@ package baritone.api.utils;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.math.RayTraceContext;
 import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;

 /**
 * @author Brady
@@ -45,14 +45,14 @@ public final class RayTraceUtils {
    }

    public static RayTraceResult rayTraceTowards(Entity entity, Rotation rotation, double blockReachDistance, boolean wouldSneak) {
-        Vector3d start;
+        Vec3d start;
        if (wouldSneak) {
            start = inferSneakingEyePosition(entity);
        } else {
            start = entity.getEyePosition(1.0F); // do whatever is correct
        }
-        Vector3d direction = RotationUtils.calcVector3dFromRotation(rotation);
-        Vector3d end = start.add(
+        Vec3d direction = RotationUtils.calcVec3dFromRotation(rotation);
+        Vec3d end = start.add(
                direction.x * blockReachDistance,
                direction.y * blockReachDistance,
                direction.z * blockReachDistance
@@ -60,7 +60,7 @@ public final class RayTraceUtils {
        return entity.world.rayTraceBlocks(new RayTraceContext(start, end, RayTraceContext.BlockMode.OUTLINE, RayTraceContext.FluidMode.NONE, entity));
    }

-    public static Vector3d inferSneakingEyePosition(Entity entity) {
-        return new Vector3d(entity.getPosX(), entity.getPosY() + IPlayerContext.eyeHeight(true), entity.getPosZ());
+    public static Vec3d inferSneakingEyePosition(Entity entity) {
+        return new Vec3d(entity.posX, entity.posY + IPlayerContext.eyeHeight(true), entity.posZ);
    }
 }
--- a/src/api/java/baritone/api/utils/RotationUtils.java
+++ b/src/api/java/baritone/api/utils/RotationUtils.java
@@ -19,18 +19,14 @@ package baritone.api.utils;

 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
-import net.minecraft.block.AbstractFireBlock;
 import net.minecraft.block.BlockState;
+import net.minecraft.block.FireBlock;
 import net.minecraft.client.entity.player.ClientPlayerEntity;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.Direction;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.BlockRayTraceResult;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.*;
 import net.minecraft.util.math.shapes.VoxelShape;
 import net.minecraft.util.math.shapes.VoxelShapes;
-import net.minecraft.util.math.vector.Vector3d;

 import java.util.Optional;

@@ -53,13 +49,13 @@ public final class RotationUtils {
    /**
     * Offsets from the root block position to the center of each side.
     */
-    private static final Vector3d[] BLOCK_SIDE_MULTIPLIERS = new Vector3d[]{
-            new Vector3d(0.5, 0, 0.5), // Down
-            new Vector3d(0.5, 1, 0.5), // Up
-            new Vector3d(0.5, 0.5, 0), // North
-            new Vector3d(0.5, 0.5, 1), // South
-            new Vector3d(0, 0.5, 0.5), // West
-            new Vector3d(1, 0.5, 0.5)  // East
+    private static final Vec3d[] BLOCK_SIDE_MULTIPLIERS = new Vec3d[]{
+            new Vec3d(0.5, 0, 0.5), // Down
+            new Vec3d(0.5, 1, 0.5), // Up
+            new Vec3d(0.5, 0.5, 0), // North
+            new Vec3d(0.5, 0.5, 1), // South
+            new Vec3d(0, 0.5, 0.5), // West
+            new Vec3d(1, 0.5, 0.5)  // East
    };

    private RotationUtils() {}
@@ -72,7 +68,7 @@ public final class RotationUtils {
     * @return The rotation from the origin to the destination
     */
    public static Rotation calcRotationFromCoords(BlockPos orig, BlockPos dest) {
-        return calcRotationFromVec3d(new Vector3d(orig.getX(), orig.getY(), orig.getZ()), new Vector3d(dest.getX(), dest.getY(), dest.getZ()));
+        return calcRotationFromVec3d(new Vec3d(orig), new Vec3d(dest));
    }

    /**
@@ -101,7 +97,7 @@ public final class RotationUtils {
     * @return The rotation from the origin to the destination
     * @see #wrapAnglesToRelative(Rotation, Rotation)
     */
-    public static Rotation calcRotationFromVec3d(Vector3d orig, Vector3d dest, Rotation current) {
+    public static Rotation calcRotationFromVec3d(Vec3d orig, Vec3d dest, Rotation current) {
        return wrapAnglesToRelative(current, calcRotationFromVec3d(orig, dest));
    }

@@ -112,7 +108,7 @@ public final class RotationUtils {
     * @param dest The destination position
     * @return The rotation from the origin to the destination
     */
-    private static Rotation calcRotationFromVec3d(Vector3d orig, Vector3d dest) {
+    private static Rotation calcRotationFromVec3d(Vec3d orig, Vec3d dest) {
        double[] delta = {orig.x - dest.x, orig.y - dest.y, orig.z - dest.z};
        double yaw = MathHelper.atan2(delta[0], -delta[2]);
        double dist = Math.sqrt(delta[0] * delta[0] + delta[2] * delta[2]);
@@ -129,12 +125,12 @@ public final class RotationUtils {
     * @param rotation The input rotation
     * @return Look vector for the rotation
     */
-    public static Vector3d calcVector3dFromRotation(Rotation rotation) {
+    public static Vec3d calcVec3dFromRotation(Rotation rotation) {
        float f = MathHelper.cos(-rotation.getYaw() * (float) DEG_TO_RAD - (float) Math.PI);
        float f1 = MathHelper.sin(-rotation.getYaw() * (float) DEG_TO_RAD - (float) Math.PI);
        float f2 = -MathHelper.cos(-rotation.getPitch() * (float) DEG_TO_RAD);
        float f3 = MathHelper.sin(-rotation.getPitch() * (float) DEG_TO_RAD);
-        return new Vector3d((double) (f1 * f2), (double) f3, (double) (f * f2));
+        return new Vec3d((double) (f1 * f2), (double) f3, (double) (f * f2));
    }

    /**
@@ -202,11 +198,11 @@ public final class RotationUtils {
        if (shape.isEmpty()) {
            shape = VoxelShapes.fullCube();
        }
-        for (Vector3d sideOffset : BLOCK_SIDE_MULTIPLIERS) {
+        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);
-            possibleRotation = reachableOffset(entity, pos, new Vector3d(pos.getX(), pos.getY(), pos.getZ()).add(xDiff, yDiff, zDiff), blockReachDistance, wouldSneak);
+            possibleRotation = reachableOffset(entity, pos, new Vec3d(pos).add(xDiff, yDiff, zDiff), blockReachDistance, wouldSneak);
            if (possibleRotation.isPresent()) {
                return possibleRotation;
            }
@@ -225,8 +221,8 @@ public final class RotationUtils {
     * @param blockReachDistance The block reach distance of the entity
     * @return The optional rotation
     */
-    public static Optional<Rotation> reachableOffset(Entity entity, BlockPos pos, Vector3d offsetPos, double blockReachDistance, boolean wouldSneak) {
-        Vector3d eyes = wouldSneak ? RayTraceUtils.inferSneakingEyePosition(entity) : entity.getEyePosition(1.0F);
+    public static Optional<Rotation> reachableOffset(Entity entity, BlockPos pos, Vec3d offsetPos, double blockReachDistance, boolean wouldSneak) {
+        Vec3d eyes = wouldSneak ? RayTraceUtils.inferSneakingEyePosition(entity) : entity.getEyePosition(1.0F);
        Rotation rotation = calcRotationFromVec3d(eyes, offsetPos, new Rotation(entity.rotationYaw, entity.rotationPitch));
        RayTraceResult result = RayTraceUtils.rayTraceTowards(entity, rotation, blockReachDistance, wouldSneak);
        //System.out.println(result);
@@ -234,7 +230,7 @@ public final class RotationUtils {
            if (((BlockRayTraceResult) result).getPos().equals(pos)) {
                return Optional.of(rotation);
            }
-            if (entity.world.getBlockState(pos).getBlock() instanceof AbstractFireBlock && ((BlockRayTraceResult) result).getPos().equals(pos.down())) {
+            if (entity.world.getBlockState(pos).getBlock() instanceof FireBlock && ((BlockRayTraceResult) result).getPos().equals(pos.down())) {
                return Optional.of(rotation);
            }
        }
--- a/src/api/java/baritone/api/utils/SettingsUtil.java
+++ b/src/api/java/baritone/api/utils/SettingsUtil.java
@@ -24,7 +24,7 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.item.Item;
 import net.minecraft.util.Direction;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.vector.Vector3i;
+import net.minecraft.util.math.Vec3i;
 import net.minecraft.util.registry.Registry;

 import java.awt.*;
@@ -38,7 +38,6 @@ import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -52,7 +51,6 @@ public class SettingsUtil {

    private static final Path SETTINGS_PATH = Minecraft.getInstance().gameDir.toPath().resolve("baritone").resolve("settings.txt");
    private static final Pattern SETTING_PATTERN = Pattern.compile("^(?<setting>[^ ]+) +(?<value>.+)"); // key and value split by the first space
-    private static final String[] JAVA_ONLY_SETTINGS = {"logger", "notifier", "toaster"};


    private static boolean isComment(String line) {
@@ -115,7 +113,7 @@ public class SettingsUtil {
                System.out.println("NULL SETTING?" + setting.getName());
                continue;
            }
-            if (javaOnlySetting(setting)) {
+            if (setting.getName().equals("logger")) {
                continue; // NO
            }
            if (setting.value == setting.defaultValue) {
@@ -169,28 +167,13 @@ public class SettingsUtil {
    }

    public static String settingToString(Settings.Setting setting) throws IllegalStateException {
-        if (javaOnlySetting(setting)) {
-            return setting.getName();
+        if (setting.getName().equals("logger")) {
+            return "logger";
        }

        return setting.getName() + " " + settingValueToString(setting);
    }

-    /**
-     * This should always be the same as whether the setting can be parsed from or serialized to a string
-     *
-     * @param setting The Setting
-     * @return true if the setting can not be set or read by the user
-     */
-    public static boolean javaOnlySetting(Settings.Setting setting) {
-        for (String name : JAVA_ONLY_SETTINGS) { // no JAVA_ONLY_SETTINGS.contains(...) because that would be case sensitive
-            if (setting.getName().equalsIgnoreCase(name)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
    public static void parseAndApply(Settings settings, String settingName, String settingValue) throws IllegalStateException, NumberFormatException {
        Settings.Setting setting = settings.byLowerName.get(settingName);
        if (setting == null) {
@@ -242,8 +225,8 @@ public class SettingsUtil {
                color -> color.getRed() + "," + color.getGreen() + "," + color.getBlue()
        ),
        VEC3I(
-                Vector3i.class,
-                str -> new Vector3i(Integer.parseInt(str.split(",")[0]), Integer.parseInt(str.split(",")[1]), Integer.parseInt(str.split(",")[2])),
+                Vec3i.class,
+                str -> new Vec3i(Integer.parseInt(str.split(",")[0]), Integer.parseInt(str.split(",")[1]), Integer.parseInt(str.split(",")[2])),
                vec -> vec.getX() + "," + vec.getY() + "," + vec.getZ()
        ),
        BLOCK(
@@ -280,36 +263,6 @@ public class SettingsUtil {
            public boolean accepts(Type type) {
                return List.class.isAssignableFrom(TypeUtils.resolveBaseClass(type));
            }
-        },
-        MAPPING() {
-            @Override
-            public Object parse(ParserContext context, String raw) {
-                Type keyType = ((ParameterizedType) context.getSetting().getType()).getActualTypeArguments()[0];
-                Type valueType = ((ParameterizedType) context.getSetting().getType()).getActualTypeArguments()[1];
-                Parser keyParser = Parser.getParser(keyType);
-                Parser valueParser = Parser.getParser(valueType);
-
-                return Stream.of(raw.split(",(?=[^,]*->)"))
-                        .map(s -> s.split("->"))
-                        .collect(Collectors.toMap(s -> keyParser.parse(context, s[0]), s -> valueParser.parse(context, s[1])));
-            }
-
-            @Override
-            public String toString(ParserContext context, Object value) {
-                Type keyType = ((ParameterizedType) context.getSetting().getType()).getActualTypeArguments()[0];
-                Type valueType = ((ParameterizedType) context.getSetting().getType()).getActualTypeArguments()[1];
-                Parser keyParser = Parser.getParser(keyType);
-                Parser valueParser = Parser.getParser(valueType);
-
-                return ((Map<?, ?>) value).entrySet().stream()
-                        .map(o -> keyParser.toString(context, o.getKey()) + "->" + valueParser.toString(context, o.getValue()))
-                        .collect(Collectors.joining(","));
-            }
-
-            @Override
-            public boolean accepts(Type type) {
-                return Map.class.isAssignableFrom(TypeUtils.resolveBaseClass(type));
-            }
        };

        private final Class<?> cla$$;
--- a/src/api/java/baritone/api/utils/VecUtils.java
+++ b/src/api/java/baritone/api/utils/VecUtils.java
@@ -17,13 +17,13 @@

 package baritone.api.utils;

-import net.minecraft.block.AbstractFireBlock;
 import net.minecraft.block.BlockState;
+import net.minecraft.block.FireBlock;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.math.shapes.VoxelShape;
-import net.minecraft.util.math.vector.Vector3d;
 import net.minecraft.world.World;

 /**
@@ -42,7 +42,7 @@ public final class VecUtils {
     * @return The center of the block's bounding box
     * @see #getBlockPosCenter(BlockPos)
     */
-    public static Vector3d calculateBlockCenter(World world, BlockPos pos) {
+    public static Vec3d calculateBlockCenter(World world, BlockPos pos) {
        BlockState b = world.getBlockState(pos);
        VoxelShape shape = b.getCollisionShape(world, pos);
        if (shape.isEmpty()) {
@@ -54,10 +54,10 @@ public final class VecUtils {
        if (Double.isNaN(xDiff) || Double.isNaN(yDiff) || Double.isNaN(zDiff)) {
            throw new IllegalStateException(b + " " + pos + " " + shape);
        }
-        if (b.getBlock() instanceof AbstractFireBlock) {//look at bottom of fire when putting it out
+        if (b.getBlock() instanceof FireBlock) {//look at bottom of fire when putting it out
            yDiff = 0;
        }
-        return new Vector3d(
+        return new Vec3d(
                pos.getX() + xDiff,
                pos.getY() + yDiff,
                pos.getZ() + zDiff
@@ -74,8 +74,8 @@ public final class VecUtils {
     * @return The assumed center of the position
     * @see #calculateBlockCenter(World, BlockPos)
     */
-    public static Vector3d getBlockPosCenter(BlockPos pos) {
-        return new Vector3d(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
+    public static Vec3d getBlockPosCenter(BlockPos pos) {
+        return new Vec3d(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
    }

    /**
@@ -105,7 +105,7 @@ public final class VecUtils {
     * @see #getBlockPosCenter(BlockPos)
     */
    public static double entityDistanceToCenter(Entity entity, BlockPos pos) {
-        return distanceToCenter(pos, entity.getPositionVec().x, entity.getPositionVec().y, entity.getPositionVec().z);
+        return distanceToCenter(pos, entity.posX, entity.posY, entity.posZ);
    }

    /**
@@ -118,6 +118,6 @@ public final class VecUtils {
     * @see #getBlockPosCenter(BlockPos)
     */
    public static double entityFlatDistanceToCenter(Entity entity, BlockPos pos) {
-        return distanceToCenter(pos, entity.getPositionVec().x, pos.getY() + 0.5, entity.getPositionVec().z);
+        return distanceToCenter(pos, entity.posX, pos.getY() + 0.5, entity.posZ);
    }
 }
--- a/src/api/java/baritone/api/utils/gui/BaritoneToast.java
+++ b/src/api/java/baritone/api/utils/gui/BaritoneToast.java
@@ -17,7 +17,6 @@

 package baritone.api.utils.gui;

-import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.platform.GlStateManager;
 import net.minecraft.client.gui.toasts.IToast;
 import net.minecraft.client.gui.toasts.ToastGui;
@@ -32,12 +31,12 @@ public class BaritoneToast implements IToast {
    private long totalShowTime;

    public BaritoneToast(ITextComponent titleComponent, ITextComponent subtitleComponent, long totalShowTime) {
-        this.title = titleComponent.getString();
-        this.subtitle = subtitleComponent == null ? null : subtitleComponent.getString();
+        this.title = titleComponent.getFormattedText();
+        this.subtitle = subtitleComponent == null ? null : subtitleComponent.getFormattedText();
        this.totalShowTime = totalShowTime;
    }

-    public Visibility func_230444_a_(MatrixStack matrixStack, ToastGui toastGui, long delta) {
+    public Visibility draw(ToastGui toastGui, long delta) {
        if (this.newDisplay) {
            this.firstDrawTime = delta;
            this.newDisplay = false;
@@ -45,21 +44,21 @@ public class BaritoneToast implements IToast {

        toastGui.getMinecraft().getTextureManager().bindTexture(new ResourceLocation("textures/gui/toasts.png"));
        GlStateManager.color4f(1.0F, 1.0F, 1.0F, 255.0f);
-        toastGui.blit(matrixStack, 0, 0, 0, 32, 160, 32);
+        toastGui.blit(0, 0, 0, 32, 160, 32);

        if (this.subtitle == null) {
-            toastGui.getMinecraft().fontRenderer.drawString(matrixStack, this.title, 18, 12, -11534256);
+            toastGui.getMinecraft().fontRenderer.drawString(this.title, 18, 12, -11534256);
        } else {
-            toastGui.getMinecraft().fontRenderer.drawString(matrixStack, this.title, 18, 7, -11534256);
-            toastGui.getMinecraft().fontRenderer.drawString(matrixStack, this.subtitle, 18, 18, -16777216);
+            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.getString();
-        this.subtitle = subtitleComponent == null ? null : subtitleComponent.getString();
+        this.title = titleComponent.getFormattedText();
+        this.subtitle = subtitleComponent == null ? null : subtitleComponent.getFormattedText();
        this.newDisplay = true;
    }

@@ -72,8 +71,4 @@ public class BaritoneToast implements IToast {
            baritonetoast.setDisplayedText(title, subtitle);
        }
    }
-
-    public static void addOrUpdate(ITextComponent title, ITextComponent subtitle) {
-        addOrUpdate(net.minecraft.client.Minecraft.getInstance().getToastGui(), title, subtitle, baritone.api.BaritoneAPI.getSettings().toastTimer.value);
-    }
 }
--- a/src/launch/java/baritone/launch/BaritoneMixinConnector.java
+++ b/src/launch/java/baritone/launch/BaritoneMixinConnector.java
@@ -1,29 +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;
-
-import org.spongepowered.asm.mixin.Mixins;
-import org.spongepowered.asm.mixin.connect.IMixinConnector;
-
-public class BaritoneMixinConnector implements IMixinConnector {
-
-    @Override
-    public void connect() {
-        Mixins.addConfiguration("mixins.baritone.json");
-    }
-}
--- a/src/launch/java/baritone/launch/mixins/MixinBitArray.java
+++ b/src/launch/java/baritone/launch/mixins/MixinBitArray.java
@@ -0,0 +1,67 @@
+/*
+ * 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.IBitArray;
+import net.minecraft.util.BitArray;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
+
+@Mixin(BitArray.class)
+public abstract class MixinBitArray implements IBitArray {
+
+    @Shadow
+    @Final
+    private long[] longArray;
+
+    @Shadow
+    @Final
+    private int bitsPerEntry;
+
+    @Shadow
+    @Final
+    private long maxEntryValue;
+
+    @Shadow
+    @Final
+    private int arraySize;
+
+    @Override
+    @Unique
+    public int[] toArray() {
+        int[] out = new int[arraySize];
+
+        for (int idx = 0, kl = bitsPerEntry - 1; idx < arraySize; idx++, kl += bitsPerEntry) {
+            final int i = idx * bitsPerEntry;
+            final int j = i >> 6;
+            final int l = i & 63;
+            final int k = kl >> 6;
+            final long jl = longArray[j] >>> l;
+
+            if (j == k) {
+                out[idx] = (int) (jl & maxEntryValue);
+            } else {
+                out[idx] = (int) ((jl | longArray[k] << (64 - l)) & maxEntryValue);
+            }
+        }
+
+        return out;
+    }
+}
--- a/src/launch/java/baritone/launch/mixins/MixinBlockStateContainer.java
+++ b/src/launch/java/baritone/launch/mixins/MixinBlockStateContainer.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.utils.accessor.IBitArray;
+import baritone.utils.accessor.IBlockStateContainer;
+import net.minecraft.block.BlockState;
+import net.minecraft.util.BitArray;
+import net.minecraft.world.chunk.BlockStateContainer;
+import net.minecraft.world.chunk.IBlockStatePalette;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+@Mixin(BlockStateContainer.class)
+public abstract class MixinBlockStateContainer implements IBlockStateContainer {
+
+    @Shadow
+    protected BitArray storage;
+
+    @Shadow
+    protected IBlockStatePalette<BlockState> palette;
+
+    @Override
+    public BlockState getAtPalette(int index) {
+        return palette.get(index);
+    }
+
+    @Override
+    public int[] storageArray() {
+        return ((IBitArray) storage).toArray();
+    }
+}
--- a/src/launch/java/baritone/launch/mixins/MixinCommandSuggestionHelper.java
+++ b/src/launch/java/baritone/launch/mixins/MixinCommandSuggestionHelper.java
@@ -22,7 +22,7 @@ import baritone.api.event.events.TabCompleteEvent;
 import com.mojang.brigadier.context.StringRange;
 import com.mojang.brigadier.suggestion.Suggestion;
 import com.mojang.brigadier.suggestion.Suggestions;
-import net.minecraft.client.gui.CommandSuggestionHelper;
+import net.minecraft.client.gui.screen.ChatScreen;
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -40,22 +40,21 @@ import java.util.stream.Stream;
 * @author Brady
 * @since 10/9/2019
 */
-@Mixin(CommandSuggestionHelper.class)
-public class MixinCommandSuggestionHelper {
+@Mixin(ChatScreen.class)
+public class MixinChatScreen {
+
+    @Shadow
+    protected TextFieldWidget inputField;

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

    @Shadow
-    @Final
-    private List<String> exceptionList;
-
-    @Shadow
-    private CompletableFuture<Suggestions> suggestionsFuture;
+    private CompletableFuture<Suggestions> pendingSuggestions;

    @Inject(
-            method = "init",
+            method = "updateSuggestion",
            at = @At("HEAD"),
            cancellable = true
    )
@@ -75,10 +74,10 @@ public class MixinCommandSuggestionHelper {
            ci.cancel();

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

            if (event.completions.length == 0) {
-                this.suggestionsFuture = Suggestions.empty();
+                this.pendingSuggestions = Suggestions.empty();
            } else {
                int offset = this.inputField.getText().endsWith(" ")
                        ? this.inputField.getCursorPosition()
@@ -92,8 +91,8 @@ public class MixinCommandSuggestionHelper {
                        StringRange.between(offset, offset + suggestionList.stream().mapToInt(s -> s.getText().length()).max().orElse(0)),
                        suggestionList);

-                this.suggestionsFuture = new CompletableFuture<>();
-                this.suggestionsFuture.complete(suggestions);
+                this.pendingSuggestions = new CompletableFuture<>();
+                this.pendingSuggestions.complete(suggestions);
            }
        }
    }
--- a/src/launch/java/baritone/launch/mixins/MixinClientPlayNetHandler.java
+++ b/src/launch/java/baritone/launch/mixins/MixinClientPlayNetHandler.java
@@ -147,15 +147,20 @@ public class MixinClientPlayNetHandler {
        if (!Baritone.settings().repackOnAnyBlockChange.value) {
            return;
        }
-        ChunkPos[] chunkPos = new ChunkPos[1];
-        packetIn.func_244310_a((pos, state) -> {
-            if (CachedChunk.BLOCKS_TO_KEEP_TRACK_OF.contains(state.getBlock())) {
-                chunkPos[0] = new ChunkPos(pos);
-            }
-        });
-        if (chunkPos[0] == null) {
+        if (packetIn.getChangedBlocks().length == 0) {
            return;
        }
+        https:
+//docs.oracle.com/javase/specs/jls/se7/html/jls-14.html#jls-14.15
+        {
+            for (SMultiBlockChangePacket.UpdateData update : packetIn.getChangedBlocks()) {
+                if (CachedChunk.BLOCKS_TO_KEEP_TRACK_OF.contains(update.getBlockState().getBlock())) {
+                    break https;
+                }
+            }
+            return;
+        }
+        ChunkPos pos = new ChunkPos(packetIn.getChangedBlocks()[0].getPos());
        for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
            ClientPlayerEntity player = ibaritone.getPlayerContext().player();
            if (player != null && player.connection == (ClientPlayNetHandler) (Object) this) {
@@ -163,8 +168,8 @@ public class MixinClientPlayNetHandler {
                        new ChunkEvent(
                                EventState.POST,
                                ChunkEvent.Type.POPULATE_FULL,
-                                chunkPos[0].x,
-                                chunkPos[0].z
+                                pos.x,
+                                pos.z
                        )
                );
            }
--- a/src/launch/java/baritone/launch/mixins/MixinEntityRenderManager.java
+++ b/src/launch/java/baritone/launch/mixins/MixinEntityRenderManager.java
@@ -20,23 +20,29 @@ package baritone.launch.mixins;
 import baritone.utils.accessor.IEntityRenderManager;
 import net.minecraft.client.renderer.entity.EntityRendererManager;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;

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

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

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

    @Override
    public double renderPosZ() {
-        return ((EntityRendererManager) (Object) this).info.getProjectedView().z;
+        return renderPosZ;
    }
 }
--- a/src/launch/java/baritone/launch/mixins/MixinWorldRenderer.java
+++ b/src/launch/java/baritone/launch/mixins/MixinWorldRenderer.java
@@ -20,33 +20,26 @@ package baritone.launch.mixins;
 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
 import baritone.api.event.events.RenderEvent;
-import com.mojang.blaze3d.matrix.MatrixStack;
-import net.minecraft.client.renderer.ActiveRenderInfo;
 import net.minecraft.client.renderer.GameRenderer;
-import net.minecraft.client.renderer.LightTexture;
-import net.minecraft.client.renderer.WorldRenderer;
-import net.minecraft.util.math.vector.Matrix4f;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;

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

    @Inject(
-            method = "updateCameraAndRender",
-            at = @At("RETURN"),
-            locals = LocalCapture.CAPTURE_FAILSOFT
+            method = "updateCameraAndRender(FJ)V",
+            at = @At(
+                    value = "INVOKE_STRING",
+                    target = "Lnet/minecraft/profiler/IProfiler;endStartSection(Ljava/lang/String;)V",
+                    args = {"ldc=hand"}
+            )
    )
-    private void onStartHand(MatrixStack matrixStackIn, float partialTicks, long finishTimeNano, boolean drawBlockOutline, ActiveRenderInfo activeRenderInfoIn, GameRenderer gameRendererIn, LightTexture lightmapIn, Matrix4f projectionIn, CallbackInfo ci) {
+    private void renderWorldPass(float partialTicks, long finishTimeNano, CallbackInfo ci) {
        for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            ibaritone.getGameEventHandler().onRenderPass(new RenderEvent(partialTicks, matrixStackIn, projectionIn));
+            ibaritone.getGameEventHandler().onRenderPass(new RenderEvent(partialTicks));
        }
    }
-}
+}
--- a/src/launch/java/baritone/launch/mixins/MixinLivingEntity.java
+++ b/src/launch/java/baritone/launch/mixins/MixinLivingEntity.java
@@ -31,7 +31,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

-import static org.objectweb.asm.Opcodes.GETFIELD;
+import static org.spongepowered.asm.lib.Opcodes.GETFIELD;

 /**
 * @author Brady
--- a/src/launch/java/baritone/launch/mixins/MixinLootContext.java
+++ b/src/launch/java/baritone/launch/mixins/MixinLootContext.java
@@ -18,11 +18,10 @@
 package baritone.launch.mixins;

 import baritone.api.utils.BlockOptionalMeta;
-import net.minecraft.loot.LootContext;
-import net.minecraft.loot.LootPredicateManager;
-import net.minecraft.loot.LootTableManager;
 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;
@@ -48,7 +47,7 @@ public class MixinLootContext {
            method = "build",
            at = @At(
                    value = "INVOKE",
-                    target = "net/minecraft/server/MinecraftServer.getLootTableManager()Lnet/minecraft/loot/LootTableManager;"
+                    target = "net/minecraft/server/MinecraftServer.getLootTableManager()Lnet/minecraft/world/storage/loot/LootTableManager;"
            )
    )
    private LootTableManager getLootTableManager(MinecraftServer server) {
@@ -57,18 +56,4 @@ public class MixinLootContext {
        }
        return server.getLootTableManager();
    }
-
-    @Redirect(
-            method = "build",
-            at = @At(
-                    value = "INVOKE",
-                    target = "net/minecraft/server/MinecraftServer.func_229736_aP_()Lnet/minecraft/loot/LootPredicateManager;"
-            )
-    )
-    private LootPredicateManager getLootPredicateManager(MinecraftServer server) {
-        if (server == null) {
-            return BlockOptionalMeta.getPredicateManager();
-        }
-        return server.func_229736_aP_();
-    }
 }
--- a/src/launch/java/baritone/launch/mixins/MixinMinecraft.java
+++ b/src/launch/java/baritone/launch/mixins/MixinMinecraft.java
@@ -19,6 +19,7 @@ package baritone.launch.mixins;

 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
+import baritone.api.event.events.BlockInteractEvent;
 import baritone.api.event.events.TickEvent;
 import baritone.api.event.events.WorldEvent;
 import baritone.api.event.events.type.EventState;
@@ -26,13 +27,18 @@ 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 org.objectweb.asm.Opcodes;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ActionResultType;
+import net.minecraft.util.Hand;
+import net.minecraft.util.math.BlockRayTraceResult;
+import org.spongepowered.asm.lib.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.LocalCapture;

 import java.util.function.BiFunction;

@@ -49,14 +55,13 @@ public class MixinMinecraft {
    public ClientWorld world;

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

-
    @Inject(
            method = "runTick",
            at = @At(
@@ -131,24 +136,16 @@ public class MixinMinecraft {
        return (BaritoneAPI.getProvider().getPrimaryBaritone().getPathingBehavior().isPathing() && player != null) || screen.passEvents;
    }

-    // TODO
-    // FIXME
-    // bradyfix
-    // i cant mixin
-    // lol
-    // https://discordapp.com/channels/208753003996512258/503692253881958400/674760939681349652
-    // https://discordapp.com/channels/208753003996512258/503692253881958400/674756457966862376
-    /*@Inject(
+    @Inject(
            method = "rightClickMouse",
            at = @At(
                    value = "INVOKE",
-                    target = "net/minecraft/client/entity/player/ClientPlayerEntity.swingArm(Lnet/minecraft/util/Hand;)V",
-                    ordinal = 1
+                    target = "net/minecraft/client/entity/player/ClientPlayerEntity.swingArm(Lnet/minecraft/util/Hand;)V"
            ),
            locals = LocalCapture.CAPTURE_FAILHARD
    )
-    private void onBlockUse(CallbackInfo ci, Hand var1[], int var2, int var3, Hand enumhand, ItemStack itemstack, EntityRayTraceResult rt, Entity ent, ActionResultType art, BlockRayTraceResult raytrace, int i, ActionResultType enumactionresult) {
+    private void onBlockUse(CallbackInfo ci, Hand var1[], int var2, int var3, Hand enumhand, ItemStack itemstack, BlockRayTraceResult raytrace, int i, ActionResultType enumactionresult) {
        // rightClickMouse is only for the main player
        BaritoneAPI.getProvider().getPrimaryBaritone().getGameEventHandler().onBlockInteract(new BlockInteractEvent(raytrace.getPos(), BlockInteractEvent.Type.USE));
-    }*/
+    }
 }
--- a/src/launch/java/baritone/launch/mixins/MixinSodiumChunkProvider.java
+++ b/src/launch/java/baritone/launch/mixins/MixinSodiumChunkProvider.java
@@ -1,94 +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 baritone.utils.accessor.ISodiumChunkArray;
-import net.minecraft.client.multiplayer.ClientChunkProvider;
-import net.minecraft.client.world.ClientWorld;
-import org.spongepowered.asm.mixin.*;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-import java.util.concurrent.locks.StampedLock;
-
-@Pseudo
-@Mixin(targets = "me.jellysquid.mods.sodium.client.world.SodiumChunkManager", remap = false)
-public class MixinSodiumChunkProvider implements IClientChunkProvider {
-    
-    @Shadow
-    @Final
-    private StampedLock lock;
-    
-    @Shadow
-    @Final
-    private ClientWorld world;
-    
-    @Shadow
-    private int radius;
-    
-    @Unique
-    private static Constructor<?> thisConstructor = null;
-    
-    @Unique
-    private static Field chunkArrayField = null;
-    
-    @Override
-    public ClientChunkProvider createThreadSafeCopy() {
-        // similar operation to https://github.com/jellysquid3/sodium-fabric/blob/d3528521d48a130322c910c6f0725cf365ebae6f/src/main/java/me/jellysquid/mods/sodium/client/world/SodiumChunkManager.java#L139
-        long stamp = this.lock.writeLock();
-        
-        try {
-            ISodiumChunkArray refArray = extractReferenceArray();
-            if (thisConstructor == null) {
-                thisConstructor = this.getClass().getConstructor(ClientWorld.class, int.class);
-            }
-            ClientChunkProvider result = (ClientChunkProvider) thisConstructor.newInstance(world, radius - 3); // -3 because it adds 3 for no reason here too lmao
-            IChunkArray copyArr = ((IClientChunkProvider) result).extractReferenceArray();
-            copyArr.copyFrom(refArray);
-            return result;
-        } catch (InstantiationException | InvocationTargetException | NoSuchMethodException | IllegalAccessException e) {
-            throw new RuntimeException("Sodium chunk manager initialization for baritone failed", e);
-        } finally {
-            // put this in finally so we can't break anything.
-            this.lock.unlockWrite(stamp);
-        }
-    }
-    
-    @Override
-    public ISodiumChunkArray extractReferenceArray() {
-        https://docs.oracle.com/javase/specs/jls/se7/html/jls-14.html#jls-14.15
-        if (chunkArrayField == null) {
-            for (Field f : this.getClass().getDeclaredFields()) {
-                if (ISodiumChunkArray.class.isAssignableFrom(f.getType())) {
-                    chunkArrayField = f;
-                    break https;
-                }
-            }
-            throw new RuntimeException(Arrays.toString(this.getClass().getDeclaredFields()));
-        }
-        try {
-            return (ISodiumChunkArray) chunkArrayField.get(this);
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}
--- a/src/launch/java/baritone/launch/mixins/MixinSodiumFixedLongHashTable.java
+++ b/src/launch/java/baritone/launch/mixins/MixinSodiumFixedLongHashTable.java
@@ -1,80 +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.ISodiumChunkArray;
-import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
-import it.unimi.dsi.fastutil.objects.ObjectIterator;
-import net.minecraft.world.chunk.Chunk;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Pseudo;
-import org.spongepowered.asm.mixin.Shadow;
-
-import java.util.concurrent.atomic.AtomicReferenceArray;
-
-@Pseudo
-@Mixin(targets = "me.jellysquid.mods.sodium.client.util.collections.FixedLongHashTable", remap = false)
-public abstract class MixinSodiumFixedLongHashTable implements ISodiumChunkArray {
-    
-    @Shadow
-    public abstract ObjectIterator<Long2ObjectMap.Entry<Object>> iterator();
-    
-    @Shadow
-    public abstract Object put(final long k, final Object v);
-    
-    /**
-    * similar to https://github.com/jellysquid3/sodium-fabric/blob/d3528521d48a130322c910c6f0725cf365ebae6f/src/main/java/me/jellysquid/mods/sodium/client/world/SodiumChunkManager.java#L149
-    * except that since we aren't changing the radius, the key value doesn't change.
-    */
-    @Override
-    public void copyFrom(IChunkArray other) {
-        ObjectIterator<Long2ObjectMap.Entry<Object>> it = ((ISodiumChunkArray) other).callIterator();
-        while (it.hasNext()) {
-            Long2ObjectMap.Entry<Object> entry = it.next();
-            this.put(entry.getLongKey(), entry.getValue());
-        }
-    }
-    
-    @Override
-    public ObjectIterator<Long2ObjectMap.Entry<Object>> callIterator() {
-        return iterator();
-    }
-    
-    //these are useless here...
-    @Override
-    public AtomicReferenceArray<Chunk> getChunks() {
-        return null;
-    }
-    
-    @Override
-    public int centerX() {
-        return 0;
-    }
-    
-    @Override
-    public int centerZ() {
-        return 0;
-    }
-    
-    @Override
-    public int viewDistance() {
-        return 0;
-    }
-    
-}
--- a/src/launch/resources/META-INF/mods.toml
+++ b/src/launch/resources/META-INF/mods.toml
@@ -1,33 +0,0 @@
-# This is an example mods.toml file. It contains the data relating to the loading mods.
-# There are several mandatory fields (#mandatory), and many more that are optional (#optional).
-# The overall format is standard TOML format, v0.5.0.
-# Note that there are a couple of TOML lists in this file.
-# Find more information on toml format here:  https://github.com/toml-lang/toml
-# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
-modLoader="javafml" #mandatory
-# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
-loaderVersion="[33,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
-license="https://raw.githubusercontent.com/cabaletta/baritone/1.16.2/LICENSE"
-# A URL to refer people to when problems occur with this mod
-issueTrackerURL="https://github.com/cabaletta/baritone/issues" #optional
-# A list of mods - how many allowed here is determined by the individual mod loader
-[[mods]] #mandatory
-# The modid of the mod
-modId="baritoe" #mandatory
-# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it
-version="${file.jarVersion}" #mandatory
- # A display name for the mod
-displayName="Baritone" #mandatory
-# A URL for the "homepage" for this mod, displayed in the mod UI
-displayURL="https://github.com/cabaletta/baritone" #optional
-# A file name (in the root of the mod JAR) containing a logo for display
-#logoFile="examplemod.png" #optional
-# A text field displayed in the mod UI
-credits="Hat Gamers" #optional
-# A text field displayed in the mod UI
-authors="leijurv, Brady" #optional
-# The description text for the mod (multi line!) (#mandatory)
-description='''
-A Minecraft pathfinder bot.
-'''
-
--- a/src/launch/resources/baritone/launch/BaritoneForgeModXD.class
+++ b/src/launch/resources/baritone/launch/BaritoneForgeModXD.class
--- a/src/launch/resources/fabric.mod.json
+++ b/src/launch/resources/fabric.mod.json
@@ -1,31 +0,0 @@
-
-{
-  "schemaVersion": 1,
-  "id": "baritone",
-  "version": "${version}",
-
-  "name": "Baritone",
-  "description": "Google Maps for Blockgame",
-  "authors": [
-    "leijurv", "Brady"
-  ],
-  "contact": {
-    "homepage": "https://github.com/cabaletta/baritone",
-    "sources": "https://github.com/cabaletta/baritone"
-  },
-
-  "license": "LGPL-3.0",
-  "icon": "assets/baritone/icon.png",
-
-  "environment": "*",
-  "entrypoints": {
-  },
-  "mixins": [
-    "mixins.baritone.json"
-  ],
-
-  "depends": {
-    "fabricloader": ">=0.7.4",
-    "minecraft": "1.16.x"
-  }
-}
--- a/src/launch/resources/mixins.baritone.json
+++ b/src/launch/resources/mixins.baritone.json
@@ -8,22 +8,22 @@
    "maxShiftBy": 2
  },
  "client": [
+    "MixinBitArray",
+    "MixinBlockStateContainer",
+    "MixinChatScreen",
    "MixinChunkArray",
    "MixinClientChunkProvider",
    "MixinClientPlayerEntity",
    "MixinClientPlayNetHandler",
-    "MixinCommandSuggestionHelper",
    "MixinEntity",
    "MixinEntityRenderManager",
+    "MixinGameRenderer",
    "MixinItemStack",
    "MixinLivingEntity",
    "MixinLootContext",
    "MixinMinecraft",
    "MixinNetworkManager",
    "MixinPlayerController",
-    "MixinScreen",
-    "MixinSodiumChunkProvider",
-    "MixinSodiumFixedLongHashTable",
-    "MixinWorldRenderer"
+    "MixinScreen"
  ]
 }
--- a/src/launch/resources/pack.mcmeta
+++ b/src/launch/resources/pack.mcmeta
@@ -1,6 +0,0 @@
-{
-    "pack": {
-        "description": "baritoe",
-        "pack_format": 5
-    }
-}
--- a/src/main/java/baritone/Baritone.java
+++ b/src/main/java/baritone/Baritone.java
@@ -68,8 +68,8 @@ public class Baritone implements IBaritone {

    private PathingBehavior pathingBehavior;
    private LookBehavior lookBehavior;
+    private MemoryBehavior memoryBehavior;
    private InventoryBehavior inventoryBehavior;
-    private WaypointBehavior waypointBehavior;
    private InputOverrideHandler inputOverrideHandler;

    private FollowProcess followProcess;
@@ -100,9 +100,9 @@ public class Baritone implements IBaritone {
            // the Behavior constructor calls baritone.registerBehavior(this) so this populates the behaviors arraylist
            pathingBehavior = new PathingBehavior(this);
            lookBehavior = new LookBehavior(this);
+            memoryBehavior = new MemoryBehavior(this);
            inventoryBehavior = new InventoryBehavior(this);
            inputOverrideHandler = new InputOverrideHandler(this);
-            waypointBehavior = new WaypointBehavior(this);
        }

        this.pathingControlManager = new PathingControlManager(this);
@@ -151,6 +151,10 @@ public class Baritone implements IBaritone {
        return this.playerContext;
    }

+    public MemoryBehavior getMemoryBehavior() {
+        return this.memoryBehavior;
+    }
+
    @Override
    public FollowProcess getFollowProcess() {
        return this.followProcess;
--- a/src/main/java/baritone/behavior/InventoryBehavior.java
+++ b/src/main/java/baritone/behavior/InventoryBehavior.java
@@ -30,7 +30,7 @@ import net.minecraft.util.Direction;
 import net.minecraft.util.Hand;
 import net.minecraft.util.NonNullList;
 import net.minecraft.util.math.BlockRayTraceResult;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;

 import java.util.ArrayList;
 import java.util.OptionalInt;
@@ -115,9 +115,6 @@ public final class InventoryBehavior extends Behavior {
            if (stack.isEmpty()) {
                continue;
            }
-            if (Baritone.settings().itemSaver.value && (stack.getDamage() + Baritone.settings().itemSaverThreshold.value) >= stack.getMaxDamage() && stack.getMaxDamage() > 1) {
-                continue;
-            }
            if (cla$$.isInstance(stack.getItem())) {
                double speed = ToolSet.calculateSpeedVsBlock(stack, against.getDefaultState()); // takes into account enchants
                if (speed > bestSpeed) {
@@ -140,7 +137,7 @@ public final class InventoryBehavior extends Behavior {

    public boolean selectThrowawayForLocation(boolean select, int x, int y, int z) {
        BlockState maybe = baritone.getBuilderProcess().placeAt(x, y, z, baritone.bsi.get0(x, y, z));
-        if (maybe != null && throwaway(select, stack -> stack.getItem() instanceof BlockItem && maybe.equals(((BlockItem) stack.getItem()).getBlock().getStateForPlacement(new BlockItemUseContext(new ItemUseContext(ctx.world(), ctx.player(), Hand.MAIN_HAND, stack, new BlockRayTraceResult(new Vector3d(ctx.player().getPositionVec().x, ctx.player().getPositionVec().y, ctx.player().getPositionVec().z), Direction.UP, ctx.playerFeet(), false)) {}))))) {
+        if (maybe != null && throwaway(select, stack -> stack.getItem() instanceof BlockItem && maybe.equals(((BlockItem) stack.getItem()).getBlock().getStateForPlacement(new BlockItemUseContext(new ItemUseContext(ctx.world(), ctx.player(), Hand.MAIN_HAND, stack, new BlockRayTraceResult(new Vec3d(ctx.player().posX, ctx.player().posY, ctx.player().posZ), Direction.UP, ctx.playerFeet(), false)) {}))))) {
            return true; // gotem
        }
        if (maybe != null && throwaway(select, stack -> stack.getItem() instanceof BlockItem && ((BlockItem) stack.getItem()).getBlock().equals(maybe.getBlock()))) {
@@ -155,10 +152,6 @@ public final class InventoryBehavior extends Behavior {
    }

    public boolean throwaway(boolean select, Predicate<? super ItemStack> desired) {
-        return throwaway(select, desired, Baritone.settings().allowInventory.value);
-    }
-
-    public boolean throwaway(boolean select, Predicate<? super ItemStack> desired, boolean allowInventory) {
        ClientPlayerEntity p = ctx.player();
        NonNullList<ItemStack> inv = p.inventory.mainInventory;
        for (int i = 0; i < 9; i++) {
@@ -191,19 +184,6 @@ public final class InventoryBehavior extends Behavior {
                }
            }
        }
-
-        if (allowInventory) {
-            for (int i = 9; i < 36; i++) {
-                if (desired.test(inv.get(i))) {
-                    swapWithHotBar(i, 7);
-                    if (select) {
-                        p.inventory.currentItem = 7;
-                    }
-                    return true;
-                }
-            }
-        }
-
        return false;
    }
 }
--- a/src/main/java/baritone/behavior/MemoryBehavior.java
+++ b/src/main/java/baritone/behavior/MemoryBehavior.java
@@ -0,0 +1,102 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.behavior;
+
+import baritone.Baritone;
+import baritone.api.cache.Waypoint;
+import baritone.api.event.events.BlockInteractEvent;
+import baritone.api.utils.BetterBlockPos;
+import baritone.cache.ContainerMemory;
+import baritone.utils.BlockStateInterface;
+import net.minecraft.block.BedBlock;
+import net.minecraft.item.ItemStack;
+
+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;
+
+
+/**
+ * doesn't work for horse inventories :^)
+ *
+ * @author Brady
+ * @since 8/6/2018
+ */
+public final class MemoryBehavior extends Behavior {
+
+    public MemoryBehavior(Baritone baritone) {
+        super(baritone);
+    }
+
+    @Override
+    public void onBlockInteract(BlockInteractEvent event) {
+        if (event.getType() == BlockInteractEvent.Type.USE && BlockStateInterface.getBlock(ctx, event.getPos()) instanceof BedBlock) {
+            baritone.getWorldProvider().getCurrentWorld().getWaypoints().addWaypoint(new Waypoint("bed", Waypoint.Tag.BED, BetterBlockPos.from(event.getPos())));
+        }
+    }
+
+    @Override
+    public void onPlayerDeath() {
+        baritone.getWorldProvider().getCurrentWorld().getWaypoints().addWaypoint(new Waypoint("death", Waypoint.Tag.DEATH, ctx.playerFeet()));
+    }
+
+    public EnderChestMemory getCurrent() {
+        Path path = baritone.getWorldProvider().getCurrentWorld().directory;
+        return EnderChestMemory.getByServerAndPlayer(path.getParent(), ctx.player().getUniqueID());
+    }
+
+    public static class EnderChestMemory {
+
+        private static final Map<Path, EnderChestMemory> memory = new HashMap<>();
+        private final Path enderChest;
+        private List<ItemStack> contents;
+
+        private EnderChestMemory(Path enderChest) {
+            this.enderChest = enderChest;
+            System.out.println("Echest storing in " + enderChest);
+            try {
+                this.contents = ContainerMemory.readItemStacks(Files.readAllBytes(enderChest));
+            } catch (IOException e) {
+                e.printStackTrace();
+                System.out.println("CANNOT read echest =( =(");
+                this.contents = null;
+            }
+        }
+
+        public synchronized void save() {
+            System.out.println("Saving");
+            if (contents != null) {
+                try {
+                    enderChest.getParent().toFile().mkdir();
+                    Files.write(enderChest, ContainerMemory.writeItemStacks(contents));
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    System.out.println("CANNOT save echest =( =(");
+                }
+            }
+        }
+
+        private static synchronized EnderChestMemory getByServerAndPlayer(Path serverStorage, UUID player) {
+            return memory.computeIfAbsent(serverStorage.resolve("echests").resolve(player.toString()), EnderChestMemory::new);
+        }
+    }
+}
--- a/src/main/java/baritone/behavior/PathingBehavior.java
+++ b/src/main/java/baritone/behavior/PathingBehavior.java
@@ -52,10 +52,6 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
    private Goal goal;
    private CalculationContext context;

-    /*eta*/
-    private int ticksElapsedSoFar;
-    private BetterBlockPos startPosition;
-
    private boolean safeToCancel;
    private boolean pauseRequestedLastTick;
    private boolean unpausedLastTick;
@@ -99,11 +95,9 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
            baritone.getPathingControlManager().cancelEverything();
            return;
        }
-
        expectedSegmentStart = pathStart();
        baritone.getPathingControlManager().preTick();
        tickPath();
-        ticksElapsedSoFar++;
        dispatchEvents();
    }

@@ -378,40 +372,6 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
        return context;
    }

-    public Optional<Double> estimatedTicksToGoal() {
-        BetterBlockPos currentPos = ctx.playerFeet();
-        if (goal == null || currentPos == null || startPosition == null) {
-            return Optional.empty();
-        }
-        if (goal.isInGoal(ctx.playerFeet())) {
-            resetEstimatedTicksToGoal();
-            return Optional.of(0.0);
-        }
-        if (ticksElapsedSoFar == 0) {
-            return Optional.empty();
-        }
-        double current = goal.heuristic(currentPos.x, currentPos.y, currentPos.z);
-        double start = goal.heuristic(startPosition.x, startPosition.y, startPosition.z);
-        if (current == start) {// can't check above because current and start can be equal even if currentPos and startPosition are not
-            return Optional.empty();
-        }
-        double eta = Math.abs(current - goal.heuristic()) * ticksElapsedSoFar / Math.abs(start - current);
-        return Optional.of(eta);
-    }
-
-    private void resetEstimatedTicksToGoal() {
-        resetEstimatedTicksToGoal(expectedSegmentStart);
-    }
-
-    private void resetEstimatedTicksToGoal(BlockPos start) {
-        resetEstimatedTicksToGoal(new BetterBlockPos(start));
-    }
-
-    private void resetEstimatedTicksToGoal(BetterBlockPos start) {
-        ticksElapsedSoFar = 0;
-        startPosition = start;
-    }
-
    /**
     * See issue #209
     *
@@ -420,9 +380,9 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
    public BetterBlockPos pathStart() { // TODO move to a helper or util class
        BetterBlockPos feet = ctx.playerFeet();
        if (!MovementHelper.canWalkOn(ctx, feet.down())) {
-            if (ctx.player().isOnGround()) {
-                double playerX = ctx.player().getPositionVec().x;
-                double playerZ = ctx.player().getPositionVec().z;
+            if (ctx.player().onGround) {
+                double playerX = ctx.player().posX;
+                double playerZ = ctx.player().posZ;
                ArrayList<BetterBlockPos> closest = new ArrayList<>();
                for (int dx = -1; dx <= 1; dx++) {
                    for (int dz = -1; dz <= 1; dz++) {
@@ -508,7 +468,6 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
                        if (executor.get().getPath().positions().contains(expectedSegmentStart)) {
                            queuePathEvent(PathEvent.CALC_FINISHED_NOW_EXECUTING);
                            current = executor.get();
-                            resetEstimatedTicksToGoal(start);
                        } else {
                            logDebug("Warning: discarding orphan path segment with incorrect start");
                        }
--- a/src/main/java/baritone/behavior/WaypointBehavior.java
+++ b/src/main/java/baritone/behavior/WaypointBehavior.java
@@ -1,93 +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.behavior;
-
-import baritone.Baritone;
-import baritone.api.cache.IWaypoint;
-import baritone.api.cache.Waypoint;
-import baritone.api.event.events.BlockInteractEvent;
-import baritone.api.utils.BetterBlockPos;
-import baritone.api.utils.Helper;
-import baritone.utils.BlockStateInterface;
-import net.minecraft.block.BedBlock;
-import net.minecraft.block.BlockState;
-import net.minecraft.state.properties.BedPart;
-import net.minecraft.util.text.IFormattableTextComponent;
-import net.minecraft.util.text.StringTextComponent;
-import net.minecraft.util.text.TextFormatting;
-import net.minecraft.util.text.event.ClickEvent;
-import net.minecraft.util.text.event.HoverEvent;
-
-import java.util.Set;
-
-import static baritone.api.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX;
-
-public class WaypointBehavior extends Behavior {
-
-
-    public WaypointBehavior(Baritone baritone) {
-        super(baritone);
-    }
-
-    @Override
-    public void onBlockInteract(BlockInteractEvent event) {
-        if (!Baritone.settings().doBedWaypoints.value)
-            return;
-        if (event.getType() == BlockInteractEvent.Type.USE) {
-            BetterBlockPos pos = BetterBlockPos.from(event.getPos());
-            BlockState state = BlockStateInterface.get(ctx, pos);
-            if (state.getBlock() instanceof BedBlock) {
-                if (state.get(BedBlock.PART) == BedPart.FOOT) {
-                    pos = pos.offset(state.get(BedBlock.HORIZONTAL_FACING));
-                }
-                Set<IWaypoint> waypoints = baritone.getWorldProvider().getCurrentWorld().getWaypoints().getByTag(IWaypoint.Tag.BED);
-                boolean exists = waypoints.stream().map(IWaypoint::getLocation).filter(pos::equals).findFirst().isPresent();
-                if (!exists) {
-                    baritone.getWorldProvider().getCurrentWorld().getWaypoints().addWaypoint(new Waypoint("bed", Waypoint.Tag.BED, pos));
-                }
-            }
-        }
-    }
-
-    @Override
-    public void onPlayerDeath() {
-        if (!Baritone.settings().doDeathWaypoints.value)
-            return;
-        Waypoint deathWaypoint = new Waypoint("death", Waypoint.Tag.DEATH, ctx.playerFeet());
-        baritone.getWorldProvider().getCurrentWorld().getWaypoints().addWaypoint(deathWaypoint);
-        IFormattableTextComponent component = new StringTextComponent("Death position saved.");
-        component.setStyle(component.getStyle()
-                .setFormatting(TextFormatting.WHITE)
-                .setHoverEvent(new HoverEvent(
-                        HoverEvent.Action.SHOW_TEXT,
-                        new StringTextComponent("Click to goto death")
-                ))
-                .setClickEvent(new ClickEvent(
-                        ClickEvent.Action.RUN_COMMAND,
-                        String.format(
-                                "%s%s goto %s @ %d",
-                                FORCE_COMMAND_PREFIX,
-                                "wp",
-                                deathWaypoint.getTag().getName(),
-                                deathWaypoint.getCreationTimestamp()
-                        )
-                )));
-        Helper.HELPER.logDirect(component);
-    }
-
-}
--- a/src/main/java/baritone/cache/CachedChunk.java
+++ b/src/main/java/baritone/cache/CachedChunk.java
@@ -24,9 +24,7 @@ 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.util.RegistryKey;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;

 import java.util.ArrayList;
 import java.util.BitSet;
@@ -180,7 +178,7 @@ public final class CachedChunk {
        }
    }

-    public final BlockState getBlock(int x, int y, int z, RegistryKey<World> dimension) {
+    public final BlockState getBlock(int x, int y, int z, int dimension) {
        int index = getPositionIndex(x, y, z);
        PathingBlockType type = getType(index);
        int internalPos = z << 4 | x;
@@ -202,11 +200,11 @@ public final class CachedChunk {
        }

        if (type == PathingBlockType.SOLID) {
-            if (y == 127 && dimension == World.THE_NETHER) {
+            if (y == 127 && dimension == -1) {
                // nether roof is always unbreakable
                return Blocks.BEDROCK.getDefaultState();
            }
-            if (y < 5 && dimension == World.OVERWORLD) {
+            if (y < 5 && dimension == 0) {
                // solid blocks below 5 are commonly bedrock
                // however, returning bedrock always would be a little yikes
                // discourage paths that include breaking blocks below 5 a little more heavily just so that it takes paths breaking what's known to be stone (at 5 or above) instead of what could maybe be bedrock (below 5)
--- a/src/main/java/baritone/cache/CachedRegion.java
+++ b/src/main/java/baritone/cache/CachedRegion.java
@@ -21,9 +21,7 @@ import baritone.Baritone;
 import baritone.api.cache.ICachedRegion;
 import baritone.api.utils.BlockUtils;
 import net.minecraft.block.BlockState;
-import net.minecraft.util.RegistryKey;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;

 import java.io.*;
 import java.nio.file.Files;
@@ -62,14 +60,14 @@ public final class CachedRegion implements ICachedRegion {
     */
    private final int z;

-    private final RegistryKey<World> dimension;
+    private final int dimension;

    /**
     * Has this region been modified since its most recent load or save
     */
    private boolean hasUnsavedChanges;

-    CachedRegion(int x, int z, RegistryKey<World> dimension) {
+    CachedRegion(int x, int z, int dimension) {
        this.x = x;
        this.z = z;
        this.hasUnsavedChanges = false;
--- a/src/main/java/baritone/cache/CachedWorld.java
+++ b/src/main/java/baritone/cache/CachedWorld.java
@@ -25,10 +25,8 @@ import baritone.api.cache.IWorldData;
 import baritone.api.utils.Helper;
 import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
 import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
-import net.minecraft.util.RegistryKey;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
-import net.minecraft.world.World;
 import net.minecraft.world.chunk.Chunk;

 import java.io.IOException;
@@ -73,9 +71,9 @@ public final class CachedWorld implements ICachedWorld, Helper {
     */
    private final Map<ChunkPos, Chunk> toPackMap = new ConcurrentHashMap<>();

-    private final RegistryKey<World> dimension;
+    private final int dimension;

-    CachedWorld(Path directory, RegistryKey<World> dimension) {
+    CachedWorld(Path directory, int dimension) {
        if (!Files.exists(directory)) {
            try {
                Files.createDirectories(directory);
@@ -211,7 +209,7 @@ public final class CachedWorld implements ICachedWorld, Helper {
    private BlockPos guessPosition() {
        for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
            IWorldData data = ibaritone.getWorldProvider().getCurrentWorld();
-            if (data != null && data.getCachedWorld() == this && ibaritone.getPlayerContext().player() != null) {
+            if (data != null && data.getCachedWorld() == this) {
                return ibaritone.getPlayerContext().playerFeet();
            }
        }
--- a/src/main/java/baritone/cache/ChunkPacker.java
+++ b/src/main/java/baritone/cache/ChunkPacker.java
@@ -21,11 +21,9 @@ import baritone.api.utils.BlockUtils;
 import baritone.pathing.movement.MovementHelper;
 import baritone.utils.pathing.PathingBlockType;
 import net.minecraft.block.*;
-import net.minecraft.util.RegistryKey;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Vector3d;
-import net.minecraft.util.palette.PalettedContainer;
-import net.minecraft.world.World;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.chunk.BlockStateContainer;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.ChunkSection;

@@ -61,7 +59,7 @@ public final class ChunkPacker {
                    // since a bitset is initialized to all zero, and air is saved as zeros
                    continue;
                }
-                PalettedContainer<BlockState> bsc = extendedblockstorage.getData();
+                BlockStateContainer<BlockState> bsc = extendedblockstorage.getData();
                int yReal = y0 << 4;
                // the mapping of BlockStateContainer.getIndex from xyz to index is y << 8 | z << 4 | x;
                // for better cache locality, iterate in that order
@@ -125,7 +123,7 @@ public final class ChunkPacker {
                return PathingBlockType.AVOID;
            }
            if (x == 0 || x == 15 || z == 0 || z == 15) {
-                Vector3d flow = state.getFluidState().getFlow(chunk.getWorld(), new BlockPos(x + (chunk.getPos().x << 4), y, z + (chunk.getPos().z << 4)));
+                Vec3d flow = state.getFluidState().getFlow(chunk.getWorld(), new BlockPos(x + chunk.getPos().x << 4, y, z + chunk.getPos().z << 4));
                if (flow.x != 0.0 || flow.z != 0.0) {
                    return PathingBlockType.WATER;
                }
@@ -148,7 +146,7 @@ public final class ChunkPacker {
        return PathingBlockType.SOLID;
    }

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

 import baritone.Baritone;
 import baritone.api.cache.ICachedWorld;
+import baritone.api.cache.IContainerMemory;
 import baritone.api.cache.IWaypointCollection;
 import baritone.api.cache.IWorldData;
-import net.minecraft.util.RegistryKey;
-import net.minecraft.world.World;

+import java.io.IOException;
 import java.nio.file.Path;

 /**
@@ -35,14 +35,16 @@ public class WorldData implements IWorldData {

    public final CachedWorld cache;
    private final WaypointCollection waypoints;
+    private final ContainerMemory containerMemory;
    //public final MapData map;
    public final Path directory;
-    public final RegistryKey<World> dimension;
+    public final int dimension;

-    WorldData(Path directory, RegistryKey<World> dimension) {
+    WorldData(Path directory, int dimension) {
        this.directory = directory;
        this.cache = new CachedWorld(directory.resolve("cache"), dimension);
        this.waypoints = new WaypointCollection(directory.resolve("waypoints"));
+        this.containerMemory = new ContainerMemory(directory.resolve("containers"));
        this.dimension = dimension;
    }

@@ -51,6 +53,15 @@ public class WorldData implements IWorldData {
            System.out.println("Started saving the world in a new thread");
            cache.save();
        });
+        Baritone.getExecutor().execute(() -> {
+            System.out.println("Started saving saved containers in a new thread");
+            try {
+                containerMemory.save();
+            } catch (IOException e) {
+                e.printStackTrace();
+                System.out.println("Failed to save saved containers");
+            }
+        });
    }

    @Override
@@ -62,4 +73,9 @@ public class WorldData implements IWorldData {
    public IWaypointCollection getWaypoints() {
        return this.waypoints;
    }
+
+    @Override
+    public IContainerMemory getContainerMemory() {
+        return this.containerMemory;
+    }
 }
--- a/src/main/java/baritone/cache/WorldProvider.java
+++ b/src/main/java/baritone/cache/WorldProvider.java
@@ -21,10 +21,8 @@ import baritone.Baritone;
 import baritone.api.cache.IWorldProvider;
 import baritone.api.utils.Helper;
 import net.minecraft.server.integrated.IntegratedServer;
-import net.minecraft.util.RegistryKey;
-import net.minecraft.world.DimensionType;
-import net.minecraft.world.World;
-import net.minecraft.world.storage.FolderName;
+import net.minecraft.world.dimension.DimensionType;
+import net.minecraft.world.server.ServerWorld;
 import org.apache.commons.lang3.SystemUtils;

 import java.io.File;
@@ -45,20 +43,18 @@ public class WorldProvider implements IWorldProvider, Helper {
    private static final Map<Path, WorldData> worldCache = new HashMap<>(); // this is how the bots have the same cached world

    private WorldData currentWorld;
-    private World mcWorld; // this let's us detect a broken load/unload hook

    @Override
    public final WorldData getCurrentWorld() {
-        detectAndHandleBrokenLoading();
        return this.currentWorld;
    }

    /**
     * Called when a new world is initialized to discover the
     *
-     * @param world The world's Registry Data
+     * @param dimension The ID of the world's dimension
     */
-    public final void initWorld(RegistryKey<World> world) {
+    public final void initWorld(DimensionType dimension) {
        File directory;
        File readme;

@@ -66,7 +62,8 @@ public class WorldProvider implements IWorldProvider, Helper {

        // If there is an integrated server running (Aka Singleplayer) then do magic to find the world save file
        if (mc.isSingleplayer()) {
-            directory = DimensionType.getDimensionFolder(world, integratedServer.func_240776_a_(FolderName.DOT).toFile());
+            ServerWorld localServerWorld = integratedServer.getWorld(dimension);
+            directory = dimension.getDirectory(localServerWorld.getSaveHandler().getWorldDirectory());

            // Gets the "depth" of this directory relative the the game's run directory, 2 is the location of the world
            if (directory.toPath().relativize(mc.gameDir.toPath()).getNameCount() != 2) {
@@ -77,16 +74,7 @@ public class WorldProvider implements IWorldProvider, Helper {
            directory = new File(directory, "baritone");
            readme = directory;
        } else { // Otherwise, the server must be remote...
-            String folderName;
-            if (mc.getCurrentServerData() != null) {
-                folderName = mc.isConnectedToRealms() ? "realms" : mc.getCurrentServerData().serverIP;
-            } else {
-                //replaymod causes null currentServerData and false singleplayer.
-                System.out.println("World seems to be a replay. Not loading Baritone cache.");
-                currentWorld = null;
-                mcWorld = mc.world;
-                return;
-            }
+            String folderName = mc.isConnectedToRealms() ? "realms" : mc.getCurrentServerData().serverIP;
            if (SystemUtils.IS_OS_WINDOWS) {
                folderName = folderName.replace(":", "_");
            }
@@ -101,7 +89,7 @@ public class WorldProvider implements IWorldProvider, Helper {
        } catch (IOException ignored) {}

        // We will actually store the world data in a subfolder: "DIM<id>"
-        Path dir = DimensionType.getDimensionFolder(world, directory).toPath();
+        Path dir = new File(directory, "DIM" + dimension.getId()).toPath();
        if (!Files.exists(dir)) {
            try {
                Files.createDirectories(dir);
@@ -110,15 +98,13 @@ public class WorldProvider implements IWorldProvider, Helper {

        System.out.println("Baritone world data dir: " + dir);
        synchronized (worldCache) {
-            this.currentWorld = worldCache.computeIfAbsent(dir, d -> new WorldData(d, world));
+            this.currentWorld = worldCache.computeIfAbsent(dir, d -> new WorldData(d, dimension.getId()));
        }
-        this.mcWorld = mc.world;
    }

    public final void closeWorld() {
        WorldData world = this.currentWorld;
        this.currentWorld = null;
-        this.mcWorld = null;
        if (world == null) {
            return;
        }
@@ -126,25 +112,8 @@ public class WorldProvider implements IWorldProvider, Helper {
    }

    public final void ifWorldLoaded(Consumer<WorldData> currentWorldConsumer) {
-        detectAndHandleBrokenLoading();
        if (this.currentWorld != null) {
            currentWorldConsumer.accept(this.currentWorld);
        }
    }
-
-    private final void detectAndHandleBrokenLoading() {
-        if (this.mcWorld != mc.world) {
-            if (this.currentWorld != null) {
-                System.out.println("mc.world unloaded unnoticed! Unloading Baritone cache now.");
-                closeWorld();
-            }
-            if (mc.world != null) {
-                System.out.println("mc.world loaded unnoticed! Loading Baritone cache now.");
-                initWorld(mc.world.getDimensionKey());
-            }
-        } else if (currentWorld == null && mc.world != null && (mc.isSingleplayer() || mc.getCurrentServerData() != null)) {
-            System.out.println("Retrying to load Baritone cache");
-            initWorld(mc.world.getDimensionKey());
-        }
-    }
 }
--- a/src/main/java/baritone/cache/WorldScanner.java
+++ b/src/main/java/baritone/cache/WorldScanner.java
@@ -22,11 +22,11 @@ import baritone.api.cache.IWorldScanner;
 import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.BlockOptionalMetaLookup;
 import baritone.api.utils.IPlayerContext;
+import baritone.utils.accessor.IBlockStateContainer;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.multiplayer.ClientChunkProvider;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
-import net.minecraft.util.palette.PalettedContainer;
 import net.minecraft.world.chunk.AbstractChunkProvider;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.ChunkSection;
@@ -155,27 +155,27 @@ public enum WorldScanner implements IWorldScanner {
                continue;
            }
            int yReal = y0 << 4;
-            PalettedContainer<BlockState> bsc = section.getData();
-            for (int yy = 0; yy < 16; yy++) {
-                for (int z = 0; z < 16; z++) {
-                    for (int x = 0; x < 16; x++) {
-                        BlockState state = bsc.get(x, yy, z);
-                        if (filter.has(state)) {
-                            int y = yReal | yy;
-                            if (result.size() >= max) {
-                                if (Math.abs(y - playerY) < yLevelThreshold) {
-                                    foundWithinY = true;
-                                } else {
-                                    if (foundWithinY) {
-                                        // have found within Y in this chunk, so don't need to consider outside Y
-                                        // TODO continue iteration to one more sorted Y coordinate block
-                                        return true;
-                                    }
-                                }
+            IBlockStateContainer bsc = (IBlockStateContainer) section.getData();
+            // storageArray uses an optimized algorithm that's faster than getAt
+            // creating this array and then using getAtPalette is faster than even getFast(int index)
+            int[] storage = bsc.storageArray();
+            final int imax = 1 << 12;
+            for (int i = 0; i < imax; i++) {
+                BlockState state = bsc.getAtPalette(storage[i]);
+                if (filter.has(state)) {
+                    int y = yReal | ((i >> 8) & 15);
+                    if (result.size() >= max) {
+                        if (Math.abs(y - playerY) < yLevelThreshold) {
+                            foundWithinY = true;
+                        } else {
+                            if (foundWithinY) {
+                                // have found within Y in this chunk, so don't need to consider outside Y
+                                // TODO continue iteration to one more sorted Y coordinate block
+                                return true;
                            }
-                            result.add(new BlockPos(chunkX | x, y, chunkZ | z));
                        }
                    }
+                    result.add(new BlockPos(chunkX | (i & 15), y, chunkZ | ((i >> 4) & 15)));
                }
            }
        }
--- a/src/main/java/baritone/command/ExampleBaritoneControl.java
+++ b/src/main/java/baritone/command/ExampleBaritoneControl.java
@@ -35,8 +35,8 @@ import baritone.command.argument.CommandArguments;
 import baritone.command.manager.CommandManager;
 import baritone.utils.accessor.IGuiScreen;
 import net.minecraft.util.Tuple;
+import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.StringTextComponent;
-import net.minecraft.util.text.TextComponent;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.util.text.event.ClickEvent;
 import net.minecraft.util.text.event.HoverEvent;
@@ -79,9 +79,9 @@ public class ExampleBaritoneControl implements Helper, AbstractGameEventListener
        if (settings.echoCommands.value) {
            String msg = command + rest;
            String toDisplay = settings.censorRanCommands.value ? command + " ..." : msg;
-            TextComponent component = new StringTextComponent(String.format("> %s", toDisplay));
-            component.setStyle(component.getStyle()
-                    .setFormatting(TextFormatting.WHITE)
+            ITextComponent component = new StringTextComponent(String.format("> %s", toDisplay));
+            component.getStyle()
+                    .setColor(TextFormatting.WHITE)
                    .setHoverEvent(new HoverEvent(
                            HoverEvent.Action.SHOW_TEXT,
                            new StringTextComponent("Click to rerun command")
@@ -89,7 +89,7 @@ public class ExampleBaritoneControl implements Helper, AbstractGameEventListener
                    .setClickEvent(new ClickEvent(
                            ClickEvent.Action.RUN_COMMAND,
                            FORCE_COMMAND_PREFIX + msg
-                    )));
+                    ));
            logDirect(component);
        }
    }
@@ -124,7 +124,7 @@ public class ExampleBaritoneControl implements Helper, AbstractGameEventListener
            }
        } else if (argc.hasExactlyOne()) {
            for (Settings.Setting setting : settings.allSettings) {
-                if (SettingsUtil.javaOnlySetting(setting)) {
+                if (setting.getName().equals("logger")) {
                    continue;
                }
                if (setting.getName().equalsIgnoreCase(pair.getA())) {
@@ -177,7 +177,7 @@ public class ExampleBaritoneControl implements Helper, AbstractGameEventListener
                            .stream();
                }
                Settings.Setting setting = settings.byLowerName.get(argc.getString().toLowerCase(Locale.US));
-                if (setting != null && !SettingsUtil.javaOnlySetting(setting)) {
+                if (setting != null) {
                    if (setting.getValueClass() == Boolean.class) {
                        TabCompleteHelper helper = new TabCompleteHelper();
                        if ((Boolean) setting.value) {
--- a/src/main/java/baritone/command/argument/ArgConsumer.java
+++ b/src/main/java/baritone/command/argument/ArgConsumer.java
@@ -17,7 +17,6 @@

 package baritone.command.argument;

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

 import baritone.api.IBaritone;
+import baritone.api.cache.IRememberedInventory;
 import baritone.api.command.Command;
 import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.exception.CommandException;
+import baritone.api.command.exception.CommandInvalidStateException;
+import baritone.api.utils.BetterBlockPos;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.text.ITextComponent;

 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.stream.Stream;

-public class LitematicaCommand extends Command {
+public class ChestsCommand extends Command {

-    public LitematicaCommand(IBaritone baritone) {
-        super(baritone, "litematica");
+    public ChestsCommand(IBaritone baritone) {
+        super(baritone, "chests");
    }

    @Override
    public void execute(String label, IArgConsumer args) throws CommandException {
-        int schematic = 0;
-        if (args.hasAny()) {
-            args.requireMax(1);
-            if (args.is(Integer.class)) {
-                schematic = args.getAs(Integer.class) - 1;
-            }
+        args.requireMax(0);
+        Set<Map.Entry<BlockPos, IRememberedInventory>> entries =
+                ctx.worldData().getContainerMemory().getRememberedInventories().entrySet();
+        if (entries.isEmpty()) {
+            throw new CommandInvalidStateException("No remembered inventories");
        }
-        try {
-            baritone.getBuilderProcess().buildOpenLitematic(schematic);
-        } catch (IndexOutOfBoundsException e) {
-            logDirect("Pleas provide a valid index.");
+        for (Map.Entry<BlockPos, IRememberedInventory> entry : entries) {
+            // betterblockpos has censoring
+            BetterBlockPos pos = new BetterBlockPos(entry.getKey());
+            IRememberedInventory inv = entry.getValue();
+            logDirect(pos.toString());
+            for (ItemStack item : inv.getContents()) {
+                ITextComponent component = item.getTextComponent();
+                component.appendText(String.format(" x %d", item.getCount()));
+                logDirect(component);
+            }
        }
    }

@@ -55,17 +68,16 @@ public class LitematicaCommand extends Command {

    @Override
    public String getShortDesc() {
-        return "Builds the loaded schematic";
+        return "Display remembered inventories";
    }

    @Override
    public List<String> getLongDesc() {
        return Arrays.asList(
-                "Build a schematic currently open in Litematica.",
+                "The chests command lists remembered inventories, I guess?",
                "",
                "Usage:",
-                "> litematica",
-                "> litematica <#>"
+                "> chests"
        );
    }
-}
+}
--- a/src/main/java/baritone/command/defaults/ComeCommand.java
+++ b/src/main/java/baritone/command/defaults/ComeCommand.java
@@ -24,6 +24,7 @@ import baritone.api.command.exception.CommandException;
 import baritone.api.command.exception.CommandInvalidStateException;
 import baritone.api.pathing.goals.GoalBlock;
 import net.minecraft.entity.Entity;
+import net.minecraft.util.math.BlockPos;

 import java.util.Arrays;
 import java.util.List;
@@ -42,7 +43,7 @@ public class ComeCommand extends Command {
        if (entity == null) {
            throw new CommandInvalidStateException("render view entity is null");
        }
-        baritone.getCustomGoalProcess().setGoalAndPath(new GoalBlock(entity.getPosition()));
+        baritone.getCustomGoalProcess().setGoalAndPath(new GoalBlock(new BlockPos(entity)));
        logDirect("Coming");
    }

--- a/src/main/java/baritone/command/defaults/DefaultCommands.java
+++ b/src/main/java/baritone/command/defaults/DefaultCommands.java
@@ -38,12 +38,10 @@ public final class DefaultCommands {
                new GotoCommand(baritone),
                new PathCommand(baritone),
                new ProcCommand(baritone),
-                new ETACommand(baritone),
                new VersionCommand(baritone),
                new RepackCommand(baritone),
                new BuildCommand(baritone),
-                //new SchematicaCommand(baritone),
-                new LitematicaCommand(baritone),
+                new SchematicaCommand(baritone),
                new ComeCommand(baritone),
                new AxisCommand(baritone),
                new ForceCancelCommand(baritone),
@@ -52,6 +50,7 @@ public final class DefaultCommands {
                new TunnelCommand(baritone),
                new RenderCommand(baritone),
                new FarmCommand(baritone),
+                new ChestsCommand(baritone),
                new FollowCommand(baritone),
                new ExploreFilterCommand(baritone),
                new ReloadAllCommand(baritone),
--- a/src/main/java/baritone/command/defaults/ETACommand.java
+++ b/src/main/java/baritone/command/defaults/ETACommand.java
@@ -1,84 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.command.defaults;
-
-import baritone.api.IBaritone;
-import baritone.api.behavior.IPathingBehavior;
-import baritone.api.command.Command;
-import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.exception.CommandException;
-import baritone.api.command.exception.CommandInvalidStateException;
-import baritone.api.pathing.calc.IPathingControlManager;
-import baritone.api.process.IBaritoneProcess;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Stream;
-
-public class ETACommand extends Command {
-
-    public ETACommand(IBaritone baritone) {
-        super(baritone, "eta");
-    }
-
-    @Override
-    public void execute(String label, IArgConsumer args) throws CommandException {
-        args.requireMax(0);
-        IPathingControlManager pathingControlManager = baritone.getPathingControlManager();
-        IBaritoneProcess process = pathingControlManager.mostRecentInControl().orElse(null);
-        if (process == null) {
-            throw new CommandInvalidStateException("No process in control");
-        }
-        IPathingBehavior pathingBehavior = baritone.getPathingBehavior();
-
-        double ticksRemainingInSegment = pathingBehavior.ticksRemainingInSegment().orElse(Double.NaN);
-        double ticksRemainingInGoal = pathingBehavior.estimatedTicksToGoal().orElse(Double.NaN);
-
-        logDirect(String.format(
-                "Next segment: %.1fs (%.0f ticks)\n" +
-                        "Goal: %.1fs (%.0f ticks)",
-                ticksRemainingInSegment / 20, // we just assume tps is 20, it isn't worth the effort that is needed to calculate it exactly
-                ticksRemainingInSegment,
-                ticksRemainingInGoal / 20,
-                ticksRemainingInGoal
-        ));
-    }
-
-    @Override
-    public Stream<String> tabComplete(String label, IArgConsumer args) {
-        return Stream.empty();
-    }
-
-    @Override
-    public String getShortDesc() {
-        return "View the current ETA";
-    }
-
-    @Override
-    public List<String> getLongDesc() {
-        return Arrays.asList(
-                "The ETA command provides information about the estimated time until the next segment.",
-                "and the goal",
-                "",
-                "Be aware that the ETA to your goal is really unprecise",
-                "",
-                "Usage:",
-                "> eta - View ETA, if present"
-        );
-    }
-}
--- a/src/main/java/baritone/command/defaults/ExecutionControlCommands.java
+++ b/src/main/java/baritone/command/defaults/ExecutionControlCommands.java
@@ -56,7 +56,6 @@ public class ExecutionControlCommands {

                    @Override
                    public PathingCommand onTick(boolean calcFailed, boolean isSafeToCancel) {
-                        baritone.getInputOverrideHandler().clearAllKeys();
                        return new PathingCommand(null, PathingCommandType.REQUEST_PAUSE);
                    }

@@ -80,7 +79,7 @@ public class ExecutionControlCommands {
                    }
                }
        );
-        pauseCommand = new Command(baritone, "pause", "p", "paws") {
+        pauseCommand = new Command(baritone, "pause", "p") {
            @Override
            public void execute(String label, IArgConsumer args) throws CommandException {
                args.requireMax(0);
@@ -113,7 +112,7 @@ public class ExecutionControlCommands {
                );
            }
        };
-        resumeCommand = new Command(baritone, "resume", "r", "unpause", "unpaws") {
+        resumeCommand = new Command(baritone, "resume", "r") {
            @Override
            public void execute(String label, IArgConsumer args) throws CommandException {
                args.requireMax(0);
--- a/src/main/java/baritone/command/defaults/FindCommand.java
+++ b/src/main/java/baritone/command/defaults/FindCommand.java
@@ -22,22 +22,15 @@ import baritone.api.command.Command;
 import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.datatypes.BlockById;
 import baritone.api.command.exception.CommandException;
-import baritone.api.command.helpers.TabCompleteHelper;
 import baritone.api.utils.BetterBlockPos;
-import baritone.cache.CachedChunk;
 import net.minecraft.block.Block;
 import net.minecraft.util.registry.Registry;
-import net.minecraft.util.text.*;
-import net.minecraft.util.text.event.ClickEvent;
-import net.minecraft.util.text.event.HoverEvent;

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

-import static baritone.api.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX;
-
 public class FindCommand extends Command {

    public FindCommand(IBaritone baritone) {
@@ -46,13 +39,12 @@ public class FindCommand extends Command {

    @Override
    public void execute(String label, IArgConsumer args) throws CommandException {
-        args.requireMin(1);
        List<Block> toFind = new ArrayList<>();
        while (args.hasAny()) {
            toFind.add(args.getDatatypeFor(BlockById.INSTANCE));
        }
        BetterBlockPos origin = ctx.playerFeet();
-        ITextComponent[] components = toFind.stream()
+        toFind.stream()
                .flatMap(block ->
                        ctx.worldData().getCachedWorld().getLocationsOf(
                                Registry.BLOCK.getKey(block).getPath(),
@@ -63,39 +55,13 @@ public class FindCommand extends Command {
                        ).stream()
                )
                .map(BetterBlockPos::new)
-                .map(this::positionToComponent)
-                .toArray(ITextComponent[]::new);
-        if (components.length > 0) {
-            Arrays.asList(components).forEach(this::logDirect);
-        } else {
-            logDirect("No positions known, are you sure the blocks are cached?");
-        }
-    }
-
-    private ITextComponent positionToComponent(BetterBlockPos pos) {
-        String positionText = String.format("%s %s %s", pos.x, pos.y, pos.z);
-        String command = String.format("%sgoal %s", FORCE_COMMAND_PREFIX, positionText);
-        IFormattableTextComponent baseComponent = new StringTextComponent(pos.toString());
-        IFormattableTextComponent hoverComponent = new StringTextComponent("Click to set goal to this position");
-        baseComponent.setStyle(baseComponent.getStyle()
-                .setFormatting(TextFormatting.GRAY)
-                .setInsertion(positionText)
-                .setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, command))
-                .setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, hoverComponent)));
-        return baseComponent;
+                .map(BetterBlockPos::toString)
+                .forEach(this::logDirect);
    }

    @Override
-    public Stream<String> tabComplete(String label, IArgConsumer args) throws CommandException {
-        return new TabCompleteHelper()
-                .append(
-                        CachedChunk.BLOCKS_TO_KEEP_TRACK_OF.stream()
-                                .map(Registry.BLOCK::getKey)
-                                .map(Object::toString)
-                )
-                .filterPrefixNamespaced(args.getString())
-                .sortAlphabetically()
-                .stream();
+    public Stream<String> tabComplete(String label, IArgConsumer args) {
+        return args.tabCompleteDatatype(BlockById.INSTANCE);
    }

    @Override
@@ -106,11 +72,10 @@ public class FindCommand extends Command {
    @Override
    public List<String> getLongDesc() {
        return Arrays.asList(
-                "The find command searches through Baritone's cache and attempts to find the location of the block.",
-                "Tab completion will suggest only cached blocks and uncached blocks can not be found.",
+                "",
                "",
                "Usage:",
-                "> find <block> [...] - Try finding the listed blocks"
+                "> "
        );
    }
 }
--- a/src/main/java/baritone/command/defaults/FollowCommand.java
+++ b/src/main/java/baritone/command/defaults/FollowCommand.java
@@ -24,7 +24,6 @@ import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.datatypes.EntityClassById;
 import baritone.api.command.datatypes.IDatatypeFor;
 import baritone.api.command.datatypes.NearbyPlayer;
-import baritone.api.command.exception.CommandErrorMessageException;
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
 import net.minecraft.entity.Entity;
@@ -62,7 +61,7 @@ public class FollowCommand extends Command {
                if (gotten instanceof EntityType) {
                    //noinspection unchecked
                    classes.add((EntityType) gotten);
-                } else if (gotten != null) {
+                } else {
                    entities.add((Entity) gotten);
                }
            }
@@ -76,14 +75,12 @@ public class FollowCommand extends Command {
        if (group != null) {
            logDirect(String.format("Following all %s", group.name().toLowerCase(Locale.US)));
        } else {
+            logDirect("Following these types of entities:");
            if (classes.isEmpty()) {
-                if (entities.isEmpty()) throw new NoEntitiesException();
-                logDirect("Following these entities:");
                entities.stream()
                        .map(Entity::toString)
                        .forEach(this::logDirect);
            } else {
-                logDirect("Following these types of entities:");
                classes.stream()
                        .map(Registry.ENTITY_TYPE::getKey)
                        .map(Objects::requireNonNull)
@@ -160,12 +157,4 @@ public class FollowCommand extends Command {
            this.datatype = datatype;
        }
    }
-
-    public static class NoEntitiesException extends CommandErrorMessageException {
-
-        protected NoEntitiesException() {
-            super("No valid entities in range!");
-        }
-
-    }
 }
--- a/src/main/java/baritone/command/defaults/HelpCommand.java
+++ b/src/main/java/baritone/command/defaults/HelpCommand.java
@@ -25,8 +25,8 @@ import baritone.api.command.exception.CommandException;
 import baritone.api.command.exception.CommandNotFoundException;
 import baritone.api.command.helpers.Paginator;
 import baritone.api.command.helpers.TabCompleteHelper;
+import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.StringTextComponent;
-import net.minecraft.util.text.TextComponent;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.util.text.event.ClickEvent;
 import net.minecraft.util.text.event.HoverEvent;
@@ -58,22 +58,22 @@ public class HelpCommand extends Command {
                    command -> {
                        String names = String.join("/", command.getNames());
                        String name = command.getNames().get(0);
-                        TextComponent shortDescComponent = new StringTextComponent(" - " + command.getShortDesc());
-                        shortDescComponent.setStyle(shortDescComponent.getStyle().setFormatting(TextFormatting.DARK_GRAY));
-                        TextComponent namesComponent = new StringTextComponent(names);
-                        namesComponent.setStyle(namesComponent.getStyle().setFormatting(TextFormatting.WHITE));
-                        TextComponent hoverComponent = new StringTextComponent("");
-                        hoverComponent.setStyle(hoverComponent.getStyle().setFormatting(TextFormatting.GRAY));
-                        hoverComponent.append(namesComponent);
-                        hoverComponent.appendString("\n" + command.getShortDesc());
-                        hoverComponent.appendString("\n\nClick to view full help");
+                        ITextComponent shortDescComponent = new StringTextComponent(" - " + command.getShortDesc());
+                        shortDescComponent.getStyle().setColor(TextFormatting.DARK_GRAY);
+                        ITextComponent namesComponent = new StringTextComponent(names);
+                        namesComponent.getStyle().setColor(TextFormatting.WHITE);
+                        ITextComponent hoverComponent = new StringTextComponent("");
+                        hoverComponent.getStyle().setColor(TextFormatting.GRAY);
+                        hoverComponent.appendSibling(namesComponent);
+                        hoverComponent.appendText("\n" + command.getShortDesc());
+                        hoverComponent.appendText("\n\nClick to view full help");
                        String clickCommand = FORCE_COMMAND_PREFIX + String.format("%s %s", label, command.getNames().get(0));
-                        TextComponent component = new StringTextComponent(name);
-                        component.setStyle(component.getStyle().setFormatting(TextFormatting.GRAY));
-                        component.append(shortDescComponent);
-                        component.setStyle(component.getStyle()
+                        ITextComponent component = new StringTextComponent(name);
+                        component.getStyle().setColor(TextFormatting.GRAY);
+                        component.appendSibling(shortDescComponent);
+                        component.getStyle()
                                .setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, hoverComponent))
-                                .setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, clickCommand)));
+                                .setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, clickCommand));
                        return component;
                    },
                    FORCE_COMMAND_PREFIX + label
@@ -88,11 +88,11 @@ public class HelpCommand extends Command {
            logDirect("");
            command.getLongDesc().forEach(this::logDirect);
            logDirect("");
-            TextComponent returnComponent = new StringTextComponent("Click to return to the help menu");
-            returnComponent.setStyle(returnComponent.getStyle().setClickEvent(new ClickEvent(
+            ITextComponent returnComponent = new StringTextComponent("Click to return to the help menu");
+            returnComponent.getStyle().setClickEvent(new ClickEvent(
                    ClickEvent.Action.RUN_COMMAND,
                    FORCE_COMMAND_PREFIX + label
-            )));
+            ));
            logDirect(returnComponent);
        }
    }
--- a/src/main/java/baritone/command/defaults/MineCommand.java
+++ b/src/main/java/baritone/command/defaults/MineCommand.java
@@ -65,12 +65,14 @@ public class MineCommand extends Command {
        return Arrays.asList(
                "The mine command allows you to tell Baritone to search for and mine individual blocks.",
                "",
-                "The specified blocks can be ores, or any other block.",
+                "The specified blocks can be ores (which are commonly cached), or any other block.",
                "",
                "Also see the legitMine settings (see #set l legitMine).",
                "",
                "Usage:",
-                "> mine diamond_ore - Mines all diamonds it can find."
+                "> mine diamond_ore - Mines all diamonds it can find.",
+                "> mine redstone_ore lit_redstone_ore - Mines redstone ore.",
+                "> mine log:0 - Mines only oak logs."
        );
    }
 }
--- a/src/main/java/baritone/command/defaults/SchematicaCommand.java
+++ b/src/main/java/baritone/command/defaults/SchematicaCommand.java
@@ -51,7 +51,7 @@ public class SchematicaCommand extends Command {
    @Override
    public List<String> getLongDesc() {
        return Arrays.asList(
-                "Builds the schematic currently open in Schematica.",
+                "Builds the schematica currently open in Schematica.",
                "",
                "Usage:",
                "> schematica"
--- a/Show More
+++ b/Show More