Merge branch '1.13.2' into 1.14.4

Merge branch 'master' into 1.13.2
bypass
2019-08-17 16:10:59 -07:00 · 2019-08-17 16:07:26 -07:00 · 2019-08-14 22:31:46 -07:00 · 2019-07-25 16:02:29 -07:00 · 2019-07-25 15:50:58 -07:00 · 2019-07-24 15:43:37 -07:00
352 changed files with 4533 additions and 23508 deletions
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -11,25 +11,15 @@ 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
-
-Linux: `~/.minecraft/logs/`
-
-Windows: `%appdata%/.minecraft/logs/`
-
-Mac: `/Library/Application\ Support/minecraft/logs/`
+You can find your logs in `%appdata%/.minecraft/logs/` (Windows) or `/Library/Application\ Support/minecraft/logs` (Mac).

 ## How to reproduce
 Add your steps to reproduce the issue/bug experienced here.

-## Modified settings
-To get the modified settings run `#modified` in game
-
 ## Final checklist
- [x] I know how to properly use check boxes 
 - [ ] I have included the version of Minecraft I'm running, baritone's version and forge mods (if used).
 - [ ] I have included logs, exceptions and / or steps to reproduce the issue.
- [ ] I have not used any OwO's or UwU's in this issue.
+- [ ] I have not used any OwO's or UwU's in this issue.
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -10,5 +10,4 @@ assignees: ''
 With as much detail as possible, describe your question and what you may need help with.

 ## Final checklist
- [x] I know how to properly use check boxes 
- [ ] I have not used any OwO's or UwU's in this issue.
+- [ ] I have not used any OwO's or UwU's in this issue.
--- a/.github/ISSUE_TEMPLATE/suggestion.md
+++ b/.github/ISSUE_TEMPLATE/suggestion.md
@@ -16,5 +16,4 @@ If applicable, what settings/customizability should be offered to tweak the func
 Describe how your suggestion would improve Baritone, or the reason behind it being added.

 ## Final checklist
- [x] I know how to properly use check boxes 
- [ ] I have not used any OwO's or UwU's in this issue.
+- [ ] I have not used any OwO's or UwU's in this 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@v3
-    - name: Set up JDK 8
-      uses: actions/setup-java@v3
-      with:
-        java-version: '8'
-        distribution: 'temurin'
-        
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-      
-    - name: Build with Gradle
-      run: ./gradlew build
-      
-    - name: Archive Artifacts
-      uses: actions/upload-artifact@v3
-      with:
-        name: Artifacts
-        path: dist/
-        
-    - name: Archive mapping.txt
-      uses: actions/upload-artifact@v3
-      with:
-        name: Mappings
-        path: build/tmp/proguard/mapping.txt
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -1,26 +0,0 @@
-
-name: Tests
-
-on:
-  push:
-  pull_request:
-
-jobs:
-  test:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 8
-      uses: actions/setup-java@v3
-      with:
-        java-version: '8'
-        distribution: 'temurin'
-        
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-      
-    - name: Executing tests
-      run: ./gradlew test
-    
--- a/.gitignore
+++ b/.gitignore
@@ -11,24 +11,13 @@ build/
 classes/
 *.class

+/out
+
 # IntelliJ Files
 .idea/
 *.iml
-*.ipr
-*.iws
 /logs/

-# Eclipse Files
-.classpath
-.project
-.settings/
-baritone_Client.launch
-
 # Copyright Files
 !/.idea/copyright/Baritone.xml
 !/.idea/copyright/profiles_settings.xml
-
-.vscode/launch.json
-
-libs/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar
-libs/java-objc-bridge-1.1.jar
--- a/.gitmessage
+++ b/.gitmessage
@@ -1,31 +0,0 @@
-<emoji> <title> (<ticket>)
-
-# 📝 Update README.md (WD-1234)
-# ✅ Add unit test for inputs (WD-1234)
-
-# <emoji> can be:
-# 🎨 :art: when improving structure of the code
-# ⚡️ :zap: when improving performance
-# 🔥 :fire: when removing code or files
-# ✨ :sparkles: when introducing new features
-# 🚧 :construction: when work in progress
-# 🔨 :hammer: when refactoring code
-# 📝 :memo: when writing docs
-# 💄 :lipstick: when updating the UI and style files
-# 📈 :chart_with_upwards_trend: when adding analytics or tracking code
-# 🌐 :globe_with_meridians: when adding internationalization and localization
-# ✏️ :pencil2: when fixing typos
-# 🚚 :truck: when moving or renaming files
-# ✅ :white_check_mark: when adding tests
-
-# 👌 :ok_hand: when updating code due to code review changes
-# 🐛 :bug: when fixing a bug
-# 🚑 :ambulance: when doing a critical hotfix
-# 🚨 :rotating_light: when removing linter warnings
-
-# 🔀 :twisted_rightwards_arrows: when merging branches
-# ⬆️ :arrow_up: when upgrading dependencies
-# ⬇️ :arrow_down: when downgrading dependencies
-# 🔧 :wrench: when changing configuration files
-# 🔖 :bookmark: when releasing / version tagging
-# 💚 :green_heart: when fixing the CI build
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,29 @@
+language: java
+
+sudo: required
+
+services:
+- docker
+
+install:
+- travis_retry docker build -t cabaletta/baritone .
+
+script:
+- docker run --rm 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/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -14,10 +14,10 @@ appearance, race, religion, or sexual identity and orientation.
 Examples of behavior that contributes to creating a positive environment
 include:

-* No Anime (including uwu's or owo's)
+* No Anime
 * Using welcoming and inclusive language
 * Being respectful of differing viewpoints and experiences
-* Giving and gracefully accepting constructive criticism
+* Gracefully accepting constructive criticism
 * Focusing on what is best for the community
 * Showing empathy towards other community members

@@ -29,7 +29,7 @@ Examples of unacceptable behavior by participants include:
 * ~~Trolling, insulting/derogatory comments, and personal or political attacks~~
 * Public or private harassment
 * Publishing others' private information, such as a physical or electronic
- address, without explicit permission or consent
+ address, without explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
 professional setting

--- a/8
+++ b/8
@@ -1,5 +1,7 @@
 FROM debian:stretch

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

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

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

 WORKDIR /code

+# this .deb is specially patched to support lwjgl
+# source: https://github.com/tectonicus/tectonicus/issues/60#issuecomment-154239173
+RUN dpkg -i scripts/xvfb_1.16.4-1_amd64.deb
+
 RUN ./gradlew build
--- a/README.md
+++ b/README.md
@@ -1,81 +1,44 @@
 # 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>
