v1.6.2

Update to 1.16.4
v1.6.1
2020-12-16 13:32:11 -10:00 · 2020-12-16 16:42:35 -06:00 · 2020-09-07 16:48:44 -07:00 · 2020-08-22 02:04:05 -07:00 · 2020-08-21 19:36:15 -05:00 · 2020-08-17 17:41:13 -07:00
330 changed files with 3215 additions and 20490 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,39 +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@v2
-    - name: Set up JDK 8
-      uses: actions/setup-java@v2
-      with:
-        java-version: '8'
-        distribution: 'adopt'
-        
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-      
-    - name: Build with Gradle
-      run: ./gradlew build
-      
-    - name: Archive Artifacts
-      uses: actions/upload-artifact@v2
-      with:
-        name: Artifacts
-        path: dist/
-        
-    - name: Archive mapping.txt
-      uses: actions/upload-artifact@v2
-      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@v2
-    - name: Set up JDK 9
-      uses: actions/setup-java@v2
-      with:
-        java-version: '8'
-        distribution: 'adopt'
-        
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-      
-    - name: Executing tests
-      run: ./gradlew test
-    
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,8 @@ build/
 classes/
 *.class

+/out
+
 # IntelliJ Files
 .idea/
 *.iml
@@ -18,12 +20,6 @@ classes/
 *.iws
 /logs/

-# Eclipse Files
-.classpath
-.project
-.settings/
-baritone_Client.launch
-
 # Copyright Files
 !/.idea/copyright/Baritone.xml
 !/.idea/copyright/profiles_settings.xml
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -0,0 +1,14 @@
+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,29 @@
+language: java
+
+sudo: required
+
+services:
+- docker
+
+install:
+- travis_retry docker build -t cabaletta/baritone .
+
+script:
+- docker run --name baritone cabaletta/baritone ./gradlew javadoc
+#- docker run --name baritone cabaletta/baritone /bin/sh -c "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 128x128x24 -ac +extension GLX +render; DISPLAY=:99 BARITONE_AUTO_TEST=true ./gradlew runAutoTest; cat /code/autotest/success"
+- docker cp baritone:/code/dist dist
+- ls dist
+- cat dist/checksums.txt
+
+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/9
+++ b/9
@@ -1,5 +1,7 @@
 FROM debian:stretch

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

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

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

 WORKDIR /code

+# this .deb is specially patched to support lwjgl
+# source: https://github.com/tectonicus/tectonicus/issues/60#issuecomment-154239173
+RUN dpkg -i scripts/xvfb_1.16.4-1_amd64.deb
+
 RUN ./gradlew build
+RUN ./gradlew build -Pbaritone.forge_build
--- a/README.md
+++ b/README.md
@@ -1,63 +1,47 @@
 # 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>
