v1.0.0-hotfix-4

.gitattributes

@@ -1 +0,0 @@
-* text=auto

.github/ISSUE_TEMPLATE.md

@@ -1 +0,0 @@
-<!-- No UwU's or OwO's allowed -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1 +0,0 @@
-<!-- No UwU's or OwO's allowed -->

.gitignore

@@ -11,8 +11,6 @@ build/
 classes/
 *.class
 
-/out
-
 # IntelliJ Files
 .idea/
 *.iml
@@ -20,4 +18,4 @@ classes/
 
 # Copyright Files
 !/.idea/copyright/Baritone.xml
-!/.idea/copyright/profiles_settings.xml
+!/.idea/copyright/profiles_settings.xml

.travis.yml

@@ -9,8 +9,7 @@ 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 run --name baritone cabaletta/baritone /bin/sh -c "set -e; /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 runClient"
 - docker cp baritone:/code/dist dist
 - ls dist
 - cat dist/checksums.txt

CODE_OF_CONDUCT.md

@@ -1,83 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* No Anime
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* Anime
-* The use of sexualized language or imagery and unwelcome sexual attention or
- advances
-* ~~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
-* Other conduct which could reasonably be considered inappropriate in a
- professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-Project maintainers have the right and responsibility to immediately remove
-without any sort of dispute any issues or pull requests that do not align
-with their corresponding templates. Absolutely no leniancy shall be accepted
-with these terms.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at complaints@leijurv.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq

Dockerfile

@@ -1,16 +1,17 @@
-FROM debian:stretch
+FROM debian:jessie
 
-RUN echo 'deb http://deb.debian.org/debian stretch-backports main' > /etc/apt/sources.list.d/stretch-backports.list
+RUN echo 'deb http://deb.debian.org/debian jessie-backports main' > /etc/apt/sources.list.d/jessie-backports.list
 
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt update -y
 
-RUN apt install \
+RUN apt install --target-release jessie-backports \
           openjdk-8-jdk \
+          ca-certificates-java \
           --assume-yes
 
-RUN apt install -qq --assume-yes mesa-utils libgl1-mesa-glx libxcursor1 libxrandr2 libxxf86vm1 x11-xserver-utils xfonts-base xserver-common
+RUN apt install -qq --force-yes mesa-utils libgl1-mesa-glx libxcursor1 libxrandr2 libxxf86vm1 x11-xserver-utils xfonts-base xserver-common
 
 COPY . /code
 
@@ -20,4 +21,4 @@ WORKDIR /code
 # source: https://github.com/tectonicus/tectonicus/issues/60#issuecomment-154239173
 RUN dpkg -i scripts/xvfb_1.16.4-1_amd64.deb
 
-RUN ./gradlew build
+RUN ./gradlew build

FEATURES.md

@@ -4,14 +4,13 @@
 - **Block breaking** Baritone considers breaking blocks as part of its path. It also takes into account your current tool set and hot bar. For example, if you have a Eff V diamond pick, it may choose to mine through a stone barrier, while if you only had a wood pick it might be faster to climb over it.
 - **Block placing** Baritone considers placing blocks as part of its path. This includes sneak-back-placing, pillaring, etc. It has a configurable penalty of placing a block (set to 1 second by default), to conserve its resources. The list of acceptable throwaway blocks is also configurable, and is cobble, dirt, or netherrack by default. <a href="https://www.youtube.com/watch?v=F6FbI1L9UmU">Example</a>
 - **Falling** Baritone will fall up to 3 blocks onto solid ground (configurable, if you have Feather Falling and/or don't mind taking a little damage). If you have a water bucket on your hotbar, it will fall up to 23 blocks and place the bucket beneath it. It will fall an unlimited distance into existing still water.
-- **Vines and ladders** Baritone understands how to climb and descend vines and ladders. There is experimental support for more advanced maneuvers, like strafing to a different ladder / vine column in midair (off by default, setting named `allowVines`). Baritone can break its fall by grabbing ladders / vines midair, and understands when that is and isn't possible.
+- **Vines and ladders** Baritone understands how to climb and descend vines and ladders. There is experimental support for more advanced maneuvers, like strafing to a different ladder / vine column in midair (off by default, setting named `allowVines`).
 - **Opening fence gates and doors**
 - **Slabs and stairs**
 - **Falling blocks** Baritone understands the costs of breaking blocks with falling blocks on top, and includes all of their break costs. Additionally, since it avoids breaking any blocks touching a liquid, it won't break the bottom of a gravel stack below a lava lake (anymore).
 - **Avoiding dangerous blocks** Obviously, it knows not to walk through fire or on magma, not to corner over lava (that deals some damage), not to break any blocks touching a liquid (it might drown), etc.
 - **Parkour** Sprint jumping over 1, 2, or 3 block gaps
 - **Parkour place** Sprint jumping over a 3 block gap and placing the block to land on while executing the jump. It's really cool.
-- **Pigs** It can sort of control pigs. I wouldn't rely on it though.
 
 # Pathing method
 Baritone uses A*, with some modifications: 
@@ -22,9 +21,9 @@ Baritone uses A*, with some modifications:
 - **Backtrack cost favoring** While calculating the next segment, Baritone favors backtracking its current segment. The cost is decreased heavily, but is still positive (this won't cause it to backtrack if it doesn't need to). This allows it to splice and jump onto the next segment as early as possible, if the next segment begins with a backtrack of the current one. <a href="https://www.youtube.com/watch?v=CGiMcb8-99Y">Example</a>
 - **Backtrack detection and pausing** While path calculation happens on a separate thread, the main game thread has access to the latest node considered, and the best path so far (those are rendered light blue and dark blue respectively). When the current best path (rendered dark blue) passes through the player's current position on the current path segment, path execution is paused (if it's safe to do so), because there's no point continuing forward if we're about to turn around and go back that same way. Note that the current best path as reported by the path calculation thread takes into account the incremental cost backoff system, so it's accurate to what the path calculation thread will actually pick once it finishes.
 
-# Chat control
-
-- [Baritone chat control usage](USAGE.md)
+# Configuring Baritone
+All the settings and documentation are <a href="https://github.com/cabaletta/baritone/blob/master/src/api/java/baritone/api/Settings.java">here</a>.
+To change 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 `pathTimeoutMS 250`). It's case insensitive.
 
 # Goals
 The pathing goal can be set to any of these options:
@@ -47,6 +46,7 @@ Things it doesn't have yet
 See <a href="https://github.com/cabaletta/baritone/issues">issues</a> for more.
 
 Things it may not ever have, from most likely to least likely =(
+- Pigs
 - Boats
 - Horses (2x3 path instead of 1x2)
 - Elytra

IMPACT.md

@@ -0,0 +1 @@
+Impact 4.4 is out. See <a href="INSTALL.md">INSTALL.md</a>

INSTALL.md

@@ -0,0 +1,96 @@
+# Integration between Baritone and Impact
+Impact 4.4 has Baritone included.
+
+These instructions apply to Impact 4.3 (and potentially other hacked clients).
+
+To run Baritone on Vanilla, just follow the instructions in the README (it's `./gradlew runClient`).
+
+
+## An Introduction
+There are some basic steps to getting Baritone setup with Impact.
+- Acquiring a build of Baritone
+- Placing Baritone in the libraries directory
+- Modifying the Impact Profile JSON to run baritone
+- How to use Baritone
+
+## Acquiring a build of Baritone
+There are two methods of acquiring a build of Baritone
+
+### Official Release (Not always up to date)
+https://github.com/cabaletta/baritone/releases
+
+For Impact 4.3, there is no Baritone integration yet, so you will want `baritone-standalone-X.Y.Z.jar`.
+
+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 . && docker run --rm cabaletta/baritone cat /code/dist/checksums.txt` 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).
+
+### Building Baritone yourself
+There are a few steps to this
+- Clone this repository
+- Setup the project as instructed in the README
+- Run the ``build`` gradle task. You can either do this using IntelliJ's gradle UI or through a
+command line
+  - Windows: ``gradlew build``
+  - Mac/Linux: ``./gradlew build``
+- The build should be exported into ``/build/libs/baritone-X.Y.Z.jar``
+
+## Placing Baritone in the libraries directory
+``/libraries`` is a neat directory in your <a href="https://minecraft.gamepedia.com/.minecraft">Minecraft Installation Directory</a>
+that contains all of the dependencies that are required from the game and some mods. This is where we will be
+putting baritone.
+- Locate the ``libraries`` folder, it should be in the Minecraft Installation Directory
+- Create 3 new subdirectories starting from ``libraries``
+  - ``cabaletta``
+    - ``baritone``
+      - ``X.Y.Z``
+ - Copy the build of Baritone that was acquired earlier, and place it into the ``X.Y.Z`` folder
+   - The full path should look like ``<Minecraft>/libraries/cabaletta/baritone/X.Y.Z/baritone-X.Y.Z.jar``
+
+## Modifying the Impact Profile JSON to run baritone
+The final step is "registering" the Baritone library with Impact, so that it loads on launch.
+- Ensure your Minecraft launcher is closed
+- Navigate back to the Minecraft Installation Directory
+- Find the ``versions`` directory, and open in
+- In here there should be a ``1.12.2-Impact_4.3`` folder.
+  - If you don't have any Impact folder or have a version older than 4.3, you can download Impact <a href="https://impactdevelopment.github.io">here</a>.
+- Open the folder and inside there should be a file called ``1.12.2-Impact_4.3.json``
+- Open the JSON file with a text editor that supports your system's line endings
+  - For example, Notepad on Windows likely will NOT work for this. You should instead use a Text Editor like
+  <a href="https://notepad-plus-plus.org/">Notepad++</a> if you're on Windows. (For other systems, I'm not sure
+  what would work the best so you may have to do some research.)
+- Find the ``libraries`` array in the JSON. It should look something like this.
+    ```
+    "libraries": [
+        {
+            "name": "net.minecraft:launchwrapper:1.12"
+        },
+        {
+            "name": "com.github.ImpactDevelopment:Impact:4.3-1.12.2",
+            "url": "https://impactdevelopment.github.io/maven/"
+        },
+        {
+            "name": "com.github.ImpactDeveloment:ClientAPI:3.0.2",
+            "url": "https://impactdevelopment.github.io/maven/"
+        },
+        ...
+    ```
+- Create two new objects in the array, between the ``Impact`` and ``ClientAPI`` dependencies preferably.
+    ```
+    {
+        "name": "cabaletta:baritone:X.Y.Z"
+    },
+    {
+        "name": "com.github.ImpactDevelopment:SimpleTweaker:1.2",
+        "url": "https://impactdevelopment.github.io/maven/"
+    },
+    ```
+- Now find the ``"minecraftArguments": "..."`` text near the top.
+- At the very end of the quotes where it says ``--tweakClass clientapi.load.ClientTweaker"``, add on the following so it looks like:
+  - ``--tweakClass clientapi.load.ClientTweaker --tweakClass baritone.launch.BaritoneTweakerOptifine"``
+- If you didn't close your launcher for this step, restart it now.
+- You can now launch Impact 4.3 as normal, and Baritone should start up
+ 
+ ## How to use Baritone
+ Instructions on how to use Baritone are limited, and you may have to read a little bit of code (Really nothing much
+  just plain English), you can view that <a href="https://github.com/cabaletta/baritone#chat-control">here</a>.

README.md

@@ -1,78 +1,75 @@
 # Baritone
 [![Build Status](https://travis-ci.com/cabaletta/baritone.svg?branch=master)](https://travis-ci.com/cabaletta/baritone)
 [![Release](https://img.shields.io/github/release/cabaletta/baritone.svg)](https://github.com/cabaletta/baritone/releases)
-[![License](https://img.shields.io/badge/license-LGPL--3.0%20with%20anime%20exception-green.svg)](LICENSE)
+[![License](https://img.shields.io/github/license/cabaletta/baritone.svg)](LICENSE)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/a73d037823b64a5faf597a18d71e3400)](https://www.codacy.com/app/leijurv/baritone?utm_source=github.com&utm_medium=referral&utm_content=cabaletta/baritone&utm_campaign=Badge_Grade)
 [![HitCount](http://hits.dwyl.com/cabaletta/baritone.svg)](http://hits.dwyl.com/cabaletta/baritone)
-[![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)
-![](https://tokei.rs/b1/github/cabaletta/baritone?category=code)
-[![Minecraft](https://img.shields.io/badge/MC-1.13.2-brightgreen.svg)](https://minecraft.gamepedia.com/1.13.2)
-[![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.5%20/%20v1.3.0-brightgreen.svg)](https://impactdevelopment.github.io/)
-[![WWE integration](https://img.shields.io/badge/WWE%20%22integration%22-master%3F-green.svg)](https://wweclient.com/)
-[![KAMI integration](https://img.shields.io/badge/KAMI%20integration-v1.0.0-red.svg)](https://github.com/zeroeightysix/KAMI/)
-[![Future integration](https://img.shields.io/badge/Future%20integration-Soon™%3F%3F%3F-red.svg)](https://futureclient.net/)
-[![ForgeHax integration](https://img.shields.io/badge/ForgeHax%20integration-Soon™-red.svg)](https://github.com/fr1kin/ForgeHax)
-[![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)
+[![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/cabaletta/baritone/issues)
+[![Minecraft](https://img.shields.io/badge/MC-1.12.2-green.svg)](https://minecraft.gamepedia.com/1.12.2)
 
-A Minecraft pathfinder bot. 
+A Minecraft pathfinder bot. This project is an updated version of [MineBot](https://github.com/leijurv/MineBot/),
+the original version of the bot for Minecraft 1.8, rebuilt for 1.12.2. Baritone focuses on reliability and particularly performance (it's over [29x faster](https://github.com/cabaletta/baritone/pull/180#issuecomment-423822928) than MineBot at calculating paths).
 
 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.
 
-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. 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 for the last 8 months =D 🦀
-
-1Leijurv3DWTrGAfmmiTphjhXLvQiHg7K2
-
-# Getting Started
-
 Here are some links to help to get started:
 
 - [Features](FEATURES.md)
 
-- [Installation & setup](SETUP.md)
+- [Installation](INSTALL.md)
 
-- [API Javadocs](https://baritone.leijurv.com)
+There's also some useful information down below
 
-- [Settings](https://baritone.leijurv.com/baritone/api/Settings.html#field.detail)
+# Setup
 
-- [Baritone chat control usage](USAGE.md)
+## Command Line
+On Mac OSX and Linux, use `./gradlew` instead of `gradlew`.
 
-# API
+Running Baritone:
 
-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.
+```
+$ gradlew runClient
+```
 
-Below is an example of basic usage for changing some settings, and then pathing to a X/Z goal.
+Building Baritone:
+```
+$ gradlew build
+```
+
+For example, to replace out Impact 4.4's Baritone build with a customized one, build Baritone as above then copy `dist/baritone-api-$VERSION.jar` into `minecraft/libraries/cabaletta/baritone-api/1.0.0/baritone-api-1.0.0.jar`, replacing the jar that was previously there. You also need to edit `minecraft/versions/1.12.2-Impact_4.4/1.12.2-Impact_4.4.json`, find the line `"name": "cabaletta:baritone-api:1.0.0"`, remove the comma from the end, and entirely remove the line that's immediately after (starts with `"url"`). 
+
+## IntelliJ's Gradle UI
+- Open the project in IntelliJ as a Gradle project
+- Run the Gradle task `setupDecompWorkspace`
+- Run the Gradle task `genIntellijRuns`
+- Refresh the Gradle project (or, to be safe, just restart IntelliJ)
+- Select the "Minecraft Client" launch config
+- In `Edit Configurations...` you may need to select `baritone_launch` for `Use classpath of module:`.
+
+# Chat control
+[Defined Here](src/main/java/baritone/utils/ExampleBaritoneControl.java)
+
+Quick start example: `thisway 1000` or `goal 70` to set the goal, `path` to actually start pathing. Also try `mine diamond_ore`. `cancel` to cancel.
+
+# API example
 
 ```
 BaritoneAPI.getSettings().allowSprint.value = true;
-BaritoneAPI.getSettings().primaryTimeoutMS.value = 2000L;
+BaritoneAPI.getSettings().pathTimeoutMS.value = 2000L;
 
-BaritoneAPI.getProvider().getPrimaryBaritone().getCustomGoalProcess().setGoalAndPath(new GoalXZ(10000, 20000));
+BaritoneAPI.getPathingBehavior().setGoal(new GoalXZ(10000, 20000));
+BaritoneAPI.getPathingBehavior().path();
 ```
 
 # FAQ
 
-## Can I use Baritone as a library in my custom utility client?
+## Can I use Baritone as a library in my hacked client?
 
-That's what it's for, sure! (As long as usage is in compliance with the LGPL 3 License)
+Sure! (As long as usage is in compliance with the LGPL 3 License)
 
 ## How is it so fast?
 
-Magic. (Hours of [leijurv](https://github.com/leijurv) enduring excruciating pain)
+Magic. (Hours of [Leijurv](https://github.com/leijurv) enduring excruciating pain)
 
 ## Why is it called Baritone?
 

SETUP.md

@@ -1,98 +0,0 @@
-# Installation
-
-## Prebuilt official releases
-These releases are not always completely up to date with latest features, and are only released from `master`. (so if you want `backfill-2` branch for example, you'll have to build it yourself)
-
-Link to the releases page: [Releases](https://github.com/cabaletta/baritone/releases)
-
-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).
-
-
-## Artifacts
-
-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 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 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 Standalone**: Same as Standalone, but packaged for Forge. This should be used when Baritone is your only Forge mod, or none of your other Forge mods integrate with Baritone.
-- **Unoptimized**: Nothing is obfuscated. This shouldn't be used ever in production.
-
-## More Info
-To replace out Impact 4.5's Baritone build with a customized one, build Baritone as above then copy & **rename** `dist/baritone-api-$VERSION$.jar` into `minecraft/libraries/cabaletta/baritone-api/1.2/baritone-api-1.2.jar`, replacing the jar that was previously there. You also need to edit `minecraft/versions/1.12.2-Impact_4.5/1.12.2-Impact_4.5.json`, find the line `"name": "cabaletta:baritone-api:1.2"`, remove the comma from the end, and **entirely remove the NEXT line** (starts with `"url"`). **Restart your launcher** then load as normal. 
-
-You can verify whether or not it worked by running `.b version` in chat (only valid in Impact). It should print out the version that you downloaded. Note: The version that comes with 4.5 is `v1.2.3`.
-
-## Build it yourself
-- Clone or download Baritone
-
-  ![Image](https://i.imgur.com/kbqBtoN.png)
-  - If you choose to download, make sure you extract the ZIP archive.
-- Follow one of the instruction sets below, based on your preference
-
-## Command Line
-On Mac OSX and Linux, use `./gradlew` instead of `gradlew`.
-
-Setting up the Environment:
-
-```
-$ gradlew setupDecompWorkspace
-$ gradlew --refresh-dependencies
-```
-
-Running Baritone:
-
-```
-$ gradlew runClient
-```
-
-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)
-  
-  ![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

USAGE.md

@@ -1,90 +0,0 @@
-(assuming you already have Baritone [set up](SETUP.md))
-
-# Prefix
-
-Baritone commands can by default be typed in the chatbox. However if you make a typo, like typing "gola 10000 10000" instead of goal it goes into public chat, which is bad.
-
-Therefore you can use a prefix before your messages.
-
-On Baritone v1.1.0 and newer: The prefix is `#` by default. Anything beginning with `#` isn't sent, and is only interpreted by Baritone.
-For older than v1.1.0, `#` must be enabled by toggling on the `prefix` setting.
-
-**Only** in Impact is `.b` also a valid prefix. In 4.4, `#` does **not** work, neither does saying the commands directly in chat. `#` works by default in 4.5 (not 4.4).
-
-Other clients like Kami and Asuna have their own custom things (like `-path`), and can disable direct chat control entirely.
-
-
-
-# Commands
-
-**All** of these commands may need a prefix before them, as above ^.
-
-`help` for (rudimentary) help. You can see what it says [here](https://github.com/cabaletta/baritone/blob/master/src/main/java/baritone/utils/ExampleBaritoneControl.java#L53).
-
-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`.
-
-
-
-
-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 go to a certain coordinate
-- `goal` to set the goal to your player's feet
-- `goal clear` to clear the goal
-- `cancel` or `stop` to stop everything
-- `goto portal` or `goto ender_chest` or `goto block_type` to go to a block. (in Impact, `.goto` is an alias for `.b goto` for the most part)
-- `mine diamond_ore` 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. `follow` to follow the entity you're looking at (only works if it hitting range). `followplayers` to follow any players in range (combine with Kill Aura for a fun time).
-- `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).
-- `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.
-- `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/main/java/baritone/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.
-- `allowBreak`
-- `allowSprint`
-- `allowPlace`
-- `allowParkour`
-- `allowParkourPlace`
-- `blockPlacementPenalty`
-- `renderCachedChunks` (and `cachedChunksOpacity`) <-- very fun but you need a beefy computer
-- `avoidance` (avoidance of mobs / mob spawners)
-- `legitMine`
-- `followRadius`
-- `backfill` (fill in tunnels behind you)
-- `buildInLayers`
-- `buildRepeatDistance` and `buildRepeatDirection`
-- `worldExploringChunkOffset`
-- `acceptableThrowawayItems`
-- `blocksToAvoidBreaking`
-
-
-
-
-# Troubleshooting / common issues
-
-## Why doesn't Baritone respond to any of my chat commands?
-This could be one of many things.
-
-First, make sure it's actually installed. An easy way to check is seeing if it created the folder `baritone` in your Minecraft folder.
-
-Second, make sure that you're using the prefix properly, and that chat control is enabled in the way you expect.
-
-For example, Impact disables direct chat control. (i.e. anything typed in chat without a prefix will be ignored and sent publicly). **This is a saved setting**, so if you run Impact once, `chatControl` will be off from then on, **even in other clients**.
-So you'll need to use the `#` prefix or edit `baritone/settings.txt` in your Minecraft folder to undo that (specifically, remove the line `chatControl false` then restart your client).
-
-
-## 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 `goal x z` then `path`.

build.gradle

@@ -1,187 +1,115 @@
-/*
- * 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/>.
- */
-
-group 'baritone'
-version '1.3.2'
-
-buildscript {
-    repositories {
-        jcenter()
-        maven {
-            name = 'forge'
-            url = 'http://files.minecraftforge.net/maven'
-        }
-        maven {
-            name = 'impactdevelopment-repo'
-            url = 'https://impactdevelopment.github.io/maven/'
-        }
-    }
-
-    dependencies {
-        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: 'net.minecraftforge.gradle'
-apply plugin: 'org.spongepowered.mixin'
-
-sourceCompatibility = targetCompatibility = '1.8'
-compileJava {
-    sourceCompatibility = targetCompatibility = '1.8'
-    options.encoding = "UTF-8" // allow emoji in comments :^)
-}
-
-sourceSets {
-    api {
-        compileClasspath += main.compileClasspath
-    }
-    main {
-        compileClasspath += api.output
-    }
-    test {
-        compileClasspath += main.compileClasspath + main.runtimeClasspath + main.output
-        runtimeClasspath += main.compileClasspath + main.runtimeClasspath + main.output
-    }
-    launch {
-        compileClasspath += main.compileClasspath + main.runtimeClasspath + main.output
-        runtimeClasspath += main.compileClasspath + main.runtimeClasspath + main.output
-    }
-}
-
-task sourceJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
-    from sourceSets.api.allSource
-}
-
-minecraft {
-    mappings channel: 'snapshot', version: '20190307-1.13.1'
-    reobfMappings 'notch'
-
-    runs {
-        client {
-            workingDirectory project.file('run')
-            source sourceSets.launch
-
-            main 'baritone.launch.LaunchTesting'
-
-            environment 'assetIndex', '{asset_index}'
-            environment 'assetDirectory', downloadAssets.output
-            environment 'nativesDirectory', extractNatives.output
-
-            environment 'tweakClass', 'baritone.launch.BaritoneTweaker'
-
-            if (Os.isFamily(Os.FAMILY_MAC)) {
-                jvmArgs "-XstartOnFirstThread"
-            }
-        }
-
-        autoTest {
-            workingDirectory project.file('autotest')
-            source sourceSets.launch
-
-            main 'baritone.launch.LaunchTesting'
-
-            environment 'assetIndex', '{asset_index}'
-            environment 'assetDirectory', downloadAssets.output
-            environment 'nativesDirectory', extractNatives.output
-
-            environment 'tweakClass', 'baritone.launch.BaritoneTweaker'
-            environment 'BARITONE_AUTO_TEST', 'true'
-
-            if (Os.isFamily(Os.FAMILY_MAC)) {
-                jvmArgs "-XstartOnFirstThread"
-            }
-        }
-    }
-}
-
-repositories {
-    mavenCentral()
-
-    maven {
-        name = 'spongepowered-repo'
-        url = 'http://repo.spongepowered.org/maven/'
-    }
-
-    maven {
-        name = 'impactdevelopment-repo'
-        url = 'https://impactdevelopment.github.io/maven/'
-    }
-}
-
-dependencies {
-    minecraft 'com.github.ImpactDevelopment:Vanilla:1.13.2'
-
-    runtime launchCompile('net.minecraft:launchwrapper:1.12') {
-        exclude module: 'lwjgl'
-    }
-    runtime launchCompile('org.ow2.asm:asm-debug-all:5.2')
-    runtime launchCompile('com.github.ImpactDevelopment:SimpleTweaker:1.2')
-    runtime launchCompile('org.spongepowered:mixin:0.7.11-SNAPSHOT') {
-        // Mixin includes a lot of dependencies that are too up-to-date
-        exclude module: 'launchwrapper'
-        exclude module: 'guava'
-        exclude module: 'gson'
-        exclude module: 'commons-io'
-        exclude module: 'log4j-core'
-    }
-
-    testImplementation 'junit:junit:4.12'
-}
-
-mixin {
-    defaultObfuscationEnv searge
-    add sourceSets.launch, 'mixins.baritone.refmap.json'
-}
-
-javadoc {
-    options.addStringOption('Xwerror', '-quiet') // makes the build fail on travis when there is a javadoc error
-    options.linkSource true
-    options.encoding "UTF-8" // allow emoji in comments :^)
-    source = sourceSets.api.allJava
-    classpath += sourceSets.api.compileClasspath
-}
-
-jar {
-    from sourceSets.launch.output, sourceSets.api.output
-    preserveFileTimestamps = false
-    reproducibleFileOrder = true
-
-    manifest {
-        attributes(
-                'MixinConfigs': 'mixins.baritone.json',
-
-                'Implementation-Title': 'Baritone',
-                'Implementation-Version': version
-        )
-    }
-}
-
-task proguard(type: ProguardTask) {
-    url 'https://downloads.sourceforge.net/project/proguard/proguard/6.0/proguard6.0.3.zip'
-    extract 'proguard6.0.3/lib/proguard.jar'
-}
-
-task createDist(type: CreateDistTask, dependsOn: proguard)
-
-build.finalizedBy(createDist)
+/*
+ * 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/>.
+ */
+
+group 'baritone'
+version '1.0.0-hotfix-4'
+
+buildscript {
+    repositories {
+        maven {
+            name = 'forge'
+            url = 'http://files.minecraftforge.net/maven'
+        }
+        maven {
+            name = 'SpongePowered'
+            url = 'http://repo.spongepowered.org/maven'
+        }
+        jcenter()
+    }
+
+    dependencies {
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
+        classpath 'org.spongepowered:mixingradle:0.6-SNAPSHOT'
+    }
+}
+
+
+import baritone.gradle.task.CreateDistTask
+import baritone.gradle.task.ProguardTask
+
+apply plugin: 'java'
+apply plugin: 'net.minecraftforge.gradle.tweaker-client'
+apply plugin: 'org.spongepowered.mixin'
+
+sourceCompatibility = targetCompatibility = '1.8'
+compileJava {
+    sourceCompatibility = targetCompatibility = '1.8'
+}
+
+sourceSets {
+    launch {
+        compileClasspath += main.compileClasspath + main.runtimeClasspath + main.output
+    }
+}
+
+minecraft {
+    version = '1.12.2'
+    mappings = 'snapshot_20180731'
+    tweakClass = 'baritone.launch.BaritoneTweaker'
+    runDir = 'run'
+
+    // The sources jar should use SRG names not MCP to ensure compatibility with all mappings
+    makeObfSourceJar = true
+}
+
+repositories {
+    mavenCentral()
+
+    maven {
+        name = 'spongepowered-repo'
+        url = 'http://repo.spongepowered.org/maven/'
+    }
+
+    maven {
+        name = 'impactdevelopment-repo'
+        url = 'https://impactdevelopment.github.io/maven/'
+    }
+}
+
+dependencies {
+    runtime launchCompile('com.github.ImpactDevelopment:SimpleTweaker:1.2')
+    runtime launchCompile('org.spongepowered:mixin:0.7.11-SNAPSHOT') {
+        // Mixin includes a lot of dependencies that are too up-to-date
+        exclude module: 'launchwrapper'
+        exclude module: 'guava'
+        exclude module: 'gson'
+        exclude module: 'commons-io'
+        exclude module: 'log4j-core'
+    }
+    testImplementation 'junit:junit:4.12'
+}
+
+mixin {
+    defaultObfuscationEnv notch
+    add sourceSets.launch, 'mixins.baritone.refmap.json'
+}
+
+jar {
+    from sourceSets.launch.output, sourceSets.api.output
+    preserveFileTimestamps = false
+    reproducibleFileOrder = true
+}
+
+task proguard(type: ProguardTask) {
+    url 'https://downloads.sourceforge.net/project/proguard/proguard/6.0/proguard6.0.3.zip'
+    extract 'proguard6.0.3/lib/proguard.jar'
+    versionManifest 'https://launchermeta.mojang.com/mc/game/version_manifest.json'
+}
+
+task createDist(type: CreateDistTask, dependsOn: proguard)
+
+build.finalizedBy(createDist)

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

@@ -17,6 +17,8 @@
 
 package baritone.gradle.task;
 
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
 import org.gradle.api.DefaultTask;
 
 import java.io.File;
@@ -24,6 +26,7 @@ import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.List;
 
 /**
  * @author Brady
@@ -31,6 +34,8 @@ import java.nio.file.Paths;
  */
 class BaritoneGradleTask extends DefaultTask {
 
+    protected static final JsonParser PARSER = new JsonParser();
+
     protected static final String
             PROGUARD_ZIP                    = "proguard.zip",
             PROGUARD_JAR                    = "proguard.jar",
@@ -40,10 +45,14 @@ class BaritoneGradleTask extends DefaultTask {
             PROGUARD_STANDALONE_CONFIG      = "standalone.pro",
             PROGUARD_EXPORT_PATH            = "proguard_out.jar",
 
-            ARTIFACT_STANDARD         = "%s-%s.jar",
-            ARTIFACT_UNOPTIMIZED      = "%s-unoptimized-%s.jar",
-            ARTIFACT_API              = "%s-api-%s.jar",
-            ARTIFACT_STANDALONE       = "%s-standalone-%s.jar";
+            VERSION_MANIFEST = "version_manifest.json",
+
+            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";
 
     protected String artifactName, artifactVersion;
     protected Path artifactPath, artifactUnoptimizedPath, artifactApiPath, artifactStandalonePath, proguardOut;
@@ -52,10 +61,10 @@ class BaritoneGradleTask extends DefaultTask {
         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.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);
 
@@ -86,4 +95,8 @@ class BaritoneGradleTask extends DefaultTask {
     protected Path getBuildFile(String file) {
         return getRelativeFile("build/libs/" + file);
     }
+
+    protected JsonElement readJson(List<String> lines) {
+        return PARSER.parse(String.join("\n", lines));
+    }
 }

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

@@ -42,9 +42,9 @@ public class CreateDistTask extends BaritoneGradleTask {
         super.verifyArtifacts();
 
         // Define the distribution file paths
-        Path api             = getRelativeFile("dist/" + formatVersion(ARTIFACT_API));
-        Path standalone      = getRelativeFile("dist/" + formatVersion(ARTIFACT_STANDALONE));
-        Path unoptimized     = getRelativeFile("dist/" + formatVersion(ARTIFACT_UNOPTIMIZED));
+        Path api         = getRelativeFile("dist/" + formatVersion(ARTIFACT_API));
+        Path standalone  = getRelativeFile("dist/" + formatVersion(ARTIFACT_STANDALONE));
+        Path unoptimized = getRelativeFile("dist/" + formatVersion(ARTIFACT_UNOPTIMIZED));
 
         // NIO will not automatically create directories
         Path dir = getRelativeFile("dist/");
@@ -53,9 +53,9 @@ public class CreateDistTask extends BaritoneGradleTask {
         }
 
         // Copy build jars to dist/
-        Files.copy(this.artifactApiPath,             api,             REPLACE_EXISTING);
-        Files.copy(this.artifactStandalonePath,      standalone,      REPLACE_EXISTING);
-        Files.copy(this.artifactUnoptimizedPath,     unoptimized,     REPLACE_EXISTING);
+        Files.copy(this.artifactApiPath,         api,         REPLACE_EXISTING);
+        Files.copy(this.artifactStandalonePath,  standalone,  REPLACE_EXISTING);
+        Files.copy(this.artifactUnoptimizedPath, unoptimized, REPLACE_EXISTING);
 
         // Calculate all checksums and format them like "shasum"
         List<String> shasum = Stream.of(api, standalone, unoptimized)

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

@@ -18,18 +18,21 @@
 package baritone.gradle.task;
 
 import baritone.gradle.util.Determinizer;
+import com.google.gson.*;
 import org.apache.commons.io.IOUtils;
-import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.TaskAction;
+import org.gradle.internal.Pair;
 
 import java.io.*;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Stream;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
@@ -41,12 +44,20 @@ import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
  */
 public class ProguardTask extends BaritoneGradleTask {
 
+    private static final Pattern TEMP_LIBRARY_PATTERN = Pattern.compile("-libraryjars 'tempLibraries\\/([a-zA-Z0-9/_\\-\\.]+)\\.jar'");
+
     @Input
     private String url;
 
     @Input
     private String extract;
 
+    @Input
+    private String versionManifest;
+
+    private Map<String, String> versionDownloadMap;
+    private List<String> requiredLibraries;
+
     @TaskAction
     protected void exec() throws Exception {
         super.verifyArtifacts();
@@ -56,6 +67,8 @@ public class ProguardTask extends BaritoneGradleTask {
         downloadProguard();
         extractProguard();
         generateConfigs();
+        downloadVersionManifest();
+        acquireDependencies();
         proguardApi();
         proguardStandalone();
         cleanup();
@@ -99,19 +112,6 @@ public class ProguardTask extends BaritoneGradleTask {
         String out = IOUtils.toString(p.getInputStream(), "UTF-8").split("\n")[0].split("Opened ")[1].replace("]", "");
         template.add(2, "-libraryjars '" + out + "'");
 
-        // 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);
 
@@ -119,10 +119,80 @@ 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 Stream<File> acquireDependencies() {
-        return getProject().getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("launch").getRuntimeClasspath().getFiles().stream().filter(File::isFile);
+    private void downloadVersionManifest() throws Exception {
+        Path manifestJson = getTemporaryFile(VERSION_MANIFEST);
+        write(new URL(this.versionManifest).openStream(), manifestJson);
+
+        // Place all the versions in the map with their download URL
+        this.versionDownloadMap = new HashMap<>();
+        JsonObject json = readJson(Files.readAllLines(manifestJson)).getAsJsonObject();
+        JsonArray versions = json.getAsJsonArray("versions");
+        versions.forEach(element -> {
+            JsonObject object = element.getAsJsonObject();
+            this.versionDownloadMap.put(object.get("id").getAsString(), object.get("url").getAsString());
+        });
+    }
+
+    private void acquireDependencies() throws Exception {
+
+        // Create a map of all of the dependencies that we are able to access in this project
+        // Likely a better way to do this, I just pair the dependency with the first valid configuration
+        Map<String, Pair<Configuration, Dependency>> dependencyLookupMap = new HashMap<>();
+        getProject().getConfigurations().stream().filter(Configuration::isCanBeResolved).forEach(config ->
+                config.getAllDependencies().forEach(dependency ->
+                        dependencyLookupMap.putIfAbsent(dependency.getName() + "-" + dependency.getVersion(), Pair.of(config, dependency))));
+
+        // Create the directory if it doesn't already exist
+        Path tempLibraries = getTemporaryFile(TEMP_LIBRARY_DIR);
+        if (!Files.exists(tempLibraries)) {
+            Files.createDirectory(tempLibraries);
+        }
+
+        // Iterate the required libraries to copy them to tempLibraries
+        for (String lib : this.requiredLibraries) {
+            // Download the version jar from the URL acquired from the version manifest
+            if (lib.startsWith("minecraft")) {
+                String version = lib.split("-")[1];
+                Path versionJar = getTemporaryFile("tempLibraries/" + lib + ".jar");
+                if (!Files.exists(versionJar)) {
+                    JsonObject versionJson = PARSER.parse(new InputStreamReader(new URL(this.versionDownloadMap.get(version)).openStream())).getAsJsonObject();
+                    String url = versionJson.getAsJsonObject("downloads").getAsJsonObject("client").getAsJsonPrimitive("url").getAsString();
+                    write(new URL(url).openStream(), versionJar);
+                }
+                continue;
+            }
+
+            // Find a configuration/dependency pair that matches the desired library
+            Pair<Configuration, Dependency> pair = null;
+            for (Map.Entry<String, Pair<Configuration, Dependency>> entry : dependencyLookupMap.entrySet()) {
+                if (entry.getKey().startsWith(lib)) {
+                    pair = entry.getValue();
+                }
+            }
+
+            // The pair must be non-null
+            Objects.requireNonNull(pair);
+
+            // Find the library jar file, and copy it to tempLibraries
+            for (File file : pair.getLeft().files(pair.getRight())) {
+                if (file.getName().startsWith(lib)) {
+                    Files.copy(file.toPath(), getTemporaryFile("tempLibraries/" + lib + ".jar"), REPLACE_EXISTING);
+                }
+            }
+        }
     }
 
     private void proguardApi() throws Exception {
@@ -149,6 +219,10 @@ public class ProguardTask extends BaritoneGradleTask {
         this.extract = extract;
     }
 
+    public void setVersionManifest(String versionManifest) {
+        this.versionManifest = versionManifest;
+    }
+
     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)) {
@@ -161,8 +235,8 @@ public class ProguardTask extends BaritoneGradleTask {
                 .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
-        this.printOutputLog(p.getInputStream(), System.out);
-        this.printOutputLog(p.getErrorStream(), System.err);
+        this.printOutputLog(p.getInputStream());
+        this.printOutputLog(p.getErrorStream());
 
         // Halt the current thread until the process is complete, if the exit code isn't 0, throw an exception
         int exitCode = p.waitFor();
@@ -171,14 +245,14 @@ public class ProguardTask extends BaritoneGradleTask {
         }
     }
 
-    private void printOutputLog(InputStream stream, PrintStream outerr) {
+    private void printOutputLog(InputStream stream) {
         new Thread(() -> {
             try (BufferedReader reader = new BufferedReader(new InputStreamReader(stream))) {
                 String line;
                 while ((line = reader.readLine()) != null) {
-                    outerr.println(line);
+                    System.out.println(line);
                 }
-            } catch (Exception e) {
+            } catch (final Exception e) {
                 e.printStackTrace();
             }
         }).start();

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Jul 31 21:56:56 PDT 2018
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
+#Tue Jul 31 21:56:56 PDT 2018
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip

gradlew.bat

@@ -1,84 +1,84 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@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=
-
-@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 init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-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 %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@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=
+
+@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 init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+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 %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

scripts/proguard.pro

@@ -12,18 +12,14 @@
 -flattenpackagehierarchy
 -repackageclasses 'baritone'
 
-# lwjgl is weird
--dontwarn org.lwjgl.**
-# also lwjgl lol
--dontwarn module-info
-
 -keep class baritone.api.** { *; } # this is the keep api
 
 # service provider needs these class names
 -keep class baritone.BaritoneProvider
 -keep class baritone.api.IBaritoneProvider
 
--keep class baritone.api.utils.MyChunkPos { *; } # even in standalone we need to keep this for gson reflect
+# hack
+-keep class baritone.utils.ExampleBaritoneControl { *; }
 
 # setting names are reflected from field names, so keep field names
 -keepclassmembers class baritone.api.Settings {
@@ -33,6 +29,55 @@
 # need to keep mixin names
 -keep class baritone.launch.** { *; }
 
+# copy all necessary libraries into tempLibraries to build
+
+-libraryjars 'tempLibraries/minecraft-1.12.2.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.1.jar'
+-libraryjars 'tempLibraries/platform-3.4.0.jar'
+-libraryjars 'tempLibraries/realms-1.10.22.jar'
+-libraryjars 'tempLibraries/soundsystem-20120107.jar'
+-libraryjars 'tempLibraries/text2speech-1.10.3.jar'
+
+-libraryjars 'tempLibraries/mixin-0.7.11-SNAPSHOT.jar'
+-libraryjars 'tempLibraries/launchwrapper-1.11.jar' # TODO why does only 1.11.jar exist?
+
+
+
+
 # Keep - Applications. Keep all application classes, along with their 'main'
 # methods.
 -keepclasseswithmembers public class * {

settings.gradle

@@ -1,19 +1,19 @@
-/*
- * 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/>.
- */
-
-rootProject.name = 'baritone'
-
+/*
+ * 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/>.
+ */
+
+rootProject.name = 'baritone'
+

src/api/java/baritone/api/BaritoneAPI.java

@@ -17,36 +17,70 @@
 
 package baritone.api;
 
+import baritone.api.behavior.*;
+import baritone.api.cache.IWorldProvider;
+import baritone.api.cache.IWorldScanner;
+import baritone.api.event.listener.IGameEventListener;
 import baritone.api.utils.SettingsUtil;
 
 import java.util.Iterator;
 import java.util.ServiceLoader;
 
 /**
- * Exposes the {@link IBaritoneProvider} instance and the {@link Settings} instance for API usage.
+ * API exposure for various things implemented in Baritone.
+ * <p>
+ * W.I.P
  *
  * @author Brady
  * @since 9/23/2018
  */
 public final class BaritoneAPI {
 
-    private static final IBaritoneProvider provider;
+    private static final IBaritoneProvider baritone;
     private static final Settings settings;
 
     static {
         ServiceLoader<IBaritoneProvider> baritoneLoader = ServiceLoader.load(IBaritoneProvider.class);
         Iterator<IBaritoneProvider> instances = baritoneLoader.iterator();
-        provider = instances.next();
+        baritone = instances.next();
 
         settings = new Settings();
         SettingsUtil.readAndApply(settings);
     }
 
-    public static IBaritoneProvider getProvider() {
-        return BaritoneAPI.provider;
+    public static IFollowBehavior getFollowBehavior() {
+        return baritone.getFollowBehavior();
+    }
+
+    public static ILookBehavior getLookBehavior() {
+        return baritone.getLookBehavior();
+    }
+
+    public static IMemoryBehavior getMemoryBehavior() {
+        return baritone.getMemoryBehavior();
+    }
+
+    public static IMineBehavior getMineBehavior() {
+        return baritone.getMineBehavior();
+    }
+
+    public static IPathingBehavior getPathingBehavior() {
+        return baritone.getPathingBehavior();
     }
 
     public static Settings getSettings() {
-        return BaritoneAPI.settings;
+        return settings;
+    }
+
+    public static IWorldProvider getWorldProvider() {
+        return baritone.getWorldProvider();
+    }
+
+    public static IWorldScanner getWorldScanner() {
+        return baritone.getWorldScanner();
+    }
+
+    public static void registerEventListener(IGameEventListener listener) {
+        baritone.registerEventListener(listener);
     }
 }

src/api/java/baritone/api/IBaritone.java

@@ -1,132 +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;
-
-import baritone.api.behavior.ILookBehavior;
-import baritone.api.behavior.IPathingBehavior;
-import baritone.api.cache.IWorldProvider;
-import baritone.api.event.listener.IEventBus;
-import baritone.api.pathing.calc.IPathingControlManager;
-import baritone.api.process.*;
-import baritone.api.utils.IInputOverrideHandler;
-import baritone.api.utils.IPlayerContext;
-
-/**
- * @author Brady
- * @since 9/29/2018
- */
-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 ILookBehavior} instance
-     * @see ILookBehavior
-     */
-    ILookBehavior getLookBehavior();
-
-    /**
-     * @return The {@link IFollowProcess} instance
-     * @see IFollowProcess
-     */
-    IFollowProcess getFollowProcess();
-
-    /**
-     * @return The {@link IMineProcess} instance
-     * @see IMineProcess
-     */
-    IMineProcess getMineProcess();
-
-    /**
-     * @return The {@link IBuilderProcess} instance
-     * @see IBuilderProcess
-     */
-    IBuilderProcess getBuilderProcess();
-
-    /**
-     * @return The {@link IExploreProcess} instance
-     * @see IExploreProcess
-     */
-    IExploreProcess getExploreProcess();
-
-    /**
-     * @return The {@link IFarmProcess} instance
-     * @see IFarmProcess
-     */
-    IFarmProcess getFarmProcess();
-
-    /**
-     * @return The {@link ICustomGoalProcess} instance
-     * @see ICustomGoalProcess
-     */
-    ICustomGoalProcess getCustomGoalProcess();
-
-    /**
-     * @return The {@link IGetToBlockProcess} instance
-     * @see IGetToBlockProcess
-     */
-    IGetToBlockProcess getGetToBlockProcess();
-
-    /**
-     * @return The {@link IWorldProvider} instance
-     * @see IWorldProvider
-     */
-    IWorldProvider getWorldProvider();
-
-    /**
-     * Returns the {@link IPathingControlManager} for this {@link IBaritone} instance, which is responsible
-     * for managing the {@link IBaritoneProcess}es which control the {@link IPathingBehavior} state.
-     *
-     * @return The {@link IPathingControlManager} instance
-     * @see IPathingControlManager
-     */
-    IPathingControlManager getPathingControlManager();
-
-    /**
-     * @return The {@link IInputOverrideHandler} instance
-     * @see IInputOverrideHandler
-     */
-    IInputOverrideHandler getInputOverrideHandler();
-
-    /**
-     * @return The {@link IPlayerContext} instance
-     * @see IPlayerContext
-     */
-    IPlayerContext getPlayerContext();
-
-    /**
-     * @return The {@link IEventBus} instance
-     * @see IEventBus
-     */
-    IEventBus getGameEventHandler();
-
-    void openClick();
-}

src/api/java/baritone/api/IBaritoneProvider.java

@@ -17,58 +17,70 @@
 
 package baritone.api;
 
+import baritone.api.behavior.*;
+import baritone.api.cache.IWorldProvider;
 import baritone.api.cache.IWorldScanner;
-import net.minecraft.client.entity.EntityPlayerSP;
-
-import java.util.List;
+import baritone.api.event.listener.IGameEventListener;
 
 /**
- * Provides the present {@link IBaritone} instances
- *
- * @author leijurv
+ * @author Brady
+ * @since 9/29/2018
  */
 public interface IBaritoneProvider {
 
     /**
-     * Returns the primary {@link IBaritone} instance. This instance is persistent, and
-     * is represented by the local player that is created by the game itself, not a "bot"
-     * player through Baritone.
+     * @see IFollowBehavior
      *
-     * @return The primary {@link IBaritone} instance.
+     * @return The {@link IFollowBehavior} instance
      */
-    IBaritone getPrimaryBaritone();
+    IFollowBehavior getFollowBehavior();
 
     /**
-     * Returns all of the active {@link IBaritone} instances. This includes the local one
-     * returned by {@link #getPrimaryBaritone()}.
+     * @see ILookBehavior
      *
-     * @return All active {@link IBaritone} instances.
-     * @see #getBaritoneForPlayer(EntityPlayerSP)
+     * @return The {@link ILookBehavior} instance
      */
-    List<IBaritone> getAllBaritones();
+    ILookBehavior getLookBehavior();
 
     /**
-     * Provides the {@link IBaritone} instance for a given {@link EntityPlayerSP}. This will likely be
-     * replaced with or be overloaded in addition to {@code #getBaritoneForUser(IBaritoneUser)} when
-     * {@code bot-system} is merged into {@code master}.
+     * @see IMemoryBehavior
      *
-     * @param player The player
-     * @return The {@link IBaritone} instance.
+     * @return The {@link IMemoryBehavior} instance
      */
-    default IBaritone getBaritoneForPlayer(EntityPlayerSP player) {
-        for (IBaritone baritone : getAllBaritones()) {
-            if (player.equals(baritone.getPlayerContext().player())) {
-                return baritone;
-            }
-        }
-        return null;
-    }
+    IMemoryBehavior getMemoryBehavior();
 
     /**
-     * Returns the {@link IWorldScanner} instance. This is not a type returned by
-     * {@link IBaritone} implementation, because it is not linked with {@link IBaritone}.
+     * @see IMineBehavior
      *
-     * @return The {@link IWorldScanner} instance.
+     * @return The {@link IMineBehavior} instance
+     */
+    IMineBehavior getMineBehavior();
+
+    /**
+     * @see IPathingBehavior
+     *
+     * @return The {@link IPathingBehavior} instance
+     */
+    IPathingBehavior getPathingBehavior();
+
+    /**
+     * @see IWorldProvider
+     *
+     * @return The {@link IWorldProvider} instance
+     */
+    IWorldProvider getWorldProvider();
+
+    /**
+     * @see IWorldScanner
+     *
+     * @return The {@link IWorldScanner} instance
      */
     IWorldScanner getWorldScanner();
+
+    /**
+     * Registers a {@link IGameEventListener} with Baritone's "event bus".
+     *
+     * @param listener The listener
+     */
+    void registerEventListener(IGameEventListener listener);
 }

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

@@ -17,96 +17,68 @@
 
 package baritone.api;
 
-import baritone.api.utils.SettingsUtil;
-import baritone.api.utils.TypeUtils;
-import net.minecraft.block.Block;
 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.reflect.Field;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
 import java.util.*;
 import java.util.List;
 import java.util.function.Consumer;
 
 /**
- * Baritone's settings. Settings apply to all Baritone instances.
+ * Baritone's settings
  *
  * @author leijurv
  */
-public final class Settings {
+public class Settings {
 
     /**
      * Allow Baritone to break blocks
      */
-    public final Setting<Boolean> allowBreak = new Setting<>(true);
+    public Setting<Boolean> allowBreak = new Setting<>(true);
 
     /**
      * Allow Baritone to sprint
      */
-    public final Setting<Boolean> allowSprint = new Setting<>(true);
+    public Setting<Boolean> allowSprint = new Setting<>(true);
 
     /**
      * Allow Baritone to place blocks
      */
-    public final Setting<Boolean> allowPlace = new Setting<>(true);
-
-    /**
-     * Allow Baritone to move items in your inventory to your hotbar
-     */
-    public final Setting<Boolean> allowInventory = new Setting<>(false);
+    public Setting<Boolean> allowPlace = 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.
-     * <p>
-     * Decrease to make Baritone more often consider paths that would require placing blocks
+     * because we want to generally conserve blocks which might be limited
      */
-    public final Setting<Double> blockPlacementPenalty = new Setting<>(20D);
+    public Setting<Double> blockPlacementPenalty = new Setting<>(20D);
 
     /**
      * This is just a tiebreaker to make it less likely to break blocks if it can avoid it.
      * For example, fire has a break cost of 0, this makes it nonzero, so all else being equal
      * it will take an otherwise equivalent route that doesn't require it to put out fire.
      */
-    public final Setting<Double> blockBreakAdditionalPenalty = new Setting<>(2D);
-
-    /**
-     * Additional penalty for hitting the space bar (ascend, pillar, or parkour) because it uses hunger
-     */
-    public final Setting<Double> jumpPenalty = new Setting<>(2D);
-
-    /**
-     * Walking on water uses up hunger really quick, so penalize it
-     */
-    public final Setting<Double> walkOnWaterOnePenalty = new Setting<>(3D);
+    public Setting<Double> blockBreakAdditionalPenalty = new Setting<>(2D);
 
     /**
      * Allow Baritone to fall arbitrary distances and place a water bucket beneath it.
      * Reliability: questionable.
      */
-    public final Setting<Boolean> allowWaterBucketFall = new Setting<>(true);
+    public Setting<Boolean> allowWaterBucketFall = new Setting<>(true);
 
     /**
      * 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.
      */
-    public final Setting<Boolean> assumeWalkOnWater = new Setting<>(false);
-
-    /**
-     * If you have Fire Resistance and Jesus then I guess you could turn this on lol
-     */
-    public final Setting<Boolean> assumeWalkOnLava = new Setting<>(false);
+    public Setting<Boolean> assumeWalkOnWater = new Setting<>(false);
 
     /**
      * Assume step functionality; don't jump on an Ascend.
      */
-    public final Setting<Boolean> assumeStep = new Setting<>(false);
+    public Setting<Boolean> assumeStep = new Setting<>(false);
 
     /**
      * Assume safe walk functionality; don't sneak on a backplace traverse.
@@ -115,121 +87,45 @@ public final class Settings {
      * it won't sneak right click, it'll just right click, which means it'll open the chest instead of placing
      * against it. That's why this defaults to off.
      */
-    public final Setting<Boolean> assumeSafeWalk = new Setting<>(false);
-
-    /**
-     * If true, parkour is allowed to make jumps when standing on blocks at the maximum height, so player feet is y=256
-     * <p>
-     * Defaults to false because this fails on constantiam. Please let me know if this is ever disabled. Please.
-     */
-    public final Setting<Boolean> allowJumpAt256 = new Setting<>(false);
-
-    /**
-     * Allow descending diagonally
-     * <p>
-     * Safer than allowParkour yet still slightly unsafe, can make contact with unchecked adjacent blocks, so it's unsafe in the nether.
-     * <p>
-     * For a generic "take some risks" mode I'd turn on this one, parkour, and parkour place.
-     */
-    public final Setting<Boolean> allowDiagonalDescend = new Setting<>(false);
-
-    /**
-     * Allow mining the block directly beneath its feet
-     * <p>
-     * Turn this off to force it to make more staircases and less shafts
-     */
-    public final Setting<Boolean> allowDownward = new Setting<>(true);
+    public Setting<Boolean> assumeSafeWalk = new Setting<>(false);
 
     /**
      * 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(
-            Blocks.DIRT.asItem(),
-            Blocks.COBBLESTONE.asItem(),
-            Blocks.NETHERRACK.asItem(),
-            Blocks.STONE.asItem()
+    public Setting<List<Item>> acceptableThrowawayItems = new Setting<>(new ArrayList<>(Arrays.asList(
+            Item.getItemFromBlock(Blocks.DIRT),
+            Item.getItemFromBlock(Blocks.COBBLESTONE),
+            Item.getItemFromBlock(Blocks.NETHERRACK)
     )));
 
-    /**
-     * Blocks that Baritone will attempt to avoid (Used in avoidance)
-     */
-    public final Setting<List<Block>> blocksToAvoid = new Setting<>(new ArrayList<>(
-            // Leave Empty by Default
-    ));
-
-    /**
-     * Blocks that Baritone is not allowed to break
-     */
-    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.CHEST,
-            Blocks.TRAPPED_CHEST
-    )));
-
-    /**
-     * If this setting is true, Baritone will never break a block that is adjacent to an unsupported falling block.
-     * <p>
-     * I.E. it will never trigger cascading sand / gravel falls
-     */
-    public final Setting<Boolean> avoidUpdatingFallingBlocks = new Setting<>(true);
-
     /**
      * Enables some more advanced vine features. They're honestly just gimmicks and won't ever be needed in real
      * pathing scenarios. And they can cause Baritone to get trapped indefinitely in a strange scenario.
-     * <p>
-     * Never turn this on lol
      */
-    public final Setting<Boolean> allowVines = new Setting<>(false);
+    public Setting<Boolean> allowVines = new Setting<>(false);
 
     /**
      * Slab behavior is complicated, disable this for higher path reliability. Leave enabled if you have bottom slabs
      * everywhere in your base.
      */
-    public final Setting<Boolean> allowWalkOnBottomSlab = new Setting<>(true);
+    public Setting<Boolean> allowWalkOnBottomSlab = new Setting<>(true);
 
     /**
      * You know what it is
      * <p>
      * But it's very unreliable and falls off when cornering like all the time so.
-     * <p>
-     * It also overshoots the landing pretty much always (making contact with the next block over), so be careful
      */
-    public final Setting<Boolean> allowParkour = new Setting<>(false);
+    public Setting<Boolean> allowParkour = new Setting<>(false);
 
     /**
-     * Actually pretty reliable.
-     * <p>
-     * Doesn't make it any more dangerous compared to just normal allowParkour th
+     * Like parkour, but even more unreliable!
      */
-    public final Setting<Boolean> allowParkourPlace = new Setting<>(false);
+    public Setting<Boolean> allowParkourPlace = new Setting<>(false);
 
     /**
      * For example, if you have Mining Fatigue or Haste, adjust the costs of breaking blocks accordingly.
      */
-    public final Setting<Boolean> considerPotionEffects = new Setting<>(true);
-
-    /**
-     * Sprint and jump a block early on ascends wherever possible
-     */
-    public final Setting<Boolean> sprintAscends = new Setting<>(true);
-
-    /**
-     * If we overshoot a traverse and end up one block beyond the destination, mark it as successful anyway.
-     * <p>
-     * This helps with speed at >=20m/s
-     */
-    public final Setting<Boolean> overshootTraverse = new Setting<>(true);
-
-    /**
-     * When breaking blocks for a movement, wait until all falling blocks have settled before continuing
-     */
-    public final Setting<Boolean> pauseMiningForFallingBlocks = new Setting<>(true);
-
-    /**
-     * How many ticks between right clicks are allowed. Default in game is 4
-     */
-    public final Setting<Integer> rightClickSpeed = new Setting<>(4);
+    public Setting<Boolean> considerPotionEffects = new Setting<>(true);
 
     /**
      * This is the big A* setting.
@@ -246,139 +142,95 @@ public final class Settings {
      * <p>
      * Finding the optimal path is worth it, so it's the default.
      */
-    public final Setting<Double> costHeuristic = new Setting<>(3.563);
+    public Setting<Double> costHeuristic = new Setting<>(3.5D);
 
     // a bunch of obscure internal A* settings that you probably don't want to change
     /**
      * The maximum number of times it will fetch outside loaded or cached chunks before assuming that
      * pathing has reached the end of the known area, and should therefore stop.
      */
-    public final Setting<Integer> pathingMaxChunkBorderFetch = new Setting<>(50);
+    public Setting<Integer> pathingMaxChunkBorderFetch = new Setting<>(50);
 
     /**
      * Set to 1.0 to effectively disable this feature
      *
      * @see <a href="https://github.com/cabaletta/baritone/issues/18">Issue #18</a>
      */
-    public final Setting<Double> backtrackCostFavoringCoefficient = new Setting<>(0.5);
-
-    /**
-     * Toggle the following 4 settings
-     * <p>
-     * They have a noticeable performance impact, so they default off
-     * <p>
-     * Specifically, building up the avoidance map on the main thread before pathing starts actually takes a noticeable
-     * amount of time, especially when there are a lot of mobs around, and your game jitters for like 200ms while doing so
-     */
-    public final Setting<Boolean> avoidance = new Setting<>(false);
-
-    /**
-     * Set to 1.0 to effectively disable this feature
-     * <p>
-     * Set below 1.0 to go out of your way to walk near mob spawners
-     */
-    public final Setting<Double> mobSpawnerAvoidanceCoefficient = new Setting<>(2.0);
-
-    public final Setting<Integer> mobSpawnerAvoidanceRadius = new Setting<>(16);
-
-    /**
-     * Set to 1.0 to effectively disable this feature
-     * <p>
-     * Set below 1.0 to go out of your way to walk near mobs
-     */
-    public final Setting<Double> mobAvoidanceCoefficient = new Setting<>(1.5);
-
-    public final Setting<Integer> mobAvoidanceRadius = new Setting<>(8);
-
-    /**
-     * When running a goto towards a container block (chest, ender chest, furnace, etc),
-     * right click and open it once you arrive.
-     */
-    public final Setting<Boolean> rightClickContainerOnArrival = new Setting<>(true);
-
-    /**
-     * When running a goto towards a nether portal block, walk all the way into the portal
-     * instead of stopping one block before.
-     */
-    public final Setting<Boolean> enterPortal = new Setting<>(true);
+    public Setting<Double> backtrackCostFavoringCoefficient = new Setting<>(0.5);
 
     /**
      * Don't repropagate cost improvements below 0.01 ticks. They're all just floating point inaccuracies,
      * and there's no point.
      */
-    public final Setting<Boolean> minimumImprovementRepropagation = new Setting<>(true);
+    public Setting<Boolean> minimumImprovementRepropagation = new Setting<>(true);
 
     /**
      * After calculating a path (potentially through cached chunks), artificially cut it off to just the part that is
      * entirely within currently loaded chunks. Improves path safety because cached chunks are heavily simplified.
-     * <p>
-     * This is much safer to leave off now, and makes pathing more efficient. More explanation in the issue.
      *
-     * @see <a href="https://github.com/cabaletta/baritone/issues/114">Issue #114</a>
+     * @see <a href="https://github.com/cabaletta/baritone/issues/144">Issue #144</a>
      */
-    public final Setting<Boolean> cutoffAtLoadBoundary = new Setting<>(false);
+    public Setting<Boolean> cutoffAtLoadBoundary = new Setting<>(false);
 
     /**
      * If a movement's cost increases by more than this amount between calculation and execution (due to changes
      * in the environment / world), cancel and recalculate
      */
-    public final Setting<Double> maxCostIncrease = new Setting<>(10D);
+    public Setting<Double> maxCostIncrease = new Setting<>(10D);
 
     /**
      * Stop 5 movements before anything that made the path COST_INF.
      * For example, if lava has spread across the path, don't walk right up to it then recalculate, it might
      * still be spreading lol
      */
-    public final Setting<Integer> costVerificationLookahead = new Setting<>(5);
+    public Setting<Integer> costVerificationLookahead = new Setting<>(5);
 
     /**
      * Static cutoff factor. 0.9 means cut off the last 10% of all paths, regardless of chunk load state
      */
-    public final Setting<Double> pathCutoffFactor = new Setting<>(0.9);
+    public Setting<Double> pathCutoffFactor = new Setting<>(0.9);
 
     /**
      * Only apply static cutoff for paths of at least this length (in terms of number of movements)
      */
-    public final Setting<Integer> pathCutoffMinimumLength = new Setting<>(30);
+    public Setting<Integer> pathCutoffMinimumLength = new Setting<>(30);
 
     /**
      * Start planning the next path once the remaining movements tick estimates sum up to less than this value
      */
-    public final Setting<Integer> planningTickLookahead = new Setting<>(150);
+    public Setting<Integer> planningTickLookAhead = new Setting<>(150);
 
     /**
      * Default size of the Long2ObjectOpenHashMap used in pathing
      */
-    public final Setting<Integer> pathingMapDefaultSize = new Setting<>(1024);
+    public Setting<Integer> pathingMapDefaultSize = new Setting<>(1024);
 
     /**
      * Load factor coefficient for the Long2ObjectOpenHashMap used in pathing
      * <p>
      * Decrease for faster map operations, but higher memory usage
      */
-    public final Setting<Float> pathingMapLoadFactor = new Setting<>(0.75f);
+    public Setting<Float> pathingMapLoadFactor = new Setting<>(0.75f);
 
     /**
      * How far are you allowed to fall onto solid ground (without a water bucket)?
      * 3 won't deal any damage. But if you just want to get down the mountain quickly and you have
      * Feather Falling IV, you might set it a bit higher, like 4 or 5.
      */
-    public final Setting<Integer> maxFallHeightNoWater = new Setting<>(3);
+    public Setting<Integer> maxFallHeightNoWater = new Setting<>(3);
 
     /**
      * How far are you allowed to fall onto solid ground (with a water bucket)?
      * It's not that reliable, so I've set it below what would kill an unarmored player (23)
      */
-    public final Setting<Integer> maxFallHeightBucket = new Setting<>(20);
+    public Setting<Integer> maxFallHeightBucket = new Setting<>(20);
 
     /**
      * Is it okay to sprint through a descend followed by a diagonal?
      * The player overshoots the landing, but not enough to fall off. And the diagonal ensures that there isn't
      * lava or anything that's !canWalkInto in that space, so it's technically safe, just a little sketchy.
-     * <p>
-     * Note: this is *not* related to the allowDiagonalDescend setting, that is a completely different thing.
      */
-    public final Setting<Boolean> allowOvershootDiagonalDescend = new Setting<>(true);
+    public Setting<Boolean> allowOvershootDiagonalDescend = new Setting<>(true);
 
     /**
      * If your goal is a GoalBlock in an unloaded chunk, assume it's far enough away that the Y coord
@@ -387,152 +239,104 @@ public final class Settings {
      * of considering the Y coord. The reasoning is that if your X and Z are 10,000 blocks away,
      * your Y coordinate's accuracy doesn't matter at all until you get much much closer.
      */
-    public final Setting<Boolean> simplifyUnloadedYCoord = new Setting<>(true);
+    public Setting<Boolean> simplifyUnloadedYCoord = new Setting<>(true);
 
     /**
      * If a movement takes this many ticks more than its initial cost estimate, cancel it
      */
-    public final Setting<Integer> movementTimeoutTicks = new Setting<>(100);
+    public Setting<Integer> movementTimeoutTicks = new Setting<>(100);
 
     /**
-     * Pathing ends after this amount of time, but only if a path has been found
-     * <p>
-     * If no valid path (length above the minimum) has been found, pathing continues up until the failure timeout
+     * Pathing can never take longer than this
      */
-    public final Setting<Long> primaryTimeoutMS = new Setting<>(500L);
+    public Setting<Long> pathTimeoutMS = new Setting<>(2000L);
 
     /**
-     * Pathing can never take longer than this, even if that means failing to find any path at all
+     * Planning ahead while executing a segment can never take longer than this
      */
-    public final Setting<Long> failureTimeoutMS = new Setting<>(2000L);
-
-    /**
-     * Planning ahead while executing a segment ends after this amount of time, but only if a path has been found
-     * <p>
-     * If no valid path (length above the minimum) has been found, pathing continues up until the failure timeout
-     */
-    public final Setting<Long> planAheadPrimaryTimeoutMS = new Setting<>(4000L);
-
-    /**
-     * Planning ahead while executing a segment can never take longer than this, even if that means failing to find any path at all
-     */
-    public final Setting<Long> planAheadFailureTimeoutMS = new Setting<>(5000L);
+    public Setting<Long> planAheadTimeoutMS = new Setting<>(4000L);
 
     /**
      * For debugging, consider nodes much much slower
      */
-    public final Setting<Boolean> slowPath = new Setting<>(false);
+    public Setting<Boolean> slowPath = new Setting<>(false);
 
     /**
      * Milliseconds between each node
      */
-    public final Setting<Long> slowPathTimeDelayMS = new Setting<>(100L);
+    public Setting<Long> slowPathTimeDelayMS = new Setting<>(100L);
 
     /**
      * The alternative timeout number when slowPath is on
      */
-    public final Setting<Long> slowPathTimeoutMS = new Setting<>(40000L);
+    public Setting<Long> slowPathTimeoutMS = new Setting<>(40000L);
 
     /**
      * The big one. Download all chunks in simplified 2-bit format and save them for better very-long-distance pathing.
      */
-    public final Setting<Boolean> chunkCaching = new Setting<>(true);
-
-    /**
-     * On save, delete from RAM any cached regions that are more than 1024 blocks away from the player
-     * <p>
-     * Temporarily disabled
-     * <p>
-     * Temporarily reenabled
-     *
-     * @see <a href="https://github.com/cabaletta/baritone/issues/248">Issue #248</a>
-     */
-    public final Setting<Boolean> pruneRegionsFromRAM = new Setting<>(true);
-
-    /**
-     * Remember the contents of containers (chests, echests, furnaces)
-     * <p>
-     * Really buggy since the packet stuff is multithreaded badly thanks to brady
-     */
-    public final Setting<Boolean> containerMemory = new Setting<>(false);
-
-    /**
-     * Fill in blocks behind you
-     */
-    public final Setting<Boolean> backfill = new Setting<>(false);
+    public Setting<Boolean> chunkCaching = new Setting<>(true);
 
     /**
      * Print all the debug messages to chat
      */
-    public final Setting<Boolean> chatDebug = new Setting<>(false);
+    public Setting<Boolean> chatDebug = new Setting<>(true);
 
     /**
      * Allow chat based control of Baritone. Most likely should be disabled when Baritone is imported for use in
      * something else
      */
-    public final Setting<Boolean> chatControl = new Setting<>(true);
+    public Setting<Boolean> chatControl = new Setting<>(true);
 
     /**
      * A second override over chatControl to force it on
      */
-    public final Setting<Boolean> removePrefix = new Setting<>(false);
+    public Setting<Boolean> removePrefix = new Setting<>(false);
 
     /**
      * Render the path
      */
-    public final Setting<Boolean> renderPath = new Setting<>(true);
+    public Setting<Boolean> renderPath = new Setting<>(true);
 
     /**
      * Render the goal
      */
-    public final Setting<Boolean> renderGoal = new Setting<>(true);
-
-    /**
-     * Render selection boxes
-     */
-    public final Setting<Boolean> renderSelectionBoxes = new Setting<>(true);
+    public Setting<Boolean> renderGoal = new Setting<>(true);
 
     /**
      * Ignore depth when rendering the goal
      */
-    public final Setting<Boolean> renderGoalIgnoreDepth = new Setting<>(true);
-
-    /**
-     * Renders X/Z type Goals with the vanilla beacon beam effect. Combining this with
-     * {@link #renderGoalIgnoreDepth} will cause strange render clipping.
-     */
-    public final Setting<Boolean> renderGoalXZBeacon = new Setting<>(false);
+    public Setting<Boolean> renderGoalIgnoreDepth = new Setting<>(false);
 
     /**
      * Ignore depth when rendering the selection boxes (to break, to place, to walk into)
      */
-    public final Setting<Boolean> renderSelectionBoxesIgnoreDepth = new Setting<>(true);
+    public Setting<Boolean> renderSelectionBoxesIgnoreDepth = new Setting<>(false);
 
     /**
      * Ignore depth when rendering the path
      */
-    public final Setting<Boolean> renderPathIgnoreDepth = new Setting<>(true);
+    public Setting<Boolean> renderPathIgnoreDepth = new Setting<>(false);
 
     /**
      * Line width of the path when rendered, in pixels
      */
-    public final Setting<Float> pathRenderLineWidthPixels = new Setting<>(5F);
+    public Setting<Float> pathRenderLineWidthPixels = new Setting<>(5F);
 
     /**
      * Line width of the goal when rendered, in pixels
      */
-    public final Setting<Float> goalRenderLineWidthPixels = new Setting<>(3F);
+    public Setting<Float> goalRenderLineWidthPixels = new Setting<>(3F);
 
     /**
      * Start fading out the path at 20 movements ahead, and stop rendering it entirely 30 movements ahead.
      * Improves FPS.
      */
-    public final Setting<Boolean> fadePath = new Setting<>(false);
+    public Setting<Boolean> fadePath = new Setting<>(false);
 
     /**
      * Move without having to force the client-sided rotations
      */
-    public final Setting<Boolean> freeLook = new Setting<>(true);
+    public Setting<Boolean> freeLook = new Setting<>(true);
 
     /**
      * Will cause some minor behavioral differences to ensure that Baritone works on anticheats.
@@ -540,159 +344,42 @@ public final class Settings {
      * At the moment this will silently set the player's rotations when using freeLook so you're not sprinting in
      * directions other than forward, which is picken up by more "advanced" anticheats like AAC, but not NCP.
      */
-    public final Setting<Boolean> antiCheatCompatibility = new Setting<>(true);
+    public Setting<Boolean> antiCheatCompatibility = new Setting<>(true);
 
     /**
      * Exclusively use cached chunks for pathing
-     * <p>
-     * Never turn this on
      */
-    public final Setting<Boolean> pathThroughCachedOnly = new Setting<>(false);
-
-    /**
-     * Continue sprinting while in water
-     */
-    public final Setting<Boolean> sprintInWater = new Setting<>(true);
-
-    /**
-     * 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 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.
-     */
-    public final Setting<Boolean> blacklistClosestOnFailure = new Setting<>(true);
-
-    /**
-     * 😎 Render cached chunks as semitransparent. Doesn't work with OptiFine 😭 Rarely randomly crashes, see <a href="https://github.com/cabaletta/baritone/issues/327">this issue</a>.
-     * <p>
-     * Can be very useful on servers with low render distance. After enabling, you may need to reload the world in order for it to have an effect
-     * (e.g. disconnect and reconnect, enter then exit the nether, die and respawn, etc). This may literally kill your FPS and CPU because
-     * every chunk gets recompiled twice as much as normal, since the cached version comes into range, then the normal one comes from the server for real.
-     * <p>
-     * Note that flowing water is cached as AVOID, which is rendered as lava. As you get closer, you may therefore see lava falls being replaced with water falls.
-     * <p>
-     * SOLID is rendered as stone in the overworld, netherrack in the nether, and end stone in the end
-     */
-    public final Setting<Boolean> renderCachedChunks = new Setting<>(false);
-
-    /**
-     * 0.0f = not visible, fully transparent (instead of setting this to 0, turn off renderCachedChunks)
-     * 1.0f = fully opaque
-     */
-    public final Setting<Float> cachedChunksOpacity = new Setting<>(0.5f);
+    public Setting<Boolean> pathThroughCachedOnly = new Setting<>(false);
 
     /**
      * Whether or not to use the "#" command prefix
      */
-    public final Setting<Boolean> prefixControl = new Setting<>(true);
+    public Setting<Boolean> prefix = new Setting<>(false);
+
+    /**
+     * {@code true}: can mine blocks when in inventory, chat, or tabbed away in ESC menu
+     * <p>
+     * {@code false}: works on cosmic prisons
+     * <p>
+     * LOL
+     */
+    public Setting<Boolean> leftClickWorkaround = new Setting<>(true);
 
     /**
      * Don't stop walking forward when you need to break blocks in your way
      */
-    public final Setting<Boolean> walkWhileBreaking = new Setting<>(true);
-
-    /**
-     * When a new segment is calculated that doesn't overlap with the current one, but simply begins where the current segment ends,
-     * splice it on and make a longer combined path. If this setting is off, any planned segment will not be spliced and will instead
-     * be the "next path" in PathingBehavior, and will only start after this one ends. Turning this off hurts planning ahead,
-     * because the next segment will exist even if it's very short.
-     *
-     * @see #planningTickLookahead
-     */
-    public final Setting<Boolean> splicePath = new Setting<>(true);
-
-    /**
-     * If we are more than 300 movements into the current path, discard the oldest segments, as they are no longer useful
-     */
-    public final Setting<Integer> maxPathHistoryLength = new Setting<>(300);
-
-    /**
-     * If the current path is too long, cut off this many movements from the beginning.
-     */
-    public final Setting<Integer> pathHistoryCutoffAmount = new Setting<>(50);
+    public Setting<Boolean> walkWhileBreaking = new Setting<>(true);
 
     /**
      * Rescan for the goal once every 5 ticks.
      * Set to 0 to disable.
      */
-    public final Setting<Integer> mineGoalUpdateInterval = new Setting<>(5);
-
-    /**
-     * After finding this many instances of the target block in the cache, it will stop expanding outward the chunk search.
-     */
-    public final Setting<Integer> maxCachedWorldScanCount = new Setting<>(10);
-
-    /**
-     * 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);
-
-    /**
-     * While exploring the world, offset the closest unloaded chunk by this much in both axes.
-     * <p>
-     * This can result in more efficient loading, if you set this to the render distance.
-     */
-    public final Setting<Integer> worldExploringChunkOffset = new Setting<>(0);
-
-    /**
-     * Take the 10 closest chunks, even if they aren't strictly tied for distance metric from origin.
-     */
-    public final Setting<Integer> exploreChunkSetMinimumSize = new Setting<>(10);
-
-    /**
-     * Attempt to maintain Y coordinate while exploring
-     * <p>
-     * -1 to disable
-     */
-    public final Setting<Integer> exploreMaintainY = new Setting<>(64);
-
-    /**
-     * Replant nether wart while farming
-     */
-    public final Setting<Boolean> replantNetherWart = new Setting<>(false);
-
-    /**
-     * When the cache scan gives less blocks than the maximum threshold (but still above zero), scan the main world too.
-     * <p>
-     * Only if you have a beefy CPU and automatically mine blocks that are in cache
-     */
-    public final Setting<Boolean> extendCacheOnThreshold = new Setting<>(false);
-
-    /**
-     * Don't consider the next layer in builder until the current one is done
-     */
-    public final Setting<Boolean> buildInLayers = new Setting<>(false);
-
-    /**
-     * false = build from bottom to top
-     * <p>
-     * true = build from top to bottom
-     */
-    public final Setting<Boolean> layerOrder = 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));
-
-    /**
-     * Allow standing above a block while mining it, in BuilderProcess
-     * <p>
-     * Experimental
-     */
-    public final Setting<Boolean> breakFromAbove = new Setting<>(false);
-
-    /**
-     * As well as breaking from above, set a goal to up and to the side of all blocks to break.
-     * <p>
-     * Never turn this on without also turning on breakFromAbove.
-     */
-    public final Setting<Boolean> goalBreakFromAbove = new Setting<>(false);
+    public Setting<Integer> mineGoalUpdateInterval = 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);
+    public Setting<Boolean> mineScanDroppedItems = new Setting<>(true);
 
     /**
      * Cancel the current path if the goal has changed, and the path originally ended in the goal but doesn't anymore.
@@ -707,78 +394,54 @@ public final class Settings {
      * <p>
      * Also on cosmic prisons this should be set to true since you don't actually mine the ore it just gets replaced with stone.
      */
-    public final Setting<Boolean> cancelOnGoalInvalidation = new Setting<>(true);
+    public Setting<Boolean> cancelOnGoalInvalidation = new Setting<>(false);
 
     /**
      * The "axis" command (aka GoalAxis) will go to a axis, or diagonal axis, at this Y level.
      */
-    public final Setting<Integer> axisHeight = new Setting<>(120);
+    public Setting<Integer> axisHeight = new Setting<>(120);
 
     /**
-     * Disconnect from the server upon arriving at your goal
-     */
-    public final Setting<Boolean> disconnectOnArrival = new Setting<>(false);
-
-    /**
-     * Disallow MineBehavior from using X-Ray to see where the ores are. Turn this option on to force it to mine "legit"
+     * Allow MineBehavior to use X-Ray to see where the ores are. Turn this option off 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
+     * couldn't. If you don't want it to look like you're X-Raying, turn this off
      */
-    public final Setting<Boolean> legitMine = new Setting<>(false);
+    public Setting<Boolean> legitMine = new Setting<>(false);
 
     /**
      * What Y level to go to for legit strip mining
      */
-    public final Setting<Integer> legitMineYLevel = new Setting<>(11);
-
-    /**
-     * Magically see ores that are separated diagonally from existing ores. Basically like mining around the ores that it finds
-     * in case there's one there touching it diagonally, except it checks it un-legit-ly without having the mine blocks to see it.
-     * You can decide whether this looks plausible or not.
-     * <p>
-     * This is disabled because it results in some weird behavior. For example, it can """see""" the top block of a vein of iron_ore
-     * through a lava lake. This isn't an issue normally since it won't consider anything touching lava, so it just ignores it.
-     * However, this setting expands that and allows it to see the entire vein so it'll mine under the lava lake to get the iron that
-     * it can reach without mining blocks adjacent to lava. This really defeats the purpose of legitMine since a player could never
-     * do that lol, so thats one reason why its disabled
-     */
-    public final Setting<Boolean> legitMineIncludeDiagonals = new Setting<>(false);
+    public Setting<Integer> legitMineYLevel = new Setting<>(11);
 
     /**
      * When mining block of a certain type, try to mine two at once instead of one.
      * If the block above is also a goal block, set GoalBlock instead of GoalTwoBlocks
      * If the block below is also a goal block, set GoalBlock to the position one down instead of GoalTwoBlocks
      */
-    public final Setting<Boolean> forceInternalMining = new Setting<>(true);
+    public Setting<Boolean> forceInternalMining = new Setting<>(true);
 
     /**
      * Modification to the previous setting, only has effect if forceInternalMining is true
      * If true, only apply the previous setting if the block adjacent to the goal isn't air.
      */
-    public final Setting<Boolean> internalMiningAirException = new Setting<>(true);
+    public Setting<Boolean> internalMiningAirException = new Setting<>(true);
 
     /**
      * The actual GoalNear is set this distance away from the entity you're following
      * <p>
      * For example, set followOffsetDistance to 5 and followRadius to 0 to always stay precisely 5 blocks north of your follow target.
      */
-    public final Setting<Double> followOffsetDistance = new Setting<>(0D);
+    public Setting<Double> followOffsetDistance = new Setting<>(0D);
 
     /**
-     * The actual GoalNear is set in this direction from the entity you're following. This value is in degrees.
+     * The actual GoalNear is set in this direction from the entity you're following
      */
-    public final Setting<Float> followOffsetDirection = new Setting<>(0F);
+    public Setting<Float> followOffsetDirection = new Setting<>(0F);
 
     /**
      * The radius (for the GoalNear) of how close to your target position you actually have to be
      */
-    public final Setting<Integer> followRadius = new Setting<>(3);
-
-    /**
-     * Turn this on if your exploration filter is enormous, you don't want it to check if it's done,
-     * and you are just fine with it just hanging on completion
-     */
-    public final Setting<Boolean> disableCompletionCheck = new Setting<>(false);
+    public Setting<Integer> followRadius = new Setting<>(3);
 
     /**
      * Cached chunks (regardless of if they're in RAM or saved to disk) expire and are deleted after this number of seconds
@@ -800,60 +463,54 @@ public final class Settings {
      * has to build up that cache from scratch. But after it's gone through an area just once, the next time will have zero
      * backtracking, since the entire area is now known and cached.
      */
-    public final Setting<Long> cachedChunksExpirySeconds = new Setting<>(-1L);
+    public Setting<Long> cachedChunksExpirySeconds = new Setting<>(-1L);
 
     /**
      * The function that is called when Baritone will log to chat. This function can be added to
      * via {@link Consumer#andThen(Consumer)} or it can completely be overriden via setting
      * {@link Setting#value};
      */
-    public final Setting<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
-     */
-    public final Setting<Double> yLevelBoxSize = new Setting<>(15D);
+    public Setting<Consumer<ITextComponent>> logger = new Setting<>(Minecraft.getMinecraft().ingameGUI.getChatGUI()::printChatMessage);
 
     /**
      * The color of the current path
      */
-    public final Setting<Color> colorCurrentPath = new Setting<>(Color.RED);
+    public Setting<Color> colorCurrentPath = new Setting<>(Color.RED);
 
     /**
      * The color of the next path
      */
-    public final Setting<Color> colorNextPath = new Setting<>(Color.MAGENTA);
+    public Setting<Color> colorNextPath = new Setting<>(Color.MAGENTA);
 
     /**
      * The color of the blocks to break
      */
-    public final Setting<Color> colorBlocksToBreak = new Setting<>(Color.RED);
+    public Setting<Color> colorBlocksToBreak = new Setting<>(Color.RED);
 
     /**
      * The color of the blocks to place
      */
-    public final Setting<Color> colorBlocksToPlace = new Setting<>(Color.GREEN);
+    public Setting<Color> colorBlocksToPlace = new Setting<>(Color.GREEN);
 
     /**
      * The color of the blocks to walk into
      */
-    public final Setting<Color> colorBlocksToWalkInto = new Setting<>(Color.MAGENTA);
+    public Setting<Color> colorBlocksToWalkInto = new Setting<>(Color.MAGENTA);
 
     /**
      * The color of the best path so far
      */
-    public final Setting<Color> colorBestPathSoFar = new Setting<>(Color.BLUE);
+    public Setting<Color> colorBestPathSoFar = new Setting<>(Color.BLUE);
 
     /**
      * The color of the path to the most recent considered node
      */
-    public final Setting<Color> colorMostRecentConsidered = new Setting<>(Color.CYAN);
+    public Setting<Color> colorMostRecentConsidered = new Setting<>(Color.CYAN);
 
     /**
      * The color of the goal box
      */
-    public final Setting<Color> colorGoalBox = new Setting<>(Color.GREEN);
-
+    public Setting<Color> colorGoalBox = new Setting<>(Color.GREEN);
 
     /**
      * A map of lowercase setting field names to their respective setting
@@ -865,12 +522,11 @@ public final class Settings {
      */
     public final List<Setting<?>> allSettings;
 
-    public final Map<Setting<?>, Type> settingTypes;
-
-    public final class Setting<T> {
+    public class Setting<T> {
         public T value;
         public final T defaultValue;
         private String name;
+        private final Class<T> klass;
 
         @SuppressWarnings("unchecked")
         private Setting(T value) {
@@ -879,16 +535,12 @@ public final class Settings {
             }
             this.value = value;
             this.defaultValue = value;
+            this.klass = (Class<T>) value.getClass();
         }
 
-        /**
-         * Deprecated! Please use .value directly instead
-         *
-         * @return the current setting value
-         */
-        @Deprecated
-        public final T get() {
-            return value;
+        @SuppressWarnings("unchecked")
+        public final <K extends T> K get() {
+            return (K) value;
         }
 
         public final String getName() {
@@ -896,24 +548,11 @@ public final class Settings {
         }
 
         public Class<T> getValueClass() {
-            // noinspection unchecked
-            return (Class<T>) TypeUtils.resolveBaseClass(getType());
+            return klass;
         }
 
-        @Override
         public String toString() {
-            return SettingsUtil.settingToString(this);
-        }
-
-        /**
-         * Reset this setting to its default value
-         */
-        public void reset() {
-            value = defaultValue;
-        }
-
-        public final Type getType() {
-            return settingTypes.get(this);
+            return name + ": " + value;
         }
     }
 
@@ -921,11 +560,8 @@ public final class Settings {
 
     Settings() {
         Field[] temp = getClass().getFields();
-
-        Map<String, Setting<?>> tmpByName = new HashMap<>();
+        HashMap<String, Setting<?>> tmpByName = new HashMap<>();
         List<Setting<?>> tmpAll = new ArrayList<>();
-        Map<Setting<?>, Type> tmpSettingTypes = new HashMap<>();
-
         try {
             for (Field field : temp) {
                 if (field.getType().equals(Setting.class)) {
@@ -938,7 +574,6 @@ public final class Settings {
                     }
                     tmpByName.put(name, setting);
                     tmpAll.add(setting);
-                    tmpSettingTypes.put(setting, ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0]);
                 }
             }
         } catch (IllegalAccessException e) {
@@ -946,7 +581,6 @@ public final class Settings {
         }
         byLowerName = Collections.unmodifiableMap(tmpByName);
         allSettings = Collections.unmodifiableList(tmpAll);
-        settingTypes = Collections.unmodifiableMap(tmpSettingTypes);
     }
 
     @SuppressWarnings("unchecked")

src/api/java/baritone/api/behavior/IBehavior.java

@@ -18,13 +18,10 @@
 package baritone.api.behavior;
 
 import baritone.api.event.listener.AbstractGameEventListener;
-import baritone.api.event.listener.IGameEventListener;
+import baritone.api.utils.interfaces.Toggleable;
 
 /**
- * A behavior is simply a type that is able to listen to events.
- *
  * @author Brady
- * @see IGameEventListener
  * @since 9/23/2018
  */
-public interface IBehavior extends AbstractGameEventListener {}
+public interface IBehavior extends AbstractGameEventListener, Toggleable {}

src/api/java/baritone/api/behavior/IFollowBehavior.java

@@ -15,37 +15,30 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.process;
+package baritone.api.behavior;
 
 import net.minecraft.entity.Entity;
 
-import java.util.List;
-import java.util.function.Predicate;
-
 /**
  * @author Brady
  * @since 9/23/2018
  */
-public interface IFollowProcess extends IBaritoneProcess {
+public interface IFollowBehavior extends IBehavior {
 
     /**
-     * Set the follow target to any entities matching this predicate
+     * Set the follow target to the specified entity;
      *
-     * @param filter the predicate
+     * @param entity The entity to follow
      */
-    void follow(Predicate<Entity> filter);
+    void follow(Entity entity);
 
     /**
-     * @return The entities that are currently being followed. null if not currently following, empty if nothing matches the predicate
+     * @return The entity that is currently being followed
      */
-    List<Entity> following();
-
-    Predicate<Entity> currentFilter();
+    Entity following();
 
     /**
      * Cancels the follow behavior, this will clear the current follow target.
      */
-    default void cancel() {
-        onLostControl();
-    }
+    void cancel();
 }

src/api/java/baritone/api/behavior/ILookBehavior.java

@@ -33,7 +33,7 @@ public interface ILookBehavior extends IBehavior {
      * otherwise, it should be {@code false};
      *
      * @param rotation The target rotations
-     * @param force    Whether or not to "force" the rotations
+     * @param force Whether or not to "force" the rotations
      */
     void updateTarget(Rotation rotation, boolean force);
 }

src/api/java/baritone/api/behavior/IMemoryBehavior.java

@@ -15,8 +15,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.cache;
+package baritone.api.behavior;
 
+import baritone.api.behavior.memory.IRememberedInventory;
 import net.minecraft.util.math.BlockPos;
 
 import java.util.Map;
@@ -25,7 +26,7 @@ import java.util.Map;
  * @author Brady
  * @since 9/23/2018
  */
-public interface IContainerMemory {
+public interface IMemoryBehavior extends IBehavior {
 
     /**
      * Gets a remembered inventory by its block position.

src/api/java/baritone/api/behavior/IMineBehavior.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.process;
+package baritone.api.behavior;
 
 import net.minecraft.block.Block;
 
@@ -23,7 +23,7 @@ import net.minecraft.block.Block;
  * @author Brady
  * @since 9/23/2018
  */
-public interface IMineProcess extends IBaritoneProcess {
+public interface IMineBehavior extends IBehavior {
 
     /**
      * Begin to search for and mine the specified blocks until
@@ -31,9 +31,9 @@ public interface IMineProcess extends IBaritoneProcess {
      * are mined. This is based on the first target block to mine.
      *
      * @param quantity The number of items to get from blocks mined
-     * @param blocks   The blocks to mine
+     * @param blocks The blocks to mine
      */
-    void mineByName(int quantity, String... blocks);
+    void mine(int quantity, String... blocks);
 
     /**
      * Begin to search for and mine the specified blocks until
@@ -41,7 +41,7 @@ public interface IMineProcess extends IBaritoneProcess {
      * are mined. This is based on the first target block to mine.
      *
      * @param quantity The number of items to get from blocks mined
-     * @param blocks   The blocks to mine
+     * @param blocks The blocks to mine
      */
     void mine(int quantity, Block... blocks);
 
@@ -50,8 +50,8 @@ public interface IMineProcess extends IBaritoneProcess {
      *
      * @param blocks The blocks to mine
      */
-    default void mineByName(String... blocks) {
-        mineByName(0, blocks);
+    default void mine(String... blocks) {
+        this.mine(0, blocks);
     }
 
     /**
@@ -60,13 +60,11 @@ public interface IMineProcess extends IBaritoneProcess {
      * @param blocks The blocks to mine
      */
     default void mine(Block... blocks) {
-        mine(0, blocks);
+        this.mine(0, blocks);
     }
 
     /**
      * Cancels the current mining task
      */
-    default void cancel() {
-        onLostControl();
-    }
+    void cancel();
 }

src/api/java/baritone/api/behavior/IPathingBehavior.java

@@ -37,55 +37,37 @@ public interface IPathingBehavior extends IBehavior {
      *
      * @return The estimated remaining ticks in the current segment.
      */
-    default Optional<Double> ticksRemainingInSegment() {
-        return ticksRemainingInSegment(true);
-    }
+    Optional<Double> ticksRemainingInSegment();
 
     /**
-     * Returns the estimated remaining ticks in the current pathing
-     * segment. Given that the return type is an optional, {@link Optional#empty()}
-     * will be returned in the case that there is no current segment being pathed.
+     * Sets the pathing goal.
      *
-     * @param includeCurrentMovement whether or not to include the entirety of the cost of the currently executing movement in the total
-     * @return The estimated remaining ticks in the current segment.
+     * @param goal The pathing goal
      */
-    default Optional<Double> ticksRemainingInSegment(boolean includeCurrentMovement) {
-        IPathExecutor current = getCurrent();
-        if (current == null) {
-            return Optional.empty();
-        }
-        int start = includeCurrentMovement ? current.getPosition() : current.getPosition() + 1;
-        return Optional.of(current.getPath().ticksRemainingFrom(start));
-    }
+    void setGoal(Goal goal);
 
     /**
      * @return The current pathing goal
      */
     Goal getGoal();
 
+    /**
+     * Begins pathing. Calculation will start in a new thread, and once completed,
+     * movement will commence. Returns whether or not the operation was successful.
+     *
+     * @return Whether or not the operation was successful
+     */
+    boolean path();
+
     /**
      * @return Whether or not a path is currently being executed.
      */
-    default boolean isPathing() {
-        return getCurrent() != null;
-    }
+    boolean isPathing();
 
     /**
-     * Cancels the pathing behavior or the current path calculation, and all processes that could be controlling path.
-     * <p>
-     * Basically, "MAKE IT STOP".
-     *
-     * @return Whether or not the pathing behavior was canceled. All processes are guaranteed to be canceled, but the
-     * PathingBehavior might be in the middle of an uncancelable action like a parkour jump
+     * Cancels the pathing behavior or the current path calculation.
      */
-    boolean cancelEverything();
-
-    /**
-     * PLEASE never call this
-     * <p>
-     * If cancelEverything was like "kill" this is "sudo kill -9". Or shutting off your computer.
-     */
-    void forceCancel();
+    void cancel();
 
     /**
      * Returns the current path, from the current path executor, if there is one.
@@ -99,7 +81,7 @@ public interface IPathingBehavior extends IBehavior {
     /**
      * @return The current path finder being executed
      */
-    Optional<? extends IPathFinder> getInProgress();
+    Optional<IPathFinder> getPathFinder();
 
     /**
      * @return The current path executor

src/api/java/baritone/api/behavior/memory/IRememberedInventory.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.cache;
+package baritone.api.behavior.memory;
 
 import net.minecraft.item.ItemStack;
 

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

@@ -22,7 +22,7 @@ import net.minecraft.util.math.BlockPos;
 
 /**
  * @author Brady
- * @since 8/4/2018
+ * @since 8/4/2018 2:01 AM
  */
 public interface IBlockTypeAccess {
 

src/api/java/baritone/api/cache/ICachedRegion.java

@@ -29,20 +29,21 @@ public interface ICachedRegion extends IBlockTypeAccess {
      * however, the block coordinates should in on a scale from 0 to 511 (inclusive)
      * because region sizes are 512x512 blocks.
      *
+     * @see ICachedWorld#isCached(int, int)
+     *
      * @param blockX The block X coordinate
      * @param blockZ The block Z coordinate
      * @return Whether or not the specified XZ location is cached
-     * @see ICachedWorld#isCached(int, int)
      */
     boolean isCached(int blockX, int blockZ);
 
     /**
-     * @return The X coordinate of this region
+     * The X coordinate of this region
      */
     int getX();
 
     /**
-     * @return The Z coordinate of this region
+     * The Z coordinate of this region
      */
     int getZ();
 }

src/api/java/baritone/api/cache/ICachedWorld.java

@@ -20,7 +20,7 @@ package baritone.api.cache;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.chunk.Chunk;
 
-import java.util.ArrayList;
+import java.util.LinkedList;
 
 /**
  * @author Brady
@@ -61,14 +61,12 @@ public interface ICachedWorld {
      * information that is returned by this method may not be up to date, because
      * older cached chunks can contain data that is much more likely to have changed.
      *
-     * @param block               The special block to search for
-     * @param maximum             The maximum number of position results to receive
-     * @param centerX             The x block coordinate center of the search
-     * @param centerZ             The z block coordinate center of the search
+     * @param block The special block to search for
+     * @param maximum The maximum number of position results to receive
      * @param maxRegionDistanceSq The maximum region distance, squared
      * @return The locations found that match the special block
      */
-    ArrayList<BlockPos> getLocationsOf(String block, int maximum, int centerX, int centerZ, int maxRegionDistanceSq);
+    LinkedList<BlockPos> getLocationsOf(String block, int maximum, int maxRegionDistanceSq);
 
     /**
      * Reloads all of the cached regions in this world from disk. Anything that is not saved
@@ -81,6 +79,4 @@ public interface ICachedWorld {
      * in a new thread by default.
      */
     void save();
-
-
 }

src/api/java/baritone/api/cache/IWaypointCollection.java

@@ -50,17 +50,19 @@ public interface IWaypointCollection {
     /**
      * Gets all of the waypoints that have the specified tag
      *
+     * @see IWaypointCollection#getAllWaypoints()
+     *
      * @param tag The tag
      * @return All of the waypoints with the specified tag
-     * @see IWaypointCollection#getAllWaypoints()
      */
     Set<IWaypoint> getByTag(IWaypoint.Tag tag);
 
     /**
      * Gets all of the waypoints in this collection, regardless of the tag.
      *
-     * @return All of the waypoints in this collection
      * @see IWaypointCollection#getByTag(IWaypoint.Tag)
+     *
+     * @return All of the waypoints in this collection
      */
     Set<IWaypoint> getAllWaypoints();
 }

src/api/java/baritone/api/cache/IWorldData.java

@@ -27,19 +27,13 @@ public interface IWorldData {
      * Returns the cached world for this world. A cached world is a simplified format
      * of a regular world, intended for use on multiplayer servers where chunks are not
      * traditionally stored to disk, allowing for long distance pathing with minimal disk usage.
-     *
-     * @return The cached world for this world
      */
     ICachedWorld getCachedWorld();
 
     /**
+     * Returns the waypoint collection for this world.
+     *
      * @return The waypoint collection for this world
      */
     IWaypointCollection getWaypoints();
-
-    /**
-     * @return The {@link IContainerMemory} instance
-     * @see IContainerMemory
-     */
-    IContainerMemory getContainerMemory();
 }

src/api/java/baritone/api/cache/IWorldScanner.java

@@ -17,10 +17,8 @@
 
 package baritone.api.cache;
 
-import baritone.api.utils.IPlayerContext;
 import net.minecraft.block.Block;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.ChunkPos;
 
 import java.util.List;
 
@@ -33,8 +31,6 @@ 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 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
@@ -42,19 +38,5 @@ public interface IWorldScanner {
      * @param maxSearchRadius The maximum chunk search radius
      * @return The matching block positions
      */
-    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 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.
-     * @return The matching block positions
-     */
-    List<BlockPos> scanChunk(IPlayerContext ctx, List<Block> blocks, ChunkPos pos, int max, int yLevelThreshold);
+    List<BlockPos> scanChunkRadius(List<Block> blocks, int max, int yLevelThreshold, int maxSearchRadius);
 }

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

@@ -20,7 +20,7 @@ package baritone.api.event.events;
 import net.minecraft.util.math.BlockPos;
 
 /**
- * Called when the local player interacts with a block, can be either {@link Type#START_BREAK} or {@link Type#USE}.
+ * Called when the local player interacts with a block, can be either {@link Type#BREAK} or {@link Type#USE}.
  *
  * @author Brady
  * @since 8/22/2018
@@ -59,9 +59,9 @@ public final class BlockInteractEvent {
     public enum Type {
 
         /**
-         * We're starting to break the target block.
+         * We're breaking the target block.
          */
-        START_BREAK,
+        BREAK,
 
         /**
          * We're right clicking on the target block. Either placing or interacting with.

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

@@ -17,20 +17,22 @@
 
 package baritone.api.event.events;
 
-import baritone.api.event.events.type.Cancellable;
+import baritone.api.event.events.type.ManagedPlayerEvent;
+import net.minecraft.client.entity.EntityPlayerSP;
 
 /**
  * @author Brady
- * @since 8/1/2018
+ * @since 8/1/2018 6:39 PM
  */
-public final class ChatEvent extends Cancellable {
+public final class ChatEvent extends ManagedPlayerEvent.Cancellable {
 
     /**
      * The message being sent
      */
     private final String message;
 
-    public ChatEvent(String message) {
+    public ChatEvent(EntityPlayerSP player, String message) {
+        super(player);
         this.message = message;
     }
 

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

@@ -21,7 +21,7 @@ import baritone.api.event.events.type.EventState;
 
 /**
  * @author Brady
- * @since 8/2/2018
+ * @since 8/2/2018 12:32 AM
  */
 public final class ChunkEvent {
 
@@ -31,9 +31,7 @@ public final class ChunkEvent {
     private final EventState state;
 
     /**
-     * The type of chunk event that occurred
-     *
-     * @see Type
+     * The type of chunk event that occurred;
      */
     private final Type type;
 
@@ -96,16 +94,7 @@ public final class ChunkEvent {
 
         /**
          * When the chunk is being populated with blocks, tile entities, etc.
-         * <p>
-         * And it's a full chunk
          */
-        POPULATE_FULL,
-
-        /**
-         * When the chunk is being populated with blocks, tile entities, etc.
-         * <p>
-         * And it's a partial chunk
-         */
-        POPULATE_PARTIAL
+        POPULATE
     }
 }

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

@@ -23,7 +23,7 @@ import net.minecraft.network.Packet;
 
 /**
  * @author Brady
- * @since 8/6/2018
+ * @since 8/6/2018 9:31 PM
  */
 public final class PacketEvent {
 

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

@@ -18,19 +18,22 @@
 package baritone.api.event.events;
 
 import baritone.api.event.events.type.EventState;
+import baritone.api.event.events.type.ManagedPlayerEvent;
+import net.minecraft.client.entity.EntityPlayerSP;
 
 /**
  * @author Brady
  * @since 8/21/2018
  */
-public final class PlayerUpdateEvent {
+public final class PlayerUpdateEvent extends ManagedPlayerEvent {
 
     /**
      * The state of the event
      */
     private final EventState state;
 
-    public PlayerUpdateEvent(EventState state) {
+    public PlayerUpdateEvent(EntityPlayerSP player, EventState state) {
+        super(player);
         this.state = state;
     }
 

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

@@ -19,7 +19,7 @@ package baritone.api.event.events;
 
 /**
  * @author Brady
- * @since 8/5/2018
+ * @since 8/5/2018 12:28 AM
  */
 public final class RenderEvent {
 

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

@@ -17,6 +17,9 @@
 
 package baritone.api.event.events;
 
+import baritone.api.event.events.type.EventState;
+import baritone.api.event.events.type.ManagedPlayerEvent;
+import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 
@@ -24,7 +27,7 @@ import net.minecraft.entity.EntityLivingBase;
  * @author Brady
  * @since 8/21/2018
  */
-public final class RotationMoveEvent {
+public final class RotationMoveEvent extends ManagedPlayerEvent {
 
     /**
      * The type of event
@@ -32,29 +35,21 @@ public final class RotationMoveEvent {
     private final Type type;
 
     /**
-     * The yaw rotation
+     * The state of the event
      */
-    private float yaw;
+    private final EventState state;
 
-    public RotationMoveEvent(Type type, float yaw) {
+    public RotationMoveEvent(EntityPlayerSP player, EventState state, Type type) {
+        super(player);
+        this.state = state;
         this.type = type;
-        this.yaw = yaw;
     }
 
     /**
-     * Set the yaw movement rotation
-     *
-     * @param yaw Yaw rotation
+     * @return The state of the event
      */
-    public final void setYaw(float yaw) {
-        this.yaw = yaw;
-    }
-
-    /**
-     * @return The yaw rotation
-     */
-    public final float getYaw() {
-        return this.yaw;
+    public final EventState getState() {
+        return this.state;
     }
 
     /**

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

@@ -1,35 +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;
-
-/**
- * @author Brady
- * @since 1/18/2019
- */
-public final class SprintStateEvent {
-
-    private Boolean state;
-
-    public final void setState(boolean state) {
-        this.state = state;
-    }
-
-    public final Boolean getState() {
-        return this.state;
-    }
-}

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

@@ -22,7 +22,7 @@ import net.minecraft.client.multiplayer.WorldClient;
 
 /**
  * @author Brady
- * @since 8/4/2018
+ * @since 8/4/2018 3:13 AM
  */
 public final class WorldEvent {
 

src/api/java/baritone/api/event/events/type/Cancellable.java

@@ -19,7 +19,7 @@ package baritone.api.event.events.type;
 
 /**
  * @author Brady
- * @since 8/1/2018
+ * @since 8/1/2018 6:41 PM
  */
 public class Cancellable implements ICancellable {
 

src/api/java/baritone/api/event/events/type/EventState.java

@@ -19,17 +19,19 @@ package baritone.api.event.events.type;
 
 /**
  * @author Brady
- * @since 8/2/2018
+ * @since 8/2/2018 12:34 AM
  */
 public enum EventState {
 
     /**
-     * Before the dispatching of what the event is targetting
+     * Indicates that whatever movement the event is being
+     * dispatched as a result of is about to occur.
      */
     PRE,
 
     /**
-     * After the dispatching of what the event is targetting
+     * Indicates that whatever movement the event is being
+     * dispatched as a result of has already occurred.
      */
     POST
 }

src/api/java/baritone/api/event/events/type/ManagedPlayerEvent.java

@@ -0,0 +1,61 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.api.event.events.type;
+
+import net.minecraft.client.entity.EntityPlayerSP;
+
+/**
+ * An event that has a reference to a locally managed player.
+ *
+ * @author Brady
+ * @since 10/11/2018
+ */
+public class ManagedPlayerEvent {
+
+    protected final EntityPlayerSP player;
+
+    public ManagedPlayerEvent(EntityPlayerSP player) {
+        this.player = player;
+    }
+
+    public final EntityPlayerSP getPlayer() {
+        return this.player;
+    }
+
+    public static class Cancellable extends ManagedPlayerEvent implements ICancellable {
+
+        /**
+         * Whether or not this event has been cancelled
+         */
+        private boolean cancelled;
+
+        public Cancellable(EntityPlayerSP player) {
+            super(player);
+        }
+
+        @Override
+        public final void cancel() {
+            this.cancelled = true;
+        }
+
+        @Override
+        public final boolean isCancelled() {
+            return this.cancelled;
+        }
+    }
+}

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

@@ -26,7 +26,7 @@ import baritone.api.event.events.*;
  *
  * @author Brady
  * @see IGameEventListener
- * @since 8/1/2018
+ * @since 8/1/2018 6:29 PM
  */
 public interface AbstractGameEventListener extends IGameEventListener {
 
@@ -36,6 +36,9 @@ public interface AbstractGameEventListener extends IGameEventListener {
     @Override
     default void onPlayerUpdate(PlayerUpdateEvent event) {}
 
+    @Override
+    default void onProcessKeyBinds() {}
+
     @Override
     default void onSendChatMessage(ChatEvent event) {}
 
@@ -57,9 +60,6 @@ public interface AbstractGameEventListener extends IGameEventListener {
     @Override
     default void onPlayerRotationMove(RotationMoveEvent event) {}
 
-    @Override
-    default void onPlayerSprintState(SprintStateEvent event) {}
-
     @Override
     default void onBlockInteract(BlockInteractEvent event) {}
 

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

@@ -1,36 +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.listener;
-
-/**
- * A type of {@link IGameEventListener} that can have additional listeners
- * registered so that they receive the events that are dispatched to this
- * listener.
- *
- * @author Brady
- * @since 11/14/2018
- */
-public interface IEventBus extends IGameEventListener {
-
-    /**
-     * Registers the specified {@link IGameEventListener} to this event bus
-     *
-     * @param listener The listener
-     */
-    void registerEventListener(IGameEventListener listener);
-}

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

@@ -18,24 +18,28 @@
 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.gui.GuiScreen;
 import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.renderer.EntityRenderer;
+import net.minecraft.client.settings.GameSettings;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.network.NetworkManager;
 import net.minecraft.network.Packet;
+import net.minecraft.util.text.ITextComponent;
 
 /**
  * @author Brady
- * @since 7/31/2018
+ * @since 7/31/2018 11:05 PM
  */
 public interface IGameEventListener {
 
     /**
      * Run once per game tick before screen input is handled.
      *
-     * @param event The event
      * @see Minecraft#runTick()
      */
     void onTick(TickEvent event);
@@ -43,15 +47,20 @@ public interface IGameEventListener {
     /**
      * Run once per game tick from before and after the player rotation is sent to the server.
      *
-     * @param event The event
-     * @see EntityPlayerSP#tick()
+     * @see EntityPlayerSP#onUpdate()
      */
     void onPlayerUpdate(PlayerUpdateEvent event);
 
+    /**
+     * Run once per game tick from before keybinds are processed.
+     *
+     * @see Minecraft#processKeyBinds()
+     */
+    void onProcessKeyBinds();
+
     /**
      * Runs whenever the client player sends a message to the server.
      *
-     * @param event The event
      * @see EntityPlayerSP#sendChatMessage(String)
      */
     void onSendChatMessage(ChatEvent event);
@@ -59,38 +68,41 @@ public interface IGameEventListener {
     /**
      * Runs before and after whenever a chunk is either loaded, unloaded, or populated.
      *
-     * @param event The event
+     * @see WorldClient#doPreChunk(int, int, boolean)
      */
     void onChunkEvent(ChunkEvent event);
 
     /**
-     * Runs once per world render pass.
+     * 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
      *
-     * @param event The event
+     * @see EntityRenderer#renderWorldPass(int, float, long)
      */
     void onRenderPass(RenderEvent event);
 
     /**
      * Runs before and after whenever a new world is loaded
      *
-     * @param event The event
-     * @see Minecraft#loadWorld(WorldClient, GuiScreen)
+     * @see Minecraft#loadWorld(WorldClient, String)
      */
     void onWorldEvent(WorldEvent event);
 
     /**
      * Runs before a outbound packet is sent
      *
-     * @param event The event
+     * @see NetworkManager#dispatchPacket(Packet, GenericFutureListener[])
      * @see Packet
+     * @see GenericFutureListener
      */
     void onSendPacket(PacketEvent event);
 
     /**
      * Runs before an inbound packet is processed
      *
-     * @param event The event
+     * @see NetworkManager#dispatchPacket(Packet, GenericFutureListener[])
      * @see Packet
+     * @see GenericFutureListener
      */
     void onReceivePacket(PacketEvent event);
 
@@ -98,37 +110,31 @@ public interface IGameEventListener {
      * Run once per game tick from before and after the player's moveRelative method is called
      * and before and after the player jumps.
      *
-     * @param event The event
      * @see Entity#moveRelative(float, float, float, float)
+     * @see EntityLivingBase#jump()
      */
     void onPlayerRotationMove(RotationMoveEvent event);
 
-    /**
-     * Called whenever the sprint keybind state is checked in {@link EntityPlayerSP#livingTick}
-     *
-     * @param event The event
-     * @see EntityPlayerSP#livingTick()
-     */
-    void onPlayerSprintState(SprintStateEvent event);
-
     /**
      * Called when the local player interacts with a block, whether it is breaking or opening/placing.
      *
-     * @param event The event
+     * @see Minecraft#clickMouse()
+     * @see Minecraft#rightClickMouse()
      */
     void onBlockInteract(BlockInteractEvent event);
 
     /**
      * Called when the local player dies, as indicated by the creation of the {@link GuiGameOver} screen.
      *
-     * @see GuiGameOver
+     * @see GuiGameOver(ITextComponent)
+     * @see ITextComponent
      */
     void onPlayerDeath();
 
     /**
      * When the pathfinder's state changes
      *
-     * @param event The event
+     * @param event
      */
     void onPathEvent(PathEvent event);
 }

src/api/java/baritone/api/pathing/calc/IPath.java

@@ -22,7 +22,6 @@ import baritone.api.pathing.goals.Goal;
 import baritone.api.pathing.movement.IMovement;
 import baritone.api.utils.BetterBlockPos;
 
-import java.util.HashSet;
 import java.util.List;
 
 /**
@@ -51,12 +50,8 @@ public interface IPath {
     /**
      * This path is actually going to be executed in the world. Do whatever additional processing is required.
      * (as opposed to Path objects that are just constructed every frame for rendering)
-     *
-     * @return The result of path post processing
      */
-    default IPath postProcess() {
-        throw new UnsupportedOperationException();
-    }
+    default void postProcess() {}
 
     /**
      * Returns the number of positions in this path. Equivalent to {@code positions().size()}.
@@ -120,60 +115,23 @@ public interface IPath {
     /**
      * Cuts off this path at the loaded chunk border, and returns the resulting path. Default
      * implementation just returns this path, without the intended functionality.
-     * <p>
-     * The argument is supposed to be a BlockStateInterface LOL LOL LOL LOL LOL
      *
-     * @param bsi The block state lookup, highly cursed
      * @return The result of this cut-off operation
      */
-    default IPath cutoffAtLoadedChunks(Object bsi) {
-        throw new UnsupportedOperationException();
+    default IPath cutoffAtLoadedChunks() {
+        return this;
     }
 
     /**
      * Cuts off this path using the min length and cutoff factor settings, and returns the resulting path.
      * Default implementation just returns this path, without the intended functionality.
      *
-     * @param destination The end goal of this path
-     * @return The result of this cut-off operation
      * @see Settings#pathCutoffMinimumLength
      * @see Settings#pathCutoffFactor
+     *
+     * @return The result of this cut-off operation
      */
     default IPath staticCutoff(Goal destination) {
-        throw new UnsupportedOperationException();
-    }
-
-
-    /**
-     * Performs a series of checks to ensure that the assembly of the path went as expected.
-     */
-    default void sanityCheck() {
-        List<BetterBlockPos> path = positions();
-        List<IMovement> movements = movements();
-        if (!getSrc().equals(path.get(0))) {
-            throw new IllegalStateException("Start node does not equal first path element");
-        }
-        if (!getDest().equals(path.get(path.size() - 1))) {
-            throw new IllegalStateException("End node does not equal last path element");
-        }
-        if (path.size() != movements.size() + 1) {
-            throw new IllegalStateException("Size of path array is unexpected");
-        }
-        HashSet<BetterBlockPos> seenSoFar = new HashSet<>();
-        for (int i = 0; i < path.size() - 1; i++) {
-            BetterBlockPos src = path.get(i);
-            BetterBlockPos dest = path.get(i + 1);
-            IMovement movement = movements.get(i);
-            if (!src.equals(movement.getSrc())) {
-                throw new IllegalStateException("Path source is not equal to the movement source");
-            }
-            if (!dest.equals(movement.getDest())) {
-                throw new IllegalStateException("Path destination is not equal to the movement destination");
-            }
-            if (seenSoFar.contains(src)) {
-                throw new IllegalStateException("Path doubles back on itself, making a loop");
-            }
-            seenSoFar.add(src);
-        }
+        return this;
     }
 }

src/api/java/baritone/api/pathing/calc/IPathFinder.java

@@ -18,7 +18,6 @@
 package baritone.api.pathing.calc;
 
 import baritone.api.pathing.goals.Goal;
-import baritone.api.utils.PathCalculationResult;
 
 import java.util.Optional;
 
@@ -34,11 +33,9 @@ public interface IPathFinder {
     /**
      * Calculate the path in full. Will take several seconds.
      *
-     * @param primaryTimeout If a path is found, the path finder will stop after this amount of time
-     * @param failureTimeout If a path isn't found, the path finder will continue for this amount of time
      * @return The final path
      */
-    PathCalculationResult calculate(long primaryTimeout, long failureTimeout);
+    Optional<IPath> calculate(long timeout);
 
     /**
      * Intended to be called concurrently with calculatePath from a different thread to tell if it's finished yet

src/api/java/baritone/api/pathing/calc/IPathingControlManager.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.pathing.calc;
-
-import baritone.api.process.IBaritoneProcess;
-import baritone.api.process.PathingCommand;
-
-import java.util.Optional;
-
-/**
- * @author leijurv
- */
-public interface IPathingControlManager {
-
-    /**
-     * Registers a process with this pathing control manager. See {@link IBaritoneProcess} for more details.
-     *
-     * @param process The process
-     * @see IBaritoneProcess
-     */
-    void registerProcess(IBaritoneProcess process);
-
-    /**
-     * @return The most recent {@link IBaritoneProcess} that had control
-     */
-    Optional<IBaritoneProcess> mostRecentInControl();
-
-    /**
-     * @return The most recent pathing command executed
-     */
-    Optional<PathingCommand> mostRecentCommand();
-}

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

@@ -30,9 +30,6 @@ public interface Goal {
      * Returns whether or not the specified position
      * meets the requirement for this goal based.
      *
-     * @param x The goal X position
-     * @param y The goal Y position
-     * @param z The goal Z position
      * @return Whether or not it satisfies this goal
      */
     boolean isInGoal(int x, int y, int z);
@@ -40,9 +37,6 @@ public interface Goal {
     /**
      * Estimate the number of ticks it will take to get to the goal
      *
-     * @param x The goal X position
-     * @param y The goal Y position
-     * @param z The goal Z position
      * @return The estimate number of ticks to satisfy the goal
      */
     double heuristic(int x, int y, int z);

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

@@ -25,7 +25,7 @@ public class GoalAxis implements Goal {
 
     @Override
     public boolean isInGoal(int x, int y, int z) {
-        return y == BaritoneAPI.getSettings().axisHeight.value && (x == 0 || z == 0 || Math.abs(x) == Math.abs(z));
+        return y == BaritoneAPI.getSettings().axisHeight.get() && (x == 0 || z == 0 || Math.abs(x) == Math.abs(z));
     }
 
     @Override
@@ -39,7 +39,7 @@ public class GoalAxis implements Goal {
 
         double flatAxisDistance = Math.min(x, Math.min(z, diff * SQRT_2_OVER_2));
 
-        return flatAxisDistance * BaritoneAPI.getSettings().costHeuristic.value + GoalYLevel.calculate(BaritoneAPI.getSettings().axisHeight.value, y);
+        return flatAxisDistance * BaritoneAPI.getSettings().costHeuristic.get() + GoalYLevel.calculate(BaritoneAPI.getSettings().axisHeight.get(), y);
     }
 
     @Override

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

@@ -30,17 +30,17 @@ public class GoalBlock implements Goal, IGoalRenderPos {
     /**
      * The X block position of this goal
      */
-    public final int x;
+    private final int x;
 
     /**
      * The Y block position of this goal
      */
-    public final int y;
+    private final int y;
 
     /**
      * The Z block position of this goal
      */
-    public final int z;
+    private final int z;
 
     public GoalBlock(BlockPos pos) {
         this(pos.getX(), pos.getY(), pos.getZ());

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

@@ -17,7 +17,10 @@
 
 package baritone.api.pathing.goals;
 
+import net.minecraft.util.math.BlockPos;
+
 import java.util.Arrays;
+import java.util.Collection;
 
 /**
  * A composite of many goals, any one of which satisfies the composite.
@@ -37,6 +40,14 @@ public class GoalComposite implements Goal {
         this.goals = goals;
     }
 
+    public GoalComposite(BlockPos... blocks) {
+        this(Arrays.asList(blocks));
+    }
+
+    public GoalComposite(Collection<BlockPos> blocks) {
+        this(blocks.stream().map(GoalBlock::new).toArray(Goal[]::new));
+    }
+
     @Override
     public boolean isInGoal(int x, int y, int z) {
         for (Goal goal : goals) {

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

@@ -28,9 +28,9 @@ import net.minecraft.util.math.BlockPos;
  */
 public class GoalGetToBlock implements Goal, IGoalRenderPos {
 
-    public final int x;
-    public final int y;
-    public final int z;
+    private final int x;
+    private final int y;
+    private final int z;
 
     public GoalGetToBlock(BlockPos pos) {
         this.x = pos.getX();
@@ -48,7 +48,10 @@ public class GoalGetToBlock implements Goal, IGoalRenderPos {
         int xDiff = x - this.x;
         int yDiff = y - this.y;
         int zDiff = z - this.z;
-        return Math.abs(xDiff) + Math.abs(yDiff < 0 ? yDiff + 1 : yDiff) + Math.abs(zDiff) <= 1;
+        if (yDiff < 0) {
+            yDiff++;
+        }
+        return Math.abs(xDiff) + Math.abs(yDiff) + Math.abs(zDiff) <= 1;
     }
 
     @Override
@@ -56,7 +59,7 @@ public class GoalGetToBlock implements Goal, IGoalRenderPos {
         int xDiff = x - this.x;
         int yDiff = y - this.y;
         int zDiff = z - this.z;
-        return GoalBlock.calculate(xDiff, yDiff < 0 ? yDiff + 1 : yDiff, zDiff);
+        return GoalBlock.calculate(xDiff, yDiff, zDiff);
     }
 
     @Override

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

@@ -61,6 +61,6 @@ public class GoalNear implements Goal, IGoalRenderPos {
                 ", y=" + y +
                 ", z=" + z +
                 ", rangeSq=" + rangeSq +
-                "}";
+                '}';
     }
 }

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

@@ -32,26 +32,16 @@ public class GoalRunAway implements Goal {
 
     private final double distanceSq;
 
-    private final Integer maintainY;
-
     public GoalRunAway(double distance, BlockPos... from) {
-        this(distance, null, from);
-    }
-
-    public GoalRunAway(double distance, Integer maintainY, BlockPos... from) {
         if (from.length == 0) {
             throw new IllegalArgumentException();
         }
         this.from = from;
         this.distanceSq = distance * distance;
-        this.maintainY = maintainY;
     }
 
     @Override
     public boolean isInGoal(int x, int y, int z) {
-        if (maintainY != null && maintainY != y) {
-            return false;
-        }
         for (BlockPos p : from) {
             int diffX = x - p.getX();
             int diffZ = z - p.getZ();
@@ -72,19 +62,11 @@ public class GoalRunAway implements Goal {
                 min = h;
             }
         }
-        min = -min;
-        if (maintainY != null) {
-            min = min * 0.6 + GoalYLevel.calculate(maintainY, y) * 1.5;
-        }
-        return min;
+        return -min;
     }
 
     @Override
     public String toString() {
-        if (maintainY != null) {
-            return "GoalRunAwayFromMaintainY y=" + maintainY + ", " + Arrays.asList(from);
-        } else {
-            return "GoalRunAwayFrom" + Arrays.asList(from);
-        }
+        return "GoalRunAwayFrom" + Arrays.asList(from);
     }
 }

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

@@ -1,75 +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.pathing.goals;
-
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.BlockPos;
-
-/**
- * Dig a tunnel in a certain direction, but if you have to deviate from the path, go back to where you started
- */
-public class GoalStrictDirection implements Goal {
-    public final int x;
-    public final int y;
-    public final int z;
-    public final int dx;
-    public final int dz;
-
-    public GoalStrictDirection(BlockPos origin, EnumFacing direction) {
-        x = origin.getX();
-        y = origin.getY();
-        z = origin.getZ();
-        dx = direction.getXOffset();
-        dz = direction.getZOffset();
-        if (dx == 0 && dz == 0) {
-            throw new IllegalArgumentException(direction + "");
-        }
-    }
-
-    @Override
-    public boolean isInGoal(int x, int y, int z) {
-        return false;
-    }
-
-    @Override
-    public double heuristic(int x, int y, int z) {
-        int distanceFromStartInDesiredDirection = (x - this.x) * dx + (z - this.z) * dz;
-
-        int distanceFromStartInIncorrectDirection = Math.abs((x - this.x) * dz) + Math.abs((z - this.z) * dx);
-
-        int verticalDistanceFromStart = Math.abs(y - this.y);
-
-        // we want heuristic to decrease as desiredDirection increases
-        double heuristic = -distanceFromStartInDesiredDirection * 100;
-
-        heuristic += distanceFromStartInIncorrectDirection * 1000;
-        heuristic += verticalDistanceFromStart * 1000;
-        return heuristic;
-    }
-
-    @Override
-    public String toString() {
-        return "GoalStrictDirection{" +
-                "x=" + x +
-                ", y=" + y +
-                ", z=" + z +
-                ", dx=" + dx +
-                ", dz=" + dz +
-                "}";
-    }
-}

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

@@ -31,17 +31,17 @@ public class GoalTwoBlocks implements Goal, IGoalRenderPos {
     /**
      * The X block position of this goal
      */
-    protected final int x;
+    private final int x;
 
     /**
      * The Y block position of this goal
      */
-    protected final int y;
+    private final int y;
 
     /**
      * The Z block position of this goal
      */
-    protected final int z;
+    private final int z;
 
     public GoalTwoBlocks(BlockPos pos) {
         this(pos.getX(), pos.getY(), pos.getZ());
@@ -63,7 +63,10 @@ public class GoalTwoBlocks implements Goal, IGoalRenderPos {
         int xDiff = x - this.x;
         int yDiff = y - this.y;
         int zDiff = z - this.z;
-        return GoalBlock.calculate(xDiff, yDiff < 0 ? yDiff + 1 : yDiff, zDiff);
+        if (yDiff < 0) {
+            yDiff++;
+        }
+        return GoalBlock.calculate(xDiff, yDiff, zDiff);
     }
 
     @Override

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

@@ -80,7 +80,7 @@ public class GoalXZ implements Goal {
             diagonal = z;
         }
         diagonal *= SQRT_2;
-        return (diagonal + straight) * BaritoneAPI.getSettings().costHeuristic.value; // big TODO tune
+        return (diagonal + straight) * BaritoneAPI.getSettings().costHeuristic.get(); // big TODO tune
     }
 
     public static GoalXZ fromDirection(Vec3d origin, float yaw, double distance) {

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

@@ -29,7 +29,7 @@ public class GoalYLevel implements Goal, ActionCosts {
     /**
      * The target Y level
      */
-    public final int level;
+    private final int level;
 
     public GoalYLevel(int level) {
         this.level = level;

src/api/java/baritone/api/pathing/movement/IMovement.java

@@ -20,6 +20,8 @@ package baritone.api.pathing.movement;
 import baritone.api.utils.BetterBlockPos;
 import net.minecraft.util.math.BlockPos;
 
+import java.util.List;
+
 /**
  * @author Brady
  * @since 10/8/2018
@@ -45,6 +47,10 @@ public interface IMovement {
      */
     boolean safeToCancel();
 
+    double recalculateCost();
+
+    double calculateCostWithoutCaching();
+
     boolean calculatedWhileLoaded();
 
     BetterBlockPos getSrc();
@@ -52,4 +58,10 @@ public interface IMovement {
     BetterBlockPos getDest();
 
     BlockPos getDirection();
+
+    List<BlockPos> toBreak();
+
+    List<BlockPos> toPlace();
+
+    List<BlockPos> toWalkInto();
 }

src/api/java/baritone/api/pathing/path/IPathExecutor.java

@@ -26,6 +26,4 @@ import baritone.api.pathing.calc.IPath;
 public interface IPathExecutor {
 
     IPath getPath();
-
-    int getPosition();
 }

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

@@ -1,114 +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.process;
-
-import baritone.api.behavior.IPathingBehavior;
-import baritone.api.event.events.PathEvent;
-
-/**
- * A process that can control the PathingBehavior.
- * <p>
- * Differences between a baritone process and a behavior:
- * <ul>
- * <li>Only one baritone process can be active at a time</li>
- * <li>PathingBehavior can only be controlled by a process</li>
- * </ul>
- * <p>
- * That's it actually
- *
- * @author leijurv
- */
-public interface IBaritoneProcess {
-
-    /**
-     * Default priority. Most normal processes should have this value.
-     * <p>
-     * Some examples of processes that should have different values might include some kind of automated mob avoidance
-     * that would be temporary and would forcefully take control. Same for something that pauses pathing for auto eat, etc.
-     * <p>
-     * The value is -1 beacuse that's what Impact 4.5's beta auto walk returns and I want to tie with it.
-     */
-    double DEFAULT_PRIORITY = -1;
-
-    /**
-     * Would this process like to be in control?
-     *
-     * @return Whether or not this process would like to be in contorl.
-     */
-    boolean isActive();
-
-    /**
-     * Called when this process is in control of pathing; Returns what Baritone should do.
-     *
-     * @param calcFailed     {@code true} if this specific process was in control last tick,
-     *                       and there was a {@link PathEvent#CALC_FAILED} event last tick
-     * @param isSafeToCancel {@code true} if a {@link PathingCommandType#REQUEST_PAUSE} would happen this tick, and
-     *                       {@link IPathingBehavior} wouldn't actually tick. {@code false} if the PathExecutor reported
-     *                       pausing would be unsafe at the end of the last tick. Effectively "could request cancel or
-     *                       pause and have it happen right away"
-     * @return What the {@link IPathingBehavior} should do
-     */
-    PathingCommand onTick(boolean calcFailed, boolean isSafeToCancel);
-
-    /**
-     * Returns whether or not this process should be treated as "temporary".
-     * <p>
-     * If a process is temporary, it doesn't call {@link #onLostControl} on the processes that aren't execute because of it.
-     * <p>
-     * For example, {@code CombatPauserProcess} and {@code PauseForAutoEatProcess} should return {@code true} always,
-     * and should return {@link #isActive} {@code true} only if there's something in range this tick, or if the player would like
-     * to start eating this tick. {@code PauseForAutoEatProcess} should only actually right click once onTick is called with
-     * {@code isSafeToCancel} true though.
-     *
-     * @return Whethor or not if this control is temporary
-     */
-    boolean isTemporary();
-
-    /**
-     * Called if {@link #isActive} returned {@code true}, but another non-temporary
-     * process has control. Effectively the same as cancel. You want control but you
-     * don't get it.
-     */
-    void onLostControl();
-
-    /**
-     * Used to determine which Process gains control if multiple are reporting {@link #isActive()}. The one
-     * that returns the highest value will be given control.
-     *
-     * @return A double representing the priority
-     */
-    default double priority() {
-        return DEFAULT_PRIORITY;
-    }
-
-    /**
-     * Returns a user-friendly name for this process. Suitable for a HUD.
-     *
-     * @return A display name that's suitable for a HUD
-     */
-    default String displayName() {
-        if (!isActive()) {
-            // i love it when impcat's scuffed HUD calls displayName for inactive processes for 1 tick too long
-            // causing NPEs when the displayname relies on fields that become null when inactive
-            return "INACTIVE";
-        }
-        return displayName0();
-    }
-
-    String displayName0();
-}

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

@@ -1,62 +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.process;
-
-import baritone.api.utils.ISchematic;
-import net.minecraft.client.Minecraft;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec3i;
-
-import java.io.File;
-
-/**
- * @author Brady
- * @since 1/15/2019
- */
-public interface IBuilderProcess extends IBaritoneProcess {
-
-    /**
-     * Requests a build for the specified schematic, labeled as specified, with the specified origin.
-     *
-     * @param name      A user-friendly name for the schematic
-     * @param schematic The object representation of the schematic
-     * @param origin    The origin position of the schematic being built
-     */
-    void build(String name, ISchematic schematic, Vec3i origin);
-
-    /**
-     * Requests a build for the specified schematic, labeled as specified, with the specified origin.
-     *
-     * @param name      A user-friendly name for the schematic
-     * @param schematic The file path of the schematic
-     * @param origin    The origin position of the schematic being built
-     * @return Whether or not the schematic was able to load from file
-     */
-    boolean build(String name, File schematic, Vec3i origin);
-
-    default boolean build(String schematicFile, BlockPos origin) {
-        File file = new File(new File(Minecraft.getInstance().gameDir, "schematics"), schematicFile);
-        return build(schematicFile, file, origin);
-    }
-
-    void pause();
-
-    void resume();
-
-    void clearArea(BlockPos corner1, BlockPos corner2);
-}

src/api/java/baritone/api/process/ICustomGoalProcess.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.process;
-
-import baritone.api.pathing.goals.Goal;
-
-public interface ICustomGoalProcess extends IBaritoneProcess {
-
-    /**
-     * Sets the pathing goal
-     *
-     * @param goal The new goal
-     */
-    void setGoal(Goal goal);
-
-    /**
-     * Starts path calculation and execution.
-     */
-    void path();
-
-    /**
-     * @return The current goal
-     */
-    Goal getGoal();
-
-    /**
-     * Sets the goal and begins the path execution.
-     *
-     * @param goal The new goal
-     */
-    default void setGoalAndPath(Goal goal) {
-        this.setGoal(goal);
-        this.path();
-    }
-}

src/api/java/baritone/api/process/IExploreProcess.java

@@ -1,26 +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.process;
-
-import java.nio.file.Path;
-
-public interface IExploreProcess extends IBaritoneProcess {
-    void explore(int centerX, int centerZ);
-
-    void applyJsonFilter(Path path, boolean invert) throws Exception;
-}

src/api/java/baritone/api/process/IGetToBlockProcess.java

@@ -1,30 +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.process;
-
-import net.minecraft.block.Block;
-
-/**
- * but it rescans the world every once in a while so it doesn't get fooled by its cache
- */
-public interface IGetToBlockProcess extends IBaritoneProcess {
-
-    void getToBlock(Block block);
-
-    boolean blacklistClosest();
-}

src/api/java/baritone/api/process/PathingCommand.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.process;
-
-import baritone.api.pathing.goals.Goal;
-
-import java.util.Objects;
-
-/**
- * @author leijurv
- */
-public class PathingCommand {
-
-    /**
-     * The target goal, may be {@code null}.
-     */
-    public final Goal goal;
-
-    /**
-     * The command type.
-     *
-     * @see PathingCommandType
-     */
-    public final PathingCommandType commandType;
-
-    /**
-     * Create a new {@link PathingCommand}.
-     *
-     * @param goal        The target goal, may be {@code null}.
-     * @param commandType The command type, cannot be {@code null}.
-     * @throws NullPointerException if {@code commandType} is {@code null}.
-     * @see Goal
-     * @see PathingCommandType
-     */
-    public PathingCommand(Goal goal, PathingCommandType commandType) {
-        Objects.requireNonNull(commandType);
-
-        this.goal = goal;
-        this.commandType = commandType;
-    }
-
-    @Override
-    public String toString() {
-        return commandType + " " + goal;
-    }
-}

src/api/java/baritone/api/process/PathingCommandType.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.process;
-
-import baritone.api.Settings;
-
-public enum PathingCommandType {
-
-    /**
-     * Set the goal and path.
-     * <p>
-     * If you use this alongside a {@code null} goal, it will continue along its current path and current goal.
-     */
-    SET_GOAL_AND_PATH,
-
-    /**
-     * Has no effect on the current goal or path, just requests a pause
-     */
-    REQUEST_PAUSE,
-
-    /**
-     * Set the goal (regardless of {@code null}), and request a cancel of the current path (when safe)
-     */
-    CANCEL_AND_SET_GOAL,
-
-    /**
-     * Set the goal and path.
-     * <p>
-     * If {@link Settings#cancelOnGoalInvalidation} is {@code true}, revalidate the
-     * current goal, and cancel if it's no longer valid, or if the new goal is {@code null}.
-     */
-    REVALIDATE_GOAL_AND_PATH,
-
-    /**
-     * Set the goal and path.
-     * <p>
-     * Cancel the current path if the goals are not equal
-     */
-    FORCE_REVALIDATE_GOAL_AND_PATH,
-
-    /**
-     * Go and ask the next process what to do
-     */
-    DEFER
-}

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

@@ -61,8 +61,6 @@ public final class BetterBlockPos extends BlockPos {
     }
 
     public static long longHash(int x, int y, int z) {
-        // TODO use the same thing as BlockPos.fromLong();
-        // invertibility would be incredibly useful
         /*
          *   This is the hashcode implementation of Vec3i (the superclass of the class which I shall not name)
          *

src/api/java/baritone/api/utils/BlockUtils.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.utils;
-
-import net.minecraft.block.Block;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.registry.IRegistry;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-public class BlockUtils {
-    private static transient Map<String, Block> resourceCache = new HashMap<>();
-
-    public static String blockToString(Block block) {
-        ResourceLocation loc = IRegistry.BLOCK.getKey(block);
-        String name = loc.getPath(); // normally, only write the part after the minecraft:
-        if (!loc.getNamespace().equals("minecraft")) {
-            // Baritone is running on top of forge with mods installed, perhaps?
-            name = loc.toString(); // include the namespace with the colon
-        }
-        return name;
-    }
-
-    public static Block stringToBlockRequired(String name) {
-        if (name.equals("lit_redstone_ore")) { // workaround for Impact 4.6 only
-            return stringToBlockRequired("redstone_ore");
-        }
-        Block block = stringToBlockNullable(name);
-        Objects.requireNonNull(block);
-        return block;
-    }
-
-    public static Block stringToBlockNullable(String name) {
-        // do NOT just replace this with a computeWithAbsent, it isn't thread safe
-        Block block = resourceCache.get(name); // map is never mutated in place so this is safe
-        if (block != null) {
-            return block;
-        }
-        if (resourceCache.containsKey(name)) {
-            return null; // cached as null
-        }
-        block = IRegistry.BLOCK.get(ResourceLocation.tryCreate(name.contains(":") ? name : "minecraft:" + name));
-        Map<String, Block> copy = new HashMap<>(resourceCache); // read only copy is safe, wont throw concurrentmodification
-        copy.put(name, block);
-        resourceCache = copy;
-        return block;
-    }
-
-    private BlockUtils() {}
-}

src/api/java/baritone/api/utils/ExampleBaritoneControl.java

@@ -1,716 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.utils;
-
-import baritone.api.BaritoneAPI;
-import baritone.api.IBaritone;
-import baritone.api.Settings;
-import baritone.api.behavior.IPathingBehavior;
-import baritone.api.cache.IRememberedInventory;
-import baritone.api.cache.IWaypoint;
-import baritone.api.cache.Waypoint;
-import baritone.api.event.events.ChatEvent;
-import baritone.api.event.listener.AbstractGameEventListener;
-import baritone.api.pathing.goals.*;
-import baritone.api.process.IBaritoneProcess;
-import baritone.api.process.ICustomGoalProcess;
-import baritone.api.process.IGetToBlockProcess;
-import net.minecraft.block.Block;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.ChunkProviderClient;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.chunk.Chunk;
-
-import java.nio.file.Path;
-import java.util.*;
-
-public class ExampleBaritoneControl implements Helper, AbstractGameEventListener {
-
-    private static final String HELP_MSG =
-            "baritone - Output settings into chat\n" +
-                    "settings - Same as baritone\n" +
-                    "goal - Create a goal (one number is '<Y>', two is '<X> <Z>', three is '<X> <Y> <Z>, 'clear' to clear)\n" +
-                    "path - Go towards goal\n" +
-                    "repack - (debug) Repacks chunk cache\n" +
-                    "rescan - (debug) Same as repack\n" +
-                    "axis - Paths towards the closest axis or diagonal axis, at y=120\n" +
-                    "cancel - Cancels current path\n" +
-                    "forcecancel - sudo cancel (only use if very glitched, try toggling 'pause' first)\n" +
-                    "gc - Calls System.gc();\n" +
-                    "invert - Runs away from the goal instead of towards it\n" +
-                    "follow - Follows a player 'follow username'\n" +
-                    "reloadall - (debug) Reloads chunk cache\n" +
-                    "saveall - (debug) Saves chunk cache\n" +
-                    "find - (debug) outputs how many blocks of a certain type are within the cache\n" +
-                    "mine - Paths to and mines specified blocks 'mine x_ore y_ore ...'\n" +
-                    "thisway - Creates a goal X blocks where you're facing\n" +
-                    "list - Lists waypoints under a category\n" +
-                    "get - Same as list\n" +
-                    "show - Same as list\n" +
-                    "save - Saves a waypoint (works but don't try to make sense of it)\n" +
-                    "goto - Paths towards specified block or waypoint\n" +
-                    "spawn - Paths towards world spawn or your most recent bed right-click\n" +
-                    "sethome - Sets \"home\"\n" +
-                    "home - Paths towards \"home\" \n" +
-                    "costs - (debug) all movement costs from current location\n" +
-                    "damn - Daniel\n" +
-                    "Go to https://github.com/cabaletta/baritone/blob/master/USAGE.md for more information";
-
-    private static final String COMMAND_PREFIX = "#";
-
-    public final IBaritone baritone;
-    public final IPlayerContext ctx;
-
-    public ExampleBaritoneControl(IBaritone baritone) {
-        this.baritone = baritone;
-        this.ctx = baritone.getPlayerContext();
-        baritone.getGameEventHandler().registerEventListener(this);
-    }
-
-    @Override
-    public void onSendChatMessage(ChatEvent event) {
-        String msg = event.getMessage();
-        if (BaritoneAPI.getSettings().prefixControl.value && msg.startsWith(COMMAND_PREFIX)) {
-            if (!runCommand(msg.substring(COMMAND_PREFIX.length()))) {
-                logDirect("Invalid command");
-            }
-            event.cancel(); // always cancel if using prefixControl
-            return;
-        }
-        if (!BaritoneAPI.getSettings().chatControl.value && !BaritoneAPI.getSettings().removePrefix.value) {
-            return;
-        }
-        if (runCommand(msg)) {
-            event.cancel();
-        }
-    }
-
-    public boolean runCommand(String msg0) { // you may think this can be private, but impcat calls it from .b =)
-        String msg = msg0.toLowerCase(Locale.US).trim(); // don't reassign the argument LOL
-        IPathingBehavior pathingBehavior = baritone.getPathingBehavior();
-        ICustomGoalProcess customGoalProcess = baritone.getCustomGoalProcess();
-        List<Settings.Setting<Boolean>> toggleable = BaritoneAPI.getSettings().getAllValuesByType(Boolean.class);
-        for (Settings.Setting<Boolean> setting : toggleable) {
-            if (msg.equalsIgnoreCase(setting.getName())) {
-                setting.value ^= true;
-                logDirect("Toggled " + setting.getName() + " to " + setting.value);
-                SettingsUtil.save(BaritoneAPI.getSettings());
-                return true;
-            }
-        }
-        if (msg.equals("baritone") || msg.equals("modifiedsettings") || msg.startsWith("settings m") || msg.equals("modified")) {
-            logDirect("All settings that have been modified from their default values:");
-            for (Settings.Setting<?> setting : SettingsUtil.modifiedSettings(BaritoneAPI.getSettings())) {
-                logDirect(setting.toString());
-            }
-            return true;
-        }
-        if (msg.startsWith("settings")) {
-            String rest = msg.substring("settings".length());
-            try {
-                int page = Integer.parseInt(rest.trim());
-                int min = page * 10;
-                int max = Math.min(BaritoneAPI.getSettings().allSettings.size(), (page + 1) * 10);
-                logDirect("Settings " + min + " to " + (max - 1) + ":");
-                for (int i = min; i < max; i++) {
-                    logDirect(BaritoneAPI.getSettings().allSettings.get(i).toString());
-                }
-            } catch (Exception ex) { // NumberFormatException | ArrayIndexOutOfBoundsException and probably some others I'm forgetting lol
-                ex.printStackTrace();
-                logDirect("All settings:");
-                for (Settings.Setting<?> setting : BaritoneAPI.getSettings().allSettings) {
-                    logDirect(setting.toString());
-                }
-                logDirect("To get one page of ten settings at a time, do settings <num>");
-            }
-            return true;
-        }
-        if (msg.equals("") || msg.equals("help") || msg.equals("?")) {
-            for (String line : HELP_MSG.split("\n")) {
-                logDirect(line);
-            }
-            return true;
-        }
-        if (msg.contains(" ")) {
-            String settingName = msg.substring(0, msg.indexOf(' '));
-            String settingValue = msg.substring(msg.indexOf(' ') + 1);
-            Settings.Setting setting = BaritoneAPI.getSettings().byLowerName.get(settingName);
-            if (setting != null) {
-                if (settingValue.equals("reset")) {
-                    logDirect("Resetting setting " + settingName + " to default value.");
-                    setting.reset();
-                } else {
-                    try {
-                        SettingsUtil.parseAndApply(BaritoneAPI.getSettings(), settingName, settingValue);
-                    } catch (Exception ex) {
-                        logDirect("Unable to parse setting");
-                        return true;
-                    }
-                }
-                SettingsUtil.save(BaritoneAPI.getSettings());
-                logDirect(setting.toString());
-                return true;
-            }
-        }
-        if (BaritoneAPI.getSettings().byLowerName.containsKey(msg)) {
-            Settings.Setting<?> setting = BaritoneAPI.getSettings().byLowerName.get(msg);
-            logDirect(setting.toString());
-            return true;
-        }
-
-        if (msg.startsWith("goal")) {
-            String rest = msg.substring(4).trim();
-            Goal goal;
-            if (rest.equals("clear") || rest.equals("none")) {
-                goal = null;
-            } else {
-                String[] params = rest.split(" ");
-                if (params[0].equals("")) {
-                    params = new String[]{};
-                }
-                goal = parseGoal(params);
-                if (goal == null) {
-                    return true;
-                }
-            }
-            customGoalProcess.setGoal(goal);
-            logDirect("Goal: " + goal);
-            return true;
-        }
-        if (msg.equals("path")) {
-            if (pathingBehavior.getGoal() == null) {
-                logDirect("No goal.");
-            } else if (pathingBehavior.getGoal().isInGoal(ctx.playerFeet())) {
-                logDirect("Already in goal");
-            } else if (pathingBehavior.isPathing()) {
-                logDirect("Currently executing a path. Please cancel it first.");
-            } else {
-                customGoalProcess.setGoalAndPath(pathingBehavior.getGoal());
-            }
-            return true;
-        }
-        /*if (msg.equals("fullpath")) {
-            if (pathingBehavior.getGoal() == null) {
-                logDirect("No goal.");
-            } else {
-                logDirect("Started segmented calculator");
-                SegmentedCalculator.calculateSegmentsThreaded(pathingBehavior.pathStart(), pathingBehavior.getGoal(), new CalculationContext(baritone, true), ipath -> {
-                    logDirect("Found a path");
-                    logDirect("Ends at " + ipath.getDest());
-                    logDirect("Length " + ipath.length());
-                    logDirect("Estimated time " + ipath.ticksRemainingFrom(0));
-                    pathingBehavior.secretCursedFunctionDoNotCall(ipath); // it's okay when *I* do it
-                }, () -> {
-                    logDirect("Path calculation failed, no path");
-                });
-            }
-            return true;
-        }*/
-        if (msg.equals("proc")) {
-            Optional<IBaritoneProcess> proc = baritone.getPathingControlManager().mostRecentInControl();
-            if (!proc.isPresent()) {
-                logDirect("No process is in control");
-                return true;
-            }
-            IBaritoneProcess p = proc.get();
-            logDirect("Class: " + p.getClass());
-            logDirect("Priority: " + p.priority());
-            logDirect("Temporary: " + p.isTemporary());
-            logDirect("Display name: " + p.displayName());
-            logDirect("Command: " + baritone.getPathingControlManager().mostRecentCommand());
-            return true;
-        }
-        if (msg.equals("version")) {
-            String version = ExampleBaritoneControl.class.getPackage().getImplementationVersion();
-            if (version == null) {
-                logDirect("No version detected. Either dev environment or broken install.");
-            } else {
-                logDirect("You are using Baritone v" + version);
-            }
-            return true;
-        }
-        if (msg.equals("repack") || msg.equals("rescan")) {
-            ChunkProviderClient cli = (ChunkProviderClient) ctx.world().getChunkProvider();
-            int playerChunkX = ctx.playerFeet().getX() >> 4;
-            int playerChunkZ = ctx.playerFeet().getZ() >> 4;
-            int count = 0;
-            for (int x = playerChunkX - 40; x <= playerChunkX + 40; x++) {
-                for (int z = playerChunkZ - 40; z <= playerChunkZ + 40; z++) {
-                    Chunk chunk = cli.getChunk(x, z, false, false);
-                    if (chunk != null) {
-                        count++;
-                        baritone.getWorldProvider().getCurrentWorld().getCachedWorld().queueForPacking(chunk);
-                    }
-                }
-            }
-            logDirect("Queued " + count + " chunks for repacking");
-            return true;
-        }
-        if (msg.startsWith("build")) {
-            String file;
-            BlockPos origin;
-            try {
-                String[] coords = msg.substring("build".length()).trim().split(" ");
-                file = coords[0] + ".schematic";
-                origin = new BlockPos(parseOrDefault(coords[1], ctx.playerFeet().x), parseOrDefault(coords[2], ctx.playerFeet().y), parseOrDefault(coords[3], ctx.playerFeet().z));
-            } catch (Exception ex) {
-                file = msg.substring(5).trim() + ".schematic";
-                origin = ctx.playerFeet();
-            }
-            logDirect("Loading '" + file + "' to build from origin " + origin);
-            boolean success = baritone.getBuilderProcess().build(file, origin);
-            logDirect(success ? "Loaded" : "Unable to load");
-            return true;
-        }
-        if (msg.equals("come")) {
-            customGoalProcess.setGoalAndPath(new GoalBlock(new BlockPos(Helper.mc.getRenderViewEntity())));
-            logDirect("Coming");
-            return true;
-        }
-        if (msg.equals("axis") || msg.equals("highway")) {
-            customGoalProcess.setGoalAndPath(new GoalAxis());
-            return true;
-        }
-        if (msg.equals("cancel") || msg.equals("stop")) {
-            pathingBehavior.cancelEverything();
-            logDirect("ok canceled");
-            return true;
-        }
-        if (msg.equals("forcecancel")) {
-            pathingBehavior.cancelEverything();
-            pathingBehavior.forceCancel();
-            logDirect("ok force canceled");
-            return true;
-        }
-        if (msg.equals("gc")) {
-            System.gc();
-            logDirect("Called System.gc();");
-            return true;
-        }
-        if (msg.equals("invert")) {
-            Goal goal = pathingBehavior.getGoal();
-            BlockPos runAwayFrom;
-            if (goal instanceof GoalXZ) {
-                runAwayFrom = new BlockPos(((GoalXZ) goal).getX(), 0, ((GoalXZ) goal).getZ());
-            } else if (goal instanceof GoalBlock) {
-                runAwayFrom = ((GoalBlock) goal).getGoalPos();
-            } else {
-                logDirect("Goal must be GoalXZ or GoalBlock to invert");
-                logDirect("Inverting goal of player feet");
-                runAwayFrom = ctx.playerFeet();
-            }
-            customGoalProcess.setGoalAndPath(new GoalRunAway(1, runAwayFrom) {
-                @Override
-                public boolean isInGoal(int x, int y, int z) {
-                    return false;
-                }
-            });
-            return true;
-        }
-        if (msg.startsWith("cleararea")) {
-            String suffix = msg.substring("cleararea".length());
-            BlockPos corner1;
-            BlockPos corner2;
-            if (suffix.isEmpty()) {
-                // clear the area from the current goal to here
-                Goal goal = baritone.getPathingBehavior().getGoal();
-                if (goal == null || !(goal instanceof GoalBlock)) {
-                    logDirect("Need to specify goal of opposite corner");
-                    return true;
-                }
-                corner1 = ((GoalBlock) goal).getGoalPos();
-                corner2 = ctx.playerFeet();
-            } else {
-                try {
-                    String[] spl = suffix.split(" ");
-                    corner1 = ctx.playerFeet();
-                    corner2 = new BlockPos(Integer.parseInt(spl[0]), Integer.parseInt(spl[1]), Integer.parseInt(spl[2]));
-                } catch (NumberFormatException | ArrayIndexOutOfBoundsException | NullPointerException ex) {
-                    logDirect("unable to parse");
-                    return true;
-                }
-            }
-            baritone.getBuilderProcess().clearArea(corner1, corner2);
-            return true;
-        }
-        if (msg.equals("resume")) {
-            baritone.getBuilderProcess().resume();
-            logDirect("resumed");
-            return true;
-        }
-        if (msg.equals("pause")) {
-            baritone.getBuilderProcess().pause();
-            logDirect("paused");
-            return true;
-        }
-        if (msg.equals("reset")) {
-            for (Settings.Setting setting : BaritoneAPI.getSettings().allSettings) {
-                setting.reset();
-            }
-            SettingsUtil.save(BaritoneAPI.getSettings());
-            logDirect("Baritone settings reset");
-            return true;
-        }
-        if (msg.equals("tunnel")) {
-            customGoalProcess.setGoalAndPath(new GoalStrictDirection(ctx.playerFeet(), ctx.player().getHorizontalFacing()));
-            logDirect("tunneling");
-            return true;
-        }
-        if (msg.equals("render")) {
-            BetterBlockPos pf = ctx.playerFeet();
-            Minecraft.getInstance().worldRenderer.markBlockRangeForRenderUpdate(pf.x - 500, pf.y - 500, pf.z - 500, pf.x + 500, pf.y + 500, pf.z + 500);
-            logDirect("okay");
-            return true;
-        }
-        if (msg.equals("farm")) {
-            baritone.getFarmProcess().farm();
-            logDirect("farming");
-            return true;
-        }
-        // this literally doesn't work, memory is disabled lol
-        /*if (msg.equals("echest")) {
-            Optional<List<ItemStack>> contents = baritone.getMemoryBehavior().echest();
-            if (contents.isPresent()) {
-                logDirect("echest contents:");
-                log(contents.get());
-            } else {
-                logDirect("echest contents unknown");
-            }
-            return true;
-        }*/
-        if (msg.equals("chests")) {
-            for (Map.Entry<BlockPos, IRememberedInventory> entry : baritone.getWorldProvider().getCurrentWorld().getContainerMemory().getRememberedInventories().entrySet()) {
-                logDirect(entry.getKey() + "");
-                log(entry.getValue().getContents());
-            }
-            return true;
-        }
-        if (msg.startsWith("followplayers")) {
-            baritone.getFollowProcess().follow(EntityPlayer.class::isInstance); // O P P A
-            logDirect("Following any players");
-            return true;
-        }
-        if (msg.startsWith("follow")) {
-            String name = msg.substring(6).trim();
-            Optional<Entity> toFollow = Optional.empty();
-            if (name.length() == 0) {
-                toFollow = ctx.getSelectedEntity();
-            } else {
-                for (EntityPlayer pl : ctx.world().playerEntities) {
-                    String theirName = pl.getName().getString().trim().toLowerCase();
-                    if (!theirName.equals(ctx.player().getName().getString().trim().toLowerCase()) && (theirName.contains(name) || name.contains(theirName))) { // don't follow ourselves lol
-                        toFollow = Optional.of(pl);
-                    }
-                }
-            }
-            if (!toFollow.isPresent()) {
-                logDirect("Not found");
-                return true;
-            }
-            Entity effectivelyFinal = toFollow.get();
-            baritone.getFollowProcess().follow(x -> effectivelyFinal.equals(x));
-            logDirect("Following " + toFollow.get());
-            return true;
-        }
-        if (msg.startsWith("explorefilter")) {
-            // explorefilter blah.json
-            // means that entries in blah.json are already explored
-            // explorefilter blah.json invert
-            // means that entries in blah.json are NOT already explored
-            String path = msg.substring("explorefilter".length()).trim();
-            String[] parts = path.split(" ");
-            Path path1 = Minecraft.getInstance().gameDir.toPath().resolve(parts[0]);
-            boolean invert = parts.length > 1;
-            try {
-                baritone.getExploreProcess().applyJsonFilter(path1, invert);
-                logDirect("Loaded filter. Inverted: " + invert);
-                if (invert) {
-                    logDirect("Chunks on this list will be treated as possibly unexplored, all others will be treated as certainly explored");
-                } else {
-                    logDirect("Chunks on this list will be treated as certainly explored, all others will be treated as possibly unexplored");
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-                logDirect("Unable to load " + path1);
-            }
-            return true;
-        }
-        if (msg.equals("reloadall")) {
-            baritone.getWorldProvider().getCurrentWorld().getCachedWorld().reloadAllFromDisk();
-            logDirect("ok");
-            return true;
-        }
-        if (msg.equals("saveall")) {
-            baritone.getWorldProvider().getCurrentWorld().getCachedWorld().save();
-            logDirect("ok");
-            return true;
-        }
-        if (msg.startsWith("explore")) {
-            String rest = msg.substring("explore".length()).trim();
-            int centerX;
-            int centerZ;
-            try {
-                centerX = Integer.parseInt(rest.split(" ")[0]);
-                centerZ = Integer.parseInt(rest.split(" ")[1]);
-            } catch (Exception ex) {
-                centerX = ctx.playerFeet().x;
-                centerZ = ctx.playerFeet().z;
-            }
-            baritone.getExploreProcess().explore(centerX, centerZ);
-            logDirect("Exploring from " + centerX + "," + centerZ);
-            return true;
-        }
-        if (msg.equals("blacklist")) {
-            IGetToBlockProcess proc = baritone.getGetToBlockProcess();
-            if (!proc.isActive()) {
-                logDirect("GetToBlockProcess is not currently active");
-                return true;
-            }
-            if (proc.blacklistClosest()) {
-                logDirect("Blacklisted closest instances");
-            } else {
-                logDirect("No known locations, unable to blacklist");
-            }
-            return true;
-        }
-        if (msg.startsWith("find")) {
-            String blockType = msg.substring(4).trim();
-            ArrayList<BlockPos> locs = baritone.getWorldProvider().getCurrentWorld().getCachedWorld().getLocationsOf(blockType, 1, ctx.playerFeet().getX(), ctx.playerFeet().getZ(), 4);
-            logDirect("Have " + locs.size() + " locations");
-            for (BlockPos pos : locs) {
-                Block actually = ctx.world().getBlockState(pos).getBlock();
-                if (!BlockUtils.blockToString(actually).equalsIgnoreCase(blockType)) {
-                    logDebug("Was looking for " + blockType + " but actually found " + actually + " " + BlockUtils.blockToString(actually));
-                }
-            }
-            return true;
-        }
-        if (msg.startsWith("mine")) {
-            String[] blockTypes = msg.substring(4).trim().split(" ");
-            try {
-                int quantity = Integer.parseInt(blockTypes[1]);
-                Block block = BlockUtils.stringToBlockRequired(blockTypes[0]);
-                baritone.getMineProcess().mine(quantity, block);
-                logDirect("Will mine " + quantity + " " + blockTypes[0]);
-                return true;
-            } catch (NumberFormatException | ArrayIndexOutOfBoundsException | NullPointerException ex) {}
-            for (String s : blockTypes) {
-                if (BlockUtils.stringToBlockNullable(s) == null) {
-                    logDirect(s + " isn't a valid block name");
-                    return true;
-                }
-
-            }
-            baritone.getMineProcess().mineByName(0, blockTypes);
-            logDirect("Started mining blocks of type " + Arrays.toString(blockTypes));
-            return true;
-        }
-        if (msg.equals("click")) {
-            baritone.openClick();
-            logDirect("aight dude");
-            return true;
-        }
-        if (msg.startsWith("thisway") || msg.startsWith("forward")) {
-            try {
-                Goal goal = GoalXZ.fromDirection(ctx.playerFeetAsVec(), ctx.player().rotationYaw, Double.parseDouble(msg.substring(7).trim()));
-                customGoalProcess.setGoal(goal);
-                logDirect("Goal: " + goal);
-            } catch (NumberFormatException ex) {
-                logDirect("Error unable to parse '" + msg.substring(7).trim() + "' to a double.");
-            }
-            return true;
-        }
-        if (msg.startsWith("list") || msg.startsWith("get ") || msg.startsWith("show")) {
-            String waypointType = msg.substring(4).trim();
-            if (waypointType.endsWith("s")) {
-                // for example, "show deaths"
-                waypointType = waypointType.substring(0, waypointType.length() - 1);
-            }
-            IWaypoint.Tag tag = IWaypoint.Tag.fromString(waypointType);
-            if (tag == null) {
-                logDirect("Not a valid tag. Tags are: " + Arrays.asList(IWaypoint.Tag.values()).toString().toLowerCase());
-                return true;
-            }
-            Set<IWaypoint> waypoints = baritone.getWorldProvider().getCurrentWorld().getWaypoints().getByTag(tag);
-            // might as well show them from oldest to newest
-            List<IWaypoint> sorted = new ArrayList<>(waypoints);
-            sorted.sort(Comparator.comparingLong(IWaypoint::getCreationTimestamp));
-            logDirect("Waypoints under tag " + tag + ":");
-            for (IWaypoint waypoint : sorted) {
-                logDirect(waypoint.toString());
-            }
-            return true;
-        }
-        if (msg.startsWith("save")) {
-            String name = msg.substring(4).trim();
-            BlockPos pos = ctx.playerFeet();
-            if (name.contains(" ")) {
-                logDirect("Name contains a space, assuming it's in the format 'save waypointName X Y Z'");
-                String[] parts = name.split(" ");
-                if (parts.length != 4) {
-                    logDirect("Unable to parse, expected four things");
-                    return true;
-                }
-                try {
-                    pos = new BlockPos(Integer.parseInt(parts[1]), Integer.parseInt(parts[2]), Integer.parseInt(parts[3]));
-                } catch (NumberFormatException ex) {
-                    logDirect("Unable to parse coordinate integers");
-                    return true;
-                }
-                name = parts[0];
-            }
-            baritone.getWorldProvider().getCurrentWorld().getWaypoints().addWaypoint(new Waypoint(name, IWaypoint.Tag.USER, pos));
-            logDirect("Saved user defined position " + pos + " under name '" + name + "'. Say 'goto " + name + "' to set goal, say 'list user' to list custom waypoints.");
-            return true;
-        }
-        if (msg.startsWith("goto")) {
-            String waypointType = msg.substring(4).trim();
-            if (waypointType.endsWith("s") && IWaypoint.Tag.fromString(waypointType.substring(0, waypointType.length() - 1)) != null) {
-                // for example, "show deaths"
-                waypointType = waypointType.substring(0, waypointType.length() - 1);
-            }
-            IWaypoint.Tag tag = IWaypoint.Tag.fromString(waypointType);
-            IWaypoint waypoint;
-            if (tag == null) {
-                String mining = waypointType;
-                Block block = BlockUtils.stringToBlockNullable(mining);
-                //logDirect("Not a valid tag. Tags are: " + Arrays.asList(Waypoint.Tag.values()).toString().toLowerCase());
-                if (block == null) {
-                    waypoint = baritone.getWorldProvider().getCurrentWorld().getWaypoints().getAllWaypoints().stream().filter(w -> w.getName().equalsIgnoreCase(mining)).max(Comparator.comparingLong(IWaypoint::getCreationTimestamp)).orElse(null);
-                    if (waypoint == null) {
-                        Goal goal = parseGoal(waypointType.split(" "));
-                        if (goal != null) {
-                            logDirect("Going to " + goal);
-                            customGoalProcess.setGoalAndPath(goal);
-                        }
-                        return true;
-                    }
-                } else {
-                    baritone.getGetToBlockProcess().getToBlock(block);
-                    return true;
-                }
-            } else {
-                waypoint = baritone.getWorldProvider().getCurrentWorld().getWaypoints().getMostRecentByTag(tag);
-                if (waypoint == null) {
-                    logDirect("None saved for tag " + tag);
-                    return true;
-                }
-            }
-            Goal goal = waypoint.getTag() == IWaypoint.Tag.BED ? new GoalGetToBlock(waypoint.getLocation()) : new GoalBlock(waypoint.getLocation());
-            customGoalProcess.setGoalAndPath(goal);
-            return true;
-        }
-        if (msg.equals("spawn") || msg.equals("bed")) {
-            IWaypoint waypoint = baritone.getWorldProvider().getCurrentWorld().getWaypoints().getMostRecentByTag(IWaypoint.Tag.BED);
-            if (waypoint == null) {
-                BlockPos spawnPoint = ctx.player().getBedLocation();
-                // for some reason the default spawnpoint is underground sometimes
-                Goal goal = new GoalXZ(spawnPoint.getX(), spawnPoint.getZ());
-                logDirect("spawn not saved, defaulting to world spawn. set goal to " + goal);
-                customGoalProcess.setGoalAndPath(goal);
-            } else {
-                Goal goal = new GoalGetToBlock(waypoint.getLocation());
-                customGoalProcess.setGoalAndPath(goal);
-                logDirect("Set goal to most recent bed " + goal);
-            }
-            return true;
-        }
-        if (msg.equals("sethome")) {
-            baritone.getWorldProvider().getCurrentWorld().getWaypoints().addWaypoint(new Waypoint("", IWaypoint.Tag.HOME, ctx.playerFeet()));
-            logDirect("Saved. Say home to set goal.");
-            return true;
-        }
-        if (msg.equals("home")) {
-            IWaypoint waypoint = baritone.getWorldProvider().getCurrentWorld().getWaypoints().getMostRecentByTag(IWaypoint.Tag.HOME);
-            if (waypoint == null) {
-                logDirect("home not saved");
-            } else {
-                Goal goal = new GoalBlock(waypoint.getLocation());
-                customGoalProcess.setGoalAndPath(goal);
-                logDirect("Going to saved home " + goal);
-            }
-            return true;
-        }
-        // this is completely impossible from api
-        /*if (msg.equals("costs")) {
-            List<Movement> moves = Stream.of(Moves.values()).map(x -> x.apply0(new CalculationContext(baritone), ctx.playerFeet())).collect(Collectors.toCollection(ArrayList::new));
-            while (moves.contains(null)) {
-                moves.remove(null);
-            }
-            moves.sort(Comparator.comparingDouble(move -> move.getCost(new CalculationContext(baritone))));
-            for (Movement move : moves) {
-                String[] parts = move.getClass().toString().split("\\.");
-                double cost = move.getCost();
-                String strCost = cost + "";
-                if (cost >= ActionCosts.COST_INF) {
-                    strCost = "IMPOSSIBLE";
-                }
-                logDirect(parts[parts.length - 1] + " " + move.getDest().getX() + "," + move.getDest().getY() + "," + move.getDest().getZ() + " " + strCost);
-            }
-            return true;
-        }*/
-        if (msg.equals("damn")) {
-            logDirect("daniel");
-        }
-        return false;
-    }
-
-    private int parseOrDefault(String str, int i) {
-        return str.equals("~") ? i : str.startsWith("~") ? Integer.parseInt(str.substring(1)) + i : Integer.parseInt(str);
-    }
-
-    private void log(List<ItemStack> stacks) {
-        for (ItemStack stack : stacks) {
-            if (!stack.isEmpty()) {
-                logDirect(stack.getCount() + "x " + stack.getDisplayName() + "@" + stack.getDamage());
-            }
-        }
-    }
-
-    private Goal parseGoal(String[] params) {
-        Goal goal;
-        try {
-            BetterBlockPos playerFeet = ctx.playerFeet();
-            switch (params.length) {
-                case 0:
-                    goal = new GoalBlock(playerFeet);
-                    break;
-                case 1:
-
-                    goal = new GoalYLevel(parseOrDefault(params[0], playerFeet.y));
-                    break;
-                case 2:
-                    goal = new GoalXZ(parseOrDefault(params[0], playerFeet.x), parseOrDefault(params[1], playerFeet.z));
-                    break;
-                case 3:
-                    goal = new GoalBlock(new BlockPos(parseOrDefault(params[0], playerFeet.x), parseOrDefault(params[1], playerFeet.y), parseOrDefault(params[2], playerFeet.z)));
-                    break;
-                default:
-                    logDirect("unable to understand lol");
-                    return null;
-            }
-        } catch (NumberFormatException ex) {
-            logDirect("unable to parse integer " + ex);
-            return null;
-        }
-        return goal;
-    }
-}

src/api/java/baritone/api/utils/IInputOverrideHandler.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.utils;
-
-import baritone.api.behavior.IBehavior;
-import baritone.api.utils.input.Input;
-
-/**
- * @author Brady
- * @since 11/12/2018
- */
-public interface IInputOverrideHandler extends IBehavior {
-
-    boolean isInputForcedDown(Input input);
-
-    void setInputForceState(Input input, boolean forced);
-
-    void clearAllKeys();
-}

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

@@ -1,97 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.utils;
-
-import baritone.api.cache.IWorldData;
-import net.minecraft.block.BlockSlab;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.World;
-
-import java.util.Optional;
-
-/**
- * @author Brady
- * @since 11/12/2018
- */
-public interface IPlayerContext {
-
-    EntityPlayerSP player();
-
-    IPlayerController playerController();
-
-    World world();
-
-    IWorldData worldData();
-
-    RayTraceResult objectMouseOver();
-
-    default BetterBlockPos playerFeet() {
-        // TODO find a better way to deal with soul sand!!!!!
-        BetterBlockPos feet = new BetterBlockPos(player().posX, player().posY + 0.1251, player().posZ);
-        if (world().getBlockState(feet).getBlock() instanceof BlockSlab) {
-            return feet.up();
-        }
-        return feet;
-    }
-
-    default Vec3d playerFeetAsVec() {
-        return new Vec3d(player().posX, player().posY, player().posZ);
-    }
-
-    default Vec3d playerHead() {
-        return new Vec3d(player().posX, player().posY + player().getEyeHeight(), player().posZ);
-    }
-
-    default Rotation playerRotations() {
-        return new Rotation(player().rotationYaw, player().rotationPitch);
-    }
-
-    /**
-     * Returns the block that the crosshair is currently placed over. Updated once per tick.
-     *
-     * @return The position of the highlighted block
-     */
-    default Optional<BlockPos> getSelectedBlock() {
-        RayTraceResult result = objectMouseOver();
-        if (result != null && result.type == RayTraceResult.Type.BLOCK) {
-            return Optional.of(result.getBlockPos());
-        }
-        return Optional.empty();
-    }
-
-    default boolean isLookingAt(BlockPos pos) {
-        return getSelectedBlock().equals(Optional.of(pos));
-    }
-
-    /**
-     * Returns the entity that the crosshair is currently placed over. Updated once per tick.
-     *
-     * @return The entity
-     */
-    default Optional<Entity> getSelectedEntity() {
-        RayTraceResult result = objectMouseOver();
-        if (result != null && result.type == RayTraceResult.Type.ENTITY) {
-            return Optional.of(result.entity);
-        }
-        return Optional.empty();
-    }
-}

src/api/java/baritone/api/utils/IPlayerController.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.utils;
-
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.ClickType;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.GameType;
-import net.minecraft.world.World;
-
-/**
- * @author Brady
- * @since 12/14/2018
- */
-public interface IPlayerController {
-
-    boolean onPlayerDamageBlock(BlockPos pos, EnumFacing side);
-
-    void resetBlockRemoving();
-
-    ItemStack windowClick(int windowId, int slotId, int mouseButton, ClickType type, EntityPlayer player);
-
-    void setGameType(GameType type);
-
-    GameType getGameType();
-
-    default double getBlockReachDistance() {
-        return this.getGameType().isCreative() ? 5.0F : 4.5F;
-    }
-
-    EnumActionResult processRightClickBlock(EntityPlayerSP player, World world, BlockPos pos, EnumFacing direction, Vec3d vec, EnumHand hand);
-
-    EnumActionResult processRightClick(EntityPlayerSP player, World world, EnumHand hand);
-}

src/api/java/baritone/api/utils/ISchematic.java

@@ -1,85 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.utils;
-
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.util.EnumFacing;
-
-/**
- * Basic representation of a schematic. Provides the dimensions and
- * the desired statefor a given position relative to the origin.
- *
- * @author leijurv
- */
-public interface ISchematic {
-
-    /**
-     * Does the block at this coordinate matter to the schematic?
-     * <p>
-     * Normally just a check for if the coordinate is in the cube.
-     * <p>
-     * However, in the case of something like a map art, anything that's below the level of the map art doesn't matter,
-     * so this function should return false in that case. (i.e. it doesn't really have to be air below the art blocks)
-     *
-     * @param x The x position of the block, relative to the origin
-     * @param y The y position of the block, relative to the origin
-     * @param z The z position of the block, relative to the origin
-     * @return Whether or not the specified position is within the bounds of this schematic
-     */
-    default boolean inSchematic(int x, int y, int z) {
-        return x >= 0 && x < widthX() && y >= 0 && y < heightY() && z >= 0 && z < lengthZ();
-    }
-
-    default int size(EnumFacing.Axis axis) {
-        switch (axis) {
-            case X:
-                return widthX();
-            case Y:
-                return heightY();
-            case Z:
-                return lengthZ();
-            default:
-                throw new UnsupportedOperationException(axis + "");
-        }
-    }
-
-    /**
-     * Returns the desired block state at a given (X, Y, Z) position relative to the origin (0, 0, 0).
-     *
-     * @param x The x position of the block, relative to the origin
-     * @param y The y position of the block, relative to the origin
-     * @param z The z position of the block, relative to the origin
-     * @return The desired block state at the specified position
-     */
-    IBlockState desiredState(int x, int y, int z);
-
-    /**
-     * @return The width (X axis length) of this schematic
-     */
-    int widthX();
-
-    /**
-     * @return The height (Y axis length) of this schematic
-     */
-    int heightY();
-
-    /**
-     * @return The length (Z axis length) of this schematic
-     */
-    int lengthZ();
-}

src/api/java/baritone/api/utils/Logger.java

@@ -15,8 +15,13 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.process;
+package baritone.api.utils;
+
+/**
+ * @author Brady
+ * @since 9/23/2018
+ */
+public class Logger {
+
 
-public interface IFarmProcess extends IBaritoneProcess {
-    void farm();
 }

src/api/java/baritone/api/utils/MyChunkPos.java

@@ -1,31 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.utils;
-
-/**
- * Need a non obfed chunkpos that we can load using GSON
- */
-public class MyChunkPos {
-    public int x;
-    public int z;
-
-    @Override
-    public String toString() {
-        return x + ", " + z;
-    }
-}

src/api/java/baritone/api/utils/PathCalculationResult.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.utils;
-
-import baritone.api.pathing.calc.IPath;
-
-import java.util.Objects;
-import java.util.Optional;
-
-public class PathCalculationResult {
-
-    private final IPath path;
-    private final Type type;
-
-    public PathCalculationResult(Type type) {
-        this(type, null);
-    }
-
-    public PathCalculationResult(Type type, IPath path) {
-        Objects.requireNonNull(type);
-        this.path = path;
-        this.type = type;
-    }
-
-    public final Optional<IPath> getPath() {
-        return Optional.ofNullable(this.path);
-    }
-
-    public final Type getType() {
-        return this.type;
-    }
-
-    public enum Type {
-        SUCCESS_TO_GOAL,
-        SUCCESS_SEGMENT,
-        FAILURE,
-        CANCELLATION,
-        EXCEPTION,
-    }
-}

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

@@ -17,37 +17,97 @@
 
 package baritone.api.utils;
 
+import net.minecraft.client.Minecraft;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.math.RayTraceFluidMode;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.math.Vec3d;
 
+import java.util.Optional;
+
 /**
  * @author Brady
  * @since 8/25/2018
  */
 public final class RayTraceUtils {
+    /**
+     * The {@link Minecraft} instance
+     */
+    private static final Minecraft mc = Minecraft.getMinecraft();
 
     private RayTraceUtils() {}
 
+    /**
+     * Simulates a "vanilla" raytrace. A RayTraceResult returned by this method
+     * will be that of the next render pass given that the local player's yaw and
+     * pitch match the specified yaw and pitch values. This is particularly useful
+     * when you would like to simulate a "legit" raytrace with certainty that the only
+     * thing to achieve the desired outcome (whether it is hitting and entity or placing
+     * a block) can be done just by modifying user input.
+     *
+     * @param yaw   The yaw to raytrace with
+     * @param pitch The pitch to raytrace with
+     * @return The calculated raytrace result
+     */
+    public static RayTraceResult simulateRayTrace(float yaw, float pitch) {
+        RayTraceResult oldTrace = mc.objectMouseOver;
+        float oldYaw = mc.player.rotationYaw;
+        float oldPitch = mc.player.rotationPitch;
+
+        mc.player.rotationYaw = yaw;
+        mc.player.rotationPitch = pitch;
+
+        mc.entityRenderer.getMouseOver(1.0F);
+        RayTraceResult result = mc.objectMouseOver;
+        mc.objectMouseOver = oldTrace;
+
+        mc.player.rotationYaw = oldYaw;
+        mc.player.rotationPitch = oldPitch;
+
+        return result;
+    }
+
     /**
      * Performs a block raytrace with the specified rotations. This should only be used when
      * any entity collisions can be ignored, because this method will not recognize if an
      * entity is in the way or not. The local player's block reach distance will be used.
      *
-     * @param entity             The entity representing the raytrace source
-     * @param rotation           The rotation to raytrace towards
-     * @param blockReachDistance The block reach distance of the entity
+     * @param rotation The rotation to raytrace towards
      * @return The calculated raytrace result
      */
-    public static RayTraceResult rayTraceTowards(Entity entity, Rotation rotation, double blockReachDistance) {
-        Vec3d start = entity.getEyePosition(1.0F);
+    public static RayTraceResult rayTraceTowards(Rotation rotation) {
+        double blockReachDistance = mc.playerController.getBlockReachDistance();
+        Vec3d start = mc.player.getPositionEyes(1.0F);
         Vec3d direction = RotationUtils.calcVec3dFromRotation(rotation);
         Vec3d end = start.add(
                 direction.x * blockReachDistance,
                 direction.y * blockReachDistance,
                 direction.z * blockReachDistance
         );
-        return entity.world.rayTraceBlocks(start, end, RayTraceFluidMode.NEVER, false, true);
+        return mc.world.rayTraceBlocks(start, end, false, false, true);
+    }
+
+    /**
+     * Returns the block that the crosshair is currently placed over. Updated once per render tick.
+     *
+     * @return The position of the highlighted block
+     */
+    public static Optional<BlockPos> getSelectedBlock() {
+        if (mc.objectMouseOver != null && mc.objectMouseOver.typeOfHit == RayTraceResult.Type.BLOCK) {
+            return Optional.of(mc.objectMouseOver.getBlockPos());
+        }
+        return Optional.empty();
+    }
+
+    /**
+     * Returns the entity that the crosshair is currently placed over. Updated once per render tick.
+     *
+     * @return The entity
+     */
+    public static Optional<Entity> getSelectedEntity() {
+        if (mc.objectMouseOver != null && mc.objectMouseOver.typeOfHit == RayTraceResult.Type.ENTITY) {
+            return Optional.of(mc.objectMouseOver.entityHit);
+        }
+        return Optional.empty();
     }
 }

src/api/java/baritone/api/utils/Rotation.java

@@ -36,9 +36,6 @@ public class Rotation {
     public Rotation(float yaw, float pitch) {
         this.yaw = yaw;
         this.pitch = pitch;
-        if (Float.isInfinite(yaw) || Float.isNaN(yaw) || Float.isInfinite(pitch) || Float.isNaN(pitch)) {
-            throw new IllegalStateException(yaw + " " + pitch);
-        }
     }
 
     /**
@@ -89,7 +86,7 @@ public class Rotation {
     public Rotation clamp() {
         return new Rotation(
                 this.yaw,
-                clampPitch(this.pitch)
+                RotationUtils.clampPitch(this.pitch)
         );
     }
 
@@ -98,7 +95,7 @@ public class Rotation {
      */
     public Rotation normalize() {
         return new Rotation(
-                normalizeYaw(this.yaw),
+                RotationUtils.normalizeYaw(this.yaw),
                 this.pitch
         );
     }
@@ -108,55 +105,8 @@ public class Rotation {
      */
     public Rotation normalizeAndClamp() {
         return new Rotation(
-                normalizeYaw(this.yaw),
-                clampPitch(this.pitch)
+                RotationUtils.normalizeYaw(this.yaw),
+                RotationUtils.clampPitch(this.pitch)
         );
     }
-
-    /**
-     * Is really close to
-     *
-     * @param other another rotation
-     * @return are they really close
-     */
-    public boolean isReallyCloseTo(Rotation other) {
-        return yawIsReallyClose(other) && Math.abs(this.pitch - other.pitch) < 0.01;
-    }
-
-    public boolean yawIsReallyClose(Rotation other) {
-        float yawDiff = Math.abs(normalizeYaw(yaw) - normalizeYaw(other.yaw)); // you cant fool me
-        return (yawDiff < 0.01 || yawDiff > 359.99);
-    }
-
-    /**
-     * Clamps the specified pitch value between -90 and 90.
-     *
-     * @param pitch The input pitch
-     * @return The clamped pitch
-     */
-    public static float clampPitch(float pitch) {
-        return Math.max(-90, Math.min(90, pitch));
-    }
-
-    /**
-     * Normalizes the specified yaw value between -180 and 180.
-     *
-     * @param yaw The input yaw
-     * @return The normalized yaw
-     */
-    public static float normalizeYaw(float yaw) {
-        float newYaw = yaw % 360F;
-        if (newYaw < -180F) {
-            newYaw += 360F;
-        }
-        if (newYaw > 180F) {
-            newYaw -= 360F;
-        }
-        return newYaw;
-    }
-
-    @Override
-    public String toString() {
-        return "Yaw: " + yaw + ", Pitch: " + pitch;
-    }
 }

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

@@ -17,19 +17,11 @@
 
 package baritone.api.utils;
 
-import baritone.api.BaritoneAPI;
-import baritone.api.IBaritone;
 import net.minecraft.block.BlockFire;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.Minecraft;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.math.shapes.VoxelShape;
-import net.minecraft.util.math.shapes.VoxelShapes;
+import net.minecraft.util.math.*;
 
 import java.util.Optional;
 
@@ -39,6 +31,11 @@ import java.util.Optional;
  */
 public final class RotationUtils {
 
+    /**
+     * The {@link Minecraft} instance
+     */
+    private static final Minecraft mc = Minecraft.getMinecraft();
+
     /**
      * Constant that a degree value is multiplied by to get the equivalent radian value
      */
@@ -63,6 +60,33 @@ public final class RotationUtils {
 
     private RotationUtils() {}
 
+    /**
+     * Clamps the specified pitch value between -90 and 90.
+     *
+     * @param pitch The input pitch
+     * @return The clamped pitch
+     */
+    public static float clampPitch(float pitch) {
+        return Math.max(-90, Math.min(90, pitch));
+    }
+
+    /**
+     * Normalizes the specified yaw value between -180 and 180.
+     *
+     * @param yaw The input yaw
+     * @return The normalized yaw
+     */
+    public static float normalizeYaw(float yaw) {
+        float newYaw = yaw % 360F;
+        if (newYaw < -180F) {
+            newYaw += 360F;
+        }
+        if (newYaw >= 180F) {
+            newYaw -= 360F;
+        }
+        return newYaw;
+    }
+
     /**
      * Calculates the rotation from BlockPos<sub>dest</sub> to BlockPos<sub>orig</sub>
      *
@@ -84,9 +108,6 @@ public final class RotationUtils {
      * @return The wrapped angles
      */
     public static Rotation wrapAnglesToRelative(Rotation current, Rotation target) {
-        if (current.yawIsReallyClose(target)) {
-            return new Rotation(current.getYaw(), target.getPitch());
-        }
         return target.subtract(current).normalize().add(current);
     }
 
@@ -111,7 +132,7 @@ public final class RotationUtils {
      * @param dest The destination position
      * @return The rotation from the origin to the destination
      */
-    private static Rotation calcRotationFromVec3d(Vec3d orig, Vec3d dest) {
+    public static Rotation calcRotationFromVec3d(Vec3d orig, Vec3d dest) {
         double[] delta = {orig.x - dest.x, orig.y - dest.y, orig.z - dest.z};
         double yaw = MathHelper.atan2(delta[0], -delta[2]);
         double dist = Math.sqrt(delta[0] * delta[0] + delta[2] * delta[2]);
@@ -136,16 +157,6 @@ public final class RotationUtils {
         return new Vec3d((double) (f1 * f2), (double) f3, (double) (f * f2));
     }
 
-    /**
-     * @param ctx Context for the viewing entity
-     * @param pos The target block position
-     * @return The optional rotation
-     * @see #reachable(EntityPlayerSP, BlockPos, double)
-     */
-    public static Optional<Rotation> reachable(IPlayerContext ctx, BlockPos pos) {
-        return reachable(ctx.player(), pos, ctx.playerController().getBlockReachDistance());
-    }
-
     /**
      * Determines if the specified entity is able to reach the center of any of the sides
      * of the specified block. It first checks if the block center is reachable, and if so,
@@ -153,14 +164,12 @@ public final class RotationUtils {
      * side that is reachable. The return type will be {@link Optional#empty()} if the entity is
      * unable to reach any of the sides of the block.
      *
-     * @param entity             The viewing entity
-     * @param pos                The target block position
-     * @param blockReachDistance The block reach distance of the entity
+     * @param entity The viewing entity
+     * @param pos    The target block position
      * @return The optional rotation
      */
-    public static Optional<Rotation> reachable(EntityPlayerSP entity, BlockPos pos, double blockReachDistance) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer(entity);
-        if (baritone.getPlayerContext().isLookingAt(pos)) {
+    public static Optional<Rotation> reachable(Entity entity, BlockPos pos) {
+        if (pos.equals(RayTraceUtils.getSelectedBlock().orElse(null))) {
             /*
              * why add 0.0001?
              * to indicate that we actually have a desired pitch
@@ -173,22 +182,19 @@ public final class RotationUtils {
              */
             return Optional.of(new Rotation(entity.rotationYaw, entity.rotationPitch + 0.0001F));
         }
-        Optional<Rotation> possibleRotation = reachableCenter(entity, pos, blockReachDistance);
+        Optional<Rotation> possibleRotation = reachableCenter(entity, pos);
         //System.out.println("center: " + possibleRotation);
         if (possibleRotation.isPresent()) {
             return possibleRotation;
         }
 
-        IBlockState state = entity.world.getBlockState(pos);
-        VoxelShape shape = state.getShape(entity.world, pos);
-        if (shape.isEmpty()) {
-            shape = VoxelShapes.fullCube();
-        }
+        IBlockState state = mc.world.getBlockState(pos);
+        AxisAlignedBB aabb = state.getBoundingBox(entity.world, pos);
         for (Vec3d sideOffset : BLOCK_SIDE_MULTIPLIERS) {
-            double xDiff = shape.getStart(EnumFacing.Axis.X) * sideOffset.x + shape.getEnd(EnumFacing.Axis.X) * (1 - sideOffset.x);
-            double yDiff = shape.getStart(EnumFacing.Axis.Y) * sideOffset.y + shape.getEnd(EnumFacing.Axis.Y) * (1 - sideOffset.y);
-            double zDiff = shape.getStart(EnumFacing.Axis.Z) * sideOffset.z + shape.getEnd(EnumFacing.Axis.Z) * (1 - sideOffset.z);
-            possibleRotation = reachableOffset(entity, pos, new Vec3d(pos).add(xDiff, yDiff, zDiff), blockReachDistance);
+            double xDiff = aabb.minX * sideOffset.x + aabb.maxX * (1 - sideOffset.x);
+            double yDiff = aabb.minY * sideOffset.y + aabb.maxY * (1 - sideOffset.y);
+            double zDiff = aabb.minZ * sideOffset.z + aabb.maxZ * (1 - sideOffset.z);
+            possibleRotation = reachableOffset(entity, pos, new Vec3d(pos).add(xDiff, yDiff, zDiff));
             if (possibleRotation.isPresent()) {
                 return possibleRotation;
             }
@@ -201,17 +207,16 @@ public final class RotationUtils {
      * the given offsetted position. The return type will be {@link Optional#empty()} if
      * the entity is unable to reach the block with the offset applied.
      *
-     * @param entity             The viewing entity
-     * @param pos                The target block position
-     * @param offsetPos          The position of the block with the offset applied.
-     * @param blockReachDistance The block reach distance of the entity
+     * @param entity    The viewing entity
+     * @param pos       The target block position
+     * @param offsetPos The position of the block with the offset applied.
      * @return The optional rotation
      */
-    public static Optional<Rotation> reachableOffset(Entity entity, BlockPos pos, Vec3d offsetPos, double blockReachDistance) {
-        Rotation rotation = calcRotationFromVec3d(entity.getEyePosition(1.0F), offsetPos, new Rotation(entity.rotationYaw, entity.rotationPitch));
-        RayTraceResult result = RayTraceUtils.rayTraceTowards(entity, rotation, blockReachDistance);
+    public static Optional<Rotation> reachableOffset(Entity entity, BlockPos pos, Vec3d offsetPos) {
+        Rotation rotation = calcRotationFromVec3d(entity.getPositionEyes(1.0F), offsetPos);
+        RayTraceResult result = RayTraceUtils.rayTraceTowards(rotation);
         //System.out.println(result);
-        if (result != null && result.type == RayTraceResult.Type.BLOCK) {
+        if (result != null && result.typeOfHit == RayTraceResult.Type.BLOCK) {
             if (result.getBlockPos().equals(pos)) {
                 return Optional.of(rotation);
             }
@@ -226,12 +231,11 @@ public final class RotationUtils {
      * Determines if the specified entity is able to reach the specified block where it is
      * looking at the direct center of it's hitbox.
      *
-     * @param entity             The viewing entity
-     * @param pos                The target block position
-     * @param blockReachDistance The block reach distance of the entity
+     * @param entity The viewing entity
+     * @param pos    The target block position
      * @return The optional rotation
      */
-    public static Optional<Rotation> reachableCenter(Entity entity, BlockPos pos, double blockReachDistance) {
-        return reachableOffset(entity, pos, VecUtils.calculateBlockCenter(entity.world, pos), blockReachDistance);
+    public static Optional<Rotation> reachableCenter(Entity entity, BlockPos pos) {
+        return reachableOffset(entity, pos, VecUtils.calculateBlockCenter(pos));
     }
 }

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

@@ -18,252 +18,124 @@
 package baritone.api.utils;
 
 import baritone.api.Settings;
-import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.Item;
-import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.registry.IRegistry;
-import net.minecraft.util.math.Vec3i;
 
 import java.awt.*;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.nio.file.Files;
-import java.nio.file.NoSuchFileException;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.function.Consumer;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.*;
 import java.util.function.Function;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-
+import java.util.stream.Stream;
 
 public class SettingsUtil {
-    private static final Path SETTINGS_PATH = Minecraft.getInstance().gameDir.toPath().resolve("baritone").resolve("settings.txt");
-    private static final Pattern SETTING_PATTERN = Pattern.compile("^(?<setting>[^ ]+) +(?<value>.+)"); // key and value split by the first space
 
+    private static final File settingsFile = new File(new File(Minecraft.getMinecraft().gameDir, "baritone"), "settings.txt");
 
-    private static boolean isComment(String line) {
-        return line.startsWith("#") || line.startsWith("//");
-    }
-
-    private static void forEachLine(Path file, Consumer<String> consumer) throws IOException {
-        try (BufferedReader scan = Files.newBufferedReader(file)) {
-            String line;
-            while ((line = scan.readLine()) != null) {
-                if (line.isEmpty() || isComment(line)) {
-                    continue;
-                }
-                consumer.accept(line);
-            }
-        }
-    }
+    private static final Map<Class<?>, SettingsIO> map;
 
     public static void readAndApply(Settings settings) {
-        try {
-            forEachLine(SETTINGS_PATH, line -> {
-                Matcher matcher = SETTING_PATTERN.matcher(line);
-                if (!matcher.matches()) {
-                    System.out.println("Invalid syntax in setting file: " + line);
-                    return;
+        try (Scanner scan = new Scanner(settingsFile)) {
+            while (scan.hasNextLine()) {
+                String line = scan.nextLine();
+                if (line.isEmpty()) {
+                    continue;
                 }
-
-                String settingName = matcher.group("setting").toLowerCase();
-                String settingValue = matcher.group("value");
+                if (line.startsWith("#") || line.startsWith("//")) {
+                    continue;
+                }
+                int space = line.indexOf(" ");
+                if (space == -1) {
+                    System.out.println("Skipping invalid line with no space: " + line);
+                    continue;
+                }
+                String settingName = line.substring(0, space).trim().toLowerCase();
+                String settingValue = line.substring(space).trim();
                 try {
                     parseAndApply(settings, settingName, settingValue);
                 } catch (Exception ex) {
-                    System.out.println("Unable to parse line " + line);
                     ex.printStackTrace();
+                    System.out.println("Unable to parse line " + line);
                 }
-            });
-        } catch (NoSuchFileException ignored) {
-            System.out.println("Baritone settings file not found, resetting.");
+            }
         } catch (Exception ex) {
-            System.out.println("Exception while reading Baritone settings, some settings may be reset to default values!");
             ex.printStackTrace();
+            System.out.println("Exception while reading Baritone settings, some settings may be reset to default values!");
         }
     }
 
     public static synchronized void save(Settings settings) {
-        try (BufferedWriter out = Files.newBufferedWriter(SETTINGS_PATH)) {
-            for (Settings.Setting setting : modifiedSettings(settings)) {
-                out.write(settingToString(setting) + "\n");
+        try (FileOutputStream out = new FileOutputStream(settingsFile)) {
+            for (Settings.Setting setting : settings.allSettings) {
+                if (setting.get() == null) {
+                    System.out.println("NULL SETTING?" + setting.getName());
+                    continue;
+                }
+                if (setting.getName().equals("logger")) {
+                    continue; // NO
+                }
+                if (setting.value == setting.defaultValue) {
+                    continue;
+                }
+                SettingsIO io = map.get(setting.getValueClass());
+                if (io == null) {
+                    throw new IllegalStateException("Missing " + setting.getValueClass() + " " + setting + " " + setting.getName());
+                }
+                out.write((setting.getName() + " " + io.toString.apply(setting.get()) + "\n").getBytes());
             }
         } catch (Exception ex) {
-            System.out.println("Exception thrown while saving Baritone settings!");
             ex.printStackTrace();
+            System.out.println("Exception while saving Baritone settings!");
         }
     }
 
-    public static List<Settings.Setting> modifiedSettings(Settings settings) {
-        List<Settings.Setting> modified = new ArrayList<>();
-        for (Settings.Setting setting : settings.allSettings) {
-            if (setting.value == null) {
-                System.out.println("NULL SETTING?" + setting.getName());
-                continue;
-            }
-            if (setting.getName().equals("logger")) {
-                continue; // NO
-            }
-            if (setting.value == setting.defaultValue) {
-                continue;
-            }
-            modified.add(setting);
-        }
-        return modified;
-    }
-
-    public static String settingToString(Settings.Setting setting) throws IllegalStateException {
-        if (setting.getName().equals("logger")) {
-            return "logger";
-        }
-        Parser io = Parser.getParser(setting.getType());
-        if (io == null) {
-            throw new IllegalStateException("Missing " + setting.getValueClass() + " " + setting.getName());
-        }
-        return setting.getName() + " " + io.toString(new ParserContext(setting), setting.value);
-    }
-
-    public static void parseAndApply(Settings settings, String settingName, String settingValue) throws IllegalStateException, NumberFormatException {
+    private static void parseAndApply(Settings settings, String settingName, String settingValue) throws IllegalStateException, NumberFormatException {
         Settings.Setting setting = settings.byLowerName.get(settingName);
         if (setting == null) {
             throw new IllegalStateException("No setting by that name");
         }
         Class intendedType = setting.getValueClass();
-        ISettingParser ioMethod = Parser.getParser(setting.getType());
-        Object parsed = ioMethod.parse(new ParserContext(setting), settingValue);
+        SettingsIO ioMethod = map.get(intendedType);
+        Object parsed = ioMethod.parser.apply(settingValue);
         if (!intendedType.isInstance(parsed)) {
             throw new IllegalStateException(ioMethod + " parser returned incorrect type, expected " + intendedType + " got " + parsed + " which is " + parsed.getClass());
         }
         setting.value = parsed;
     }
 
-    private interface ISettingParser<T> {
-
-        T parse(ParserContext context, String raw);
-
-        String toString(ParserContext context, T value);
-
-        boolean accepts(Type type);
-    }
-
-    private static class ParserContext {
-
-        private final Settings.Setting<?> setting;
-
-        public ParserContext(Settings.Setting<?> setting) {
-            this.setting = setting;
-        }
-
-        final Settings.Setting<?> getSetting() {
-            return this.setting;
-        }
-    }
-
-    private enum Parser implements ISettingParser {
-
+    private enum SettingsIO {
         DOUBLE(Double.class, Double::parseDouble),
         BOOLEAN(Boolean.class, Boolean::parseBoolean),
         INTEGER(Integer.class, Integer::parseInt),
         FLOAT(Float.class, Float::parseFloat),
         LONG(Long.class, Long::parseLong),
-        ENUMFACING(EnumFacing.class, EnumFacing::byName),
-        COLOR(
-                Color.class,
-                str -> new Color(Integer.parseInt(str.split(",")[0]), Integer.parseInt(str.split(",")[1]), Integer.parseInt(str.split(",")[2])),
-                color -> color.getRed() + "," + color.getGreen() + "," + color.getBlue()
-        ),
-        VEC3I(
-                Vec3i.class,
-                str -> new Vec3i(Integer.parseInt(str.split(",")[0]), Integer.parseInt(str.split(",")[1]), Integer.parseInt(str.split(",")[2])),
-                vec -> vec.getX() + "," + vec.getY() + "," + vec.getZ()
-        ),
-        BLOCK(
-                Block.class,
-                str -> BlockUtils.stringToBlockRequired(str.trim()),
-                BlockUtils::blockToString
-        ),
-        ITEM(
-                Item.class,
-                str -> IRegistry.ITEM.get(new ResourceLocation(str.trim())),
-                item -> IRegistry.ITEM.getKey(item).toString()
-        ),
-        LIST() {
-            @Override
-            public Object parse(ParserContext context, String raw) {
-                Type type = ((ParameterizedType) context.getSetting().getType()).getActualTypeArguments()[0];
-                Parser parser = Parser.getParser(type);
-                return Arrays.stream(raw.split(","))
-                        .map(s -> parser.parse(context, s))
-                        .collect(Collectors.toList());
-            }
 
-            @Override
-            public String toString(ParserContext context, Object value) {
-                Type type = ((ParameterizedType) context.getSetting().getType()).getActualTypeArguments()[0];
-                Parser parser = Parser.getParser(type);
+        ITEM_LIST(ArrayList.class, str -> Stream.of(str.split(",")).map(Item::getByNameOrId).collect(Collectors.toCollection(ArrayList::new)), list -> ((ArrayList<Item>) list).stream().map(Item.REGISTRY::getNameForObject).map(ResourceLocation::toString).collect(Collectors.joining(","))),
+        COLOR(Color.class, str -> new Color(Integer.parseInt(str.split(",")[0]), Integer.parseInt(str.split(",")[1]), Integer.parseInt(str.split(",")[2])), color -> color.getRed() + "," + color.getGreen() + "," + color.getBlue());
 
-                return ((List<?>) value).stream()
-                        .map(o -> parser.toString(context, o))
-                        .collect(Collectors.joining(","));
-            }
 
-            @Override
-            public boolean accepts(Type type) {
-                return List.class.isAssignableFrom(TypeUtils.resolveBaseClass(type));
-            }
-        };
+        Class<?> klass;
+        Function<String, Object> parser;
+        Function<Object, String> toString;
 
-        private final Class<?> klass;
-        private final Function<String, Object> parser;
-        private final Function<Object, String> toString;
-
-        Parser() {
-            this.klass = null;
-            this.parser = null;
-            this.toString = null;
-        }
-
-        <T> Parser(Class<T> klass, Function<String, T> parser) {
+        <T> SettingsIO(Class<T> klass, Function<String, T> parser) {
             this(klass, parser, Object::toString);
         }
 
-        <T> Parser(Class<T> klass, Function<String, T> parser, Function<T, String> toString) {
+        <T> SettingsIO(Class<T> klass, Function<String, T> parser, Function<T, String> toString) {
             this.klass = klass;
             this.parser = parser::apply;
             this.toString = x -> toString.apply((T) x);
         }
+    }
 
-        @Override
-        public Object parse(ParserContext context, String raw) {
-            Object parsed = this.parser.apply(raw);
-            Objects.requireNonNull(parsed);
-            return parsed;
-        }
-
-        @Override
-        public String toString(ParserContext context, Object value) {
-            return this.toString.apply(value);
-        }
-
-        @Override
-        public boolean accepts(Type type) {
-            return type instanceof Class && this.klass.isAssignableFrom((Class) type);
-        }
-
-        public static Parser getParser(Type type) {
-            return Arrays.stream(values())
-                    .filter(parser -> parser.accepts(type))
-                    .findFirst().orElse(null);
+    static {
+        HashMap<Class<?>, SettingsIO> tempMap = new HashMap<>();
+        for (SettingsIO type : SettingsIO.values()) {
+            tempMap.put(type.klass, type);
         }
+        map = Collections.unmodifiableMap(tempMap);
     }
 }

src/api/java/baritone/api/utils/TypeUtils.java

@@ -1,44 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.utils;
-
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-
-/**
- * @author Brady
- * @since 4/20/2019
- */
-public final class TypeUtils {
-
-    private TypeUtils() {}
-
-    /**
-     * Resolves the "base type" for the specified type. For example, if the specified
-     * type is {@code List<String>}, then {@code List.class} will be returned. If the
-     * specified type is already a class, then it is directly returned.
-     *
-     * @param type The type to resolve
-     * @return The base class
-     */
-    public static Class<?> resolveBaseClass(Type type) {
-        return type instanceof Class ? (Class<?>) type
-                : type instanceof ParameterizedType ? (Class<?>) ((ParameterizedType) type).getRawType()
-                : null;
-    }
-}

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

@@ -19,41 +19,37 @@ package baritone.api.utils;
 
 import net.minecraft.block.BlockFire;
 import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.math.shapes.VoxelShape;
-import net.minecraft.world.World;
 
 /**
  * @author Brady
  * @since 10/13/2018
  */
 public final class VecUtils {
+    /**
+     * The {@link Minecraft} instance
+     */
+    private static final Minecraft mc = Minecraft.getMinecraft();
 
     private VecUtils() {}
 
     /**
      * Calculates the center of the block at the specified position's bounding box
      *
-     * @param world The world that the block is in, used to provide the bounding box
-     * @param pos   The block position
+     * @param pos The block position
      * @return The center of the block's bounding box
      * @see #getBlockPosCenter(BlockPos)
      */
-    public static Vec3d calculateBlockCenter(World world, BlockPos pos) {
-        IBlockState b = world.getBlockState(pos);
-        VoxelShape shape = b.getCollisionShape(world, pos);
-        if (shape.isEmpty()) {
-            return getBlockPosCenter(pos);
-        }
-        double xDiff = (shape.getStart(EnumFacing.Axis.X) + shape.getEnd(EnumFacing.Axis.X)) / 2;
-        double yDiff = (shape.getStart(EnumFacing.Axis.Y) + shape.getEnd(EnumFacing.Axis.Y)) / 2;
-        double zDiff = (shape.getStart(EnumFacing.Axis.Z) + shape.getEnd(EnumFacing.Axis.Z)) / 2;
-        if (Double.isNaN(xDiff) || Double.isNaN(yDiff) || Double.isNaN(zDiff)) {
-            throw new IllegalStateException(b + " " + pos + " " + shape);
-        }
+    public static Vec3d calculateBlockCenter(BlockPos pos) {
+        IBlockState b = mc.world.getBlockState(pos);
+        AxisAlignedBB bbox = b.getBoundingBox(mc.world, pos);
+        double xDiff = (bbox.minX + bbox.maxX) / 2;
+        double yDiff = (bbox.minY + bbox.maxY) / 2;
+        double zDiff = (bbox.minZ + bbox.maxZ) / 2;
         if (b.getBlock() instanceof BlockFire) {//look at bottom of fire when putting it out
             yDiff = 0;
         }
@@ -72,7 +68,7 @@ public final class VecUtils {
      *
      * @param pos The block position
      * @return The assumed center of the position
-     * @see #calculateBlockCenter(World, BlockPos)
+     * @see #calculateBlockCenter(BlockPos)
      */
     public static Vec3d getBlockPosCenter(BlockPos pos) {
         return new Vec3d(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);

src/api/java/baritone/api/utils/interfaces/Toggleable.java

@@ -15,57 +15,40 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.input;
+package baritone.api.utils.interfaces;
 
 /**
- * An {@link Enum} representing the inputs that control the player's
- * behavior. This includes moving, interacting with blocks, jumping,
- * sneaking, and sprinting.
+ * @author Brady
+ * @since 8/20/2018
  */
-public enum Input {
+public interface Toggleable {
 
     /**
-     * The move forward input
+     * Toggles the enabled state of this {@link Toggleable}.
+     *
+     * @return The new state.
      */
-    MOVE_FORWARD,
+    boolean toggle();
 
     /**
-     * The move back input
+     * Sets the enabled state of this {@link Toggleable}.
+     *
+     * @return The new state.
      */
-    MOVE_BACK,
+    boolean setEnabled(boolean enabled);
 
     /**
-     * The move left input
+     * @return Whether or not this {@link Toggleable} object is enabled
      */
-    MOVE_LEFT,
+    boolean isEnabled();
 
     /**
-     * The move right input
+     * Called when the state changes from disabled to enabled
      */
-    MOVE_RIGHT,
+    default void onEnable() {}
 
     /**
-     * The attack input
+     * Called when the state changes from enabled to disabled
      */
-    CLICK_LEFT,
-
-    /**
-     * The use item input
-     */
-    CLICK_RIGHT,
-
-    /**
-     * The jump input
-     */
-    JUMP,
-
-    /**
-     * The sneak input
-     */
-    SNEAK,
-
-    /**
-     * The sprint input
-     */
-    SPRINT
+    default void onDisable() {}
 }

src/launch/java/baritone/launch/BaritoneTweaker.java

@@ -29,7 +29,7 @@ import java.util.List;
 
 /**
  * @author Brady
- * @since 7/31/2018
+ * @since 7/31/2018 9:59 PM
  */
 public class BaritoneTweaker extends SimpleTweaker {
 

src/launch/java/baritone/launch/LaunchTesting.java

@@ -1,105 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.launch;
-
-import com.google.common.base.Strings;
-import com.google.gson.GsonBuilder;
-import com.mojang.authlib.Agent;
-import com.mojang.authlib.exceptions.AuthenticationException;
-import com.mojang.authlib.properties.PropertyMap;
-import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
-import com.mojang.authlib.yggdrasil.YggdrasilUserAuthentication;
-import net.minecraft.launchwrapper.Launch;
-
-import java.io.File;
-import java.lang.reflect.Field;
-import java.net.Proxy;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Based on GradleStart from ForgeGradle 2.3
- *
- * @author Brady
- * @since 3/11/2019
- */
-public class LaunchTesting {
-
-    public static void main(String[] args) {
-        Map<String, String> arguments = new HashMap<>();
-
-        hackNatives();
-        arguments.put("version", "BaritownedDeveloperEnvironment");
-        arguments.put("assetIndex", System.getenv("assetIndex"));
-        arguments.put("assetsDir", System.getenv().getOrDefault("assetDirectory", "assets"));
-        arguments.put("accessToken", "FML");
-        arguments.put("userProperties", "{}");
-        arguments.put("tweakClass", System.getenv("tweakClass"));
-        String password = System.getenv("password");
-        if (password != null && !password.isEmpty()) {
-            attemptLogin(arguments, System.getenv("username"), System.getenv("password"));
-        }
-
-        List<String> argsArray = new ArrayList<>();
-        arguments.forEach((k, v) -> {
-            argsArray.add("--" + k);
-            argsArray.add(v);
-        });
-
-        Launch.main(argsArray.toArray(new String[0]));
-    }
-
-    private static void hackNatives() {
-        String paths = System.getProperty("java.library.path");
-        String nativesDir = System.getenv().get("nativesDirectory");
-
-        if (Strings.isNullOrEmpty(paths))
-            paths = nativesDir;
-        else
-            paths += File.pathSeparator + nativesDir;
-
-        System.setProperty("java.library.path", paths);
-
-        // hack the classloader now.
-        try {
-            final Field sysPathsField = ClassLoader.class.getDeclaredField("sys_paths");
-            sysPathsField.setAccessible(true);
-            sysPathsField.set(null, null);
-        } catch (Throwable ignored) {}
-    }
-
-    private static void attemptLogin(Map<String, String> argMap, String username, String password) {
-        YggdrasilUserAuthentication auth = (YggdrasilUserAuthentication) (new YggdrasilAuthenticationService(Proxy.NO_PROXY, "1")).createUserAuthentication(Agent.MINECRAFT);
-        auth.setUsername(username);
-        auth.setPassword(password);
-
-        try {
-            auth.logIn();
-        } catch (AuthenticationException var4) {
-            throw new RuntimeException(var4);
-        }
-
-        argMap.put("accessToken", auth.getAuthenticatedToken());
-        argMap.put("uuid", auth.getSelectedProfile().getId().toString().replace("-", ""));
-        argMap.put("username", auth.getSelectedProfile().getName());
-        argMap.put("userType", auth.getUserType().getName());
-        argMap.put("userProperties", (new GsonBuilder()).registerTypeAdapter(PropertyMap.class, new PropertyMap.Serializer()).create().toJson(auth.getUserProperties()));
-    }
-}

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

@@ -32,9 +32,7 @@ import java.io.File;
 @Mixin(AnvilChunkLoader.class)
 public class MixinAnvilChunkLoader implements IAnvilChunkLoader {
 
-    @Shadow
-    @Final
-    private File chunkSaveLocation;
+    @Shadow @Final private File chunkSaveLocation;
 
     @Override
     public File getChunkSaveLocation() {

src/launch/java/baritone/launch/mixins/MixinBlockPos.java

@@ -35,12 +35,6 @@ public class MixinBlockPos extends Vec3i {
         super(xIn, yIn, zIn);
     }
 
-    /**
-     * The purpose of this was to ensure a friendly name for when we print raw
-     * block positions to chat in the context of an obfuscated environment.
-     *
-     * @return a string representation of the object.
-     */
     @Override
     @Nonnull
     public String toString() {

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

@@ -31,9 +31,7 @@ import org.spongepowered.asm.mixin.Shadow;
 @Mixin(ChunkProviderServer.class)
 public class MixinChunkProviderServer implements IChunkProviderServer {
 
-    @Shadow
-    @Final
-    private IChunkLoader chunkLoader;
+    @Shadow @Final private IChunkLoader chunkLoader;
 
     @Override
     public IChunkLoader getChunkLoader() {

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