+[![Build Status](https://travis-ci.com/cabaletta/baritone.svg?branch=master)](https://travis-ci.com/cabaletta/baritone/)
+[![Release](https://img.shields.io/github/release/cabaletta/baritone.svg)](https://github.com/cabaletta/baritone/releases/)
+[![License](https://img.shields.io/badge/license-LGPL--3.0%20with%20anime%20exception-green.svg)](LICENSE)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/a73d037823b64a5faf597a18d71e3400)](https://www.codacy.com/app/leijurv/baritone?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=cabaletta/baritone&amp;utm_campaign=Badge_Grade)
+[![HitCount](http://hits.dwyl.com/cabaletta/baritone.svg)](http://hits.dwyl.com/cabaletta/baritone/)
+[![GitHub All Releases](https://img.shields.io/github/downloads/cabaletta/baritone/total.svg)](https://github.com/cabaletta/baritone/releases/)
+[![Minecraft](https://img.shields.io/badge/MC-1.12.2-brightgreen.svg)](https://github.com/cabaletta/baritone/tree/master/)
+[![Minecraft](https://img.shields.io/badge/MC-1.13.2-brightgreen.svg)](https://github.com/cabaletta/baritone/tree/1.13.2/)
+[![Minecraft](https://img.shields.io/badge/MC-1.14.4-brightgreen.svg)](https://github.com/cabaletta/baritone/tree/1.14.4/)
+[![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.8%20/%20v1.3.4-brightgreen.svg)](https://impactdevelopment.github.io/)
+[![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-green.svg)](https://gitlab.com/emc-mods-indrit/baritone_api)
+[![WWE integration](https://img.shields.io/badge/WWE%20%22integration%22-master%3F-green.svg)](https://wweclient.com/)
+[![Future integration](https://img.shields.io/badge/Future%20integration-Soon™%3F%3F%3F-red.svg)](https://futureclient.net/)
+[![forthebadge](https://forthebadge.com/images/badges/built-with-swag.svg)](http://forthebadge.com/)
+[![forthebadge](https://forthebadge.com/images/badges/mom-made-pizza-rolls.svg)](http://forthebadge.com/)

-<p align="center">
-  <a href="#Baritone"><img src="https://img.shields.io/badge/MC-1.12.2-brightgreen.svg" alt="Minecraft"/></a>
-  <a href="#Baritone"><img src="https://img.shields.io/badge/MC-1.13.2-yellow.svg" alt="Minecraft"/></a>
-  <a href="#Baritone"><img src="https://img.shields.io/badge/MC-1.14.4-yellow.svg" alt="Minecraft"/></a>
-  <a href="#Baritone"><img src="https://img.shields.io/badge/MC-1.15.2-yellow.svg" alt="Minecraft"/></a>
-  <a href="#Baritone"><img src="https://img.shields.io/badge/MC-1.16.5-brightgreen.svg" alt="Minecraft"/></a>
-  <a href="#Baritone"><img src="https://img.shields.io/badge/MC-1.17.1-yellow.svg" alt="Minecraft"/></a>
-  <a href="#Baritone"><img src="https://img.shields.io/badge/MC-1.18.2-brightgreen.svg" alt="Minecraft"/></a>
-  <a href="#Baritone"><img src="https://img.shields.io/badge/MC-1.19.2-brightgreen.svg" alt="Minecraft"/></a>
-  <a href="#Baritone"><img src="https://img.shields.io/badge/MC-1.19.4-brightgreen.svg" alt="Minecraft"/></a>
-  <a href="#Baritone"><img src="https://img.shields.io/badge/MC-1.20.1-brightgreen.svg" alt="Minecraft"/></a>
-</p>
+A Minecraft pathfinder bot. 

-<p align="center">
-  <a href="https://travis-ci.com/cabaletta/baritone/"><img src="https://travis-ci.com/cabaletta/baritone.svg?branch=master" alt="Build Status"/></a>
-  <a href="https://github.com/cabaletta/baritone/releases/"><img src="https://img.shields.io/github/release/cabaletta/baritone.svg" alt="Release"/></a>
-  <a href="LICENSE"><img src="https://img.shields.io/badge/license-LGPL--3.0%20with%20anime%20exception-green.svg" alt="License"/></a>
-  <a href="https://www.codacy.com/gh/cabaletta/baritone/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=cabaletta/baritone&amp;utm_campaign=Badge_Grade"><img src="https://app.codacy.com/project/badge/Grade/cadab857dab049438b6e28b3cfc5570e" alt="Codacy Badge"/></a>
-  <a href="https://github.com/cabaletta/baritone/blob/master/CODE_OF_CONDUCT.md"><img src="https://img.shields.io/badge/%E2%9D%A4-code%20of%20conduct-blue.svg?style=flat" alt="Code of Conduct"/></a>
-  <a href="https://snyk.io/test/github/cabaletta/baritone?targetFile=build.gradle"><img src="https://snyk.io/test/github/cabaletta/baritone/badge.svg?targetFile=build.gradle" alt="Known Vulnerabilities"/></a>
-  <a href="https://github.com/cabaletta/baritone/issues/"><img src="https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat" alt="Contributions welcome"/></a>
-  <a href="https://github.com/cabaletta/baritone/issues/"><img src="https://img.shields.io/github/issues/cabaletta/baritone.svg" alt="Issues"/></a>
-  <a href="https://github.com/cabaletta/baritone/issues?q=is%3Aissue+is%3Aclosed"><img src="https://img.shields.io/github/issues-closed/cabaletta/baritone.svg" alt="GitHub issues-closed"/></a>
-  <a href="https://github.com/cabaletta/baritone/pulls/"><img src="https://img.shields.io/github/issues-pr/cabaletta/baritone.svg" alt="Pull Requests"/></a>
-  <a href="https://github.com/cabaletta/baritone/graphs/contributors/"><img src="https://img.shields.io/github/contributors/cabaletta/baritone.svg" alt="GitHub contributors"/></a>
-  <a href="https://github.com/cabaletta/baritone/commit/"><img src="https://img.shields.io/github/commits-since/cabaletta/baritone/v1.0.0.svg" alt="GitHub commits"/></a>
-  <img src="https://img.shields.io/github/languages/code-size/cabaletta/baritone.svg" alt="Code size"/>
-  <img src="https://img.shields.io/github/repo-size/cabaletta/baritone.svg" alt="GitHub repo size"/>
-  <img src="https://tokei.rs/b1/github/cabaletta/baritone?category=code" alt="Lines of Code"/>
-</p>
+Baritone is the pathfinding system used in [Impact](https://impactdevelopment.github.io/) since 4.4. There's a [showcase video](https://www.youtube.com/watch?v=yI8hgW_m6dQ) made by @Adovin#3153 on Baritone's integration into Impact. [Here's](https://www.youtube.com/watch?v=StquF69-_wI) a video I made showing off what it can do.

-<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/lambda-client/lambda"><img src="https://img.shields.io/badge/Lambda%20integration-v1.2.17-brightgreen.svg" alt="Lambda 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>
+The easiest way to install Baritone is to install [Impact](https://impactdevelopment.github.io/), which comes with Baritone. The second easiest way (for 1.12.2 only) is to install the v1.2.* forge api jar from [releases](https://github.com/cabaletta/baritone/releases). Otherwise, see [Installation & setup](SETUP.md). Once Baritone is installed, look [here](USAGE.md) for instructions on how to use it.

-<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 is the pathfinding system used in [Impact](https://impactclient.net/) since 4.4. [Here's](https://www.youtube.com/watch?v=StquF69-_wI) a (very old!) video I made showing off what it can do.
-
-[**Baritone Discord Server**](http://discord.gg/s6fRBAUpmr)
-
-**Quick download links:**
-
-| Forge                                                                                                         | Fabric                                                                                                        |
-|---------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------|
-| [1.12.2 Forge](https://github.com/cabaletta/baritone/releases/download/v1.2.17/baritone-api-forge-1.2.17.jar) |                                                                                                               |
-| [1.16.5 Forge](https://github.com/cabaletta/baritone/releases/download/v1.6.4/baritone-api-forge-1.6.4.jar)   | [1.16.5 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.6.4/baritone-api-fabric-1.6.4.jar) |
-| [1.17.1 Forge](https://github.com/cabaletta/baritone/releases/download/v1.7.3/baritone-api-forge-1.7.3.jar)   | [1.17.1 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.7.3/baritone-api-fabric-1.7.3.jar) |
-| [1.18.2 Forge](https://github.com/cabaletta/baritone/releases/download/v1.8.4/baritone-api-forge-1.8.4.jar)   | [1.18.2 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.8.4/baritone-api-fabric-1.8.4.jar) |
-| [1.19.2 Forge](https://github.com/cabaletta/baritone/releases/download/v1.9.4/baritone-api-forge-1.9.4.jar)   | [1.19.2 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.9.4/baritone-api-fabric-1.9.4.jar) |
-| [1.19.3 Forge](https://github.com/cabaletta/baritone/releases/download/v1.9.1/baritone-api-forge-1.9.1.jar)   | [1.19.3 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.9.1/baritone-api-fabric-1.9.1.jar) |
-| [1.19.4 Forge](https://github.com/cabaletta/baritone/releases/download/v1.9.3/baritone-api-forge-1.9.3.jar)   | [1.19.4 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.9.3/baritone-api-fabric-1.9.3.jar) |
-| [1.20.1 Forge](https://github.com/cabaletta/baritone/releases/download/v1.10.1/baritone-api-forge-1.10.1.jar)   | [1.20.1 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.10.1/baritone-api-fabric-1.10.1.jar) |
-
-**How to immediately get started:** Type `#goto 1000 500` in chat to go to x=1000 z=500. Type `#mine diamond_ore` to mine diamond ore. Type `#stop` to stop. For more, read [the usage page](USAGE.md) and/or watch this [tutorial playlist](https://www.youtube.com/playlist?list=PLnwnJ1qsS7CoQl9Si-RTluuzCo_4Oulpa)
-
-For other versions of Minecraft or more complicated situations or for development, see [Installation & setup](SETUP.md). Also consider just installing [Impact](https://impactclient.net/), which comes with Baritone and is easier to install than wrangling with version JSONs and zips. For 1.16.5, [click here](https://www.youtube.com/watch?v=_4eVJ9Qz2J8) and see description. Once Baritone is installed, look [here](USAGE.md) for instructions on how to use it. There's a [showcase video](https://youtu.be/CZkLXWo4Fg4) made by @Adovin#6313 on Baritone which I recommend.
+For 1.14.4, [click here](https://www.dropbox.com/s/rkml3hjokd3qv0m/1.14.4-Baritone.zip?dl=1). Or [with optifine](https://github.com/cabaletta/baritone/issues/797).

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

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

 1Leijurv3DWTrGAfmmiTphjhXLvQiHg7K2

@@ -93,19 +56,15 @@ Here are some links to help to get started:

 - [Usage (chat control)](USAGE.md)

-## Stars over time
-
-[![Stargazers over time](https://starchart.cc/cabaletta/baritone.svg)](https://starchart.cc/cabaletta/baritone)
-
 # API

 The API is heavily documented, you can find the Javadocs for the latest release [here](https://baritone.leijurv.com/).
 Please note that usage of anything located outside of the ``baritone.api`` package is not supported by the API release
 jar.

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

-```java
+```
 BaritoneAPI.getSettings().allowSprint.value = true;
 BaritoneAPI.getSettings().primaryTimeoutMS.value = 2000L;

@@ -116,22 +75,12 @@ BaritoneAPI.getProvider().getPrimaryBaritone().getCustomGoalProcess().setGoalAnd

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

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

 ## How is it so fast?

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

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

-It's named for FitMC's deep sultry voice.
+It's named for FitMC's deep sultry voice. 
--- a/SETUP.md
+++ b/SETUP.md
@@ -1,8 +1,8 @@
 # Installation

-The easiest way to install Baritone is to install [Impact](https://impactclient.net/), which comes with Baritone.
+The easiest way to install Baritone is to install [Impact](https://impactdevelopment.github.io/), 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.
+For 1.14.4, [click here](https://www.dropbox.com/s/rkml3hjokd3qv0m/1.14.4-Baritone.zip?dl=1).

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

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

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

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

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

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

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

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

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

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

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

 ## Build it yourself
 - Clone or download Baritone
@@ -43,36 +47,60 @@ If another one of your Forge mods has a Baritone integration, you want `baritone
 ## Command Line
 On Mac OSX and Linux, use `./gradlew` instead of `gradlew`.

-If you have errors with a package missing please make sure you have setup your environment, and are using Oracle JDK 8 for 1.12.2-1.16.5, JDK 16+ for 1.17.1, and JDK 17+ for 1.18.1.
+Setting up the Environment:

-To check which java you are using do 
-`java -version` in a command prompt or terminal.
-If you are using anything above OpenJDK 8 for 1.12.2-1.16.5, it might not work because the Java distributions above JDK 8 using may not have the needed javax classes.
+```
+$ gradlew setupDecompWorkspace
+$ gradlew --refresh-dependencies
+```

-Download java: https://adoptium.net/
-#### 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
+Running Baritone:

-If you see something like
+```
+$ gradlew runClient
+```

-`% 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
-
-### Building Baritone
-
-These tasks depend on the minecraft version, but are (for the most part) standard for building mods.
-
-for more details, see [the build ci action](/.github/workflows/gradle_build.yml)
+For information on how to build baritone, see [Building Baritone](#building-baritone)

 ## IntelliJ
 - Open the project in IntelliJ as a Gradle project
+  
+  ![Image](https://i.imgur.com/jw7Q6vY.png)
+
+- Run the Gradle tasks `setupDecompWorkspace` then `genIntellijRuns`
+  
+  ![Image](https://i.imgur.com/QEfVvWP.png)
+
 - Refresh the Gradle project (or, to be safe, just restart IntelliJ)
- depending on the minecraft version, you may need to run `setupDecompWorkspace` or `genIntellijRuns` in order to get everything working
+  
+  ![Image](https://i.imgur.com/3V7EdWr.png)
+
+- Select the "Minecraft Client" launch config
+  
+  ![Image](https://i.imgur.com/1qz2QGV.png)
+
+- Click on ``Edit Configurations...`` from the same dropdown and select the "Minecraft Client" config
+  
+  ![Image](https://i.imgur.com/s4ly0ZF.png)
+
+- In `Edit Configurations...` you need to select `baritone_launch` for `Use classpath of module:`.
+  
+  ![Image](https://i.imgur.com/hrLhG9u.png)
+
+# Building
+
+Make sure that you have properly [setup](#setup) the environment before trying to build it.
+
+## Command Line
+
+```
+$ gradlew build
+```
+
+## IntelliJ
+
+- Navigate to the gradle tasks on the right tab as follows
+
+  ![Image](https://i.imgur.com/PE6r9iN.png)
+
+- Double click on **build** to run it
--- a/USAGE.md
+++ b/USAGE.md
@@ -8,62 +8,39 @@ Baritone commands can also by default be typed in the chatbox. However if you ma

 To disable direct chat control (with no prefix), turn off the `chatControl` setting. To disable chat control with the `#` prefix, turn off the `prefixControl` setting. In Impact, `.b` cannot be disabled. Be careful that you don't leave yourself with all control methods disabled (if you do, reset your settings by deleting the file `minecraft/baritone/settings.txt` and relaunching).

-# For Baritone 1.2.10+, 1.3.5+, 1.4.2+
-
-Lots of the commands have changed, BUT `#help` is improved vastly (its clickable! commands have tab completion! oh my!).
-
-Try `#help` I promise it won't just send you back here =)
-
-"wtf where is cleararea" -> look at `#help sel`
-
-"wtf where is goto death, goto waypoint" -> look at `#help wp` 
-
-just look at `#help` lmao
-
-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`
+`help` for (rudimentary) help. You can see what it says [here](https://github.com/cabaletta/baritone/blob/master/src/api/java/baritone/api/utils/ExampleBaritoneControl.java#L47).

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

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

+
+For the rest of the commands, you can take a look at the code [here](https://github.com/cabaletta/baritone/blob/master/src/api/java/baritone/api/utils/ExampleBaritoneControl.java).
+
 All the settings and documentation are <a href="https://github.com/cabaletta/baritone/blob/master/src/api/java/baritone/api/Settings.java">here</a>. If you find HTML easier to read than Javadoc, you can look <a href="https://baritone.leijurv.com/baritone/api/Settings.html#field.detail">here</a>.

 There are about a hundred settings, but here are some fun / interesting / important ones that you might want to look at changing in normal usage of Baritone. The documentation for each can be found at the above links.
@@ -83,8 +60,6 @@ There are about a hundred settings, but here are some fun / interesting / import
 - `worldExploringChunkOffset`
 - `acceptableThrowawayItems`
 - `blocksToAvoidBreaking`
- `mineScanDroppedItems`
- `allowDiagonalAscend`



@@ -104,4 +79,4 @@ So you'll need to use the `#` prefix or edit `baritone/settings.txt` in your Min

 ## Why can I do `.goto x z` in Impact but nowhere else? Why can I do `-path to x z` in KAMI but nowhere else?
 These are custom commands that they added; those aren't from Baritone.
-The equivalent you're looking for is `goto x z`.
+The equivalent you're looking for is `goal x z` then `path`.
--- a/build.gradle
+++ b/build.gradle
@@ -16,35 +16,33 @@
 */

 group 'baritone'
-version '1.2.17'
+version '1.4.0'

 buildscript {
    repositories {
+        jcenter()
        maven {
            name = 'forge'
-            url = 'https://files.minecraftforge.net/maven'
+            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/'
        }
-        jcenter()
    }

    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:4.+' // TODO: 5.+. `doHackyStuff` relies on 4.x internals.
-        classpath 'org.spongepowered:mixingradle:0.7-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 org.apache.tools.ant.taskdefs.condition.Os

 apply plugin: 'java'
-apply plugin: 'maven-publish'
 apply plugin: 'net.minecraftforge.gradle'
-apply from: 'hacks.gradle'
-ext.doHackyStuff(Class.forName('net.minecraftforge.gradle.mcp.task.GenerateSRG')) // TODO: fg 5.0 - `ext.doHackyStuff(Class.forName('net.minecraftforge.gradle.mcp.tasks.GenerateSRG'))`
 apply plugin: 'org.spongepowered.mixin'

 sourceCompatibility = targetCompatibility = '1.8'
@@ -78,25 +76,49 @@ sourceSets {
    }
 }

+task sourceJar(type: Jar, dependsOn: classes) {
+    classifier = 'sources'
+    from sourceSets.api.allSource
+}
+
 minecraft {
-    mappings channel: 'stable', version: '39-1.12'
+    mappings channel: 'snapshot', version: '20190814-1.14.3'
+    reobfMappings 'notch'
+
    runs {
-        def nativesOutput = extractNatives.output // TODO: fg 5.0 - `def nativesOutput = extractNatives.output.get()`
-        println("[Baritoe] Detected natives: ${nativesOutput}")
        client {
            workingDirectory project.file('run')
            source sourceSets.launch

-            main 'net.minecraft.launchwrapper.Launch'
+            main 'baritone.launch.LaunchTesting'

-            args '--gameDir', '.'
-            args '--version', '1.12.2'
-            args '--assetsDir', downloadAssets.output
-            args '--assetIndex', '{asset_index}'
-            args '--accessToken', 'INVALID'
+            environment 'assetIndex', '{asset_index}'
+            environment 'assetDirectory', downloadAssets.output
+            environment 'nativesDirectory', extractNatives.output

-            args '--tweakClass', 'baritone.launch.BaritoneTweaker'
-            jvmArgs "-Dorg.lwjgl.librarypath=${nativesOutput}"
+            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"
+            }
        }
    }
 }
@@ -106,81 +128,37 @@ 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 {
-        name = 'babbaj-repo'
-        url = 'https://babbaj.github.io/maven/'
-    }
-}
-
-// fix forge gradle 4+ bug with 1.12.2
-afterEvaluate {
-    configurations.minecraft {
-        exclude group: 'net.minecraftforge', module: 'mergetool'
-    }
-}
-
-// lwjgl2 hack for running game on arm64 mac os
-afterEvaluate {
-    def os = org.gradle.internal.os.OperatingSystem.current()
-    if (os.isMacOsX()) {
-        def arch = System.getProperty("os.arch").toLowerCase()
-        println("Detected Mac OS X running on ${arch}")
-        if (arch == "aarch64") {
-            println("Configurating aarch64 dependencies.")
-
-            configurations.minecraft {
-                exclude group: 'ca.weblite', module: 'java-objc-bridge'
-            }
-
-            dependencies {
-                // https://github.com/MinecraftMachina/lwjgl/releases/download/2.9.4-20150209-mmachina.2/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar
-                minecraft files("libs/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar")
-                // TODO: use prism launcher maven
-                // https://github.com/MinecraftMachina/Java-Objective-C-Bridge/releases/download/1.1.0-mmachina.1/java-objc-bridge-1.1.jar
-                minecraft files("libs/java-objc-bridge-1.1.jar") // TODO: use prism launcher maven
-                minecraft(group: 'net.java.dev.jna', name: 'jna') {
-                    version {
-                        strictly '5.12.1'
-                    }
-                }
-            }
-        }
-    }
 }

 dependencies {
-    minecraft group: 'net.minecraft', name: 'joined', version: '1.12.2'
-    implementation(group: 'net.minecraft', name: 'launchwrapper', version: '1.12') {
-        transitive = false
+    minecraft 'com.github.ImpactDevelopment:Vanilla:1.14.4'
+
+    runtime launchCompile('net.minecraft:launchwrapper:1.12') {
+        exclude module: 'lwjgl'
    }
-
-    def asmVersion = '9.5'
-    implementation group: 'org.ow2.asm', name: 'asm', version: asmVersion
-    implementation group: 'org.ow2.asm', name: 'asm-tree', version: asmVersion
-    implementation group: 'org.ow2.asm', name: 'asm-commons', version: asmVersion
-    implementation group: 'org.ow2.asm', name: 'asm-analysis', version: asmVersion
-    implementation group: 'org.ow2.asm', name: 'asm-util', version: asmVersion
-
-    launchImplementation('com.github.ImpactDevelopment:SimpleTweaker:1.2')
-    launchImplementation('org.spongepowered:mixin:0.7.11-SNAPSHOT') {
+    runtime launchCompile('org.ow2.asm:asm-debug-all:5.2')
+    runtime launchCompile('com.github.ImpactDevelopment:SimpleTweaker:1.2')
+    runtime launchCompile('org.spongepowered:mixin:0.7.11-SNAPSHOT') {
        // Mixin includes a lot of dependencies that are too up-to-date
-        transitive = false
+        exclude module: 'launchwrapper'
+        exclude module: 'guava'
+        exclude module: 'gson'
+        exclude module: 'commons-io'
+        exclude module: 'log4j-core'
    }
-    launchAnnotationProcessor 'org.spongepowered:mixin:0.8.4-SNAPSHOT:processor'
-    launchImplementation('dev.babbaj:nether-pathfinder:0.34')
-    implementation 'dev.babbaj:nether-pathfinder:0.34'
+
    testImplementation 'junit:junit:4.12'
 }

 mixin {
+    defaultObfuscationEnv searge
    add sourceSets.launch, 'mixins.baritone.refmap.json'
 }

@@ -194,19 +172,13 @@ 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',
-                'TweakClass': 'baritone.launch.BaritoneTweaker',
+
                'Implementation-Title': 'Baritone',
                'Implementation-Version': version
        )
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -20,6 +20,6 @@ repositories {
 }

 dependencies {
-    implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
-    implementation group: 'commons-io', name: 'commons-io', version: '2.6'
+    compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
+    compile group: 'commons-io', name: 'commons-io', version: '2.6'
 }
--- a/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java
+++ b/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java
@@ -32,41 +32,35 @@ import java.nio.file.Paths;
 class BaritoneGradleTask extends DefaultTask {

    protected static final String
-            PROGUARD_ZIP = "proguard.zip",
-            PROGUARD_JAR = "proguard.jar",
-            PROGUARD_CONFIG_TEMPLATE = "scripts/proguard.pro",
-            PROGUARD_CONFIG_DEST = "template.pro",
-            PROGUARD_API_CONFIG = "api.pro",
-            PROGUARD_STANDALONE_CONFIG = "standalone.pro",
-            PROGUARD_EXPORT_PATH = "proguard_out.jar",
+            PROGUARD_ZIP                    = "proguard.zip",
+            PROGUARD_JAR                    = "proguard.jar",
+            PROGUARD_CONFIG_TEMPLATE        = "scripts/proguard.pro",
+            PROGUARD_CONFIG_DEST            = "template.pro",
+            PROGUARD_API_CONFIG             = "api.pro",
+            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";

    protected String artifactName, artifactVersion;
-    protected Path artifactPath, artifactUnoptimizedPath, artifactApiPath, artifactStandalonePath, artifactForgeApiPath, artifactForgeStandalonePath, proguardOut;
+    protected Path artifactPath, artifactUnoptimizedPath, artifactApiPath, artifactStandalonePath, proguardOut;

    protected void verifyArtifacts() throws IllegalStateException {
        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));
+        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);

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

@@ -82,7 +76,7 @@ class BaritoneGradleTask extends DefaultTask {
    }

    protected Path getRelativeFile(String file) {
-        return Paths.get(this.getProject().file(file).getAbsolutePath());
+        return Paths.get(new File(file).getAbsolutePath());
    }

    protected Path getTemporaryFile(String file) {
--- a/buildSrc/src/main/java/baritone/gradle/task/CreateDistTask.java
+++ b/buildSrc/src/main/java/baritone/gradle/task/CreateDistTask.java
@@ -45,8 +45,6 @@ public class CreateDistTask extends BaritoneGradleTask {
        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));

        // NIO will not automatically create directories
        Path dir = getRelativeFile("dist/");
@@ -58,11 +56,9 @@ public class CreateDistTask extends BaritoneGradleTask {
        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);

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

--- a/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java
+++ b/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java
@@ -19,61 +19,43 @@ package baritone.gradle.task;

 import baritone.gradle.util.Determinizer;
 import org.apache.commons.io.IOUtils;
-import org.gradle.api.Project;
-import org.gradle.api.artifacts.Configuration;
-import org.gradle.api.artifacts.Dependency;
+import org.gradle.api.plugins.JavaPluginConvention;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.TaskAction;
-import org.gradle.api.tasks.TaskCollection;
-import org.gradle.api.tasks.compile.ForkOptions;
-import org.gradle.api.tasks.compile.JavaCompile;
-import org.gradle.internal.jvm.Jvm;
-
-import java.io.File;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-import java.util.Objects;

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

+import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
+
 /**
 * @author Brady
 * @since 10/11/2018
 */
 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;
-    private File pathfinder;
-
    @TaskAction
    protected void exec() throws Exception {
        super.verifyArtifacts();

        // "Haha brady why don't you make separate tasks"
+        processArtifact();
        downloadProguard();
        extractProguard();
        generateConfigs();
-        acquireDependencies();
-        processArtifact();
        proguardApi();
        proguardStandalone();
        cleanup();
@@ -84,7 +66,7 @@ public class ProguardTask extends BaritoneGradleTask {
            Files.delete(this.artifactUnoptimizedPath);
        }

-        Determinizer.determinize(this.artifactPath.toString(), this.artifactUnoptimizedPath.toString(), Arrays.asList(pathfinder), false);
+        Determinizer.determinize(this.artifactPath.toString(), this.artifactUnoptimizedPath.toString());
    }

    private void downloadProguard() throws Exception {
@@ -104,84 +86,32 @@ public class ProguardTask extends BaritoneGradleTask {
        }
    }

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

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

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

+        // Discover all of the libraries that we will need to acquire from gradle
+        acquireDependencies().forEach(f -> {
+            if (f.toString().endsWith("-recomp.jar")) {
+                // remove MCP mapped jar
+                return;
+            }
+            if (f.toString().endsWith("client-extra.jar")) {
+                // go from the extra to the original downloaded client
+                f = new File(f.getParentFile(), "client.jar");
+            }
+            template.add(2, "-libraryjars '" + f + "'");
+        });
+
        // API config doesn't require any changes from the changes that we made to the template
        Files.write(getTemporaryFile(PROGUARD_API_CONFIG), template);

@@ -189,147 +119,20 @@ 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 static final class Pair<A, B> {
-        public final A a;
-        public final B b;
-
-        private Pair(final A a, final B b) {
-            this.a = a;
-            this.b = b;
-        }
-
-        @Override
-        public String toString() {
-            return "Pair{" +
-                    "a=" + this.a +
-                    ", " +
-                    "b=" + this.b +
-                    '}';
-        }
-    }
-
-    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<>();
-        Map<String, File> files = new HashMap<>();
-        getProject().getConfigurations().stream().filter(Configuration::isCanBeResolved).forEach(config -> {
-            for (File file : config.getFiles()) {
-                files.put(file.getName(), file);
-            }
-            config.getAllDependencies().forEach(dependency ->
-                    dependencyLookupMap.putIfAbsent(dependency.getName() + "-" + dependency.getVersion(), new Pair<>(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, StandardCopyOption.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();
-                }
-            }
-            // Find the library jar file, and copy it to tempLibraries
-            if (pair == null) {
-                File libFile = files.get(lib + ".jar");
-                if (libFile == null) {
-                    libFile = files.values().stream().filter(file -> file.getName().startsWith(lib)).findFirst().orElse(null);
-                    if (libFile == null) {
-                        throw new IllegalStateException(lib);
-                    }
-                }
-                copyTempLib(lib, libFile);
-            } else {
-                for (File file : pair.a.files(pair.b)) {
-                    if (file.getName().startsWith(lib)) {
-                        copyTempLib(lib, file);
-                    }
-                }
-            }
-        }
-        if (mixin == null) {
-            throw new IllegalStateException("Unable to find mixin jar");
-        }
-        if (pathfinder == null) {
-            throw new IllegalStateException("Unable to find pathfinder jar");
-        }
-    }
-
-    private void copyTempLib(String lib, File libFile) throws IOException {
-        if (lib.contains("mixin")) {
-            mixin = libFile;
-        }
-        if (lib.contains("nether-pathfinder")) {
-            pathfinder = libFile;
-        }
-        Files.copy(libFile.toPath(), getTemporaryFile("tempLibraries/" + lib + ".jar"), StandardCopyOption.REPLACE_EXISTING);
-    }
-
-    // a bunch of epic stuff to get the path to the cached jar
-    private Path getMinecraftJar() throws Exception {
-        return getObfuscatedMinecraftJar(getProject(), false); // always notch jar for now.
-    }
-
-    private static Path getObfuscatedMinecraftJar(final Project project, final boolean srg) throws Exception {
-        final Object extension = Objects.requireNonNull(project.getExtensions().findByName("minecraft"), "Unable to find Minecraft extension.");
-
-        final Class<?> mcpRepoClass = mcpRepoClass(extension.getClass().getClassLoader());
-        final Field mcpRepoInstanceField = mcpRepoClass.getDeclaredField("INSTANCE");
-        mcpRepoInstanceField.setAccessible(true);
-        final Method findMethod = mcpRepoClass.getDeclaredMethod(srg ? "findSrg" : "findRaw", String.class, String.class);
-        findMethod.setAccessible(true);
-
-        final Object mcpRepo = mcpRepoInstanceField.get(null);
-        final String mcpVersion = (String) Objects.requireNonNull(project.getExtensions().getExtraProperties().get("MCP_VERSION"), "Extra property \"MCP_VERSION\" not found");
-        return ((File) findMethod.invoke(mcpRepo, "joined", mcpVersion)).toPath();
-    }
-
-    private static Class<?> mcpRepoClass(final ClassLoader loader) throws Exception {
-        final Method forName0 = Class.class.getDeclaredMethod("forName0", String.class, boolean.class, ClassLoader.class, Class.class);
-        forName0.setAccessible(true);
-        return (Class<?>) forName0.invoke(null, "net.minecraftforge.gradle.mcp.MCPRepo", true, loader, null);
+    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(), Arrays.asList(pathfinder), false);
-        Determinizer.determinize(this.proguardOut.toString(), this.artifactForgeApiPath.toString(), Arrays.asList(pathfinder, mixin), true);
+        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(), Arrays.asList(pathfinder), false);
-        Determinizer.determinize(this.proguardOut.toString(), this.artifactForgeStandalonePath.toString(), Arrays.asList(pathfinder, mixin), true);
+        Determinizer.determinize(this.proguardOut.toString(), this.artifactStandalonePath.toString());
    }

    private void cleanup() {
@@ -342,33 +145,19 @@ public class ProguardTask extends BaritoneGradleTask {
        this.url = url;
    }

-    public String getUrl() {
-        return url;
-    }
-
    public void setExtract(String extract) {
        this.extract = extract;
    }

-    public String getExtract() {
-        return extract;
-    }
-
    private void runProguard(Path config) throws Exception {
        // Delete the existing proguard output file. Proguard probably handles this already, but why not do it ourselves
        if (Files.exists(this.proguardOut)) {
            Files.delete(this.proguardOut);
        }

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

        // We can't do output inherit process I/O with gradle for some reason and have it work, so we have to do this
@@ -378,7 +167,6 @@ public class ProguardTask extends BaritoneGradleTask {
        // Halt the current thread until the process is complete, if the exit code isn't 0, throw an exception
        int exitCode = p.waitFor();
        if (exitCode != 0) {
-            Thread.sleep(1000);
            throw new IllegalStateException("Proguard exited with code " + exitCode);
        }
    }
--- a/buildSrc/src/main/java/baritone/gradle/util/Determinizer.java
+++ b/buildSrc/src/main/java/baritone/gradle/util/Determinizer.java
@@ -39,11 +39,10 @@ import java.util.stream.Collectors;
 */
 public class Determinizer {

-    public static void determinize(String inputPath, String outputPath, List<File> toInclude, boolean doForgeReplacementOfMetaInf) 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);
-        System.out.println(" Shade: " + toInclude);

        try (
                JarFile jarFile = new JarFile(new File(inputPath));
@@ -64,36 +63,15 @@ public class Determinizer {
                JarEntry clone = new JarEntry(entry.getName());
                clone.setTime(42069);
                jos.putNextEntry(clone);
-                if (entry.getName().endsWith(".json")) {
-                    JsonElement json = new JsonParser().parse(new InputStreamReader(jarFile.getInputStream(entry)));
-                    jos.write(writeSorted(json).getBytes());
-                } else if (entry.getName().equals("META-INF/MANIFEST.MF") && doForgeReplacementOfMetaInf) { // 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());
+                if (entry.getName().endsWith(".refmap.json")) {
+                    JsonObject object = new JsonParser().parse(new InputStreamReader(jarFile.getInputStream(entry))).getAsJsonObject();
+                    jos.write(writeSorted(object).getBytes());
                } else {
                    copy(jarFile.getInputStream(entry), jos);
                }
            }
-            for (File file : toInclude) {
-                try (JarFile mixin = new JarFile(file)) {
-                    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();
        }
-        System.out.println("Done with determinizer");
    }

    private static void copy(InputStream is, OutputStream os) throws IOException {
@@ -104,7 +82,7 @@ public class Determinizer {
        }
    }

-    private static String writeSorted(JsonElement in) throws IOException {
+    private static String writeSorted(JsonObject in) throws IOException {
        StringWriter writer = new StringWriter();
        JsonWriter jw = new JsonWriter(writer);
        ORDERED_JSON_WRITER.write(jw, in);
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Tue Jul 31 21:56:56 PDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
--- a/55
+++ b/55
@@ -1,21 +1,5 @@
 #!/usr/bin/env sh

-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -44,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`

 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS=""

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -72,7 +56,7 @@ case "`uname`" in
  Darwin* )
    darwin=true
    ;;
-  MSYS* | MINGW* )
+  MINGW* )
    msys=true
    ;;
  NONSTOP* )
@@ -82,7 +66,6 @@ esac

 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

-
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -126,11 +109,10 @@ if $darwin; then
    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi

-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
    JAVACMD=`cygpath --unix "$JAVACMD"`

    # We build the pattern for arguments to be converted via cygpath
@@ -156,19 +138,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
        else
            eval `echo args$i`="\"$arg\""
        fi
-        i=`expr $i + 1`
+        i=$((i+1))
    done
    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
    esac
 fi

@@ -177,9 +159,14 @@ save () {
    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
    echo " "
 }
-APP_ARGS=`save "$@"`
+APP_ARGS=$(save "$@")

 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
 exec "$JAVACMD" "$@"
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,19 +1,3 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@@ -29,18 +13,15 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS=

@rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if "%ERRORLEVEL%" == "0" goto init

 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +35,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe

-if exist "%JAVA_EXE%" goto execute
+if exist "%JAVA_EXE%" goto init

 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,14 +45,28 @@ echo location of your Java installation.

 goto fail

+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
 :execute
@rem Setup the command line

 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

-
@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

 :end
@rem End local scope for the variables with windows NT shell
--- a/hacks.gradle
+++ b/hacks.gradle
@@ -1,161 +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/>.
- */
-
-ext.doHackyStuff = { final Class<?> clazz ->
-    def withExtension = { final File file, final String extension ->
-        def i = file.getName().lastIndexOf('.')
-        def name = file.getName().substring(0, i)
-        return new File(file.getParent(), "$name.$extension")
-    }
-
-    // https://github.com/MinecraftForge/ForgeGradle/blob/6639464b29b0923187eee0a609e546ba9f1b998b/src/patcher/java/net/minecraftforge/gradle/patcher/PatcherPlugin.java#L545
-    // https://github.com/MinecraftForge/ForgeGradle/blob/6639464b29b0923187eee0a609e546ba9f1b998b/src/userdev/java/net/minecraftforge/gradle/userdev/UserDevPlugin.java#L149
-    // create createMcp2Obf task
-    this.tasks.register('createMcpToObf', clazz)
-            .configure { task ->
-                task.setNotch(true)
-                task.setReverse(true)
-            }
-    afterEvaluate {
-        def createMcp2Obf = this.tasks.getByName('createMcpToObf')
-        def createMcp2Srg = this.tasks.getByName('createMcpToSrg')
-
-        // configure createMcp2Obf task
-        if (createMcp2Obf.getSrg() == null) {
-            createMcp2Obf.setSrg(createMcp2Srg.getSrg())
-            createMcp2Obf.setMappings(createMcp2Srg.getMappings())
-            createMcp2Obf.dependsOn(createMcp2Srg)
-        }
-
-        def createSrgCopyTask = { final Task tsrgTask ->
-            def srgCopyTask = this.tasks.register("${tsrgTask.name}Srg", tsrgTask.getClass())
-            tsrgTask.getDependsOn().forEach({ dep ->
-                srgCopyTask.get().dependsOn(dep)
-            })
-            // https://github.com/MinecraftForge/ForgeGradle/blob/6639464b29b0923187eee0a609e546ba9f1b998b/src/mcp/java/net/minecraftforge/gradle/mcp/task/GenerateSRG.java#L39
-            srgCopyTask.configure { task ->
-                task.setSrg(tsrgTask.getSrg())
-                task.setMappings(tsrgTask.getMappings())
-                // https://github.com/MinecraftForge/SrgUtils/blob/bb2ca35bb8d349a122ef512dedd24f54f7cd0bdf/src/main/java/net/minecraftforge/srgutils/IMappingFile.java#L44
-                task.setFormat('SRG')
-                task.setNotch(tsrgTask.getNotch())
-                task.setReverse(tsrgTask.getReverse())
-                task.setOutput(withExtension(tsrgTask.getOutput(), 'srg'))
-            }
-            return srgCopyTask
-        }
-        def createMcp2ObfSrgCopyTask = createSrgCopyTask(createMcp2Obf)
-        createMcp2Obf.dependsOn(createMcp2ObfSrgCopyTask)
-        def createMcp2SrgSrgCopyTask = createSrgCopyTask(createMcp2Srg)
-        createMcp2Srg.dependsOn(createMcp2SrgSrgCopyTask)
-
-        this.sourceSets.forEach({ set ->
-            def compileTask = this.project.tasks[set.compileJavaTaskName]
-            if (!(compileTask instanceof JavaCompile)) {
-                println("[Baritoe] Non-java compile task for ${set} of type ${compileTask}")
-                return
-            }
-            compileTask.dependsOn(createMcp2Obf)
-            compileTask.doFirst {
-                // inject legacy notch srg file
-                def createMcp2ObfSrgCopy = createMcp2ObfSrgCopyTask.get()
-                def reobfNotchSrgFileArgument = "-AreobfNotchSrgFile=${createMcp2ObfSrgCopy.output.canonicalPath}"
-                compileTask.options.compilerArgs += reobfNotchSrgFileArgument
-                println("[Baritoe] Injecting compiler argument: ${reobfNotchSrgFileArgument}")
-
-                // inject legacy notch srg out file
-                def outTSrgFileArgument = '-AoutTsrgFile='
-                def compilerArgsIterator = compileTask.options.compilerArgs.listIterator()
-                while (compilerArgsIterator.hasNext()) {
-                    def compilerArg = compilerArgsIterator.next()
-                    if (compilerArg.startsWith(outTSrgFileArgument)) {
-                        def argumentFileValue = new File(compilerArg.substring(outTSrgFileArgument.length(), compilerArg.length()))
-                        def outNotchSrgFile = withExtension(argumentFileValue, 'notch.srg')
-                        def outNotchSrgFileArgument = "-AoutNotchSrgFile=${outNotchSrgFile.canonicalPath}"
-                        println("[Baritoe] Injecting compiler argument: ${outNotchSrgFileArgument}")
-                        compilerArgsIterator.add(outNotchSrgFileArgument)
-                    }
-                }
-            }
-        })
-
-        // register reobf jars
-        def reobfExtension = this.project.getExtensions().getByName('reobf')
-        if (!reobfExtension) {
-            throw new IllegalStateException("Could not find \"reobf\" extension")
-        }
-        def reobfNotchJar = reobfExtension.create(jar.getName())
-        reobfNotchJar.dependsOn(createMcp2Obf)
-        reobfNotchJar.setMappings(createMcp2Obf.getOutput())
-
-        // even more horrible hack :) for outNotchSrgFile injection
-        reobfNotchJar.doFirst {
-            // https://github.com/MinecraftForge/ForgeGradle/blob/6639464b29b0923187eee0a609e546ba9f1b998b/src/userdev/java/net/minecraftforge/gradle/userdev/tasks/RenameJar.java#L96
-            def extraMappings = reobfNotchJar.getExtraMappings()
-            println("[Baritoe] Extra mappings: ${extraMappings}")
-            def copy = new ArrayList<>()
-            extraMappings.forEach { extraMapping ->
-                copy.add(withExtension(extraMapping, 'notch.srg'))
-            }
-            println("[Baritoe] New extra mappings: ${copy}")
-            reobfNotchJar.setExtraMappings(copy)
-        }
-    }
-}
-
-// TODO: In-complete fg 5.0 port. Currently doesn't handle mixin notch srg mapping hack.
-//ext.doHackyStuff = { final Class<?> clazz ->
-//    afterEvaluate {
-//        def createMcp2Srg = this.tasks.getByName('createMcpToSrg')
-//        def createMcpToObf = this.tasks.register('createMcpToObf', clazz)
-//        createMcpToObf.configure { task ->
-//            task.setNotch(true)
-//            task.setReverse(true)
-//            task.getSrg().set(createMcp2Srg.getSrg().get())
-//            task.getMappings().set(createMcp2Srg.getMappings().get())
-//            task.dependsOn(createMcp2Srg)
-//        }
-//        reobf {
-//            jar {
-//                dependsOn(createMcpToObf)
-//                getMappings().set(createMcpToObf.get().getOutput().get())
-//            }
-//        }
-//        this.sourceSets.forEach({ set ->
-//            def compileTask = this.project.tasks[set.compileJavaTaskName]
-//            if (!(compileTask instanceof JavaCompile)) {
-//                println("[Baritoe] Non-java compile task for ${set} of type ${compileTask}")
-//                return
-//            }
-//            compileTask.dependsOn(createMcpToObf)
-//            compileTask.doFirst {
-//                def reobfTSrgFile = '-AreobfTsrgFile='
-//                def compilerArgsIterator = compileTask.options.compilerArgs.listIterator()
-//                while (compilerArgsIterator.hasNext()) {
-//                    def compilerArg = compilerArgsIterator.next()
-//                    if (compilerArg.startsWith(reobfTSrgFile)) {
-//                        compilerArgsIterator.remove()
-//                        def toInject = "-AreobfTsrgFile=${createMcpToObf.get().output.get().asFile.canonicalPath}"
-//                        compilerArgsIterator.add(toInject)
-//                        println("[Baritoe] Injecting compiler argument: ${toInject}")
-//                    }
-//                }
-//                println("[Baritoe] Compiler arguments: ${compileTask.options.compilerArgs}")
-//            }
-//        })
-//    }
-//}
--- a/scripts/proguard.pro
+++ b/scripts/proguard.pro
@@ -1,6 +1,5 @@
 -keepattributes Signature
 -keepattributes *Annotation*
-keepattributes InnerClasses

 -optimizationpasses 5
 -verbose
@@ -15,6 +14,8 @@

 # lwjgl is weird
 -dontwarn org.lwjgl.**
+# also lwjgl lol
+-dontwarn module-info

 -keep class baritone.api.** { *; } # this is the keep api

@@ -23,14 +24,6 @@
 -keep class baritone.api.IBaritoneProvider

 -keep class baritone.api.utils.MyChunkPos { *; } # even in standalone we need to keep this for gson reflect
-keepname class baritone.api.utils.BlockOptionalMeta # this name is exposed to the user, so we need to keep it in all builds
-
-# Keep any class or member annotated with @KeepName so we dont have to put everything in the script
-keep,allowobfuscation @interface baritone.KeepName
-keep @baritone.KeepName class *
-keepclassmembers class * {
-    @baritone.KeepName *;
-}

 # setting names are reflected from field names, so keep field names
 -keepclassmembers class baritone.api.Settings {
@@ -42,59 +35,8 @@

 #try to keep usage of schematica in separate classes
 -keep class baritone.utils.schematic.schematica.**
-keep class baritone.utils.schematic.litematica.**
 #proguard doesnt like it when it cant find our fake schematica classes
 -dontwarn baritone.utils.schematic.schematica.**
-dontwarn baritone.utils.schematic.litematica.**
-
-# 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.3.9.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.12.jar'
-
-libraryjars 'tempLibraries/nether-pathfinder-.jar'


 # Keep - Applications. Keep all application classes, along with their 'main'
@@ -192,19 +134,19 @@
 -assumenosideeffects public class java.lang.* extends java.lang.Number {
    public static java.lang.String toString(byte);
    public static java.lang.Byte valueOf(byte);
-#    public static byte parseByte(java.lang.String);
-#    public static byte parseByte(java.lang.String,int);
-#    public static java.lang.Byte valueOf(java.lang.String,int);
-#    public static java.lang.Byte valueOf(java.lang.String);
-#    public static java.lang.Byte decode(java.lang.String);
+    public static byte parseByte(java.lang.String);
+    public static byte parseByte(java.lang.String,int);
+    public static java.lang.Byte valueOf(java.lang.String,int);
+    public static java.lang.Byte valueOf(java.lang.String);
+    public static java.lang.Byte decode(java.lang.String);
    public int compareTo(java.lang.Byte);
    public static java.lang.String toString(short);
-#    public static short parseShort(java.lang.String);
-#    public static short parseShort(java.lang.String,int);
-#    public static java.lang.Short valueOf(java.lang.String,int);
-#    public static java.lang.Short valueOf(java.lang.String);
+    public static short parseShort(java.lang.String);
+    public static short parseShort(java.lang.String,int);
+    public static java.lang.Short valueOf(java.lang.String,int);
+    public static java.lang.Short valueOf(java.lang.String);
    public static java.lang.Short valueOf(short);
-#    public static java.lang.Short decode(java.lang.String);
+    public static java.lang.Short decode(java.lang.String);
    public static short reverseBytes(short);
    public int compareTo(java.lang.Short);
    public static java.lang.String toString(int,int);
@@ -212,10 +154,10 @@
    public static java.lang.String toOctalString(int);
    public static java.lang.String toBinaryString(int);
    public static java.lang.String toString(int);
-#    public static int parseInt(java.lang.String,int);
-#    public static int parseInt(java.lang.String);
-#    public static java.lang.Integer valueOf(java.lang.String,int);
-#    public static java.lang.Integer valueOf(java.lang.String);
+    public static int parseInt(java.lang.String,int);
+    public static int parseInt(java.lang.String);
+    public static java.lang.Integer valueOf(java.lang.String,int);
+    public static java.lang.Integer valueOf(java.lang.String);
    public static java.lang.Integer valueOf(int);
    public static java.lang.Integer getInteger(java.lang.String);
    public static java.lang.Integer getInteger(java.lang.String,int);
@@ -237,12 +179,12 @@
    public static java.lang.String toOctalString(long);
    public static java.lang.String toBinaryString(long);
    public static java.lang.String toString(long);
-#    public static long parseLong(java.lang.String,int);
-#    public static long parseLong(java.lang.String);
-#    public static java.lang.Long valueOf(java.lang.String,int);
-#    public static java.lang.Long valueOf(java.lang.String);
+    public static long parseLong(java.lang.String,int);
+    public static long parseLong(java.lang.String);
+    public static java.lang.Long valueOf(java.lang.String,int);
+    public static java.lang.Long valueOf(java.lang.String);
    public static java.lang.Long valueOf(long);
-#    public static java.lang.Long decode(java.lang.String);
+    public static java.lang.Long decode(java.lang.String);
    public static java.lang.Long getLong(java.lang.String);
    public static java.lang.Long getLong(java.lang.String,long);
    public static java.lang.Long getLong(java.lang.String,java.lang.Long);
@@ -259,9 +201,9 @@
    public int compareTo(java.lang.Long);
    public static java.lang.String toString(float);
    public static java.lang.String toHexString(float);
-#    public static java.lang.Float valueOf(java.lang.String);
+    public static java.lang.Float valueOf(java.lang.String);
    public static java.lang.Float valueOf(float);
-#    public static float parseFloat(java.lang.String);
+    public static float parseFloat(java.lang.String);
    public static boolean isNaN(float);
    public static boolean isInfinite(float);
    public static int floatToIntBits(float);
@@ -273,9 +215,9 @@
    public int compareTo(java.lang.Float);
    public static java.lang.String toString(double);
    public static java.lang.String toHexString(double);
-#    public static java.lang.Double valueOf(java.lang.String);
-#    public static java.lang.Double valueOf(double);
-#    public static double parseDouble(java.lang.String);
+    public static java.lang.Double valueOf(java.lang.String);
+    public static java.lang.Double valueOf(double);
+    public static double parseDouble(java.lang.String);
    public static boolean isNaN(double);
    public static boolean isInfinite(double);
    public static long doubleToLongBits(double);
@@ -385,5 +327,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
@@ -34,12 +34,12 @@ public final class BaritoneAPI {
    private static final Settings settings;

    static {
-        settings = new Settings();
-        SettingsUtil.readAndApply(settings, SettingsUtil.SETTINGS_DEFAULT_NAME);
-
        ServiceLoader<IBaritoneProvider> baritoneLoader = ServiceLoader.load(IBaritoneProvider.class);
        Iterator<IBaritoneProvider> instances = baritoneLoader.iterator();
        provider = instances.next();
+
+        settings = new Settings();
+        SettingsUtil.readAndApply(settings);
    }

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

 package baritone.api;

-import baritone.api.behavior.IElytraBehavior;
 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;

@@ -35,18 +32,21 @@ import baritone.api.utils.IPlayerContext;
 */
 public interface IBaritone {

+    /**
+     * Call as soon as Minecraft is ready, initializes all of the processes, behaviors, etc. This will
+     * only effectively be ran once, any additional calls are redundant because the initialization state
+     * is saved.
+     * <p>
+     * Or whenever your overeager utility client wants.
+     */
+    void init();
+
    /**
     * @return The {@link IPathingBehavior} instance
     * @see IPathingBehavior
     */
    IPathingBehavior getPathingBehavior();

-    /**
-     * @return The {@link IElytraBehavior} instance
-     * @see IElytraBehavior
-     */
-    IElytraBehavior getElytraBehavior();
-
    /**
     * @return The {@link ILookBehavior} instance
     * @see ILookBehavior
@@ -128,18 +128,6 @@ public interface IBaritone {
     */
    IEventBus getGameEventHandler();

-    /**
-     * @return The {@link ISelectionManager} instance
-     * @see ISelectionManager
-     */
-    ISelectionManager getSelectionManager();
-
-    /**
-     * @return The {@link ICommandManager} instance
-     * @see ICommandManager
-     */
-    ICommandManager getCommandManager();
-
    /**
     * Open click
     */
--- a/src/api/java/baritone/api/IBaritoneProvider.java
+++ b/src/api/java/baritone/api/IBaritoneProvider.java
@@ -18,18 +18,12 @@
 package baritone.api;

 import baritone.api.cache.IWorldScanner;
-import baritone.api.command.ICommand;
-import baritone.api.command.ICommandSystem;
-import baritone.api.schematic.ISchematicSystem;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.client.entity.player.ClientPlayerEntity;

 import java.util.List;
-import java.util.Objects;

 /**
- * Provides the present {@link IBaritone} instances, as well as non-baritone instance related APIs.
+ * Provides the present {@link IBaritone} instances
 *
 * @author leijurv
 */
@@ -49,74 +43,27 @@ 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}.
+     * 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) {
-        for (IBaritone baritone : this.getAllBaritones()) {
-            if (Objects.equals(player, baritone.getPlayerContext().player())) {
+    default IBaritone getBaritoneForPlayer(ClientPlayerEntity player) {
+        for (IBaritone baritone : getAllBaritones()) {
+            if (player.equals(baritone.getPlayerContext().player())) {
                return baritone;
            }
        }
        return null;
    }

-    /**
-     * Provides the {@link IBaritone} instance for a given {@link Minecraft}.
-     *
-     * @param minecraft The minecraft
-     * @return The {@link IBaritone} instance.
-     */
-    default IBaritone getBaritoneForMinecraft(Minecraft minecraft) {
-        for (IBaritone baritone : this.getAllBaritones()) {
-            if (Objects.equals(minecraft, baritone.getPlayerContext().minecraft())) {
-                return baritone;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Provides the {@link IBaritone} instance for the player with the specified connection.
-     *
-     * @param connection The connection
-     * @return The {@link IBaritone} instance.
-     */
-    default IBaritone getBaritoneForConnection(NetHandlerPlayClient connection) {
-        for (IBaritone baritone : this.getAllBaritones()) {
-            final EntityPlayerSP player = baritone.getPlayerContext().player();
-            if (player != null && player.connection == connection) {
-                return baritone;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Creates and registers a new {@link IBaritone} instance using the specified {@link Minecraft}. The existing
-     * instance is returned if already registered.
-     *
-     * @param minecraft The minecraft
-     * @return The {@link IBaritone} instance
-     */
-    IBaritone createBaritone(Minecraft minecraft);
-
-    /**
-     * Destroys and removes the specified {@link IBaritone} instance. If the specified instance is the
-     * {@link #getPrimaryBaritone() primary baritone}, this operation has no effect and will return {@code false}.
-     *
-     * @param baritone The baritone instance to remove
-     * @return Whether the baritone instance was removed
-     */
-    boolean destroyBaritone(IBaritone baritone);
-
    /**
     * Returns the {@link IWorldScanner} instance. This is not a type returned by
     * {@link IBaritone} implementation, because it is not linked with {@link IBaritone}.
@@ -124,17 +71,4 @@ public interface IBaritoneProvider {
     * @return The {@link IWorldScanner} instance.
     */
    IWorldScanner getWorldScanner();
-
-    /**
-     * Returns the {@link ICommandSystem} instance. This is not bound to a specific {@link IBaritone}
-     * instance because {@link ICommandSystem} itself controls global behavior for {@link ICommand}s.
-     *
-     * @return The {@link ICommandSystem} instance.
-     */
-    ICommandSystem getCommandSystem();
-
-    /**
-     * @return The {@link ISchematicSystem} instance.
-     */
-    ISchematicSystem getSchematicSystem();
 }
--- a/src/api/java/baritone/api/Settings.java
+++ b/src/api/java/baritone/api/Settings.java
@@ -17,29 +17,21 @@

 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.text.ITextComponent;

 import java.awt.*;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-import java.util.List;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.function.BiConsumer;
+import java.util.List;
 import java.util.function.Consumer;

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

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

-    /**
-     * Wait this many ticks between InventoryBehavior moving inventory items
-     */
-    public final Setting<Integer> ticksBetweenInventoryMoves = new Setting<>(1);
-
-    /**
-     * Come to a halt before doing any inventory moves. Intended for anticheat such as 2b2t
-     */
-    public final Setting<Boolean> inventoryMoveOnlyIfStationary = new Setting<>(false);
-
-    /**
-     * Disable baritone's auto-tool at runtime, but still assume that another mod will provide auto tool functionality
-     * <p>
-     * Specifically, path calculation will still assume that an auto tool will run at execution time, even though
-     * Baritone itself will not do that.
-     */
-    public final Setting<Boolean> assumeExternalAutoTool = new Setting<>(false);
-
-    /**
-     * Automatically select the best available tool
-     */
-    public final Setting<Boolean> autoTool = new Setting<>(true);
-
    /**
     * It doesn't actually take twenty ticks to place a block, this cost is so high
     * because we want to generally conserve blocks which might be limited.
@@ -122,13 +86,6 @@ public final class Settings {
     */
    public final Setting<Double> walkOnWaterOnePenalty = new Setting<>(3D);

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

@@ -185,13 +140,6 @@ public final class Settings {
     */
    public final Setting<Boolean> allowDiagonalDescend = new Setting<>(false);

-    /**
-     * Allow diagonal ascending
-     * <p>
-     * Actually pretty safe, much safer than diagonal descend tbh
-     */
-    public final Setting<Boolean> allowDiagonalAscend = new Setting<>(false);
-
    /**
     * Allow mining the block directly beneath its feet
     * <p>
@@ -203,10 +151,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()
    )));

    /**
@@ -219,94 +167,11 @@ public final class Settings {
    /**
     * Blocks that Baritone is not allowed to break
     */
-    public final Setting<List<Block>> blocksToDisallowBreaking = new Setting<>(new ArrayList<>(
-            // Leave Empty by Default
-    ));
-
-    /**
-     * blocks that baritone shouldn't break, but can if it needs to.
-     */
    public final Setting<List<Block>> blocksToAvoidBreaking = new Setting<>(new ArrayList<>(Arrays.asList( // TODO can this be a HashSet or ImmutableSet?
            Blocks.CRAFTING_TABLE,
            Blocks.FURNACE,
-            Blocks.LIT_FURNACE,
            Blocks.CHEST,
-            Blocks.TRAPPED_CHEST,
-            Blocks.STANDING_SIGN,
-            Blocks.WALL_SIGN
-    )));
-
-    /**
-     * this multiplies the break speed, if set above 1 it's "encourage breaking" instead
-     */
-    public final Setting<Double> avoidBreakingMultiplier = new Setting<>(.1);
-
-    /**
-     * A list of blocks to be treated as if they're air.
-     * <p>
-     * If a schematic asks for air at a certain position, and that position currently contains a block on this list, it will be treated as correct.
-     */
-    public final Setting<List<Block>> buildIgnoreBlocks = new Setting<>(new ArrayList<>(Arrays.asList(
-
-    )));
-
-    /**
-     * A list of blocks to be treated as correct.
-     * <p>
-     * If a schematic asks for any block on this list at a certain position, it will be treated as correct, regardless of what it currently is.
-     */
-    public final Setting<List<Block>> buildSkipBlocks = new Setting<>(new ArrayList<>(Arrays.asList(
-
-    )));
-
-    /**
-     * A mapping of blocks to blocks treated as correct in their position
-     * <p>
-     * If a schematic asks for a block on this mapping, all blocks on the mapped list will be accepted at that location as well
-     * <p>
-     * Syntax same as <a href="https://baritone.leijurv.com/baritone/api/Settings.html#buildSubstitutes">buildSubstitutes</a>
-     */
-    public final Setting<Map<Block, List<Block>>> buildValidSubstitutes = new Setting<>(new HashMap<>());
-
-    /**
-     * A mapping of blocks to blocks to be built instead
-     * <p>
-     * If a schematic asks for a block on this mapping, Baritone will place the first placeable block in the mapped list
-     * <p>
-     * Usage Syntax:
-     * <pre>
-     *      sourceblockA->blockToSubstituteA1,blockToSubstituteA2,...blockToSubstituteAN,sourceBlockB->blockToSubstituteB1,blockToSubstituteB2,...blockToSubstituteBN,...sourceBlockX->blockToSubstituteX1,blockToSubstituteX2...blockToSubstituteXN
-     * </pre>
-     * Example:
-     * <pre>
-     *     stone->cobblestone,andesite,oak_planks->birch_planks,acacia_planks,glass
-     * </pre>
-     */
-    public final Setting<Map<Block, List<Block>>> buildSubstitutes = new Setting<>(new HashMap<>());
-
-    /**
-     * A list of blocks to become air
-     * <p>
-     * If a schematic asks for a block on this list, only air will be accepted at that location (and nothing on buildIgnoreBlocks)
-     */
-    public final Setting<List<Block>> okIfAir = new Setting<>(new ArrayList<>(Arrays.asList(
-
-    )));
-
-    /**
-     * If this is true, the builder will treat all non-air blocks as correct. It will only place new blocks.
-     */
-    public final Setting<Boolean> buildIgnoreExisting = new Setting<>(false);
-
-    /**
-     * If this is true, the builder will ignore directionality of certain blocks like glazed terracotta.
-     */
-    public final Setting<Boolean> buildIgnoreDirection = new Setting<>(false);
-
-    /**
-     * A list of names of block properties the builder will ignore.
-     */
-    public final Setting<List<String>> buildIgnoreProperties = new Setting<>(new ArrayList<>(Arrays.asList(
+            Blocks.TRAPPED_CHEST
    )));

    /**
@@ -359,7 +224,7 @@ public final class Settings {
    /**
     * If we overshoot a traverse and end up one block beyond the destination, mark it as successful anyway.
     * <p>
-     * This helps with speed exceeding 20m/s
+     * This helps with speed at >=20m/s
     */
    public final Setting<Boolean> overshootTraverse = new Setting<>(true);

@@ -374,14 +239,9 @@ public final class Settings {
    public final Setting<Integer> rightClickSpeed = new Setting<>(4);

    /**
-     * Block reach distance
+     * How many degrees to randomize the yaw every tick. Set to 0 to disable
     */
-    public final Setting<Float> blockReachDistance = new Setting<>(4.5f);
-
-    /**
-     * How many degrees to randomize the pitch and yaw every tick. Set to 0 to disable
-     */
-    public final Setting<Double> randomLooking = new Setting<>(0.01d);
+    public final Setting<Double> randomLooking = new Setting<>(2d);

    /**
     * This is the big A* setting.
@@ -431,9 +291,6 @@ public final class Settings {
     */
    public final Setting<Double> mobSpawnerAvoidanceCoefficient = new Setting<>(2.0);

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

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

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

    /**
@@ -547,11 +401,6 @@ public final class Settings {
     */
    public final Setting<Boolean> simplifyUnloadedYCoord = new Setting<>(true);

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

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

    /**
-     * The chunk packer queue can never grow to larger than this, if it does, the oldest chunks are discarded
+     * Remember the contents of containers (chests, echests, furnaces)
     * <p>
-     * The newest chunks are kept, so that if you're moving in a straight line quickly then stop, your immediate render distance is still included
+     * Really buggy since the packet stuff is multithreaded badly thanks to brady
     */
-    public final Setting<Integer> chunkPackerQueueMaxSize = new Setting<>(2000);
+    public final Setting<Boolean> containerMemory = new Setting<>(false);

    /**
     * Fill in blocks behind you
     */
    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
     */
@@ -659,31 +485,20 @@ public final class Settings {
    public final Setting<Boolean> chatControl = new Setting<>(true);

    /**
-     * Some clients like Impact try to force chatControl to off, so here's a second setting to do it anyway
+     * A second override over chatControl to force it on
     */
-    public final Setting<Boolean> chatControlAnyway = new Setting<>(false);
+    public final Setting<Boolean> removePrefix = new Setting<>(false);

    /**
     * Render the path
     */
    public final Setting<Boolean> renderPath = new Setting<>(true);

-    /**
-     * Render the path as a line instead of a frickin thingy
-     */
-    public final Setting<Boolean> renderPathAsLine = new Setting<>(false);
-
    /**
     * Render the goal
     */
    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
     */
@@ -731,28 +546,6 @@ public final class Settings {
     */
    public final Setting<Boolean> freeLook = new Setting<>(true);

-    /**
-     * Break and place blocks without having to force the client-sided rotations. Requires {@link #freeLook}.
-     */
-    public final Setting<Boolean> blockFreeLook = new Setting<>(false);
-
-    /**
-     * Automatically elytra fly without having to force the client-sided rotations. Requires {@link #freeLook}.
-     */
-    public final Setting<Boolean> elytraFreeLook = new Setting<>(false);
-
-    /**
-     * Forces the client-sided rotations to an average of the last 10 ticks of server-sided rotations.
-     * Requires {@link #freeLook}.
-     */
-    public final Setting<Boolean> smoothLook = new Setting<>(false);
-
-    /**
-     * When true, the player will remain with its existing look direction as often as possible.
-     * Although, in some cases this can get it stuck, hence this setting to disable that behavior.
-     */
-    public final Setting<Boolean> remainWithExistingLookDirection = new Setting<>(true);
-
    /**
     * Will cause some minor behavioral differences to ensure that Baritone works on anticheats.
     * <p>
@@ -775,7 +568,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.
     */
@@ -801,51 +594,10 @@ public final class Settings {
    public final Setting<Float> cachedChunksOpacity = new Setting<>(0.5f);

    /**
-     * Whether or not to allow you to run Baritone commands with the prefix
+     * Whether or not to use the "#" command prefix
     */
    public final Setting<Boolean> prefixControl = new Setting<>(true);

-    /**
-     * The command prefix for chat control
-     */
-    public final Setting<String> prefix = new Setting<>("#");
-
-    /**
-     * Use a short Baritone prefix [B] instead of [Baritone] when logging to chat
-     */
-    public final Setting<Boolean> shortBaritonePrefix = new Setting<>(false);
-
-    /**
-     * Echo commands to chat when they are run
-     */
-    public final Setting<Boolean> echoCommands = new Setting<>(true);
-
-    /**
-     * Censor coordinates in goals and block positions
-     */
-    public final Setting<Boolean> censorCoordinates = new Setting<>(false);
-
-    /**
-     * Censor arguments to ran commands, to hide, for example, coordinates to #goal
-     */
-    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.
-     */
-    public final Setting<Boolean> preferSilkTouch = new Setting<>(false);
-
    /**
     * Don't stop walking forward when you need to break blocks in your way
     */
@@ -883,29 +635,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);
-
-    /**
-     * Sets the maximum y level to mine ores at.
-     */
-    public final Setting<Integer> maxYLevelWhileMining = new Setting<>(255); // 1.17+ defaults to maximum possible world height
-
-    /**
-     * 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);

@@ -929,12 +659,7 @@ public final class Settings {
    public final Setting<Integer> exploreMaintainY = new Setting<>(64);

    /**
-     * Replant normal Crops while farming and leave cactus and sugarcane to regrow
-     */
-    public final Setting<Boolean> replantCrops = new Setting<>(true);
-
-    /**
-     * Replant nether wart while farming. This setting only has an effect when replantCrops is also enabled
+     * Replant nether wart while farming
     */
    public final Setting<Boolean> replantNetherWart = new Setting<>(false);

@@ -957,44 +682,11 @@ 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));

-    /**
-     * 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>
@@ -1009,71 +701,11 @@ public final class Settings {
     */
    public final Setting<Boolean> goalBreakFromAbove = new Setting<>(false);

-    /**
-     * Build in map art mode, which makes baritone only care about the top block in each column
-     */
-    public final Setting<Boolean> mapArtMode = new Setting<>(false);
-
-    /**
-     * Override builder's behavior to not attempt to correct blocks that are currently water
-     */
-    public final Setting<Boolean> okIfWater = new Setting<>(false);
-
-    /**
-     * The set of incorrect blocks can never grow beyond this size
-     */
-    public final Setting<Integer> incorrectSize = new Setting<>(100);
-
-    /**
-     * Multiply the cost of breaking a block that's correct in the builder's schematic by this coefficient
-     */
-    public final Setting<Double> breakCorrectBlockPenaltyMultiplier = new Setting<>(10d);
-
-    /**
-     * When this setting is true, build a schematic with the highest X coordinate being the origin, instead of the lowest
-     */
-    public final Setting<Boolean> schematicOrientationX = new Setting<>(false);
-
-    /**
-     * When this setting is true, build a schematic with the highest Y coordinate being the origin, instead of the lowest
-     */
-    public final Setting<Boolean> schematicOrientationY = new Setting<>(false);
-
-    /**
-     * When this setting is true, build a schematic with the highest Z coordinate being the origin, instead of the lowest
-     */
-    public final Setting<Boolean> schematicOrientationZ = new Setting<>(false);
-
-    /**
-     * The fallback used by the build command when no extension is specified. This may be useful if schematics of a
-     * particular format are used often, and the user does not wish to have to specify the extension with every usage.
-     */
-    public final Setting<String> schematicFallbackExtension = new Setting<>("schematic");
-
-    /**
-     * Distance to scan every tick for updates. Expanding this beyond player reach distance (i.e. setting it to 6 or above)
-     * is only necessary in very large schematics where rescanning the whole thing is costly.
-     */
-    public final Setting<Integer> builderTickScanRadius = new Setting<>(5);
-
    /**
     * While mining, should it also consider dropped items of the correct type as a pathing destination (as well as ore blocks)?
     */
    public final Setting<Boolean> mineScanDroppedItems = new Setting<>(true);

-    /**
-     * While mining, wait this number of milliseconds after mining an ore to see if it will drop an item
-     * instead of immediately going onto the next one
-     * <p>
-     * Thanks Louca
-     */
-    public final Setting<Long> mineDropLoiterDurationMSThanksLouca = new Setting<>(250L);
-
-    /**
-     * Trim incorrect positions too far away, helps performance but hurts reliability in very large schematics
-     */
-    public final Setting<Boolean> distanceTrim = new Setting<>(true);
-
    /**
     * Cancel the current path if the goal has changed, and the path originally ended in the goal but doesn't anymore.
     * <p>
@@ -1103,7 +735,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);

@@ -1188,24 +819,7 @@ public final class Settings {
     * via {@link Consumer#andThen(Consumer)} or it can completely be overriden via setting
     * {@link Setting#value};
     */
-    @JavaOnly
-    public final Setting<Consumer<ITextComponent>> logger = new Setting<>(msg -> Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(msg));
-
-    /**
-     * The function that is called when Baritone will send a desktop notification. This function can be added to
-     * via {@link Consumer#andThen(Consumer)} or it can completely be overriden via setting
-     * {@link Setting#value};
-     */
-    @JavaOnly
-    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};
-     */
-    @JavaOnly
-    public final Setting<BiConsumer<ITextComponent, ITextComponent>> toaster = new Setting<>(BaritoneToast::addOrUpdate);
+    public final Setting<Consumer<ITextComponent>> logger = new Setting<>(Minecraft.getInstance().ingameGUI.getChatGUI()::printChatMessage);

    /**
     * The size of the box that is rendered when the current goal is a GoalYLevel
@@ -1252,168 +866,6 @@ public final class Settings {
     */
    public final Setting<Color> colorGoalBox = new Setting<>(Color.GREEN);

-    /**
-     * The color of the goal box when it's inverted
-     */
-    public final Setting<Color> colorInvertedGoalBox = new Setting<>(Color.RED);
-
-    /**
-     * The color of all selections
-     */
-    public final Setting<Color> colorSelection = new Setting<>(Color.CYAN);
-
-    /**
-     * The color of the selection pos 1
-     */
-    public final Setting<Color> colorSelectionPos1 = new Setting<>(Color.BLACK);
-
-    /**
-     * The color of the selection pos 2
-     */
-    public final Setting<Color> colorSelectionPos2 = new Setting<>(Color.ORANGE);
-
-    /**
-     * The opacity of the selection. 0 is completely transparent, 1 is completely opaque
-     */
-    public final Setting<Float> selectionOpacity = new Setting<>(.5f);
-
-    /**
-     * Line width of the goal when rendered, in pixels
-     */
-    public final Setting<Float> selectionLineWidth = new Setting<>(2F);
-
-    /**
-     * Render selections
-     */
-    public final Setting<Boolean> renderSelection = new Setting<>(true);
-
-    /**
-     * Ignore depth when rendering selections
-     */
-    public final Setting<Boolean> renderSelectionIgnoreDepth = new Setting<>(true);
-
-    /**
-     * Render selection corners
-     */
-    public final Setting<Boolean> renderSelectionCorners = new Setting<>(true);
-
-    /**
-     * Use sword to mine.
-     */
-    public final Setting<Boolean> useSwordToMine = new Setting<>(true);
-
-    /**
-     * Desktop notifications
-     */
-    public final Setting<Boolean> desktopNotifications = new Setting<>(false);
-
-    /**
-     * Desktop notification on path complete
-     */
-    public final Setting<Boolean> notificationOnPathComplete = new Setting<>(true);
-
-    /**
-     * Desktop notification on farm fail
-     */
-    public final Setting<Boolean> notificationOnFarmFail = new Setting<>(true);
-
-    /**
-     * Desktop notification on build finished
-     */
-    public final Setting<Boolean> notificationOnBuildFinished = new Setting<>(true);
-
-    /**
-     * Desktop notification on explore finished
-     */
-    public final Setting<Boolean> notificationOnExploreFinished = new Setting<>(true);
-
-    /**
-     * Desktop notification on mine fail
-     */
-    public final Setting<Boolean> notificationOnMineFail = new Setting<>(true);
-
-    /**
-     * The number of ticks of elytra movement to simulate while firework boost is not active. Higher values are
-     * computationally more expensive.
-     */
-    public final Setting<Integer> elytraSimulationTicks = new Setting<>(20);
-
-    /**
-     * The maximum allowed deviation in pitch from a direct line-of-sight to the flight target. Higher values are
-     * computationally more expensive.
-     */
-    public final Setting<Integer> elytraPitchRange = new Setting<>(25);
-
-    /**
-     * The minimum speed that the player can drop to (in blocks/tick) before a firework is automatically deployed.
-     */
-    public final Setting<Double> elytraFireworkSpeed = new Setting<>(0.6);
-
-    /**
-     * The delay after the player's position is set-back by the server that a firework may be automatically deployed.
-     * Value is in ticks.
-     */
-    public final Setting<Integer> elytraFireworkSetbackUseDelay = new Setting<>(15);
-
-    /**
-     * The minimum padding value that is added to the player's hitbox when considering which point to fly to on the
-     * path. High values can result in points not being considered which are otherwise safe to fly to. Low values can
-     * result in flight paths which are extremely tight, and there's the possibility of crashing due to getting too low
-     * to the ground.
-     */
-    public final Setting<Double> elytraMinimumAvoidance = new Setting<>(0.2);
-
-    /**
-     * If enabled, avoids using fireworks when descending along the flight path.
-     */
-    public final Setting<Boolean> conserveFireworks = new Setting<>(true);
-
-    /**
-     * Renders the raytraces that are performed by the elytra fly calculation.
-     */
-    public final Setting<Boolean> renderRaytraces = new Setting<>(false);
-
-    /**
-     * Renders the raytraces that are used in the hitbox part of the elytra fly calculation.
-     * Requires {@link #renderRaytraces}.
-     */
-    public final Setting<Boolean> renderHitboxRaytraces = new Setting<>(false);
-
-    /**
-     * Renders the best elytra flight path that was simulated each tick.
-     */
-    public final Setting<Boolean> renderElytraSimulation = new Setting<>(false);
-
-    /**
-     * Automatically path to and jump off of ledges to initiate elytra flight when grounded.
-     */
-    public final Setting<Boolean> elytraAutoJump = new Setting<>(false);
-
-    /**
-     * The seed used to generate chunks for long distance elytra path-finding in the nether.
-     * Defaults to 2b2t's nether seed.
-     */
-    public final Setting<Long> elytraNetherSeed = new Setting<>(146008555100680L);
-
-    /**
-     * Automatically swap the current elytra with a new one when the durability gets too low
-     */
-    public final Setting<Boolean> elytraAutoSwap = new Setting<>(true);
-
-    /**
-     * The minimum durability an elytra can have before being swapped
-     */
-    public final Setting<Integer> elytraMinimumDurability = new Setting<>(5);
-
-    /**
-     * Time between culling far away chunks from the nether pathfinder chunk cache
-     */
-    public final Setting<Long> elytraTimeBetweenCacheCullSecs = new Setting<>(TimeUnit.MINUTES.toSeconds(3));
-
-    /**
-     * Maximum distance chunks can be before being culled from the nether pathfinder chunk cache
-     */
-    public final Setting<Integer> elytraCacheCullDistance = new Setting<>(5000);

    /**
     * A map of lowercase setting field names to their respective setting
@@ -1428,11 +880,9 @@ public final class Settings {
    public final Map<Setting<?>, Type> settingTypes;

    public final class Setting<T> {
-
        public T value;
        public final T defaultValue;
        private String name;
-        private boolean javaOnly;

        @SuppressWarnings("unchecked")
        private Setting(T value) {
@@ -1441,7 +891,6 @@ public final class Settings {
            }
            this.value = value;
            this.defaultValue = value;
-            this.javaOnly = false;
        }

        /**
@@ -1478,25 +927,8 @@ public final class Settings {
        public final Type getType() {
            return settingTypes.get(this);
        }
-
-        /**
-         * This should always be the same as whether the setting can be parsed from or serialized to a string; in other
-         * words, the only way to modify it is by writing to {@link #value} programatically.
-         *
-         * @return {@code true} if the setting can not be set or read by the user
-         */
-        public boolean isJavaOnly() {
-            return javaOnly;
-        }
    }

-    /**
-     * Marks a {@link Setting} field as being {@link Setting#isJavaOnly() Java-only}
-     */
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.FIELD)
-    private @interface JavaOnly {}
-
    // here be dragons

    Settings() {
@@ -1512,7 +944,6 @@ public final class Settings {
                    Setting<?> setting = (Setting<?>) field.get(this);
                    String name = field.getName();
                    setting.name = name;
-                    setting.javaOnly = field.isAnnotationPresent(JavaOnly.class);
                    name = name.toLowerCase();
                    if (tmpByName.containsKey(name)) {
                        throw new IllegalStateException("Duplicate setting name");
@@ -1531,10 +962,10 @@ public final class Settings {
    }

    @SuppressWarnings("unchecked")
-    public <T> List<Setting<T>> getAllValuesByType(Class<T> cla$$) {
+    public <T> List<Setting<T>> getAllValuesByType(Class<T> klass) {
        List<Setting<T>> result = new ArrayList<>();
        for (Setting<?> setting : allSettings) {
-            if (setting.getValueClass().equals(cla$$)) {
+            if (setting.getValueClass().equals(klass)) {
                result.add((Setting<T>) setting);
            }
        }
--- a/src/api/java/baritone/api/behavior/IBehavior.java
+++ b/src/api/java/baritone/api/behavior/IBehavior.java
@@ -27,10 +27,4 @@ import baritone.api.event.listener.IGameEventListener;
 * @see IGameEventListener
 * @since 9/23/2018
 */
-public interface IBehavior extends AbstractGameEventListener {
-
-    /**
-     * Called after Baritone's initialization is complete
-     */
-    default void onLoad() {}
-}
+public interface IBehavior extends AbstractGameEventListener {}
--- a/src/api/java/baritone/api/behavior/IElytraBehavior.java
+++ b/src/api/java/baritone/api/behavior/IElytraBehavior.java
@@ -1,54 +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.behavior;
-
-import net.minecraft.util.math.BlockPos;
-
-import java.util.concurrent.CompletableFuture;
-
-public interface IElytraBehavior extends IBehavior {
-
-    /**
-     * Marks the nether pathfinder context to be reset when it is safe to do so. Because this operation is not
-     * immediate, a {@link CompletableFuture} is returned that will complete after the context has been reset.
-     *
-     * @return A {@link CompletableFuture} that is completed when the context is reset
-     */
-    CompletableFuture<Void> resetContext();
-
-    void repackChunks();
-
-    void pathTo(BlockPos destination);
-
-    void cancel();
-
-    /**
-     * Returns {@code true} if the current {@link IElytraBehavior} is actively pathing.
-     */
-    boolean isActive();
-
-    /**
-     * @return {@code true} if the native library loaded and elytra is actually usable
-     */
-    boolean isLoaded();
-
-    /*
-     * FOR INTERNAL USE ONLY. MAY BE REMOVED AT ANY TIME.
-     */
-    boolean isSafeToCancel();
-}
--- a/src/api/java/baritone/api/behavior/ILookBehavior.java
+++ b/src/api/java/baritone/api/behavior/ILookBehavior.java
@@ -17,8 +17,6 @@

 package baritone.api.behavior;

-import baritone.api.Settings;
-import baritone.api.behavior.look.IAimProcessor;
 import baritone.api.utils.Rotation;

 /**
@@ -28,23 +26,14 @@ import baritone.api.utils.Rotation;
 public interface ILookBehavior extends IBehavior {

    /**
-     * Updates the current {@link ILookBehavior} target to target the specified rotations on the next tick. If any sort
-     * of block interaction is required, {@code blockInteract} should be {@code true}. It is not guaranteed that the
-     * rotations set by the caller will be the exact rotations expressed by the client (This is due to settings like
-     * {@link Settings#randomLooking}). If the rotations produced by this behavior are required, then the
-     * {@link #getAimProcessor() aim processor} should be used.
+     * Updates the current {@link ILookBehavior} target to target
+     * the specified rotations on the next tick. If force is {@code true},
+     * then freeLook will be overriden and angles will be set regardless.
+     * If any sort of block interaction is required, force should be {@code true},
+     * otherwise, it should be {@code false};
     *
-     * @param rotation      The target rotations
-     * @param blockInteract Whether the target rotations are needed for a block interaction
+     * @param rotation The target rotations
+     * @param force    Whether or not to "force" the rotations
     */
-    void updateTarget(Rotation rotation, boolean blockInteract);
-
-    /**
-     * The aim processor instance for this {@link ILookBehavior}, which is responsible for applying additional,
-     * deterministic transformations to the target rotation set by {@link #updateTarget}.
-     *
-     * @return The aim processor
-     * @see IAimProcessor#fork
-     */
-    IAimProcessor getAimProcessor();
+    void updateTarget(Rotation rotation, boolean force);
 }
--- a/src/api/java/baritone/api/behavior/IPathingBehavior.java
+++ b/src/api/java/baritone/api/behavior/IPathingBehavior.java
@@ -58,32 +58,15 @@ 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
     */
    Goal getGoal();

    /**
-     * @return Whether or not a path is currently being executed. This will be false if there's currently a pause.
-     * @see #hasPath()
+     * @return Whether or not a path is currently being executed.
     */
-    boolean isPathing();
-
-    /**
-     * @return If there is a current path. Note that the path is not necessarily being executed, for example when there
-     * is a pause in effect.
-     * @see #isPathing()
-     */
-    default boolean hasPath() {
+    default boolean isPathing() {
        return getCurrent() != null;
    }

--- a/src/api/java/baritone/api/behavior/look/IAimProcessor.java
+++ b/src/api/java/baritone/api/behavior/look/IAimProcessor.java
@@ -1,45 +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.behavior.look;
-
-import baritone.api.utils.Rotation;
-
-/**
- * @author Brady
- */
-public interface IAimProcessor {
-
-    /**
-     * Returns the actual rotation that will be used when the desired rotation is requested. The returned rotation
-     * always reflects what would happen in the upcoming tick. In other words, it is a pure function, and no internal
-     * state changes. If simulation of the rotation states beyond the next tick is required, then a
-     * {@link IAimProcessor#fork fork} should be created.
-     *
-     * @param desired The desired rotation to set
-     * @return The actual rotation
-     */
-    Rotation peekRotation(Rotation desired);
-
-    /**
-     * Returns a copy of this {@link IAimProcessor} which has its own internal state and is manually tickable.
-     *
-     * @return The forked processor
-     * @see ITickableAimProcessor
-     */
-    ITickableAimProcessor fork();
-}
--- a/src/api/java/baritone/api/behavior/look/ITickableAimProcessor.java
+++ b/src/api/java/baritone/api/behavior/look/ITickableAimProcessor.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.api.behavior.look;
-
-import baritone.api.utils.Rotation;
-
-/**
- * @author Brady
- */
-public interface ITickableAimProcessor extends IAimProcessor {
-
-    /**
-     * Advances the internal state of this aim processor by a single tick.
-     */
-    void tick();
-
-    /**
-     * Calls {@link #tick()} the specified number of times.
-     *
-     * @param ticks The number of calls
-     */
-    void advance(int ticks);
-
-    /**
-     * Returns the actual rotation as provided by {@link #peekRotation(Rotation)}, and then automatically advances the
-     * internal state by one {@link #tick() tick}.
-     *
-     * @param rotation The desired rotation to set
-     * @return The actual rotation
-     */
-    Rotation nextRotation(Rotation rotation);
-}
--- 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/ICachedWorld.java
+++ b/src/api/java/baritone/api/cache/ICachedWorld.java
@@ -81,4 +81,6 @@ public interface ICachedWorld {
     * in a new thread by default.
     */
    void save();
+
+
 }
--- a/src/api/java/baritone/api/schematic/format/ISchematicFormat.java
+++ b/src/api/java/baritone/api/schematic/format/ISchematicFormat.java
@@ -15,31 +15,30 @@
 * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
 */

-package baritone.api.schematic.format;
+package baritone.api.cache;

-import baritone.api.schematic.ISchematic;
-import baritone.api.schematic.IStaticSchematic;
+import net.minecraft.util.math.BlockPos;

-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+import java.util.Map;

 /**
- * The base of a {@link ISchematic} file format
- *
 * @author Brady
- * @since 12/23/2019
+ * @since 9/23/2018
 */
-public interface ISchematicFormat {
+public interface IContainerMemory {

    /**
-     * @return The parser for creating schematics of this format
+     * Gets a remembered inventory by its block position.
+     *
+     * @param pos The position of the container block
+     * @return The remembered inventory
     */
-    IStaticSchematic parse(InputStream input) throws IOException;
+    IRememberedInventory getInventoryByPos(BlockPos pos);

    /**
-     * @param file The file to check against
-     * @return Whether or not the specified file matches this schematic format
+     * Gets the map of all block positions to their remembered inventories.
+     *
+     * @return Map of block positions to their respective remembered inventories
     */
-    boolean isFileType(File file);
+    Map<BlockPos, IRememberedInventory> getRememberedInventories();
 }
--- a/src/main/java/baritone/utils/accessor/IAnvilChunkLoader.java
+++ b/src/main/java/baritone/utils/accessor/IAnvilChunkLoader.java
@@ -15,18 +15,25 @@
 * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
 */

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

-import baritone.cache.WorldProvider;
+import net.minecraft.item.ItemStack;

-import java.io.File;
+import java.util.List;

 /**
 * @author Brady
- * @see WorldProvider
- * @since 8/4/2018
+ * @since 9/23/2018
 */
-public interface IAnvilChunkLoader {
+public interface IRememberedInventory {

-    File getChunkSaveLocation();
+    /**
+     * @return The contents of this inventory
+     */
+    List<ItemStack> getContents();
+
+    /**
+     * @return The number of slots in this inventory
+     */
+    int getSize();
 }
--- a/src/api/java/baritone/api/cache/IWaypoint.java
+++ b/src/api/java/baritone/api/cache/IWaypoint.java
@@ -17,9 +17,12 @@

 package baritone.api.cache;

-import baritone.api.utils.BetterBlockPos;
+import net.minecraft.util.math.BlockPos;
+import org.apache.commons.lang3.ArrayUtils;

-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;

 /**
 * A marker for a position in the world.
@@ -57,7 +60,7 @@ public interface IWaypoint {
     *
     * @return The block position of this waypoint
     */
-    BetterBlockPos getLocation();
+    BlockPos getLocation();

    enum Tag {

@@ -89,48 +92,20 @@ public interface IWaypoint {
        /**
         * The names for the tag, anything that the tag can be referred to as.
         */
-        public final String[] names;
+        private final String[] names;

        Tag(String... names) {
            this.names = names;
        }

        /**
-         * @return A name that can be passed to {@link #getByName(String)} to retrieve this tag
-         */
-        public String getName() {
-            return names[0];
-        }
-
-        /**
-         * Gets a tag by one of its names.
+         * Finds a tag from one of the names that could be used to identify said tag.
         *
-         * @param name The name to search for.
-         * @return The tag, if found, or null.
+         * @param name The name of the tag
+         * @return The tag, if one is found, otherwise, {@code null}
         */
-        public static Tag getByName(String name) {
-            for (Tag action : Tag.values()) {
-                for (String alias : action.names) {
-                    if (alias.equalsIgnoreCase(name)) {
-                        return action;
-                    }
-                }
-            }
-
-            return null;
-        }
-
-        /**
-         * @return All tag names.
-         */
-        public static String[] getAllNames() {
-            Set<String> names = new HashSet<>();
-
-            for (Tag tag : Tag.values()) {
-                names.addAll(Arrays.asList(tag.names));
-            }
-
-            return names.toArray(new String[0]);
+        public static Tag fromString(String name) {
+            return TAG_LIST.stream().filter(tag -> ArrayUtils.contains(tag.names, name.toLowerCase())).findFirst().orElse(null);
        }
    }
 }
--- a/src/api/java/baritone/api/cache/IWorldData.java
+++ b/src/api/java/baritone/api/cache/IWorldData.java
@@ -37,4 +37,9 @@ public interface IWorldData {
     */
    IWaypointCollection getWaypoints();

+    /**
+     * @return The {@link IContainerMemory} instance
+     * @see IContainerMemory
+     */
+    IContainerMemory getContainerMemory();
 }
--- a/src/api/java/baritone/api/cache/IWorldProvider.java
+++ b/src/api/java/baritone/api/cache/IWorldProvider.java
@@ -17,8 +17,6 @@

 package baritone.api.cache;

-import java.util.function.Consumer;
-
 /**
 * @author Brady
 * @since 9/24/2018
@@ -31,11 +29,4 @@ public interface IWorldProvider {
     * @return The current world data
     */
    IWorldData getCurrentWorld();
-
-    default void ifWorldLoaded(Consumer<IWorldData> callback) {
-        final IWorldData currentWorld = this.getCurrentWorld();
-        if (currentWorld != null) {
-            callback.accept(currentWorld);
-        }
-    }
 }
--- a/src/api/java/baritone/api/cache/IWorldScanner.java
+++ b/src/api/java/baritone/api/cache/IWorldScanner.java
@@ -17,7 +17,6 @@

 package baritone.api.cache;

-import baritone.api.utils.BlockOptionalMetaLookup;
 import baritone.api.utils.IPlayerContext;
 import net.minecraft.block.Block;
 import net.minecraft.util.math.BlockPos;
@@ -34,63 +33,28 @@ public interface IWorldScanner {
    /**
     * Scans the world, up to the specified max chunk radius, for the specified blocks.
     *
-     * @param ctx             The {@link IPlayerContext} containing player and world info that the scan is based upon
-     * @param filter          The blocks to scan for
+     * @param ctx             The {@link IPlayerContext} containing player and world info that the
+     *                        scan is based upon
+     * @param blocks          The blocks to scan for
     * @param max             The maximum number of blocks to scan before cutoff
-     * @param yLevelThreshold If a block is found within this Y level, the current result will be returned, if the value
-     *                        is negative, then this condition doesn't apply.
+     * @param yLevelThreshold If a block is found within this Y level, the current result will be
+     *                        returned, if the value is negative, then this condition doesn't apply.
     * @param maxSearchRadius The maximum chunk search radius
     * @return The matching block positions
     */
-    List<BlockPos> scanChunkRadius(IPlayerContext ctx, BlockOptionalMetaLookup filter, int max, int yLevelThreshold, int maxSearchRadius);
-
-    default List<BlockPos> scanChunkRadius(IPlayerContext ctx, List<Block> filter, int max, int yLevelThreshold, int maxSearchRadius) {
-        return scanChunkRadius(ctx, new BlockOptionalMetaLookup(filter.toArray(new Block[0])), max, yLevelThreshold, maxSearchRadius);
-    }
+    List<BlockPos> scanChunkRadius(IPlayerContext ctx, List<Block> blocks, int max, int yLevelThreshold, int maxSearchRadius);

    /**
     * Scans a single chunk for the specified blocks.
     *
-     * @param ctx             The {@link IPlayerContext} containing player and world info that the scan is based upon
-     * @param filter          The blocks to scan for
-     * @param pos             The position of the target chunk
-     * @param max             The maximum number of blocks to scan before cutoff
-     * @param yLevelThreshold If a block is found within this Y level, the current result will be returned, if the value
-     *                        is negative, then this condition doesn't apply.
-     * @return The matching block positions
-     */
-    List<BlockPos> scanChunk(IPlayerContext ctx, BlockOptionalMetaLookup filter, ChunkPos pos, int max, int yLevelThreshold);
-
-    /**
-     * Scans a single chunk for the specified blocks.
-     *
-     * @param ctx             The {@link IPlayerContext} containing player and world info that the scan is based upon
+     * @param ctx             The {@link IPlayerContext} containing player and world info that the
+     *                        scan is based upon
     * @param blocks          The blocks to scan for
     * @param pos             The position of the target chunk
     * @param max             The maximum number of blocks to scan before cutoff
-     * @param yLevelThreshold If a block is found within this Y level, the current result will be returned, if the value
-     *                        is negative, then this condition doesn't apply.
+     * @param yLevelThreshold If a block is found within this Y level, the current result will be
+     *                        returned, if the value is negative, then this condition doesn't apply.
     * @return The matching block positions
     */
-    default List<BlockPos> scanChunk(IPlayerContext ctx, List<Block> blocks, ChunkPos pos, int max, int yLevelThreshold) {
-        return scanChunk(ctx, new BlockOptionalMetaLookup(blocks), pos, max, yLevelThreshold);
-    }
-
-    /**
-     * Overload of {@link #repack(IPlayerContext, int)} where the value of the {@code range} parameter is {@code 40}.
-     *
-     * @param ctx The player, describing the origin
-     * @return The amount of chunks successfully queued for repacking
-     */
-    int repack(IPlayerContext ctx);
-
-    /**
-     * 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 range The range to repack
-     * @return The amount of chunks successfully queued for repacking
-     */
-    int repack(IPlayerContext ctx, int range);
+    List<BlockPos> scanChunk(IPlayerContext ctx, List<Block> blocks, ChunkPos pos, int max, int yLevelThreshold);
 }
--- a/src/api/java/baritone/api/cache/Waypoint.java
+++ b/src/api/java/baritone/api/cache/Waypoint.java
@@ -17,7 +17,7 @@

 package baritone.api.cache;

-import baritone.api.utils.BetterBlockPos;
+import net.minecraft.util.math.BlockPos;

 import java.util.Date;

@@ -31,9 +31,9 @@ public class Waypoint implements IWaypoint {
    private final String name;
    private final Tag tag;
    private final long creationTimestamp;
-    private final BetterBlockPos location;
+    private final BlockPos location;

-    public Waypoint(String name, Tag tag, BetterBlockPos location) {
+    public Waypoint(String name, Tag tag, BlockPos location) {
        this(name, tag, location, System.currentTimeMillis());
    }

@@ -46,7 +46,7 @@ public class Waypoint implements IWaypoint {
     * @param location          The waypoint location
     * @param creationTimestamp When the waypoint was created
     */
-    public Waypoint(String name, Tag tag, BetterBlockPos location, long creationTimestamp) {
+    public Waypoint(String name, Tag tag, BlockPos location, long creationTimestamp) {
        this.name = name;
        this.tag = tag;
        this.location = location;
@@ -55,7 +55,7 @@ public class Waypoint implements IWaypoint {

    @Override
    public int hashCode() {
-        return name.hashCode() ^ tag.hashCode() ^ location.hashCode() ^ Long.hashCode(creationTimestamp);
+        return name.hashCode() + tag.hashCode() + location.hashCode(); //lol
    }

    @Override
@@ -74,18 +74,13 @@ public class Waypoint implements IWaypoint {
    }

    @Override
-    public BetterBlockPos getLocation() {
+    public BlockPos getLocation() {
        return this.location;
    }

    @Override
    public String toString() {
-        return String.format(
-                "%s %s %s",
-                name,
-                BetterBlockPos.from(location).toString(),
-                new Date(creationTimestamp).toString()
-        );
+        return name + " " + location.toString() + " " + new Date(creationTimestamp).toString();
    }

    @Override
--- a/src/api/java/baritone/api/command/Command.java
+++ b/src/api/java/baritone/api/command/Command.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.api.command;
-
-import baritone.api.IBaritone;
-import baritone.api.utils.IPlayerContext;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * A default implementation of {@link ICommand} which provides easy access to the
- * command's bound {@link IBaritone} instance, {@link IPlayerContext} and an easy
- * way to provide multiple valid command execution names through the default constructor.
- * <p>
- * 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
- */
-public abstract class Command implements ICommand {
-
-    protected IBaritone baritone;
-    protected IPlayerContext ctx;
-
-    /**
-     * The names of this command. This is what you put after the command prefix.
-     */
-    protected final List<String> names;
-
-    /**
-     * Creates a new Baritone control command.
-     *
-     * @param names The names of this command. This is what you put after the command prefix.
-     */
-    protected Command(IBaritone baritone, String... names) {
-        this.names = Collections.unmodifiableList(Stream.of(names)
-                .map(s -> s.toLowerCase(Locale.US))
-                .collect(Collectors.toList()));
-        this.baritone = baritone;
-        this.ctx = baritone.getPlayerContext();
-    }
-
-    @Override
-    public final List<String> getNames() {
-        return this.names;
-    }
-}
--- a/src/api/java/baritone/api/command/IBaritoneChatControl.java
+++ b/src/api/java/baritone/api/command/IBaritoneChatControl.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.api.command;
-
-import baritone.api.Settings;
-
-import java.util.UUID;
-
-/**
- * @author Brady
- * @since 9/26/2019
- */
-public interface IBaritoneChatControl {
-
-    /**
-     * In certain cases chat components need to execute commands for you. For example, the paginator automatically runs
-     * commands when you click the forward and back arrows to show you the previous/next page.
-     * <p>
-     * If the prefix is changed in the meantime, then the command will go to chat. That's no good. So here's a permanent
-     * prefix that forces a command to run, regardless of the current prefix, chat/prefix control being enabled, etc.
-     * <p>
-     * If used right (by both developers and users), it should be impossible to expose a command accidentally to the
-     * server. As a rule of thumb, if you have a clickable chat component, always use this prefix. If you're suggesting
-     * a command (a component that puts text into your text box, or something else), use {@link Settings#prefix}.
-     */
-    String FORCE_COMMAND_PREFIX = String.format("<<%s>>", UUID.randomUUID().toString());
-}
--- a/src/api/java/baritone/api/command/ICommand.java
+++ b/src/api/java/baritone/api/command/ICommand.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.api.command;
-
-import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.exception.CommandException;
-import baritone.api.utils.Helper;
-
-import java.util.List;
-import java.util.stream.Stream;
-
-/**
- * The base for a command.
- *
- * @author Brady
- * @since 10/7/2019
- */
-public interface ICommand extends Helper {
-
-    /**
-     * Called when this command is executed.
-     */
-    void execute(String label, IArgConsumer args) throws CommandException;
-
-    /**
-     * Called when the command needs to tab complete. Return a Stream representing the entries to put in the completions
-     * list.
-     */
-    Stream<String> tabComplete(String label, IArgConsumer args) throws CommandException;
-
-    /**
-     * @return A <b>single-line</b> string containing a short description of this command's purpose.
-     */
-    String getShortDesc();
-
-    /**
-     * @return A list of lines that will be printed by the help command when the user wishes to view them.
-     */
-    List<String> getLongDesc();
-
-    /**
-     * @return A list of the names that can be accepted to have arguments passed to this command
-     */
-    List<String> getNames();
-
-    /**
-     * @return {@code true} if this command should be hidden from the help menu
-     */
-    default boolean hiddenFromHelp() {
-        return false;
-    }
-}
--- a/src/api/java/baritone/api/command/ICommandSystem.java
+++ b/src/api/java/baritone/api/command/ICommandSystem.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.api.command;
-
-import baritone.api.command.argparser.IArgParserManager;
-
-/**
- * @author Brady
- * @since 10/4/2019
- */
-public interface ICommandSystem {
-
-    IArgParserManager getParserManager();
-}
--- a/src/api/java/baritone/api/command/argparser/IArgParser.java
+++ b/src/api/java/baritone/api/command/argparser/IArgParser.java
@@ -1,60 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.argparser;
-
-import baritone.api.command.argument.ICommandArgument;
-
-public interface IArgParser<T> {
-
-    /**
-     * @return the class of this parser.
-     */
-    Class<T> getTarget();
-
-    /**
-     * A stateless argument parser is just that. It takes a {@link ICommandArgument} and outputs its type.
-     */
-    interface Stateless<T> extends IArgParser<T> {
-
-        /**
-         * @param arg The argument to parse.
-         * @return What it was parsed into.
-         * @throws RuntimeException if you want the parsing to fail. The exception will be caught and turned into an
-         *                          appropriate error.
-         */
-        T parseArg(ICommandArgument arg) throws Exception;
-    }
-
-    /**
-     * A stated argument parser is similar to a stateless one. It also takes a {@link ICommandArgument}, but it also
-     * takes a second argument that can be any type, referred to as the state.
-     */
-    interface Stated<T, S> extends IArgParser<T> {
-
-        Class<S> getStateType();
-
-        /**
-         * @param arg   The argument to parse.
-         * @param state Can be anything.
-         * @return What it was parsed into.
-         * @throws RuntimeException if you want the parsing to fail. The exception will be caught and turned into an
-         *                          appropriate error.
-         */
-        T parseArg(ICommandArgument arg, S state) throws Exception;
-    }
-}
--- a/src/api/java/baritone/api/command/argparser/IArgParserManager.java
+++ b/src/api/java/baritone/api/command/argparser/IArgParserManager.java
@@ -1,69 +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.command.argparser;
-
-import baritone.api.command.argument.ICommandArgument;
-import baritone.api.command.exception.CommandInvalidTypeException;
-import baritone.api.command.registry.Registry;
-
-/**
- * Used to retrieve {@link IArgParser} instances from the registry, by their target class.
- * It can be assumed that a {@link IArgParser} exists for {@link Integer}, {@link Long},
- * {@link Float}, {@link Double} and {@link Boolean}.
- *
- * @author Brady
- * @since 10/4/2019
- */
-public interface IArgParserManager {
-
-    /**
-     * @param type The type trying to be parsed
-     * @return A parser that can parse arguments into this class, if found.
-     */
-    <T> IArgParser.Stateless<T> getParserStateless(Class<T> type);
-
-    /**
-     * @param type The type trying to be parsed
-     * @return A parser that can parse arguments into this class, if found.
-     */
-    <T, S> IArgParser.Stated<T, S> getParserStated(Class<T> type, Class<S> stateKlass);
-
-    /**
-     * 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.
-     * @return An instance of the specified class.
-     * @throws CommandInvalidTypeException If the parsing failed
-     */
-    <T> T parseStateless(Class<T> type, ICommandArgument arg) throws CommandInvalidTypeException;
-
-    /**
-     * Attempt to parse the specified argument with a stated {@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 state The state to pass to the {@link IArgParser.Stated}.
-     * @return An instance of the specified class.
-     * @throws CommandInvalidTypeException If the parsing failed
-     * @see IArgParser.Stated
-     */
-    <T, S> T parseStated(Class<T> type, Class<S> stateKlass, ICommandArgument arg, S state) throws CommandInvalidTypeException;
-
-    Registry<IArgParser> getRegistry();
-}
--- a/src/api/java/baritone/api/command/argument/IArgConsumer.java
+++ b/src/api/java/baritone/api/command/argument/IArgConsumer.java
@@ -1,594 +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.command.argument;
-
-import baritone.api.command.ICommand;
-import baritone.api.command.argparser.IArgParser;
-import baritone.api.command.datatypes.IDatatype;
-import baritone.api.command.datatypes.IDatatypeFor;
-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 java.util.Deque;
-import java.util.LinkedList;
-import java.util.stream.Stream;
-
-/**
- * The {@link IArgConsumer} is how {@link ICommand}s read the arguments passed to them. This class has many benefits:
- *
- * <ul>
- * <li>Mutability. The whole concept of the {@link IArgConsumer}} is to let you gradually consume arguments in any way
- * you'd like. You can change your consumption based on earlier arguments, for subcommands for example.</li>
- * <li>You don't need to keep track of your consumption. The {@link IArgConsumer}} keeps track of the arguments you
- * consume so that it can throw detailed exceptions whenever something is out of the ordinary. Additionally, if you
- * need to retrieve an argument after you've already consumed it - look no further than {@link #consumed()}!</li>
- * <li>Easy retrieval of many different types. If you need to retrieve an instance of an int or float for example,
- * look no further than {@link #getAs(Class)}. If you need a more powerful way of retrieving data, try out the many
- * {@code getDatatype...} methods.</li>
- * <li>It's very easy to throw detailed exceptions. The {@link IArgConsumer}} has many different methods that can
- * enforce the number of arguments, the type of arguments, and more, throwing different types of
- * {@link CommandException}s if something seems off. You're recommended to do all validation and store all needed
- * data in variables BEFORE logging any data to chat via {@link Helper#logDirect(String)}, so that the error
- * handlers can do their job and log the error to chat.</li>
- * </ul>
- */
-public interface IArgConsumer {
-
-    LinkedList<ICommandArgument> getArgs();
-
-    Deque<ICommandArgument> getConsumed();
-
-    /**
-     * @param num The number of arguments to check for
-     * @return {@code true} if there are <i>at least</i> {@code num} arguments left in this {@link IArgConsumer}}
-     * @see #hasAny()
-     * @see #hasAtMost(int)
-     * @see #hasExactly(int)
-     */
-    boolean has(int num);
-
-    /**
-     * @return {@code true} if there is <i>at least</i> 1 argument left in this {@link IArgConsumer}}
-     * @see #has(int)
-     * @see #hasAtMostOne()
-     * @see #hasExactlyOne()
-     */
-    boolean hasAny();
-
-    /**
-     * @param num The number of arguments to check for
-     * @return {@code true} if there are <i>at most</i> {@code num} arguments left in this {@link IArgConsumer}}
-     * @see #has(int)
-     * @see #hasAtMost(int)
-     * @see #hasExactly(int)
-     */
-    boolean hasAtMost(int num);
-
-    /**
-     * @return {@code true} if there is <i>at most</i> 1 argument left in this {@link IArgConsumer}}
-     * @see #hasAny()
-     * @see #hasAtMostOne()
-     * @see #hasExactlyOne()
-     */
-    boolean hasAtMostOne();
-
-    /**
-     * @param num The number of arguments to check for
-     * @return {@code true} if there are <i>exactly</i> {@code num} arguments left in this {@link IArgConsumer}}
-     * @see #has(int)
-     * @see #hasAtMost(int)
-     */
-    boolean hasExactly(int num);
-
-    /**
-     * @return {@code true} if there is <i>exactly</i> 1 argument left in this {@link IArgConsumer}}
-     * @see #hasAny()
-     * @see #hasAtMostOne()
-     */
-    boolean hasExactlyOne();
-
-    /**
-     * @param index The index to peek
-     * @return The argument at index {@code index} in this {@link IArgConsumer}}, with 0 being the next one. This does not
-     * mutate the {@link IArgConsumer}}
-     * @throws CommandNotEnoughArgumentsException If there is less than {@code index + 1} arguments left
-     * @see #peek()
-     * @see #peekString(int)
-     * @see #peekAs(Class, int)
-     * @see #get()
-     */
-    ICommandArgument peek(int index) throws CommandNotEnoughArgumentsException;
-
-    /**
-     * @return The next argument in this {@link IArgConsumer}}. This does not mutate the {@link IArgConsumer}}
-     * @throws CommandNotEnoughArgumentsException If there is less than one argument left
-     * @see #peek(int)
-     * @see #peekString()
-     * @see #peekAs(Class)
-     * @see #get()
-     */
-    ICommandArgument peek() throws CommandNotEnoughArgumentsException;
-
-    /**
-     * @param index The index to peek
-     * @param type  The type to check for
-     * @return If an ArgParser.Stateless for the specified {@code type} would succeed in parsing the next
-     * argument
-     * @throws CommandNotEnoughArgumentsException If there is less than {@code index + 1} arguments left
-     * @see #peek()
-     * @see #getAs(Class)
-     */
-    boolean is(Class<?> type, int index) throws CommandNotEnoughArgumentsException;
-
-    /**
-     * @param type The type to check for
-     * @return If an ArgParser.Stateless for the specified {@code type} would succeed in parsing the next
-     * argument
-     * @throws CommandNotEnoughArgumentsException If there is less than one argument left
-     * @see #peek()
-     * @see #getAs(Class)
-     */
-    boolean is(Class<?> type) throws CommandNotEnoughArgumentsException;
-
-    /**
-     * @param index The index to peek
-     * @return The value of the argument at index {@code index} in this {@link IArgConsumer}}, with 0 being the next one
-     * This does not mutate the {@link IArgConsumer}}
-     * @throws CommandNotEnoughArgumentsException If there is less than {@code index + 1} arguments left
-     * @see #peek()
-     * @see #peekString()
-     */
-    String peekString(int index) throws CommandNotEnoughArgumentsException;
-
-    /**
-     * @return The value of the next argument in this {@link IArgConsumer}}. This does not mutate the {@link IArgConsumer}}
-     * @throws CommandNotEnoughArgumentsException If there is less than one argument left
-     * @see #peekString(int)
-     * @see #getString()
-     */
-    String peekString() throws CommandNotEnoughArgumentsException;
-
-    /**
-     * @param index     The index to peek
-     * @param enumClass The class to search
-     * @return From the specified enum class, an enum constant of that class. The enum constant's name will match the
-     * next argument's value
-     * @throws java.util.NoSuchElementException If the constant couldn't be found
-     * @see #peekEnumOrNull(Class)
-     * @see #getEnum(Class)
-     * @see ICommandArgument#getEnum(Class)
-     */
-    <E extends Enum<?>> E peekEnum(Class<E> enumClass, int index) throws CommandInvalidTypeException, CommandNotEnoughArgumentsException;
-
-    /**
-     * @param enumClass The class to search
-     * @return From the specified enum class, an enum constant of that class. The enum constant's name will match the
-     * next argument's value
-     * @throws CommandInvalidTypeException If the constant couldn't be found
-     * @see #peekEnumOrNull(Class)
-     * @see #getEnum(Class)
-     * @see ICommandArgument#getEnum(Class)
-     */
-    <E extends Enum<?>> E peekEnum(Class<E> enumClass) throws CommandInvalidTypeException, CommandNotEnoughArgumentsException;
-
-    /**
-     * @param index     The index to peek
-     * @param enumClass The class to search
-     * @return From the specified enum class, an enum constant of that class. The enum constant's name will match the
-     * next argument's value. If no constant could be found, null
-     * @see #peekEnum(Class)
-     * @see #getEnumOrNull(Class)
-     * @see ICommandArgument#getEnum(Class)
-     */
-    <E extends Enum<?>> E peekEnumOrNull(Class<E> enumClass, int index) throws CommandNotEnoughArgumentsException;
-
-    /**
-     * @param enumClass The class to search
-     * @return From the specified enum class, an enum constant of that class. The enum constant's name will match the
-     * next argument's value. If no constant could be found, null
-     * @see #peekEnum(Class)
-     * @see #getEnumOrNull(Class)
-     * @see ICommandArgument#getEnum(Class)
-     */
-    <E extends Enum<?>> E peekEnumOrNull(Class<E> enumClass) throws CommandNotEnoughArgumentsException;
-
-    /**
-     * Tries to use a <b>stateless</b> {@link IArgParser} to parse the argument at the specified index into the specified
-     * class
-     * <p>
-     * A critical difference between {@link IDatatype}s and {@link IArgParser}s is how many arguments they can take.
-     * While {@link IArgParser}s always operate on a single argument's value, {@link IDatatype}s get access to the entire
-     * {@link 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
-     * @see IArgParser
-     * @see #peekAs(Class)
-     * @see #peekAsOrDefault(Class, Object, int)
-     * @see #peekAsOrNull(Class, int)
-     */
-    <T> T peekAs(Class<T> type, int index) throws CommandInvalidTypeException, CommandNotEnoughArgumentsException;
-
-    /**
-     * Tries to use a <b>stateless</b> {@link IArgParser} to parse the next argument into the specified class
-     * <p>
-     * A critical difference between {@link IDatatype}s and {@link IArgParser}s is how many arguments they can take.
-     * While {@link IArgParser}s always operate on a single argument's value, {@link IDatatype}s get access to the entire
-     * {@link IArgConsumer}}.
-     *
-     * @param type The type to peek as
-     * @return An instance of the specified type
-     * @throws CommandInvalidTypeException If the parsing failed
-     * @see IArgParser
-     * @see #peekAs(Class, int)
-     * @see #peekAsOrDefault(Class, Object)
-     * @see #peekAsOrNull(Class)
-     */
-    <T> T peekAs(Class<T> type) throws CommandInvalidTypeException, CommandNotEnoughArgumentsException;
-
-    /**
-     * Tries to use a <b>stateless</b> {@link IArgParser} to parse the argument at the specified index into the specified
-     * class
-     * <p>
-     * A critical difference between {@link IDatatype}s and {@link IArgParser}s is how many arguments they can take.
-     * While {@link IArgParser}s always operate on a single argument's value, {@link IDatatype}s get access to the entire
-     * {@link IArgConsumer}}.
-     *
-     * @param type  The type to peek as
-     * @param def   The value to return if the argument can't be parsed
-     * @param index The index to peek
-     * @return An instance of the specified type, or {@code def} if it couldn't be parsed
-     * @see IArgParser
-     * @see #peekAsOrDefault(Class, Object)
-     * @see #peekAs(Class, int)
-     * @see #peekAsOrNull(Class, int)
-     */
-    <T> T peekAsOrDefault(Class<T> type, T def, int index) throws CommandNotEnoughArgumentsException;
-
-    /**
-     * Tries to use a <b>stateless</b> {@link IArgParser} to parse the next argument into the specified class
-     * <p>
-     * A critical difference between {@link IDatatype}s and {@link IArgParser}s is how many arguments they can take.
-     * While {@link IArgParser}s always operate on a single argument's value, {@link IDatatype}s get access to the entire
-     * {@link IArgConsumer}}.
-     *
-     * @param type The type to peek as
-     * @param def  The value to return if the argument can't be parsed
-     * @return An instance of the specified type, or {@code def} if it couldn't be parsed
-     * @see IArgParser
-     * @see #peekAsOrDefault(Class, Object, int)
-     * @see #peekAs(Class)
-     * @see #peekAsOrNull(Class)
-     */
-    <T> T peekAsOrDefault(Class<T> type, T def) throws CommandNotEnoughArgumentsException;
-
-    /**
-     * Tries to use a <b>stateless</b> {@link IArgParser} to parse the argument at the specified index into the specified
-     * class
-     * <p>
-     * A critical difference between {@link IDatatype}s and {@link IArgParser}s is how many arguments they can take.
-     * While {@link IArgParser}s always operate on a single argument's value, {@link IDatatype}s get access to the entire
-     * {@link IArgConsumer}}.
-     *
-     * @param type  The type to peek as
-     * @param index The index to peek
-     * @return An instance of the specified type, or {@code null} if it couldn't be parsed
-     * @see IArgParser
-     * @see #peekAsOrNull(Class)
-     * @see #peekAs(Class, int)
-     * @see #peekAsOrDefault(Class, Object, int)
-     */
-    <T> T peekAsOrNull(Class<T> type, int index) throws CommandNotEnoughArgumentsException;
-
-    /**
-     * Tries to use a <b>stateless</b> {@link IArgParser} to parse the next argument into the specified class
-     * <p>
-     * A critical difference between {@link IDatatype}s and {@link IArgParser}s is how many arguments they can take.
-     * While {@link IArgParser}s always operate on a single argument's value, {@link IDatatype}s get access to the entire
-     * {@link IArgConsumer}}.
-     *
-     * @param type The type to peek as
-     * @return An instance of the specified type, or {@code null} if it couldn't be parsed
-     * @see IArgParser
-     * @see #peekAsOrNull(Class, int)
-     * @see #peekAs(Class)
-     * @see #peekAsOrDefault(Class, Object)
-     */
-    <T> T peekAsOrNull(Class<T> type) throws CommandNotEnoughArgumentsException;
-
-    <T> T peekDatatype(IDatatypeFor<T> datatype) throws CommandInvalidTypeException, CommandNotEnoughArgumentsException;
-
-    <T, O> T peekDatatype(IDatatypePost<T, O> datatype) throws CommandInvalidTypeException, CommandNotEnoughArgumentsException;
-
-    <T, O> T peekDatatype(IDatatypePost<T, O> datatype, O original) throws CommandInvalidTypeException, CommandNotEnoughArgumentsException;
-
-    <T> T peekDatatypeOrNull(IDatatypeFor<T> datatype);
-
-    <T, O> T peekDatatypeOrNull(IDatatypePost<T, O> datatype);
-
-    <T, O, D extends IDatatypePost<T, O>> T peekDatatypePost(D datatype, O original) throws CommandInvalidTypeException, CommandNotEnoughArgumentsException;
-
-    <T, O, D extends IDatatypePost<T, O>> T peekDatatypePostOrDefault(D datatype, O original, T def);
-
-    <T, O, D extends IDatatypePost<T, O>> T peekDatatypePostOrNull(D datatype, O original);
-
-    /**
-     * Attempts to get the specified {@link IDatatypeFor} from this ArgConsumer
-     * <p>
-     * A critical difference between {@link IDatatype}s and {@link IArgParser}s is how many arguments they can take.
-     * While {@link IArgParser}s always operate on a single argument's value, {@link IDatatype}s get access to the entire
-     * {@link IArgConsumer}}.
-     * <p>
-     * Since this is a peek operation, this ArgConsumer will not be mutated by any call to this method.
-     *
-     * @param datatype The datatype to get
-     * @return The datatype instance
-     * @see IDatatype
-     * @see IDatatypeFor
-     */
-    <T, D extends IDatatypeFor<T>> T peekDatatypeFor(Class<D> datatype);
-
-    /**
-     * Attempts to get the specified {@link IDatatypeFor} from this ArgConsumer
-     * <p>
-     * A critical difference between {@link IDatatype}s and {@link IArgParser}s is how many arguments they can take.
-     * While {@link IArgParser}s always operate on a single argument's value, {@link IDatatype}s get access to the entire
-     * {@link IArgConsumer}}.
-     * <p>
-     * Since this is a peek operation, this ArgConsumer will not be mutated by any call to this method.
-     *
-     * @param datatype The datatype to get
-     * @param def      The default value
-     * @return The datatype instance, or {@code def} if it throws an exception
-     * @see IDatatype
-     * @see IDatatypeFor
-     */
-    <T, D extends IDatatypeFor<T>> T peekDatatypeForOrDefault(Class<D> datatype, T def);
-
-    /**
-     * Attempts to get the specified {@link IDatatypeFor} from this ArgConsumer
-     * <p>
-     * A critical difference between {@link IDatatype}s and {@link IArgParser}s is how many arguments they can take.
-     * While {@link IArgParser}s always operate on a single argument's value, {@link IDatatype}s get access to the entire
-     * {@link IArgConsumer}}.
-     * <p>
-     * Since this is a peek operation, this ArgConsumer will not be mutated by any call to this method.
-     *
-     * @param datatype The datatype to get
-     * @return The datatype instance, or {@code null} if it throws an exception
-     * @see IDatatype
-     * @see IDatatypeFor
-     */
-    <T, D extends IDatatypeFor<T>> T peekDatatypeForOrNull(Class<D> datatype);
-
-    /**
-     * Gets the next argument and returns it. This consumes the first argument so that subsequent calls will return
-     * later arguments
-     *
-     * @return The next argument
-     * @throws CommandNotEnoughArgumentsException If there's less than one argument left
-     */
-    ICommandArgument get() throws CommandNotEnoughArgumentsException;
-
-    /**
-     * Gets the value of the next argument and returns it. This consumes the first argument so that subsequent calls
-     * will return later arguments
-     *
-     * @return The value of the next argument
-     * @throws CommandNotEnoughArgumentsException If there's less than one argument left
-     */
-    String getString() throws CommandNotEnoughArgumentsException;
-
-    /**
-     * 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}
-     *
-     * @param enumClass The enum class to search
-     * @return An enum constant of that class with the same name as the next argument's value
-     * @throws CommandInvalidTypeException If the constant couldn't be found
-     * @see #peekEnum(Class)
-     * @see #getEnumOrNull(Class)
-     * @see ICommandArgument#getEnum(Class)
-     */
-    <E extends Enum<?>> E getEnum(Class<E> enumClass) throws CommandInvalidTypeException, CommandNotEnoughArgumentsException;
-
-    /**
-     * 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}
-     *
-     * @param enumClass The enum class to search
-     * @param def       The default value
-     * @return An enum constant of that class with the same name as the next argument's value, or {@code def} if it
-     * couldn't be found
-     * @see #getEnum(Class)
-     * @see #getEnumOrNull(Class)
-     * @see #peekEnumOrNull(Class)
-     * @see ICommandArgument#getEnum(Class)
-     */
-    <E extends Enum<?>> E getEnumOrDefault(Class<E> enumClass, E def) throws CommandNotEnoughArgumentsException;
-
-    /**
-     * 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}
-     *
-     * @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
-     * couldn't be found
-     * @see #getEnum(Class)
-     * @see #getEnumOrDefault(Class, Enum)
-     * @see #peekEnumOrNull(Class)
-     * @see ICommandArgument#getEnum(Class)
-     */
-    <E extends Enum<?>> E getEnumOrNull(Class<E> enumClass) throws CommandNotEnoughArgumentsException;
-
-    /**
-     * Tries to use a <b>stateless</b> {@link IArgParser} to parse the next argument into the specified class
-     * <p>
-     * A critical difference between {@link IDatatype}s and {@link IArgParser}s is how many arguments they can take.
-     * While {@link IArgParser}s always operate on a single argument's value, {@link IDatatype}s get access to the entire
-     * {@link IArgConsumer}}.
-     *
-     * @param type The type to peek as
-     * @return An instance of the specified type
-     * @throws CommandInvalidTypeException If the parsing failed
-     * @see IArgParser
-     * @see #get()
-     * @see #getAsOrDefault(Class, Object)
-     * @see #getAsOrNull(Class)
-     * @see #peekAs(Class)
-     * @see #peekAsOrDefault(Class, Object, int)
-     * @see #peekAsOrNull(Class, int)
-     */
-    <T> T getAs(Class<T> type) throws CommandInvalidTypeException, CommandNotEnoughArgumentsException;
-
-    /**
-     * Tries to use a <b>stateless</b> {@link IArgParser} to parse the next argument into the specified class
-     * <p>
-     * A critical difference between {@link IDatatype}s and {@link IArgParser}s is how many arguments they can take.
-     * While {@link IArgParser}s always operate on a single argument's value, {@link IDatatype}s get access to the entire
-     * {@link IArgConsumer}}.
-     *
-     * @param type The type to peek as
-     * @param def  The default value
-     * @return An instance of the specified type, or {@code def} if it couldn't be parsed
-     * @see IArgParser
-     * @see #get()
-     * @see #getAs(Class)
-     * @see #getAsOrNull(Class)
-     * @see #peekAs(Class)
-     * @see #peekAsOrDefault(Class, Object, int)
-     * @see #peekAsOrNull(Class, int)
-     */
-    <T> T getAsOrDefault(Class<T> type, T def) throws CommandNotEnoughArgumentsException;
-
-    /**
-     * Tries to use a <b>stateless</b> {@link IArgParser} to parse the next argument into the specified class
-     * <p>
-     * A critical difference between {@link IDatatype}s and {@link IArgParser}s is how many arguments they can take.
-     * While {@link IArgParser}s always operate on a single argument's value, {@link IDatatype}s get access to the entire
-     * {@link IArgConsumer}}.
-     *
-     * @param type The type to peek as
-     * @return An instance of the specified type, or {@code null} if it couldn't be parsed
-     * @see IArgParser
-     * @see #get()
-     * @see #getAs(Class)
-     * @see #getAsOrDefault(Class, Object)
-     * @see #peekAs(Class)
-     * @see #peekAsOrDefault(Class, Object, int)
-     * @see #peekAsOrNull(Class, int)
-     */
-    <T> T getAsOrNull(Class<T> type) throws CommandNotEnoughArgumentsException;
-
-    <T, O, D extends IDatatypePost<T, O>> T getDatatypePost(D datatype, O original) throws CommandInvalidTypeException, CommandNotEnoughArgumentsException;
-
-    <T, O, D extends IDatatypePost<T, O>> T getDatatypePostOrDefault(D datatype, O original, T _default);
-
-    <T, O, D extends IDatatypePost<T, O>> T getDatatypePostOrNull(D datatype, O original);
-
-    <T, D extends IDatatypeFor<T>> T getDatatypeFor(D datatype) throws CommandInvalidTypeException, CommandNotEnoughArgumentsException;
-
-    <T, D extends IDatatypeFor<T>> T getDatatypeForOrDefault(D datatype, T def);
-
-    <T, D extends IDatatypeFor<T>> T getDatatypeForOrNull(D datatype);
-
-    <T extends IDatatype> Stream<String> tabCompleteDatatype(T datatype);
-
-    /**
-     * Returns the "raw rest" of the string. For example, from a string <code>arg1 arg2&nbsp;&nbsp;arg3</code>, split
-     * into three {@link ICommandArgument}s {@code "arg1"}, {@code "arg2"}, and {@code "arg3"}:
-     *
-     * <ul>
-     * <li>{@code rawRest()} would return <code>arg1 arg2&nbsp;&nbsp;arg3</code></li>
-     * <li>After calling {@link #get()}, {@code rawRest()} would return <code>arg2&nbsp;&nbsp;arg3</code> (note the
-     * double space - it is preserved!)</li>
-     * <li>After calling {@link #get()} again, {@code rawRest()} would return {@code "arg3"}</li>
-     * <li>After calling {@link #get()} one last time, {@code rawRest()} would return {@code ""}</li>
-     * </ul>
-     *
-     * @return The "raw rest" of the string.
-     */
-    String rawRest();
-
-    /**
-     * @param min The minimum amount of arguments to require.
-     * @throws CommandNotEnoughArgumentsException If there are less than {@code min} arguments left.
-     * @see #requireMax(int)
-     * @see #requireExactly(int)
-     */
-    void requireMin(int min) throws CommandNotEnoughArgumentsException;
-
-    /**
-     * @param max The maximum amount of arguments allowed.
-     * @throws CommandTooManyArgumentsException If there are more than {@code max} arguments left.
-     * @see #requireMin(int)
-     * @see #requireExactly(int)
-     */
-    void requireMax(int max) throws CommandTooManyArgumentsException;
-
-    /**
-     * @param args The exact amount of arguments to require.
-     * @throws CommandNotEnoughArgumentsException If there are less than {@code args} arguments left.
-     * @throws CommandTooManyArgumentsException   If there are more than {@code args} arguments left.
-     * @see #requireMin(int)
-     * @see #requireMax(int)
-     */
-    void requireExactly(int args) throws CommandException;
-
-    /**
-     * @return If this {@link IArgConsumer}} has consumed at least one argument.
-     * @see #consumed()
-     * @see #consumedString()
-     */
-    boolean hasConsumed();
-
-    /**
-     * @return The last argument this {@link IArgConsumer}} has consumed, or an "unknown" argument, indicated by a
-     * comamnd argument index that has a value of {@code -1}, if no arguments have been consumed yet.
-     * @see #consumedString()
-     * @see #hasConsumed()
-     */
-    ICommandArgument consumed();
-
-    /**
-     * @return The value of thelast argument this {@link IArgConsumer}} has consumed, or an empty string if no arguments
-     * have been consumed yet
-     * @see #consumed()
-     * @see #hasConsumed()
-     */
-    String consumedString();
-
-    /**
-     * @return A copy of this {@link IArgConsumer}}. It has the same arguments (both consumed and not), but does not
-     * affect or mutate this instance. Useful for the various {@code peek} functions
-     */
-    IArgConsumer copy();
-}
--- a/src/api/java/baritone/api/command/argument/ICommandArgument.java
+++ b/src/api/java/baritone/api/command/argument/ICommandArgument.java
@@ -1,101 +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.command.argument;
-
-import baritone.api.command.argparser.IArgParser;
-import baritone.api.command.exception.CommandInvalidTypeException;
-import net.minecraft.util.EnumFacing;
-
-/**
- * A {@link ICommandArgument} is an immutable object representing one command argument. It contains data on the index of
- * that argument, its value, and the rest of the string that argument was found in
- * <p>
- * You're recommended to use {@link IArgConsumer}}s to handle these.
- *
- * @author Brady
- * @since 10/2/2019
- */
-public interface ICommandArgument {
-
-    /**
-     * @return The index of this command argument in the list of command arguments generated
-     */
-    int getIndex();
-
-    /**
-     * @return The raw value of just this argument
-     */
-    String getValue();
-
-    /**
-     * @return The raw value of the remaining arguments after this one was captured
-     */
-    String getRawRest();
-
-    /**
-     * 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}
-     *
-     * @param enumClass The enum class to search
-     * @return An enum constant of that class with the same name as this argument's value
-     * @throws CommandInvalidTypeException If the constant couldn't be found
-     * @see IArgConsumer#peekEnum(Class)
-     * @see IArgConsumer#peekEnum(Class, int)
-     * @see IArgConsumer#peekEnumOrNull(Class)
-     * @see IArgConsumer#peekEnumOrNull(Class, int)
-     * @see IArgConsumer#getEnum(Class)
-     * @see IArgConsumer#getEnumOrNull(Class)
-     */
-    <E extends Enum<?>> E getEnum(Class<E> enumClass) throws CommandInvalidTypeException;
-
-    /**
-     * Tries to use a <b>stateless</b> {@link IArgParser} to parse this argument into the specified class
-     *
-     * @param type The class to parse this argument into
-     * @return An instance of the specified type
-     * @throws CommandInvalidTypeException If the parsing failed
-     */
-    <T> T getAs(Class<T> type) throws CommandInvalidTypeException;
-
-    /**
-     * Tries to use a <b>stateless</b> {@link IArgParser} to parse this argument into the specified class
-     *
-     * @param type The class to parse this argument into
-     * @return If the parser succeeded
-     */
-    <T> boolean is(Class<T> type);
-
-    /**
-     * Tries to use a <b>stated</b> {@link IArgParser} to parse this argument into the specified class
-     *
-     * @param type The class to parse this argument into
-     * @return An instance of the specified type
-     * @throws CommandInvalidTypeException If the parsing failed
-     */
-    <T, S> T getAs(Class<T> type, Class<S> stateType, S state) throws CommandInvalidTypeException;
-
-    /**
-     * Tries to use a <b>stated</b> {@link IArgParser} to parse this argument into the specified class
-     *
-     * @param type The class to parse this argument into
-     * @return If the parser succeeded
-     */
-    <T, S> boolean is(Class<T> type, Class<S> stateType, S state);
-}
--- a/src/api/java/baritone/api/command/datatypes/BlockById.java
+++ b/src/api/java/baritone/api/command/datatypes/BlockById.java
@@ -1,65 +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.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 java.util.regex.Pattern;
-import java.util.stream.Stream;
-
-public enum BlockById implements IDatatypeFor<Block> {
-    INSTANCE;
-
-    /**
-     * Matches (domain:)?name? where domain and name are [a-z0-9_.-]+ and [a-z0-9/_.-]+ respectively.
-     */
-    private static Pattern PATTERN = Pattern.compile("(?:[a-z0-9_.-]+:)?[a-z0-9/_.-]*");
-
-    @Override
-    public Block get(IDatatypeContext ctx) throws CommandException {
-        ResourceLocation id = new ResourceLocation(ctx.getConsumer().getString());
-        Block block;
-        if ((block = Block.REGISTRY.getObject(id)) == Blocks.AIR) {
-            throw new IllegalArgumentException("no block found by that id");
-        }
-        return block;
-    }
-
-    @Override
-    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
-        String arg = ctx.getConsumer().getString();
-
-        if (!PATTERN.matcher(arg).matches()) {
-            return Stream.empty();
-        }
-
-        return new TabCompleteHelper()
-                .append(
-                        Block.REGISTRY.getKeys()
-                                .stream()
-                                .map(Object::toString)
-                )
-                .filterPrefixNamespaced(arg)
-                .sortAlphabetically()
-                .stream();
-    }
-}
--- a/src/api/java/baritone/api/command/datatypes/EntityClassById.java
+++ b/src/api/java/baritone/api/command/datatypes/EntityClassById.java
@@ -1,61 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.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.util.ResourceLocation;
-
-import java.util.stream.Stream;
-
-public enum EntityClassById implements IDatatypeFor<Class<? extends Entity>> {
-    INSTANCE;
-
-    @Override
-    public Class<? extends Entity> 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) {
-            throw new IllegalArgumentException("no entity found by that id");
-        }
-        return entity;
-    }
-
-    @Override
-    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
-        return new TabCompleteHelper()
-                .append(EntityList.getEntityNameList().stream().map(Object::toString))
-                .filterPrefixNamespaced(ctx.getConsumer().getString())
-                .sortAlphabetically()
-                .stream();
-    }
-}
--- a/src/api/java/baritone/api/command/datatypes/ForAxis.java
+++ b/src/api/java/baritone/api/command/datatypes/ForAxis.java
@@ -1,43 +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.command.datatypes;
-
-import baritone.api.command.exception.CommandException;
-import baritone.api.command.helpers.TabCompleteHelper;
-import net.minecraft.util.EnumFacing;
-
-import java.util.Locale;
-import java.util.stream.Stream;
-
-public enum ForAxis implements IDatatypeFor<EnumFacing.Axis> {
-    INSTANCE;
-
-    @Override
-    public EnumFacing.Axis get(IDatatypeContext ctx) throws CommandException {
-        return EnumFacing.Axis.valueOf(ctx.getConsumer().getString().toUpperCase(Locale.US));
-    }
-
-    @Override
-    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
-        return new TabCompleteHelper()
-                .append(Stream.of(EnumFacing.Axis.values())
-                        .map(EnumFacing.Axis::getName).map(String::toLowerCase))
-                .filterPrefix(ctx.getConsumer().getString())
-                .stream();
-    }
-}
--- a/src/api/java/baritone/api/command/datatypes/ForBlockOptionalMeta.java
+++ b/src/api/java/baritone/api/command/datatypes/ForBlockOptionalMeta.java
@@ -1,153 +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.command.datatypes;
-
-import baritone.api.command.exception.CommandException;
-import baritone.api.command.helpers.TabCompleteHelper;
-import baritone.api.utils.BlockOptionalMeta;
-import net.minecraft.block.Block;
-import net.minecraft.block.properties.IProperty;
-import net.minecraft.util.ResourceLocation;
-
-import java.util.Set;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-public enum ForBlockOptionalMeta implements IDatatypeFor<BlockOptionalMeta> {
-    INSTANCE;
-
-    /**
-     * Matches (domain:)?name([(property=value)*])? but the input can be truncated at any position.
-     * domain and name are [a-z0-9_.-]+ and [a-z0-9/_.-]+ because that's what mc 1.13+ accepts.
-     * property and value use the same format as domain.
-     */
-    // Good luck reading this.
-    private static Pattern PATTERN = Pattern.compile("(?:[a-z0-9_.-]+:)?(?:[a-z0-9/_.-]+(?:\\[(?:(?:[a-z0-9_.-]+=[a-z0-9_.-]+,)*(?:[a-z0-9_.-]+(?:=(?:[a-z0-9_.-]+(?:\\])?)?)?)?|\\])?)?)?");
-
-    @Override
-    public BlockOptionalMeta get(IDatatypeContext ctx) throws CommandException {
-        return new BlockOptionalMeta(ctx.getConsumer().getString());
-    }
-
-    @Override
-    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
-        String arg = ctx.getConsumer().peekString();
-
-        if (!PATTERN.matcher(arg).matches()) {
-            // Invalid format; we can't complete this.
-            ctx.getConsumer().getString();
-            return Stream.empty();
-        }
-
-        if (arg.endsWith("]")) {
-            // We are already done.
-            ctx.getConsumer().getString();
-            return Stream.empty();
-        }
-
-        if (!arg.contains("[")) {
-            // no properties so we are completing the block id
-            return ctx.getConsumer().tabCompleteDatatype(BlockById.INSTANCE);
-        }
-
-        ctx.getConsumer().getString();
-
-        // destructuring assignment? Please?
-        String blockId, properties;
-        {
-            String[] parts = splitLast(arg, '[');
-            blockId = parts[0];
-            properties = parts[1];
-        }
-
-        Block block = Block.REGISTRY.getObject(new ResourceLocation(blockId));
-        if (block == null) {
-            // This block doesn't exist so there's no properties to complete.
-            return Stream.empty();
-        }
-
-        String leadingProperties, lastProperty;
-        {
-            String[] parts = splitLast(properties, ',');
-            leadingProperties = parts[0];
-            lastProperty = parts[1];
-        }
-
-        if (!lastProperty.contains("=")) {
-            // The last property-value pair doesn't have a value yet so we are completing its name
-            Set<String> usedProps = Stream.of(leadingProperties.split(","))
-                    .map(pair -> pair.split("=")[0])
-                    .collect(Collectors.toSet());
-
-            String prefix = arg.substring(0, arg.length() - lastProperty.length());
-            return new TabCompleteHelper()
-                    .append(
-                            block.getBlockState()
-                                    .getProperties()
-                                    .stream()
-                                    .map(IProperty::getName)
-                    )
-                    .filter(prop -> !usedProps.contains(prop))
-                    .filterPrefix(lastProperty)
-                    .sortAlphabetically()
-                    .map(prop -> prefix + prop)
-                    .stream();
-        }
-
-        String lastName, lastValue;
-        {
-            String[] parts = splitLast(lastProperty, '=');
-            lastName = parts[0];
-            lastValue = parts[1];
-        }
-
-        // We are completing the value of a property
-        String prefix = arg.substring(0, arg.length() - lastValue.length());
-
-        IProperty<?> property = block.getBlockState().getProperty(lastName);
-        if (property == null) {
-            // The property does not exist so there's no values to complete
-            return Stream.empty();
-        }
-
-        return new TabCompleteHelper()
-                .append(getValues(property))
-                .filterPrefix(lastValue)
-                .sortAlphabetically()
-                .map(val -> prefix + val)
-                .stream();
-    }
-
-    /**
-     * Always returns exactly two strings.
-     * If the separator is not found the FIRST returned string is empty.
-     */
-    private static String[] splitLast(String string, char chr) {
-        int idx = string.lastIndexOf(chr);
-        if (idx == -1) {
-            return new String[]{"", string};
-        }
-        return new String[]{string.substring(0, idx), string.substring(idx + 1)};
-    }
-
-    // this shouldn't need to be a separate method?
-    private static <T extends Comparable<T>> Stream<String> getValues(IProperty<T> property) {
-        return property.getAllowedValues().stream().map(property::getName);
-    }
-}
--- a/src/api/java/baritone/api/command/datatypes/ForEnumFacing.java
+++ b/src/api/java/baritone/api/command/datatypes/ForEnumFacing.java
@@ -1,43 +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.command.datatypes;
-
-import baritone.api.command.exception.CommandException;
-import baritone.api.command.helpers.TabCompleteHelper;
-import net.minecraft.util.EnumFacing;
-
-import java.util.Locale;
-import java.util.stream.Stream;
-
-public enum ForEnumFacing implements IDatatypeFor<EnumFacing> {
-    INSTANCE;
-
-    @Override
-    public EnumFacing get(IDatatypeContext ctx) throws CommandException {
-        return EnumFacing.valueOf(ctx.getConsumer().getString().toUpperCase(Locale.US));
-    }
-
-    @Override
-    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
-        return new TabCompleteHelper()
-                .append(Stream.of(EnumFacing.values())
-                        .map(EnumFacing::getName).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
@@ -1,81 +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.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 java.util.Comparator;
-import java.util.stream.Stream;
-
-public enum ForWaypoints implements IDatatypeFor<IWaypoint[]> {
-    INSTANCE;
-
-    @Override
-    public IWaypoint[] get(IDatatypeContext ctx) throws CommandException {
-        final String input = ctx.getConsumer().getString();
-        final IWaypoint.Tag tag = IWaypoint.Tag.getByName(input);
-
-        // If the input doesn't resolve to a valid tag, resolve by name
-        return tag == null
-                ? getWaypointsByName(ctx.getBaritone(), input)
-                : getWaypointsByTag(ctx.getBaritone(), tag);
-    }
-
-    @Override
-    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
-        return new TabCompleteHelper()
-                .append(getWaypointNames(ctx.getBaritone()))
-                .sortAlphabetically()
-                .prepend(IWaypoint.Tag.getAllNames())
-                .filterPrefix(ctx.getConsumer().getString())
-                .stream();
-    }
-
-    public static IWaypointCollection waypoints(IBaritone baritone) {
-        return baritone.getWorldProvider().getCurrentWorld().getWaypoints();
-    }
-
-    public static IWaypoint[] getWaypoints(IBaritone baritone) {
-        return waypoints(baritone).getAllWaypoints().stream()
-                .sorted(Comparator.comparingLong(IWaypoint::getCreationTimestamp).reversed())
-                .toArray(IWaypoint[]::new);
-    }
-
-    public static String[] getWaypointNames(IBaritone baritone) {
-        return Stream.of(getWaypoints(baritone))
-                .map(IWaypoint::getName)
-                .filter(name -> !name.isEmpty())
-                .toArray(String[]::new);
-    }
-
-    public static IWaypoint[] getWaypointsByTag(IBaritone baritone, IWaypoint.Tag tag) {
-        return waypoints(baritone).getByTag(tag).stream()
-                .sorted(Comparator.comparingLong(IWaypoint::getCreationTimestamp).reversed())
-                .toArray(IWaypoint[]::new);
-    }
-
-    public static IWaypoint[] getWaypointsByName(IBaritone baritone, String name) {
-        return Stream.of(getWaypoints(baritone))
-                .filter(waypoint -> waypoint.getName().equalsIgnoreCase(name))
-                .toArray(IWaypoint[]::new);
-    }
-}
--- a/src/api/java/baritone/api/command/datatypes/IDatatype.java
+++ b/src/api/java/baritone/api/command/datatypes/IDatatype.java
@@ -1,56 +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.command.datatypes;
-
-import baritone.api.command.argparser.IArgParser;
-import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.exception.CommandException;
-
-import java.util.stream.Stream;
-
-/**
- * An {@link IDatatype} is similar to an {@link IArgParser} in the sense that it is capable of consuming an argument
- * to transform it into a usable form as the code desires.
- * <p>
- * A fundamental difference is that an {@link IDatatype} is capable of consuming multiple arguments. For example,
- * {@link RelativeBlockPos} is an {@link IDatatypePost} which requires at least 3 {@link RelativeCoordinate} arguments
- * to be specified.
- * <p>
- * Another difference is that an {@link IDatatype} can be tab-completed, providing comprehensive auto completion
- * that can substitute based on existing input or provide possibilities for the next piece of input.
- *
- * @see IDatatypeContext
- * @see IDatatypeFor
- * @see IDatatypePost
- */
-public interface IDatatype {
-
-    /**
-     * Attempts to complete missing or partial input provided through the {@link IArgConsumer}} provided by
-     * {@link IDatatypeContext#getConsumer()} in order to aide the user in executing commands.
-     * <p>
-     * One benefit over datatypes over {@link IArgParser}s is that instead of each command trying to guess what values
-     * the datatype will accept, or simply not tab completing at all, datatypes that support tab completion can provide
-     * accurate information using the same methods used to parse arguments in the first place.
-     *
-     * @param ctx The argument consumer to tab complete
-     * @return A stream representing the strings that can be tab completed. DO NOT INCLUDE SPACES IN ANY STRINGS.
-     * @see IArgConsumer#tabCompleteDatatype(IDatatype)
-     */
-    Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException;
-}
--- a/src/api/java/baritone/api/command/datatypes/IDatatypeContext.java
+++ b/src/api/java/baritone/api/command/datatypes/IDatatypeContext.java
@@ -1,46 +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.command.datatypes;
-
-import baritone.api.IBaritone;
-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
- * @since 9/26/2019
- */
-public interface IDatatypeContext {
-
-    /**
-     * Provides the {@link IBaritone} instance that is associated with the action relating to datatype handling.
-     *
-     * @return The context {@link IBaritone} instance.
-     */
-    IBaritone getBaritone();
-
-    /**
-     * Provides the {@link IArgConsumer}} to fetch input information from.
-     *
-     * @return The context {@link IArgConsumer}}.
-     */
-    IArgConsumer getConsumer();
-}
--- a/src/api/java/baritone/api/command/datatypes/IDatatypeFor.java
+++ b/src/api/java/baritone/api/command/datatypes/IDatatypeFor.java
@@ -1,43 +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.command.datatypes;
-
-import baritone.api.command.exception.CommandException;
-
-import java.util.function.Supplier;
-
-/**
- * An {@link IDatatype} which acts as a {@link Supplier}, in essence. The only difference
- * is that it requires an {@link IDatatypeContext} to be provided due to the expectation that
- * implementations of {@link IDatatype} are singletons.
- */
-public interface IDatatypeFor<T> extends IDatatype {
-
-    /**
-     * Consumes the desired amount of arguments from the specified {@link IDatatypeContext}, and
-     * then returns the parsed value. This method will more than likely return a {@link IllegalArgumentException}
-     * 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.
-     *
-     * @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/IDatatypePost.java
+++ b/src/api/java/baritone/api/command/datatypes/IDatatypePost.java
@@ -1,41 +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.command.datatypes;
-
-import baritone.api.command.exception.CommandException;
-
-import java.util.function.Function;
-
-/**
- * An {@link IDatatype} which acts as a {@link Function}, in essence. The only difference
- * is that it requires an {@link IDatatypeContext} to be provided due to the expectation that
- * implementations of {@link IDatatype} are singletons.
- */
-public interface IDatatypePost<T, O> extends IDatatype {
-
-    /**
-     * Takes the expected input and transforms it based on the value held by {@code original}. If {@code original}
-     * is null, it is expected that the implementation of this method has a case to handle it, such that a
-     * {@link NullPointerException} will never be thrown as a result.
-     *
-     * @param ctx      The datatype context
-     * @param original The transformable value
-     * @return The transformed value
-     */
-    T apply(IDatatypeContext ctx, O original) throws CommandException;
-}
--- a/src/api/java/baritone/api/command/datatypes/IDatatypePostFunction.java
+++ b/src/api/java/baritone/api/command/datatypes/IDatatypePostFunction.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.api.command.datatypes;
-
-import baritone.api.command.exception.CommandException;
-
-/**
- * @author Brady
- * @since 9/26/2019
- */
-public interface IDatatypePostFunction<T, O> {
-
-    T apply(O original) throws CommandException;
-}
--- a/src/api/java/baritone/api/command/datatypes/NearbyPlayer.java
+++ b/src/api/java/baritone/api/command/datatypes/NearbyPlayer.java
@@ -1,55 +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.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 java.util.List;
-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> {
-    INSTANCE;
-
-    @Override
-    public EntityPlayer get(IDatatypeContext ctx) throws CommandException {
-        final String username = ctx.getConsumer().getString();
-        return getPlayers(ctx).stream()
-                .filter(s -> s.getName().equalsIgnoreCase(username))
-                .findFirst().orElse(null);
-    }
-
-    @Override
-    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
-        return new TabCompleteHelper()
-                .append(getPlayers(ctx).stream().map(EntityPlayer::getName))
-                .filterPrefix(ctx.getConsumer().getString())
-                .sortAlphabetically()
-                .stream();
-    }
-
-    private static List<EntityPlayer> getPlayers(IDatatypeContext ctx) {
-        return ctx.getBaritone().getPlayerContext().world().playerEntities;
-    }
-}
--- a/src/api/java/baritone/api/command/datatypes/RelativeBlockPos.java
+++ b/src/api/java/baritone/api/command/datatypes/RelativeBlockPos.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.api.command.datatypes;
-
-import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.exception.CommandException;
-import baritone.api.utils.BetterBlockPos;
-
-import java.util.stream.Stream;
-
-public enum RelativeBlockPos implements IDatatypePost<BetterBlockPos, BetterBlockPos> {
-    INSTANCE;
-
-    @Override
-    public BetterBlockPos apply(IDatatypeContext ctx, BetterBlockPos origin) throws CommandException {
-        if (origin == null) {
-            origin = BetterBlockPos.ORIGIN;
-        }
-
-        final IArgConsumer consumer = ctx.getConsumer();
-        return new BetterBlockPos(
-                consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.x),
-                consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.y),
-                consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.z)
-        );
-    }
-
-    @Override
-    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
-        final IArgConsumer consumer = ctx.getConsumer();
-        if (consumer.hasAny() && !consumer.has(4)) {
-            while (consumer.has(2)) {
-                if (consumer.peekDatatypeOrNull(RelativeCoordinate.INSTANCE) == null) {
-                    break;
-                }
-                consumer.get();
-            }
-            return consumer.tabCompleteDatatype(RelativeCoordinate.INSTANCE);
-        }
-        return Stream.empty();
-    }
-}
--- a/src/api/java/baritone/api/command/datatypes/RelativeCoordinate.java
+++ b/src/api/java/baritone/api/command/datatypes/RelativeCoordinate.java
@@ -1,69 +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.command.datatypes;
-
-import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.exception.CommandException;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Stream;
-
-public enum RelativeCoordinate implements IDatatypePost<Double, Double> {
-    INSTANCE;
-    private static String ScalesAliasRegex = "[kKmM]";
-    private static Pattern PATTERN = Pattern.compile("^(~?)([+-]?(?:\\d+(?:\\.\\d*)?|\\.\\d+)(" + ScalesAliasRegex + "?)|)$");
-
-    @Override
-    public Double apply(IDatatypeContext ctx, Double origin) throws CommandException {
-        if (origin == null) {
-            origin = 0.0D;
-        }
-
-        Matcher matcher = PATTERN.matcher(ctx.getConsumer().getString());
-        if (!matcher.matches()) {
-            throw new IllegalArgumentException("pattern doesn't match");
-        }
-
-        boolean isRelative = !matcher.group(1).isEmpty();
-
-        double offset = matcher.group(2).isEmpty() ? 0 : Double.parseDouble(matcher.group(2).replaceAll(ScalesAliasRegex, ""));
-
-        if (matcher.group(2).toLowerCase().contains("k")) {
-            offset *= 1000;
-        }
-        if (matcher.group(2).toLowerCase().contains("m")) {
-            offset *= 1000000;
-        }
-
-
-        if (isRelative) {
-            return origin + offset;
-        }
-        return offset;
-    }
-
-    @Override
-    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
-        final IArgConsumer consumer = ctx.getConsumer();
-        if (!consumer.has(2) && consumer.getString().matches("^(~|$)")) {
-            return Stream.of("~");
-        }
-        return Stream.empty();
-    }
-}
--- a/src/api/java/baritone/api/command/datatypes/RelativeFile.java
+++ b/src/api/java/baritone/api/command/datatypes/RelativeFile.java
@@ -1,110 +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.command.datatypes;
-
-import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.exception.CommandException;
-import baritone.api.utils.Helper;
-import net.minecraft.client.Minecraft;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.nio.file.FileSystems;
-import java.nio.file.InvalidPathException;
-import java.nio.file.Path;
-import java.util.Locale;
-import java.util.Objects;
-import java.util.stream.Stream;
-
-import static baritone.api.utils.Helper.HELPER;
-
-public enum RelativeFile implements IDatatypePost<File, File> {
-    INSTANCE;
-
-    @Override
-    public File apply(IDatatypeContext ctx, File original) throws CommandException {
-        if (original == null) {
-            original = new File("./");
-        }
-
-        Path path;
-        try {
-            path = FileSystems.getDefault().getPath(ctx.getConsumer().getString());
-        } catch (InvalidPathException e) {
-            throw new IllegalArgumentException("invalid path");
-        }
-        return getCanonicalFileUnchecked(original.toPath().resolve(path).toFile());
-    }
-
-    @Override
-    public Stream<String> tabComplete(IDatatypeContext ctx) {
-        return Stream.empty();
-    }
-
-    /**
-     * Seriously
-     *
-     * @param file File
-     * @return Canonical file of file
-     * @author LoganDark
-     */
-    private static File getCanonicalFileUnchecked(File file) {
-        try {
-            return file.getCanonicalFile();
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
-    }
-
-    public static Stream<String> tabComplete(IArgConsumer consumer, File base0) throws CommandException {
-        // I will not make the caller deal with this, seriously
-        // Tab complete code is beautiful and I'm not going to bloat it with dumb ass checked exception bullshit -LoganDark
-
-        // lol owned -Brady
-
-        File base = getCanonicalFileUnchecked(base0);
-        String currentPathStringThing = consumer.getString();
-        Path currentPath = FileSystems.getDefault().getPath(currentPathStringThing);
-        Path basePath = currentPath.isAbsolute() ? currentPath.getRoot() : base.toPath();
-        boolean useParent = !currentPathStringThing.isEmpty() && !currentPathStringThing.endsWith(File.separator);
-        File currentFile = currentPath.isAbsolute() ? currentPath.toFile() : new File(base, currentPathStringThing);
-        return Stream.of(Objects.requireNonNull(getCanonicalFileUnchecked(
-                        useParent
-                                ? currentFile.getParentFile()
-                                : currentFile
-                ).listFiles()))
-                .map(f -> (currentPath.isAbsolute() ? f : basePath.relativize(f.toPath()).toString()) +
-                        (f.isDirectory() ? File.separator : ""))
-                .filter(s -> s.toLowerCase(Locale.US).startsWith(currentPathStringThing.toLowerCase(Locale.US)))
-                .filter(s -> !s.contains(" "));
-    }
-
-    @Deprecated
-    public static File gameDir() {
-        return gameDir(Helper.mc);
-    }
-
-    public static File gameDir(Minecraft mc) {
-        File gameDir = mc.gameDir.getAbsoluteFile();
-        if (gameDir.getName().equals(".")) {
-            return gameDir.getParentFile();
-        }
-        return gameDir;
-    }
-}
--- a/src/api/java/baritone/api/command/datatypes/RelativeGoal.java
+++ b/src/api/java/baritone/api/command/datatypes/RelativeGoal.java
@@ -1,64 +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.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 java.util.stream.Stream;
-
-public enum RelativeGoal implements IDatatypePost<Goal, BetterBlockPos> {
-    INSTANCE;
-
-    @Override
-    public Goal apply(IDatatypeContext ctx, BetterBlockPos origin) throws CommandException {
-        if (origin == null) {
-            origin = BetterBlockPos.ORIGIN;
-        }
-
-        final IArgConsumer consumer = ctx.getConsumer();
-
-        GoalBlock goalBlock = consumer.peekDatatypePostOrNull(RelativeGoalBlock.INSTANCE, origin);
-        if (goalBlock != null) {
-            return goalBlock;
-        }
-
-        GoalXZ goalXZ = consumer.peekDatatypePostOrNull(RelativeGoalXZ.INSTANCE, origin);
-        if (goalXZ != null) {
-            return goalXZ;
-        }
-
-        GoalYLevel goalYLevel = consumer.peekDatatypePostOrNull(RelativeGoalYLevel.INSTANCE, origin);
-        if (goalYLevel != null) {
-            return goalYLevel;
-        }
-
-        // when the user doesn't input anything, default to the origin
-        return new GoalBlock(origin);
-    }
-
-    @Override
-    public Stream<String> tabComplete(IDatatypeContext ctx) {
-        return ctx.getConsumer().tabCompleteDatatype(RelativeCoordinate.INSTANCE);
-    }
-}
--- a/src/api/java/baritone/api/command/datatypes/RelativeGoalBlock.java
+++ b/src/api/java/baritone/api/command/datatypes/RelativeGoalBlock.java
@@ -1,53 +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.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 net.minecraft.util.math.MathHelper;
-
-import java.util.stream.Stream;
-
-public enum RelativeGoalBlock implements IDatatypePost<GoalBlock, BetterBlockPos> {
-    INSTANCE;
-
-    @Override
-    public GoalBlock apply(IDatatypeContext ctx, BetterBlockPos origin) throws CommandException {
-        if (origin == null) {
-            origin = BetterBlockPos.ORIGIN;
-        }
-
-        final IArgConsumer consumer = ctx.getConsumer();
-        return new GoalBlock(
-                MathHelper.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.x)),
-                MathHelper.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.y)),
-                MathHelper.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.z))
-        );
-    }
-
-    @Override
-    public Stream<String> tabComplete(IDatatypeContext ctx) {
-        final IArgConsumer consumer = ctx.getConsumer();
-        if (consumer.hasAtMost(3)) {
-            return consumer.tabCompleteDatatype(RelativeCoordinate.INSTANCE);
-        }
-        return Stream.empty();
-    }
-}
--- a/src/api/java/baritone/api/command/datatypes/RelativeGoalXZ.java
+++ b/src/api/java/baritone/api/command/datatypes/RelativeGoalXZ.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.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 net.minecraft.util.math.MathHelper;
-
-import java.util.stream.Stream;
-
-public enum RelativeGoalXZ implements IDatatypePost<GoalXZ, BetterBlockPos> {
-    INSTANCE;
-
-    @Override
-    public GoalXZ apply(IDatatypeContext ctx, BetterBlockPos origin) throws CommandException {
-        if (origin == null) {
-            origin = BetterBlockPos.ORIGIN;
-        }
-
-        final IArgConsumer consumer = ctx.getConsumer();
-        return new GoalXZ(
-                MathHelper.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.x)),
-                MathHelper.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.z))
-        );
-    }
-
-    @Override
-    public Stream<String> tabComplete(IDatatypeContext ctx) {
-        final IArgConsumer consumer = ctx.getConsumer();
-        if (consumer.hasAtMost(2)) {
-            return consumer.tabCompleteDatatype(RelativeCoordinate.INSTANCE);
-        }
-        return Stream.empty();
-    }
-}
--- a/src/api/java/baritone/api/command/datatypes/RelativeGoalYLevel.java
+++ b/src/api/java/baritone/api/command/datatypes/RelativeGoalYLevel.java
@@ -1,50 +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.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 net.minecraft.util.math.MathHelper;
-
-import java.util.stream.Stream;
-
-public enum RelativeGoalYLevel implements IDatatypePost<GoalYLevel, BetterBlockPos> {
-    INSTANCE;
-
-    @Override
-    public GoalYLevel apply(IDatatypeContext ctx, BetterBlockPos origin) throws CommandException {
-        if (origin == null) {
-            origin = BetterBlockPos.ORIGIN;
-        }
-
-        return new GoalYLevel(
-                MathHelper.floor(ctx.getConsumer().getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.y))
-        );
-    }
-
-    @Override
-    public Stream<String> tabComplete(IDatatypeContext ctx) {
-        final IArgConsumer consumer = ctx.getConsumer();
-        if (consumer.hasAtMost(1)) {
-            return consumer.tabCompleteDatatype(RelativeCoordinate.INSTANCE);
-        }
-        return Stream.empty();
-    }
-}
--- a/src/api/java/baritone/api/command/exception/CommandErrorMessageException.java
+++ b/src/api/java/baritone/api/command/exception/CommandErrorMessageException.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.api.command.exception;
-
-public abstract class CommandErrorMessageException extends CommandException {
-
-    protected CommandErrorMessageException(String reason) {
-        super(reason);
-    }
-
-    protected CommandErrorMessageException(String reason, Throwable cause) {
-        super(reason, cause);
-    }
-}
--- a/src/api/java/baritone/api/command/exception/CommandException.java
+++ b/src/api/java/baritone/api/command/exception/CommandException.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.api.command.exception;
-
-public abstract class CommandException extends Exception implements ICommandException {
-
-    protected CommandException(String reason) {
-        super(reason);
-    }
-
-    protected CommandException(String reason, Throwable cause) {
-        super(reason, cause);
-    }
-}
--- a/src/api/java/baritone/api/command/exception/CommandInvalidArgumentException.java
+++ b/src/api/java/baritone/api/command/exception/CommandInvalidArgumentException.java
@@ -1,43 +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.command.exception;
-
-import baritone.api.command.argument.ICommandArgument;
-
-public abstract class CommandInvalidArgumentException extends CommandErrorMessageException {
-
-    public final ICommandArgument arg;
-
-    protected CommandInvalidArgumentException(ICommandArgument arg, String message) {
-        super(formatMessage(arg, message));
-        this.arg = arg;
-    }
-
-    protected CommandInvalidArgumentException(ICommandArgument arg, String message, Throwable cause) {
-        super(formatMessage(arg, message), cause);
-        this.arg = arg;
-    }
-
-    private static String formatMessage(ICommandArgument arg, String message) {
-        return String.format(
-                "Error at argument #%s: %s",
-                arg.getIndex() == -1 ? "<unknown>" : Integer.toString(arg.getIndex() + 1),
-                message
-        );
-    }
-}
--- a/src/api/java/baritone/api/command/exception/CommandInvalidStateException.java
+++ b/src/api/java/baritone/api/command/exception/CommandInvalidStateException.java
@@ -1,25 +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.command.exception;
-
-public class CommandInvalidStateException extends CommandErrorMessageException {
-
-    public CommandInvalidStateException(String reason) {
-        super(reason);
-    }
-}
--- a/src/api/java/baritone/api/command/exception/CommandInvalidTypeException.java
+++ b/src/api/java/baritone/api/command/exception/CommandInvalidTypeException.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.api.command.exception;
-
-import baritone.api.command.argument.ICommandArgument;
-
-public class CommandInvalidTypeException extends CommandInvalidArgumentException {
-
-    public CommandInvalidTypeException(ICommandArgument arg, String expected) {
-        super(arg, String.format("Expected %s", expected));
-    }
-
-    public CommandInvalidTypeException(ICommandArgument arg, String expected, Throwable cause) {
-        super(arg, String.format("Expected %s", expected), cause);
-    }
-
-    public CommandInvalidTypeException(ICommandArgument arg, String expected, String got) {
-        super(arg, String.format("Expected %s, but got %s instead", expected, got));
-    }
-
-    public CommandInvalidTypeException(ICommandArgument arg, String expected, String got, Throwable cause) {
-        super(arg, String.format("Expected %s, but got %s instead", expected, got), cause);
-    }
-}
--- a/src/api/java/baritone/api/command/exception/CommandNoParserForTypeException.java
+++ b/src/api/java/baritone/api/command/exception/CommandNoParserForTypeException.java
@@ -1,25 +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.command.exception;
-
-public class CommandNoParserForTypeException extends CommandUnhandledException {
-
-    public CommandNoParserForTypeException(Class<?> klass) {
-        super(String.format("Could not find a handler for type %s", klass.getSimpleName()));
-    }
-}
--- a/src/api/java/baritone/api/command/exception/CommandNotEnoughArgumentsException.java
+++ b/src/api/java/baritone/api/command/exception/CommandNotEnoughArgumentsException.java
@@ -1,25 +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.command.exception;
-
-public class CommandNotEnoughArgumentsException extends CommandErrorMessageException {
-
-    public CommandNotEnoughArgumentsException(int minArgs) {
-        super(String.format("Not enough arguments (expected at least %d)", minArgs));
-    }
-}
--- a/src/api/java/baritone/api/command/exception/CommandNotFoundException.java
+++ b/src/api/java/baritone/api/command/exception/CommandNotFoundException.java
@@ -1,40 +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.command.exception;
-
-import baritone.api.command.ICommand;
-import baritone.api.command.argument.ICommandArgument;
-
-import java.util.List;
-
-import static baritone.api.utils.Helper.HELPER;
-
-public class CommandNotFoundException extends CommandException {
-
-    public final String command;
-
-    public CommandNotFoundException(String command) {
-        super(String.format("Command not found: %s", command));
-        this.command = command;
-    }
-
-    @Override
-    public void handle(ICommand command, List<ICommandArgument> args) {
-        HELPER.logDirect(getMessage());
-    }
-}
--- a/src/api/java/baritone/api/command/exception/CommandTooManyArgumentsException.java
+++ b/src/api/java/baritone/api/command/exception/CommandTooManyArgumentsException.java
@@ -1,25 +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.command.exception;
-
-public class CommandTooManyArgumentsException extends CommandErrorMessageException {
-
-    public CommandTooManyArgumentsException(int maxArgs) {
-        super(String.format("Too many arguments (expected at most %d)", maxArgs));
-    }
-}
--- a/src/api/java/baritone/api/command/exception/CommandUnhandledException.java
+++ b/src/api/java/baritone/api/command/exception/CommandUnhandledException.java
@@ -1,41 +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.command.exception;
-
-import baritone.api.command.ICommand;
-import baritone.api.command.argument.ICommandArgument;
-
-import java.util.List;
-
-import static baritone.api.utils.Helper.HELPER;
-
-public class CommandUnhandledException extends RuntimeException implements ICommandException {
-
-    public CommandUnhandledException(String message) {
-        super(message);
-    }
-
-    public CommandUnhandledException(Throwable cause) {
-        super(cause);
-    }
-
-    @Override
-    public void handle(ICommand command, List<ICommandArgument> args) {
-        HELPER.logUnhandledException(this);
-    }
-}
--- a/src/api/java/baritone/api/command/exception/ICommandException.java
+++ b/src/api/java/baritone/api/command/exception/ICommandException.java
@@ -1,55 +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.command.exception;
-
-import baritone.api.command.ICommand;
-import baritone.api.command.argument.ICommandArgument;
-import net.minecraft.util.text.TextFormatting;
-
-import java.util.List;
-
-import static baritone.api.utils.Helper.HELPER;
-
-/**
- * The base for a Baritone Command Exception, checked or unchecked. Provides a
- * {@link #handle(ICommand, List)} method that is used to provide useful output
- * to the user for diagnosing issues that may have occurred during execution.
- * <p>
- * Anything implementing this interface should be assignable to {@link Exception}.
- *
- * @author Brady
- * @since 9/20/2019
- */
-public interface ICommandException {
-
-    /**
-     * @return The exception details
-     * @see Exception#getMessage()
-     */
-    String getMessage();
-
-    /**
-     * Called when this exception is thrown, to handle the exception.
-     *
-     * @param command The command that threw it.
-     * @param args    The arguments the command was called with.
-     */
-    default void handle(ICommand command, List<ICommandArgument> args) {
-        HELPER.logDirect(this.getMessage(), TextFormatting.RED);
-    }
-}
--- a/src/api/java/baritone/api/command/helpers/Paginator.java
+++ b/src/api/java/baritone/api/command/helpers/Paginator.java
@@ -1,184 +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.command.helpers;
-
-import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.exception.CommandException;
-import baritone.api.command.exception.CommandInvalidTypeException;
-import baritone.api.utils.Helper;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TextComponentString;
-import net.minecraft.util.text.TextFormatting;
-import net.minecraft.util.text.event.ClickEvent;
-import net.minecraft.util.text.event.HoverEvent;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.function.Function;
-
-public class Paginator<E> implements Helper {
-
-    public final List<E> entries;
-    public int pageSize = 8;
-    public int page = 1;
-
-    public Paginator(List<E> entries) {
-        this.entries = entries;
-    }
-
-    public Paginator(E... entries) {
-        this.entries = Arrays.asList(entries);
-    }
-
-    public Paginator<E> setPageSize(int pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    public int getMaxPage() {
-        return (entries.size() - 1) / pageSize + 1;
-    }
-
-    public boolean validPage(int page) {
-        return page > 0 && page <= getMaxPage();
-    }
-
-    public Paginator<E> skipPages(int pages) {
-        page += pages;
-        return this;
-    }
-
-    public void display(Function<E, ITextComponent> transform, String commandPrefix) {
-        int offset = (page - 1) * pageSize;
-        for (int i = offset; i < offset + pageSize; i++) {
-            if (i < entries.size()) {
-                logDirect(transform.apply(entries.get(i)));
-            } else {
-                logDirect("--", TextFormatting.DARK_GRAY);
-            }
-        }
-        boolean hasPrevPage = commandPrefix != null && validPage(page - 1);
-        boolean hasNextPage = commandPrefix != null && validPage(page + 1);
-        ITextComponent prevPageComponent = new TextComponentString("<<");
-        if (hasPrevPage) {
-            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")
-                    ));
-        } else {
-            prevPageComponent.getStyle().setColor(TextFormatting.DARK_GRAY);
-        }
-        ITextComponent nextPageComponent = new TextComponentString(">>");
-        if (hasNextPage) {
-            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")
-                    ));
-        } else {
-            nextPageComponent.getStyle().setColor(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()));
-        logDirect(pagerComponent);
-    }
-
-    public void display(Function<E, ITextComponent> transform) {
-        display(transform, null);
-    }
-
-    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Runnable pre, Function<T, ITextComponent> transform, String commandPrefix) throws CommandException {
-        int page = 1;
-        consumer.requireMax(1);
-        if (consumer.hasAny()) {
-            page = consumer.getAs(Integer.class);
-            if (!pagi.validPage(page)) {
-                throw new CommandInvalidTypeException(
-                        consumer.consumed(),
-                        String.format(
-                                "a valid page (1-%d)",
-                                pagi.getMaxPage()
-                        ),
-                        consumer.consumed().getValue()
-                );
-            }
-        }
-        pagi.skipPages(page - pagi.page);
-        if (pre != null) {
-            pre.run();
-        }
-        pagi.display(transform, commandPrefix);
-    }
-
-    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Runnable pre, Function<T, ITextComponent> transform, String commandPrefix) throws CommandException {
-        paginate(consumer, new Paginator<>(elems), pre, transform, commandPrefix);
-    }
-
-    public static <T> void paginate(IArgConsumer consumer, T[] elems, Runnable pre, Function<T, ITextComponent> transform, String commandPrefix) throws CommandException {
-        paginate(consumer, Arrays.asList(elems), pre, transform, commandPrefix);
-    }
-
-    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Function<T, ITextComponent> transform, String commandPrefix) throws CommandException {
-        paginate(consumer, pagi, null, transform, commandPrefix);
-    }
-
-    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Function<T, ITextComponent> transform, String commandPrefix) throws CommandException {
-        paginate(consumer, new Paginator<>(elems), null, transform, commandPrefix);
-    }
-
-    public static <T> void paginate(IArgConsumer consumer, T[] elems, Function<T, ITextComponent> transform, String commandPrefix) throws CommandException {
-        paginate(consumer, Arrays.asList(elems), null, transform, commandPrefix);
-    }
-
-    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Runnable pre, Function<T, ITextComponent> transform) throws CommandException {
-        paginate(consumer, pagi, pre, transform, null);
-    }
-
-    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Runnable pre, Function<T, ITextComponent> transform) throws CommandException {
-        paginate(consumer, new Paginator<>(elems), pre, transform, null);
-    }
-
-    public static <T> void paginate(IArgConsumer consumer, T[] elems, Runnable pre, Function<T, ITextComponent> transform) throws CommandException {
-        paginate(consumer, Arrays.asList(elems), pre, transform, null);
-    }
-
-    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Function<T, ITextComponent> transform) throws CommandException {
-        paginate(consumer, pagi, null, transform, null);
-    }
-
-    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Function<T, ITextComponent> transform) throws CommandException {
-        paginate(consumer, new Paginator<>(elems), null, transform, null);
-    }
-
-    public static <T> void paginate(IArgConsumer consumer, T[] elems, Function<T, ITextComponent> transform) throws CommandException {
-        paginate(consumer, Arrays.asList(elems), null, transform, null);
-    }
-}
--- a/src/api/java/baritone/api/command/helpers/TabCompleteHelper.java
+++ b/src/api/java/baritone/api/command/helpers/TabCompleteHelper.java
@@ -1,287 +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.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 net.minecraft.util.ResourceLocation;
-
-import java.util.Comparator;
-import java.util.List;
-import java.util.Locale;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
-
-/**
- * The {@link TabCompleteHelper} is a <b>single-use</b> object that helps you handle tab completion. It includes helper
- * methods for appending and prepending streams, sorting, filtering by prefix, and so on.
- * <p>
- * The recommended way to use this class is:
- * <ul>
- * <li>Create a new instance with the empty constructor</li>
- * <li>Use {@code append}, {@code prepend} or {@code add<something>} methods to add completions</li>
- * <li>Sort using {@link #sort(Comparator)} or {@link #sortAlphabetically()} and then filter by prefix using
- * {@link #filterPrefix(String)}</li>
- * <li>Get the stream using {@link #stream()}</li>
- * <li>Pass it up to whatever's calling your tab complete function (i.e.
- * {@link ICommandManager#tabComplete(String)} or {@link IArgConsumer}#tabCompleteDatatype(IDatatype)})</li>
- * </ul>
- * <p>
- * For advanced users: if you're intercepting {@link TabCompleteEvent}s directly, use {@link #build()} instead for an
- * array.
- */
-public class TabCompleteHelper {
-
-    private Stream<String> stream;
-
-    public TabCompleteHelper(String[] base) {
-        stream = Stream.of(base);
-    }
-
-    public TabCompleteHelper(List<String> base) {
-        stream = base.stream();
-    }
-
-    public TabCompleteHelper() {
-        stream = Stream.empty();
-    }
-
-    /**
-     * Appends the specified stream to this {@link TabCompleteHelper} and returns it for chaining
-     *
-     * @param source The stream to append
-     * @return This {@link TabCompleteHelper} after having appended the stream
-     * @see #append(String...)
-     * @see #append(Class)
-     */
-    public TabCompleteHelper append(Stream<String> source) {
-        stream = Stream.concat(stream, source);
-        return this;
-    }
-
-    /**
-     * Appends the specified strings to this {@link TabCompleteHelper} and returns it for chaining
-     *
-     * @param source The stream to append
-     * @return This {@link TabCompleteHelper} after having appended the strings
-     * @see #append(Stream)
-     * @see #append(Class)
-     */
-    public TabCompleteHelper append(String... source) {
-        return append(Stream.of(source));
-    }
-
-    /**
-     * Appends all values of the specified enum to this {@link TabCompleteHelper} and returns it for chaining
-     *
-     * @param num The enum to append the values of
-     * @return This {@link TabCompleteHelper} after having appended the values
-     * @see #append(Stream)
-     * @see #append(String...)
-     */
-    public TabCompleteHelper append(Class<? extends Enum<?>> num) {
-        return append(
-                Stream.of(num.getEnumConstants())
-                        .map(Enum::name)
-                        .map(String::toLowerCase)
-        );
-    }
-
-    /**
-     * Prepends the specified stream to this {@link TabCompleteHelper} and returns it for chaining
-     *
-     * @param source The stream to prepend
-     * @return This {@link TabCompleteHelper} after having prepended the stream
-     * @see #prepend(String...)
-     * @see #prepend(Class)
-     */
-    public TabCompleteHelper prepend(Stream<String> source) {
-        stream = Stream.concat(source, stream);
-        return this;
-    }
-
-    /**
-     * Prepends the specified strings to this {@link TabCompleteHelper} and returns it for chaining
-     *
-     * @param source The stream to prepend
-     * @return This {@link TabCompleteHelper} after having prepended the strings
-     * @see #prepend(Stream)
-     * @see #prepend(Class)
-     */
-    public TabCompleteHelper prepend(String... source) {
-        return prepend(Stream.of(source));
-    }
-
-    /**
-     * Prepends all values of the specified enum to this {@link TabCompleteHelper} and returns it for chaining
-     *
-     * @param num The enum to prepend the values of
-     * @return This {@link TabCompleteHelper} after having prepended the values
-     * @see #prepend(Stream)
-     * @see #prepend(String...)
-     */
-    public TabCompleteHelper prepend(Class<? extends Enum<?>> num) {
-        return prepend(
-                Stream.of(num.getEnumConstants())
-                        .map(Enum::name)
-                        .map(String::toLowerCase)
-        );
-    }
-
-    /**
-     * Apply the specified {@code transform} to every element <b>currently</b> in this {@link TabCompleteHelper} and
-     * return this object for chaining
-     *
-     * @param transform The transform to apply
-     * @return This {@link TabCompleteHelper}
-     */
-    public TabCompleteHelper map(Function<String, String> transform) {
-        stream = stream.map(transform);
-        return this;
-    }
-
-    /**
-     * Apply the specified {@code filter} to every element <b>currently</b> in this {@link TabCompleteHelper} and return
-     * this object for chaining
-     *
-     * @param filter The filter to apply
-     * @return This {@link TabCompleteHelper}
-     */
-    public TabCompleteHelper filter(Predicate<String> filter) {
-        stream = stream.filter(filter);
-        return this;
-    }
-
-    /**
-     * Apply the specified {@code sort} to every element <b>currently</b> in this {@link TabCompleteHelper} and return
-     * this object for chaining
-     *
-     * @param comparator The comparator to use
-     * @return This {@link TabCompleteHelper}
-     */
-    public TabCompleteHelper sort(Comparator<String> comparator) {
-        stream = stream.sorted(comparator);
-        return this;
-    }
-
-    /**
-     * Sort every element <b>currently</b> in this {@link TabCompleteHelper} alphabetically and return this object for
-     * chaining
-     *
-     * @return This {@link TabCompleteHelper}
-     */
-    public TabCompleteHelper sortAlphabetically() {
-        return sort(String.CASE_INSENSITIVE_ORDER);
-    }
-
-    /**
-     * Filter out any element that doesn't start with {@code prefix} and return this object for chaining
-     *
-     * @param prefix The prefix to filter for
-     * @return This {@link TabCompleteHelper}
-     */
-    public TabCompleteHelper filterPrefix(String prefix) {
-        return filter(x -> x.toLowerCase(Locale.US).startsWith(prefix.toLowerCase(Locale.US)));
-    }
-
-    /**
-     * Filter out any element that doesn't start with {@code prefix} and return this object for chaining
-     * <p>
-     * Assumes every element in this {@link TabCompleteHelper} is a {@link ResourceLocation}
-     *
-     * @param prefix The prefix to filter for
-     * @return This {@link TabCompleteHelper}
-     */
-    public TabCompleteHelper filterPrefixNamespaced(String prefix) {
-        return filterPrefix(new ResourceLocation(prefix).toString());
-    }
-
-    /**
-     * @return An array containing every element in this {@link TabCompleteHelper}
-     * @see #stream()
-     */
-    public String[] build() {
-        return stream.toArray(String[]::new);
-    }
-
-    /**
-     * @return A stream containing every element in this {@link TabCompleteHelper}
-     * @see #build()
-     */
-    public Stream<String> stream() {
-        return stream;
-    }
-
-    /**
-     * 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) {
-        return append(manager.getRegistry().descendingStream()
-                .flatMap(command -> command.getNames().stream())
-                .distinct()
-        );
-    }
-
-    /**
-     * Appends every setting in the {@link Settings} to this {@link TabCompleteHelper}
-     *
-     * @return This {@link TabCompleteHelper}
-     */
-    public TabCompleteHelper addSettings() {
-        return append(
-                BaritoneAPI.getSettings().allSettings.stream()
-                        .filter(s -> !s.isJavaOnly())
-                        .map(Settings.Setting::getName)
-                        .sorted(String.CASE_INSENSITIVE_ORDER)
-        );
-    }
-
-    /**
-     * Appends every modified setting in the {@link Settings} to this {@link TabCompleteHelper}
-     *
-     * @return This {@link TabCompleteHelper}
-     */
-    public TabCompleteHelper addModifiedSettings() {
-        return append(
-                SettingsUtil.modifiedSettings(BaritoneAPI.getSettings()).stream()
-                        .map(Settings.Setting::getName)
-                        .sorted(String.CASE_INSENSITIVE_ORDER)
-        );
-    }
-
-    /**
-     * Appends every {@link Boolean} setting in the {@link Settings} to this {@link TabCompleteHelper}
-     *
-     * @return This {@link TabCompleteHelper}
-     */
-    public TabCompleteHelper addToggleableSettings() {
-        return append(
-                BaritoneAPI.getSettings().getAllValuesByType(Boolean.class).stream()
-                        .map(Settings.Setting::getName)
-                        .sorted(String.CASE_INSENSITIVE_ORDER)
-        );
-    }
-}
--- a/src/api/java/baritone/api/command/manager/ICommandManager.java
+++ b/src/api/java/baritone/api/command/manager/ICommandManager.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.api.command.manager;
-
-import baritone.api.IBaritone;
-import baritone.api.command.ICommand;
-import baritone.api.command.argument.ICommandArgument;
-import baritone.api.command.registry.Registry;
-import net.minecraft.util.Tuple;
-
-import java.util.List;
-import java.util.stream.Stream;
-
-/**
- * @author Brady
- * @since 9/21/2019
- */
-public interface ICommandManager {
-
-    IBaritone getBaritone();
-
-    Registry<ICommand> getRegistry();
-
-    /**
-     * @param name The command name to search for.
-     * @return The command, if found.
-     */
-    ICommand getCommand(String name);
-
-    boolean execute(String string);
-
-    boolean execute(Tuple<String, List<ICommandArgument>> expanded);
-
-    Stream<String> tabComplete(Tuple<String, List<ICommandArgument>> expanded);
-
-    Stream<String> tabComplete(String prefix);
-}
--- a/src/api/java/baritone/api/command/registry/Registry.java
+++ b/src/api/java/baritone/api/command/registry/Registry.java
@@ -1,135 +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.command.registry;
-
-import java.util.*;
-import java.util.function.Consumer;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-/**
- * This registry class allows for registration and unregistration of a certain type. This is mainly designed for use by
- * event handlers where newly registered ones are encountered first during iteration and can therefore override older
- * ones. In Baritone, this is used for commands and argument parsers so that mods and addons can extend Baritone's
- * functionality without resorting to hacks, wrappers, or mixins.
- *
- * @param <V> The entry type that will be stored in this registry. This can be anything, really - preferably anything
- *            that works as a HashMap key, as that's what's used to keep track of which entries are registered or not.
- */
-public class Registry<V> {
-
-    /**
-     * An internal linked list of all the entries that are currently registered. This is a linked list so that entries
-     * can be inserted at the beginning, which means that newer entries are encountered first during iteration. This is
-     * an important property of the registry that makes it more useful than a simple list, and also the reason it does
-     * not just use a map.
-     */
-    private final Deque<V> _entries = new LinkedList<>();
-    /**
-     * A HashSet containing every entry currently registered. Entries are added to this set when something is registered
-     * and removed from the set when they are unregistered. An entry being present in this set indicates that it is
-     * currently registered, can be removed, and should not be reregistered until it is removed.
-     */
-    private final Set<V> registered = new HashSet<>();
-    /**
-     * The collection of entries that are currently in this registry. This is a collection (and not a list) because,
-     * internally, entries are stored in a linked list, which is not the same as a normal list.
-     */
-    public final Collection<V> entries = Collections.unmodifiableCollection(_entries);
-
-    /**
-     * @param entry The entry to check.
-     * @return If this entry is currently registered in this registry.
-     */
-    public boolean registered(V entry) {
-        return registered.contains(entry);
-    }
-
-    /**
-     * Ensures that the entry {@code entry} is registered.
-     *
-     * @param entry The entry to register.
-     * @return A boolean indicating whether or not this is a new registration. No matter the value of this boolean, the
-     * entry is always guaranteed to now be in this registry. This boolean simply indicates if the entry was <i>not</i>
-     * in the map prior to this method call.
-     */
-    public boolean register(V entry) {
-        if (!registered(entry)) {
-            _entries.addFirst(entry);
-            registered.add(entry);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Unregisters this entry from this registry. After this method call, the entry is guaranteed to be removed from the
-     * registry, since each entry only ever appears once.
-     *
-     * @param entry The entry to unregister.
-     */
-    public void unregister(V entry) {
-        if (!registered(entry)) {
-            return;
-        }
-        _entries.remove(entry);
-        registered.remove(entry);
-    }
-
-    /**
-     * Returns an iterator that iterates over each entry in this registry, with the newest elements iterated over first.
-     * Internally, as new elements are prepended to the registry rather than appended to the end, this order is the best
-     * way to search through the registry if you want to discover newer items first.
-     */
-    public Iterator<V> iterator() {
-        return _entries.iterator();
-    }
-
-    /**
-     * Returns an iterator that iterates over each entry in this registry, in the order they were added. Internally,
-     * this iterates through the registry backwards, as new elements are prepended to the registry rather than appended
-     * to the end. You should only do this when you need to, for example, list elements in order - it is almost always
-     * fine to simply use {@link Iterable#forEach(Consumer) forEach} on the {@link #entries} collection instead.
-     */
-    public Iterator<V> descendingIterator() {
-        return _entries.descendingIterator();
-    }
-
-    /**
-     * Returns a stream that contains each entry in this registry, with the newest elements ordered first. Internally,
-     * as new elements are prepended to the registry rather than appended to the end, this order is the best way to
-     * search through the registry if you want to discover newer items first.
-     */
-    public Stream<V> stream() {
-        return _entries.stream();
-    }
-
-    /**
-     * Returns a stream that returns each entry in this registry, in the order they were added. Internally, this orders
-     * the registry backwards, as new elements are prepended to the registry rather than appended to the end. You should
-     * only use this when you need to, for example, list elements in order - it is almost always fine to simply use the
-     * regular {@link #stream()} method instead.
-     */
-    public Stream<V> descendingStream() {
-        return StreamSupport.stream(Spliterators.spliterator(
-                descendingIterator(),
-                _entries.size(),
-                Spliterator.SIZED | Spliterator.SUBSIZED
-        ), false);
-    }
-}
--- a/src/api/java/baritone/api/event/events/BlockChangeEvent.java
+++ b/src/api/java/baritone/api/event/events/BlockChangeEvent.java
@@ -1,49 +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.event.events;
-
-import baritone.api.utils.Pair;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.ChunkPos;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author Brady
- */
-public final class BlockChangeEvent {
-
-    private final ChunkPos chunk;
-    private final List<Pair<BlockPos, IBlockState>> blocks;
-
-    public BlockChangeEvent(ChunkPos pos, List<Pair<BlockPos, IBlockState>> blocks) {
-        this.chunk = pos;
-        this.blocks = blocks;
-    }
-
-    public ChunkPos getChunkPos() {
-        return this.chunk;
-    }
-
-    public List<Pair<BlockPos, IBlockState>> getBlocks() {
-        return this.blocks;
-    }
-}
--- a/src/api/java/baritone/api/event/events/ChunkEvent.java
+++ b/src/api/java/baritone/api/event/events/ChunkEvent.java
@@ -57,38 +57,31 @@ public final class ChunkEvent {
    /**
     * @return The state of the event
     */
-    public EventState getState() {
+    public final EventState getState() {
        return this.state;
    }

    /**
     * @return The type of chunk event that occurred;
     */
-    public Type getType() {
+    public final Type getType() {
        return this.type;
    }

    /**
     * @return The Chunk X position.
     */
-    public int getX() {
+    public final int getX() {
        return this.x;
    }

    /**
     * @return The Chunk Z position.
     */
-    public int getZ() {
+    public final int getZ() {
        return this.z;
    }

-    /**
-     * @return {@code true} if the event was fired after a chunk population
-     */
-    public boolean isPostPopulate() {
-        return this.state == EventState.POST && this.type.isPopulate();
-    }
-
    public enum Type {

        /**
@@ -113,10 +106,6 @@ public final class ChunkEvent {
         * <p>
         * And it's a partial chunk
         */
-        POPULATE_PARTIAL;
-
-        public final boolean isPopulate() {
-            return this == POPULATE_FULL || this == POPULATE_PARTIAL;
-        }
+        POPULATE_PARTIAL
    }
 }
--- 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/RotationMoveEvent.java
+++ b/src/api/java/baritone/api/event/events/RotationMoveEvent.java
@@ -17,9 +17,7 @@

 package baritone.api.event.events;

-import baritone.api.utils.Rotation;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;

 /**
 * @author Brady
@@ -32,27 +30,14 @@ public final class RotationMoveEvent {
     */
    private final Type type;

-    private final Rotation original;
-
    /**
     * The yaw rotation
     */
    private float yaw;

-    /**
-     * The pitch rotation
-     */
-    private float pitch;
-
-    public RotationMoveEvent(Type type, float yaw, float pitch) {
+    public RotationMoveEvent(Type type, float yaw) {
        this.type = type;
-        this.original = new Rotation(yaw, pitch);
        this.yaw = yaw;
-        this.pitch = pitch;
-    }
-
-    public Rotation getOriginal() {
-        return this.original;
    }

    /**
@@ -60,37 +45,21 @@ public final class RotationMoveEvent {
     *
     * @param yaw Yaw rotation
     */
-    public void setYaw(float yaw) {
+    public final void setYaw(float yaw) {
        this.yaw = yaw;
    }

    /**
     * @return The yaw rotation
     */
-    public float getYaw() {
+    public final float getYaw() {
        return this.yaw;
    }

-    /**
-     * Set the pitch movement rotation
-     *
-     * @param pitch Pitch rotation
-     */
-    public void setPitch(float pitch) {
-        this.pitch = pitch;
-    }
-
-    /**
-     * @return The pitch rotation
-     */
-    public float getPitch() {
-        return pitch;
-    }
-
    /**
     * @return The type of the event
     */
-    public Type getType() {
+    public final Type getType() {
        return this.type;
    }

@@ -106,7 +75,7 @@ public final class RotationMoveEvent {
        /**
         * Called when the player jumps.
         *
-         * @see EntityLivingBase#jump
+         * @see LivingEntity#jump
         */
        JUMP
    }
--- a/src/api/java/baritone/api/event/events/TabCompleteEvent.java
+++ b/src/api/java/baritone/api/event/events/TabCompleteEvent.java
@@ -1,34 +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.event.events;
-
-import baritone.api.event.events.type.Cancellable;
-
-/**
- * @author LoganDark
- */
-public class TabCompleteEvent extends Cancellable {
-
-    public final String prefix;
-    public String[] completions;
-
-    public TabCompleteEvent(String prefix) {
-        this.prefix = prefix;
-        this.completions = null;
-    }
-}
--- a/src/api/java/baritone/api/event/events/TickEvent.java
+++ b/src/api/java/baritone/api/event/events/TickEvent.java
@@ -18,30 +18,23 @@
 package baritone.api.event.events;

 import baritone.api.event.events.type.EventState;
-import net.minecraft.client.Minecraft;

-import java.util.function.BiFunction;
-
-/**
- * Called on and after each game tick of the primary {@link Minecraft} instance and dispatched to all Baritone
- * instances.
- * <p>
- * When {@link #state} is {@link EventState#PRE}, the event is being called just prior to when the current in-game
- * screen is ticked. When {@link #state} is {@link EventState#POST}, the event is being called at the very end
- * of the {@link Minecraft#runTick()} method.
- */
 public final class TickEvent {

-    private static int overallTickCount;
-
    private final EventState state;
    private final Type type;
    private final int count;

-    public TickEvent(EventState state, Type type, int count) {
+    private static int overallTickCount;
+
+    public TickEvent(EventState state, Type type) {
        this.state = state;
        this.type = type;
-        this.count = count;
+        this.count = incrementCount();
+    }
+
+    private static synchronized int incrementCount() {
+        return overallTickCount++;
    }

    public int getCount() {
@@ -56,10 +49,6 @@ public final class TickEvent {
        return state;
    }

-    public static synchronized BiFunction<EventState, Type, TickEvent> createNextProvider() {
-        final int count = overallTickCount++;
-        return (state, type) -> new TickEvent(state, type, count);
-    }

    public enum Type {
        /**
--- 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/events/type/Overrideable.java
+++ b/src/api/java/baritone/api/event/events/type/Overrideable.java
@@ -1,53 +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.event.events.type;
-
-/**
- * @author LoganDark
- */
-public class Overrideable<T> {
-
-    private T value;
-    private boolean modified;
-
-    public Overrideable(T current) {
-        value = current;
-    }
-
-    public T get() {
-        return value;
-    }
-
-    public void set(T newValue) {
-        value = newValue;
-        modified = true;
-    }
-
-    public boolean wasModified() {
-        return modified;
-    }
-
-    @Override
-    public String toString() {
-        return String.format(
-                "Overrideable{modified=%b,value=%s}",
-                modified,
-                value.toString()
-        );
-    }
-}
--- a/src/api/java/baritone/api/event/listener/AbstractGameEventListener.java
+++ b/src/api/java/baritone/api/event/listener/AbstractGameEventListener.java
@@ -33,24 +33,15 @@ public interface AbstractGameEventListener extends IGameEventListener {
    @Override
    default void onTick(TickEvent event) {}

-    @Override
-    default void onPostTick(TickEvent event) {}
-
    @Override
    default void onPlayerUpdate(PlayerUpdateEvent event) {}

    @Override
    default void onSendChatMessage(ChatEvent event) {}

-    @Override
-    default void onPreTabComplete(TabCompleteEvent event) {}
-
    @Override
    default void onChunkEvent(ChunkEvent event) {}

-    @Override
-    default void onBlockChange(BlockChangeEvent event) {}
-
    @Override
    default void onRenderPass(RenderEvent event) {}

--- a/src/api/java/baritone/api/event/listener/IGameEventListener.java
+++ b/src/api/java/baritone/api/event/listener/IGameEventListener.java
@@ -18,14 +18,12 @@
 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.gui.screen.Screen;
+import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.Entity;
-import net.minecraft.network.Packet;

 /**
 * @author Brady
@@ -41,19 +39,11 @@ public interface IGameEventListener {
     */
    void onTick(TickEvent event);

-    /**
-     * Run once per game tick after the tick is completed
-     *
-     * @param event The event
-     * @see Minecraft#runTick()
-     */
-    void onPostTick(TickEvent event);
-
    /**
     * 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);

@@ -61,36 +51,19 @@ 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);

-    /**
-     * Runs whenever the client player tries to tab complete in chat.
-     *
-     * @param event The event
-     */
-    void onPreTabComplete(TabCompleteEvent event);
-
    /**
     * 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 after a single or multi block change packet is received and processed.
-     *
-     * @param event The event
-     */
-    void onBlockChange(BlockChangeEvent 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
     */
@@ -100,7 +73,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, Screen)
     */
    void onWorldEvent(WorldEvent event);

@@ -109,7 +82,6 @@ public interface IGameEventListener {
     *
     * @param event The event
     * @see Packet
-     * @see GenericFutureListener
     */
    void onSendPacket(PacketEvent event);

@@ -118,7 +90,6 @@ public interface IGameEventListener {
     *
     * @param event The event
     * @see Packet
-     * @see GenericFutureListener
     */
    void onReceivePacket(PacketEvent event);

@@ -132,10 +103,10 @@ public interface IGameEventListener {
    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);

--- 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/GoalAxis.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalAxis.java
@@ -42,16 +42,6 @@ public class GoalAxis implements Goal {
        return flatAxisDistance * BaritoneAPI.getSettings().costHeuristic.value + GoalYLevel.calculate(BaritoneAPI.getSettings().axisHeight.value, y);
    }

-    @Override
-    public boolean equals(Object o) {
-        return o.getClass() == GoalAxis.class;
-    }
-
-    @Override
-    public int hashCode() {
-        return 201385781;
-    }
-
    @Override
    public String toString() {
        return "GoalAxis";
--- a/src/api/java/baritone/api/pathing/goals/GoalBlock.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalBlock.java
@@ -17,8 +17,6 @@

 package baritone.api.pathing.goals;

-import baritone.api.utils.BetterBlockPos;
-import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.interfaces.IGoalRenderPos;
 import net.minecraft.util.math.BlockPos;

@@ -67,34 +65,9 @@ public class GoalBlock implements Goal, IGoalRenderPos {
        return calculate(xDiff, yDiff, zDiff);
    }

-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        GoalBlock goal = (GoalBlock) o;
-        return x == goal.x
-                && y == goal.y
-                && z == goal.z;
-    }
-
-    @Override
-    public int hashCode() {
-        return (int) BetterBlockPos.longHash(x, y, z) * 905165533;
-    }
-
    @Override
    public String toString() {
-        return String.format(
-                "GoalBlock{x=%s,y=%s,z=%s}",
-                SettingsUtil.maybeCensor(x),
-                SettingsUtil.maybeCensor(y),
-                SettingsUtil.maybeCensor(z)
-        );
+        return "GoalBlock{x=" + x + ",y=" + y + ",z=" + z + "}";
    }

    /**
@@ -108,9 +81,9 @@ public class GoalBlock implements Goal, IGoalRenderPos {
    public static double calculate(double xDiff, int yDiff, double zDiff) {
        double heuristic = 0;

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

        //use the pythagorean and manhattan mixture from GoalXZ
        heuristic += GoalXZ.calculate(xDiff, zDiff);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Leijurv	0bb148844d	Merge branch '1.13.2' into 1.14.4	2019-08-17 16:10:59 -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