+[![HitCount](http://hits.dwyl.com/cabaletta/baritone.svg)](http://hits.dwyl.com/cabaletta/baritone/)
+[![GitHub All Releases](https://img.shields.io/github/downloads/cabaletta/baritone/total.svg)](https://github.com/cabaletta/baritone/releases/)

-<p align="center">
-  <img src="https://img.shields.io/badge/MC-1.12.2-brightgreen.svg" alt="Minecraft"/>
-  <img src="https://img.shields.io/badge/MC-1.13.2-brightgreen.svg" alt="Minecraft"/>
-  <img src="https://img.shields.io/badge/MC-1.14.4-brightgreen.svg" alt="Minecraft"/>
-  <img src="https://img.shields.io/badge/MC-1.15.2-brightgreen.svg" alt="Minecraft"/>
-  <img src="https://img.shields.io/badge/MC-1.16.5-brightgreen.svg" alt="Minecraft"/>
-</p>
+[![Build Status](https://travis-ci.com/cabaletta/baritone.svg?branch=master)](https://travis-ci.com/cabaletta/baritone/)
+[![Release](https://img.shields.io/github/release/cabaletta/baritone.svg)](https://github.com/cabaletta/baritone/releases/)
+[![License](https://img.shields.io/badge/license-LGPL--3.0%20with%20anime%20exception-green.svg)](LICENSE)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/a73d037823b64a5faf597a18d71e3400)](https://www.codacy.com/app/leijurv/baritone?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=cabaletta/baritone&amp;utm_campaign=Badge_Grade)
+[![Minecraft](https://img.shields.io/badge/MC-1.12.2-brightgreen.svg)](https://github.com/cabaletta/baritone/tree/master/)
+[![Minecraft](https://img.shields.io/badge/MC-1.13.2-brightgreen.svg)](https://github.com/cabaletta/baritone/tree/1.13.2/)
+[![Minecraft](https://img.shields.io/badge/MC-1.14.4-brightgreen.svg)](https://github.com/cabaletta/baritone/tree/1.14.4/)
+[![Minecraft](https://img.shields.io/badge/MC-1.15.2-brightgreen.svg)](https://github.com/cabaletta/baritone/tree/1.15.2/)
+[![Code of Conduct](https://img.shields.io/badge/%E2%9D%A4-code%20of%20conduct-blue.svg?style=flat)](https://github.com/cabaletta/baritone/blob/master/CODE_OF_CONDUCT.md)
+[![Known Vulnerabilities](https://snyk.io/test/github/cabaletta/baritone/badge.svg?targetFile=build.gradle)](https://snyk.io/test/github/cabaletta/baritone?targetFile=build.gradle)
+[![Contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/cabaletta/baritone/issues/)
+[![Issues](https://img.shields.io/github/issues/cabaletta/baritone.svg)](https://github.com/cabaletta/baritone/issues/)
+[![GitHub issues-closed](https://img.shields.io/github/issues-closed/cabaletta/baritone.svg)](https://github.com/cabaletta/baritone/issues?q=is%3Aissue+is%3Aclosed)
+[![Pull Requests](https://img.shields.io/github/issues-pr/cabaletta/baritone.svg)](https://github.com/cabaletta/baritone/pulls/)
+![Code size](https://img.shields.io/github/languages/code-size/cabaletta/baritone.svg)
+![GitHub repo size](https://img.shields.io/github/repo-size/cabaletta/baritone.svg)
+![Lines of Code](https://tokei.rs/b1/github/cabaletta/baritone?category=code)
+[![GitHub contributors](https://img.shields.io/github/contributors/cabaletta/baritone.svg)](https://github.com/cabaletta/baritone/graphs/contributors/)
+[![GitHub commits](https://img.shields.io/github/commits-since/cabaletta/baritone/v1.0.0.svg)](https://github.com/cabaletta/baritone/commit/)
+[![Impact integration](https://img.shields.io/badge/Impact%20integration-v1.2.14%20/%20v1.3.8%20/%20v1.4.6%20/%20v1.5.3-brightgreen.svg)](https://impactclient.net/)
+[![KAMI Blue integration](https://img.shields.io/badge/KAMI%20Blue%20integration-v1.2.14--master-green)](https://github.com/kami-blue/client)
+[![ForgeHax integration](https://img.shields.io/badge/ForgeHax%20%22integration%22-scuffed-yellow.svg)](https://github.com/fr1kin/ForgeHax/)
+[![Aristois add-on integration](https://img.shields.io/badge/Aristois%20add--on%20integration-v1.3.4%20/%20v1.4.1-green.svg)](https://gitlab.com/emc-mods-indrit/baritone_api)
+[![rootNET integration](https://img.shields.io/badge/rootNET%20integration-v1.2.11-green.svg)](https://rootnet.dev/)
+[![WWE integration](https://img.shields.io/badge/WWE%20%22integration%22-master%3F-green.svg)](https://wweclient.com/)
+[![Future integration](https://img.shields.io/badge/Future%20integration-v1.2.12%20%2F%20v1.3.6%20%2F%20v1.4.4-red)](https://futureclient.net/)
+[![RusherHack integration](https://img.shields.io/badge/RusherHack%20integration-v1.2.14-green)](https://rusherhack.org/)
+[![forthebadge](https://forthebadge.com/images/badges/built-with-swag.svg)](http://forthebadge.com/)
+[![forthebadge](https://forthebadge.com/images/badges/mom-made-pizza-rolls.svg)](http://forthebadge.com/)

-<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/app/leijurv/baritone?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=cabaletta/baritone&amp;utm_campaign=Badge_Grade"><img src="https://api.codacy.com/project/badge/Grade/a73d037823b64a5faf597a18d71e3400" 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>
+A Minecraft pathfinder bot. 

-<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>
+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.

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

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

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

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

--- 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.2 or 1.16.4 or 1.16.5 (LOL)
+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).

@@ -32,6 +32,11 @@ If another one of your Forge mods has a Baritone integration, you want `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.

+## 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

@@ -44,27 +49,6 @@ On Mac OSX and Linux, use `./gradlew` instead of `gradlew`.

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

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

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

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

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

 # Commands

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

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

 group 'baritone'
-version '1.2.15'
+version '1.6.2'

 buildscript {
    repositories {
@@ -25,25 +25,30 @@ buildscript {
            url = 'http://files.minecraftforge.net/maven'
        }
        maven {
-            name = 'SpongePowered'
-            url = 'https://repo.spongepowered.org/repository/maven-public/'
+            name = 'impactdevelopment-repo'
+            url = 'https://impactdevelopment.github.io/maven/'
+        }
+        maven {
+            url = 'https://www.dogforce-games.com/maven/'
        }
        jcenter()
    }

    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
-        classpath 'org.spongepowered:mixingradle:0.6-SNAPSHOT'
+        classpath group: 'com.github.ImpactDevelopment', name: 'ForgeGradle', version: '3.0.115'
+        classpath group: 'com.github.ImpactDevelopment', name: 'MixinGradle', version: '0.6.2'
    }
 }

-
 import baritone.gradle.task.CreateDistTask
 import baritone.gradle.task.ProguardTask

+import net.minecraftforge.gradle.userdev.tasks.GenerateSRG
+import net.minecraftforge.gradle.userdev.tasks.RenameJarInPlace
+import org.apache.tools.ant.taskdefs.condition.Os
+
 apply plugin: 'java'
-apply plugin: 'maven'
-apply plugin: 'net.minecraftforge.gradle.tweaker-client'
+apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'org.spongepowered.mixin'

 sourceCompatibility = targetCompatibility = '1.8'
@@ -53,8 +58,19 @@ compileJava {
 }

 sourceSets {
+    api {
+        compileClasspath += main.compileClasspath
+    }
+    main {
+        compileClasspath += api.output
+    }
+    test {
+        compileClasspath += main.compileClasspath + main.runtimeClasspath + main.output
+        runtimeClasspath += main.compileClasspath + main.runtimeClasspath + main.output
+    }
    launch {
        compileClasspath += main.compileClasspath + main.runtimeClasspath + main.output
+        runtimeClasspath += main.compileClasspath + main.runtimeClasspath + main.output
    }

    schematica_api {
@@ -66,14 +82,56 @@ sourceSets {
    }
 }

-minecraft {
-    version = '1.12.2'
-    mappings = 'stable_39'
-    tweakClass = 'baritone.launch.BaritoneTweaker'
-    runDir = 'run'
+task sourceJar(type: Jar, dependsOn: classes) {
+    classifier = 'sources'
+    from sourceSets.api.allSource
+}

-    // The sources jar should use SRG names not MCP to ensure compatibility with all mappings
-    makeObfSourceJar = true
+minecraft {
+    mappings channel: 'snapshot', version: '20201028-1.16.3'
+
+    if (getProject().hasProperty("baritone.forge_build")) {
+        reobfMappings 'searge'
+    } else {
+        reobfMappings 'notch'
+    }
+
+    runs {
+        client {
+            workingDirectory project.file('run')
+            source sourceSets.launch
+
+            main 'baritone.launch.LaunchTesting'
+
+            environment 'assetIndex', '{asset_index}'
+            environment 'assetDirectory', downloadAssets.output
+            environment 'nativesDirectory', extractNatives.output
+
+            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"
+            }
+        }
+    }
 }

 repositories {
@@ -81,18 +139,26 @@ repositories {

    maven {
        name = 'spongepowered-repo'
-        url = 'https://repo.spongepowered.org/repository/maven-public/'
+        url = 'http://repo.spongepowered.org/maven/'
    }
-
    maven {
        name = 'impactdevelopment-repo'
        url = 'https://impactdevelopment.github.io/maven/'
    }
+    maven {
+        url = 'https://www.dogforce-games.com/maven/'
+    }
 }

 dependencies {
+    minecraft 'com.github.ImpactDevelopment:Vanilla:1.16.4'
+
+    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') {
+    runtime launchCompile('org.spongepowered:mixin:0.8.+') {
        // Mixin includes a lot of dependencies that are too up-to-date
        exclude module: 'launchwrapper'
        exclude module: 'guava'
@@ -100,6 +166,7 @@ dependencies {
        exclude module: 'commons-io'
        exclude module: 'log4j-core'
    }
+
    testImplementation 'junit:junit:4.12'
 }

@@ -118,26 +185,53 @@ javadoc {

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

    manifest {
        attributes(
                'MixinConfigs': 'mixins.baritone.json',
+                "MixinConnector": "baritone.launch.BaritoneMixinConnector",

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

-task proguard(type: ProguardTask) {
+// 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 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'
 }
@@ -145,25 +239,3 @@ task proguard(type: ProguardTask) {
 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/task/BaritoneGradleTask.java
+++ b/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java
@@ -20,6 +20,7 @@ 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;
@@ -40,37 +41,46 @@ class BaritoneGradleTask extends DefaultTask {
            PROGUARD_STANDALONE_CONFIG      = "standalone.pro",
            PROGUARD_EXPORT_PATH            = "proguard_out.jar",

-            TEMP_LIBRARY_DIR = "tempLibraries/",
-
-            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_API        = "%s-api-forge-%s.jar",
-            ARTIFACT_FORGE_STANDALONE = "%s-standalone-forge-%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",
+            ARTIFACT_FORGE_UNOPTIMIZED = "%s-unoptimized-forge-%s.jar",
+            ARTIFACT_FORGE_API         = "%s-api-forge-%s.jar",
+            ARTIFACT_FORGE_STANDALONE  = "%s-standalone-forge-%s.jar";

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

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

-        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.artifactForgeApiPath        = this.getBuildFile(formatVersion(ARTIFACT_FORGE_API));
-        this.artifactForgeStandalonePath = this.getBuildFile(formatVersion(ARTIFACT_FORGE_STANDALONE));
+        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 {
+            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 Exception {
+    protected void write(InputStream stream, Path file) throws IOException {
        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,11 +42,9 @@ public class CreateDistTask extends BaritoneGradleTask {
        super.verifyArtifacts();

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

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

        // Copy build jars to dist/
-        Files.copy(this.artifactApiPath,             api,             REPLACE_EXISTING);
-        Files.copy(this.artifactStandalonePath,      standalone,      REPLACE_EXISTING);
-        Files.copy(this.artifactUnoptimizedPath,     unoptimized,     REPLACE_EXISTING);
-        Files.copy(this.artifactForgeApiPath,        forgeApi,        REPLACE_EXISTING);
-        Files.copy(this.artifactForgeStandalonePath, forgeStandalone, REPLACE_EXISTING);
+        // 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);

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

@@ -72,6 +70,21 @@ 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_FORGE_API)),
+                getRelativeFile("dist/" + formatVersion(ARTIFACT_STANDALONE)),
+                getRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_STANDALONE)),
+                getRelativeFile("dist/" + formatVersion(ARTIFACT_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
@@ -18,9 +18,8 @@
 package baritone.gradle.task;

 import baritone.gradle.util.Determinizer;
-import baritone.gradle.util.MappingType;
-import baritone.gradle.util.ReobfWrapper;
 import org.apache.commons.io.IOUtils;
+import org.gradle.api.plugins.JavaPluginConvention;
 import org.gradle.api.JavaVersion;
 import org.gradle.api.NamedDomainObjectContainer;
 import org.gradle.api.artifacts.Configuration;
@@ -38,14 +37,12 @@ import org.gradle.internal.jvm.inspection.DefaultJvmVersionDetector;
 import org.gradle.process.internal.DefaultExecActionFactory;

 import java.io.*;
-import java.lang.reflect.Field;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;

@@ -57,18 +54,12 @@ import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 */
 public class ProguardTask extends BaritoneGradleTask {

-    private static final Pattern TEMP_LIBRARY_PATTERN = Pattern.compile("-libraryjars 'tempLibraries\\/([a-zA-Z0-9/_\\-\\.]+)\\.jar'");
-
    @Input
    private String url;

    @Input
    private String extract;

-    private List<String> requiredLibraries;
-
-    private File mixin;
-
    @TaskAction
    protected void exec() throws Exception {
        super.verifyArtifacts();
@@ -78,7 +69,6 @@ public class ProguardTask extends BaritoneGradleTask {
        downloadProguard();
        extractProguard();
        generateConfigs();
-        acquireDependencies();
        proguardApi();
        proguardStandalone();
        cleanup();
@@ -89,7 +79,7 @@ public class ProguardTask extends BaritoneGradleTask {
            Files.delete(this.artifactUnoptimizedPath);
        }

-        Determinizer.determinize(this.artifactPath.toString(), this.artifactUnoptimizedPath.toString(), Optional.empty());
+        Determinizer.determinize(this.artifactPath.toString(), this.artifactUnoptimizedPath.toString());
    }

    private void downloadProguard() throws Exception {
@@ -217,6 +207,28 @@ public class ProguardTask extends BaritoneGradleTask {
        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 {
+                    libraries = dependencies;
+                }
+            }
+            libraries.forEach(f -> {
+                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);

@@ -224,165 +236,26 @@ public class ProguardTask extends BaritoneGradleTask {
        List<String> standalone = new ArrayList<>(template);
        standalone.removeIf(s -> s.contains("# this is the keep api"));
        Files.write(getTemporaryFile(PROGUARD_STANDALONE_CONFIG), standalone);
-
-        // Discover all of the libraries that we will need to acquire from gradle
-        this.requiredLibraries = new ArrayList<>();
-        template.forEach(line -> {
-            if (!line.startsWith("#")) {
-                Matcher m = TEMP_LIBRARY_PATTERN.matcher(line);
-                if (m.find()) {
-                    this.requiredLibraries.add(m.group(1));
-                }
-            }
-        });
    }

-    private void acquireDependencies() throws Exception {
-
-        // Create a map of all of the dependencies that we are able to access in this project
-        // Likely a better way to do this, I just pair the dependency with the first valid configuration
-        Map<String, Pair<Configuration, Dependency>> dependencyLookupMap = new HashMap<>();
-        getProject().getConfigurations().stream().filter(Configuration::isCanBeResolved).forEach(config ->
-                config.getAllDependencies().forEach(dependency ->
-                        dependencyLookupMap.putIfAbsent(dependency.getName() + "-" + dependency.getVersion(), Pair.of(config, dependency))));
-
-        // Create the directory if it doesn't already exist
-        Path tempLibraries = getTemporaryFile(TEMP_LIBRARY_DIR);
-        if (!Files.exists(tempLibraries)) {
-            Files.createDirectory(tempLibraries);
-        }
-
-        // Iterate the required libraries to copy them to tempLibraries
-        for (String lib : this.requiredLibraries) {
-            // copy from the forgegradle cache
-            if (lib.equals("minecraft")) {
-                Path cachedJar = getMinecraftJar();
-                Path inTempDir = getTemporaryFile("tempLibraries/minecraft.jar");
-                // TODO: maybe try not to copy every time
-                Files.copy(cachedJar, inTempDir, REPLACE_EXISTING);
-
-                continue;
-            }
-
-            // Find a configuration/dependency pair that matches the desired library
-            Pair<Configuration, Dependency> pair = null;
-            for (Map.Entry<String, Pair<Configuration, Dependency>> entry : dependencyLookupMap.entrySet()) {
-                if (entry.getKey().startsWith(lib)) {
-                    pair = entry.getValue();
-                }
-            }
-
-            // The pair must be non-null
-            Objects.requireNonNull(pair);
-
-            // Find the library jar file, and copy it to tempLibraries
-            for (File file : pair.getLeft().files(pair.getRight())) {
-                if (file.getName().startsWith(lib)) {
-                    if (lib.contains("mixin")) {
-                        mixin = file;
-                    }
-                    Files.copy(file.toPath(), getTemporaryFile("tempLibraries/" + lib + ".jar"), REPLACE_EXISTING);
-                }
-            }
-        }
-        if (mixin == null) {
-            throw new IllegalStateException("Unable to find mixin jar");
-        }
+    private File getSrgMcJar() {
+        return getProject().getTasks().findByName("copyMcJar").getOutputs().getFiles().getSingleFile();
    }

-    // a bunch of epic stuff to get the path to the cached jar
-    private Path getMinecraftJar() throws Exception {
-        MappingType mappingType;
-        try {
-            mappingType = getMappingType();
-        } catch (Exception e) {
-            System.err.println("Failed to get mapping type, assuming NOTCH.");
-            mappingType = MappingType.NOTCH;
-        }
-
-        String suffix;
-        switch (mappingType) {
-            case NOTCH:
-                suffix = "";
-                break;
-            case SEARGE:
-                suffix = "-srgBin";
-                break;
-            case CUSTOM:
-                throw new IllegalStateException("Custom mappings not supported!");
-            default:
-                throw new IllegalStateException("Unknown mapping type: " + mappingType);
-        }
-
-        DefaultConvention convention = (DefaultConvention) this.getProject().getConvention();
-        Object extension = convention.getAsMap().get("minecraft");
-        Objects.requireNonNull(extension);
-
-        // for some reason cant use Class.forName
-        Class<?> class_baseExtension = extension.getClass().getSuperclass().getSuperclass().getSuperclass(); // <-- cursed
-        Field f_replacer = class_baseExtension.getDeclaredField("replacer");
-        f_replacer.setAccessible(true);
-        Object replacer = f_replacer.get(extension);
-        Class<?> class_replacementProvider = replacer.getClass();
-        Field replacement_replaceMap = class_replacementProvider.getDeclaredField("replaceMap");
-        replacement_replaceMap.setAccessible(true);
-
-        Map<String, Object> replacements = (Map) replacement_replaceMap.get(replacer);
-        String cacheDir = replacements.get("CACHE_DIR").toString() + "/net/minecraft";
-        String mcVersion = replacements.get("MC_VERSION").toString();
-        String mcpInsert = replacements.get("MAPPING_CHANNEL").toString() + "/" + replacements.get("MAPPING_VERSION").toString();
-        String fullJarName = "minecraft-" + mcVersion + suffix + ".jar";
-
-        String baseDir = String.format("%s/minecraft/%s/", cacheDir, mcVersion);
-
-        String jarPath;
-        if (mappingType == MappingType.SEARGE) {
-            jarPath = String.format("%s/%s/%s", baseDir, mcpInsert, fullJarName);
-        } else {
-            jarPath = baseDir + fullJarName;
-        }
-        jarPath = jarPath
-                .replace("/", File.separator)
-                .replace("\\", File.separator); // hecking regex
-
-        return new File(jarPath).toPath();
-    }
-
-    // throws IllegalStateException if mapping type is ambiguous or it fails to find it
-    private MappingType getMappingType() {
-        // if it fails to find this then its probably a forgegradle version problem
-        Set<Object> reobf = (NamedDomainObjectContainer<Object>) this.getProject().getExtensions().getByName("reobf");
-
-        List<MappingType> mappingTypes = getUsedMappingTypes(reobf);
-        long mappingTypesUsed = mappingTypes.size();
-        if (mappingTypesUsed == 0) {
-            throw new IllegalStateException("Failed to find mapping type (no jar task?)");
-        }
-        if (mappingTypesUsed > 1) {
-            throw new IllegalStateException("Ambiguous mapping type (multiple jars with different mapping types?)");
-        }
-
-        return mappingTypes.get(0);
-    }
-
-    private List<MappingType> getUsedMappingTypes(Set<Object> reobf) {
-        return reobf.stream()
-                .map(ReobfWrapper::new)
-                .map(ReobfWrapper::getMappingType)
-                .distinct()
-                .collect(Collectors.toList());
+    private Stream<File> acquireDependencies() {
+        return getProject().getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("launch").getRuntimeClasspath().getFiles()
+            .stream()
+            .filter(File::isFile);
    }

    private void proguardApi() throws Exception {
        runProguard(getTemporaryFile(PROGUARD_API_CONFIG));
-        Determinizer.determinize(this.proguardOut.toString(), this.artifactApiPath.toString(), Optional.empty());
-        Determinizer.determinize(this.proguardOut.toString(), this.artifactForgeApiPath.toString(), Optional.of(mixin));
+        Determinizer.determinize(this.proguardOut.toString(), this.artifactApiPath.toString());
    }

    private void proguardStandalone() throws Exception {
        runProguard(getTemporaryFile(PROGUARD_STANDALONE_CONFIG));
-        Determinizer.determinize(this.proguardOut.toString(), this.artifactStandalonePath.toString(), Optional.empty());
-        Determinizer.determinize(this.proguardOut.toString(), this.artifactForgeStandalonePath.toString(), Optional.of(mixin));
+        Determinizer.determinize(this.proguardOut.toString(), this.artifactStandalonePath.toString());
    }

    private void cleanup() {
--- a/buildSrc/src/main/java/baritone/gradle/util/Determinizer.java
+++ b/buildSrc/src/main/java/baritone/gradle/util/Determinizer.java
@@ -22,7 +22,10 @@ import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;

 import java.io.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.jar.JarOutputStream;
@@ -36,7 +39,7 @@ import java.util.stream.Collectors;
 */
 public class Determinizer {

-    public static void determinize(String inputPath, String outputPath, Optional<File> toInclude) throws IOException {
+    public static void determinize(String inputPath, String outputPath) throws IOException {
        System.out.println("Running Determinizer");
        System.out.println(" Input path: " + inputPath);
        System.out.println(" Output path: " + outputPath);
@@ -63,30 +66,10 @@ public class Determinizer {
                if (entry.getName().endsWith(".refmap.json")) {
                    JsonObject object = new JsonParser().parse(new InputStreamReader(jarFile.getInputStream(entry))).getAsJsonObject();
                    jos.write(writeSorted(object).getBytes());
-                } else if (entry.getName().equals("META-INF/MANIFEST.MF") && toInclude.isPresent()) { // only replace for forge jar
-                    ByteArrayOutputStream cancer = new ByteArrayOutputStream();
-                    copy(jarFile.getInputStream(entry), cancer);
-                    String manifest = new String(cancer.toByteArray());
-                    if (!manifest.contains("baritone.launch.BaritoneTweaker")) {
-                        throw new IllegalStateException("unable to replace");
-                    }
-                    manifest = manifest.replace("baritone.launch.BaritoneTweaker", "org.spongepowered.asm.launch.MixinTweaker");
-                    jos.write(manifest.getBytes());
                } else {
                    copy(jarFile.getInputStream(entry), jos);
                }
            }
-            if (toInclude.isPresent()) {
-                try (JarFile mixin = new JarFile(toInclude.get())) {
-                    for (JarEntry entry : mixin.stream().sorted(Comparator.comparing(JarEntry::getName)).collect(Collectors.toList())) {
-                        if (entry.getName().startsWith("META-INF") && !entry.getName().startsWith("META-INF/services")) {
-                            continue;
-                        }
-                        jos.putNextEntry(entry);
-                        copy(mixin.getInputStream(entry), jos);
-                    }
-                }
-            }
            jos.finish();
        }
    }
--- a/buildSrc/src/main/java/baritone/gradle/util/MappingType.java
+++ b/buildSrc/src/main/java/baritone/gradle/util/MappingType.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.gradle.util;
-
-/**
- * All credits go to AsmLibGradle and its contributors.
- *
- * @see <a href="https://github.com/pozzed/AsmLibGradle/blob/8f917dbc3939eab7a3d9daf54d9d285fdf34f4b2/src/main/java/net/futureclient/asmlib/forgegradle/MappingType.java">Original Source</a>
- */
-public enum MappingType {
-    SEARGE,
-    NOTCH,
-    CUSTOM // forgegradle
-}
--- a/buildSrc/src/main/java/baritone/gradle/util/ReobfWrapper.java
+++ b/buildSrc/src/main/java/baritone/gradle/util/ReobfWrapper.java
@@ -1,63 +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.util;
-
-import java.lang.reflect.Field;
-import java.util.Objects;
-
-/**
- * All credits go to AsmLibGradle and its contributors.
- *
- * @see <a href="https://github.com/pozzed/AsmLibGradle/blob/8f917dbc3939eab7a3d9daf54d9d285fdf34f4b2/src/main/java/net/futureclient/asmlib/forgegradle/ReobfWrapper.java">Original Source</a>
- */
-public class ReobfWrapper {
-
-    private final Object instance;
-    private final Class<?> type;
-
-    public ReobfWrapper(Object instance) {
-        this.instance = instance;
-        Objects.requireNonNull(instance);
-        this.type = instance.getClass();
-    }
-
-    public String getName() {
-        try {
-            Field nameField = type.getDeclaredField("name");
-            nameField.setAccessible(true);
-            return (String) nameField.get(this.instance);
-        } catch (ReflectiveOperationException ex) {
-            throw new IllegalStateException(ex);
-        }
-    }
-
-    public MappingType getMappingType() {
-        try {
-            Field enumField = type.getDeclaredField("mappingType");
-            enumField.setAccessible(true);
-            Enum<?> aEnum = (Enum<?>) enumField.get(this.instance);
-            MappingType mappingType = MappingType.values()[aEnum.ordinal()];
-            if (!aEnum.name().equals(mappingType.name())) {
-                throw new IllegalStateException("ForgeGradle ReobfMappingType is not equivalent to MappingType (version error?)");
-            }
-            return mappingType;
-        } catch (ReflectiveOperationException ex) {
-            throw new IllegalStateException(ex);
-        }
-    }
-}
--- a/scripts/proguard.pro
+++ b/scripts/proguard.pro
@@ -14,7 +14,12 @@

 # lwjgl is weird
 -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
@@ -43,55 +48,6 @@
 #proguard doesnt like it when it cant find our fake schematica classes
 -dontwarn baritone.utils.schematic.schematica.**

-# copy all necessary libraries into tempLibraries to build
-
-# The correct jar will be copied from the forgegradle cache based on the mapping type being compiled with
-libraryjars 'tempLibraries/minecraft.jar'
-
-libraryjars 'tempLibraries/SimpleTweaker-1.2.jar'
-
-libraryjars 'tempLibraries/authlib-1.5.25.jar'
-libraryjars 'tempLibraries/codecjorbis-20101023.jar'
-libraryjars 'tempLibraries/codecwav-20101023.jar'
-libraryjars 'tempLibraries/commons-codec-1.10.jar'
-libraryjars 'tempLibraries/commons-compress-1.8.1.jar'
-libraryjars 'tempLibraries/commons-io-2.5.jar'
-libraryjars 'tempLibraries/commons-lang3-3.5.jar'
-libraryjars 'tempLibraries/commons-logging-1.1.3.jar'
-libraryjars 'tempLibraries/fastutil-7.1.0.jar'
-libraryjars 'tempLibraries/gson-2.8.0.jar'
-libraryjars 'tempLibraries/guava-21.0.jar'
-libraryjars 'tempLibraries/httpclient-4.3.3.jar'
-libraryjars 'tempLibraries/httpcore-4.3.2.jar'
-libraryjars 'tempLibraries/icu4j-core-mojang-51.2.jar'
-libraryjars 'tempLibraries/jinput-2.0.5.jar'
-libraryjars 'tempLibraries/jna-4.4.0.jar'
-libraryjars 'tempLibraries/jopt-simple-5.0.3.jar'
-libraryjars 'tempLibraries/jsr305-3.0.1.jar'
-libraryjars 'tempLibraries/jutils-1.0.0.jar'
-libraryjars 'tempLibraries/libraryjavasound-20101123.jar'
-libraryjars 'tempLibraries/librarylwjglopenal-20100824.jar'
-libraryjars 'tempLibraries/log4j-api-2.8.1.jar'
-libraryjars 'tempLibraries/log4j-core-2.8.1.jar'
-
-# startsWith is used to check the library, and mac/linux differ in which version they use
-# this is FINE
-libraryjars 'tempLibraries/lwjgl-.jar'
-libraryjars 'tempLibraries/lwjgl_util-.jar'
-
-libraryjars 'tempLibraries/netty-all-4.1.9.Final.jar'
-libraryjars 'tempLibraries/oshi-core-1.1.jar'
-libraryjars 'tempLibraries/patchy-1.2.jar'
-libraryjars 'tempLibraries/platform-3.4.0.jar'
-libraryjars 'tempLibraries/realms-1.10.22.jar'
-libraryjars 'tempLibraries/soundsystem-20120107.jar'
-libraryjars 'tempLibraries/text2speech-1.10.3.jar'
-
-libraryjars 'tempLibraries/mixin-0.7.11-SNAPSHOT.jar'
-libraryjars 'tempLibraries/launchwrapper-1.11.jar' # TODO why does only 1.11.jar exist?
-
-
-

 # Keep - Applications. Keep all application classes, along with their 'main'
 # methods.
@@ -381,5 +337,3 @@
    public java.lang.String substring(int);
    public java.lang.String substring(int,int);
 }
-
-printmapping mapping.txt
--- a/scripts/xvfb_1.16.4-1_amd64.deb
+++ b/scripts/xvfb_1.16.4-1_amd64.deb
--- a/src/api/java/baritone/api/BaritoneAPI.java
+++ b/src/api/java/baritone/api/BaritoneAPI.java
@@ -19,9 +19,6 @@ 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.
 *
@@ -37,9 +34,11 @@ public final class BaritoneAPI {
        settings = new Settings();
        SettingsUtil.readAndApply(settings);

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

    public static IBaritoneProvider getProvider() {
--- a/src/api/java/baritone/api/IBaritone.java
+++ b/src/api/java/baritone/api/IBaritone.java
@@ -20,13 +20,13 @@ package baritone.api;
 import baritone.api.behavior.ILookBehavior;
 import baritone.api.behavior.IPathingBehavior;
 import baritone.api.cache.IWorldProvider;
-import baritone.api.command.manager.ICommandManager;
 import baritone.api.event.listener.IEventBus;
 import baritone.api.pathing.calc.IPathingControlManager;
 import baritone.api.process.*;
 import baritone.api.selection.ISelectionManager;
 import baritone.api.utils.IInputOverrideHandler;
 import baritone.api.utils.IPlayerContext;
+import baritone.api.command.manager.ICommandManager;

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

 import java.util.List;
 import java.util.Objects;
@@ -47,19 +47,19 @@ public interface IBaritoneProvider {
     * returned by {@link #getPrimaryBaritone()}.
     *
     * @return All active {@link IBaritone} instances.
-     * @see #getBaritoneForPlayer(EntityPlayerSP)
+     * @see #getBaritoneForPlayer(ClientPlayerEntity)
     */
    List<IBaritone> getAllBaritones();

    /**
-     * Provides the {@link IBaritone} instance for a given {@link EntityPlayerSP}. This will likely be
+     * Provides the {@link IBaritone} instance for a given {@link ClientPlayerEntity}. This will likely be
     * replaced with or be overloaded in addition to {@code #getBaritoneForUser(IBaritoneUser)} when
     * {@code bot-system} is merged into {@code master}.
     *
     * @param player The player
     * @return The {@link IBaritone} instance.
     */
-    default IBaritone getBaritoneForPlayer(EntityPlayerSP player) {
+    default IBaritone getBaritoneForPlayer(ClientPlayerEntity player) {
        for (IBaritone baritone : getAllBaritones()) {
            if (Objects.equals(player, baritone.getPlayerContext().player())) {
                return baritone;
--- 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.init.Blocks;
 import net.minecraft.item.Item;
-import net.minecraft.util.math.Vec3i;
+import net.minecraft.util.math.vector.Vector3i;
 import net.minecraft.util.text.ITextComponent;

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

 /**
 * Baritone's settings. Settings apply to all Baritone instances.
@@ -67,15 +64,15 @@ public final class Settings {
    /**
     * Disable baritone's auto-tool at runtime, but still assume that another mod will provide auto tool functionality
     * <p>
-     * Specifically, path calculation will still assume that an auto tool will run at execution time, even though
+     * Specifically, path calculation will still assume that an auto tool wil run at execution time, even though
     * Baritone itself will not do that.
     */
    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
@@ -174,10 +171,10 @@ public final class Settings {
     * Blocks that Baritone is allowed to place (as throwaway, for sneak bridging, pillaring, etc.)
     */
    public final Setting<List<Item>> acceptableThrowawayItems = new Setting<>(new ArrayList<>(Arrays.asList(
-            Item.getItemFromBlock(Blocks.DIRT),
-            Item.getItemFromBlock(Blocks.COBBLESTONE),
-            Item.getItemFromBlock(Blocks.NETHERRACK),
-            Item.getItemFromBlock(Blocks.STONE)
+            Blocks.DIRT.asItem(),
+            Blocks.COBBLESTONE.asItem(),
+            Blocks.NETHERRACK.asItem(),
+            Blocks.STONE.asItem()
    )));

    /**
@@ -193,11 +190,8 @@ public final class Settings {
    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,
-            Blocks.LIT_FURNACE,
            Blocks.CHEST,
-            Blocks.TRAPPED_CHEST,
-            Blocks.STANDING_SIGN,
-            Blocks.WALL_SIGN
+            Blocks.TRAPPED_CHEST
    )));

    /**
@@ -209,29 +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
-     */
-    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
-     */
-    public final Setting<Map<Block, List<Block>>> buildSubstitutes = new Setting<>(new HashMap<>());
-
    /**
     * A list of blocks to become air
     * <p>
@@ -310,6 +281,11 @@ public final class Settings {
     */
    public final Setting<Integer> rightClickSpeed = new Setting<>(4);

+    /**
+     * How many degrees to randomize the yaw every tick. Set to 0 to disable
+     */
+    public final Setting<Double> randomLooking113 = new Setting<>(2d);
+
    /**
     * Block reach distance
     */
@@ -555,18 +531,6 @@ public final class Settings {
     */
    public final Setting<Boolean> backfill = new Setting<>(false);

-    /**
-     * Shows popup message in the upper right corner, similarly to when you make an advancement
-     */
-    public final Setting<Boolean> logAsToast = new Setting<>(false);
-
-    /**
-     * The time of how long the message in the pop-up will display
-     * <p>
-     * If below 1000L (1sec), it's better to disable this
-     */
-    public final Setting<Long> toastTimer = new Setting<>(5000L);
-
    /**
     * Print all the debug messages to chat
     */
@@ -598,12 +562,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
     */
@@ -673,7 +631,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.
     */
@@ -728,16 +686,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.
@@ -781,24 +729,7 @@ public final class Settings {
    public final Setting<Integer> maxCachedWorldScanCount = new Setting<>(10);

    /**
-     * Sets the minimum y level whilst mining - set to 0 to turn off.
-     */
-    public final Setting<Integer> minYLevelWhileMining = new Setting<>(0);
-
-    /**
-     * This will only allow baritone to mine exposed ores, can be used to stop ore obfuscators on servers that use them.
-     */
-    public final Setting<Boolean> allowOnlyExposedOres = new Setting<>(false);
-
-    /**
-     * When allowOnlyExposedOres is enabled this is the distance around to search.
-     * <p>
-     * It is recommended to keep this value low, as it dramatically increases calculation times.
-     */
-    public final Setting<Integer> allowOnlyExposedOresDistance = new Setting<>(1);
-
-    /**
-     * When GetToBlock 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);

@@ -850,44 +781,22 @@ 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
     */
    public final Setting<Integer> startAtLayer = new Setting<>(0);

-    /**
-     * If a layer is unable to be constructed, just skip it.
-     */
-    public final Setting<Boolean> skipFailedLayers = new Setting<>(false);
-
-    /**
-     * 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<Vec3i> buildRepeat = new Setting<>(new Vec3i(0, 0, 0));
+    public final Setting<Vector3i> buildRepeat = new Setting<>(new Vector3i(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>
@@ -996,7 +905,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);

@@ -1081,21 +989,12 @@ 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<>(Minecraft.getMinecraft().ingameGUI.getChatGUI()::printChatMessage);
+    public final Setting<Consumer<ITextComponent>> logger = new Setting<>(Minecraft.getInstance().ingameGUI.getChatGUI()::printChatMessage);

    /**
-     * 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};
+     * Print out ALL command exceptions as a stack trace to stdout, even simple syntax errors
     */
-    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);
+    public final Setting<Boolean> verboseCommandExceptions = new Setting<>(false);

    /**
     * The size of the box that is rendered when the current goal is a GoalYLevel
@@ -1187,11 +1086,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/api/java/baritone/api/cache/IBlockTypeAccess.java
+++ b/src/api/java/baritone/api/cache/IBlockTypeAccess.java
@@ -17,7 +17,7 @@

 package baritone.api.cache;

-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 import net.minecraft.util.math.BlockPos;

 /**
@@ -26,9 +26,9 @@ import net.minecraft.util.math.BlockPos;
 */
 public interface IBlockTypeAccess {

-    IBlockState getBlock(int x, int y, int z);
+    BlockState getBlock(int x, int y, int z);

-    default IBlockState getBlock(BlockPos pos) {
+    default BlockState getBlock(BlockPos pos) {
        return getBlock(pos.getX(), pos.getY(), pos.getZ());
    }
 }
--- a/src/api/java/baritone/api/cache/IWorldScanner.java
+++ b/src/api/java/baritone/api/cache/IWorldScanner.java
@@ -88,7 +88,7 @@ public interface IWorldScanner {
     * Queues the chunks in a square formation around the specified player, using the specified
     * range, which represents 1/2 the square's dimensions, where the player is in the center.
     *
-     * @param ctx   The player, describing the origin
+     * @param ctx The player, describing the origin
     * @param range The range to repack
     * @return The amount of chunks successfully queued for repacking
     */
--- a/src/api/java/baritone/api/command/Command.java
+++ b/src/api/java/baritone/api/command/Command.java
@@ -34,8 +34,9 @@ import java.util.stream.Stream;
 * So basically, you should use it because it provides a small amount of boilerplate,
 * but you're not forced to use it.
 *
- * @author LoganDark
 * @see ICommand
+ *
+ * @author LoganDark
 */
 public abstract class Command implements ICommand {

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

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

 import java.util.Deque;
 import java.util.LinkedList;
@@ -223,7 +223,7 @@ public interface IArgConsumer {
     * @param type  The type to peek as
     * @param index The index to peek
     * @return An instance of the specified type
-     * @throws CommandInvalidTypeException If the parsing failed
+     * @throws CommandInvalidTypeException     If the parsing failed
     * @see IArgParser
     * @see #peekAs(Class)
     * @see #peekAsOrDefault(Class, Object, int)
@@ -240,7 +240,7 @@ public interface IArgConsumer {
     *
     * @param type The type to peek as
     * @return An instance of the specified type
-     * @throws CommandInvalidTypeException If the parsing failed
+     * @throws CommandInvalidTypeException     If the parsing failed
     * @see IArgParser
     * @see #peekAs(Class, int)
     * @see #peekAsOrDefault(Class, Object)
@@ -404,8 +404,8 @@ public interface IArgConsumer {
    /**
     * Gets an enum value from the enum class with the same name as the next argument's value
     * <p>
-     * For example if you getEnum as an {@link EnumFacing}, and the next argument's value is "up", this will return
-     * {@link EnumFacing#UP}
+     * For example if you getEnum as an {@link Direction}, and the next argument's value is "up", this will return
+     * {@link Direction#UP}
     *
     * @param enumClass The enum class to search
     * @return An enum constant of that class with the same name as the next argument's value
@@ -419,8 +419,8 @@ public interface IArgConsumer {
    /**
     * Gets an enum value from the enum class with the same name as the next argument's value
     * <p>
-     * For example if you getEnum as an {@link EnumFacing}, and the next argument's value is "up", this will return
-     * {@link EnumFacing#UP}
+     * For example if you getEnum as an {@link Direction}, and the next argument's value is "up", this will return
+     * {@link Direction#UP}
     *
     * @param enumClass The enum class to search
     * @param def       The default value
@@ -436,8 +436,8 @@ public interface IArgConsumer {
    /**
     * Gets an enum value from the enum class with the same name as the next argument's value
     * <p>
-     * For example if you getEnum as an {@link EnumFacing}, and the next argument's value is "up", this will return
-     * {@link EnumFacing#UP}
+     * For example if you getEnum as an {@link Direction}, and the next argument's value is "up", this will return
+     * {@link Direction#UP}
     *
     * @param enumClass The enum class to search
     * @return An enum constant of that class with the same name as the next argument's value, or {@code null} if it
@@ -458,7 +458,7 @@ public interface IArgConsumer {
     *
     * @param type The type to peek as
     * @return An instance of the specified type
-     * @throws CommandInvalidTypeException If the parsing failed
+     * @throws CommandInvalidTypeException     If the parsing failed
     * @see IArgParser
     * @see #get()
     * @see #getAsOrDefault(Class, Object)
--- a/src/api/java/baritone/api/command/argument/ICommandArgument.java
+++ b/src/api/java/baritone/api/command/argument/ICommandArgument.java
@@ -19,7 +19,7 @@ package baritone.api.command.argument;

 import baritone.api.command.argparser.IArgParser;
 import baritone.api.command.exception.CommandInvalidTypeException;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;

 /**
 * A {@link ICommandArgument} is an immutable object representing one command argument. It contains data on the index of
@@ -50,8 +50,8 @@ public interface ICommandArgument {
    /**
     * Gets an enum value from the enum class with the same name as this argument's value
     * <p>
-     * For example if you getEnum as an {@link EnumFacing}, and this argument's value is "up", it will return {@link
-     * EnumFacing#UP}
+     * For example if you getEnum as an {@link Direction}, and this argument's value is "up", it will return {@link
+     * Direction#UP}
     *
     * @param enumClass The enum class to search
     * @return An enum constant of that class with the same name as this argument's value
@@ -87,7 +87,7 @@ public interface ICommandArgument {
     *
     * @param type The class to parse this argument into
     * @return An instance of the specified type
-     * @throws CommandInvalidTypeException If the parsing failed
+     * @throws CommandInvalidTypeException     If the parsing failed
     */
    <T, S> T getAs(Class<T> type, Class<S> stateType, S state) throws CommandInvalidTypeException;

--- a/src/api/java/baritone/api/command/datatypes/BlockById.java
+++ b/src/api/java/baritone/api/command/datatypes/BlockById.java
@@ -20,8 +20,8 @@ package baritone.api.command.datatypes;
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
 import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.registry.Registry;

 import java.util.stream.Stream;

@@ -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 = Block.REGISTRY.getObject(id)) == Blocks.AIR) {
+        if ((block = Registry.BLOCK.getOptional(id).orElse(null)) == null) {
            throw new IllegalArgumentException("no block found by that id");
        }
        return block;
@@ -42,7 +42,7 @@ public enum BlockById implements IDatatypeFor<Block> {
    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
        return new TabCompleteHelper()
                .append(
-                        Block.REGISTRY.getKeys()
+                        Registry.BLOCK.keySet()
                                .stream()
                                .map(Object::toString)
                )
--- a/src/api/java/baritone/api/command/datatypes/EntityClassById.java
+++ b/src/api/java/baritone/api/command/datatypes/EntityClassById.java
@@ -19,32 +19,20 @@ package baritone.api.command.datatypes;

 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityList;
+import net.minecraft.entity.EntityType;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.registry.Registry;

 import java.util.stream.Stream;

-public enum EntityClassById implements IDatatypeFor<Class<? extends Entity>> {
+public enum EntityClassById implements IDatatypeFor<EntityType> {
    INSTANCE;

    @Override
-    public Class<? extends Entity> get(IDatatypeContext ctx) throws CommandException {
+    public EntityType get(IDatatypeContext ctx) throws CommandException {
        ResourceLocation id = new ResourceLocation(ctx.getConsumer().getString());
-        Class<? extends Entity> entity;
-        try {
-            entity = EntityList.REGISTRY.getObject(id);
-        } catch (NoSuchFieldError e) {
-            // Forge removes EntityList.REGISTRY field and provides the getClass method as a replacement
-            // See https://github.com/MinecraftForge/MinecraftForge/blob/1.12.x/patches/minecraft/net/minecraft/entity/EntityList.java.patch
-            try {
-                entity = (Class<? extends Entity>) EntityList.class.getMethod("getClass", ResourceLocation.class).invoke(null, id);
-            } catch (Exception ex) {
-                throw new RuntimeException("EntityList.REGISTRY does not exist and failed to call the Forge-replacement method", ex);
-            }
-        }
-
-        if (entity == null) {
+        EntityType entity;
+        if ((entity = Registry.ENTITY_TYPE.getOptional(id).orElse(null)) == null) {
            throw new IllegalArgumentException("no entity found by that id");
        }
        return entity;
@@ -53,7 +41,7 @@ public enum EntityClassById implements IDatatypeFor<Class<? extends Entity>> {
    @Override
    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
        return new TabCompleteHelper()
-                .append(EntityList.getEntityNameList().stream().map(Object::toString))
+                .append(Registry.ENTITY_TYPE.stream().map(Object::toString))
                .filterPrefixNamespaced(ctx.getConsumer().getString())
                .sortAlphabetically()
                .stream();
--- a/src/api/java/baritone/api/command/datatypes/ForBlockOptionalMeta.java
+++ b/src/api/java/baritone/api/command/datatypes/ForBlockOptionalMeta.java
@@ -17,8 +17,8 @@

 package baritone.api.command.datatypes;

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

 import java.util.stream.Stream;

--- a/src/api/java/baritone/api/command/datatypes/ForEnumFacing.java
+++ b/src/api/java/baritone/api/command/datatypes/ForEnumFacing.java
@@ -17,26 +17,26 @@

 package baritone.api.command.datatypes;

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

 import java.util.Locale;
 import java.util.stream.Stream;

-public enum ForEnumFacing implements IDatatypeFor<EnumFacing> {
+public enum ForDirection implements IDatatypeFor<Direction> {
    INSTANCE;

    @Override
-    public EnumFacing get(IDatatypeContext ctx) throws CommandException {
-        return EnumFacing.valueOf(ctx.getConsumer().getString().toUpperCase(Locale.US));
+    public Direction get(IDatatypeContext ctx) throws CommandException {
+        return Direction.valueOf(ctx.getConsumer().getString().toUpperCase(Locale.US));
    }

    @Override
    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
        return new TabCompleteHelper()
-                .append(Stream.of(EnumFacing.values())
-                        .map(EnumFacing::getName).map(String::toLowerCase))
+                .append(Stream.of(Direction.values())
+                        .map(Direction::getName2).map(String::toLowerCase))
                .filterPrefix(ctx.getConsumer().getString())
                .stream();
    }
--- a/src/api/java/baritone/api/command/datatypes/ForWaypoints.java
+++ b/src/api/java/baritone/api/command/datatypes/ForWaypoints.java
@@ -20,8 +20,8 @@ package baritone.api.command.datatypes;
 import baritone.api.IBaritone;
 import baritone.api.cache.IWaypoint;
 import baritone.api.cache.IWaypointCollection;
-import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
+import baritone.api.command.exception.CommandException;

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

 import java.util.List;
 import java.util.stream.Stream;
@@ -29,27 +30,27 @@ import java.util.stream.Stream;
 * An {@link IDatatype} used to resolve nearby players, those within
 * render distance of the target {@link IBaritone} instance.
 */
-public enum NearbyPlayer implements IDatatypeFor<EntityPlayer> {
+public enum NearbyPlayer implements IDatatypeFor<PlayerEntity> {
    INSTANCE;

    @Override
-    public EntityPlayer get(IDatatypeContext ctx) throws CommandException {
+    public PlayerEntity get(IDatatypeContext ctx) throws CommandException {
        final String username = ctx.getConsumer().getString();
        return getPlayers(ctx).stream()
-                .filter(s -> s.getName().equalsIgnoreCase(username))
+                .filter(s -> s.getName().getString().equalsIgnoreCase(username))
                .findFirst().orElse(null);
    }

    @Override
    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
        return new TabCompleteHelper()
-                .append(getPlayers(ctx).stream().map(EntityPlayer::getName))
+                .append(getPlayers(ctx).stream().map(PlayerEntity::getName).map(ITextComponent::getString))
                .filterPrefix(ctx.getConsumer().getString())
                .sortAlphabetically()
                .stream();
    }

-    private static List<EntityPlayer> getPlayers(IDatatypeContext ctx) {
-        return ctx.getBaritone().getPlayerContext().world().playerEntities;
+    private static List<? extends PlayerEntity> getPlayers(IDatatypeContext ctx) {
+        return ctx.getBaritone().getPlayerContext().world().getPlayers();
    }
 }
--- a/src/api/java/baritone/api/command/datatypes/RelativeBlockPos.java
+++ b/src/api/java/baritone/api/command/datatypes/RelativeBlockPos.java
@@ -18,8 +18,8 @@
 package baritone.api.command.datatypes;

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

 import java.util.stream.Stream;

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

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

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

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

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

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

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

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

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

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

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

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

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

 package baritone.api.command.helpers;

-import baritone.api.command.argument.IArgConsumer;
+import baritone.api.utils.Helper;
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.exception.CommandInvalidTypeException;
-import baritone.api.utils.Helper;
+import baritone.api.command.argument.IArgConsumer;
 import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TextComponentString;
+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;
@@ -74,40 +75,40 @@ public class Paginator<E> implements Helper {
        }
        boolean hasPrevPage = commandPrefix != null && validPage(page - 1);
        boolean hasNextPage = commandPrefix != null && validPage(page + 1);
-        ITextComponent prevPageComponent = new TextComponentString("<<");
+        TextComponent prevPageComponent = new StringTextComponent("<<");
        if (hasPrevPage) {
-            prevPageComponent.getStyle()
+            prevPageComponent.setStyle(prevPageComponent.getStyle()
                    .setClickEvent(new ClickEvent(
                            ClickEvent.Action.RUN_COMMAND,
                            String.format("%s %d", commandPrefix, page - 1)
                    ))
                    .setHoverEvent(new HoverEvent(
                            HoverEvent.Action.SHOW_TEXT,
-                            new TextComponentString("Click to view previous page")
-                    ));
+                            new StringTextComponent("Click to view previous page")
+                    )));
        } else {
-            prevPageComponent.getStyle().setColor(TextFormatting.DARK_GRAY);
+            prevPageComponent.setStyle(prevPageComponent.getStyle().setFormatting(TextFormatting.DARK_GRAY));
        }
-        ITextComponent nextPageComponent = new TextComponentString(">>");
+        TextComponent nextPageComponent = new StringTextComponent(">>");
        if (hasNextPage) {
-            nextPageComponent.getStyle()
+            nextPageComponent.setStyle(nextPageComponent.getStyle()
                    .setClickEvent(new ClickEvent(
                            ClickEvent.Action.RUN_COMMAND,
                            String.format("%s %d", commandPrefix, page + 1)
                    ))
                    .setHoverEvent(new HoverEvent(
                            HoverEvent.Action.SHOW_TEXT,
-                            new TextComponentString("Click to view next page")
-                    ));
+                            new StringTextComponent("Click to view next page")
+                    )));
        } else {
-            nextPageComponent.getStyle().setColor(TextFormatting.DARK_GRAY);
+            nextPageComponent.setStyle(nextPageComponent.getStyle().setFormatting(TextFormatting.DARK_GRAY));
        }
-        ITextComponent pagerComponent = new TextComponentString("");
-        pagerComponent.getStyle().setColor(TextFormatting.GRAY);
-        pagerComponent.appendSibling(prevPageComponent);
-        pagerComponent.appendText(" | ");
-        pagerComponent.appendSibling(nextPageComponent);
-        pagerComponent.appendText(String.format(" %d/%d", page, getMaxPage()));
+        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()));
        logDirect(pagerComponent);
    }

--- a/src/api/java/baritone/api/command/helpers/TabCompleteHelper.java
+++ b/src/api/java/baritone/api/command/helpers/TabCompleteHelper.java
@@ -19,10 +19,10 @@ package baritone.api.command.helpers;

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

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

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

 /**
 * @author Brady
@@ -31,9 +31,9 @@ public final class PacketEvent {

    private final EventState state;

-    private final Packet<?> packet;
+    private final IPacket<?> packet;

-    public PacketEvent(NetworkManager networkManager, EventState state, Packet<?> packet) {
+    public PacketEvent(NetworkManager networkManager, EventState state, IPacket<?> packet) {
        this.networkManager = networkManager;
        this.state = state;
        this.packet = packet;
@@ -47,12 +47,12 @@ public final class PacketEvent {
        return this.state;
    }

-    public final Packet<?> getPacket() {
+    public final IPacket<?> getPacket() {
        return this.packet;
    }

    @SuppressWarnings("unchecked")
-    public final <T extends Packet<?>> T cast() {
+    public final <T extends IPacket<?>> T cast() {
        return (T) this.packet;
    }
 }
--- a/src/api/java/baritone/api/event/events/RenderEvent.java
+++ b/src/api/java/baritone/api/event/events/RenderEvent.java
@@ -17,6 +17,9 @@

 package baritone.api.event.events;

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

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

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

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

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

        /**
         * Called when the player jumps.
         *
-         * @see EntityLivingBase#jump
+         * @see LivingEntity
         */
        JUMP
    }
--- a/src/api/java/baritone/api/event/events/TabCompleteEvent.java
+++ b/src/api/java/baritone/api/event/events/TabCompleteEvent.java
@@ -18,11 +18,12 @@
 package baritone.api.event.events;

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

 /**
 * @author LoganDark
 */
-public class TabCompleteEvent extends Cancellable {
+public final class TabCompleteEvent extends Cancellable {

    public final String prefix;
    public String[] completions;
--- a/src/api/java/baritone/api/event/events/WorldEvent.java
+++ b/src/api/java/baritone/api/event/events/WorldEvent.java
@@ -18,7 +18,7 @@
 package baritone.api.event.events;

 import baritone.api.event.events.type.EventState;
-import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.world.ClientWorld;

 /**
 * @author Brady
@@ -29,14 +29,14 @@ public final class WorldEvent {
    /**
     * The new world that is being loaded. {@code null} if being unloaded.
     */
-    private final WorldClient world;
+    private final ClientWorld world;

    /**
     * The state of the event
     */
    private final EventState state;

-    public WorldEvent(WorldClient world, EventState state) {
+    public WorldEvent(ClientWorld world, EventState state) {
        this.world = world;
        this.state = state;
    }
@@ -44,7 +44,7 @@ public final class WorldEvent {
    /**
     * @return The new world that is being loaded. {@code null} if being unloaded.
     */
-    public final WorldClient getWorld() {
+    public final ClientWorld getWorld() {
        return this.world;
    }

--- a/src/api/java/baritone/api/event/listener/IGameEventListener.java
+++ b/src/api/java/baritone/api/event/listener/IGameEventListener.java
@@ -18,14 +18,13 @@
 package baritone.api.event.listener;

 import baritone.api.event.events.*;
-import io.netty.util.concurrent.GenericFutureListener;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.client.gui.GuiGameOver;
-import net.minecraft.client.multiplayer.WorldClient;
-import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.client.gui.screen.DeathScreen;
+import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.Entity;
-import net.minecraft.network.Packet;
+import net.minecraft.network.IPacket;
+import net.minecraft.util.math.vector.Vector3d;

 /**
 * @author Brady
@@ -45,7 +44,7 @@ public interface IGameEventListener {
     * Run once per game tick from before and after the player rotation is sent to the server.
     *
     * @param event The event
-     * @see EntityPlayerSP#onUpdate()
+     * @see ClientPlayerEntity#tick()
     */
    void onPlayerUpdate(PlayerUpdateEvent event);

@@ -53,7 +52,7 @@ public interface IGameEventListener {
     * Runs whenever the client player sends a message to the server.
     *
     * @param event The event
-     * @see EntityPlayerSP#sendChatMessage(String)
+     * @see ClientPlayerEntity#sendChatMessage(String)
     */
    void onSendChatMessage(ChatEvent event);

@@ -68,14 +67,11 @@ public interface IGameEventListener {
     * Runs before and after whenever a chunk is either loaded, unloaded, or populated.
     *
     * @param event The event
-     * @see WorldClient#doPreChunk(int, int, boolean)
     */
    void onChunkEvent(ChunkEvent event);

    /**
-     * Runs once per world render pass. Two passes are made when {@link GameSettings#anaglyph} is on.
-     * <p>
-     * <b>Note:</b> {@link GameSettings#anaglyph} has been removed in Minecraft 1.13
+     * Runs once per world render pass.
     *
     * @param event The event
     */
@@ -85,7 +81,7 @@ public interface IGameEventListener {
     * Runs before and after whenever a new world is loaded
     *
     * @param event The event
-     * @see Minecraft#loadWorld(WorldClient, String)
+     * @see Minecraft#loadWorld(ClientWorld)
     */
    void onWorldEvent(WorldEvent event);

@@ -93,8 +89,7 @@ public interface IGameEventListener {
     * Runs before a outbound packet is sent
     *
     * @param event The event
-     * @see Packet
-     * @see GenericFutureListener
+     * @see IPacket
     */
    void onSendPacket(PacketEvent event);

@@ -102,8 +97,7 @@ public interface IGameEventListener {
     * Runs before an inbound packet is processed
     *
     * @param event The event
-     * @see Packet
-     * @see GenericFutureListener
+     * @see IPacket
     */
    void onReceivePacket(PacketEvent event);

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

    /**
-     * Called whenever the sprint keybind state is checked in {@link EntityPlayerSP#onLivingUpdate}
+     * Called whenever the sprint keybind state is checked in {@link ClientPlayerEntity#livingTick}
     *
     * @param event The event
-     * @see EntityPlayerSP#onLivingUpdate()
+     * @see ClientPlayerEntity#livingTick()
     */
    void onPlayerSprintState(SprintStateEvent event);

@@ -132,9 +126,9 @@ public interface IGameEventListener {
    void onBlockInteract(BlockInteractEvent event);

    /**
-     * Called when the local player dies, as indicated by the creation of the {@link GuiGameOver} screen.
+     * Called when the local player dies, as indicated by the creation of the {@link DeathScreen} screen.
     *
-     * @see GuiGameOver
+     * @see DeathScreen
     */
    void onPlayerDeath();

--- 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/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.DoubleOpenHashSet;
-import it.unimi.dsi.fastutil.doubles.DoubleIterator;
 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.DoubleOpenHashSet;
-import it.unimi.dsi.fastutil.doubles.DoubleIterator;
 import net.minecraft.util.math.BlockPos;

 import java.util.Arrays;
@@ -33,7 +31,7 @@ public class GoalRunAway implements Goal {

    private final BlockPos[] from;

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

    private final Integer maintainY;

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

@@ -58,7 +56,7 @@ public class GoalRunAway implements Goal {
        for (BlockPos p : from) {
            int diffX = x - p.getX();
            int diffZ = z - p.getZ();
-            int distSq = diffX * diffX + diffZ * diffZ;
+            double distSq = diffX * diffX + diffZ * diffZ;
            if (distSq < distanceSq) {
                return false;
            }
@@ -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
@@ -18,7 +18,7 @@
 package baritone.api.pathing.goals;

 import baritone.api.utils.SettingsUtil;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;

 /**
@@ -32,7 +32,7 @@ public class GoalStrictDirection implements Goal {
    public final int dx;
    public final int dz;

-    public GoalStrictDirection(BlockPos origin, EnumFacing direction) {
+    public GoalStrictDirection(BlockPos origin, Direction direction) {
        x = origin.getX();
        y = origin.getY();
        z = origin.getZ();
@@ -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.Vec3d;
+import net.minecraft.util.math.vector.Vector3d;

 /**
 * 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(Vec3d origin, float yaw, double distance) {
+    public static GoalXZ fromDirection(Vector3d 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/IBaritoneProcess.java
+++ b/src/api/java/baritone/api/process/IBaritoneProcess.java
@@ -75,7 +75,7 @@ public interface IBaritoneProcess {
     * to start eating this tick. {@code PauseForAutoEatProcess} should only actually right click once onTick is called with
     * {@code isSafeToCancel} true though.
     *
-     * @return Whether or not if this control is temporary
+     * @return Whethor or not if this control is temporary
     */
    boolean isTemporary();

--- a/src/api/java/baritone/api/process/IBuilderProcess.java
+++ b/src/api/java/baritone/api/process/IBuilderProcess.java
@@ -18,10 +18,10 @@
 package baritone.api.process;

 import baritone.api.schematic.ISchematic;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec3i;
+import net.minecraft.util.math.vector.Vector3i;

 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, Vec3i origin);
+    void build(String name, ISchematic schematic, Vector3i origin);

    /**
     * Requests a build for the specified schematic, labeled as specified, with the specified origin.
@@ -49,10 +49,10 @@ 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, Vec3i origin);
+    boolean build(String name, File schematic, Vector3i origin);

    default boolean build(String schematicFile, BlockPos origin) {
-        File file = new File(new File(Minecraft.getMinecraft().gameDir, "schematics"), schematicFile);
+        File file = new File(new File(Minecraft.getInstance().gameDir, "schematics"), schematicFile);
        return build(schematicFile, file, origin);
    }

@@ -71,5 +71,5 @@ public interface IBuilderProcess extends IBaritoneProcess {
     * schematics, for example, to pick a state that the builder process will be happy with, because any variation will
     * cause it to give up. This is updated every tick, but only while the builder process is active.
     */
-    List<IBlockState> getApproxPlaceable();
+    List<BlockState> getApproxPlaceable();
 }
--- a/src/api/java/baritone/api/process/IFarmProcess.java
+++ b/src/api/java/baritone/api/process/IFarmProcess.java
@@ -17,29 +17,7 @@

 package baritone.api.process;

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

-    /**
-     * Begin to search for crops to farm with in specified aria
-     * from specified location.
-     *
-     * @param range The distance from center to farm from
-     * @param pos   The center position to base the range from
-     */
-    void farm(int range, BlockPos pos);
-
-    /**
-     * Begin to search for nearby crops to farm.
-     */
-    default void farm() {farm(0, null);}
-
-    /**
-     * Begin to search for crops to farm with in specified aria
-     * from the position the command was executed.
-     *
-     * @param range The distance to search for crops to farm
-     */
-    default void farm(int range) {farm(range, null);}
+    void farm();
 }
--- a/src/api/java/baritone/api/schematic/CompositeSchematic.java
+++ b/src/api/java/baritone/api/schematic/CompositeSchematic.java
@@ -17,7 +17,7 @@

 package baritone.api.schematic;

-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;

 import java.util.ArrayList;
 import java.util.List;
@@ -47,7 +47,7 @@ public class CompositeSchematic extends AbstractSchematic {
        recalcArr();
    }

-    private CompositeSchematicEntry getSchematic(int x, int y, int z, IBlockState currentState) {
+    private CompositeSchematicEntry getSchematic(int x, int y, int z, BlockState currentState) {
        for (CompositeSchematicEntry entry : schematicArr) {
            if (x >= entry.x && y >= entry.y && z >= entry.z &&
                    entry.schematic.inSchematic(x - entry.x, y - entry.y, z - entry.z, currentState)) {
@@ -58,24 +58,17 @@ public class CompositeSchematic extends AbstractSchematic {
    }

    @Override
-    public boolean inSchematic(int x, int y, int z, IBlockState currentState) {
+    public boolean inSchematic(int x, int y, int z, BlockState currentState) {
        CompositeSchematicEntry entry = getSchematic(x, y, z, currentState);
        return entry != null && entry.schematic.inSchematic(x - entry.x, y - entry.y, z - entry.z, currentState);
    }

    @Override
-    public IBlockState desiredState(int x, int y, int z, IBlockState current, List<IBlockState> approxPlaceable) {
+    public BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable) {
        CompositeSchematicEntry entry = getSchematic(x, y, z, current);
        if (entry == null) {
            throw new IllegalStateException("couldn't find schematic for this position");
        }
        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
@@ -18,7 +18,8 @@
 package baritone.api.schematic;

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

 import java.util.List;

@@ -31,8 +32,8 @@ public class FillSchematic extends AbstractSchematic {
        this.bom = bom;
    }

-    public FillSchematic(int x, int y, int z, IBlockState state) {
-        this(x, y, z, new BlockOptionalMeta(state.getBlock(), state.getBlock().getMetaFromState(state)));
+    public FillSchematic(int x, int y, int z, BlockState state) {
+        this(x, y, z, new BlockOptionalMeta(state.getBlock()));
    }

    public BlockOptionalMeta getBom() {
@@ -40,11 +41,13 @@ public class FillSchematic extends AbstractSchematic {
    }

    @Override
-    public IBlockState desiredState(int x, int y, int z, IBlockState current, List<IBlockState> approxPlaceable) {
+    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 (IBlockState placeable : approxPlaceable) {
+        for (BlockState placeable : approxPlaceable) {
            if (bom.matches(placeable)) {
                return placeable;
            }
--- a/src/api/java/baritone/api/schematic/ISchematic.java
+++ b/src/api/java/baritone/api/schematic/ISchematic.java
@@ -17,8 +17,8 @@

 package baritone.api.schematic;

-import net.minecraft.block.state.IBlockState;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.block.BlockState;
+import net.minecraft.util.Direction;

 import java.util.List;

@@ -44,11 +44,11 @@ public interface ISchematic {
     * @param currentState The current state of that block in the world, or null
     * @return Whether or not the specified position is within the bounds of this schematic
     */
-    default boolean inSchematic(int x, int y, int z, IBlockState currentState) {
+    default boolean inSchematic(int x, int y, int z, BlockState currentState) {
        return x >= 0 && x < widthX() && y >= 0 && y < heightY() && z >= 0 && z < lengthZ();
    }

-    default int size(EnumFacing.Axis axis) {
+    default int size(Direction.Axis axis) {
        switch (axis) {
            case X:
                return widthX();
@@ -71,12 +71,7 @@ public interface ISchematic {
     * @param approxPlaceable The list of blockstates estimated to be placeable
     * @return The desired block state at the specified position
     */
-    IBlockState desiredState(int x, int y, int z, IBlockState current, List<IBlockState> approxPlaceable);
-
-    /**
-     * Resets possible caches to avoid wrong behavior when moving the schematic around
-     */
-    default void reset() {}
+    BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable);

    /**
     * @return The width (X axis length) of this schematic
--- a/src/api/java/baritone/api/schematic/IStaticSchematic.java
+++ b/src/api/java/baritone/api/schematic/IStaticSchematic.java
@@ -17,20 +17,21 @@

 package baritone.api.schematic;

-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;

 /**
 * A static schematic is capable of providing the desired state at a given position without
 * additional context. Schematics of this type are expected to have non-varying contents.
+ * 
+ * @see #getDirect(int, int, int) 
 *
 * @author Brady
- * @see #getDirect(int, int, int)
 * @since 12/24/2019
 */
 public interface IStaticSchematic extends ISchematic {

    /**
-     * Gets the {@link IBlockState} for a given position in this schematic. It should be guaranteed
+     * Gets the {@link BlockState} for a given position in this schematic. It should be guaranteed
     * that the return value of this method will not change given that the parameters are the same.
     *
     * @param x The X block position
@@ -38,19 +39,19 @@ public interface IStaticSchematic extends ISchematic {
     * @param z The Z block position
     * @return The desired state at the specified position.
     */
-    IBlockState getDirect(int x, int y, int z);
+    BlockState getDirect(int x, int y, int z);

    /**
-     * Returns an {@link IBlockState} array of size {@link #heightY()} which contains all
-     * desired block states in the specified vertical column. The index of {@link IBlockState}s
+     * Returns an {@link BlockState} array of size {@link #heightY()} which contains all
+     * desired block states in the specified vertical column. The index of {@link BlockState}s
     * in the array are equivalent to their Y position in the schematic.
     *
     * @param x The X column position
     * @param z The Z column position
-     * @return An {@link IBlockState} array
+     * @return An {@link BlockState} array
     */
-    default IBlockState[] getColumn(int x, int z) {
-        IBlockState[] column = new IBlockState[this.heightY()];
+    default BlockState[] getColumn(int x, int z) {
+        BlockState[] column = new BlockState[this.heightY()];
        for (int i = 0; i < this.heightY(); i++) {
            column[i] = getDirect(x, i, z);
        }
--- a/src/api/java/baritone/api/schematic/MaskSchematic.java
+++ b/src/api/java/baritone/api/schematic/MaskSchematic.java
@@ -17,7 +17,7 @@

 package baritone.api.schematic;

-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;

 import java.util.List;

@@ -30,15 +30,15 @@ public abstract class MaskSchematic extends AbstractSchematic {
        this.schematic = schematic;
    }

-    protected abstract boolean partOfMask(int x, int y, int z, IBlockState currentState);
+    protected abstract boolean partOfMask(int x, int y, int z, BlockState currentState);

    @Override
-    public boolean inSchematic(int x, int y, int z, IBlockState currentState) {
+    public boolean inSchematic(int x, int y, int z, BlockState currentState) {
        return schematic.inSchematic(x, y, z, currentState) && partOfMask(x, y, z, currentState);
    }

    @Override
-    public IBlockState desiredState(int x, int y, int z, IBlockState current, List<IBlockState> approxPlaceable) {
+    public BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable) {
        return schematic.desiredState(x, y, z, current, approxPlaceable);
    }
 }
--- a/src/api/java/baritone/api/schematic/ReplaceSchematic.java
+++ b/src/api/java/baritone/api/schematic/ReplaceSchematic.java
@@ -18,7 +18,7 @@
 package baritone.api.schematic;

 import baritone.api.utils.BlockOptionalMetaLookup;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;

 public class ReplaceSchematic extends MaskSchematic {

@@ -32,19 +32,7 @@ public class ReplaceSchematic extends MaskSchematic {
    }

    @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, IBlockState currentState) {
+    protected boolean partOfMask(int x, int y, int z, BlockState currentState) {
        if (cache[x][y][z] == null) {
            cache[x][y][z] = filter.has(currentState);
        }
--- a/src/api/java/baritone/api/schematic/ShellSchematic.java
+++ b/src/api/java/baritone/api/schematic/ShellSchematic.java
@@ -17,7 +17,7 @@

 package baritone.api.schematic;

-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;

 public class ShellSchematic extends MaskSchematic {

@@ -26,7 +26,7 @@ public class ShellSchematic extends MaskSchematic {
    }

    @Override
-    protected boolean partOfMask(int x, int y, int z, IBlockState currentState) {
+    protected boolean partOfMask(int x, int y, int z, BlockState currentState) {
        return x == 0 || y == 0 || z == 0 || x == widthX() - 1 || y == heightY() - 1 || z == lengthZ() - 1;
    }
 }
--- a/src/api/java/baritone/api/schematic/SubstituteSchematic.java
+++ b/src/api/java/baritone/api/schematic/SubstituteSchematic.java
@@ -1,89 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.schematic;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockAir;
-import net.minecraft.block.properties.IProperty;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.init.Blocks;
-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<IBlockState, Map<Block, IBlockState>> 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, IBlockState currentState) {
-        return schematic.inSchematic(x, y, z, currentState);
-    }
-
-    @Override
-    public IBlockState desiredState(int x, int y, int z, IBlockState current, List<IBlockState> approxPlaceable) {
-        IBlockState 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 BlockAir)) {// 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 BlockAir) {
-                return current.getBlock() instanceof BlockAir ? current : Blocks.AIR.getDefaultState(); // can always "place" air
-            }
-            for (IBlockState placeable : approxPlaceable) {
-                if (substitute.equals(placeable.getBlock())) {
-                    return withBlock(desired, placeable.getBlock());
-                }
-            }
-        }
-        return substitutes.get(0).getDefaultState();
-    }
-
-    private IBlockState withBlock(IBlockState state, Block block) {
-        if (blockStateCache.containsKey(state) && blockStateCache.get(state).containsKey(block)) {
-            return blockStateCache.get(state).get(block);
-        }
-        Collection<IProperty<?>> properties = state.getPropertyKeys();
-        IBlockState newState = block.getDefaultState();
-        for (IProperty<?> 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,IBlockState>()).put(block, newState);
-        return newState;
-    }
-    private <T extends Comparable<T>> IBlockState copySingleProp(IBlockState fromState, IBlockState toState, IProperty<T> prop) {
-        return toState.withProperty(prop, fromState.getValue(prop));
-    }
-}
--- a/src/api/java/baritone/api/schematic/WallsSchematic.java
+++ b/src/api/java/baritone/api/schematic/WallsSchematic.java
@@ -17,7 +17,7 @@

 package baritone.api.schematic;

-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;

 public class WallsSchematic extends MaskSchematic {

@@ -26,7 +26,7 @@ public class WallsSchematic extends MaskSchematic {
    }

    @Override
-    protected boolean partOfMask(int x, int y, int z, IBlockState currentState) {
+    protected boolean partOfMask(int x, int y, int z, BlockState currentState) {
        return x == 0 || z == 0 || x == widthX() - 1 || z == lengthZ() - 1;
    }
 }
--- a/src/api/java/baritone/api/selection/ISelection.java
+++ b/src/api/java/baritone/api/selection/ISelection.java
@@ -18,9 +18,9 @@
 package baritone.api.selection;

 import baritone.api.utils.BetterBlockPos;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.AxisAlignedBB;
-import net.minecraft.util.math.Vec3i;
+import net.minecraft.util.math.vector.Vector3i;

 /**
 * 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.
     */
-    Vec3i size();
+    Vector3i size();

    /**
     * @return An {@link AxisAlignedBB} encompassing all blocks in this selection.
@@ -65,7 +65,7 @@ public interface ISelection {
     * @param blocks    How many blocks to expand it.
     * @return A new selection, expanded as specified.
     */
-    ISelection expand(EnumFacing direction, int blocks);
+    ISelection expand(Direction direction, int blocks);

    /**
     * Returns a new {@link ISelection} contracted in the specified direction by the specified number of blocks.
@@ -77,7 +77,7 @@ public interface ISelection {
     * @param blocks    How many blocks to contract it.
     * @return A new selection, contracted as specified.
     */
-    ISelection contract(EnumFacing direction, int blocks);
+    ISelection contract(Direction direction, int blocks);

    /**
     * Returns a new {@link ISelection} shifted in the specified direction by the specified number of blocks. This moves
@@ -87,5 +87,5 @@ public interface ISelection {
     * @param blocks    How many blocks to shift it.
     * @return A new selection, shifted as specified.
     */
-    ISelection shift(EnumFacing direction, int blocks);
+    ISelection shift(Direction direction, int blocks);
 }
--- a/src/api/java/baritone/api/selection/ISelectionManager.java
+++ b/src/api/java/baritone/api/selection/ISelectionManager.java
@@ -18,7 +18,7 @@
 package baritone.api.selection;

 import baritone.api.utils.BetterBlockPos;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;

 /**
 * The selection manager handles setting Baritone's selections. You can set the selection here, as well as retrieving
@@ -87,7 +87,7 @@ public interface ISelectionManager {
     * @param blocks    How many blocks to expand it.
     * @return The new selection, expanded as specified.
     */
-    ISelection expand(ISelection selection, EnumFacing direction, int blocks);
+    ISelection expand(ISelection selection, Direction direction, int blocks);

    /**
     * Replaces the specified {@link ISelection} with one contracted in the specified direction by the specified number
@@ -101,7 +101,7 @@ public interface ISelectionManager {
     * @param blocks    How many blocks to contract it.
     * @return The new selection, contracted as specified.
     */
-    ISelection contract(ISelection selection, EnumFacing direction, int blocks);
+    ISelection contract(ISelection selection, Direction direction, int blocks);

    /**
     * Replaces the specified {@link ISelection} with one shifted in the specified direction by the specified number of
@@ -112,5 +112,5 @@ public interface ISelectionManager {
     * @param blocks    How many blocks to shift it.
     * @return The new selection, shifted as specified.
     */
-    ISelection shift(ISelection selection, EnumFacing direction, int blocks);
+    ISelection shift(ISelection selection, Direction direction, int blocks);
 }
--- a/src/api/java/baritone/api/utils/BetterBlockPos.java
+++ b/src/api/java/baritone/api/utils/BetterBlockPos.java
@@ -17,11 +17,10 @@

 package baritone.api.utils;

-import it.unimi.dsi.fastutil.HashCommon;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.math.Vec3i;
+import net.minecraft.util.math.vector.Vector3i;

 import javax.annotation.Nonnull;

@@ -80,98 +79,25 @@ public final class BetterBlockPos extends BlockPos {
        return longHash(pos.x, pos.y, pos.z);
    }

-    public static final int NUM_X_BITS = 26;
-    public static final int NUM_Z_BITS = NUM_X_BITS;
-    public static final int NUM_Y_BITS = 9; // note: even though Y goes from 0 to 255, that doesn't mean 8 bits will "just work" because the deserializer assumes signed. i could change it for just Y to assume unsigned and leave X and Z as signed, however, we know that in 1.17 they plan to add negative Y. for that reason, the better approach is to give the extra bits to Y and leave it as signed.
-    // also, if 1.17 sticks with the current plan which is -64 to +320, we could have 9 bits for Y and a constant offset of -64 to change it to -128 to +256.
-    // that would result in the packed long representation of any valid coordinate still being a positive integer
-    // i like that property, so i will keep num_y_bits at 9 and plan for an offset in 1.17
-    // it also gives 1 bit of wiggle room in case anything else happens in the future, so we are only using 63 out of 64 bits at the moment
-    public static final int Z_SHIFT = 0;
-    public static final int Y_SHIFT = Z_SHIFT + NUM_Z_BITS + 1; // 1 padding bit to make twos complement not overflow
-    public static final int X_SHIFT = Y_SHIFT + NUM_Y_BITS + 1; // and also here too
-    public static final long X_MASK = (1L << NUM_X_BITS) - 1L;  // X doesn't need padding as the overflow carry bit is just discarded, like a normal long (-1) + (1) = 0
-    public static final long Y_MASK = (1L << NUM_Y_BITS) - 1L;
-    public static final long Z_MASK = (1L << NUM_Z_BITS) - 1L;
-
-    public static final long POST_ADDITION_MASK = X_MASK << X_SHIFT | Y_MASK << Y_SHIFT | Z_MASK << Z_SHIFT; // required to "manually inline" toLong(-1, -1, -1) here so that javac inserts proper ldc2_w instructions at usage points instead of getstatic
-    // what's this ^ mask for?
-    // it allows for efficient offsetting and manipulation of a long packed coordinate
-    // if we had three ints, x y z, it would be easy to do "y += 1" or "x -= 1"
-    // but how do you do those things if you have a long with x y and z all stuffed into one primitive?
-    // adding together two long coordinates actually works perfectly if both sides have X, Y, and Z as all positive, no issues at all
-    // but when Y or Z is negative, we run into an issue. consider 8 bits: negative one is 11111111 and one is 00000001
-    // adding them together gives 00000000, zero, **but only because there isn't a 9th bit to carry into**
-    // if we had, instead, 00000000 11111111 + 00000000 00000001 we would rightly get 00000001 00000000 with the 1 being carried into the 9th position there
-    // this is exactly what happens. "toLong(0, 1, 0) + toLong(0, -1, 0)" ends up equaling toLong(1, 0, 0) while we'd rather it equal toLong(0, 0, 0)
-    // so, we simply mask out the unwanted result of the carry by inserting 1 bit of padding space (as added above) between each
-    // it used to be 000XXXXXXXXXXXXXXXXXXXXXXXXXXYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZZZZZZ
-    // and now it is 0XXXXXXXXXXXXXXXXXXXXXXXXXX0YYYYYYYYY0ZZZZZZZZZZZZZZZZZZZZZZZZZZ
-    // we simply place the X Y and Z in slightly different sections of the long, putting a bit of space between each
-    // the mask ^ is 0111111111111111111111111110111111111011111111111111111111111111
-    // using that example of (0,1,0) + (0,-1,0), here's what happens
-    //   0000000000000000000000000000000000001000000000000000000000000000 (this is X=0 Y=1 Z=0)
-    // + 0000000000000000000000000000111111111000000000000000000000000000 (this is X=0 Y=-1 Z=0)
-    // = 0000000000000000000000000001000000000000000000000000000000000000
-    // the unwanted carry bit here  ^ is no longer corrupting the least significant bit of X and making it 1!
-    // now it's just turning on the unused padding bit that we don't care about
-    // using the mask and bitwise and, we can easily and branchlessly turn off the padding bits just in case something overflow carried into them!
-    //   0000000000000000000000000001000000000000000000000000000000000000 (the result of the addition from earlier)
-    // & 0111111111111111111111111110111111111011111111111111111111111111 (this is POST_ADDITION_MASK)
-    // = 0000000000000000000000000000000000000000000000000000000000000000
-    // POST_ADDITION_MASK retains the bits that actually form X, Y, and Z, but intentionally turns off the padding bits
-    // so, we can simply do "(toLong(0, 1, 0) + toLong(0, -1, 0)) & POST_ADDITION_MASK" and correctly get toLong(0, 0, 0)
-    // which is incredibly fast and efficient, an add then a bitwise AND against a constant
-    // and it doesn't require us to pull out X, Y, and Z, modify one of them, and put them all back into the long
-    // that's what the point of the mask is
-
-    static {
-        if (POST_ADDITION_MASK != toLong(-1, -1, -1)) {
-            throw new IllegalStateException(POST_ADDITION_MASK + " " + toLong(-1, -1, -1)); // sanity check
-        }
-    }
-
-    public long toLong() {
-        return toLong(this.x, this.y, this.z);
-    }
-
-    public static BetterBlockPos fromLong(long serialized) {
-        return new BetterBlockPos(XfromLong(serialized), YfromLong(serialized), ZfromLong(serialized));
-    }
-
-    public static int XfromLong(long serialized) {
-        return (int) (serialized << (64 - X_SHIFT - NUM_X_BITS) >> (64 - NUM_X_BITS));
-    }
-
-    public static int YfromLong(long serialized) {
-        return (int) (serialized << (64 - Y_SHIFT - NUM_Y_BITS) >> (64 - NUM_Y_BITS));
-    }
-
-    public static int ZfromLong(long serialized) {
-        return (int) (serialized << (64 - Z_SHIFT - NUM_Z_BITS) >> (64 - NUM_Z_BITS));
-    }
-
-    public static long toLong(final int x, final int y, final int z) {
-        return ((long) x & X_MASK) << X_SHIFT | ((long) y & Y_MASK) << Y_SHIFT | ((long) z & Z_MASK) << Z_SHIFT;
-    }
-
-    public static long offsetBy(long pos, int x, int y, int z) {
-        return (pos + toLong(x, y, z)) & BetterBlockPos.POST_ADDITION_MASK;
-    }
-
-    public static final long HASHCODE_MURMUR_MASK = murmur64(-1);
-    public static final long ZOBRIST_MURMUR_MASK = murmur64(-2);
-
    public static long longHash(int x, int y, int z) {
-        return longHash(toLong(x, y, z));
-    }
-
-    public static long longHash(long packed) {
-        return murmur64(HASHCODE_MURMUR_MASK ^ packed);
-    }
-
-    public static long murmur64(long h) {
-        return HashCommon.murmurHash3(h);
+        // TODO use the same thing as BlockPos.fromLong();
+        // invertibility would be incredibly useful
+        /*
+         *   This is the hashcode implementation of Vec3i (the superclass of the class which I shall not name)
+         *
+         *   public int hashCode() {
+         *       return (this.getY() + this.getZ() * 31) * 31 + this.getX();
+         *   }
+         *
+         *   That is terrible and has tons of collisions and makes the HashMap terribly inefficient.
+         *
+         *   That's why we grab out the X, Y, Z and calculate our own hashcode
+         */
+        long hash = 3241;
+        hash = 3457689L * hash + x;
+        hash = 8734625L * hash + y;
+        hash = 2873465L * hash + z;
+        return hash;
    }

    @Override
@@ -194,10 +120,10 @@ public final class BetterBlockPos extends BlockPos {
        // this is unimaginably faster than blockpos.up
        // that literally calls
        // this.up(1)
-        // which calls this.offset(EnumFacing.UP, 1)
+        // which calls this.offset(Direction.UP, 1)
        // which does return n == 0 ? this : new BlockPos(this.getX() + facing.getXOffset() * n, this.getY() + facing.getYOffset() * n, this.getZ() + facing.getZOffset() * n);

-        // how many function calls is that? up(), up(int), offset(EnumFacing, int), new BlockPos, getX, getXOffset, getY, getYOffset, getZ, getZOffset
+        // how many function calls is that? up(), up(int), offset(Direction, int), new BlockPos, getX, getXOffset, getY, getYOffset, getZ, getZOffset
        // that's ten.
        // this is one function call.
        return new BetterBlockPos(x, y + 1, z);
@@ -222,17 +148,17 @@ public final class BetterBlockPos extends BlockPos {
    }

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

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

@@ -280,10 +206,10 @@ public final class BetterBlockPos extends BlockPos {
    @Nonnull
    public String toString() {
        return String.format(
-                "BetterBlockPos{x=%d,y=%d,z=%d}",
-                x,
-                y,
-                z
+                "BetterBlockPos{x=%s,y=%s,z=%s}",
+                SettingsUtil.maybeCensor(x),
+                SettingsUtil.maybeCensor(y),
+                SettingsUtil.maybeCensor(z)
        );
    }
 }
--- a/src/api/java/baritone/api/utils/BlockOptionalMeta.java
+++ b/src/api/java/baritone/api/utils/BlockOptionalMeta.java
@@ -19,44 +19,41 @@ package baritone.api.utils;

 import baritone.api.utils.accessor.IItemStack;
 import com.google.common.collect.ImmutableSet;
-import net.minecraft.block.*;
-import net.minecraft.block.properties.IProperty;
-import net.minecraft.block.state.IBlockState;
+import io.netty.util.concurrent.ThreadPerTaskExecutor;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
+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 javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.util.*;
-import java.util.function.Consumer;
+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 {

    private final Block block;
-    private final int meta;
-    private final boolean noMeta;
-    private final Set<IBlockState> blockstates;
+    private final Set<BlockState> blockstates;
    private final ImmutableSet<Integer> stateHashes;
    private final ImmutableSet<Integer> stackHashes;
    private static final Pattern pattern = Pattern.compile("^(.+?)(?::(\\d+))?$");
-    private static final Map<Object, Object> normalizations;
-
-    public BlockOptionalMeta(@Nonnull Block block, @Nullable Integer meta) {
-        this.block = block;
-        this.noMeta = meta == null;
-        this.meta = noMeta ? 0 : meta;
-        this.blockstates = getStates(block, meta);
-        this.stateHashes = getStateHashes(blockstates);
-        this.stackHashes = getStackHashes(blockstates);
-    }
+    private static LootTableManager manager;
+    private static LootPredicateManager predicate = new LootPredicateManager();
+    private static Map<Block, List<Item>> drops = new HashMap<>();

    public BlockOptionalMeta(@Nonnull Block block) {
-        this(block, null);
+        this.block = block;
+        this.blockstates = getStates(block);
+        this.stateHashes = getStateHashes(blockstates);
+        this.stackHashes = getStackHashes(blockstates);
    }

    public BlockOptionalMeta(@Nonnull String selector) {
@@ -67,204 +64,33 @@ public final class BlockOptionalMeta {
        }

        MatchResult matchResult = matcher.toMatchResult();
-        noMeta = matchResult.group(2) == null;

-        ResourceLocation id = new ResourceLocation(matchResult.group(1));
-
-        if (!Block.REGISTRY.containsKey(id)) {
-            throw new IllegalArgumentException("Invalid block ID");
-        }
-
-        block = Block.REGISTRY.getObject(id);
-        meta = noMeta ? 0 : Integer.parseInt(matchResult.group(2));
-        blockstates = getStates(block, getMeta());
+        block = BlockUtils.stringToBlockRequired(matchResult.group(1));
+        blockstates = getStates(block);
        stateHashes = getStateHashes(blockstates);
        stackHashes = getStackHashes(blockstates);
    }

-    static {
-        Map<Object, Object> _normalizations = new HashMap<>();
-        Consumer<Enum> put = instance -> _normalizations.put(instance.getClass(), instance);
-        put.accept(EnumFacing.NORTH);
-        put.accept(EnumFacing.Axis.Y);
-        put.accept(BlockLog.EnumAxis.Y);
-        put.accept(BlockStairs.EnumHalf.BOTTOM);
-        put.accept(BlockStairs.EnumShape.STRAIGHT);
-        put.accept(BlockLever.EnumOrientation.DOWN_X);
-        put.accept(BlockDoublePlant.EnumBlockHalf.LOWER);
-        put.accept(BlockSlab.EnumBlockHalf.BOTTOM);
-        put.accept(BlockDoor.EnumDoorHalf.LOWER);
-        put.accept(BlockDoor.EnumHingePosition.LEFT);
-        put.accept(BlockBed.EnumPartType.HEAD);
-        put.accept(BlockRailBase.EnumRailDirection.NORTH_SOUTH);
-        put.accept(BlockTrapDoor.DoorHalf.BOTTOM);
-        _normalizations.put(BlockBanner.ROTATION, 0);
-        _normalizations.put(BlockBed.OCCUPIED, false);
-        _normalizations.put(BlockBrewingStand.HAS_BOTTLE[0], false);
-        _normalizations.put(BlockBrewingStand.HAS_BOTTLE[1], false);
-        _normalizations.put(BlockBrewingStand.HAS_BOTTLE[2], false);
-        _normalizations.put(BlockButton.POWERED, false);
-        // _normalizations.put(BlockCactus.AGE, 0);
-        // _normalizations.put(BlockCauldron.LEVEL, 0);
-        // _normalizations.put(BlockChorusFlower.AGE, 0);
-        _normalizations.put(BlockChorusPlant.NORTH, false);
-        _normalizations.put(BlockChorusPlant.EAST, false);
-        _normalizations.put(BlockChorusPlant.SOUTH, false);
-        _normalizations.put(BlockChorusPlant.WEST, false);
-        _normalizations.put(BlockChorusPlant.UP, false);
-        _normalizations.put(BlockChorusPlant.DOWN, false);
-        // _normalizations.put(BlockCocoa.AGE, 0);
-        // _normalizations.put(BlockCrops.AGE, 0);
-        _normalizations.put(BlockDirt.SNOWY, false);
-        _normalizations.put(BlockDoor.OPEN, false);
-        _normalizations.put(BlockDoor.POWERED, false);
-        // _normalizations.put(BlockFarmland.MOISTURE, 0);
-        _normalizations.put(BlockFence.NORTH, false);
-        _normalizations.put(BlockFence.EAST, false);
-        _normalizations.put(BlockFence.WEST, false);
-        _normalizations.put(BlockFence.SOUTH, false);
-        // _normalizations.put(BlockFenceGate.POWERED, false);
-        // _normalizations.put(BlockFenceGate.IN_WALL, false);
-        _normalizations.put(BlockFire.AGE, 0);
-        _normalizations.put(BlockFire.NORTH, false);
-        _normalizations.put(BlockFire.EAST, false);
-        _normalizations.put(BlockFire.SOUTH, false);
-        _normalizations.put(BlockFire.WEST, false);
-        _normalizations.put(BlockFire.UPPER, false);
-        // _normalizations.put(BlockFrostedIce.AGE, 0);
-        _normalizations.put(BlockGrass.SNOWY, false);
-        // _normalizations.put(BlockHopper.ENABLED, true);
-        // _normalizations.put(BlockLever.POWERED, false);
-        // _normalizations.put(BlockLiquid.LEVEL, 0);
-        // _normalizations.put(BlockMycelium.SNOWY, false);
-        // _normalizations.put(BlockNetherWart.AGE, false);
-        _normalizations.put(BlockLeaves.CHECK_DECAY, false);
-        // _normalizations.put(BlockLeaves.DECAYABLE, false);
-        // _normalizations.put(BlockObserver.POWERED, false);
-        _normalizations.put(BlockPane.NORTH, false);
-        _normalizations.put(BlockPane.EAST, false);
-        _normalizations.put(BlockPane.WEST, false);
-        _normalizations.put(BlockPane.SOUTH, false);
-        // _normalizations.put(BlockPistonBase.EXTENDED, false);
-        // _normalizations.put(BlockPressurePlate.POWERED, false);
-        // _normalizations.put(BlockPressurePlateWeighted.POWER, false);
-        _normalizations.put(BlockQuartz.EnumType.LINES_X, BlockQuartz.EnumType.LINES_Y);
-        _normalizations.put(BlockQuartz.EnumType.LINES_Z, BlockQuartz.EnumType.LINES_Y);
-        // _normalizations.put(BlockRailDetector.POWERED, false);
-        // _normalizations.put(BlockRailPowered.POWERED, false);
-        _normalizations.put(BlockRedstoneWire.NORTH, false);
-        _normalizations.put(BlockRedstoneWire.EAST, false);
-        _normalizations.put(BlockRedstoneWire.SOUTH, false);
-        _normalizations.put(BlockRedstoneWire.WEST, false);
-        // _normalizations.put(BlockReed.AGE, false);
-        _normalizations.put(BlockSapling.STAGE, 0);
-        _normalizations.put(BlockSkull.NODROP, false);
-        _normalizations.put(BlockStandingSign.ROTATION, 0);
-        _normalizations.put(BlockStem.AGE, 0);
-        _normalizations.put(BlockTripWire.NORTH, false);
-        _normalizations.put(BlockTripWire.EAST, false);
-        _normalizations.put(BlockTripWire.WEST, false);
-        _normalizations.put(BlockTripWire.SOUTH, false);
-        _normalizations.put(BlockVine.NORTH, false);
-        _normalizations.put(BlockVine.EAST, false);
-        _normalizations.put(BlockVine.SOUTH, false);
-        _normalizations.put(BlockVine.WEST, false);
-        _normalizations.put(BlockVine.UP, false);
-        _normalizations.put(BlockWall.UP, false);
-        _normalizations.put(BlockWall.NORTH, false);
-        _normalizations.put(BlockWall.EAST, false);
-        _normalizations.put(BlockWall.WEST, false);
-        _normalizations.put(BlockWall.SOUTH, false);
-        normalizations = Collections.unmodifiableMap(_normalizations);
+    private static Set<BlockState> getStates(@Nonnull Block block) {
+        return new HashSet<>(block.getStateContainer().getValidStates());
    }

-    public static <C extends Comparable<C>, P extends IProperty<C>> P castToIProperty(Object value) {
-        //noinspection unchecked
-        return (P) value;
-    }
-
-    public static <C extends Comparable<C>, P extends IProperty<C>> C castToIPropertyValue(P iproperty, Object value) {
-        //noinspection unchecked
-        return (C) value;
-    }
-
-    /**
-     * Normalizes the specified blockstate by setting meta-affecting properties which
-     * are not being targeted by the meta parameter to their default values.
-     * <p>
-     * For example, block variant/color is the primary target for the meta value, so properties
-     * such as rotation/facing direction will be set to default values in order to nullify
-     * the effect that they have on the state's meta value.
-     *
-     * @param state The state to normalize
-     * @return The normalized block state
-     */
-    public static IBlockState normalize(IBlockState state) {
-        IBlockState newState = state;
-
-        for (IProperty<?> property : state.getProperties().keySet()) {
-            Class<?> valueClass = property.getValueClass();
-            if (normalizations.containsKey(property)) {
-                try {
-                    newState = newState.withProperty(
-                            castToIProperty(property),
-                            castToIPropertyValue(property, normalizations.get(property))
-                    );
-                } catch (IllegalArgumentException ignored) {}
-            } else if (normalizations.containsKey(state.getValue(property))) {
-                try {
-                    newState = newState.withProperty(
-                            castToIProperty(property),
-                            castToIPropertyValue(property, normalizations.get(state.getValue(property)))
-                    );
-                } catch (IllegalArgumentException ignored) {}
-            } else if (normalizations.containsKey(valueClass)) {
-                try {
-                    newState = newState.withProperty(
-                            castToIProperty(property),
-                            castToIPropertyValue(property, normalizations.get(valueClass))
-                    );
-                } catch (IllegalArgumentException ignored) {}
-            }
-        }
-
-        return newState;
-    }
-
-    /**
-     * Evaluate the target meta value for the specified state. The target meta value is
-     * most often that which is influenced by the variant/color property of the block state.
-     *
-     * @param state The state to check
-     * @return The target meta of the state
-     * @see #normalize(IBlockState)
-     */
-    public static int stateMeta(IBlockState state) {
-        return state.getBlock().getMetaFromState(normalize(state));
-    }
-
-    private static Set<IBlockState> getStates(@Nonnull Block block, @Nullable Integer meta) {
-        return block.getBlockState().getValidStates().stream()
-                .filter(blockstate -> meta == null || stateMeta(blockstate) == meta)
-                .collect(Collectors.toSet());
-    }
-
-    private static ImmutableSet<Integer> getStateHashes(Set<IBlockState> blockstates) {
+    private static ImmutableSet<Integer> getStateHashes(Set<BlockState> blockstates) {
        return ImmutableSet.copyOf(
                blockstates.stream()
-                        .map(IBlockState::hashCode)
+                        .map(BlockState::hashCode)
                        .toArray(Integer[]::new)
        );
    }

-    private static ImmutableSet<Integer> getStackHashes(Set<IBlockState> blockstates) {
+    private static ImmutableSet<Integer> getStackHashes(Set<BlockState> blockstates) {
        //noinspection ConstantConditions
        return ImmutableSet.copyOf(
                blockstates.stream()
-                        .map(state -> new ItemStack(
-                                state.getBlock().getItemDropped(state, new Random(), 0),
-                                state.getBlock().damageDropped(state)
-                        ))
+                        .flatMap(state -> drops(state.getBlock())
+                                .stream()
+                                .map(item -> new ItemStack(item, 1))
+                        )
                        .map(stack -> ((IItemStack) (Object) stack).getBaritoneHash())
                        .toArray(Integer[]::new)
        );
@@ -274,15 +100,11 @@ public final class BlockOptionalMeta {
        return block;
    }

-    public Integer getMeta() {
-        return noMeta ? null : meta;
-    }
-
    public boolean matches(@Nonnull Block block) {
        return block == this.block;
    }

-    public boolean matches(@Nonnull IBlockState blockstate) {
+    public boolean matches(@Nonnull BlockState blockstate) {
        Block block = blockstate.getBlock();
        return block == this.block && stateHashes.contains(blockstate.hashCode());
    }
@@ -291,28 +113,66 @@ public final class BlockOptionalMeta {
        //noinspection ConstantConditions
        int hash = ((IItemStack) (Object) stack).getBaritoneHash();

-        if (noMeta) {
-            hash -= stack.getItemDamage();
-        }
+        hash -= stack.getDamage();

        return stackHashes.contains(hash);
    }

    @Override
    public String toString() {
-        return String.format("BlockOptionalMeta{block=%s,meta=%s}", block, getMeta());
+        return String.format("BlockOptionalMeta{block=%s}", block);
    }

-    public static IBlockState blockStateFromStack(ItemStack stack) {
-        //noinspection deprecation
-        return Block.getBlockFromItem(stack.getItem()).getStateFromMeta(stack.getMetadata());
-    }
-
-    public IBlockState getAnyBlockState() {
+    public BlockState getAnyBlockState() {
        if (blockstates.size() > 0) {
            return blockstates.iterator().next();
        }

        return null;
    }
+
+    public static LootTableManager getManager() {
+        if (manager == null) {
+            ResourcePackList rpl = new ResourcePackList(ResourcePackInfo::new, new ServerPackFinder());
+            rpl.reloadPacksFromFinders();
+            IResourcePack thePack = rpl.getAllPacks().iterator().next().getResourcePack();
+            IReloadableResourceManager resourceManager = new SimpleReloadableResourceManager(ResourcePackType.SERVER_DATA);
+            manager = new LootTableManager(predicate);
+            resourceManager.addReloadListener(manager);
+            try {
+                resourceManager.reloadResourcesAndThen(new ThreadPerTaskExecutor(Thread::new), new ThreadPerTaskExecutor(Thread::new), Collections.singletonList(thePack), CompletableFuture.completedFuture(Unit.INSTANCE)).get();
+            } catch (Exception exception) {
+                throw new RuntimeException(exception);
+            }
+        }
+        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;
+            }
+        });
+    }
 }
--- a/src/api/java/baritone/api/utils/BlockOptionalMetaLookup.java
+++ b/src/api/java/baritone/api/utils/BlockOptionalMetaLookup.java
@@ -18,7 +18,7 @@
 package baritone.api.utils;

 import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 import net.minecraft.item.ItemStack;

 import java.util.Arrays;
@@ -61,7 +61,7 @@ public class BlockOptionalMetaLookup {
        return false;
    }

-    public boolean has(IBlockState state) {
+    public boolean has(BlockState state) {
        for (BlockOptionalMeta bom : boms) {
            if (bom.matches(state)) {
                return true;
--- a/src/api/java/baritone/api/utils/BlockUtils.java
+++ b/src/api/java/baritone/api/utils/BlockUtils.java
@@ -19,6 +19,7 @@ package baritone.api.utils;

 import net.minecraft.block.Block;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.registry.Registry;

 import java.util.HashMap;
 import java.util.Map;
@@ -28,7 +29,7 @@ public class BlockUtils {
    private static transient Map<String, Block> resourceCache = new HashMap<>();

    public static String blockToString(Block block) {
-        ResourceLocation loc = Block.REGISTRY.getNameForObject(block);
+        ResourceLocation loc = Registry.BLOCK.getKey(block);
        String name = loc.getPath(); // normally, only write the part after the minecraft:
        if (!loc.getNamespace().equals("minecraft")) {
            // Baritone is running on top of forge with mods installed, perhaps?
@@ -56,7 +57,7 @@ public class BlockUtils {
        if (resourceCache.containsKey(name)) {
            return null; // cached as null
        }
-        block = Block.getBlockFromName(name.contains(":") ? name : "minecraft:" + name);
+        block = Registry.BLOCK.getOptional(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
@@ -20,7 +20,8 @@ package baritone.api.utils;
 import baritone.api.BaritoneAPI;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TextComponentString;
+import net.minecraft.util.text.StringTextComponent;
+import net.minecraft.util.text.TextComponent;
 import net.minecraft.util.text.TextFormatting;

 import java.util.Arrays;
@@ -44,96 +45,25 @@ public interface Helper {
    /**
     * Instance of the game
     */
-    Minecraft mc = Minecraft.getMinecraft();
+    Minecraft mc = Minecraft.getInstance();

    static ITextComponent getPrefix() {
        // Inner text component
        final Calendar now = Calendar.getInstance();
        final boolean xd = now.get(Calendar.MONTH) == Calendar.APRIL && now.get(Calendar.DAY_OF_MONTH) <= 3;
-        ITextComponent baritone = new TextComponentString(xd ? "Baritoe" : BaritoneAPI.getSettings().shortBaritonePrefix.value ? "B" : "Baritone");
-        baritone.getStyle().setColor(TextFormatting.LIGHT_PURPLE);
+        TextComponent baritone = new StringTextComponent(xd ? "Baritoe" : BaritoneAPI.getSettings().shortBaritonePrefix.value ? "B" : "Baritone");
+        baritone.setStyle(baritone.getStyle().setFormatting(TextFormatting.LIGHT_PURPLE));

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

        return prefix;
    }

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

    /**
@@ -178,23 +84,11 @@ public interface Helper {
     * @param components The components to send
     */
    default void logDirect(ITextComponent... components) {
-        logDirect(BaritoneAPI.getSettings().logAsToast.value, components);
-    }
-
-    /**
-     * Send a message to chat regardless of chatDebug (should only be used for critically important messages, or as a
-     * direct response to a chat command)
-     *
-     * @param message    The message to display in chat
-     * @param color      The color to print that message in
-     * @param logAsToast Whether to log as a toast notification
-     */
-    default void logDirect(String message, TextFormatting color, boolean logAsToast) {
-        Stream.of(message.split("\n")).forEach(line -> {
-            ITextComponent component = new TextComponentString(line.replace("\t", "    "));
-            component.getStyle().setColor(color);
-            logDirect(logAsToast, component);
-        });
+        TextComponent component = new StringTextComponent("");
+        component.append(getPrefix());
+        component.append(new StringTextComponent(" "));
+        Arrays.asList(components).forEach(component::append);
+        mc.execute(() -> BaritoneAPI.getSettings().logger.value.accept(component));
    }

    /**
@@ -205,18 +99,11 @@ public interface Helper {
     * @param color   The color to print that message in
     */
    default void logDirect(String message, TextFormatting color) {
-        logDirect(message, color, BaritoneAPI.getSettings().logAsToast.value);
-    }
-
-    /**
-     * Send a message to chat regardless of chatDebug (should only be used for critically important messages, or as a
-     * direct response to a chat command)
-     *
-     * @param message    The message to display in chat
-     * @param logAsToast Whether to log as a toast notification
-     */
-    default void logDirect(String message, boolean logAsToast) {
-        logDirect(message, TextFormatting.GRAY, logAsToast);
+        Stream.of(message.split("\n")).forEach(line -> {
+            TextComponent component = new StringTextComponent(line.replace("\t", "    "));
+            component.setStyle(component.getStyle().setFormatting(color));
+            logDirect(component);
+        });
    }

    /**
@@ -226,6 +113,6 @@ public interface Helper {
     * @param message The message to display in chat
     */
    default void logDirect(String message) {
-        logDirect(message, BaritoneAPI.getSettings().logAsToast.value);
+        logDirect(message, TextFormatting.GRAY);
    }
 }
--- a/src/api/java/baritone/api/utils/IPlayerContext.java
+++ b/src/api/java/baritone/api/utils/IPlayerContext.java
@@ -18,14 +18,17 @@
 package baritone.api.utils;

 import baritone.api.cache.IWorldData;
-import net.minecraft.block.BlockSlab;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.math.Vec3d;
+import net.minecraft.block.SlabBlock;
+import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.math.*;
+import net.minecraft.util.math.vector.Vector3d;
 import net.minecraft.world.World;

 import java.util.Optional;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;

 /**
 * @author Brady
@@ -33,19 +36,28 @@ import java.util.Optional;
 */
 public interface IPlayerContext {

-    EntityPlayerSP player();
+    ClientPlayerEntity player();

    IPlayerController playerController();

    World world();

+    default Iterable<Entity> entities() {
+        return ((ClientWorld) world()).getAllEntities();
+    }
+
+    default Stream<Entity> entitiesStream() {
+        return StreamSupport.stream(entities().spliterator(), false);
+    }
+
+
    IWorldData worldData();

    RayTraceResult objectMouseOver();

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

        // sometimes when calling this from another thread or while world is null, it'll throw a NullPointerException
        // that causes the game to immediately crash
@@ -56,7 +68,7 @@ public interface IPlayerContext {
        // this does not impact performance at all since we're not null checking constantly
        // if there is an exception, the only overhead is Java generating the exception object... so we can ignore it
        try {
-            if (world().getBlockState(feet).getBlock() instanceof BlockSlab) {
+            if (world().getBlockState(feet).getBlock() instanceof SlabBlock) {
                return feet.up();
            }
        } catch (NullPointerException ignored) {}
@@ -64,12 +76,12 @@ public interface IPlayerContext {
        return feet;
    }

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

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

    default Rotation playerRotations() {
@@ -77,7 +89,7 @@ public interface IPlayerContext {
    }

    static double eyeHeight(boolean ifSneaking) {
-        return ifSneaking ? 1.54 : 1.62;
+        return ifSneaking ? 1.27 : 1.62;
    }

    /**
@@ -87,8 +99,8 @@ public interface IPlayerContext {
     */
    default Optional<BlockPos> getSelectedBlock() {
        RayTraceResult result = objectMouseOver();
-        if (result != null && result.typeOfHit == RayTraceResult.Type.BLOCK) {
-            return Optional.of(result.getBlockPos());
+        if (result != null && result.getType() == RayTraceResult.Type.BLOCK) {
+            return Optional.of(((BlockRayTraceResult) result).getPos());
        }
        return Optional.empty();
    }
@@ -96,4 +108,17 @@ public interface IPlayerContext {
    default boolean isLookingAt(BlockPos pos) {
        return getSelectedBlock().equals(Optional.of(pos));
    }
+
+    /**
+     * Returns the entity that the crosshair is currently placed over. Updated once per tick.
+     *
+     * @return The entity
+     */
+    default Optional<Entity> getSelectedEntity() {
+        RayTraceResult result = objectMouseOver();
+        if (result != null && result.getType() == RayTraceResult.Type.ENTITY) {
+            return Optional.of(((EntityRayTraceResult) result).getEntity());
+        }
+        return Optional.empty();
+    }
 }
--- a/src/api/java/baritone/api/utils/IPlayerController.java
+++ b/src/api/java/baritone/api/utils/IPlayerController.java
@@ -17,16 +17,16 @@

 package baritone.api.utils;

+import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.inventory.container.ClickType;
 import baritone.api.BaritoneAPI;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.ClickType;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.ActionResultType;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.math.BlockRayTraceResult;
 import net.minecraft.world.GameType;
 import net.minecraft.world.World;

@@ -40,19 +40,19 @@ public interface IPlayerController {

    boolean hasBrokenBlock();

-    boolean onPlayerDamageBlock(BlockPos pos, EnumFacing side);
+    boolean onPlayerDamageBlock(BlockPos pos, Direction side);

    void resetBlockRemoving();

-    ItemStack windowClick(int windowId, int slotId, int mouseButton, ClickType type, EntityPlayer player);
+    ItemStack windowClick(int windowId, int slotId, int mouseButton, ClickType type, PlayerEntity player);

    GameType getGameType();

-    EnumActionResult processRightClickBlock(EntityPlayerSP player, World world, BlockPos pos, EnumFacing direction, Vec3d vec, EnumHand hand);
+    ActionResultType processRightClickBlock(ClientPlayerEntity player, World world, Hand hand, BlockRayTraceResult result);

-    EnumActionResult processRightClick(EntityPlayerSP player, World world, EnumHand hand);
+    ActionResultType processRightClick(ClientPlayerEntity player, World world, Hand hand);

-    boolean clickBlock(BlockPos loc, EnumFacing face);
+    boolean clickBlock(BlockPos loc, Direction face);

    void setHittingBlock(boolean hittingBlock);

--- a/src/api/java/baritone/api/utils/RayTraceUtils.java
+++ b/src/api/java/baritone/api/utils/RayTraceUtils.java
@@ -18,8 +18,9 @@
 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.Vec3d;
+import net.minecraft.util.math.vector.Vector3d;

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

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

-    public static Vec3d inferSneakingEyePosition(Entity entity) {
-        return new Vec3d(entity.posX, entity.posY + IPlayerContext.eyeHeight(true), entity.posZ);
+    public static Vector3d inferSneakingEyePosition(Entity entity) {
+        return new Vector3d(entity.getPosX(), entity.getPosY() + IPlayerContext.eyeHeight(true), entity.getPosZ());
    }
 }
--- a/src/api/java/baritone/api/utils/Rotation.java
+++ b/src/api/java/baritone/api/utils/Rotation.java
@@ -36,6 +36,9 @@ public class Rotation {
    public Rotation(float yaw, float pitch) {
        this.yaw = yaw;
        this.pitch = pitch;
+        if (Float.isInfinite(yaw) || Float.isNaN(yaw) || Float.isInfinite(pitch) || Float.isNaN(pitch)) {
+            throw new IllegalStateException(yaw + " " + pitch);
+        }
    }

    /**
--- a/src/api/java/baritone/api/utils/RotationUtils.java
+++ b/src/api/java/baritone/api/utils/RotationUtils.java
@@ -19,11 +19,15 @@ package baritone.api.utils;

 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
-import net.minecraft.block.BlockFire;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.entity.EntityPlayerSP;
+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.*;
+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;

@@ -46,13 +50,13 @@ public final class RotationUtils {
    /**
     * Offsets from the root block position to the center of each side.
     */
-    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 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 RotationUtils() {}
@@ -65,7 +69,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 Vec3d(orig), new Vec3d(dest));
+        return calcRotationFromVec3d(new Vector3d(orig.getX(), orig.getY(), orig.getZ()), new Vector3d(dest.getX(), dest.getY(), dest.getZ()));
    }

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

@@ -105,7 +109,7 @@ public final class RotationUtils {
     * @param dest The destination position
     * @return The rotation from the origin to the destination
     */
-    private static Rotation calcRotationFromVec3d(Vec3d orig, Vec3d dest) {
+    private static Rotation calcRotationFromVec3d(Vector3d orig, Vector3d 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]);
@@ -122,19 +126,19 @@ public final class RotationUtils {
     * @param rotation The input rotation
     * @return Look vector for the rotation
     */
-    public static Vec3d calcVec3dFromRotation(Rotation rotation) {
+    public static Vector3d calcVector3dFromRotation(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 Vec3d((double) (f1 * f2), (double) f3, (double) (f * f2));
+        return new Vector3d((double) (f1 * f2), (double) f3, (double) (f * f2));
    }

    /**
     * @param ctx Context for the viewing entity
     * @param pos The target block position
     * @return The optional rotation
-     * @see #reachable(EntityPlayerSP, BlockPos, double)
+     * @see #reachable(ClientPlayerEntity, BlockPos, double)
     */
    public static Optional<Rotation> reachable(IPlayerContext ctx, BlockPos pos) {
        return reachable(ctx.player(), pos, ctx.playerController().getBlockReachDistance());
@@ -156,11 +160,11 @@ public final class RotationUtils {
     * @param blockReachDistance The block reach distance of the entity
     * @return The optional rotation
     */
-    public static Optional<Rotation> reachable(EntityPlayerSP entity, BlockPos pos, double blockReachDistance) {
+    public static Optional<Rotation> reachable(ClientPlayerEntity entity, BlockPos pos, double blockReachDistance) {
        return reachable(entity, pos, blockReachDistance, false);
    }

-    public static Optional<Rotation> reachable(EntityPlayerSP entity, BlockPos pos, double blockReachDistance, boolean wouldSneak) {
+    public static Optional<Rotation> reachable(ClientPlayerEntity entity, BlockPos pos, double blockReachDistance, boolean wouldSneak) {
        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer(entity);
        if (baritone.getPlayerContext().isLookingAt(pos)) {
            /*
@@ -177,7 +181,7 @@ public final class RotationUtils {
            if (wouldSneak) {
                // the concern here is: what if we're looking at it now, but as soon as we start sneaking we no longer are
                RayTraceResult result = RayTraceUtils.rayTraceTowards(entity, hypothetical, blockReachDistance, true);
-                if (result != null && result.typeOfHit == RayTraceResult.Type.BLOCK && result.getBlockPos().equals(pos)) {
+                if (result != null && result.getType() == RayTraceResult.Type.BLOCK && ((BlockRayTraceResult) result).getPos().equals(pos)) {
                    return Optional.of(hypothetical); // yes, if we sneaked we would still be looking at the block
                }
            } else {
@@ -190,13 +194,16 @@ public final class RotationUtils {
            return possibleRotation;
        }

-        IBlockState state = entity.world.getBlockState(pos);
-        AxisAlignedBB aabb = state.getBoundingBox(entity.world, pos);
-        for (Vec3d sideOffset : BLOCK_SIDE_MULTIPLIERS) {
-            double xDiff = aabb.minX * sideOffset.x + aabb.maxX * (1 - sideOffset.x);
-            double yDiff = aabb.minY * sideOffset.y + aabb.maxY * (1 - sideOffset.y);
-            double zDiff = aabb.minZ * sideOffset.z + aabb.maxZ * (1 - sideOffset.z);
-            possibleRotation = reachableOffset(entity, pos, new Vec3d(pos).add(xDiff, yDiff, zDiff), blockReachDistance, wouldSneak);
+        BlockState state = entity.world.getBlockState(pos);
+        VoxelShape shape = state.getShape(entity.world, pos);
+        if (shape.isEmpty()) {
+            shape = VoxelShapes.fullCube();
+        }
+        for (Vector3d 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);
            if (possibleRotation.isPresent()) {
                return possibleRotation;
            }
@@ -215,16 +222,16 @@ 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, Vec3d offsetPos, double blockReachDistance, boolean wouldSneak) {
-        Vec3d eyes = wouldSneak ? RayTraceUtils.inferSneakingEyePosition(entity) : entity.getPositionEyes(1.0F);
+    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);
        Rotation rotation = calcRotationFromVec3d(eyes, offsetPos, new Rotation(entity.rotationYaw, entity.rotationPitch));
        RayTraceResult result = RayTraceUtils.rayTraceTowards(entity, rotation, blockReachDistance, wouldSneak);
        //System.out.println(result);
-        if (result != null && result.typeOfHit == RayTraceResult.Type.BLOCK) {
-            if (result.getBlockPos().equals(pos)) {
+        if (result != null && result.getType() == RayTraceResult.Type.BLOCK) {
+            if (((BlockRayTraceResult) result).getPos().equals(pos)) {
                return Optional.of(rotation);
            }
-            if (entity.world.getBlockState(pos).getBlock() instanceof BlockFire && result.getBlockPos().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
@@ -20,9 +20,12 @@ package baritone.api.utils;
 import baritone.api.BaritoneAPI;
 import baritone.api.Settings;
 import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
 import net.minecraft.item.Item;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.Vec3i;
+import net.minecraft.util.Direction;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.math.vector.Vector3i;
+import net.minecraft.util.registry.Registry;

 import java.awt.*;
 import java.io.BufferedReader;
@@ -35,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;
@@ -44,13 +46,12 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

-import static net.minecraft.client.Minecraft.getMinecraft;

 public class SettingsUtil {

-    private static final Path SETTINGS_PATH = getMinecraft().gameDir.toPath().resolve("baritone").resolve("settings.txt");
+    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) {
        return line.startsWith("#") || line.startsWith("//");
@@ -112,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) {
@@ -166,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 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) {
@@ -232,15 +218,15 @@ public class SettingsUtil {
        FLOAT(Float.class, Float::parseFloat),
        LONG(Long.class, Long::parseLong),
        STRING(String.class, String::new),
-        ENUMFACING(EnumFacing.class, EnumFacing::byName),
+        DIRECTION(Direction.class, Direction::byName),
        COLOR(
                Color.class,
                str -> new Color(Integer.parseInt(str.split(",")[0]), Integer.parseInt(str.split(",")[1]), Integer.parseInt(str.split(",")[2])),
                color -> color.getRed() + "," + color.getGreen() + "," + color.getBlue()
        ),
        VEC3I(
-                Vec3i.class,
-                str -> new Vec3i(Integer.parseInt(str.split(",")[0]), Integer.parseInt(str.split(",")[1]), Integer.parseInt(str.split(",")[2])),
+                Vector3i.class,
+                str -> new Vector3i(Integer.parseInt(str.split(",")[0]), Integer.parseInt(str.split(",")[1]), Integer.parseInt(str.split(",")[2])),
                vec -> vec.getX() + "," + vec.getY() + "," + vec.getZ()
        ),
        BLOCK(
@@ -250,15 +236,14 @@ public class SettingsUtil {
        ),
        ITEM(
                Item.class,
-                str -> Item.getByNameOrId(str.trim()),
-                item -> Item.REGISTRY.getNameForObject(item).toString()
+                str -> Registry.ITEM.getOrDefault(new ResourceLocation(str.trim())), // TODO this now returns AIR on failure instead of null, is that an issue?
+                item -> Registry.ITEM.getKey(item).toString()
        ),
        LIST() {
            @Override
            public Object parse(ParserContext context, String raw) {
                Type type = ((ParameterizedType) context.getSetting().getType()).getActualTypeArguments()[0];
                Parser parser = Parser.getParser(type);
-
                return Stream.of(raw.split(","))
                        .map(s -> parser.parse(context, s))
                        .collect(Collectors.toList());
@@ -278,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,12 +17,13 @@

 package baritone.api.utils;

-import net.minecraft.block.BlockFire;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.FireBlock;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.math.AxisAlignedBB;
+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;

 /**
@@ -41,16 +42,22 @@ public final class VecUtils {
     * @return The center of the block's bounding box
     * @see #getBlockPosCenter(BlockPos)
     */
-    public static Vec3d calculateBlockCenter(World world, BlockPos pos) {
-        IBlockState b = world.getBlockState(pos);
-        AxisAlignedBB bbox = b.getBoundingBox(world, pos);
-        double xDiff = (bbox.minX + bbox.maxX) / 2;
-        double yDiff = (bbox.minY + bbox.maxY) / 2;
-        double zDiff = (bbox.minZ + bbox.maxZ) / 2;
-        if (b.getBlock() instanceof BlockFire) {//look at bottom of fire when putting it out
+    public static Vector3d calculateBlockCenter(World world, BlockPos pos) {
+        BlockState b = world.getBlockState(pos);
+        VoxelShape shape = b.getCollisionShape(world, pos);
+        if (shape.isEmpty()) {
+            return getBlockPosCenter(pos);
+        }
+        double xDiff = (shape.getStart(Direction.Axis.X) + shape.getEnd(Direction.Axis.X)) / 2;
+        double yDiff = (shape.getStart(Direction.Axis.Y) + shape.getEnd(Direction.Axis.Y)) / 2;
+        double zDiff = (shape.getStart(Direction.Axis.Z) + shape.getEnd(Direction.Axis.Z)) / 2;
+        if (Double.isNaN(xDiff) || Double.isNaN(yDiff) || Double.isNaN(zDiff)) {
+            throw new IllegalStateException(b + " " + pos + " " + shape);
+        }
+        if (b.getBlock() instanceof FireBlock) {//look at bottom of fire when putting it out
            yDiff = 0;
        }
-        return new Vec3d(
+        return new Vector3d(
                pos.getX() + xDiff,
                pos.getY() + yDiff,
                pos.getZ() + zDiff
@@ -67,8 +74,8 @@ public final class VecUtils {
     * @return The assumed center of the position
     * @see #calculateBlockCenter(World, BlockPos)
     */
-    public static Vec3d getBlockPosCenter(BlockPos pos) {
-        return new Vec3d(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
+    public static Vector3d getBlockPosCenter(BlockPos pos) {
+        return new Vector3d(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
    }

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

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

-package baritone.builder;
+package baritone.launch;

-public enum GreedySolverEngine implements ISolverEngine {
-    INSTANCE;
+import org.spongepowered.asm.mixin.Mixins;
+import org.spongepowered.asm.mixin.connect.IMixinConnector;
+
+public class BaritoneMixinConnector implements IMixinConnector {

    @Override
-    public SolverEngineOutput solve(SolverEngineInput in) {
-        return new GreedySolver(in).search();
+    public void connect() {
+        Mixins.addConfiguration("mixins.baritone.json");
    }
-}
+}
--- a/src/launch/java/baritone/launch/LaunchTesting.java
+++ b/src/launch/java/baritone/launch/LaunchTesting.java
@@ -0,0 +1,105 @@
+/*
+ * 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 com.google.common.base.Strings;
+import com.google.gson.GsonBuilder;
+import com.mojang.authlib.Agent;
+import com.mojang.authlib.exceptions.AuthenticationException;
+import com.mojang.authlib.properties.PropertyMap;
+import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
+import com.mojang.authlib.yggdrasil.YggdrasilUserAuthentication;
+import net.minecraft.launchwrapper.Launch;
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.net.Proxy;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Based on GradleStart from ForgeGradle 2.3
+ *
+ * @author Brady
+ * @since 3/11/2019
+ */
+public class LaunchTesting {
+
+    public static void main(String[] args) {
+        Map<String, String> arguments = new HashMap<>();
+
+        hackNatives();
+        arguments.put("version", "BaritownedDeveloperEnvironment");
+        arguments.put("assetIndex", System.getenv("assetIndex"));
+        arguments.put("assetsDir", System.getenv().getOrDefault("assetDirectory", "assets"));
+        arguments.put("accessToken", "FML");
+        arguments.put("userProperties", "{}");
+        arguments.put("tweakClass", System.getenv("tweakClass"));
+        String password = System.getenv("password");
+        if (password != null && !password.isEmpty()) {
+            attemptLogin(arguments, System.getenv("username"), System.getenv("password"));
+        }
+
+        List<String> argsArray = new ArrayList<>();
+        arguments.forEach((k, v) -> {
+            argsArray.add("--" + k);
+            argsArray.add(v);
+        });
+
+        Launch.main(argsArray.toArray(new String[0]));
+    }
+
+    private static void hackNatives() {
+        String paths = System.getProperty("java.library.path");
+        String nativesDir = System.getenv().get("nativesDirectory");
+
+        if (Strings.isNullOrEmpty(paths))
+            paths = nativesDir;
+        else
+            paths += File.pathSeparator + nativesDir;
+
+        System.setProperty("java.library.path", paths);
+
+        // hack the classloader now.
+        try {
+            final Field sysPathsField = ClassLoader.class.getDeclaredField("sys_paths");
+            sysPathsField.setAccessible(true);
+            sysPathsField.set(null, null);
+        } catch (Throwable ignored) {}
+    }
+
+    private static void attemptLogin(Map<String, String> argMap, String username, String password) {
+        YggdrasilUserAuthentication auth = (YggdrasilUserAuthentication) (new YggdrasilAuthenticationService(Proxy.NO_PROXY, "1")).createUserAuthentication(Agent.MINECRAFT);
+        auth.setUsername(username);
+        auth.setPassword(password);
+
+        try {
+            auth.logIn();
+        } catch (AuthenticationException var4) {
+            throw new RuntimeException(var4);
+        }
+
+        argMap.put("accessToken", auth.getAuthenticatedToken());
+        argMap.put("uuid", auth.getSelectedProfile().getId().toString().replace("-", ""));
+        argMap.put("username", auth.getSelectedProfile().getName());
+        argMap.put("userType", auth.getUserType().getName());
+        argMap.put("userProperties", (new GsonBuilder()).registerTypeAdapter(PropertyMap.class, new PropertyMap.Serializer()).create().toJson(auth.getUserProperties()));
+    }
+}
--- a/src/launch/java/baritone/launch/mixins/MixinBitArray.java
+++ b/src/launch/java/baritone/launch/mixins/MixinBitArray.java
@@ -1,67 +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.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
@@ -1,47 +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.IBitArray;
-import baritone.utils.accessor.IBlockStateContainer;
-import net.minecraft.block.state.IBlockState;
-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 palette;
-
-    @Override
-    public IBlockState getAtPalette(int index) {
-        return palette.getBlockState(index);
-    }
-
-    @Override
-    public int[] storageArray() {
-        return ((IBitArray) storage).toArray();
-    }
-}
--- a/src/launch/java/baritone/launch/mixins/MixinChatTabCompleter.java
+++ b/src/launch/java/baritone/launch/mixins/MixinChatTabCompleter.java
@@ -1,39 +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 net.minecraft.client.gui.GuiChat;
-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;
-
-@Mixin(GuiChat.ChatTabCompleter.class)
-public abstract class MixinChatTabCompleter extends MixinTabCompleter {
-
-    @Inject(
-            method = "complete",
-            at = @At("HEAD"),
-            cancellable = true
-    )
-    private void onComplete(CallbackInfo ci) {
-        if (dontComplete) {
-            ci.cancel();
-        }
-    }
-}
--- a/src/launch/java/baritone/launch/mixins/MixinChunkArray.java
+++ b/src/launch/java/baritone/launch/mixins/MixinChunkArray.java
@@ -0,0 +1,92 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.launch.mixins;
+
+import baritone.utils.accessor.IChunkArray;
+import net.minecraft.util.math.ChunkPos;
+import net.minecraft.world.chunk.Chunk;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import java.util.concurrent.atomic.AtomicReferenceArray;
+
+@Mixin(targets = "net.minecraft.client.multiplayer.ClientChunkProvider$ChunkArray")
+public abstract class MixinChunkArray implements IChunkArray {
+    @Shadow
+    private AtomicReferenceArray<Chunk> chunks;
+    @Shadow
+    private int viewDistance;
+    @Shadow
+    private int sideLength;
+    @Shadow
+    private int centerX;
+    @Shadow
+    private int centerZ;
+    @Shadow
+    private int loaded;
+
+    @Shadow
+    protected abstract boolean inView(int x, int z);
+
+    @Shadow
+    protected abstract int getIndex(int x, int z);
+
+    @Shadow
+    protected abstract void replace(int index, Chunk chunk);
+
+    @Override
+    public int centerX() {
+        return centerX;
+    }
+
+    @Override
+    public int centerZ() {
+        return centerZ;
+    }
+
+    @Override
+    public int viewDistance() {
+        return viewDistance;
+    }
+
+    @Override
+    public AtomicReferenceArray<Chunk> getChunks() {
+        return chunks;
+    }
+
+    @Override
+    public void copyFrom(IChunkArray other) {
+        centerX = other.centerX();
+        centerZ = other.centerZ();
+
+        AtomicReferenceArray<Chunk> copyingFrom = other.getChunks();
+        for (int k = 0; k < copyingFrom.length(); ++k) {
+            Chunk chunk = copyingFrom.get(k);
+            if (chunk != null) {
+                ChunkPos chunkpos = chunk.getPos();
+                if (inView(chunkpos.x, chunkpos.z)) {
+                    int index = getIndex(chunkpos.x, chunkpos.z);
+                    if (chunks.get(index) != null) {
+                        throw new IllegalStateException("Doing this would mutate the client's REAL loaded chunks?!");
+                    }
+                    replace(index, chunk);
+                }
+            }
+        }
+    }
+}
--- a/src/launch/java/baritone/launch/mixins/MixinChunkProviderClient.java
+++ b/src/launch/java/baritone/launch/mixins/MixinChunkProviderClient.java
@@ -1,39 +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.IChunkProviderClient;
-import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
-import net.minecraft.client.multiplayer.ChunkProviderClient;
-import net.minecraft.world.chunk.Chunk;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-@Mixin(ChunkProviderClient.class)
-public class MixinChunkProviderClient implements IChunkProviderClient {
-
-    @Shadow
-    @Final
-    private Long2ObjectMap<Chunk> loadedChunks;
-
-    @Override
-    public Long2ObjectMap<Chunk> loadedChunks() {
-        return this.loadedChunks;
-    }
-}
--- a/src/launch/java/baritone/launch/mixins/MixinChunkProviderServer.java
+++ b/src/launch/java/baritone/launch/mixins/MixinChunkProviderServer.java
@@ -1,42 +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.IChunkProviderServer;
-import net.minecraft.world.chunk.storage.IChunkLoader;
-import net.minecraft.world.gen.ChunkProviderServer;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-/**
- * @author Brady
- * @since 9/4/2018
- */
-@Mixin(ChunkProviderServer.class)
-public class MixinChunkProviderServer implements IChunkProviderServer {
-
-    @Shadow
-    @Final
-    private IChunkLoader chunkLoader;
-
-    @Override
-    public IChunkLoader getChunkLoader() {
-        return this.chunkLoader;
-    }
-}
--- a/src/launch/java/baritone/launch/mixins/MixinChunkRenderContainer.java
+++ b/src/launch/java/baritone/launch/mixins/MixinChunkRenderContainer.java
@@ -1,52 +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.Baritone;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.ChunkRenderContainer;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.chunk.RenderChunk;
-import net.minecraft.util.math.BlockPos;
-import org.lwjgl.opengl.GL14;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-import static org.lwjgl.opengl.GL11.*;
-
-@Mixin(ChunkRenderContainer.class)
-public class MixinChunkRenderContainer {
-
-    @Redirect( // avoid creating CallbackInfo at all costs; this is called 40k times per second
-            method = "preRenderChunk",
-            at = @At(
-                    value = "INVOKE",
-                    target = "net/minecraft/client/renderer/chunk/RenderChunk.getPosition()Lnet/minecraft/util/math/BlockPos;"
-            )
-    )
-    private BlockPos getPosition(RenderChunk renderChunkIn) {
-        if (Baritone.settings().renderCachedChunks.value && !Minecraft.getMinecraft().isSingleplayer() && Minecraft.getMinecraft().world.getChunk(renderChunkIn.getPosition()).isEmpty()) {
-            GlStateManager.enableAlpha();
-            GlStateManager.enableBlend();
-            GL14.glBlendColor(0, 0, 0, Baritone.settings().cachedChunksOpacity.value);
-            GlStateManager.tryBlendFuncSeparate(GL_CONSTANT_ALPHA, GL_ONE_MINUS_CONSTANT_ALPHA, GL_ONE, GL_ZERO);
-        }
-        return renderChunkIn.getPosition();
-    }
-}
--- a/src/launch/java/baritone/launch/mixins/MixinChunkRenderWorker.java
+++ b/src/launch/java/baritone/launch/mixins/MixinChunkRenderWorker.java
@@ -1,57 +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.Baritone;
-import baritone.api.BaritoneAPI;
-import baritone.api.utils.IPlayerContext;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.chunk.ChunkRenderWorker;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-@Mixin(ChunkRenderWorker.class)
-public abstract class MixinChunkRenderWorker {
-
-    @Shadow
-    protected abstract boolean isChunkExisting(BlockPos pos, World worldIn);
-
-    @Redirect(
-            method = "processTask",
-            at = @At(
-                    value = "INVOKE",
-                    target = "net/minecraft/client/renderer/chunk/ChunkRenderWorker.isChunkExisting(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/World;)Z"
-            )
-    )
-    private boolean isChunkExisting(ChunkRenderWorker worker, BlockPos pos, World world) {
-        if (Baritone.settings().renderCachedChunks.value && !Minecraft.getMinecraft().isSingleplayer()) {
-            Baritone baritone = (Baritone) BaritoneAPI.getProvider().getPrimaryBaritone();
-            IPlayerContext ctx = baritone.getPlayerContext();
-            if (ctx.player() != null && ctx.world() != null && baritone.bsi != null) {
-                return baritone.bsi.isLoaded(pos.getX(), pos.getZ()) || this.isChunkExisting(pos, world);
-            }
-        }
-
-        return this.isChunkExisting(pos, world);
-    }
-}
-
--- a/src/launch/java/baritone/launch/mixins/MixinClientChunkProvider.java
+++ b/src/launch/java/baritone/launch/mixins/MixinClientChunkProvider.java
@@ -0,0 +1,61 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.launch.mixins;
+
+import baritone.utils.accessor.IChunkArray;
+import baritone.utils.accessor.IClientChunkProvider;
+import net.minecraft.client.multiplayer.ClientChunkProvider;
+import net.minecraft.client.world.ClientWorld;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import java.lang.reflect.Field;
+import java.util.Arrays;
+
+@Mixin(ClientChunkProvider.class)
+public class MixinClientChunkProvider implements IClientChunkProvider {
+
+    @Shadow
+    private ClientWorld world;
+
+    @Override
+    public ClientChunkProvider createThreadSafeCopy() {
+        IChunkArray arr = extractReferenceArray();
+        ClientChunkProvider result = new ClientChunkProvider(world, arr.viewDistance() - 3); // -3 because its adds 3 for no reason lmao
+        IChunkArray copyArr = ((IClientChunkProvider) result).extractReferenceArray();
+        copyArr.copyFrom(arr);
+        if (copyArr.viewDistance() != arr.viewDistance()) {
+            throw new IllegalStateException(copyArr.viewDistance() + " " + arr.viewDistance());
+        }
+        return result;
+    }
+
+    @Override
+    public IChunkArray extractReferenceArray() {
+        for (Field f : ClientChunkProvider.class.getDeclaredFields()) {
+            if (IChunkArray.class.isAssignableFrom(f.getType())) {
+                try {
+                    return (IChunkArray) f.get(this);
+                } catch (IllegalAccessException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+        throw new RuntimeException(Arrays.toString(ClientChunkProvider.class.getDeclaredFields()));
+    }
+}
--- a/src/launch/java/baritone/launch/mixins/MixinClientPlayNetHandler.java
+++ b/src/launch/java/baritone/launch/mixins/MixinClientPlayNetHandler.java
@@ -23,12 +23,12 @@ import baritone.api.IBaritone;
 import baritone.api.event.events.ChunkEvent;
 import baritone.api.event.events.type.EventState;
 import baritone.cache.CachedChunk;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.client.network.NetHandlerPlayClient;
-import net.minecraft.network.play.server.SPacketBlockChange;
-import net.minecraft.network.play.server.SPacketChunkData;
-import net.minecraft.network.play.server.SPacketCombatEvent;
-import net.minecraft.network.play.server.SPacketMultiBlockChange;
+import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.client.network.play.ClientPlayNetHandler;
+import net.minecraft.network.play.server.SChangeBlockPacket;
+import net.minecraft.network.play.server.SChunkDataPacket;
+import net.minecraft.network.play.server.SCombatPacket;
+import net.minecraft.network.play.server.SMultiBlockChangePacket;
 import net.minecraft.util.math.ChunkPos;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -39,20 +39,21 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 * @author Brady
 * @since 8/3/2018
 */
-@Mixin(NetHandlerPlayClient.class)
-public class MixinNetHandlerPlayClient {
+@Mixin(ClientPlayNetHandler.class)
+public class MixinClientPlayNetHandler {

-    @Inject(
+    // unused lol
+    /*@Inject(
            method = "handleChunkData",
            at = @At(
                    value = "INVOKE",
-                    target = "net/minecraft/world/chunk/Chunk.read(Lnet/minecraft/network/PacketBuffer;IZ)V"
+                    target = "net/minecraft/client/multiplayer/ChunkProviderClient.func_212474_a(IILnet/minecraft/network/PacketBuffer;IZ)Lnet/minecraft/world/chunk/Chunk;"
            )
    )
    private void preRead(SPacketChunkData packetIn, CallbackInfo ci) {
        for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            EntityPlayerSP player = ibaritone.getPlayerContext().player();
-            if (player != null && player.connection == (NetHandlerPlayClient) (Object) this) {
+            ClientPlayerEntity player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (ClientPlayNetHandler) (Object) this) {
                ibaritone.getGameEventHandler().onChunkEvent(
                        new ChunkEvent(
                                EventState.PRE,
@@ -63,16 +64,16 @@ public class MixinNetHandlerPlayClient {
                );
            }
        }
-    }
+    }*/

    @Inject(
            method = "handleChunkData",
            at = @At("RETURN")
    )
-    private void postHandleChunkData(SPacketChunkData packetIn, CallbackInfo ci) {
+    private void postHandleChunkData(SChunkDataPacket packetIn, CallbackInfo ci) {
        for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            EntityPlayerSP player = ibaritone.getPlayerContext().player();
-            if (player != null && player.connection == (NetHandlerPlayClient) (Object) this) {
+            ClientPlayerEntity player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (ClientPlayNetHandler) (Object) this) {
                ibaritone.getGameEventHandler().onChunkEvent(
                        new ChunkEvent(
                                EventState.POST,
@@ -89,22 +90,22 @@ public class MixinNetHandlerPlayClient {
            method = "handleBlockChange",
            at = @At("RETURN")
    )
-    private void postHandleBlockChange(SPacketBlockChange packetIn, CallbackInfo ci) {
+    private void postHandleBlockChange(SChangeBlockPacket packetIn, CallbackInfo ci) {
        if (!Baritone.settings().repackOnAnyBlockChange.value) {
            return;
        }
-        if (!CachedChunk.BLOCKS_TO_KEEP_TRACK_OF.contains(packetIn.getBlockState().getBlock())) {
+        if (!CachedChunk.BLOCKS_TO_KEEP_TRACK_OF.contains(packetIn.getState().getBlock())) {
            return;
        }
        for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            EntityPlayerSP player = ibaritone.getPlayerContext().player();
-            if (player != null && player.connection == (NetHandlerPlayClient) (Object) this) {
+            ClientPlayerEntity player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (ClientPlayNetHandler) (Object) this) {
                ibaritone.getGameEventHandler().onChunkEvent(
                        new ChunkEvent(
                                EventState.POST,
                                ChunkEvent.Type.POPULATE_FULL,
-                                packetIn.getBlockPosition().getX() >> 4,
-                                packetIn.getBlockPosition().getZ() >> 4
+                                packetIn.getPos().getX() >> 4,
+                                packetIn.getPos().getZ() >> 4
                        )
                );
            }
@@ -115,32 +116,28 @@ public class MixinNetHandlerPlayClient {
            method = "handleMultiBlockChange",
            at = @At("RETURN")
    )
-    private void postHandleMultiBlockChange(SPacketMultiBlockChange packetIn, CallbackInfo ci) {
+    private void postHandleMultiBlockChange(SMultiBlockChangePacket packetIn, CallbackInfo ci) {
        if (!Baritone.settings().repackOnAnyBlockChange.value) {
            return;
        }
-        if (packetIn.getChangedBlocks().length == 0) {
-            return;
-        }
-        https://docs.oracle.com/javase/specs/jls/se7/html/jls-14.html#jls-14.15
-        {
-            for (SPacketMultiBlockChange.BlockUpdateData update : packetIn.getChangedBlocks()) {
-                if (CachedChunk.BLOCKS_TO_KEEP_TRACK_OF.contains(update.getBlockState().getBlock())) {
-                    break https;
-                }
+        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) {
            return;
        }
-        ChunkPos pos = new ChunkPos(packetIn.getChangedBlocks()[0].getPos());
        for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            EntityPlayerSP player = ibaritone.getPlayerContext().player();
-            if (player != null && player.connection == (NetHandlerPlayClient) (Object) this) {
+            ClientPlayerEntity player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (ClientPlayNetHandler) (Object) this) {
                ibaritone.getGameEventHandler().onChunkEvent(
                        new ChunkEvent(
                                EventState.POST,
                                ChunkEvent.Type.POPULATE_FULL,
-                                pos.x,
-                                pos.z
+                                chunkPos[0].x,
+                                chunkPos[0].z
                        )
                );
            }
@@ -151,13 +148,13 @@ public class MixinNetHandlerPlayClient {
            method = "handleCombatEvent",
            at = @At(
                    value = "INVOKE",
-                    target = "net/minecraft/client/Minecraft.displayGuiScreen(Lnet/minecraft/client/gui/GuiScreen;)V"
+                    target = "net/minecraft/client/Minecraft.displayGuiScreen(Lnet/minecraft/client/gui/screen/Screen;)V"
            )
    )
-    private void onPlayerDeath(SPacketCombatEvent packetIn, CallbackInfo ci) {
+    private void onPlayerDeath(SCombatPacket packetIn, CallbackInfo ci) {
        for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            EntityPlayerSP player = ibaritone.getPlayerContext().player();
-            if (player != null && player.connection == (NetHandlerPlayClient) (Object) this) {
+            ClientPlayerEntity player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (ClientPlayNetHandler) (Object) this) {
                ibaritone.getGameEventHandler().onPlayerDeath();
            }
        }
--- a/src/launch/java/baritone/launch/mixins/MixinClientPlayerEntity.java
+++ b/src/launch/java/baritone/launch/mixins/MixinClientPlayerEntity.java
@@ -24,9 +24,9 @@ import baritone.api.event.events.PlayerUpdateEvent;
 import baritone.api.event.events.SprintStateEvent;
 import baritone.api.event.events.type.EventState;
 import baritone.behavior.LookBehavior;
-import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.entity.player.ClientPlayerEntity;
 import net.minecraft.client.settings.KeyBinding;
-import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.entity.player.PlayerAbilities;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -37,8 +37,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 * @author Brady
 * @since 8/1/2018
 */
-@Mixin(EntityPlayerSP.class)
-public class MixinEntityPlayerSP {
+@Mixin(ClientPlayerEntity.class)
+public class MixinClientPlayerEntity {

    @Inject(
            method = "sendChatMessage",
@@ -47,7 +47,7 @@ public class MixinEntityPlayerSP {
    )
    private void sendChatMessage(String msg, CallbackInfo ci) {
        ChatEvent event = new ChatEvent(msg);
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this);
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
        if (baritone == null) {
            return;
        }
@@ -58,46 +58,46 @@ public class MixinEntityPlayerSP {
    }

    @Inject(
-            method = "onUpdate",
+            method = "tick",
            at = @At(
                    value = "INVOKE",
-                    target = "net/minecraft/client/entity/EntityPlayerSP.isRiding()Z",
+                    target = "net/minecraft/client/entity/player/ClientPlayerEntity.isPassenger()Z",
                    shift = At.Shift.BY,
                    by = -3
            )
    )
    private void onPreUpdate(CallbackInfo ci) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this);
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
        if (baritone != null) {
            baritone.getGameEventHandler().onPlayerUpdate(new PlayerUpdateEvent(EventState.PRE));
        }
    }

    @Inject(
-            method = "onUpdate",
+            method = "tick",
            at = @At(
                    value = "INVOKE",
-                    target = "net/minecraft/client/entity/EntityPlayerSP.onUpdateWalkingPlayer()V",
+                    target = "net/minecraft/client/entity/player/ClientPlayerEntity.onUpdateWalkingPlayer()V",
                    shift = At.Shift.BY,
                    by = 2
            )
    )
    private void onPostUpdate(CallbackInfo ci) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this);
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
        if (baritone != null) {
            baritone.getGameEventHandler().onPlayerUpdate(new PlayerUpdateEvent(EventState.POST));
        }
    }

    @Redirect(
-            method = "onLivingUpdate",
+            method = "livingTick",
            at = @At(
                    value = "FIELD",
-                    target = "net/minecraft/entity/player/PlayerCapabilities.allowFlying:Z"
+                    target = "net/minecraft/entity/player/PlayerAbilities.allowFlying:Z"
            )
    )
-    private boolean isAllowFlying(PlayerCapabilities capabilities) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this);
+    private boolean isAllowFlying(PlayerAbilities capabilities) {
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
        if (baritone == null) {
            return capabilities.allowFlying;
        }
@@ -105,14 +105,14 @@ public class MixinEntityPlayerSP {
    }

    @Redirect(
-            method = "onLivingUpdate",
+            method = "livingTick",
            at = @At(
                    value = "INVOKE",
                    target = "net/minecraft/client/settings/KeyBinding.isKeyDown()Z"
            )
    )
    private boolean isKeyDown(KeyBinding keyBinding) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this);
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
        if (baritone == null) {
            return keyBinding.isKeyDown();
        }
@@ -135,7 +135,7 @@ public class MixinEntityPlayerSP {
            )
    )
    private void updateRidden(CallbackInfo cb) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this);
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
        if (baritone != null) {
            ((LookBehavior) baritone.getLookBehavior()).pig();
        }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Leijurv	dbb0f599fc	v1.6.2	2020-12-16 13:32:11 -10:00
Brady	dcc0b82210	Update to 1.16.4	2020-12-16 16:42:35 -06:00
Leijurv	a92675e125	v1.6.1	2020-09-07 16:48:44 -07:00
Leijurv	7cbe5bfd2f	Merge pull request #1967 from CDAGaming/1.16.2 Added the license field that forge is forcing	2020-08-22 02:04:05 -07:00
CDAGaming	69c4c7a3b8	Added the license field that forge is forcing	2020-08-21 19:36:15 -05:00
Leijurv	3b32c72d63	remove broken furry cringe	2020-08-17 17:41:13 -07:00
Leijurv	0102ce8fad	Merge pull request #1946 from CDAGaming/1.16.2 ✔️ 1.16.1 -> 1.16.2	2020-08-17 17:00:42 -07:00
CDAGaming	0b9bb9df2b	👌 Apply review suggestions from leijurv	2020-08-17 18:58:36 -05:00
CDAGaming	78dd64c73d	Merge remote-tracking branch 'remote/master' into 1.16.2	2020-08-17 18:55:08 -05:00
CDAGaming	750cc619fb	🐛 Fix broken mixin	2020-08-17 18:51:04 -05:00
CDAGaming	6eaa3a27f2	Merge remote-tracking branch 'remote/master' into 1.16.2	2020-08-17 18:15:59 -05:00
CDAGaming	17e16498b6	[Change] 1.16.1 -> 1.16.2	2020-08-13 13:47:50 -05:00
Leijurv	3f3358d0b1	Merge pull request #1942 from CDAGaming/live/1.16.1 [1.16.1] Live Testing Week Changes	2020-08-10 13:16:34 -07:00
CDAGaming	c006005cc7	Merge branch 'master' into live/1.16.1	2020-08-07 22:12:44 -05:00
CDAGaming	6cd12bf84d	[Fix] Attempted Fix for Forge Version Error	2020-07-26 09:47:05 -05:00
CDAGaming	a09f5d41f6	[Change] Also allow Forge Building Also sets minimum Forge version to 32.0.72 so we don't need MixinBootstrap	2020-07-25 23:16:08 -05:00
CDAGaming	8aaa49c80d	[Change] Edit CI to use Proguard Data	2020-07-25 22:59:33 -05:00
CDAGaming	4f1db04224	[Change] Updated Mappings	2020-07-25 22:53:22 -05:00
CDAGaming	dbeee33657	[Fix] Fix Proguard from Master Merge Someone didn't verify this even built xD	2020-07-25 22:52:46 -05:00
CDAGaming	cd245f7f59	Merge remote-tracking branch 'remote/master' into live/1.16.1	2020-07-25 22:30:23 -05:00
CDAGaming	246dd2b0ad	[Change] Added Auto Build Support	2020-07-25 22:28:38 -05:00
Brady	20fa2c6f3d	Merge pull request #1894 from CDAGaming/1.16.1 [Fix] Fixed BaritoneAutoTest in 1.16.1	2020-07-20 00:54:59 -05:00
CDAGaming	9cb021ffa0	Merge remote-tracking branch 'remote/1.16.1' into 1.16.1	2020-07-19 18:34:16 -05:00
CDAGaming	2acb8f2a37	[Fix] Fixed BaritoneAutoTest in 1.16.1	2020-07-19 18:33:58 -05:00
Brady	b044d244d0	Merge pull request #1892 from CDAGaming/1.16.1 [Change] Updated Mappings + Simplified Port	2020-07-19 16:53:20 -05:00
CDAGaming	807b1b5eb0	[Change] Updated Mappings + Simplified Port	2020-07-19 16:47:30 -05:00
Brady	819178b280	wildcard	2020-07-19 16:46:00 -05:00
Brady	039898c654	This null check should fix it lol	2020-07-19 16:26:18 -05:00
Brady	854985e5b5	Baritone 1.16.1	2020-07-19 15:50:56 -05:00
Leijurv	6e78384bcf	Merge pull request #1700 from babbaj/forge-mine-fix Fix #mine in forge	2020-05-16 16:01:16 -07:00
Babbaj	47501ab8e1	fix terrible formatting	2020-05-16 18:23:38 -04:00
Babbaj	682de71ab7	Fix #mine in forge	2020-05-16 18:21:27 -04:00
Brady	410ea059fc	Update mappings to 20200515-1.15.1	2020-05-15 21:03:08 -05:00
Leijurv	b7870d059c	v1.5.3	2020-04-21 12:34:46 -07:00
Leijurv	06865f1561	Merge branch '1.14.4' into 1.15.2	2020-04-21 12:34:32 -07:00
Leijurv	fe0b54cfb4	v1.4.6	2020-04-21 12:23:47 -07:00
Leijurv	0bf7bb4b39	Merge branch '1.13.2' into 1.14.4	2020-04-21 12:17:54 -07:00
Leijurv	2a830b6b68	v1.3.8	2020-04-21 12:05:09 -07:00
Leijurv	fc620f8ba8	Merge branch 'master' into 1.13.2	2020-04-21 12:04:44 -07:00
Leijurv	315977e1f2	Merge branch '1.13.2' into 1.14.4	2020-04-07 23:45:48 -07:00
Leijurv	e7658b75ef	Merge branch 'master' into 1.13.2	2020-04-07 23:45:42 -07:00
Leijurv	8c3fac977e	unscuff	2020-03-25 21:19:15 -07:00
Leijurv	be2ee1a07c	Merge pull request #1446 from babbaj/1.15.2 Add support for building forge jars	2020-03-25 21:07:45 -07:00
Babbaj	a4f7207089	ok	2020-03-25 21:00:25 -04:00
Babbaj	aead997b13	dont sha old jars	2020-03-25 20:53:37 -04:00
Leijurv	2d421e66dc	v1.5.2	2020-03-25 17:51:56 -07:00
Leijurv	e8370f1348	Merge branch '1.14.4' into 1.15.2	2020-03-25 17:51:42 -07:00
Leijurv	16f6baf216	v1.4.5	2020-03-25 17:39:01 -07:00
Leijurv	89ab959fb4	Merge branch '1.13.2' into 1.14.4	2020-03-25 17:38:28 -07:00
Babbaj	b13b86b67a	get the hash of all jars in the dist directory	2020-03-25 20:34:54 -04:00
Leijurv	b9a7efc25b	v1.3.7	2020-03-25 17:26:18 -07:00
Leijurv	3b7f13babd	Merge branch 'master' into 1.13.2	2020-03-25 17:25:25 -07:00
Babbaj	6cc31a9422	update mods.toml and fix modid	2020-03-25 20:23:41 -04:00
Babbaj	592a01f3e4	cleanup	2020-03-25 19:00:26 -04:00
Babbaj	db718a1781	Add @Mod annotated class	2020-03-25 01:16:30 -04:00
Babbaj	261bf005f6	Scuffed support for forge and building a forge jar	2020-03-25 00:28:55 -04:00
Leijurv	e926ff2a16	Merge branch '1.14.4' into 1.15.2	2020-03-14 12:35:33 -07:00
Leijurv	8794bfd79a	fix javadoc errors	2020-03-14 12:35:03 -07:00
Leijurv	500643aec7	Merge branch '1.14.4' into 1.15.2	2020-03-14 12:25:46 -07:00
Leijurv	58bb6c4357	Merge branch '1.13.2' into 1.14.4	2020-03-14 12:25:36 -07:00
Leijurv	520142427d	Merge branch 'master' into 1.13.2	2020-03-14 12:25:22 -07:00
Brady	369d726a96	Merge branch '1.14.4' into 1.15.2	2020-03-07 20:45:07 -06:00
Brady	e0beba38af	Merge branch '1.13.2' into 1.14.4	2020-03-07 20:37:47 -06:00
Brady	ebe3f457c6	Fix additional injection points in 1.13.2	2020-03-07 20:27:29 -06:00
Brady	6289e540b8	Merge branch 'master' into 1.13.2	2020-03-07 20:23:09 -06:00
Brady	e0bd82d7ff	lol?	2020-03-02 17:15:01 -06:00
Leijurv	5ec4b89caa	Merge branch '1.14.4' into 1.15.2	2020-02-24 19:28:51 -08:00
Leijurv	5fd3e236e2	Merge branch '1.13.2' into 1.14.4	2020-02-24 19:28:42 -08:00
Leijurv	399037b866	Merge branch 'master' into 1.13.2	2020-02-24 19:28:05 -08:00
Leijurv	2d941f6264	Merge branch '1.14.4' into 1.15.2	2020-02-24 19:02:20 -08:00
Leijurv	1a8d93b946	Merge branch '1.13.2' into 1.14.4	2020-02-24 18:56:56 -08:00
Leijurv	50783e65a9	Merge branch 'master' into 1.13.2	2020-02-24 18:39:36 -08:00
Leijurv	606e9bf97c	v1.5.1	2020-02-14 15:28:37 -08:00
Leijurv	47ae75a9d6	Merge branch '1.14.4' into 1.15.2	2020-02-14 15:26:34 -08:00
Leijurv	25587e317a	fix link click crash	2020-02-14 15:26:03 -08:00
Leijurv	b3ba129fc5	honey is stupid lets just not	2020-02-13 18:59:08 -08:00
Leijurv	746b7b5c88	not unscuffed, just differently scuffed	2020-02-13 18:57:32 -08:00
Brady	db2f6ec78d	Update mappings to 20200213-1.15.1	2020-02-13 14:44:29 -06:00
Leijurv	96bcabff8b	v1.5.0	2020-02-13 12:04:29 -08:00
Leijurv	0a1fe857dc	cant walk through honey blocks	2020-02-13 12:03:09 -08:00
Brady	49aaa55172	Fix click	2020-02-09 13:38:46 -06:00
Leijurv	e03e251541	fix crouching	2020-02-05 17:45:22 -08:00
Leijurv	f5380881f4	brady fix mixins im incompetent	2020-02-05 16:10:55 -08:00
Leijurv	a022778fb6	cursed but fixes blockoptionalmeta	2020-02-05 15:14:32 -08:00
Leijurv	8543a99fba	compiles and can path	2020-02-05 14:54:03 -08:00
Brady	997888fe85	Merge branch '1.14.4' into 1.15.1	2020-01-10 20:15:43 -06:00
Brady	94a2e13561	Merge branch '1.13.2' into 1.14.4	2020-01-10 20:14:46 -06:00
Brady	f7041022d0	Merge branch 'master' into 1.13.2	2020-01-10 20:13:57 -06:00
Brady	2d2030ecdf	Fix renderGoalXZBeacon	2020-01-10 20:07:33 -06:00
Brady	a3dec3a47e	Render stuff should be fixed now. There is likely a better solution, but I think this is fine in order to keep things in-line with the development over at Mojang.	2020-01-10 19:37:00 -06:00
Brady	eb348120d9	Fix Mixins	2020-01-10 18:59:57 -06:00
Brady	27cb708d40	Fix some render stuff but it's still broken	2020-01-09 20:09:49 -06:00
Leijurv	36bbe430d4	add fixmes	2020-01-09 17:27:28 -08:00
Leijurv	80952e091d	comment out anything that isn't instantly obvious how to fix (e.g. anything involving rendering)	2020-01-09 17:15:05 -08:00
Leijurv	760ac5dd8f	v1.4.4	2020-01-04 21:58:55 -08:00
Leijurv	dd76d2eabc	v1.3.6	2020-01-04 21:58:21 -08:00
Brady	92966dc57c	Merge branch '1.13.2' into 1.14.4	2019-12-31 21:57:55 -06:00
Brady	e3d3407de5	Remove normalizations from BlockOptionalMeta	2019-12-31 19:44:44 -06:00
Brady	f3d860e8fa	Merge branch 'master' into 1.13.2	2019-12-31 19:40:14 -06:00
Leijurv	1edd7126fd	Merge branch 'master' into 1.13.2	2019-12-31 15:44:03 -08:00
Leijurv	a57668bd15	Merge pull request #1073 from 0-x-2-2/1.13.2 Merged master into 1.13.2 branch. 😎	2019-10-17 13:54:06 -07:00
0x22	a324b58f55	Merged master into 1.13.2 branch. 😎	2019-10-17 16:01:35 -04:00
Leijurv	214225c08d	v1.4.3	2019-10-13 22:53:05 -07:00
Leijurv	05b5894348	a much better way to deal with this	2019-10-13 10:53:25 -07:00
Leijurv	c528dba0ea	v1.4.2	2019-10-11 17:52:11 -07:00
Leijurv	105c7d438a	v1.3.5	2019-10-11 17:29:27 -07:00
Leijurv	2b3a302a5f	Merge branch '1.13.2' into 1.14.4	2019-10-11 17:04:53 -07:00
Leijurv	1c00e167ca	Merge branch 'master' into 1.13.2	2019-10-11 16:56:04 -07:00
Leijurv	861ee5049a	unscuff	2019-10-11 16:15:38 -07:00
Brady	c1fe588de4	Leijurv is crying and shaking right now	2019-10-11 18:08:39 -05:00
Brady	8fa2dac261	This should fix tab complete scuff	2019-10-11 17:59:36 -05:00
Leijurv	f0ae31f455	fake merge of master into 1.13.2	2019-10-09 20:45:55 -07:00
Leijurv	dc7d64fb88	Merge commit 'ce2fc6f2514245987659b378687f795ab641cf1e' into 1.13.2	2019-10-09 20:44:22 -07:00
Brady	62df244db7	Initial Brigadier overriden tab completion	2019-10-09 21:19:58 -05:00
Leijurv	84a257faf4	fix air scuff	2019-10-06 17:37:07 -07:00
Leijurv	34620a448e	Merge branch '1.13.2' into 1.14.4	2019-10-06 17:36:25 -07:00
Leijurv	2b4d6f4aa0	Merge branch 'master' into 1.13.2	2019-10-06 17:32:35 -07:00
Leijurv	e54d63576f	Merge branch '1.13.2' into 1.14.4	2019-10-06 17:02:41 -07:00
Leijurv	7e505fc68f	fix dropped items scanning	2019-10-06 16:00:26 -07:00
Leijurv	9c323aba91	Merge branch 'master' into 1.13.2	2019-10-06 15:51:27 -07:00
Leijurv	ae9671bff0	meme fix, things work now	2019-09-30 17:57:09 -07:00
Leijurv	d256f05787	Merge branch 'master' into 1.13.2	2019-09-30 17:52:47 -07:00
Leijurv	02419f8b07	v1.4.1	2019-08-20 15:25:30 -07:00
Leijurv	ddeb2a5c14	perhaps fix concurrent modification issues	2019-08-20 15:07:36 -07:00
Leijurv	8973b73bfa	reduce spamminess	2019-08-20 14:58:00 -07:00
Leijurv	4557bab3c4	maybe travis fix	2019-08-20 14:49:16 -07:00
Leijurv	6e185b580c	Merge branch '1.13.2' into 1.14.4	2019-08-20 14:33:18 -07:00
Leijurv	a9ba05bf5e	Merge branch 'master' into 1.13.2	2019-08-20 14:28:59 -07:00
Leijurv	4e73880d4a	Merge branch '1.14.4' of github.com:cabaletta/baritone into 1.14.4	2019-08-17 20:29:32 -07:00
Leijurv	0bb148844d	Merge branch '1.13.2' into 1.14.4	2019-08-17 16:10:59 -07:00
Leijurv	e53b207148	Merge branch '1.13.2' into 1.14.4	2019-08-17 16:09:45 -07:00
Leijurv	7c9b812a5b	Merge branch 'master' into 1.13.2	2019-08-17 16:07:26 -07:00
Leijurv	afc639ab4b	bypass	2019-08-14 22:31:46 -07:00
Leijurv	afebdce1f8	fix crash and ice behavior	2019-07-25 16:02:29 -07:00
Leijurv	2ca4c3042a	fix realms	2019-07-25 15:50:58 -07:00
Leijurv	a8226ba4c8	v1.3.4	2019-07-24 15:43:37 -07:00
Leijurv	e34b2d1392	Merge branch 'master' into 1.13.2	2019-07-24 15:36:20 -07:00
Leijurv	6bee5828a0	thank you brigadier very cool	2019-07-23 21:38:42 -07:00
Leijurv	8a5cc5b17d	should be peaceful anyway	2019-07-23 20:54:00 -07:00
Leijurv	4e563c6130	could this be the worst possible way to copy a chunk array	2019-07-23 20:44:07 -07:00
Leijurv	01cf3c67a6	whatever this works lol	2019-07-23 19:25:48 -07:00
Leijurv	36315c5151	working for realsies	2019-07-23 15:47:18 -07:00
Leijurv	9f951f261d	fixes	2019-07-23 15:39:19 -07:00
Leijurv	4c8907c629	it launches	2019-07-23 14:12:44 -07:00
Leijurv	223791cea7	Merge branch '1.13.2' into 1.14.2	2019-07-23 12:09:39 -07:00
Leijurv	de6e96b952	Merge branch 'master' into 1.13.2	2019-07-23 11:58:45 -07:00
Leijurv	9dd6856872	get called out	2019-07-21 14:36:02 -07:00
Leijurv	ed4753e968	now that impact locks to specific baritone versions this hack can finally be removed yay	2019-07-19 22:33:08 -07:00
Leijurv	1a4635df16	v1.3.3	2019-07-11 12:47:44 -07:00
Leijurv	1390af20b6	fix parkour and multithread farm	2019-07-11 12:46:24 -07:00
Leijurv	1427cf57a8	randomlooking	2019-07-11 11:56:44 -07:00
Leijurv	d70243b4c0	leijurv would never do this	2019-07-11 11:08:45 -07:00
Leijurv	8f63dd4ba6	Merge branch 'master' into 1.13.2	2019-07-11 10:51:29 -07:00
Brady	c7e1c917c3	Fix Baritone thinking it can walk through wall-placed skulls Fixes #485	2019-07-08 19:21:09 -05:00
Leijurv	8758c77ac0	most of the way there	2019-06-10 18:25:20 -07:00
Leijurv	dba496471e	api sourceset done	2019-06-10 12:43:02 -07:00
Leijurv	125facfbb6	Merge branch 'master' into 1.13.2	2019-06-10 11:50:14 -07:00
Leijurv	16b74ff53c	v1.3.2	2019-05-16 14:57:26 -07:00
Leijurv	9297e98ac3	Merge branch 'master' into 1.13.2	2019-05-16 14:55:37 -07:00
Leijurv	b521d7bee1	fix dummy merge typo	2019-05-02 11:42:49 -07:00
Leijurv	4e96c5e5ee	Merge branch 'master' into 1.13.2	2019-05-01 23:12:19 -07:00
Leijurv	ec819220b7	Merge branch 'master' into 1.13.2	2019-05-01 12:15:31 -07:00
Brady	3d3a5f420e	Fix unsafe creation of potentially invalid ResourceLocation	2019-04-16 20:15:51 -05:00
Leijurv	9c9c9d4387	fix region pruning	2019-04-14 10:06:37 -07:00
Leijurv	82d09a536d	v1.3.1	2019-04-13 19:21:44 -07:00
Leijurv	6e49adea33	i WUV impact	2019-04-13 19:10:13 -07:00
Leijurv	f85afdbc70	Merge branch 'master' into 1.13.2	2019-04-12 21:57:01 -07:00
Leijurv	563028a5b3	fix invalid player move packet, and a bunch of things in world scanner	2019-04-09 19:30:48 -07:00
Leijurv	d5c317b88b	Merge branch 'master' into 1.13.2	2019-04-09 18:17:53 -07:00
Leijurv	c59ec9da10	blank space	2019-03-23 22:17:40 -08:00
Leijurv	3a675836da	Merge pull request #370 from babbaj/patch-1 use runAutoTest	2019-03-23 13:03:19 -07:00
babbaj	7e0fc81246	use runAutoTest	2019-03-23 15:55:16 -04:00
Leijurv	f970f932c7	great	2019-03-23 10:52:03 -07:00
Leijurv	52d2741f52	and lets try making it fail delibrately	2019-03-23 10:31:36 -07:00
Leijurv	7bc6765cac	rart	2019-03-23 10:13:14 -07:00
Leijurv	85b2aea6e9	where is this writing???	2019-03-23 09:52:49 -07:00
Leijurv	c6ba5481d9	one final attempt	2019-03-22 22:33:40 -07:00
Leijurv	81f47d5632	forgot file name lollll	2019-03-22 22:19:13 -07:00
Leijurv	9b1440ed2c	that needs to be allowed	2019-03-22 22:07:12 -07:00
Leijurv	2a8dcee028	write to a file to indicate success	2019-03-22 22:05:27 -07:00
Leijurv	277ba3643c	Merge branch 'master' into 1.13.2	2019-03-22 21:24:43 -07:00
Leijurv	e5fbaf60f3	shutdownminecraftapplet	2019-03-22 21:04:35 -07:00
Leijurv	0deb854e1b	v1.3.0	2019-03-21 16:40:18 -07:00
Leijurv	8268e3ec1b	Merge branch 'master' into 1.13.2	2019-03-21 15:51:36 -07:00
Leijurv	af91da6a28	Merge branch 'master' into 1.13.2	2019-03-19 18:12:26 -07:00
Leijurv	9a15a65ad5	not needed anymore	2019-03-19 13:59:56 -07:00
Leijurv	0cbe9f81c8	Merge branch 'master' into 1.13.2	2019-03-15 16:58:23 -07:00
Leijurv	42afd2dd54	maybe proper exit code	2019-03-15 16:49:36 -07:00
Leijurv	315929f31c	hey so what if we didnt do that	2019-03-15 16:39:59 -07:00
Leijurv	358aa80280	docker time	2019-03-15 16:22:51 -07:00
Leijurv	1dd9e11994	documentation resigned	2019-03-15 16:19:07 -07:00
Leijurv	5a8f02c944	unscuff everything	2019-03-15 16:11:14 -07:00
Leijurv	f248a5b677	make runClient work	2019-03-15 15:32:51 -07:00
Leijurv	e4a49c5529	fix launchtesting not found on runClient	2019-03-15 14:00:11 -07:00
Leijurv	449b44ba50	line	2019-03-14 16:32:14 -07:00
Leijurv	a00eec402e	i love retina wtf	2019-03-14 16:32:04 -07:00
Leijurv	717779f742	air is stupid	2019-03-14 16:06:32 -07:00
Leijurv	6f843bd24d	Merge branch 'master' into 1.13.2	2019-03-13 20:09:08 -07:00
Leijurv	d79fbea433	scuffed air	2019-03-13 18:08:15 -07:00
Leijurv	4d22c10ddb	unscuff water, thanks wwe	2019-03-12 23:08:06 -07:00
Leijurv	1ea92a6092	😎	2019-03-12 22:49:23 -07:00
Leijurv	66eba84d06	consistent spacing	2019-03-12 18:54:36 -07:00
Leijurv	92e39b5d1d	its over its done	2019-03-12 18:45:54 -07:00
Leijurv	0ddc47f473	i am rarted	2019-03-12 18:21:29 -07:00
Leijurv	ddfeca6947	unproject click cursed	2019-03-12 18:00:30 -07:00
Leijurv	6bd2e90cfd	crash when pathing near shulker boxes	2019-03-12 17:18:58 -07:00
Leijurv	82505ddb01	online mode via env	2019-03-12 17:18:52 -07:00
Leijurv	2790d1d308	Merge branch 'master' into 1.13.2	2019-03-12 16:19:06 -07:00
Leijurv	11e503a022	many fixes	2019-03-12 16:17:43 -07:00
Leijurv	6fe49380ba	pwned	2019-03-12 15:42:25 -07:00
Leijurv	1f2e267e3d	fix a bunch of scuff	2019-03-12 15:41:58 -07:00
Leijurv	4cf6783622	fix the tests	2019-03-12 09:38:05 -07:00
Brady	82d77a7bac	Update MixinGradle to 0.6.2 Includes fix ensuring that the SRGs are generated prior to Mixin annotation processing	2019-03-12 01:43:03 -05:00
Brady	841a927033	Merge remote-tracking branch 'origin/master' into 1.13.2	2019-03-12 01:09:11 -05:00
Brady	5a16561954	Working 1.13.2 development environment Including a couple bugfixes to bad 1.13.2 code!!!	2019-03-12 01:05:39 -05:00
Brady	e2cc51908b	Notch builds	2019-03-08 23:18:00 -06:00
Brady	1390e04435	Add versions in parenthesis for todos to fix stuff	2019-03-08 15:14:52 -06:00
Brady	84d961cbab	Fix usages of Setting#get()	2019-03-08 15:12:55 -06:00
Brady	87b9d3915c	Fix compiler errors unproject needs to be resolved	2019-03-08 15:03:58 -06:00
Brady	c38d17563d	Resolve merge conflicts oh my god I should've updated my local branch before doing this	2019-03-08 14:44:49 -06:00
Brady	0c2af85ac0	Update to 1.13.2 Still need to setup method of launching, and Mixin support for ModLauncher	2019-03-08 14:30:43 -06:00