premature optimization

.gitattributes

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

.github/ISSUE_TEMPLATE/bug.md

@@ -1,35 +0,0 @@
----
-name: Bug report
-about: Please file a separate report for each issue
-title: Please add a brief but descriptive title
-labels: bug
-assignees: ''
----
-
-## Some information
-Operating system:
-Java version:
-Minecraft version:
-Baritone version:
-Other mods (if used): 
-
-## Exception, error or logs
-Please find your `latest.log` or `debug.log` in this folder and attach it to the issue
-
-Linux: `~/.minecraft/logs/`
-
-Windows: `%appdata%/.minecraft/logs/`
-
-Mac: `/Library/Application\ Support/minecraft/logs/`
-
-## How to reproduce
-Add your steps to reproduce the issue/bug experienced here.
-
-## Modified settings
-To get the modified settings run `#modified` in game
-
-## Final checklist
-- [x] I know how to properly use check boxes 
-- [ ] I have included the version of Minecraft I'm running, baritone's version and forge mods (if used).
-- [ ] I have included logs, exceptions and / or steps to reproduce the issue.
-- [ ] I have not used any OwO's or UwU's in this issue.

.github/ISSUE_TEMPLATE/question.md

@@ -1,14 +0,0 @@
----
-name: Question
-about: Please file a separate report for each question
-title: Please add a brief but descriptive title
-labels: question
-assignees: ''
----
-
-## What do you need help with?
-With as much detail as possible, describe your question and what you may need help with.
-
-## Final checklist
-- [x] I know how to properly use check boxes 
-- [ ] I have not used any OwO's or UwU's in this issue.

.github/ISSUE_TEMPLATE/suggestion.md

@@ -1,20 +0,0 @@
----
-name: Suggestion
-about: Please file a separate report for each suggestion
-title: Please add a brief but descriptive title
-labels: enhancement
-assignees: ''
----
-
-## Describe your suggestion
-With as much detail as possible, describe what your suggestion would do for Baritone.
-
-## Settings
-If applicable, what settings/customizability should be offered to tweak the functionality of your suggestion.
-
-## Context
-Describe how your suggestion would improve Baritone, or the reason behind it being added.
-
-## Final checklist
-- [x] I know how to properly use check boxes 
-- [ ] I have not used any OwO's or UwU's in this issue.

.github/PULL_REQUEST_TEMPLATE.md

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

.github/workflows/gradle_build.yml

@@ -1,45 +0,0 @@
-# This workflow will build a Java project with Gradle
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
-
-name: Java CI with Gradle
-
-on:
-  push:
-  pull_request:
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 8
-      uses: actions/setup-java@v3
-      with:
-        java-version: '8'
-        distribution: 'temurin'
-        
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-      
-    - name: Build with Gradle
-      run: ./gradlew build
-      
-    - name: Build (fabric) with Gradle
-      run: ./gradlew build -Pbaritone.fabric_build
-
-    - name: Build (forge) with Gradle
-      run: ./gradlew build -Pbaritone.forge_build
-
-    - name: Archive Artifacts
-      uses: actions/upload-artifact@v3
-      with:
-        name: Artifacts
-        path: dist/
-        
-    - name: Archive mapping.txt
-      uses: actions/upload-artifact@v3
-      with:
-        name: Mappings
-        path: build/tmp/proguard/mapping.txt

.github/workflows/run_tests.yml

@@ -1,26 +0,0 @@
-
-name: Tests
-
-on:
-  push:
-  pull_request:
-
-jobs:
-  test:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 8
-      uses: actions/setup-java@v3
-      with:
-        java-version: '8'
-        distribution: 'temurin'
-        
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-      
-    - name: Executing tests
-      run: ./gradlew test
-    

.gitignore

@@ -4,7 +4,6 @@
 run/
 autotest/
 dist/
-volderyarn/
 
 # Gradle
 build/
@@ -12,24 +11,11 @@ build/
 classes/
 *.class
 
-/out
-
 # IntelliJ Files
 .idea/
 *.iml
-*.ipr
-*.iws
 /logs/
 
-# Eclipse Files
-.classpath
-.project
-.settings/
-baritone_Client.launch
-
 # Copyright Files
 !/.idea/copyright/Baritone.xml
-!/.idea/copyright/profiles_settings.xml
-
-.vscode/launch.json
-
+!/.idea/copyright/profiles_settings.xml

.gitlab-ci.yml

@@ -1,14 +0,0 @@
-image: java:8
-
-before_script:
-  - which java
-  - which javac
-
-build:
-  script:
-    - ./gradlew build
-    - ./gradlew build -Pbaritone.forge_build
-  artifacts:
-    paths:
-      - dist/*
-    expire_in: 1 week

.gitmessage

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

.travis.yml

@@ -0,0 +1,29 @@
+language: java
+
+sudo: required
+
+services:
+- docker
+
+install:
+- travis_retry docker build -t cabaletta/baritone .
+
+script:
+- docker run --rm cabaletta/baritone ./gradlew javadoc
+- docker run --name baritone cabaletta/baritone /bin/sh -c "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
+
+deploy:
+  provider: releases
+  api_key:
+    secure: YOuiXoJNpB4bW89TQoY2IGXg0tqOKls55YMXsSPU6Mx8WzRu8CjjO/A8KA9nGfNrKM+NucjiKr/h53O2Dp2uyy0i0SLvav/G0MaBMeB1NlPRwFopi6tVPNaoZsvr8NW4BIURhspckYLpOTYWnfmOkIv8q7AxrjUZWPKDlq0dte20UxEqUE6msHJ7U9XlKo/4fX40kvWMfwGI2hTyAtL0cRT1QPsd+uW3OQjAPcQj+jKaWld46V8pBK8g9Qde9mo8HC9NBv97zw1bBF1EFkynW569kElHvaS2Opl2QLGaf66guDbpnqDpGHMhQrDdxsZHJ4RksyITn+8A9UArmbkU35BxKqBeQqOWxod2+M0axdLh1pvX43Q1t9n7RiZBf7GvV8vkXL5Sjf8v6Y4LqkJGhvQkTUwpH+0knwrE761DMCtBC34AiWG70D4u7msmhurkflr9kmRHSj/3lyJ1Q2lkt8L+FOAlQBVs64vXTsfgc6Yge7N0O3UD5hCkrDNoz3BzhNBdCkbdxdKCGip71UZgUNkPy9o3ui8jATNj9ypx3+U8ovqP0XWlJqUZmyeXyNGW9NrLeCkRLTlLnZ/dv6OPONa1oAu4TwF1w5A+TGRFZcZjH/PnZKZDQ1OYQOR6drLKRYdr2unvuf5KUKUGqZ7aYtLGhP0rBvGWddRV7DSmX/s=
+  all_branches: true
+  file_glob: true
+  file:
+  - dist/*
+  skip_cleanup: true
+  on:
+    tags: true
+    repo: cabaletta/baritone

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 (including uwu's or owo's)
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Giving and 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 or consent
-* 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,17 +1,24 @@
-FROM debian:stretch
+FROM debian:jessie
+
+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 --force-yes mesa-utils libgl1-mesa-glx libxcursor1 libxrandr2 libxxf86vm1 x11-xserver-utils xfonts-base xserver-common
+
 COPY . /code
 
 WORKDIR /code
 
-RUN ./gradlew build
-RUN ./gradlew build -Pbaritone.forge_build
-RUN ./gradlew build -Pbaritone.fabric_build
+# this .deb is specially patched to support lwjgl
+# source: https://github.com/tectonicus/tectonicus/issues/60#issuecomment-154239173
+RUN dpkg -i scripts/xvfb_1.16.4-1_amd64.deb
+
+RUN ./gradlew build

FEATURES.md

@@ -4,7 +4,7 @@
 - **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).
@@ -22,9 +22,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:

INSTALL.md

@@ -0,0 +1,88 @@
+# 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
+You can either build Baritone through a command line or through IntelliJ's UI, information on that can be found [here](SETUP.md#building).
+
+## 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,103 +1,51 @@
 # Baritone
-<p align="center">
-  <a href="https://github.com/cabaletta/baritone/releases/"><img src="https://img.shields.io/github/downloads/cabaletta/baritone/total.svg" alt="GitHub All Releases"/></a>
-</p>
+[![Build Status](https://travis-ci.com/cabaletta/baritone.svg?branch=master)](https://travis-ci.com/cabaletta/baritone)
+[![Release](https://img.shields.io/github/release/cabaletta/baritone.svg)](https://github.com/cabaletta/baritone/releases)
+[![License](https://img.shields.io/badge/license-LGPL--3.0-green.svg)](LICENSE)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/a73d037823b64a5faf597a18d71e3400)](https://www.codacy.com/app/leijurv/baritone?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=cabaletta/baritone&amp;utm_campaign=Badge_Grade)
+[![HitCount](http://hits.dwyl.com/cabaletta/baritone.svg)](http://hits.dwyl.com/cabaletta/baritone)
+[![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)
+[![Minecraft](https://img.shields.io/badge/MC-1.12.2-green.svg)](https://minecraft.gamepedia.com/1.12.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/)
+[![Asuna integration](https://img.shields.io/badge/Asuna%20integration-builder%20branch-brightgreen.svg)](https://github.com/EmotionalLove/Asuna/)
+[![Impact integration](https://img.shields.io/badge/Impact%20integration-v1.0.0--hotfix--4-green.svg)](https://impactdevelopment.github.io/)
+[![KAMI integration](https://img.shields.io/badge/KAMI%20integration-v1.0.0-orange.svg)](https://github.com/zeroeightysix/KAMI/)
+[![WWE integration](https://img.shields.io/badge/WWE%20%22integration%22-v1.0.0%3F%3F%20smh%20license%20violations-orange.svg)](https://wweclient.com/)
+[![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)
 
-<p align="center">
-  <a href="https://github.com/cabaletta/baritone/tree/master"><img src="https://img.shields.io/badge/MC-1.12.2-brightgreen.svg" alt="Minecraft"/></a>
-  <a href="https://github.com/cabaletta/baritone/tree/1.13.2"><img src="https://img.shields.io/badge/MC-1.13.2-yellow.svg" alt="Minecraft"/></a>
-  <a href="https://github.com/cabaletta/baritone/tree/1.14.4"><img src="https://img.shields.io/badge/MC-1.14.4-yellow.svg" alt="Minecraft"/></a>
-  <a href="https://github.com/cabaletta/baritone/tree/1.15.2"><img src="https://img.shields.io/badge/MC-1.15.2-yellow.svg" alt="Minecraft"/></a>
-  <a href="https://github.com/cabaletta/baritone/tree/1.16.5"><img src="https://img.shields.io/badge/MC-1.16.5-brightgreen.svg" alt="Minecraft"/></a>
-  <a href="https://github.com/cabaletta/baritone/tree/1.17.1"><img src="https://img.shields.io/badge/MC-1.17.1-brightgreen.svg" alt="Minecraft"/></a>
-  <a href="https://github.com/cabaletta/baritone/tree/1.18.2"><img src="https://img.shields.io/badge/MC-1.18.2-brightgreen.svg" alt="Minecraft"/></a>
-</p>
+A Minecraft pathfinder bot. 
 
-<p align="center">
-  <a href="https://travis-ci.com/cabaletta/baritone/"><img src="https://travis-ci.com/cabaletta/baritone.svg?branch=master" alt="Build Status"/></a>
-  <a href="https://github.com/cabaletta/baritone/releases/"><img src="https://img.shields.io/github/release/cabaletta/baritone.svg" alt="Release"/></a>
-  <a href="LICENSE"><img src="https://img.shields.io/badge/license-LGPL--3.0%20with%20anime%20exception-green.svg" alt="License"/></a>
-  <a href="https://www.codacy.com/gh/cabaletta/baritone/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=cabaletta/baritone&amp;utm_campaign=Badge_Grade"><img src="https://app.codacy.com/project/badge/Grade/cadab857dab049438b6e28b3cfc5570e" alt="Codacy Badge"/></a>
-  <a href="https://github.com/cabaletta/baritone/blob/master/CODE_OF_CONDUCT.md"><img src="https://img.shields.io/badge/%E2%9D%A4-code%20of%20conduct-blue.svg?style=flat" alt="Code of Conduct"/></a>
-  <a href="https://snyk.io/test/github/cabaletta/baritone?targetFile=build.gradle"><img src="https://snyk.io/test/github/cabaletta/baritone/badge.svg?targetFile=build.gradle" alt="Known Vulnerabilities"/></a>
-  <a href="https://github.com/cabaletta/baritone/issues/"><img src="https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat" alt="Contributions welcome"/></a>
-  <a href="https://github.com/cabaletta/baritone/issues/"><img src="https://img.shields.io/github/issues/cabaletta/baritone.svg" alt="Issues"/></a>
-  <a href="https://github.com/cabaletta/baritone/issues?q=is%3Aissue+is%3Aclosed"><img src="https://img.shields.io/github/issues-closed/cabaletta/baritone.svg" alt="GitHub issues-closed"/></a>
-  <a href="https://github.com/cabaletta/baritone/pulls/"><img src="https://img.shields.io/github/issues-pr/cabaletta/baritone.svg" alt="Pull Requests"/></a>
-  <a href="https://github.com/cabaletta/baritone/graphs/contributors/"><img src="https://img.shields.io/github/contributors/cabaletta/baritone.svg" alt="GitHub contributors"/></a>
-  <a href="https://github.com/cabaletta/baritone/commit/"><img src="https://img.shields.io/github/commits-since/cabaletta/baritone/v1.0.0.svg" alt="GitHub commits"/></a>
-  <img src="https://img.shields.io/github/languages/code-size/cabaletta/baritone.svg" alt="Code size"/>
-  <img src="https://img.shields.io/github/repo-size/cabaletta/baritone.svg" alt="GitHub repo size"/>
-  <img src="https://tokei.rs/b1/github/cabaletta/baritone?category=code" alt="Lines of Code"/>
-</p>
-
-<p align="center">
-  <a href="https://impactclient.net/"><img src="https://img.shields.io/badge/Impact%20integration-v1.2.14%20/%20v1.3.8%20/%20v1.4.6%20/%20v1.5.3%20/%20v1.6.3-brightgreen.svg" alt="Impact integration"/></a>
-  <a href="https://github.com/kami-blue/client"><img src="https://img.shields.io/badge/KAMI%20Blue%20integration-v1.2.14--master-green" alt="KAMI Blue integration"/></a>
-  <a href="https://github.com/fr1kin/ForgeHax/"><img src="https://img.shields.io/badge/ForgeHax%20%22integration%22-scuffed-yellow.svg" alt="ForgeHax integration"/></a>
-  <a href="https://aristois.net/"><img src="https://img.shields.io/badge/Aristois%20add--on%20integration-v1.6.3-green.svg" alt="Aristois add-on integration"/></a>
-  <a href="https://rootnet.dev/"><img src="https://img.shields.io/badge/rootNET%20integration-v1.2.14-green.svg" alt="rootNET integration"/></a>
-  <a href="https://futureclient.net/"><img src="https://img.shields.io/badge/Future%20integration-v1.2.12%20%2F%20v1.3.6%20%2F%20v1.4.4-red" alt="Future integration"/></a>
-  <a href="https://rusherhack.org/"><img src="https://img.shields.io/badge/RusherHack%20integration-v1.2.14-green" alt="RusherHack integration"/></a>
-</p>
-
-<p align="center">
-  <a href="http://forthebadge.com/"><img src="https://forthebadge.com/images/badges/built-with-swag.svg" alt="forthebadge"/></a>
-  <a href="http://forthebadge.com/"><img src="https://forthebadge.com/images/badges/mom-made-pizza-rolls.svg" alt="forthebadge"/></a>
-</p>
-
-A Minecraft pathfinder bot.
-
-[**Baritone Discord Server**](http://discord.gg/s6fRBAUpmr)
-
-Baritone is the pathfinding system used in [Impact](https://impactclient.net/) since 4.4. There's a [showcase video](https://youtu.be/CZkLXWo4Fg4) made by @Adovin#0730 on Baritone which I recommend. [Here's](https://www.youtube.com/watch?v=StquF69-_wI) a (very old!) video I made showing off what it can do.
-
-[Tutorial playlist](https://www.youtube.com/playlist?list=PLnwnJ1qsS7CoQl9Si-RTluuzCo_4Oulpa)
-
-The easiest way to install Baritone is to install [Impact](https://impactclient.net/), which comes with Baritone. The second easiest way (for 1.12.2 only) is to 
-install the v1.2.* `api-forge` jar from [releases](https://github.com/cabaletta/baritone/releases). **For 1.12.2 Forge, just click 
-[here](https://github.com/cabaletta/baritone/releases/download/v1.2.17/baritone-api-forge-1.2.17.jar)**. Otherwise, see [Installation & setup](SETUP.md). Once Baritone is installed, look [here](USAGE.md) for instructions on how to use it.
-
-For 1.16.5, [click here](https://www.youtube.com/watch?v=_4eVJ9Qz2J8) and see description. If you need Forge or Fabric 1.16.5, look [here](https://github.com/cabaletta/baritone/releases/tag/v1.6.3) and get the `api-forge` or `api-fabric` jar. **For 1.16.5 Fabric, just click [here](https://github.com/cabaletta/baritone/releases/download/v1.6.3/baritone-api-fabric-1.6.3.jar)**.
-
-If you need Forge or Fabric 1.17.1, look [here](https://github.com/cabaletta/baritone/releases/tag/v1.7.2) and get the `api-forge` or `api-fabric` jar. **For 1.17.1 Fabric, just click [here](https://github.com/cabaletta/baritone/releases/download/v1.7.2/baritone-api-fabric-1.7.2.jar)**.
-
-If you need Forge or Fabric 1.18.2, look [here](https://github.com/cabaletta/baritone/releases/tag/v1.8.3) and get the `api-forge` or `api-fabric` jar. **For 1.18.2 Fabric, just click [here](https://github.com/cabaletta/baritone/releases/download/v1.8.3/baritone-api-fabric-1.8.3.jar)**. **For 1.18.2 Forge, just click [here](https://github.com/cabaletta/baritone/releases/download/v1.8.3/baritone-api-forge-1.8.3.jar)**.
+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 onwards. Baritone focuses on reliability and particularly performance (it's over [30x faster](https://github.com/cabaletta/baritone/pull/180#issuecomment-423822928) than MineBot at calculating paths).
-
-Have committed at least once a day from Aug 1, 2018, to Aug 1, 2019.
-
-1Leijurv3DWTrGAfmmiTphjhXLvQiHg7K2
-
-# Getting Started
+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 [30x faster](https://github.com/cabaletta/baritone/pull/180#issuecomment-423822928) than MineBot at calculating paths).
 
 Here are some links to help to get started:
 
 - [Features](FEATURES.md)
 
-- [Installation & setup](SETUP.md)
+- [Setup](SETUP.md)
 
-- [API Javadocs](https://baritone.leijurv.com/)
+- [Installation](INSTALL.md)
 
-- [Settings](https://baritone.leijurv.com/baritone/api/Settings.html#field.detail)
+- [Javadocs](https://baritone.leijurv.com/)
 
-- [Usage (chat control)](USAGE.md)
+# Chat control
+[Defined Here](src/main/java/baritone/utils/ExampleBaritoneControl.java)
 
-## Stars over time
+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.
 
-[![Stargazers over time](https://starchart.cc/cabaletta/baritone.svg)](https://starchart.cc/cabaletta/baritone)
+# API example
 
-# API
-
-The API is heavily documented, you can find the Javadocs for the latest release [here](https://baritone.leijurv.com/).
-Please note that usage of anything located outside of the ``baritone.api`` package is not supported by the API release
-jar.
-
-Below is an example of basic usage for changing some settings, and then pathing to an X/Z goal.
-
-```java
+```
 BaritoneAPI.getSettings().allowSprint.value = true;
 BaritoneAPI.getSettings().primaryTimeoutMS.value = 2000L;
 
@@ -108,22 +56,12 @@ BaritoneAPI.getProvider().getPrimaryBaritone().getCustomGoalProcess().setGoalAnd
 
 ## Can I use Baritone as a library in my custom utility client?
 
-That's what it's for, sure! (As long as usage complies with the LGPL 3.0 License)
+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)
-
-### Additional Special Thanks To:
-
-![YourKit-Logo](https://www.yourkit.com/images/yklogo.png)
-
-YourKit supports open source projects with innovative and intelligent tools for monitoring and profiling Java and .NET applications.
-
-YourKit is the creator of the [YourKit Java Profiler](https://www.yourkit.com/java/profiler/), [YourKit .NET Profiler](https://www.yourkit.com/.net/profiler/), and [YourKit YouMonitor](https://www.yourkit.com/youmonitor/).
-
-We thank them for granting Baritone an OSS license so that we can make our software the best it can be.
+Magic. (Hours of [Leijurv](https://github.com/leijurv) enduring excruciating pain)
 
 ## Why is it called Baritone?
 
-It's named for FitMC's deep sultry voice.
+It's named for FitMC's deep sultry voice. 

SETUP.md

@@ -1,39 +1,5 @@
-# Installation
+# Setup
 
-The easiest way to install Baritone is to install [Impact](https://impactclient.net/), which comes with Baritone.
-
-You can also use a custom version json for Minecraft, with the [1.14.4](https://www.dropbox.com/s/rkml3hjokd3qv0m/1.14.4-Baritone.zip?dl=1) version or the [1.15.2](https://www.dropbox.com/s/8rx6f0kts9hvd4f/1.15.2-Baritone.zip?dl=1) version or the [1.16.5](https://www.dropbox.com/s/i6f292o2i7o9acp/1.16.5-Baritone.zip?dl=1) version.
-
-Once Baritone is installed, look [here](USAGE.md) for instructions on how to use it.
-
-## 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)
-
-v1.2.* is for 1.12.2, v1.3.* is for 1.13.2, v1.4.* is for 1.14.4, v1.5.* is for 1.15.2, v1.6.* is for 1.16.5, v1.7.* is for 1.17.1, v1.8.* is for 1.18.1
-
-Any official release will be GPG signed by leijurv (44A3EA646EADAC6A). Please verify that the hash of the file you download is in `checksums.txt` and that `checksums_signed.asc` is a valid signature by that public keys of `checksums.txt`. 
-
-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 and Fabric releases can simply be added as a Forge/Fabric mods.**
-
-If another one of your Forge mods has a Baritone integration, you want `baritone-api-forge-VERSION.jar`. Otherwise, you want `baritone-standalone-forge-VERSION.jar`
-
-- **API**: Only the non-api packages are obfuscated. This should be used in environments where other mods would like to use Baritone's features.
-- **Forge/Fabric API**: Same as API, but packaged for Forge/Fabric. This should be used where another mod has a Baritone integration.
-- **Standalone**: Everything is obfuscated. This should be used in environments where there are no other mods present that would like to use Baritone's features.
-- **Forge/Fabric Standalone**: Same as Standalone, but packaged for Forge/Fabric. This should be used when Baritone is your only Forge/Fabric mod, or none of your other Forge/Fabric mods integrate with Baritone.
-- **Unoptimized**: Nothing is obfuscated. This shouldn't be used ever in production.
-- **Forge/Fabric Unoptimized**: Same as Unoptimized, but packaged for Forge/Fabric.
-
-## Build it yourself
 - Clone or download Baritone
 
   ![Image](https://i.imgur.com/kbqBtoN.png)
@@ -43,29 +9,6 @@ If another one of your Forge mods has a Baritone integration, you want `baritone
 ## Command Line
 On Mac OSX and Linux, use `./gradlew` instead of `gradlew`.
 
-If you have errors with a package missing please make sure you have setup your environment, and are using Oracle JDK 8 for 1.12.2-1.16.5, JDK 16 for 1.17.1, and JDK 17 for 1.18.1.
-
-To check which java you are using do 
-`java -version` in a command prompt or terminal.
-If you are using anything above OpenJDK 8 for 1.12.2-1.16.5, it might not work because the Java distributions above JDK 8 using may not have the needed javax classes.
-
-Open JDK download: https://openjdk.java.net/install/
-#### macOS guide
-In order to get JDK 8, Try running the following command:
-`% /usr/libexec/java_home -V`
-If it doesn't work try this guide: https://stackoverflow.com/questions/46513639/how-to-downgrade-java-from-9-to-8-on-a-macos-eclipse-is-not-running-with-java-9
-
-If you see something like
-
-`% 1.8.0_VERSION, x86_64:	"Java SE 8"	/Library/Java/JavaVirtualMachines/jdk1.8.0_VERSION.jdk/Contents/Home`
-
-in the list then you've got JDK 8 installed. 
-In order to get JDK 8 running in the **current terminal window** you will have to run this command: 
-
-`% export JAVA_HOME=$(/usr/libexec/java_home -v 1.8)`
-
-To add OpenJDK 8 to your PATH add the export line to the end of your `.zshrc / .bashrc` if you want it to apply to each new terminal. If you're using bash change the .bachrc and if you're using zsh change the .zshrc
-
 Setting up the Environment:
 
 ```
@@ -73,24 +16,6 @@ $ gradlew setupDecompWorkspace
 $ gradlew --refresh-dependencies
 ```
 
-Building Baritone: 
-
-```
-$ gradlew build
-```
-
-For minecraft 1.15.2+, run the following instead to include the Forge jars:
-
-```
-$ gradlew build -Pbaritone.forge_build
-```
-
-Do this instead for Fabric jars:
-
-```
-$ gradlew build -Pbaritone.fabric_build
-```
-
 Running Baritone:
 
 ```
@@ -124,10 +49,31 @@ For information on how to build baritone, see [Building Baritone](#building-bari
   
   ![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
+- Right click on **build** and press **Run**
+
+## Artifacts
+
+Building Baritone will result in 3 artifacts created in the ``dist`` directory.
+
+- **API**: Only the non-api packages are obfuscated. This should be used in environments where other mods would like to use Baritone's features.
+- **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.
+- **Unoptimized**: Nothing is obfuscated. This shouldn't be used ever in production.
+
+## More Info
+To replace out Impact 4.4's Baritone build with a customized one, switch to the `impact4.4-compat` branch, 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"`). 

USAGE.md

@@ -1,107 +0,0 @@
-(assuming you already have Baritone [set up](SETUP.md))
-
-# Prefix
-
-Baritone's chat control prefix is `#` by default. In Impact, you can also use `.b` as a prefix. (for example, `.b click` instead of `#click`)
-
-Baritone commands can also 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, so using `#` is suggested.
-
-To disable direct chat control (with no prefix), turn off the `chatControl` setting. To disable chat control with the `#` prefix, turn off the `prefixControl` setting. In Impact, `.b` cannot be disabled. Be careful that you don't leave yourself with all control methods disabled (if you do, reset your settings by deleting the file `minecraft/baritone/settings.txt` and relaunching).
-
-# For Baritone 1.2.10+, 1.3.5+, 1.4.2+
-
-Lots of the commands have changed, BUT `#help` is improved vastly (its clickable! commands have tab completion! oh my!).
-
-Try `#help` I promise it won't just send you back here =)
-
-"wtf where is cleararea" -> look at `#help sel`
-
-"wtf where is goto death, goto waypoint" -> look at `#help wp` 
-
-just look at `#help` lmao
-
-Watch this [showcase video](https://youtu.be/CZkLXWo4Fg4)!
-
-# Commands
-
-[Tutorial playlist](https://www.youtube.com/playlist?list=PLnwnJ1qsS7CoQl9Si-RTluuzCo_4Oulpa)
-
-**All** of these commands may need a prefix before them, as above ^.
-
-`help`
-
-To toggle a boolean setting, just say its name in chat (for example saying `allowBreak` toggles whether Baritone will consider breaking blocks). For a numeric setting, say its name then the new value (like `primaryTimeoutMS 250`). It's case insensitive. To reset a setting to its default value, say `acceptableThrowawayItems reset`. To reset all settings, say `reset`. To see all settings that have been modified from their default values, say `modified`.
-
-Commands in Baritone:
-- `thisway 1000` then `path` to go in the direction you're facing for a thousand blocks
-- `goal x y z` or `goal x z` or `goal y`, then `path` to set a goal to a certain coordinate then path to it
-- `goto x y z` or `goto x z` or `goto y` to go to a certain coordinate (in a single step, starts going immediately)
-- `goal` to set the goal to your player's feet
-- `goal clear` to clear the goal
-- `cancel` or `stop` to stop everything, `forcecancel` is also an option
-- `goto portal` or `goto ender_chest` or `goto block_type` to go to a block. (in Impact, `.goto` is an alias for `.b goto` for the most part)
-- `mine diamond_ore iron_ore` to mine diamond ore or iron ore (turn on the setting `legitMine` to only mine ores that it can actually see. It will explore randomly around y=11 until it finds them.) An amount of blocks can also be specified, for example, `mine 64 diamond_ore`.
-- `click` to click your destination on the screen. Right click path to on top of the block, left click to path into it (either at foot level or eye level), and left click and drag to select an area (`#help sel` to see what you can do with that selection).
-- `follow player playerName` to follow a player. `follow players` to follow any players in range (combine with Kill Aura for a fun time). `follow entities` to follow any entities. `follow entity pig` to follow entities of a specific type.
-- `wp` for waypoints. A "tag" is like "home" (created automatically on right clicking a bed) or "death" (created automatically on death) or "user" (has to be created manually). So you might want `#wp save user coolbiome`, then to set the goal `#wp goal coolbiome` then `#path` to path to it. For death, `#wp goal death` will list waypoints under the "death" tag (remember stuff is clickable!)
-- `build` to build a schematic. `build blah.schematic` will load `schematics/blah.schematic` and build it with the origin being your player feet. `build blah.schematic x y z` to set the origin. Any of those can be relative to your player (`~ 69 ~-420` would build at x=player x, y=69, z=player z-420).
-- `schematica` to build the schematic that is currently open in schematica
-- `tunnel` to dig and make a tunnel, 1x2. It will only deviate from the straight line if necessary such as to avoid lava. For a dumber tunnel that is really just cleararea, you can `tunnel 3 2 100`, to clear an area 3 high, 2 wide, and 100 deep.
-- `farm` to automatically harvest, replant, or bone meal crops. Use `farm <range>` or `farm <range> <waypoint>` to limit the max distance from the starting point or a waypoint. 
-- `axis` to go to an axis or diagonal axis at y=120 (`axisHeight` is a configurable setting, defaults to 120).
-- `explore x z` to explore the world from the origin of x,z. Leave out x and z to default to player feet. This will continually path towards the closest chunk to the origin that it's never seen before. `explorefilter filter.json` with optional invert can be used to load in a list of chunks to load.
-- `invert` to invert the current goal and path. This gets as far away from it as possible, instead of as close as possible. For example, do `goal` then `invert` to run as far as possible from where you're standing at the start.
-- `come` tells Baritone to head towards your camera, useful when freecam doesn't move your player position.
-- `blacklist` will stop baritone from going to the closest block so it won't attempt to get to it.
-- `eta` to get information about the estimated time until the next segment and the goal, be aware that the ETA to your goal is really unprecise.
-- `proc` to view miscellaneous information about the process currently controlling Baritone.
-- `repack` to re-cache the chunks around you.
-- `gc` to call `System.gc()` which may free up some memory.
-- `render` to fix glitched chunk rendering without having to reload all of them.
-- `reloadall` to reload Baritone's world cache or `saveall` to save Baritone's world cache.
-- `find` to search through Baritone's cache and attempt to find the location of the block.
-- `surface` or `top` to tell Baritone to head towards the closest surface-like area, this can be the surface or highest available air space.
-- `version` to get the version of Baritone you're running
-- `damn` daniel
-
-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`
-- `mineScanDroppedItems`
-- `allowDiagonalAscend`
-
-
-
-
-# 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 `goto x z`.

build.gradle

@@ -1,361 +1,123 @@
-/*
- * 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.6.4'
-
-buildscript {
-    repositories {
-        maven {
-            name = 'forge'
-            url = 'http://files.minecraftforge.net/maven'
-        }
-        maven {
-            name = 'impactdevelopment-repo'
-            url = 'https://impactdevelopment.github.io/maven/'
-        }
-        maven {
-            url = 'https://www.dogforce-games.com/maven/'
-        }
-        maven {
-            url = 'https://maven.fabricmc.net/'
-        }
-        maven {
-            url = 'https://libraries.minecraft.net/'
-        }
-        mavenCentral()
-        jcenter()
-    }
-
-    dependencies {
-        classpath group: 'com.github.ImpactDevelopment', name: 'ForgeGradle', version: '3.0.115'
-        classpath group: 'com.github.ImpactDevelopment', name: 'MixinGradle', version: '0.6.2'
-        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.7-SNAPSHOT'
-    }
-}
-
-
-import baritone.gradle.fabric.CreateVolderYarn
-import baritone.gradle.task.CreateDistTask
-import baritone.gradle.task.ProguardTask
-import net.minecraftforge.gradle.userdev.tasks.RenameJarInPlace
-import org.apache.tools.ant.taskdefs.condition.Os
-
-apply plugin: 'java'
-apply plugin: 'maven'
-
-def mcpVersion = [channel: 'snapshot', version: '20201028-1.16.3']
-
-if (getProject().hasProperty("baritone.fabric_build")) {
-    CreateVolderYarn.genMappings("1.16.5", mcpVersion)
-    apply plugin: 'fabric-loom'
-} else {
-    apply plugin: 'net.minecraftforge.gradle'
-    apply plugin: 'org.spongepowered.mixin'
-}
-
-
-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
-    }
-
-    schematica_api {
-        compileClasspath += main.compileClasspath
-    }
-
-    main {
-        compileClasspath += schematica_api.output
-    }
-}
-
-task sourceJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
-    from sourceSets.api.allSource
-}
-if (getProject().hasProperty("baritone.fabric_build")) {
-    minecraft.refmapName = "mixins.baritone.refmap.json"
-} else {
-    minecraft {
-        mappings mcpVersion
-
-        if (getProject().hasProperty("baritone.forge_build")) {
-            reobfMappings 'searge'
-        } else {
-            reobfMappings 'notch'
-        }
-
-        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"
-                }
-            }
-        }
-    }
-
-    mixin {
-        defaultObfuscationEnv searge
-        add sourceSets.launch, 'mixins.baritone.refmap.json'
-    }
-}
-
-repositories {
-    mavenCentral()
-
-    maven {
-        name = 'SpongePowered'
-        url = 'https://repo.spongepowered.org/repository/maven-public/'
-    }
-    maven {
-        name = 'impactdevelopment-repo'
-        url = 'https://impactdevelopment.github.io/maven/'
-    }
-    maven {
-        url = 'https://www.dogforce-games.com/maven/'
-    }
-}
-
-dependencies {
-    if (getProject().hasProperty("baritone.fabric_build")) {
-        minecraft "com.mojang:minecraft:1.16.5"
-        mappings fileTree(dir: "./build/volderyarn", include: "**.jar")
-        modImplementation "net.fabricmc:fabric-loader:0.9.1+build.205"
-
-        // this makes it compile with the forge tweak stuff
-        implementation 'com.github.ImpactDevelopment:SimpleTweaker:1.2'
-        implementation('net.minecraft:launchwrapper:1.12') {
-            exclude module: 'lwjgl'
-        }
-
-        implementation 'com.google.code.findbugs:jsr305:3.0.2'
-    } else {
-        minecraft 'com.github.ImpactDevelopment:Vanilla:1.16.5'
-
-        runtime launchCompile('net.minecraft:launchwrapper:1.12') {
-            exclude module: 'lwjgl'
-        }
-        runtime launchCompile('org.ow2.asm:asm-debug-all:5.2')
-        runtime launchCompile('com.github.ImpactDevelopment:SimpleTweaker:1.2')
-        runtime launchCompile('org.spongepowered:mixin:0.8.3') {
-            // Mixin includes a lot of dependencies that are too up-to-date
-            exclude module: 'launchwrapper'
-            exclude module: 'guava'
-            exclude module: 'gson'
-            exclude module: 'commons-io'
-            exclude module: 'log4j-core'
-        }
-    }
-
-    testImplementation 'junit:junit:4.12'
-}
-
-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
-}
-
-if (getProject().hasProperty("baritone.fabric_build")) {
-    // skidded from fabric-example-mod (comments and all)
-    tasks.withType(JavaCompile).configureEach {
-        // ensure that the encoding is set to UTF-8, no matter what the system default is
-        // this fixes some edge cases with special characters not displaying correctly
-        // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-        // If Javadoc is generated, this must be specified in that task too.
-        it.options.encoding = "UTF-8"
-
-        // The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
-        // JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
-        // We'll use that if it's available, but otherwise we'll use the older option.
-        def targetVersion = 8
-        if (JavaVersion.current().isJava9Compatible()) {
-            it.options.release = targetVersion
-        }
-    }
-}
-
-jar {
-    from sourceSets.launch.output, sourceSets.api.output
-
-    if (!getProject().hasProperty("baritone.forge_build")) {
-        exclude "**/BaritoneForgeModXD.class"
-        exclude "**/mods.toml"
-    }
-
-    preserveFileTimestamps = false
-    reproducibleFileOrder = true
-
-    if (getProject().hasProperty("baritone.fabric_build")) {
-        filesMatching("fabric.mod.json") {
-            expand "version": version
-        }
-    } else {
-        exclude("fabric.mod.json")
-    }
-
-
-    manifest {
-        attributes(
-                'MixinConfigs': 'mixins.baritone.json',
-                "MixinConnector": "baritone.launch.BaritoneMixinConnector",
-
-                'Implementation-Title': 'Baritone',
-                'Implementation-Version': version,
-        )
-    }
-}
-
-// skidded from ProguardTask
-File getClientJar() {
-    return project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("launch").getRuntimeClasspath().getFiles()
-            .stream()
-            .filter({ f -> f.toString().endsWith("client-extra.jar") })
-            .map({ f -> new File(f.getParentFile(), "client.jar") })
-            .findFirst()
-            .get()
-}
-
-File getClientJarFabric() {
-    return project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("launch").getRuntimeClasspath().getFiles()
-            .stream()
-            .filter({ f -> f.getName().endsWith("-v2.jar") && f.getName().startsWith("minecraft-") })
-            .map({ f -> new File(f.getParentFile().getParentFile(), f.getName().toString().replace("mapped", "intermediary")) })
-            .findFirst()
-            .get()
-}
-
-if (getProject().hasProperty("baritone.fabric_build")) {
-    task copyMcJar(type: Copy) {
-        def mcJar = { getClientJarFabric() }
-
-        from mcJar
-        into 'build/createMcIntermediaryJar/'
-        rename { 'client.jar' }
-    }
-
-    task proguard(type: ProguardTask, dependsOn: copyMcJar) {
-        url 'https://downloads.sourceforge.net/project/proguard/proguard/6.0/proguard6.0.3.zip'
-        extract 'proguard6.0.3/lib/proguard.jar'
-    }
-
-    task createDist(type: CreateDistTask, dependsOn: proguard)
-
-} else {
-    task copyMcJar(type: Copy) {
-        def mcJar = { getClientJar() }
-
-        from mcJar
-        into 'build/createMcSrgJar/'
-        rename { 'client-srg.jar' }
-    }
-
-    task createSrgMc(type: RenameJarInPlace) {
-        setInput(new File(copyMcJar.getOutputs().getFiles().getSingleFile(), "client-srg.jar"))
-        setClasspath(files({ getClientJar() }))
-
-        // fork
-        setMappingType(net.minecraftforge.gradle.common.util.MappingFile.Mapping.SEARGE)
-        setJarTask('trans alaska pipeline')
-    }
-
-    project.afterEvaluate {
-        createSrgMc.dependsOn(extractSrg, copyMcJar)
-        createSrgMc.setMappings(extractSrg.getOutput())
-    }
-
-
-    task proguard(type: ProguardTask, dependsOn: createSrgMc) { // TODO: dont need to create srg mc if doing notch build
-        url 'https://downloads.sourceforge.net/project/proguard/proguard/6.0/proguard6.0.3.zip'
-        extract 'proguard6.0.3/lib/proguard.jar'
-    }
-
-    task createDist(type: CreateDistTask, dependsOn: proguard)
-
-}
-build.finalizedBy(createDist)
-
-install {
-    def jarApiName = String.format("%s-api-%s", rootProject.name, version.toString())
-    def jarApiForgeName = String.format("%s-api-forge-%s", rootProject.name, version.toString())
-    def jarSAName = String.format("%s-standalone-%s", rootProject.name, version.toString())
-    def jarSAForgeName = String.format("%s-standalone-forge-%s", rootProject.name, version.toString())
-
-    artifacts {
-        archives file("$buildDir/libs/"+jarApiName+".jar")
-        archives file("$buildDir/libs/"+jarApiForgeName+".jar")
-        archives file("$buildDir/libs/"+jarSAName+".jar")
-        archives file("$buildDir/libs/"+jarSAForgeName+".jar")
-    }
-    repositories.mavenInstaller {
-		addFilter('api') { artifact, file -> artifact.name == "baritone-api" }
-		addFilter('api-forge') { artifact, file -> artifact.name == "baritone-api-forge" }
-		addFilter('standalone') { artifact, file -> artifact.name == "baritone-standalone" }
-		addFilter('standalone-forge') { artifact, file -> artifact.name == "baritone-standalone-forge" }
-    }
-}
-
-install.dependsOn(build)
+/*
+ * 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-2'
+
+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'
+    options.encoding = "UTF-8" // allow emoji in comments :^)
+}
+
+sourceSets {
+    launch {
+        compileClasspath += main.compileClasspath + main.runtimeClasspath + main.output
+    }
+}
+
+minecraft {
+    version = '1.12.2'
+    mappings = 'stable_39'
+    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'
+}
+
+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
+}
+
+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)

buildSrc/src/main/java/baritone/gradle/fabric/CreateVolderYarn.java

@@ -1,259 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.gradle.fabric;
-
-import java.io.*;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-import java.util.zip.ZipOutputStream;
-
-/**
- * @Author Wagyourtail
- */
-public class CreateVolderYarn {
-    public static String VOLDERYARNFOLDER = "./build/volderyarn/";
-    public static String VOLDERYARN = "volderyarn-%s-%s-%s.jar";
-
-    public static void genMappings(String mcVersion, Map<String, String> mcpVersion) throws IOException {
-        //download yarn intermediary
-        URL intURL = new URL(String.format("https://maven.fabricmc.net/net/fabricmc/intermediary/%s/intermediary-%s-v2.jar", mcVersion, mcVersion));
-        String intermediary = readZipContentFromURL(intURL, "mappings/mappings.tiny").get("mappings/mappings.tiny");
-        Map<String, ClassData> mappings = parseTinyMap(intermediary);
-
-        //download srg
-        URL srgURL = new URL(String.format("https://files.minecraftforge.net/maven/de/oceanlabs/mcp/mcp_config/%s/mcp_config-%s.zip", mcVersion, mcVersion));
-        String tsrg = readZipContentFromURL(srgURL, "config/joined.tsrg").get("config/joined.tsrg");
-        MCPData mcpData = addTSRGData(mappings, tsrg);
-
-        //download mcp
-        URL mcpURL = new URL(String.format("https://files.minecraftforge.net/maven/de/oceanlabs/mcp/mcp_%s/%s/mcp_%s-%s.zip", mcpVersion.get("channel"), mcpVersion.get("version"), mcpVersion.get("channel"), mcpVersion.get("version")));
-        Map<String, String> mcpfiles = readZipContentFromURL(mcpURL, "fields.csv", "methods.csv");
-        addMCPData(mcpData, mcpfiles.get("fields.csv"), mcpfiles.get("methods.csv"));
-
-        StringBuilder builder = new StringBuilder("tiny\t2\t0\tintermediary\tnamed");
-        for (ClassData clazz : mappings.values()) {
-            builder.append("\n").append(clazz.getIntToMCP());
-        }
-
-        File outputFolder = new File(VOLDERYARNFOLDER);
-        if (!outputFolder.exists() && !outputFolder.mkdirs())
-            throw new RuntimeException("Failed to create dir for volderyarn mappings.");
-
-        for (File f : outputFolder.listFiles()) {
-            if (!f.isDirectory()) f.delete();
-        }
-
-        File outputFile = new File(outputFolder, String.format(VOLDERYARN, mcVersion, mcpVersion.get("channel"), mcpVersion.get("version")));
-        if (!outputFile.getParentFile().exists()) {
-            if (!outputFile.getParentFile().mkdir())
-                throw new FileNotFoundException("Failed to create folder for volderyarn!");
-        }
-
-        try (ZipOutputStream output = new ZipOutputStream(new FileOutputStream(outputFile))) {
-            output.putNextEntry(new ZipEntry("mappings/mappings.tiny"));
-            byte[] outData = builder.toString().getBytes(StandardCharsets.UTF_8);
-            output.write(outData, 0, outData.length);
-        }
-    }
-
-    private static Map<String, ClassData> parseTinyMap(String map) {
-        Map<String, ClassData> mappings = new LinkedHashMap<>();
-        ClassData clazzdata = null;
-        for (String line : map.split("\n")) {
-            String[] parts = line.trim().split("\t");
-            switch (parts[0]) {
-                case "c":
-                    mappings.put(parts[1], clazzdata = new ClassData(mappings, parts[1], parts[2]));
-                    break;
-                case "m":
-                    assert clazzdata != null;
-                    clazzdata.addMethod(parts[2], parts[1], parts[3]);
-                    break;
-                case "f":
-                    assert clazzdata != null;
-                    clazzdata.addField(parts[2], parts[1], parts[3]);
-                    break;
-                default:
-            }
-        }
-        return mappings;
-    }
-
-    private static MCPData addTSRGData(Map<String, ClassData> mappings, String tsrg) {
-        MCPData mcpData = new MCPData();
-        String[] classes = String.join("\t", tsrg.split("\n\t")).split("\n");
-        for (String c : classes) {
-            String[] lines = c.split("\t");
-            String[] classData = lines[0].split("\\s+");
-            ClassData clazz = mappings.get(classData[0]);
-            if (clazz == null) continue;
-            clazz.mcpName = classData[1];
-            for (int i = 1; i < lines.length; ++i) {
-                String[] lineData = lines[i].split("\\s+");
-                //method
-                if (lineData.length == 3) {
-                    if (!mcpData.methods.containsKey(lineData[2])) mcpData.methods.put(lineData[2], new LinkedList<>());
-                    MethodData d = clazz.methods.get(lineData[0] + lineData[1]);
-                    if (d == null) continue;
-                    d.mcpName = lineData[2];
-                    mcpData.methods.get(lineData[2]).add(d);
-                    //field
-                } else {
-                    if (!mcpData.fields.containsKey(lineData[1])) mcpData.fields.put(lineData[1], new LinkedList<>());
-                    FieldData d = clazz.fields.get(lineData[0]);
-                    if (d == null) continue;
-                    d.mcpName = lineData[1];
-                    mcpData.fields.get(lineData[1]).add(d);
-                }
-            }
-        }
-        return mcpData;
-    }
-
-    private static void addMCPData(MCPData mcpData, String fields, String methods) {
-        for (String field : fields.split("\n")) {
-            String[] fieldData = field.split(",");
-            mcpData.fields.getOrDefault(fieldData[0].trim(), new LinkedList<>()).forEach(f -> f.mcpName = fieldData[1].trim());
-        }
-
-        for (String method : methods.split("\n")) {
-            String[] methodData = method.split(",");
-            mcpData.methods.getOrDefault(methodData[0].trim(), new LinkedList<>()).forEach(m -> m.mcpName = methodData[1].trim());
-        }
-    }
-
-    private static Map<String, String> readZipContentFromURL(URL remote, String... files) throws IOException {
-        try (ZipInputStream is = new ZipInputStream(new BufferedInputStream(remote.openStream(), 1024))) {
-            byte[] buff = new byte[1024];
-            ZipEntry entry;
-            Set<String> fileList = new HashSet<>(Arrays.asList(files));
-            Map<String, String> fileContents = new HashMap<>();
-            while ((entry = is.getNextEntry()) != null) {
-                if (fileList.contains(entry.getName())) {
-                    StringBuilder builder = new StringBuilder();
-                    int read;
-                    while ((read = is.read(buff, 0, 1024)) > 0) {
-                        builder.append(new String(buff, 0, read));
-                    }
-                    fileContents.put(entry.getName(), builder.toString());
-                }
-            }
-            return fileContents;
-        }
-    }
-
-    private static class ClassData {
-        final Map<String, ClassData> classMap;
-        final String obf;
-        final String intermediary;
-        String mcpName;
-
-        final Map<String, MethodData> methods = new LinkedHashMap<>();
-        final Map<String, FieldData> fields = new LinkedHashMap<>();
-
-        public ClassData(Map<String, ClassData> classMap, String obf, String intermediary) {
-            this.classMap = classMap;
-            this.obf = obf;
-            this.intermediary = intermediary;
-        }
-
-        public void addMethod(String obf, String obfSig, String intermediary) {
-            methods.put(obf + obfSig, new MethodData(classMap, obf, obfSig, intermediary));
-        }
-
-        public void addField(String obf, String obfSig, String intermediary) {
-            fields.put(obf, new FieldData(classMap, obf, obfSig, intermediary));
-        }
-
-        public String getIntToMCP() {
-            StringBuilder builder = new StringBuilder("c\t").append(intermediary).append("\t").append(mcpName);
-            for (MethodData method : methods.values()) {
-                builder.append("\n\tm\t").append(method.getIntermediarySig()).append("\t").append(method.intermediary).append("\t").append(method.mcpName);
-            }
-            for (FieldData field : fields.values()) {
-                builder.append("\n\tf\t").append(field.getIntermediarySig()).append("\t").append(field.intermediary).append("\t").append(field.mcpName);
-            }
-            return builder.toString();
-        }
-    }
-
-    private static class MethodData {
-        final Map<String, ClassData> classMap;
-        final String obf;
-        final String intermediary;
-        String mcpName;
-
-        final String obfSig;
-
-        public MethodData(Map<String, ClassData> classMap, String obf, String obfSig, String intermediary) {
-            this.classMap = classMap;
-            this.obf = obf;
-            this.obfSig = obfSig;
-            this.intermediary = intermediary;
-        }
-
-        public String getIntermediarySig() {
-            int offset = 0;
-            Matcher m = Pattern.compile("L(.+?);").matcher(obfSig);
-            String intSig = obfSig;
-            while (m.find()) {
-                if (!classMap.containsKey(m.group(1))) continue;
-                String intName = classMap.get(m.group(1)).intermediary;
-                intSig = intSig.substring(0, m.start(1) + offset) + intName + intSig.substring(m.end(1) + offset);
-                offset += intName.length() - m.group(1).length();
-            }
-            return intSig;
-        }
-    }
-
-    private static class FieldData {
-        final Map<String, ClassData> classMap;
-        final String obf;
-        final String intermediary;
-        String mcpName;
-
-        final String obfSig;
-
-        public FieldData(Map<String, ClassData> classMap, String obf, String obfSig, String intermediary) {
-            this.classMap = classMap;
-            this.obf = obf;
-            this.obfSig = obfSig;
-            this.intermediary = intermediary;
-        }
-
-        public String getIntermediarySig() {
-            Matcher m = Pattern.compile("(\\[*)L(.+?);").matcher(obfSig);
-            if (m.find()) {
-                if (!classMap.containsKey(m.group(2))) return obfSig;
-                return m.group(1) + "L" + classMap.get(m.group(2)).intermediary + ";";
-            } else {
-                return obfSig;
-            }
-        }
-    }
-
-    private static class MCPData {
-        final Map<String, List<MethodData>> methods = new HashMap<>();
-        final Map<String, List<FieldData>> fields = new HashMap<>();
-    }
-}

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

@@ -17,14 +17,16 @@
 
 package baritone.gradle.task;
 
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
 import org.gradle.api.DefaultTask;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.List;
 
 /**
  * @author Brady
@@ -32,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",
@@ -41,53 +45,35 @@ class BaritoneGradleTask extends DefaultTask {
             PROGUARD_STANDALONE_CONFIG      = "standalone.pro",
             PROGUARD_EXPORT_PATH            = "proguard_out.jar",
 
-            ARTIFACT_STANDARD           = "%s-%s.jar",
-            ARTIFACT_UNOPTIMIZED        = "%s-unoptimized-%s.jar",
-            ARTIFACT_API                = "%s-api-%s.jar",
-            ARTIFACT_STANDALONE         = "%s-standalone-%s.jar",
-            ARTIFACT_FORGE_UNOPTIMIZED  = "%s-unoptimized-forge-%s.jar",
-            ARTIFACT_FORGE_API          = "%s-api-forge-%s.jar",
-            ARTIFACT_FORGE_STANDALONE   = "%s-standalone-forge-%s.jar",
-            ARTIFACT_FABRIC_UNOPTIMIZED = "%s-unoptimized-fabric-%s.jar",
-            ARTIFACT_FABRIC_API         = "%s-api-fabric-%s.jar",
-            ARTIFACT_FABRIC_STANDALONE  = "%s-standalone-fabric-%s.jar";
+            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 final Path
-        artifactPath,
-        artifactUnoptimizedPath, artifactApiPath, artifactStandalonePath, // these are different for forge builds
-        proguardOut;
+    protected Path artifactPath, artifactUnoptimizedPath, artifactApiPath, artifactStandalonePath, proguardOut;
 
-    public BaritoneGradleTask() {
+    protected void verifyArtifacts() throws IllegalStateException {
         this.artifactName = getProject().getName();
         this.artifactVersion = getProject().getVersion().toString();
 
-        this.artifactPath = this.getBuildFile(formatVersion(ARTIFACT_STANDARD));
-
-        if (getProject().hasProperty("baritone.forge_build")) {
-            this.artifactUnoptimizedPath = this.getBuildFile(formatVersion(ARTIFACT_FORGE_UNOPTIMIZED));
-            this.artifactApiPath         = this.getBuildFile(formatVersion(ARTIFACT_FORGE_API));
-            this.artifactStandalonePath  = this.getBuildFile(formatVersion(ARTIFACT_FORGE_STANDALONE));
-        } else if (getProject().hasProperty("baritone.fabric_build")) {
-            this.artifactUnoptimizedPath = this.getBuildFile(formatVersion(ARTIFACT_FABRIC_UNOPTIMIZED));
-            this.artifactApiPath         = this.getBuildFile(formatVersion(ARTIFACT_FABRIC_API));
-            this.artifactStandalonePath  = this.getBuildFile(formatVersion(ARTIFACT_FABRIC_STANDALONE));
-        } else {
-            this.artifactUnoptimizedPath = this.getBuildFile(formatVersion(ARTIFACT_UNOPTIMIZED));
-            this.artifactApiPath         = this.getBuildFile(formatVersion(ARTIFACT_API));
-            this.artifactStandalonePath  = this.getBuildFile(formatVersion(ARTIFACT_STANDALONE));
-        }
+        this.artifactPath            = this.getBuildFile(formatVersion(ARTIFACT_STANDARD));
+        this.artifactUnoptimizedPath = this.getBuildFile(formatVersion(ARTIFACT_UNOPTIMIZED));
+        this.artifactApiPath         = this.getBuildFile(formatVersion(ARTIFACT_API));
+        this.artifactStandalonePath  = this.getBuildFile(formatVersion(ARTIFACT_STANDALONE));
 
         this.proguardOut = this.getTemporaryFile(PROGUARD_EXPORT_PATH);
-    }
 
-    protected void verifyArtifacts() throws IllegalStateException {
         if (!Files.exists(this.artifactPath)) {
             throw new IllegalStateException("Artifact not found! Run build first!");
         }
     }
 
-    protected void write(InputStream stream, Path file) throws IOException {
+    protected void write(InputStream stream, Path file) throws Exception {
         if (Files.exists(file)) {
             Files.delete(file);
         }
@@ -109,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

@@ -23,9 +23,9 @@ import javax.xml.bind.DatatypeConverter;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.security.MessageDigest;
-import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 
@@ -42,9 +42,9 @@ public class CreateDistTask extends BaritoneGradleTask {
         super.verifyArtifacts();
 
         // Define the distribution file paths
-        Path api = getRelativeFile("dist/" + getFileName(artifactApiPath));
-        Path standalone = getRelativeFile("dist/" + getFileName(artifactStandalonePath));
-        Path unoptimized = getRelativeFile("dist/" + getFileName(artifactUnoptimizedPath));
+        Path api         = getRelativeFile("dist/" + formatVersion(ARTIFACT_API));
+        Path standalone  = getRelativeFile("dist/" + formatVersion(ARTIFACT_STANDALONE));
+        Path unoptimized = getRelativeFile("dist/" + formatVersion(ARTIFACT_UNOPTIMIZED));
 
         // NIO will not automatically create directories
         Path dir = getRelativeFile("dist/");
@@ -53,14 +53,12 @@ public class CreateDistTask extends BaritoneGradleTask {
         }
 
         // Copy build jars to dist/
-        // TODO: dont copy files that dont exist
-        Files.copy(this.artifactApiPath, api, REPLACE_EXISTING);
-        Files.copy(this.artifactStandalonePath, standalone, REPLACE_EXISTING);
+        Files.copy(this.artifactApiPath,         api,         REPLACE_EXISTING);
+        Files.copy(this.artifactStandalonePath,  standalone,  REPLACE_EXISTING);
         Files.copy(this.artifactUnoptimizedPath, unoptimized, REPLACE_EXISTING);
 
         // Calculate all checksums and format them like "shasum"
-        List<String> shasum = getAllDistJars().stream()
-                .filter(Files::exists)
+        List<String> shasum = Stream.of(api, standalone, unoptimized)
                 .map(path -> sha1(path) + "  " + path.getFileName().toString())
                 .collect(Collectors.toList());
 
@@ -70,24 +68,6 @@ public class CreateDistTask extends BaritoneGradleTask {
         Files.write(getRelativeFile("dist/checksums.txt"), shasum);
     }
 
-    private static String getFileName(Path p) {
-        return p.getFileName().toString();
-    }
-
-    private List<Path> getAllDistJars() {
-        return Arrays.asList(
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_API)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_FABRIC_API)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_API)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_STANDALONE)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_FABRIC_STANDALONE)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_STANDALONE)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_UNOPTIMIZED)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_FABRIC_UNOPTIMIZED)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_UNOPTIMIZED))
-        );
-    }
-
     private static synchronized String sha1(Path path) {
         try {
             if (SHA1_DIGEST == null) {

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

@@ -18,33 +18,26 @@
 package baritone.gradle.task;
 
 import baritone.gradle.util.Determinizer;
+import baritone.gradle.util.MappingType;
+import baritone.gradle.util.ReobfWrapper;
 import org.apache.commons.io.IOUtils;
-import org.gradle.api.plugins.JavaPluginConvention;
-import org.gradle.api.tasks.Input;
-import org.gradle.api.tasks.TaskAction;
-import org.gradle.api.JavaVersion;
 import org.gradle.api.NamedDomainObjectContainer;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.Dependency;
-import org.gradle.api.internal.file.IdentityFileResolver;
 import org.gradle.api.internal.plugins.DefaultConvention;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.TaskAction;
-import org.gradle.api.tasks.TaskCollection;
-import org.gradle.api.tasks.compile.ForkOptions;
-import org.gradle.api.tasks.compile.JavaCompile;
 import org.gradle.internal.Pair;
-import org.gradle.internal.jvm.Jvm;
-import org.gradle.internal.jvm.inspection.DefaultJvmVersionDetector;
-import org.gradle.process.internal.DefaultExecActionFactory;
 
 import java.io.*;
+import java.lang.reflect.Field;
 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.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
@@ -56,12 +49,16 @@ import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
  */
 public class ProguardTask extends BaritoneGradleTask {
 
+    private static final Pattern TEMP_LIBRARY_PATTERN = Pattern.compile("-libraryjars 'tempLibraries\\/([a-zA-Z0-9/_\\-\\.]+)\\.jar'");
+
     @Input
     private String url;
 
     @Input
     private String extract;
 
+    private List<String> requiredLibraries;
+
     @TaskAction
     protected void exec() throws Exception {
         super.verifyArtifacts();
@@ -71,6 +68,7 @@ public class ProguardTask extends BaritoneGradleTask {
         downloadProguard();
         extractProguard();
         generateConfigs();
+        acquireDependencies();
         proguardApi();
         proguardStandalone();
         cleanup();
@@ -101,139 +99,19 @@ public class ProguardTask extends BaritoneGradleTask {
         }
     }
 
-    private String getJavaBinPathForProguard() throws Exception {
-        String path;
-        try {
-            path = findJavaPathByGradleConfig();
-            if (path != null) return path;
-        }
-        catch (Exception ex) {
-            System.err.println("Unable to find java by javaCompile options");
-            ex.printStackTrace();
-        }
-
-        try {
-            path = findJavaByJavaHome();
-            if (path != null) return path;
-        }
-        catch(Exception ex) {
-            System.err.println("Unable to find java by JAVA_HOME");
-            ex.printStackTrace();
-        }
-
-
-        path = findJavaByGradleCurrentRuntime();
-        if (path != null) return path;
-        
-        throw new Exception("Unable to find java to determine ProGuard libraryjars. Please specify forkOptions.executable in javaCompile," +
-                " JAVA_HOME environment variable, or make sure to run Gradle with the correct JDK (a v1.8 only)");
-    }
-
-    private String findJavaByGradleCurrentRuntime() {
-        String path = Jvm.current().getJavaExecutable().getAbsolutePath();
-
-        if (this.validateJavaVersion(path)) {
-            System.out.println("Using Gradle's runtime Java for ProGuard");
-            return path;
-        }
-        return null;
-    }
-
-    private String findJavaByJavaHome() {
-        final String javaHomeEnv = System.getenv("JAVA_HOME");
-        if (javaHomeEnv != null) {
-
-            String path = Jvm.forHome(new File(javaHomeEnv)).getJavaExecutable().getAbsolutePath();
-            if (this.validateJavaVersion(path)) {
-                System.out.println("Detected Java path by JAVA_HOME");
-                return path;
-            }
-        }
-        return null;
-    }
-
-    private String findJavaPathByGradleConfig() {
-        final TaskCollection<JavaCompile> javaCompiles = super.getProject().getTasks().withType(JavaCompile.class);
-
-        final JavaCompile compileTask = javaCompiles.iterator().next();
-        final ForkOptions forkOptions = compileTask.getOptions().getForkOptions();
-
-        if (forkOptions != null) {
-            String javacPath = forkOptions.getExecutable();
-            if (javacPath != null) {
-                File javacFile = new File(javacPath);
-                if (javacFile.exists()) {
-                    File[] maybeJava = javacFile.getParentFile().listFiles(new FilenameFilter() {
-                        @Override
-                        public boolean accept(File dir, String name) {
-                            return name.equals("java");
-                        }
-                    });
-
-                    if (maybeJava != null && maybeJava.length > 0) {
-                        String path = maybeJava[0].getAbsolutePath();
-                        if (this.validateJavaVersion(path)) {
-                            System.out.println("Detected Java path by forkOptions");
-                            return path;
-                        }
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    private boolean validateJavaVersion(String java) {
-        final JavaVersion javaVersion = new DefaultJvmVersionDetector(new DefaultExecActionFactory(new IdentityFileResolver())).getJavaVersion(java);
-
-        if (!javaVersion.getMajorVersion().equals("8")) {
-            System.out.println("Failed to validate Java version " + javaVersion.toString() + " [" + java + "] for ProGuard libraryjars");
-            // throw new RuntimeException("Java version incorrect: " + javaVersion.getMajorVersion() + " for " + java);
-            return false;
-        }
-
-        System.out.println("Validated Java version " + javaVersion.toString() + " [" + java + "] for ProGuard libraryjars");
-        return true;
-    }
-
     private void generateConfigs() throws Exception {
         Files.copy(getRelativeFile(PROGUARD_CONFIG_TEMPLATE), getTemporaryFile(PROGUARD_CONFIG_DEST), REPLACE_EXISTING);
 
         // Setup the template that will be used to derive the API and Standalone configs
         List<String> template = Files.readAllLines(getTemporaryFile(PROGUARD_CONFIG_DEST));
-        template.add(0, "-injars '" + this.artifactPath.toString() + "'");
-        template.add(1, "-outjars '" + this.getTemporaryFile(PROGUARD_EXPORT_PATH) + "'");
+        template.add(0, "-injars " + this.artifactPath.toString());
+        template.add(1, "-outjars " + this.getTemporaryFile(PROGUARD_EXPORT_PATH));
 
         // Acquire the RT jar using "java -verbose". This doesn't work on Java 9+
-        Process p = new ProcessBuilder(this.getJavaBinPathForProguard(), "-verbose").start();
+        Process p = new ProcessBuilder("java", "-verbose").start();
         String out = IOUtils.toString(p.getInputStream(), "UTF-8").split("\n")[0].split("Opened ")[1].replace("]", "");
         template.add(2, "-libraryjars '" + out + "'");
 
-        {
-            final Stream<File> libraries;
-            {
-                // Discover all of the libraries that we will need to acquire from gradle
-                final Stream<File> dependencies = acquireDependencies()
-                    // remove MCP mapped jar
-                    .filter(f -> !f.toString().endsWith("-recomp.jar"))
-                    // go from the extra to the original downloaded client
-                    .map(f -> f.toString().endsWith("client-extra.jar") ? new File(f.getParentFile(), "client.jar") : f);
-
-                if (getProject().hasProperty("baritone.forge_build")) {
-                    libraries = dependencies
-                        .map(f -> f.toString().endsWith("client.jar") ? getSrgMcJar() : f);
-                } else if (getProject().hasProperty("baritone.fabric_build")) {
-                    libraries = dependencies
-                        .map(f -> f.getName().endsWith("-v2.jar") && f.getName().startsWith("minecraft-") ? getSrgMcJar() : f);
-                } else {
-                    libraries = dependencies;
-                }
-            }
-            libraries.forEach(f -> {
-                template.add(2, "-libraryjars '" + f + "'");
-            });
-        }
-
         // API config doesn't require any changes from the changes that we made to the template
         Files.write(getTemporaryFile(PROGUARD_API_CONFIG), template);
 
@@ -241,16 +119,147 @@ 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 File getSrgMcJar() {
-        return getProject().getTasks().findByName("copyMcJar").getOutputs().getFiles().getSingleFile();
+    private void acquireDependencies() throws Exception {
+
+        // Create a map of all of the dependencies that we are able to access in this project
+        // Likely a better way to do this, I just pair the dependency with the first valid configuration
+        Map<String, Pair<Configuration, Dependency>> dependencyLookupMap = new HashMap<>();
+        getProject().getConfigurations().stream().filter(Configuration::isCanBeResolved).forEach(config ->
+                config.getAllDependencies().forEach(dependency ->
+                        dependencyLookupMap.putIfAbsent(dependency.getName() + "-" + dependency.getVersion(), Pair.of(config, dependency))));
+
+        // Create the directory if it doesn't already exist
+        Path tempLibraries = getTemporaryFile(TEMP_LIBRARY_DIR);
+        if (!Files.exists(tempLibraries)) {
+            Files.createDirectory(tempLibraries);
+        }
+
+        // Iterate the required libraries to copy them to tempLibraries
+        for (String lib : this.requiredLibraries) {
+            // copy from the forgegradle cache
+            if (lib.equals("minecraft")) {
+                Path cachedJar = getMinecraftJar();
+                Path inTempDir = getTemporaryFile("tempLibraries/minecraft.jar");
+                // TODO: maybe try not to copy every time
+                Files.copy(cachedJar, inTempDir, REPLACE_EXISTING);
+
+                continue;
+            }
+
+            // Find a configuration/dependency pair that matches the desired library
+            Pair<Configuration, Dependency> pair = null;
+            for (Map.Entry<String, Pair<Configuration, Dependency>> entry : dependencyLookupMap.entrySet()) {
+                if (entry.getKey().startsWith(lib)) {
+                    pair = entry.getValue();
+                }
+            }
+
+            // The pair must be non-null
+            Objects.requireNonNull(pair);
+
+            // Find the library jar file, and copy it to tempLibraries
+            for (File file : pair.getLeft().files(pair.getRight())) {
+                if (file.getName().startsWith(lib)) {
+                    Files.copy(file.toPath(), getTemporaryFile("tempLibraries/" + lib + ".jar"), REPLACE_EXISTING);
+                }
+            }
+        }
     }
 
-    private Stream<File> acquireDependencies() {
-        return getProject().getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("launch").getRuntimeClasspath().getFiles()
-            .stream()
-            .filter(File::isFile);
+    // a bunch of epic stuff to get the path to the cached jar
+    private Path getMinecraftJar() throws Exception {
+        MappingType mappingType;
+        try {
+            mappingType = getMappingType();
+        } catch (Exception e) {
+            System.err.println("Failed to get mapping type, assuming NOTCH.");
+            mappingType = MappingType.NOTCH;
+        }
+
+        String suffix;
+        switch (mappingType) {
+            case NOTCH:
+                suffix = "";
+                break;
+            case SEARGE:
+                suffix = "-srgBin";
+                break;
+            case CUSTOM:
+                throw new IllegalStateException("Custom mappings not supported!");
+            default:
+                throw new IllegalStateException("Unknown mapping type: " + mappingType);
+        }
+
+        DefaultConvention convention = (DefaultConvention) this.getProject().getConvention();
+        Object extension = convention.getAsMap().get("minecraft");
+        Objects.requireNonNull(extension);
+
+        // for some reason cant use Class.forName
+        Class<?> class_baseExtension = extension.getClass().getSuperclass().getSuperclass().getSuperclass(); // <-- cursed
+        Field f_replacer = class_baseExtension.getDeclaredField("replacer");
+        f_replacer.setAccessible(true);
+        Object replacer = f_replacer.get(extension);
+        Class<?> class_replacementProvider = replacer.getClass();
+        Field replacement_replaceMap = class_replacementProvider.getDeclaredField("replaceMap");
+        replacement_replaceMap.setAccessible(true);
+
+        Map<String, Object> replacements = (Map) replacement_replaceMap.get(replacer);
+        String cacheDir = replacements.get("CACHE_DIR").toString() + "/net/minecraft";
+        String mcVersion = replacements.get("MC_VERSION").toString();
+        String mcpInsert = replacements.get("MAPPING_CHANNEL").toString() + "/" + replacements.get("MAPPING_VERSION").toString();
+        String fullJarName = "minecraft-" + mcVersion + suffix + ".jar";
+
+        String baseDir = String.format("%s/minecraft/%s/", cacheDir, mcVersion);
+
+        String jarPath;
+        if (mappingType == MappingType.SEARGE) {
+            jarPath = String.format("%s/%s/%s", baseDir, mcpInsert, fullJarName);
+        } else {
+            jarPath = baseDir + fullJarName;
+        }
+        jarPath = jarPath
+                .replace("/", File.separator)
+                .replace("\\", File.separator); // hecking regex
+
+        return new File(jarPath).toPath();
+    }
+
+    // throws IllegalStateException if mapping type is ambiguous or it fails to find it
+    private MappingType getMappingType() {
+        // if it fails to find this then its probably a forgegradle version problem
+        Set<Object> reobf = (NamedDomainObjectContainer<Object>) this.getProject().getExtensions().getByName("reobf");
+
+        List<MappingType> mappingTypes = getUsedMappingTypes(reobf);
+        long mappingTypesUsed = mappingTypes.size();
+        if (mappingTypesUsed == 0) {
+            throw new IllegalStateException("Failed to find mapping type (no jar task?)");
+        }
+        if (mappingTypesUsed > 1) {
+            throw new IllegalStateException("Ambiguous mapping type (multiple jars with different mapping types?)");
+        }
+
+        return mappingTypes.get(0);
+    }
+
+    private List<MappingType> getUsedMappingTypes(Set<Object> reobf) {
+        return reobf.stream()
+                .map(ReobfWrapper::new)
+                .map(ReobfWrapper::getMappingType)
+                .distinct()
+                .collect(Collectors.toList());
     }
 
     private void proguardApi() throws Exception {
@@ -283,20 +292,14 @@ public class ProguardTask extends BaritoneGradleTask {
             Files.delete(this.proguardOut);
         }
 
-        // Make paths relative to work directory; fixes spaces in path to config, @"" doesn't work
-        Path workingDirectory = getTemporaryFile("");
-        Path proguardJar = workingDirectory.relativize(getTemporaryFile(PROGUARD_JAR));
-        config = workingDirectory.relativize(config);
-        
-        // Honestly, if you still have spaces in your path at this point, you're SOL.
-
+        Path proguardJar = getTemporaryFile(PROGUARD_JAR);
         Process p = new ProcessBuilder("java", "-jar", proguardJar.toString(), "@" + config.toString())
-                .directory(workingDirectory.toFile()) // Set the working directory to the temporary folder]
+                .directory(getTemporaryFile("").toFile()) // Set the working directory to the temporary folder]
                 .start();
 
         // We can't do output inherit process I/O with gradle for some reason and have it work, so we have to do this
-        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();
@@ -305,12 +308,12 @@ 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) {
                 e.printStackTrace();

buildSrc/src/main/java/baritone/gradle/util/MappingType.java

@@ -15,15 +15,15 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.command.datatypes;
-
-import baritone.api.command.exception.CommandException;
+package baritone.gradle.util;
 
 /**
- * @author Brady
- * @since 9/26/2019
+ * All credits go to AsmLibGradle and its contributors.
+ *
+ * @see <a href="https://github.com/pozzed/AsmLibGradle/blob/8f917dbc3939eab7a3d9daf54d9d285fdf34f4b2/src/main/java/net/futureclient/asmlib/forgegradle/MappingType.java">Original Source</a>
  */
-public interface IDatatypePostFunction<T, O> {
-
-    T apply(O original) throws CommandException;
+public enum MappingType {
+    SEARGE,
+    NOTCH,
+    CUSTOM // forgegradle
 }

buildSrc/src/main/java/baritone/gradle/util/ReobfWrapper.java

@@ -0,0 +1,63 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.gradle.util;
+
+import java.lang.reflect.Field;
+import java.util.Objects;
+
+/**
+ * All credits go to AsmLibGradle and its contributors.
+ *
+ * @see <a href="https://github.com/pozzed/AsmLibGradle/blob/8f917dbc3939eab7a3d9daf54d9d285fdf34f4b2/src/main/java/net/futureclient/asmlib/forgegradle/ReobfWrapper.java">Original Source</a>
+ */
+public class ReobfWrapper {
+
+    private final Object instance;
+    private final Class<?> type;
+
+    public ReobfWrapper(Object instance) {
+        this.instance = instance;
+        Objects.requireNonNull(instance);
+        this.type = instance.getClass();
+    }
+
+    public String getName() {
+        try {
+            Field nameField = type.getDeclaredField("name");
+            nameField.setAccessible(true);
+            return (String) nameField.get(this.instance);
+        } catch (ReflectiveOperationException ex) {
+            throw new IllegalStateException(ex);
+        }
+    }
+
+    public MappingType getMappingType() {
+        try {
+            Field enumField = type.getDeclaredField("mappingType");
+            enumField.setAccessible(true);
+            Enum<?> aEnum = (Enum<?>) enumField.get(this.instance);
+            MappingType mappingType = MappingType.values()[aEnum.ordinal()];
+            if (!aEnum.name().equals(mappingType.name())) {
+                throw new IllegalStateException("ForgeGradle ReobfMappingType is not equivalent to MappingType (version error?)");
+            }
+            return mappingType;
+        } catch (ReflectiveOperationException ex) {
+            throw new IllegalStateException(ex);
+        }
+    }
+}

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

@@ -1,6 +1,5 @@
 -keepattributes Signature
 -keepattributes *Annotation*
--keepattributes InnerClasses
 
 -optimizationpasses 5
 -verbose
@@ -13,29 +12,14 @@
 -flattenpackagehierarchy
 -repackageclasses 'baritone'
 
-# lwjgl is weird
--dontwarn org.lwjgl.**
-# also lwjgl lol
--dontwarn module-info
-# we dont have forge
--dontwarn baritone.launch.BaritoneForgeModXD
-
-# please do not change the comment below
 -keep class baritone.api.** { *; } # this is the keep api
 
 # service provider needs these class names
 -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
--keepname class baritone.api.utils.BlockOptionalMeta # this name is exposed to the user, so we need to keep it in all builds
-
-# Keep any class or member annotated with @KeepName so we dont have to put everything in the script
--keep,allowobfuscation @interface baritone.KeepName
--keep @baritone.KeepName class *
--keepclassmembers class * {
-    @baritone.KeepName *;
-}
+# hack
+-keep class baritone.utils.ExampleBaritoneControl { *; } # have to include this string to remove this keep in the standalone build: # this is the keep api
 
 # setting names are reflected from field names, so keep field names
 -keepclassmembers class baritone.api.Settings {
@@ -45,12 +29,55 @@
 # need to keep mixin names
 -keep class baritone.launch.** { *; }
 
-#try to keep usage of schematica in separate classes
--keep class baritone.utils.schematic.schematica.**
--keep class baritone.utils.schematic.litematica.**
-#proguard doesnt like it when it cant find our fake schematica classes
--dontwarn baritone.utils.schematic.schematica.**
--dontwarn baritone.utils.schematic.litematica.**
+# copy all necessary libraries into tempLibraries to build
+
+# The correct jar will be copied from the forgegradle cache based on the mapping type being compiled with
+-libraryjars 'tempLibraries/minecraft.jar'
+
+-libraryjars 'tempLibraries/SimpleTweaker-1.2.jar'
+
+-libraryjars 'tempLibraries/authlib-1.5.25.jar'
+-libraryjars 'tempLibraries/codecjorbis-20101023.jar'
+-libraryjars 'tempLibraries/codecwav-20101023.jar'
+-libraryjars 'tempLibraries/commons-codec-1.10.jar'
+-libraryjars 'tempLibraries/commons-compress-1.8.1.jar'
+-libraryjars 'tempLibraries/commons-io-2.5.jar'
+-libraryjars 'tempLibraries/commons-lang3-3.5.jar'
+-libraryjars 'tempLibraries/commons-logging-1.1.3.jar'
+-libraryjars 'tempLibraries/fastutil-7.1.0.jar'
+-libraryjars 'tempLibraries/gson-2.8.0.jar'
+-libraryjars 'tempLibraries/guava-21.0.jar'
+-libraryjars 'tempLibraries/httpclient-4.3.3.jar'
+-libraryjars 'tempLibraries/httpcore-4.3.2.jar'
+-libraryjars 'tempLibraries/icu4j-core-mojang-51.2.jar'
+-libraryjars 'tempLibraries/jinput-2.0.5.jar'
+-libraryjars 'tempLibraries/jna-4.4.0.jar'
+-libraryjars 'tempLibraries/jopt-simple-5.0.3.jar'
+-libraryjars 'tempLibraries/jsr305-3.0.1.jar'
+-libraryjars 'tempLibraries/jutils-1.0.0.jar'
+-libraryjars 'tempLibraries/libraryjavasound-20101123.jar'
+-libraryjars 'tempLibraries/librarylwjglopenal-20100824.jar'
+-libraryjars 'tempLibraries/log4j-api-2.8.1.jar'
+-libraryjars 'tempLibraries/log4j-core-2.8.1.jar'
+
+# startsWith is used to check the library, and mac/linux differ in which version they use
+# this is FINE
+-libraryjars 'tempLibraries/lwjgl-.jar'
+-libraryjars 'tempLibraries/lwjgl_util-.jar'
+
+-libraryjars 'tempLibraries/netty-all-4.1.9.Final.jar'
+-libraryjars 'tempLibraries/oshi-core-1.1.jar'
+-libraryjars 'tempLibraries/patchy-1.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.
@@ -147,19 +174,19 @@
 -assumenosideeffects public class java.lang.* extends java.lang.Number {
     public static java.lang.String toString(byte);
     public static java.lang.Byte valueOf(byte);
-#    public static byte parseByte(java.lang.String);
-#    public static byte parseByte(java.lang.String,int);
-#    public static java.lang.Byte valueOf(java.lang.String,int);
-#    public static java.lang.Byte valueOf(java.lang.String);
-#    public static java.lang.Byte decode(java.lang.String);
+    public static byte parseByte(java.lang.String);
+    public static byte parseByte(java.lang.String,int);
+    public static java.lang.Byte valueOf(java.lang.String,int);
+    public static java.lang.Byte valueOf(java.lang.String);
+    public static java.lang.Byte decode(java.lang.String);
     public int compareTo(java.lang.Byte);
     public static java.lang.String toString(short);
-#    public static short parseShort(java.lang.String);
-#    public static short parseShort(java.lang.String,int);
-#    public static java.lang.Short valueOf(java.lang.String,int);
-#    public static java.lang.Short valueOf(java.lang.String);
+    public static short parseShort(java.lang.String);
+    public static short parseShort(java.lang.String,int);
+    public static java.lang.Short valueOf(java.lang.String,int);
+    public static java.lang.Short valueOf(java.lang.String);
     public static java.lang.Short valueOf(short);
-#    public static java.lang.Short decode(java.lang.String);
+    public static java.lang.Short decode(java.lang.String);
     public static short reverseBytes(short);
     public int compareTo(java.lang.Short);
     public static java.lang.String toString(int,int);
@@ -167,10 +194,10 @@
     public static java.lang.String toOctalString(int);
     public static java.lang.String toBinaryString(int);
     public static java.lang.String toString(int);
-#    public static int parseInt(java.lang.String,int);
-#    public static int parseInt(java.lang.String);
-#    public static java.lang.Integer valueOf(java.lang.String,int);
-#    public static java.lang.Integer valueOf(java.lang.String);
+    public static int parseInt(java.lang.String,int);
+    public static int parseInt(java.lang.String);
+    public static java.lang.Integer valueOf(java.lang.String,int);
+    public static java.lang.Integer valueOf(java.lang.String);
     public static java.lang.Integer valueOf(int);
     public static java.lang.Integer getInteger(java.lang.String);
     public static java.lang.Integer getInteger(java.lang.String,int);
@@ -192,12 +219,12 @@
     public static java.lang.String toOctalString(long);
     public static java.lang.String toBinaryString(long);
     public static java.lang.String toString(long);
-#    public static long parseLong(java.lang.String,int);
-#    public static long parseLong(java.lang.String);
-#    public static java.lang.Long valueOf(java.lang.String,int);
-#    public static java.lang.Long valueOf(java.lang.String);
+    public static long parseLong(java.lang.String,int);
+    public static long parseLong(java.lang.String);
+    public static java.lang.Long valueOf(java.lang.String,int);
+    public static java.lang.Long valueOf(java.lang.String);
     public static java.lang.Long valueOf(long);
-#    public static java.lang.Long decode(java.lang.String);
+    public static java.lang.Long decode(java.lang.String);
     public static java.lang.Long getLong(java.lang.String);
     public static java.lang.Long getLong(java.lang.String,long);
     public static java.lang.Long getLong(java.lang.String,java.lang.Long);
@@ -214,9 +241,9 @@
     public int compareTo(java.lang.Long);
     public static java.lang.String toString(float);
     public static java.lang.String toHexString(float);
-#    public static java.lang.Float valueOf(java.lang.String);
+    public static java.lang.Float valueOf(java.lang.String);
     public static java.lang.Float valueOf(float);
-#    public static float parseFloat(java.lang.String);
+    public static float parseFloat(java.lang.String);
     public static boolean isNaN(float);
     public static boolean isInfinite(float);
     public static int floatToIntBits(float);
@@ -228,9 +255,9 @@
     public int compareTo(java.lang.Float);
     public static java.lang.String toString(double);
     public static java.lang.String toHexString(double);
-#    public static java.lang.Double valueOf(java.lang.String);
-#    public static java.lang.Double valueOf(double);
-#    public static double parseDouble(java.lang.String);
+    public static java.lang.Double valueOf(java.lang.String);
+    public static java.lang.Double valueOf(double);
+    public static double parseDouble(java.lang.String);
     public static boolean isNaN(double);
     public static boolean isInfinite(double);
     public static long doubleToLongBits(double);
@@ -340,5 +367,3 @@
     public java.lang.String substring(int);
     public java.lang.String substring(int,int);
 }
-
--printmapping mapping.txt

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

@@ -19,8 +19,13 @@ package baritone.api;
 
 import baritone.api.utils.SettingsUtil;
 
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
 /**
- * Exposes the {@link IBaritoneProvider} instance and the {@link Settings} instance for API usage.
+ * API exposure for various things implemented in Baritone.
+ * <p>
+ * W.I.P
  *
  * @author Brady
  * @since 9/23/2018
@@ -31,14 +36,12 @@ public final class BaritoneAPI {
     private static final Settings settings;
 
     static {
+        ServiceLoader<IBaritoneProvider> baritoneLoader = ServiceLoader.load(IBaritoneProvider.class);
+        Iterator<IBaritoneProvider> instances = baritoneLoader.iterator();
+        provider = instances.next();
+
         settings = new Settings();
         SettingsUtil.readAndApply(settings);
-
-        try {
-            provider = (IBaritoneProvider) Class.forName("baritone.BaritoneProvider").newInstance();
-        } catch (ReflectiveOperationException ex) {
-            throw new RuntimeException(ex);
-        }
     }
 
     public static IBaritoneProvider getProvider() {

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

@@ -20,11 +20,12 @@ package baritone.api;
 import baritone.api.behavior.ILookBehavior;
 import baritone.api.behavior.IPathingBehavior;
 import baritone.api.cache.IWorldProvider;
-import baritone.api.command.manager.ICommandManager;
 import baritone.api.event.listener.IEventBus;
 import baritone.api.pathing.calc.IPathingControlManager;
-import baritone.api.process.*;
-import baritone.api.selection.ISelectionManager;
+import baritone.api.process.ICustomGoalProcess;
+import baritone.api.process.IFollowProcess;
+import baritone.api.process.IGetToBlockProcess;
+import baritone.api.process.IMineProcess;
 import baritone.api.utils.IInputOverrideHandler;
 import baritone.api.utils.IPlayerContext;
 
@@ -35,10 +36,10 @@ import baritone.api.utils.IPlayerContext;
 public interface IBaritone {
 
     /**
-     * @return The {@link IPathingBehavior} instance
-     * @see IPathingBehavior
+     * @return The {@link IFollowProcess} instance
+     * @see IFollowProcess
      */
-    IPathingBehavior getPathingBehavior();
+    IFollowProcess getFollowProcess();
 
     /**
      * @return The {@link ILookBehavior} instance
@@ -46,12 +47,6 @@ public interface IBaritone {
      */
     ILookBehavior getLookBehavior();
 
-    /**
-     * @return The {@link IFollowProcess} instance
-     * @see IFollowProcess
-     */
-    IFollowProcess getFollowProcess();
-
     /**
      * @return The {@link IMineProcess} instance
      * @see IMineProcess
@@ -59,34 +54,10 @@ public interface IBaritone {
     IMineProcess getMineProcess();
 
     /**
-     * @return The {@link IBuilderProcess} instance
-     * @see IBuilderProcess
+     * @return The {@link IPathingBehavior} instance
+     * @see IPathingBehavior
      */
-    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();
+    IPathingBehavior getPathingBehavior();
 
     /**
      * @return The {@link IWorldProvider} instance
@@ -94,47 +65,15 @@ public interface IBaritone {
      */
     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
-     */
+    ICustomGoalProcess getCustomGoalProcess();
+
+    IGetToBlockProcess getGetToBlockProcess();
+
     IPlayerContext getPlayerContext();
 
-    /**
-     * @return The {@link IEventBus} instance
-     * @see IEventBus
-     */
     IEventBus getGameEventHandler();
-
-    /**
-     * @return The {@link ISelectionManager} instance
-     * @see ISelectionManager
-     */
-    ISelectionManager getSelectionManager();
-
-    /**
-     * @return The {@link ICommandManager} instance
-     * @see ICommandManager
-     */
-    ICommandManager getCommandManager();
-
-    /**
-     * Open click
-     */
-    void openClick();
 }

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

@@ -18,18 +18,12 @@
 package baritone.api;
 
 import baritone.api.cache.IWorldScanner;
-import baritone.api.command.ICommand;
-import baritone.api.command.ICommandSystem;
-import baritone.api.schematic.ISchematicSystem;
-import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.client.entity.EntityPlayerSP;
 
 import java.util.List;
-import java.util.Objects;
 
 /**
- * Provides the present {@link IBaritone} instances, as well as non-baritone instance related APIs.
- *
- * @author leijurv
+ * @author Leijurv
  */
 public interface IBaritoneProvider {
 
@@ -47,25 +41,24 @@ public interface IBaritoneProvider {
      * returned by {@link #getPrimaryBaritone()}.
      *
      * @return All active {@link IBaritone} instances.
-     * @see #getBaritoneForPlayer(ClientPlayerEntity)
+     * @see #getBaritoneForPlayer(EntityPlayerSP)
      */
     List<IBaritone> getAllBaritones();
 
     /**
-     * Provides the {@link IBaritone} instance for a given {@link ClientPlayerEntity}. This will likely be
-     * replaced with or be overloaded in addition to {@code #getBaritoneForUser(IBaritoneUser)} when
-     * {@code bot-system} is merged into {@code master}.
+     * Provides the {@link IBaritone} instance for a given {@link EntityPlayerSP}. This will likely be
+     * replaced with {@code #getBaritoneForUser(IBaritoneUser)} when {@code bot-system} is merged.
      *
      * @param player The player
      * @return The {@link IBaritone} instance.
      */
-    default IBaritone getBaritoneForPlayer(ClientPlayerEntity player) {
+    default IBaritone getBaritoneForPlayer(EntityPlayerSP player) {
         for (IBaritone baritone : getAllBaritones()) {
-            if (Objects.equals(player, baritone.getPlayerContext().player())) {
+            if (player.equals(baritone.getPlayerContext().player())) {
                 return baritone;
             }
         }
-        return null;
+        throw new IllegalStateException("No baritone for player " + player);
     }
 
     /**
@@ -75,17 +68,4 @@ public interface IBaritoneProvider {
      * @return The {@link IWorldScanner} instance.
      */
     IWorldScanner getWorldScanner();
-
-    /**
-     * Returns the {@link ICommandSystem} instance. This is not bound to a specific {@link IBaritone}
-     * instance because {@link ICommandSystem} itself controls global behavior for {@link ICommand}s.
-     *
-     * @return The {@link ICommandSystem} instance.
-     */
-    ICommandSystem getCommandSystem();
-
-    /**
-     * @return The {@link ISchematicSystem} instance.
-     */
-    ISchematicSystem getSchematicSystem();
 }

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

@@ -18,13 +18,9 @@
 package baritone.api.behavior;
 
 import baritone.api.event.listener.AbstractGameEventListener;
-import baritone.api.event.listener.IGameEventListener;
 
 /**
- * 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 {}

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

@@ -38,52 +38,22 @@ public interface IPathingBehavior extends IBehavior {
      * @return The estimated remaining ticks in the current segment.
      */
     default Optional<Double> ticksRemainingInSegment() {
-        return ticksRemainingInSegment(true);
-    }
-
-    /**
-     * 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.
-     *
-     * @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.
-     */
-    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));
+        return Optional.of(current.getPath().ticksRemainingFrom(current.getPosition()));
     }
 
-    /**
-     * Returns the estimated remaining ticks to the current goal.
-     * Given that the return type is an optional, {@link Optional#empty()}
-     * will be returned in the case that there is no current goal.
-     *
-     * @return The estimated remaining ticks to the current goal.
-     */
-    Optional<Double> estimatedTicksToGoal();
-
     /**
      * @return The current pathing goal
      */
     Goal getGoal();
 
     /**
-     * @return Whether or not a path is currently being executed. This will be false if there's currently a pause.
-     * @see #hasPath()
+     * @return Whether or not a path is currently being executed.
      */
-    boolean isPathing();
-
-    /**
-     * @return If there is a current path. Note that the path is not necessarily being executed, for example when there
-     * is a pause in effect.
-     * @see #isPathing()
-     */
-    default boolean hasPath() {
+    default boolean isPathing() {
         return getCurrent() != null;
     }
 
@@ -97,13 +67,6 @@ public interface IPathingBehavior extends IBehavior {
      */
     boolean cancelEverything();
 
-    /**
-     * PLEASE never call this
-     * <p>
-     * If cancelEverything was like "kill" this is "sudo kill -9". Or shutting off your computer.
-     */
-    void forceCancel();
-
     /**
      * Returns the current path, from the current path executor, if there is one.
      *

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

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

src/api/java/baritone/api/cache/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
@@ -68,7 +68,7 @@ public interface ICachedWorld {
      * @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 centerX, int centerZ, int maxRegionDistanceSq);
 
     /**
      * Reloads all of the cached regions in this world from disk. Anything that is not saved

src/api/java/baritone/api/cache/IContainerMemory.java

@@ -15,31 +15,30 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.schematic.format;
+package baritone.api.cache;
 
-import baritone.api.schematic.ISchematic;
-import baritone.api.schematic.IStaticSchematic;
+import net.minecraft.util.math.BlockPos;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+import java.util.Map;
 
 /**
- * The base of a {@link ISchematic} file format
- *
  * @author Brady
- * @since 12/23/2019
+ * @since 9/23/2018
  */
-public interface ISchematicFormat {
+public interface IContainerMemory {
 
     /**
-     * @return The parser for creating schematics of this format
+     * Gets a remembered inventory by its block position.
+     *
+     * @param pos The position of the container block
+     * @return The remembered inventory
      */
-    IStaticSchematic parse(InputStream input) throws IOException;
+    IRememberedInventory getInventoryByPos(BlockPos pos);
 
     /**
-     * @param file The file to check against
-     * @return Whether or not the specified file matches this schematic format
+     * Gets the map of all block positions to their remembered inventories.
+     *
+     * @return Map of block positions to their respective remembered inventories
      */
-    boolean isFileType(File file);
+    Map<BlockPos, IRememberedInventory> getRememberedInventories();
 }

src/api/java/baritone/api/cache/IRememberedInventory.java

@@ -15,15 +15,25 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.command;
+package baritone.api.cache;
 
-import baritone.api.command.argparser.IArgParserManager;
+import net.minecraft.item.ItemStack;
+
+import java.util.List;
 
 /**
  * @author Brady
- * @since 10/4/2019
+ * @since 9/23/2018
  */
-public interface ICommandSystem {
+public interface IRememberedInventory {
 
-    IArgParserManager getParserManager();
+    /**
+     * @return The contents of this inventory
+     */
+    List<ItemStack> getContents();
+
+    /**
+     * @return The number of slots in this inventory
+     */
+    int getSize();
 }

src/api/java/baritone/api/cache/IWaypoint.java

@@ -17,9 +17,12 @@
 
 package baritone.api.cache;
 
-import baritone.api.utils.BetterBlockPos;
+import net.minecraft.util.math.BlockPos;
+import org.apache.commons.lang3.ArrayUtils;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * A marker for a position in the world.
@@ -57,7 +60,7 @@ public interface IWaypoint {
      *
      * @return The block position of this waypoint
      */
-    BetterBlockPos getLocation();
+    BlockPos getLocation();
 
     enum Tag {
 
@@ -89,48 +92,20 @@ public interface IWaypoint {
         /**
          * The names for the tag, anything that the tag can be referred to as.
          */
-        public final String[] names;
+        private final String[] names;
 
         Tag(String... names) {
             this.names = names;
         }
 
         /**
-         * @return A name that can be passed to {@link #getByName(String)} to retrieve this tag
-         */
-        public String getName() {
-            return names[0];
-        }
-
-        /**
-         * Gets a tag by one of its names.
+         * Finds a tag from one of the names that could be used to identify said tag.
          *
-         * @param name The name to search for.
-         * @return The tag, if found, or null.
+         * @param name The name of the tag
+         * @return The tag, if one is found, otherwise, {@code null}
          */
-        public static Tag getByName(String name) {
-            for (Tag action : Tag.values()) {
-                for (String alias : action.names) {
-                    if (alias.equalsIgnoreCase(name)) {
-                        return action;
-                    }
-                }
-            }
-
-            return null;
-        }
-
-        /**
-         * @return All tag names.
-         */
-        public static String[] getAllNames() {
-            Set<String> names = new HashSet<>();
-
-            for (Tag tag : Tag.values()) {
-                names.addAll(Arrays.asList(tag.names));
-            }
-
-            return names.toArray(new String[0]);
+        public static Tag fromString(String name) {
+            return TAG_LIST.stream().filter(tag -> ArrayUtils.contains(tag.names, name.toLowerCase())).findFirst().orElse(null);
         }
     }
 }

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

@@ -37,4 +37,9 @@ public interface IWorldData {
      */
     IWaypointCollection getWaypoints();
 
+    /**
+     * @return The {@link IContainerMemory} instance
+     * @see IContainerMemory
+     */
+    IContainerMemory getContainerMemory();
 }

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

@@ -17,7 +17,6 @@
 
 package baritone.api.cache;
 
-import baritone.api.utils.BlockOptionalMetaLookup;
 import baritone.api.utils.IPlayerContext;
 import net.minecraft.block.Block;
 import net.minecraft.util.math.BlockPos;
@@ -34,63 +33,28 @@ public interface IWorldScanner {
     /**
      * Scans the world, up to the specified max chunk radius, for the specified blocks.
      *
-     * @param ctx             The {@link IPlayerContext} containing player and world info that the scan is based upon
-     * @param filter          The blocks to scan for
+     * @param ctx             The {@link IPlayerContext} containing player and world info that the
+     *                        scan is based upon
+     * @param blocks          The blocks to scan for
      * @param max             The maximum number of blocks to scan before cutoff
-     * @param yLevelThreshold If a block is found within this Y level, the current result will be returned, if the value
-     *                        is negative, then this condition doesn't apply.
+     * @param yLevelThreshold If a block is found within this Y level, the current result will be
+     *                        returned, if the value is negative, then this condition doesn't apply.
      * @param maxSearchRadius The maximum chunk search radius
      * @return The matching block positions
      */
-    List<BlockPos> scanChunkRadius(IPlayerContext ctx, BlockOptionalMetaLookup filter, int max, int yLevelThreshold, int maxSearchRadius);
-
-    default List<BlockPos> scanChunkRadius(IPlayerContext ctx, List<Block> filter, int max, int yLevelThreshold, int maxSearchRadius) {
-        return scanChunkRadius(ctx, new BlockOptionalMetaLookup(filter.toArray(new Block[0])), max, yLevelThreshold, maxSearchRadius);
-    }
+    List<BlockPos> scanChunkRadius(IPlayerContext ctx, List<Block> blocks, int max, int yLevelThreshold, int maxSearchRadius);
 
     /**
      * Scans a single chunk for the specified blocks.
      *
-     * @param ctx             The {@link IPlayerContext} containing player and world info that the scan is based upon
-     * @param filter          The blocks to scan for
-     * @param pos             The position of the target chunk
-     * @param max             The maximum number of blocks to scan before cutoff
-     * @param yLevelThreshold If a block is found within this Y level, the current result will be returned, if the value
-     *                        is negative, then this condition doesn't apply.
-     * @return The matching block positions
-     */
-    List<BlockPos> scanChunk(IPlayerContext ctx, BlockOptionalMetaLookup filter, ChunkPos pos, int max, int yLevelThreshold);
-
-    /**
-     * Scans a single chunk for the specified blocks.
-     *
-     * @param ctx             The {@link IPlayerContext} containing player and world info that the scan is based upon
+     * @param ctx             The {@link IPlayerContext} containing player and world info that the
+     *                        scan is based upon
      * @param blocks          The blocks to scan for
      * @param pos             The position of the target chunk
      * @param max             The maximum number of blocks to scan before cutoff
-     * @param yLevelThreshold If a block is found within this Y level, the current result will be returned, if the value
-     *                        is negative, then this condition doesn't apply.
+     * @param yLevelThreshold If a block is found within this Y level, the current result will be
+     *                        returned, if the value is negative, then this condition doesn't apply.
      * @return The matching block positions
      */
-    default List<BlockPos> scanChunk(IPlayerContext ctx, List<Block> blocks, ChunkPos pos, int max, int yLevelThreshold) {
-        return scanChunk(ctx, new BlockOptionalMetaLookup(blocks), pos, max, yLevelThreshold);
-    }
-
-    /**
-     * Overload of {@link #repack(IPlayerContext, int)} where the value of the {@code range} parameter is {@code 40}.
-     *
-     * @param ctx The player, describing the origin
-     * @return The amount of chunks successfully queued for repacking
-     */
-    int repack(IPlayerContext ctx);
-
-    /**
-     * Queues the chunks in a square formation around the specified player, using the specified
-     * range, which represents 1/2 the square's dimensions, where the player is in the center.
-     *
-     * @param ctx   The player, describing the origin
-     * @param range The range to repack
-     * @return The amount of chunks successfully queued for repacking
-     */
-    int repack(IPlayerContext ctx, int range);
+    List<BlockPos> scanChunk(IPlayerContext ctx, List<Block> blocks, ChunkPos pos, int max, int yLevelThreshold);
 }

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

@@ -1,67 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command;
-
-import baritone.api.IBaritone;
-import baritone.api.utils.IPlayerContext;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * A default implementation of {@link ICommand} which provides easy access to the
- * command's bound {@link IBaritone} instance, {@link IPlayerContext} and an easy
- * way to provide multiple valid command execution names through the default constructor.
- * <p>
- * So basically, you should use it because it provides a small amount of boilerplate,
- * but you're not forced to use it.
- *
- * @author LoganDark
- * @see ICommand
- */
-public abstract class Command implements ICommand {
-
-    protected IBaritone baritone;
-    protected IPlayerContext ctx;
-
-    /**
-     * The names of this command. This is what you put after the command prefix.
-     */
-    protected final List<String> names;
-
-    /**
-     * Creates a new Baritone control command.
-     *
-     * @param names The names of this command. This is what you put after the command prefix.
-     */
-    protected Command(IBaritone baritone, String... names) {
-        this.names = Collections.unmodifiableList(Stream.of(names)
-                .map(s -> s.toLowerCase(Locale.US))
-                .collect(Collectors.toList()));
-        this.baritone = baritone;
-        this.ctx = baritone.getPlayerContext();
-    }
-
-    @Override
-    public final List<String> getNames() {
-        return this.names;
-    }
-}

src/api/java/baritone/api/command/IBaritoneChatControl.java

@@ -1,42 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command;
-
-import baritone.api.Settings;
-
-import java.util.UUID;
-
-/**
- * @author Brady
- * @since 9/26/2019
- */
-public interface IBaritoneChatControl {
-
-    /**
-     * In certain cases chat components need to execute commands for you. For example, the paginator automatically runs
-     * commands when you click the forward and back arrows to show you the previous/next page.
-     * <p>
-     * If the prefix is changed in the meantime, then the command will go to chat. That's no good. So here's a permanent
-     * prefix that forces a command to run, regardless of the current prefix, chat/prefix control being enabled, etc.
-     * <p>
-     * If used right (by both developers and users), it should be impossible to expose a command accidentally to the
-     * server. As a rule of thumb, if you have a clickable chat component, always use this prefix. If you're suggesting
-     * a command (a component that puts text into your text box, or something else), use {@link Settings#prefix}.
-     */
-    String FORCE_COMMAND_PREFIX = String.format("<<%s>>", UUID.randomUUID().toString());
-}

src/api/java/baritone/api/command/ICommand.java

@@ -1,67 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command;
-
-import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.exception.CommandException;
-import baritone.api.utils.Helper;
-
-import java.util.List;
-import java.util.stream.Stream;
-
-/**
- * The base for a command.
- *
- * @author Brady
- * @since 10/7/2019
- */
-public interface ICommand extends Helper {
-
-    /**
-     * Called when this command is executed.
-     */
-    void execute(String label, IArgConsumer args) throws CommandException;
-
-    /**
-     * Called when the command needs to tab complete. Return a Stream representing the entries to put in the completions
-     * list.
-     */
-    Stream<String> tabComplete(String label, IArgConsumer args) throws CommandException;
-
-    /**
-     * @return A <b>single-line</b> string containing a short description of this command's purpose.
-     */
-    String getShortDesc();
-
-    /**
-     * @return A list of lines that will be printed by the help command when the user wishes to view them.
-     */
-    List<String> getLongDesc();
-
-    /**
-     * @return A list of the names that can be accepted to have arguments passed to this command
-     */
-    List<String> getNames();
-
-    /**
-     * @return {@code true} if this command should be hidden from the help menu
-     */
-    default boolean hiddenFromHelp() {
-        return false;
-    }
-}

src/api/java/baritone/api/command/argparser/IArgParser.java

@@ -1,60 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.argparser;
-
-import baritone.api.command.argument.ICommandArgument;
-
-public interface IArgParser<T> {
-
-    /**
-     * @return the class of this parser.
-     */
-    Class<T> getTarget();
-
-    /**
-     * A stateless argument parser is just that. It takes a {@link ICommandArgument} and outputs its type.
-     */
-    interface Stateless<T> extends IArgParser<T> {
-
-        /**
-         * @param arg The argument to parse.
-         * @return What it was parsed into.
-         * @throws RuntimeException if you want the parsing to fail. The exception will be caught and turned into an
-         *                          appropriate error.
-         */
-        T parseArg(ICommandArgument arg) throws Exception;
-    }
-
-    /**
-     * A stated argument parser is similar to a stateless one. It also takes a {@link ICommandArgument}, but it also
-     * takes a second argument that can be any type, referred to as the state.
-     */
-    interface Stated<T, S> extends IArgParser<T> {
-
-        Class<S> getStateType();
-
-        /**
-         * @param arg   The argument to parse.
-         * @param state Can be anything.
-         * @return What it was parsed into.
-         * @throws RuntimeException if you want the parsing to fail. The exception will be caught and turned into an
-         *                          appropriate error.
-         */
-        T parseArg(ICommandArgument arg, S state) throws Exception;
-    }
-}

src/api/java/baritone/api/command/argparser/IArgParserManager.java

@@ -1,69 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.argparser;
-
-import baritone.api.command.argument.ICommandArgument;
-import baritone.api.command.exception.CommandInvalidTypeException;
-import baritone.api.command.registry.Registry;
-
-/**
- * Used to retrieve {@link IArgParser} instances from the registry, by their target class.
- * It can be assumed that a {@link IArgParser} exists for {@link Integer}, {@link Long},
- * {@link Float}, {@link Double} and {@link Boolean}.
- *
- * @author Brady
- * @since 10/4/2019
- */
-public interface IArgParserManager {
-
-    /**
-     * @param type The type trying to be parsed
-     * @return A parser that can parse arguments into this class, if found.
-     */
-    <T> IArgParser.Stateless<T> getParserStateless(Class<T> type);
-
-    /**
-     * @param type The type trying to be parsed
-     * @return A parser that can parse arguments into this class, if found.
-     */
-    <T, S> IArgParser.Stated<T, S> getParserStated(Class<T> type, Class<S> stateKlass);
-
-    /**
-     * Attempt to parse the specified argument with a stateless {@link IArgParser} that outputs the specified class.
-     *
-     * @param type The type to try and parse the argument into.
-     * @param arg  The argument to parse.
-     * @return An instance of the specified class.
-     * @throws CommandInvalidTypeException If the parsing failed
-     */
-    <T> T parseStateless(Class<T> type, ICommandArgument arg) throws CommandInvalidTypeException;
-
-    /**
-     * Attempt to parse the specified argument with a stated {@link IArgParser} that outputs the specified class.
-     *
-     * @param type  The type to try and parse the argument into.
-     * @param arg   The argument to parse.
-     * @param state The state to pass to the {@link IArgParser.Stated}.
-     * @return An instance of the specified class.
-     * @throws CommandInvalidTypeException If the parsing failed
-     * @see IArgParser.Stated
-     */
-    <T, S> T parseStated(Class<T> type, Class<S> stateKlass, ICommandArgument arg, S state) throws CommandInvalidTypeException;
-
-    Registry<IArgParser> getRegistry();
-}

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

@@ -1,594 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.argument;
-
-import baritone.api.command.ICommand;
-import baritone.api.command.argparser.IArgParser;
-import baritone.api.command.datatypes.IDatatype;
-import baritone.api.command.datatypes.IDatatypeFor;
-import baritone.api.command.datatypes.IDatatypePost;
-import baritone.api.command.exception.CommandException;
-import baritone.api.command.exception.CommandInvalidTypeException;
-import baritone.api.command.exception.CommandNotEnoughArgumentsException;
-import baritone.api.command.exception.CommandTooManyArgumentsException;
-import baritone.api.utils.Helper;
-import net.minecraft.util.Direction;
-
-import java.util.Deque;
-import java.util.LinkedList;
-import java.util.stream.Stream;
-
-/**
- * The {@link IArgConsumer} is how {@link ICommand}s read the arguments passed to them. This class has many benefits:
- *
- * <ul>
- * <li>Mutability. The whole concept of the {@link IArgConsumer}} is to let you gradually consume arguments in any way
- * you'd like. You can change your consumption based on earlier arguments, for subcommands for example.</li>
- * <li>You don't need to keep track of your consumption. The {@link IArgConsumer}} keeps track of the arguments you
- * consume so that it can throw detailed exceptions whenever something is out of the ordinary. Additionally, if you
- * need to retrieve an argument after you've already consumed it - look no further than {@link #consumed()}!</li>
- * <li>Easy retrieval of many different types. If you need to retrieve an instance of an int or float for example,
- * look no further than {@link #getAs(Class)}. If you need a more powerful way of retrieving data, try out the many
- * {@code getDatatype...} methods.</li>
- * <li>It's very easy to throw detailed exceptions. The {@link IArgConsumer}} has many different methods that can
- * enforce the number of arguments, the type of arguments, and more, throwing different types of
- * {@link CommandException}s if something seems off. You're recommended to do all validation and store all needed
- * data in variables BEFORE logging any data to chat via {@link Helper#logDirect(String)}, so that the error
- * handlers can do their job and log the error to chat.</li>
- * </ul>
- */
-public interface IArgConsumer {
-
-    LinkedList<ICommandArgument> getArgs();
-
-    Deque<ICommandArgument> getConsumed();
-
-    /**
-     * @param num The number of arguments to check for
-     * @return {@code true} if there are <i>at least</i> {@code num} arguments left in this {@link IArgConsumer}}
-     * @see #hasAny()
-     * @see #hasAtMost(int)
-     * @see #hasExactly(int)
-     */
-    boolean has(int num);
-
-    /**
-     * @return {@code true} if there is <i>at least</i> 1 argument left in this {@link IArgConsumer}}
-     * @see #has(int)
-     * @see #hasAtMostOne()
-     * @see #hasExactlyOne()
-     */
-    boolean hasAny();
-
-    /**
-     * @param num The number of arguments to check for
-     * @return {@code true} if there are <i>at most</i> {@code num} arguments left in this {@link IArgConsumer}}
-     * @see #has(int)
-     * @see #hasAtMost(int)
-     * @see #hasExactly(int)
-     */
-    boolean hasAtMost(int num);
-
-    /**
-     * @return {@code true} if there is <i>at most</i> 1 argument left in this {@link IArgConsumer}}
-     * @see #hasAny()
-     * @see #hasAtMostOne()
-     * @see #hasExactlyOne()
-     */
-    boolean hasAtMostOne();
-
-    /**
-     * @param num The number of arguments to check for
-     * @return {@code true} if there are <i>exactly</i> {@code num} arguments left in this {@link IArgConsumer}}
-     * @see #has(int)
-     * @see #hasAtMost(int)
-     */
-    boolean hasExactly(int num);
-
-    /**
-     * @return {@code true} if there is <i>exactly</i> 1 argument left in this {@link IArgConsumer}}
-     * @see #hasAny()
-     * @see #hasAtMostOne()
-     */
-    boolean hasExactlyOne();
-
-    /**
-     * @param index The index to peek
-     * @return The argument at index {@code index} in this {@link IArgConsumer}}, with 0 being the next one. This does not
-     * mutate the {@link IArgConsumer}}
-     * @throws CommandNotEnoughArgumentsException If there is less than {@code index + 1} arguments left
-     * @see #peek()
-     * @see #peekString(int)
-     * @see #peekAs(Class, int)
-     * @see #get()
-     */
-    ICommandArgument peek(int index) throws CommandNotEnoughArgumentsException;
-
-    /**
-     * @return The next argument in this {@link IArgConsumer}}. This does not mutate the {@link IArgConsumer}}
-     * @throws CommandNotEnoughArgumentsException If there is less than one argument left
-     * @see #peek(int)
-     * @see #peekString()
-     * @see #peekAs(Class)
-     * @see #get()
-     */
-    ICommandArgument peek() throws CommandNotEnoughArgumentsException;
-
-    /**
-     * @param index The index to peek
-     * @param type  The type to check for
-     * @return If an ArgParser.Stateless for the specified {@code type} would succeed in parsing the next
-     * argument
-     * @throws CommandNotEnoughArgumentsException If there is less than {@code index + 1} arguments left
-     * @see #peek()
-     * @see #getAs(Class)
-     */
-    boolean is(Class<?> type, int index) throws CommandNotEnoughArgumentsException;
-
-    /**
-     * @param type The type to check for
-     * @return If an ArgParser.Stateless for the specified {@code type} would succeed in parsing the next
-     * argument
-     * @throws CommandNotEnoughArgumentsException If there is less than one argument left
-     * @see #peek()
-     * @see #getAs(Class)
-     */
-    boolean is(Class<?> type) throws CommandNotEnoughArgumentsException;
-
-    /**
-     * @param index The index to peek
-     * @return The value of the argument at index {@code index} in this {@link IArgConsumer}}, with 0 being the next one
-     * This does not mutate the {@link IArgConsumer}}
-     * @throws CommandNotEnoughArgumentsException If there is less than {@code index + 1} arguments left
-     * @see #peek()
-     * @see #peekString()
-     */
-    String peekString(int index) throws CommandNotEnoughArgumentsException;
-
-    /**
-     * @return The value of the next argument in this {@link IArgConsumer}}. This does not mutate the {@link IArgConsumer}}
-     * @throws CommandNotEnoughArgumentsException If there is less than one argument left
-     * @see #peekString(int)
-     * @see #getString()
-     */
-    String peekString() throws CommandNotEnoughArgumentsException;
-
-    /**
-     * @param index     The index to peek
-     * @param enumClass The class to search
-     * @return From the specified enum class, an enum constant of that class. The enum constant's name will match the
-     * next argument's value
-     * @throws java.util.NoSuchElementException If the constant couldn't be found
-     * @see #peekEnumOrNull(Class)
-     * @see #getEnum(Class)
-     * @see ICommandArgument#getEnum(Class)
-     */
-    <E extends Enum<?>> E peekEnum(Class<E> enumClass, int index) throws CommandInvalidTypeException, CommandNotEnoughArgumentsException;
-
-    /**
-     * @param enumClass The class to search
-     * @return From the specified enum class, an enum constant of that class. The enum constant's name will match the
-     * next argument's value
-     * @throws CommandInvalidTypeException If the constant couldn't be found
-     * @see #peekEnumOrNull(Class)
-     * @see #getEnum(Class)
-     * @see ICommandArgument#getEnum(Class)
-     */
-    <E extends Enum<?>> E peekEnum(Class<E> enumClass) throws CommandInvalidTypeException, CommandNotEnoughArgumentsException;
-
-    /**
-     * @param index     The index to peek
-     * @param enumClass The class to search
-     * @return From the specified enum class, an enum constant of that class. The enum constant's name will match the
-     * next argument's value. If no constant could be found, null
-     * @see #peekEnum(Class)
-     * @see #getEnumOrNull(Class)
-     * @see ICommandArgument#getEnum(Class)
-     */
-    <E extends Enum<?>> E peekEnumOrNull(Class<E> enumClass, int index) throws CommandNotEnoughArgumentsException;
-
-    /**
-     * @param enumClass The class to search
-     * @return From the specified enum class, an enum constant of that class. The enum constant's name will match the
-     * next argument's value. If no constant could be found, null
-     * @see #peekEnum(Class)
-     * @see #getEnumOrNull(Class)
-     * @see ICommandArgument#getEnum(Class)
-     */
-    <E extends Enum<?>> E peekEnumOrNull(Class<E> enumClass) throws CommandNotEnoughArgumentsException;
-
-    /**
-     * Tries to use a <b>stateless</b> {@link IArgParser} to parse the argument at the specified index into the specified
-     * class
-     * <p>
-     * A critical difference between {@link IDatatype}s and {@link IArgParser}s is how many arguments they can take.
-     * While {@link IArgParser}s always operate on a single argument's value, {@link IDatatype}s get access to the entire
-     * {@link IArgConsumer}}.
-     *
-     * @param type  The type to peek as
-     * @param index The index to peek
-     * @return An instance of the specified type
-     * @throws CommandInvalidTypeException If the parsing failed
-     * @see IArgParser
-     * @see #peekAs(Class)
-     * @see #peekAsOrDefault(Class, Object, int)
-     * @see #peekAsOrNull(Class, int)
-     */
-    <T> T peekAs(Class<T> type, int index) throws CommandInvalidTypeException, CommandNotEnoughArgumentsException;
-
-    /**
-     * Tries to use a <b>stateless</b> {@link IArgParser} to parse the next argument into the specified class
-     * <p>
-     * A critical difference between {@link IDatatype}s and {@link IArgParser}s is how many arguments they can take.
-     * While {@link IArgParser}s always operate on a single argument's value, {@link IDatatype}s get access to the entire
-     * {@link IArgConsumer}}.
-     *
-     * @param type The type to peek as
-     * @return An instance of the specified type
-     * @throws CommandInvalidTypeException If the parsing failed
-     * @see IArgParser
-     * @see #peekAs(Class, int)
-     * @see #peekAsOrDefault(Class, Object)
-     * @see #peekAsOrNull(Class)
-     */
-    <T> T peekAs(Class<T> type) throws CommandInvalidTypeException, CommandNotEnoughArgumentsException;
-
-    /**
-     * Tries to use a <b>stateless</b> {@link IArgParser} to parse the argument at the specified index into the specified
-     * class
-     * <p>
-     * A critical difference between {@link IDatatype}s and {@link IArgParser}s is how many arguments they can take.
-     * While {@link IArgParser}s always operate on a single argument's value, {@link IDatatype}s get access to the entire
-     * {@link IArgConsumer}}.
-     *
-     * @param type  The type to peek as
-     * @param def   The value to return if the argument can't be parsed
-     * @param index The index to peek
-     * @return An instance of the specified type, or {@code def} if it couldn't be parsed
-     * @see IArgParser
-     * @see #peekAsOrDefault(Class, Object)
-     * @see #peekAs(Class, int)
-     * @see #peekAsOrNull(Class, int)
-     */
-    <T> T peekAsOrDefault(Class<T> type, T def, int index) throws CommandNotEnoughArgumentsException;
-
-    /**
-     * Tries to use a <b>stateless</b> {@link IArgParser} to parse the next argument into the specified class
-     * <p>
-     * A critical difference between {@link IDatatype}s and {@link IArgParser}s is how many arguments they can take.
-     * While {@link IArgParser}s always operate on a single argument's value, {@link IDatatype}s get access to the entire
-     * {@link IArgConsumer}}.
-     *
-     * @param type The type to peek as
-     * @param def  The value to return if the argument can't be parsed
-     * @return An instance of the specified type, or {@code def} if it couldn't be parsed
-     * @see IArgParser
-     * @see #peekAsOrDefault(Class, Object, int)
-     * @see #peekAs(Class)
-     * @see #peekAsOrNull(Class)
-     */
-    <T> T peekAsOrDefault(Class<T> type, T def) throws CommandNotEnoughArgumentsException;
-
-    /**
-     * Tries to use a <b>stateless</b> {@link IArgParser} to parse the argument at the specified index into the specified
-     * class
-     * <p>
-     * A critical difference between {@link IDatatype}s and {@link IArgParser}s is how many arguments they can take.
-     * While {@link IArgParser}s always operate on a single argument's value, {@link IDatatype}s get access to the entire
-     * {@link IArgConsumer}}.
-     *
-     * @param type  The type to peek as
-     * @param index The index to peek
-     * @return An instance of the specified type, or {@code null} if it couldn't be parsed
-     * @see IArgParser
-     * @see #peekAsOrNull(Class)
-     * @see #peekAs(Class, int)
-     * @see #peekAsOrDefault(Class, Object, int)
-     */
-    <T> T peekAsOrNull(Class<T> type, int index) throws CommandNotEnoughArgumentsException;
-
-    /**
-     * Tries to use a <b>stateless</b> {@link IArgParser} to parse the next argument into the specified class
-     * <p>
-     * A critical difference between {@link IDatatype}s and {@link IArgParser}s is how many arguments they can take.
-     * While {@link IArgParser}s always operate on a single argument's value, {@link IDatatype}s get access to the entire
-     * {@link IArgConsumer}}.
-     *
-     * @param type The type to peek as
-     * @return An instance of the specified type, or {@code null} if it couldn't be parsed
-     * @see IArgParser
-     * @see #peekAsOrNull(Class, int)
-     * @see #peekAs(Class)
-     * @see #peekAsOrDefault(Class, Object)
-     */
-    <T> T peekAsOrNull(Class<T> type) throws CommandNotEnoughArgumentsException;
-
-    <T> T peekDatatype(IDatatypeFor<T> datatype) throws CommandInvalidTypeException, CommandNotEnoughArgumentsException;
-
-    <T, O> T peekDatatype(IDatatypePost<T, O> datatype) throws CommandInvalidTypeException, CommandNotEnoughArgumentsException;
-
-    <T, O> T peekDatatype(IDatatypePost<T, O> datatype, O original) throws CommandInvalidTypeException, CommandNotEnoughArgumentsException;
-
-    <T> T peekDatatypeOrNull(IDatatypeFor<T> datatype);
-
-    <T, O> T peekDatatypeOrNull(IDatatypePost<T, O> datatype);
-
-    <T, O, D extends IDatatypePost<T, O>> T peekDatatypePost(D datatype, O original) throws CommandInvalidTypeException, CommandNotEnoughArgumentsException;
-
-    <T, O, D extends IDatatypePost<T, O>> T peekDatatypePostOrDefault(D datatype, O original, T def);
-
-    <T, O, D extends IDatatypePost<T, O>> T peekDatatypePostOrNull(D datatype, O original);
-
-    /**
-     * Attempts to get the specified {@link IDatatypeFor} from this ArgConsumer
-     * <p>
-     * A critical difference between {@link IDatatype}s and {@link IArgParser}s is how many arguments they can take.
-     * While {@link IArgParser}s always operate on a single argument's value, {@link IDatatype}s get access to the entire
-     * {@link IArgConsumer}}.
-     * <p>
-     * Since this is a peek operation, this ArgConsumer will not be mutated by any call to this method.
-     *
-     * @param datatype The datatype to get
-     * @return The datatype instance
-     * @see IDatatype
-     * @see IDatatypeFor
-     */
-    <T, D extends IDatatypeFor<T>> T peekDatatypeFor(Class<D> datatype);
-
-    /**
-     * Attempts to get the specified {@link IDatatypeFor} from this ArgConsumer
-     * <p>
-     * A critical difference between {@link IDatatype}s and {@link IArgParser}s is how many arguments they can take.
-     * While {@link IArgParser}s always operate on a single argument's value, {@link IDatatype}s get access to the entire
-     * {@link IArgConsumer}}.
-     * <p>
-     * Since this is a peek operation, this ArgConsumer will not be mutated by any call to this method.
-     *
-     * @param datatype The datatype to get
-     * @param def      The default value
-     * @return The datatype instance, or {@code def} if it throws an exception
-     * @see IDatatype
-     * @see IDatatypeFor
-     */
-    <T, D extends IDatatypeFor<T>> T peekDatatypeForOrDefault(Class<D> datatype, T def);
-
-    /**
-     * Attempts to get the specified {@link IDatatypeFor} from this ArgConsumer
-     * <p>
-     * A critical difference between {@link IDatatype}s and {@link IArgParser}s is how many arguments they can take.
-     * While {@link IArgParser}s always operate on a single argument's value, {@link IDatatype}s get access to the entire
-     * {@link IArgConsumer}}.
-     * <p>
-     * Since this is a peek operation, this ArgConsumer will not be mutated by any call to this method.
-     *
-     * @param datatype The datatype to get
-     * @return The datatype instance, or {@code null} if it throws an exception
-     * @see IDatatype
-     * @see IDatatypeFor
-     */
-    <T, D extends IDatatypeFor<T>> T peekDatatypeForOrNull(Class<D> datatype);
-
-    /**
-     * Gets the next argument and returns it. This consumes the first argument so that subsequent calls will return
-     * later arguments
-     *
-     * @return The next argument
-     * @throws CommandNotEnoughArgumentsException If there's less than one argument left
-     */
-    ICommandArgument get() throws CommandNotEnoughArgumentsException;
-
-    /**
-     * Gets the value of the next argument and returns it. This consumes the first argument so that subsequent calls
-     * will return later arguments
-     *
-     * @return The value of the next argument
-     * @throws CommandNotEnoughArgumentsException If there's less than one argument left
-     */
-    String getString() throws CommandNotEnoughArgumentsException;
-
-    /**
-     * Gets an enum value from the enum class with the same name as the next argument's value
-     * <p>
-     * For example if you getEnum as an {@link Direction}, and the next argument's value is "up", this will return
-     * {@link Direction#UP}
-     *
-     * @param enumClass The enum class to search
-     * @return An enum constant of that class with the same name as the next argument's value
-     * @throws CommandInvalidTypeException If the constant couldn't be found
-     * @see #peekEnum(Class)
-     * @see #getEnumOrNull(Class)
-     * @see ICommandArgument#getEnum(Class)
-     */
-    <E extends Enum<?>> E getEnum(Class<E> enumClass) throws CommandInvalidTypeException, CommandNotEnoughArgumentsException;
-
-    /**
-     * Gets an enum value from the enum class with the same name as the next argument's value
-     * <p>
-     * For example if you getEnum as an {@link Direction}, and the next argument's value is "up", this will return
-     * {@link Direction#UP}
-     *
-     * @param enumClass The enum class to search
-     * @param def       The default value
-     * @return An enum constant of that class with the same name as the next argument's value, or {@code def} if it
-     * couldn't be found
-     * @see #getEnum(Class)
-     * @see #getEnumOrNull(Class)
-     * @see #peekEnumOrNull(Class)
-     * @see ICommandArgument#getEnum(Class)
-     */
-    <E extends Enum<?>> E getEnumOrDefault(Class<E> enumClass, E def) throws CommandNotEnoughArgumentsException;
-
-    /**
-     * Gets an enum value from the enum class with the same name as the next argument's value
-     * <p>
-     * For example if you getEnum as an {@link Direction}, and the next argument's value is "up", this will return
-     * {@link Direction#UP}
-     *
-     * @param enumClass The enum class to search
-     * @return An enum constant of that class with the same name as the next argument's value, or {@code null} if it
-     * couldn't be found
-     * @see #getEnum(Class)
-     * @see #getEnumOrDefault(Class, Enum)
-     * @see #peekEnumOrNull(Class)
-     * @see ICommandArgument#getEnum(Class)
-     */
-    <E extends Enum<?>> E getEnumOrNull(Class<E> enumClass) throws CommandNotEnoughArgumentsException;
-
-    /**
-     * Tries to use a <b>stateless</b> {@link IArgParser} to parse the next argument into the specified class
-     * <p>
-     * A critical difference between {@link IDatatype}s and {@link IArgParser}s is how many arguments they can take.
-     * While {@link IArgParser}s always operate on a single argument's value, {@link IDatatype}s get access to the entire
-     * {@link IArgConsumer}}.
-     *
-     * @param type The type to peek as
-     * @return An instance of the specified type
-     * @throws CommandInvalidTypeException If the parsing failed
-     * @see IArgParser
-     * @see #get()
-     * @see #getAsOrDefault(Class, Object)
-     * @see #getAsOrNull(Class)
-     * @see #peekAs(Class)
-     * @see #peekAsOrDefault(Class, Object, int)
-     * @see #peekAsOrNull(Class, int)
-     */
-    <T> T getAs(Class<T> type) throws CommandInvalidTypeException, CommandNotEnoughArgumentsException;
-
-    /**
-     * Tries to use a <b>stateless</b> {@link IArgParser} to parse the next argument into the specified class
-     * <p>
-     * A critical difference between {@link IDatatype}s and {@link IArgParser}s is how many arguments they can take.
-     * While {@link IArgParser}s always operate on a single argument's value, {@link IDatatype}s get access to the entire
-     * {@link IArgConsumer}}.
-     *
-     * @param type The type to peek as
-     * @param def  The default value
-     * @return An instance of the specified type, or {@code def} if it couldn't be parsed
-     * @see IArgParser
-     * @see #get()
-     * @see #getAs(Class)
-     * @see #getAsOrNull(Class)
-     * @see #peekAs(Class)
-     * @see #peekAsOrDefault(Class, Object, int)
-     * @see #peekAsOrNull(Class, int)
-     */
-    <T> T getAsOrDefault(Class<T> type, T def) throws CommandNotEnoughArgumentsException;
-
-    /**
-     * Tries to use a <b>stateless</b> {@link IArgParser} to parse the next argument into the specified class
-     * <p>
-     * A critical difference between {@link IDatatype}s and {@link IArgParser}s is how many arguments they can take.
-     * While {@link IArgParser}s always operate on a single argument's value, {@link IDatatype}s get access to the entire
-     * {@link IArgConsumer}}.
-     *
-     * @param type The type to peek as
-     * @return An instance of the specified type, or {@code null} if it couldn't be parsed
-     * @see IArgParser
-     * @see #get()
-     * @see #getAs(Class)
-     * @see #getAsOrDefault(Class, Object)
-     * @see #peekAs(Class)
-     * @see #peekAsOrDefault(Class, Object, int)
-     * @see #peekAsOrNull(Class, int)
-     */
-    <T> T getAsOrNull(Class<T> type) throws CommandNotEnoughArgumentsException;
-
-    <T, O, D extends IDatatypePost<T, O>> T getDatatypePost(D datatype, O original) throws CommandInvalidTypeException, CommandNotEnoughArgumentsException;
-
-    <T, O, D extends IDatatypePost<T, O>> T getDatatypePostOrDefault(D datatype, O original, T _default);
-
-    <T, O, D extends IDatatypePost<T, O>> T getDatatypePostOrNull(D datatype, O original);
-
-    <T, D extends IDatatypeFor<T>> T getDatatypeFor(D datatype) throws CommandInvalidTypeException, CommandNotEnoughArgumentsException;
-
-    <T, D extends IDatatypeFor<T>> T getDatatypeForOrDefault(D datatype, T def);
-
-    <T, D extends IDatatypeFor<T>> T getDatatypeForOrNull(D datatype);
-
-    <T extends IDatatype> Stream<String> tabCompleteDatatype(T datatype);
-
-    /**
-     * Returns the "raw rest" of the string. For example, from a string <code>arg1 arg2&nbsp;&nbsp;arg3</code>, split
-     * into three {@link ICommandArgument}s {@code "arg1"}, {@code "arg2"}, and {@code "arg3"}:
-     *
-     * <ul>
-     * <li>{@code rawRest()} would return <code>arg1 arg2&nbsp;&nbsp;arg3</code></li>
-     * <li>After calling {@link #get()}, {@code rawRest()} would return <code>arg2&nbsp;&nbsp;arg3</code> (note the
-     * double space - it is preserved!)</li>
-     * <li>After calling {@link #get()} again, {@code rawRest()} would return {@code "arg3"}</li>
-     * <li>After calling {@link #get()} one last time, {@code rawRest()} would return {@code ""}</li>
-     * </ul>
-     *
-     * @return The "raw rest" of the string.
-     */
-    String rawRest();
-
-    /**
-     * @param min The minimum amount of arguments to require.
-     * @throws CommandNotEnoughArgumentsException If there are less than {@code min} arguments left.
-     * @see #requireMax(int)
-     * @see #requireExactly(int)
-     */
-    void requireMin(int min) throws CommandNotEnoughArgumentsException;
-
-    /**
-     * @param max The maximum amount of arguments allowed.
-     * @throws CommandTooManyArgumentsException If there are more than {@code max} arguments left.
-     * @see #requireMin(int)
-     * @see #requireExactly(int)
-     */
-    void requireMax(int max) throws CommandTooManyArgumentsException;
-
-    /**
-     * @param args The exact amount of arguments to require.
-     * @throws CommandNotEnoughArgumentsException If there are less than {@code args} arguments left.
-     * @throws CommandTooManyArgumentsException   If there are more than {@code args} arguments left.
-     * @see #requireMin(int)
-     * @see #requireMax(int)
-     */
-    void requireExactly(int args) throws CommandException;
-
-    /**
-     * @return If this {@link IArgConsumer}} has consumed at least one argument.
-     * @see #consumed()
-     * @see #consumedString()
-     */
-    boolean hasConsumed();
-
-    /**
-     * @return The last argument this {@link IArgConsumer}} has consumed, or an "unknown" argument, indicated by a
-     * comamnd argument index that has a value of {@code -1}, if no arguments have been consumed yet.
-     * @see #consumedString()
-     * @see #hasConsumed()
-     */
-    ICommandArgument consumed();
-
-    /**
-     * @return The value of thelast argument this {@link IArgConsumer}} has consumed, or an empty string if no arguments
-     * have been consumed yet
-     * @see #consumed()
-     * @see #hasConsumed()
-     */
-    String consumedString();
-
-    /**
-     * @return A copy of this {@link IArgConsumer}}. It has the same arguments (both consumed and not), but does not
-     * affect or mutate this instance. Useful for the various {@code peek} functions
-     */
-    IArgConsumer copy();
-}

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

@@ -1,101 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.argument;
-
-import baritone.api.command.argparser.IArgParser;
-import baritone.api.command.exception.CommandInvalidTypeException;
-import net.minecraft.util.Direction;
-
-/**
- * A {@link ICommandArgument} is an immutable object representing one command argument. It contains data on the index of
- * that argument, its value, and the rest of the string that argument was found in
- * <p>
- * You're recommended to use {@link IArgConsumer}}s to handle these.
- *
- * @author Brady
- * @since 10/2/2019
- */
-public interface ICommandArgument {
-
-    /**
-     * @return The index of this command argument in the list of command arguments generated
-     */
-    int getIndex();
-
-    /**
-     * @return The raw value of just this argument
-     */
-    String getValue();
-
-    /**
-     * @return The raw value of the remaining arguments after this one was captured
-     */
-    String getRawRest();
-
-    /**
-     * Gets an enum value from the enum class with the same name as this argument's value
-     * <p>
-     * For example if you getEnum as an {@link Direction}, and this argument's value is "up", it will return {@link
-     * Direction#UP}
-     *
-     * @param enumClass The enum class to search
-     * @return An enum constant of that class with the same name as this argument's value
-     * @throws CommandInvalidTypeException If the constant couldn't be found
-     * @see IArgConsumer#peekEnum(Class)
-     * @see IArgConsumer#peekEnum(Class, int)
-     * @see IArgConsumer#peekEnumOrNull(Class)
-     * @see IArgConsumer#peekEnumOrNull(Class, int)
-     * @see IArgConsumer#getEnum(Class)
-     * @see IArgConsumer#getEnumOrNull(Class)
-     */
-    <E extends Enum<?>> E getEnum(Class<E> enumClass) throws CommandInvalidTypeException;
-
-    /**
-     * Tries to use a <b>stateless</b> {@link IArgParser} to parse this argument into the specified class
-     *
-     * @param type The class to parse this argument into
-     * @return An instance of the specified type
-     * @throws CommandInvalidTypeException If the parsing failed
-     */
-    <T> T getAs(Class<T> type) throws CommandInvalidTypeException;
-
-    /**
-     * Tries to use a <b>stateless</b> {@link IArgParser} to parse this argument into the specified class
-     *
-     * @param type The class to parse this argument into
-     * @return If the parser succeeded
-     */
-    <T> boolean is(Class<T> type);
-
-    /**
-     * Tries to use a <b>stated</b> {@link IArgParser} to parse this argument into the specified class
-     *
-     * @param type The class to parse this argument into
-     * @return An instance of the specified type
-     * @throws CommandInvalidTypeException If the parsing failed
-     */
-    <T, S> T getAs(Class<T> type, Class<S> stateType, S state) throws CommandInvalidTypeException;
-
-    /**
-     * Tries to use a <b>stated</b> {@link IArgParser} to parse this argument into the specified class
-     *
-     * @param type The class to parse this argument into
-     * @return If the parser succeeded
-     */
-    <T, S> boolean is(Class<T> type, Class<S> stateType, S state);
-}

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

@@ -1,53 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.datatypes;
-
-import baritone.api.command.exception.CommandException;
-import baritone.api.command.helpers.TabCompleteHelper;
-import net.minecraft.block.Block;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.registry.Registry;
-
-import java.util.stream.Stream;
-
-public enum BlockById implements IDatatypeFor<Block> {
-    INSTANCE;
-
-    @Override
-    public Block get(IDatatypeContext ctx) throws CommandException {
-        ResourceLocation id = new ResourceLocation(ctx.getConsumer().getString());
-        Block block;
-        if ((block = Registry.BLOCK.getOptional(id).orElse(null)) == null) {
-            throw new IllegalArgumentException("no block found by that id");
-        }
-        return block;
-    }
-
-    @Override
-    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
-        return new TabCompleteHelper()
-                .append(
-                        Registry.BLOCK.keySet()
-                                .stream()
-                                .map(Object::toString)
-                )
-                .filterPrefixNamespaced(ctx.getConsumer().getString())
-                .sortAlphabetically()
-                .stream();
-    }
-}

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

@@ -1,49 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.datatypes;
-
-import baritone.api.command.exception.CommandException;
-import baritone.api.command.helpers.TabCompleteHelper;
-import net.minecraft.entity.EntityType;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.registry.Registry;
-
-import java.util.stream.Stream;
-
-public enum EntityClassById implements IDatatypeFor<EntityType> {
-    INSTANCE;
-
-    @Override
-    public EntityType get(IDatatypeContext ctx) throws CommandException {
-        ResourceLocation id = new ResourceLocation(ctx.getConsumer().getString());
-        EntityType entity;
-        if ((entity = Registry.ENTITY_TYPE.getOptional(id).orElse(null)) == null) {
-            throw new IllegalArgumentException("no entity found by that id");
-        }
-        return entity;
-    }
-
-    @Override
-    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
-        return new TabCompleteHelper()
-                .append(Registry.ENTITY_TYPE.stream().map(Object::toString))
-                .filterPrefixNamespaced(ctx.getConsumer().getString())
-                .sortAlphabetically()
-                .stream();
-    }
-}

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

@@ -1,37 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.datatypes;
-
-import baritone.api.command.exception.CommandException;
-import baritone.api.utils.BlockOptionalMeta;
-
-import java.util.stream.Stream;
-
-public enum ForBlockOptionalMeta implements IDatatypeFor<BlockOptionalMeta> {
-    INSTANCE;
-
-    @Override
-    public BlockOptionalMeta get(IDatatypeContext ctx) throws CommandException {
-        return new BlockOptionalMeta(ctx.getConsumer().getString());
-    }
-
-    @Override
-    public Stream<String> tabComplete(IDatatypeContext ctx) {
-        return ctx.getConsumer().tabCompleteDatatype(BlockById.INSTANCE);
-    }
-}

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

@@ -1,43 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.datatypes;
-
-import baritone.api.command.exception.CommandException;
-import baritone.api.command.helpers.TabCompleteHelper;
-import net.minecraft.util.Direction;
-
-import java.util.Locale;
-import java.util.stream.Stream;
-
-public enum ForDirection implements IDatatypeFor<Direction> {
-    INSTANCE;
-
-    @Override
-    public Direction get(IDatatypeContext ctx) throws CommandException {
-        return Direction.valueOf(ctx.getConsumer().getString().toUpperCase(Locale.US));
-    }
-
-    @Override
-    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
-        return new TabCompleteHelper()
-                .append(Stream.of(Direction.values())
-                        .map(Direction::getName2).map(String::toLowerCase))
-                .filterPrefix(ctx.getConsumer().getString())
-                .stream();
-    }
-}

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

@@ -1,81 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.datatypes;
-
-import baritone.api.IBaritone;
-import baritone.api.cache.IWaypoint;
-import baritone.api.cache.IWaypointCollection;
-import baritone.api.command.exception.CommandException;
-import baritone.api.command.helpers.TabCompleteHelper;
-
-import java.util.Comparator;
-import java.util.stream.Stream;
-
-public enum ForWaypoints implements IDatatypeFor<IWaypoint[]> {
-    INSTANCE;
-
-    @Override
-    public IWaypoint[] get(IDatatypeContext ctx) throws CommandException {
-        final String input = ctx.getConsumer().getString();
-        final IWaypoint.Tag tag = IWaypoint.Tag.getByName(input);
-
-        // If the input doesn't resolve to a valid tag, resolve by name
-        return tag == null
-                ? getWaypointsByName(ctx.getBaritone(), input)
-                : getWaypointsByTag(ctx.getBaritone(), tag);
-    }
-
-    @Override
-    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
-        return new TabCompleteHelper()
-                .append(getWaypointNames(ctx.getBaritone()))
-                .sortAlphabetically()
-                .prepend(IWaypoint.Tag.getAllNames())
-                .filterPrefix(ctx.getConsumer().getString())
-                .stream();
-    }
-
-    public static IWaypointCollection waypoints(IBaritone baritone) {
-        return baritone.getWorldProvider().getCurrentWorld().getWaypoints();
-    }
-
-    public static IWaypoint[] getWaypoints(IBaritone baritone) {
-        return waypoints(baritone).getAllWaypoints().stream()
-                .sorted(Comparator.comparingLong(IWaypoint::getCreationTimestamp).reversed())
-                .toArray(IWaypoint[]::new);
-    }
-
-    public static String[] getWaypointNames(IBaritone baritone) {
-        return Stream.of(getWaypoints(baritone))
-                .map(IWaypoint::getName)
-                .filter(name -> !name.isEmpty())
-                .toArray(String[]::new);
-    }
-
-    public static IWaypoint[] getWaypointsByTag(IBaritone baritone, IWaypoint.Tag tag) {
-        return waypoints(baritone).getByTag(tag).stream()
-                .sorted(Comparator.comparingLong(IWaypoint::getCreationTimestamp).reversed())
-                .toArray(IWaypoint[]::new);
-    }
-
-    public static IWaypoint[] getWaypointsByName(IBaritone baritone, String name) {
-        return Stream.of(getWaypoints(baritone))
-                .filter(waypoint -> waypoint.getName().equalsIgnoreCase(name))
-                .toArray(IWaypoint[]::new);
-    }
-}

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

@@ -1,56 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.datatypes;
-
-import baritone.api.command.argparser.IArgParser;
-import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.exception.CommandException;
-
-import java.util.stream.Stream;
-
-/**
- * An {@link IDatatype} is similar to an {@link IArgParser} in the sense that it is capable of consuming an argument
- * to transform it into a usable form as the code desires.
- * <p>
- * A fundamental difference is that an {@link IDatatype} is capable of consuming multiple arguments. For example,
- * {@link RelativeBlockPos} is an {@link IDatatypePost} which requires at least 3 {@link RelativeCoordinate} arguments
- * to be specified.
- * <p>
- * Another difference is that an {@link IDatatype} can be tab-completed, providing comprehensive auto completion
- * that can substitute based on existing input or provide possibilities for the next piece of input.
- *
- * @see IDatatypeContext
- * @see IDatatypeFor
- * @see IDatatypePost
- */
-public interface IDatatype {
-
-    /**
-     * Attempts to complete missing or partial input provided through the {@link IArgConsumer}} provided by
-     * {@link IDatatypeContext#getConsumer()} in order to aide the user in executing commands.
-     * <p>
-     * One benefit over datatypes over {@link IArgParser}s is that instead of each command trying to guess what values
-     * the datatype will accept, or simply not tab completing at all, datatypes that support tab completion can provide
-     * accurate information using the same methods used to parse arguments in the first place.
-     *
-     * @param ctx The argument consumer to tab complete
-     * @return A stream representing the strings that can be tab completed. DO NOT INCLUDE SPACES IN ANY STRINGS.
-     * @see IArgConsumer#tabCompleteDatatype(IDatatype)
-     */
-    Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException;
-}

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

@@ -1,46 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.datatypes;
-
-import baritone.api.IBaritone;
-import baritone.api.command.argument.IArgConsumer;
-
-/**
- * Provides an {@link IDatatype} with contextual information so
- * that it can perform the desired operation on the target level.
- *
- * @author Brady
- * @see IDatatype
- * @since 9/26/2019
- */
-public interface IDatatypeContext {
-
-    /**
-     * Provides the {@link IBaritone} instance that is associated with the action relating to datatype handling.
-     *
-     * @return The context {@link IBaritone} instance.
-     */
-    IBaritone getBaritone();
-
-    /**
-     * Provides the {@link IArgConsumer}} to fetch input information from.
-     *
-     * @return The context {@link IArgConsumer}}.
-     */
-    IArgConsumer getConsumer();
-}

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

@@ -1,43 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.datatypes;
-
-import baritone.api.command.exception.CommandException;
-
-import java.util.function.Supplier;
-
-/**
- * An {@link IDatatype} which acts as a {@link Supplier}, in essence. The only difference
- * is that it requires an {@link IDatatypeContext} to be provided due to the expectation that
- * implementations of {@link IDatatype} are singletons.
- */
-public interface IDatatypeFor<T> extends IDatatype {
-
-    /**
-     * Consumes the desired amount of arguments from the specified {@link IDatatypeContext}, and
-     * then returns the parsed value. This method will more than likely return a {@link IllegalArgumentException}
-     * if the expected input does not conform to a parseable value. As far as a {@link CommandException} being
-     * thrown is concerned, see the note below for specifics.
-     *
-     * @param ctx The context
-     * @return The parsed data-type
-     * @throws CommandException If there was an issue parsing using another type or arguments could not be polled.
-     * @see IDatatypeContext
-     */
-    T get(IDatatypeContext ctx) throws CommandException;
-}

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

@@ -1,41 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.datatypes;
-
-import baritone.api.command.exception.CommandException;
-
-import java.util.function.Function;
-
-/**
- * An {@link IDatatype} which acts as a {@link Function}, in essence. The only difference
- * is that it requires an {@link IDatatypeContext} to be provided due to the expectation that
- * implementations of {@link IDatatype} are singletons.
- */
-public interface IDatatypePost<T, O> extends IDatatype {
-
-    /**
-     * Takes the expected input and transforms it based on the value held by {@code original}. If {@code original}
-     * is null, it is expected that the implementation of this method has a case to handle it, such that a
-     * {@link NullPointerException} will never be thrown as a result.
-     *
-     * @param ctx      The datatype context
-     * @param original The transformable value
-     * @return The transformed value
-     */
-    T apply(IDatatypeContext ctx, O original) throws CommandException;
-}

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

@@ -1,56 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.datatypes;
-
-import baritone.api.IBaritone;
-import baritone.api.command.exception.CommandException;
-import baritone.api.command.helpers.TabCompleteHelper;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.util.text.ITextComponent;
-
-import java.util.List;
-import java.util.stream.Stream;
-
-/**
- * An {@link IDatatype} used to resolve nearby players, those within
- * render distance of the target {@link IBaritone} instance.
- */
-public enum NearbyPlayer implements IDatatypeFor<PlayerEntity> {
-    INSTANCE;
-
-    @Override
-    public PlayerEntity get(IDatatypeContext ctx) throws CommandException {
-        final String username = ctx.getConsumer().getString();
-        return getPlayers(ctx).stream()
-                .filter(s -> s.getName().getString().equalsIgnoreCase(username))
-                .findFirst().orElse(null);
-    }
-
-    @Override
-    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
-        return new TabCompleteHelper()
-                .append(getPlayers(ctx).stream().map(PlayerEntity::getName).map(ITextComponent::getString))
-                .filterPrefix(ctx.getConsumer().getString())
-                .sortAlphabetically()
-                .stream();
-    }
-
-    private static List<? extends PlayerEntity> getPlayers(IDatatypeContext ctx) {
-        return ctx.getBaritone().getPlayerContext().world().getPlayers();
-    }
-}

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

@@ -1,57 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.datatypes;
-
-import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.exception.CommandException;
-import baritone.api.utils.BetterBlockPos;
-
-import java.util.stream.Stream;
-
-public enum RelativeBlockPos implements IDatatypePost<BetterBlockPos, BetterBlockPos> {
-    INSTANCE;
-
-    @Override
-    public BetterBlockPos apply(IDatatypeContext ctx, BetterBlockPos origin) throws CommandException {
-        if (origin == null) {
-            origin = BetterBlockPos.ORIGIN;
-        }
-
-        final IArgConsumer consumer = ctx.getConsumer();
-        return new BetterBlockPos(
-                consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.x),
-                consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.y),
-                consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.z)
-        );
-    }
-
-    @Override
-    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
-        final IArgConsumer consumer = ctx.getConsumer();
-        if (consumer.hasAny() && !consumer.has(4)) {
-            while (consumer.has(2)) {
-                if (consumer.peekDatatypeOrNull(RelativeCoordinate.INSTANCE) == null) {
-                    break;
-                }
-                consumer.get();
-            }
-            return consumer.tabCompleteDatatype(RelativeCoordinate.INSTANCE);
-        }
-        return Stream.empty();
-    }
-}

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

@@ -1,69 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.datatypes;
-
-import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.exception.CommandException;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Stream;
-
-public enum RelativeCoordinate implements IDatatypePost<Double, Double> {
-    INSTANCE;
-    private static String ScalesAliasRegex = "[kKmM]";
-    private static Pattern PATTERN = Pattern.compile("^(~?)([+-]?(?:\\d+(?:\\.\\d*)?|\\.\\d+)(" + ScalesAliasRegex + "?)|)$");
-
-    @Override
-    public Double apply(IDatatypeContext ctx, Double origin) throws CommandException {
-        if (origin == null) {
-            origin = 0.0D;
-        }
-
-        Matcher matcher = PATTERN.matcher(ctx.getConsumer().getString());
-        if (!matcher.matches()) {
-            throw new IllegalArgumentException("pattern doesn't match");
-        }
-
-        boolean isRelative = !matcher.group(1).isEmpty();
-
-        double offset = matcher.group(2).isEmpty() ? 0 : Double.parseDouble(matcher.group(2).replaceAll(ScalesAliasRegex, ""));
-
-        if (matcher.group(2).toLowerCase().contains("k")) {
-            offset *= 1000;
-        }
-        if (matcher.group(2).toLowerCase().contains("m")) {
-            offset *= 1000000;
-        }
-
-
-        if (isRelative) {
-            return origin + offset;
-        }
-        return offset;
-    }
-
-    @Override
-    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
-        final IArgConsumer consumer = ctx.getConsumer();
-        if (!consumer.has(2) && consumer.getString().matches("^(~|$)")) {
-            return Stream.of("~");
-        }
-        return Stream.empty();
-    }
-}

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

@@ -1,103 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.datatypes;
-
-import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.exception.CommandException;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.nio.file.FileSystems;
-import java.nio.file.InvalidPathException;
-import java.nio.file.Path;
-import java.util.Locale;
-import java.util.Objects;
-import java.util.stream.Stream;
-
-import static baritone.api.utils.Helper.HELPER;
-
-public enum RelativeFile implements IDatatypePost<File, File> {
-    INSTANCE;
-
-    @Override
-    public File apply(IDatatypeContext ctx, File original) throws CommandException {
-        if (original == null) {
-            original = new File("./");
-        }
-
-        Path path;
-        try {
-            path = FileSystems.getDefault().getPath(ctx.getConsumer().getString());
-        } catch (InvalidPathException e) {
-            throw new IllegalArgumentException("invalid path");
-        }
-        return getCanonicalFileUnchecked(original.toPath().resolve(path).toFile());
-    }
-
-    @Override
-    public Stream<String> tabComplete(IDatatypeContext ctx) {
-        return Stream.empty();
-    }
-
-    /**
-     * Seriously
-     *
-     * @param file File
-     * @return Canonical file of file
-     * @author LoganDark
-     */
-    private static File getCanonicalFileUnchecked(File file) {
-        try {
-            return file.getCanonicalFile();
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
-    }
-
-    public static Stream<String> tabComplete(IArgConsumer consumer, File base0) throws CommandException {
-        // I will not make the caller deal with this, seriously
-        // Tab complete code is beautiful and I'm not going to bloat it with dumb ass checked exception bullshit -LoganDark
-
-        // lol owned -Brady
-
-        File base = getCanonicalFileUnchecked(base0);
-        String currentPathStringThing = consumer.getString();
-        Path currentPath = FileSystems.getDefault().getPath(currentPathStringThing);
-        Path basePath = currentPath.isAbsolute() ? currentPath.getRoot() : base.toPath();
-        boolean useParent = !currentPathStringThing.isEmpty() && !currentPathStringThing.endsWith(File.separator);
-        File currentFile = currentPath.isAbsolute() ? currentPath.toFile() : new File(base, currentPathStringThing);
-        return Stream.of(Objects.requireNonNull(getCanonicalFileUnchecked(
-                        useParent
-                                ? currentFile.getParentFile()
-                                : currentFile
-                ).listFiles()))
-                .map(f -> (currentPath.isAbsolute() ? f : basePath.relativize(f.toPath()).toString()) +
-                        (f.isDirectory() ? File.separator : ""))
-                .filter(s -> s.toLowerCase(Locale.US).startsWith(currentPathStringThing.toLowerCase(Locale.US)))
-                .filter(s -> !s.contains(" "));
-    }
-
-    public static File gameDir() {
-        File gameDir = HELPER.mc.gameDir.getAbsoluteFile();
-        if (gameDir.getName().equals(".")) {
-            return gameDir.getParentFile();
-        }
-        return gameDir;
-    }
-}

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

@@ -1,64 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.datatypes;
-
-import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.exception.CommandException;
-import baritone.api.pathing.goals.Goal;
-import baritone.api.pathing.goals.GoalBlock;
-import baritone.api.pathing.goals.GoalXZ;
-import baritone.api.pathing.goals.GoalYLevel;
-import baritone.api.utils.BetterBlockPos;
-
-import java.util.stream.Stream;
-
-public enum RelativeGoal implements IDatatypePost<Goal, BetterBlockPos> {
-    INSTANCE;
-
-    @Override
-    public Goal apply(IDatatypeContext ctx, BetterBlockPos origin) throws CommandException {
-        if (origin == null) {
-            origin = BetterBlockPos.ORIGIN;
-        }
-
-        final IArgConsumer consumer = ctx.getConsumer();
-
-        GoalBlock goalBlock = consumer.peekDatatypePostOrNull(RelativeGoalBlock.INSTANCE, origin);
-        if (goalBlock != null) {
-            return goalBlock;
-        }
-
-        GoalXZ goalXZ = consumer.peekDatatypePostOrNull(RelativeGoalXZ.INSTANCE, origin);
-        if (goalXZ != null) {
-            return goalXZ;
-        }
-
-        GoalYLevel goalYLevel = consumer.peekDatatypePostOrNull(RelativeGoalYLevel.INSTANCE, origin);
-        if (goalYLevel != null) {
-            return goalYLevel;
-        }
-
-        // when the user doesn't input anything, default to the origin
-        return new GoalBlock(origin);
-    }
-
-    @Override
-    public Stream<String> tabComplete(IDatatypeContext ctx) {
-        return ctx.getConsumer().tabCompleteDatatype(RelativeCoordinate.INSTANCE);
-    }
-}

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

@@ -1,53 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.datatypes;
-
-import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.exception.CommandException;
-import baritone.api.pathing.goals.GoalBlock;
-import baritone.api.utils.BetterBlockPos;
-import net.minecraft.util.math.MathHelper;
-
-import java.util.stream.Stream;
-
-public enum RelativeGoalBlock implements IDatatypePost<GoalBlock, BetterBlockPos> {
-    INSTANCE;
-
-    @Override
-    public GoalBlock apply(IDatatypeContext ctx, BetterBlockPos origin) throws CommandException {
-        if (origin == null) {
-            origin = BetterBlockPos.ORIGIN;
-        }
-
-        final IArgConsumer consumer = ctx.getConsumer();
-        return new GoalBlock(
-                MathHelper.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.x)),
-                MathHelper.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.y)),
-                MathHelper.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.z))
-        );
-    }
-
-    @Override
-    public Stream<String> tabComplete(IDatatypeContext ctx) {
-        final IArgConsumer consumer = ctx.getConsumer();
-        if (consumer.hasAtMost(3)) {
-            return consumer.tabCompleteDatatype(RelativeCoordinate.INSTANCE);
-        }
-        return Stream.empty();
-    }
-}

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

@@ -1,52 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.datatypes;
-
-import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.exception.CommandException;
-import baritone.api.pathing.goals.GoalXZ;
-import baritone.api.utils.BetterBlockPos;
-import net.minecraft.util.math.MathHelper;
-
-import java.util.stream.Stream;
-
-public enum RelativeGoalXZ implements IDatatypePost<GoalXZ, BetterBlockPos> {
-    INSTANCE;
-
-    @Override
-    public GoalXZ apply(IDatatypeContext ctx, BetterBlockPos origin) throws CommandException {
-        if (origin == null) {
-            origin = BetterBlockPos.ORIGIN;
-        }
-
-        final IArgConsumer consumer = ctx.getConsumer();
-        return new GoalXZ(
-                MathHelper.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.x)),
-                MathHelper.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.z))
-        );
-    }
-
-    @Override
-    public Stream<String> tabComplete(IDatatypeContext ctx) {
-        final IArgConsumer consumer = ctx.getConsumer();
-        if (consumer.hasAtMost(2)) {
-            return consumer.tabCompleteDatatype(RelativeCoordinate.INSTANCE);
-        }
-        return Stream.empty();
-    }
-}

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

@@ -1,50 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.datatypes;
-
-import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.exception.CommandException;
-import baritone.api.pathing.goals.GoalYLevel;
-import baritone.api.utils.BetterBlockPos;
-import net.minecraft.util.math.MathHelper;
-
-import java.util.stream.Stream;
-
-public enum RelativeGoalYLevel implements IDatatypePost<GoalYLevel, BetterBlockPos> {
-    INSTANCE;
-
-    @Override
-    public GoalYLevel apply(IDatatypeContext ctx, BetterBlockPos origin) throws CommandException {
-        if (origin == null) {
-            origin = BetterBlockPos.ORIGIN;
-        }
-
-        return new GoalYLevel(
-                MathHelper.floor(ctx.getConsumer().getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.y))
-        );
-    }
-
-    @Override
-    public Stream<String> tabComplete(IDatatypeContext ctx) {
-        final IArgConsumer consumer = ctx.getConsumer();
-        if (consumer.hasAtMost(1)) {
-            return consumer.tabCompleteDatatype(RelativeCoordinate.INSTANCE);
-        }
-        return Stream.empty();
-    }
-}

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

@@ -1,29 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.exception;
-
-public abstract class CommandErrorMessageException extends CommandException {
-
-    protected CommandErrorMessageException(String reason) {
-        super(reason);
-    }
-
-    protected CommandErrorMessageException(String reason, Throwable cause) {
-        super(reason, cause);
-    }
-}

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

@@ -1,29 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.exception;
-
-public abstract class CommandException extends Exception implements ICommandException {
-
-    protected CommandException(String reason) {
-        super(reason);
-    }
-
-    protected CommandException(String reason, Throwable cause) {
-        super(reason, cause);
-    }
-}

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

@@ -1,43 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.exception;
-
-import baritone.api.command.argument.ICommandArgument;
-
-public abstract class CommandInvalidArgumentException extends CommandErrorMessageException {
-
-    public final ICommandArgument arg;
-
-    protected CommandInvalidArgumentException(ICommandArgument arg, String message) {
-        super(formatMessage(arg, message));
-        this.arg = arg;
-    }
-
-    protected CommandInvalidArgumentException(ICommandArgument arg, String message, Throwable cause) {
-        super(formatMessage(arg, message), cause);
-        this.arg = arg;
-    }
-
-    private static String formatMessage(ICommandArgument arg, String message) {
-        return String.format(
-                "Error at argument #%s: %s",
-                arg.getIndex() == -1 ? "<unknown>" : Integer.toString(arg.getIndex() + 1),
-                message
-        );
-    }
-}

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

@@ -1,25 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.exception;
-
-public class CommandInvalidStateException extends CommandErrorMessageException {
-
-    public CommandInvalidStateException(String reason) {
-        super(reason);
-    }
-}

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

@@ -1,39 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.exception;
-
-import baritone.api.command.argument.ICommandArgument;
-
-public class CommandInvalidTypeException extends CommandInvalidArgumentException {
-
-    public CommandInvalidTypeException(ICommandArgument arg, String expected) {
-        super(arg, String.format("Expected %s", expected));
-    }
-
-    public CommandInvalidTypeException(ICommandArgument arg, String expected, Throwable cause) {
-        super(arg, String.format("Expected %s", expected), cause);
-    }
-
-    public CommandInvalidTypeException(ICommandArgument arg, String expected, String got) {
-        super(arg, String.format("Expected %s, but got %s instead", expected, got));
-    }
-
-    public CommandInvalidTypeException(ICommandArgument arg, String expected, String got, Throwable cause) {
-        super(arg, String.format("Expected %s, but got %s instead", expected, got), cause);
-    }
-}

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

@@ -1,25 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.exception;
-
-public class CommandNoParserForTypeException extends CommandUnhandledException {
-
-    public CommandNoParserForTypeException(Class<?> klass) {
-        super(String.format("Could not find a handler for type %s", klass.getSimpleName()));
-    }
-}

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

@@ -1,25 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.exception;
-
-public class CommandNotEnoughArgumentsException extends CommandErrorMessageException {
-
-    public CommandNotEnoughArgumentsException(int minArgs) {
-        super(String.format("Not enough arguments (expected at least %d)", minArgs));
-    }
-}

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

@@ -1,40 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.exception;
-
-import baritone.api.command.ICommand;
-import baritone.api.command.argument.ICommandArgument;
-
-import java.util.List;
-
-import static baritone.api.utils.Helper.HELPER;
-
-public class CommandNotFoundException extends CommandException {
-
-    public final String command;
-
-    public CommandNotFoundException(String command) {
-        super(String.format("Command not found: %s", command));
-        this.command = command;
-    }
-
-    @Override
-    public void handle(ICommand command, List<ICommandArgument> args) {
-        HELPER.logDirect(getMessage());
-    }
-}

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

@@ -1,25 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.exception;
-
-public class CommandTooManyArgumentsException extends CommandErrorMessageException {
-
-    public CommandTooManyArgumentsException(int maxArgs) {
-        super(String.format("Too many arguments (expected at most %d)", maxArgs));
-    }
-}

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

@@ -1,46 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.exception;
-
-import baritone.api.command.ICommand;
-import baritone.api.command.argument.ICommandArgument;
-import net.minecraft.util.text.TextFormatting;
-
-import java.util.List;
-
-import static baritone.api.utils.Helper.HELPER;
-
-public class CommandUnhandledException extends RuntimeException implements ICommandException {
-
-    public CommandUnhandledException(String message) {
-        super(message);
-    }
-
-    public CommandUnhandledException(Throwable cause) {
-        super(cause);
-    }
-
-    @Override
-    public void handle(ICommand command, List<ICommandArgument> args) {
-        HELPER.logDirect("An unhandled exception occurred. " +
-                        "The error is in your game's log, please report this at https://github.com/cabaletta/baritone/issues",
-                TextFormatting.RED);
-
-        this.printStackTrace();
-    }
-}

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

@@ -1,55 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.exception;
-
-import baritone.api.command.ICommand;
-import baritone.api.command.argument.ICommandArgument;
-import net.minecraft.util.text.TextFormatting;
-
-import java.util.List;
-
-import static baritone.api.utils.Helper.HELPER;
-
-/**
- * The base for a Baritone Command Exception, checked or unchecked. Provides a
- * {@link #handle(ICommand, List)} method that is used to provide useful output
- * to the user for diagnosing issues that may have occurred during execution.
- * <p>
- * Anything implementing this interface should be assignable to {@link Exception}.
- *
- * @author Brady
- * @since 9/20/2019
- */
-public interface ICommandException {
-
-    /**
-     * @return The exception details
-     * @see Exception#getMessage()
-     */
-    String getMessage();
-
-    /**
-     * Called when this exception is thrown, to handle the exception.
-     *
-     * @param command The command that threw it.
-     * @param args    The arguments the command was called with.
-     */
-    default void handle(ICommand command, List<ICommandArgument> args) {
-        HELPER.logDirect(this.getMessage(), TextFormatting.RED);
-    }
-}

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

@@ -1,185 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.helpers;
-
-import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.exception.CommandException;
-import baritone.api.command.exception.CommandInvalidTypeException;
-import baritone.api.utils.Helper;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.StringTextComponent;
-import net.minecraft.util.text.TextComponent;
-import net.minecraft.util.text.TextFormatting;
-import net.minecraft.util.text.event.ClickEvent;
-import net.minecraft.util.text.event.HoverEvent;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.function.Function;
-
-public class Paginator<E> implements Helper {
-
-    public final List<E> entries;
-    public int pageSize = 8;
-    public int page = 1;
-
-    public Paginator(List<E> entries) {
-        this.entries = entries;
-    }
-
-    public Paginator(E... entries) {
-        this.entries = Arrays.asList(entries);
-    }
-
-    public Paginator<E> setPageSize(int pageSize) {
-        this.pageSize = pageSize;
-        return this;
-    }
-
-    public int getMaxPage() {
-        return (entries.size() - 1) / pageSize + 1;
-    }
-
-    public boolean validPage(int page) {
-        return page > 0 && page <= getMaxPage();
-    }
-
-    public Paginator<E> skipPages(int pages) {
-        page += pages;
-        return this;
-    }
-
-    public void display(Function<E, ITextComponent> transform, String commandPrefix) {
-        int offset = (page - 1) * pageSize;
-        for (int i = offset; i < offset + pageSize; i++) {
-            if (i < entries.size()) {
-                logDirect(transform.apply(entries.get(i)));
-            } else {
-                logDirect("--", TextFormatting.DARK_GRAY);
-            }
-        }
-        boolean hasPrevPage = commandPrefix != null && validPage(page - 1);
-        boolean hasNextPage = commandPrefix != null && validPage(page + 1);
-        TextComponent prevPageComponent = new StringTextComponent("<<");
-        if (hasPrevPage) {
-            prevPageComponent.setStyle(prevPageComponent.getStyle()
-                    .setClickEvent(new ClickEvent(
-                            ClickEvent.Action.RUN_COMMAND,
-                            String.format("%s %d", commandPrefix, page - 1)
-                    ))
-                    .setHoverEvent(new HoverEvent(
-                            HoverEvent.Action.SHOW_TEXT,
-                            new StringTextComponent("Click to view previous page")
-                    )));
-        } else {
-            prevPageComponent.setStyle(prevPageComponent.getStyle().setFormatting(TextFormatting.DARK_GRAY));
-        }
-        TextComponent nextPageComponent = new StringTextComponent(">>");
-        if (hasNextPage) {
-            nextPageComponent.setStyle(nextPageComponent.getStyle()
-                    .setClickEvent(new ClickEvent(
-                            ClickEvent.Action.RUN_COMMAND,
-                            String.format("%s %d", commandPrefix, page + 1)
-                    ))
-                    .setHoverEvent(new HoverEvent(
-                            HoverEvent.Action.SHOW_TEXT,
-                            new StringTextComponent("Click to view next page")
-                    )));
-        } else {
-            nextPageComponent.setStyle(nextPageComponent.getStyle().setFormatting(TextFormatting.DARK_GRAY));
-        }
-        TextComponent pagerComponent = new StringTextComponent("");
-        pagerComponent.setStyle(pagerComponent.getStyle().setFormatting(TextFormatting.GRAY));
-        pagerComponent.append(prevPageComponent);
-        pagerComponent.appendString(" | ");
-        pagerComponent.append(nextPageComponent);
-        pagerComponent.appendString(String.format(" %d/%d", page, getMaxPage()));
-        logDirect(pagerComponent);
-    }
-
-    public void display(Function<E, ITextComponent> transform) {
-        display(transform, null);
-    }
-
-    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Runnable pre, Function<T, ITextComponent> transform, String commandPrefix) throws CommandException {
-        int page = 1;
-        consumer.requireMax(1);
-        if (consumer.hasAny()) {
-            page = consumer.getAs(Integer.class);
-            if (!pagi.validPage(page)) {
-                throw new CommandInvalidTypeException(
-                        consumer.consumed(),
-                        String.format(
-                                "a valid page (1-%d)",
-                                pagi.getMaxPage()
-                        ),
-                        consumer.consumed().getValue()
-                );
-            }
-        }
-        pagi.skipPages(page - pagi.page);
-        if (pre != null) {
-            pre.run();
-        }
-        pagi.display(transform, commandPrefix);
-    }
-
-    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Runnable pre, Function<T, ITextComponent> transform, String commandPrefix) throws CommandException {
-        paginate(consumer, new Paginator<>(elems), pre, transform, commandPrefix);
-    }
-
-    public static <T> void paginate(IArgConsumer consumer, T[] elems, Runnable pre, Function<T, ITextComponent> transform, String commandPrefix) throws CommandException {
-        paginate(consumer, Arrays.asList(elems), pre, transform, commandPrefix);
-    }
-
-    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Function<T, ITextComponent> transform, String commandPrefix) throws CommandException {
-        paginate(consumer, pagi, null, transform, commandPrefix);
-    }
-
-    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Function<T, ITextComponent> transform, String commandPrefix) throws CommandException {
-        paginate(consumer, new Paginator<>(elems), null, transform, commandPrefix);
-    }
-
-    public static <T> void paginate(IArgConsumer consumer, T[] elems, Function<T, ITextComponent> transform, String commandPrefix) throws CommandException {
-        paginate(consumer, Arrays.asList(elems), null, transform, commandPrefix);
-    }
-
-    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Runnable pre, Function<T, ITextComponent> transform) throws CommandException {
-        paginate(consumer, pagi, pre, transform, null);
-    }
-
-    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Runnable pre, Function<T, ITextComponent> transform) throws CommandException {
-        paginate(consumer, new Paginator<>(elems), pre, transform, null);
-    }
-
-    public static <T> void paginate(IArgConsumer consumer, T[] elems, Runnable pre, Function<T, ITextComponent> transform) throws CommandException {
-        paginate(consumer, Arrays.asList(elems), pre, transform, null);
-    }
-
-    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Function<T, ITextComponent> transform) throws CommandException {
-        paginate(consumer, pagi, null, transform, null);
-    }
-
-    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Function<T, ITextComponent> transform) throws CommandException {
-        paginate(consumer, new Paginator<>(elems), null, transform, null);
-    }
-
-    public static <T> void paginate(IArgConsumer consumer, T[] elems, Function<T, ITextComponent> transform) throws CommandException {
-        paginate(consumer, Arrays.asList(elems), null, transform, null);
-    }
-}

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

@@ -1,287 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.helpers;
-
-import baritone.api.BaritoneAPI;
-import baritone.api.Settings;
-import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.manager.ICommandManager;
-import baritone.api.event.events.TabCompleteEvent;
-import baritone.api.utils.SettingsUtil;
-import net.minecraft.util.ResourceLocation;
-
-import java.util.Comparator;
-import java.util.List;
-import java.util.Locale;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
-
-/**
- * The {@link TabCompleteHelper} is a <b>single-use</b> object that helps you handle tab completion. It includes helper
- * methods for appending and prepending streams, sorting, filtering by prefix, and so on.
- * <p>
- * The recommended way to use this class is:
- * <ul>
- * <li>Create a new instance with the empty constructor</li>
- * <li>Use {@code append}, {@code prepend} or {@code add<something>} methods to add completions</li>
- * <li>Sort using {@link #sort(Comparator)} or {@link #sortAlphabetically()} and then filter by prefix using
- * {@link #filterPrefix(String)}</li>
- * <li>Get the stream using {@link #stream()}</li>
- * <li>Pass it up to whatever's calling your tab complete function (i.e.
- * {@link ICommandManager#tabComplete(String)} or {@link IArgConsumer}#tabCompleteDatatype(IDatatype)})</li>
- * </ul>
- * <p>
- * For advanced users: if you're intercepting {@link TabCompleteEvent}s directly, use {@link #build()} instead for an
- * array.
- */
-public class TabCompleteHelper {
-
-    private Stream<String> stream;
-
-    public TabCompleteHelper(String[] base) {
-        stream = Stream.of(base);
-    }
-
-    public TabCompleteHelper(List<String> base) {
-        stream = base.stream();
-    }
-
-    public TabCompleteHelper() {
-        stream = Stream.empty();
-    }
-
-    /**
-     * Appends the specified stream to this {@link TabCompleteHelper} and returns it for chaining
-     *
-     * @param source The stream to append
-     * @return This {@link TabCompleteHelper} after having appended the stream
-     * @see #append(String...)
-     * @see #append(Class)
-     */
-    public TabCompleteHelper append(Stream<String> source) {
-        stream = Stream.concat(stream, source);
-        return this;
-    }
-
-    /**
-     * Appends the specified strings to this {@link TabCompleteHelper} and returns it for chaining
-     *
-     * @param source The stream to append
-     * @return This {@link TabCompleteHelper} after having appended the strings
-     * @see #append(Stream)
-     * @see #append(Class)
-     */
-    public TabCompleteHelper append(String... source) {
-        return append(Stream.of(source));
-    }
-
-    /**
-     * Appends all values of the specified enum to this {@link TabCompleteHelper} and returns it for chaining
-     *
-     * @param num The enum to append the values of
-     * @return This {@link TabCompleteHelper} after having appended the values
-     * @see #append(Stream)
-     * @see #append(String...)
-     */
-    public TabCompleteHelper append(Class<? extends Enum<?>> num) {
-        return append(
-                Stream.of(num.getEnumConstants())
-                        .map(Enum::name)
-                        .map(String::toLowerCase)
-        );
-    }
-
-    /**
-     * Prepends the specified stream to this {@link TabCompleteHelper} and returns it for chaining
-     *
-     * @param source The stream to prepend
-     * @return This {@link TabCompleteHelper} after having prepended the stream
-     * @see #prepend(String...)
-     * @see #prepend(Class)
-     */
-    public TabCompleteHelper prepend(Stream<String> source) {
-        stream = Stream.concat(source, stream);
-        return this;
-    }
-
-    /**
-     * Prepends the specified strings to this {@link TabCompleteHelper} and returns it for chaining
-     *
-     * @param source The stream to prepend
-     * @return This {@link TabCompleteHelper} after having prepended the strings
-     * @see #prepend(Stream)
-     * @see #prepend(Class)
-     */
-    public TabCompleteHelper prepend(String... source) {
-        return prepend(Stream.of(source));
-    }
-
-    /**
-     * Prepends all values of the specified enum to this {@link TabCompleteHelper} and returns it for chaining
-     *
-     * @param num The enum to prepend the values of
-     * @return This {@link TabCompleteHelper} after having prepended the values
-     * @see #prepend(Stream)
-     * @see #prepend(String...)
-     */
-    public TabCompleteHelper prepend(Class<? extends Enum<?>> num) {
-        return prepend(
-                Stream.of(num.getEnumConstants())
-                        .map(Enum::name)
-                        .map(String::toLowerCase)
-        );
-    }
-
-    /**
-     * Apply the specified {@code transform} to every element <b>currently</b> in this {@link TabCompleteHelper} and
-     * return this object for chaining
-     *
-     * @param transform The transform to apply
-     * @return This {@link TabCompleteHelper}
-     */
-    public TabCompleteHelper map(Function<String, String> transform) {
-        stream = stream.map(transform);
-        return this;
-    }
-
-    /**
-     * Apply the specified {@code filter} to every element <b>currently</b> in this {@link TabCompleteHelper} and return
-     * this object for chaining
-     *
-     * @param filter The filter to apply
-     * @return This {@link TabCompleteHelper}
-     */
-    public TabCompleteHelper filter(Predicate<String> filter) {
-        stream = stream.filter(filter);
-        return this;
-    }
-
-    /**
-     * Apply the specified {@code sort} to every element <b>currently</b> in this {@link TabCompleteHelper} and return
-     * this object for chaining
-     *
-     * @param comparator The comparator to use
-     * @return This {@link TabCompleteHelper}
-     */
-    public TabCompleteHelper sort(Comparator<String> comparator) {
-        stream = stream.sorted(comparator);
-        return this;
-    }
-
-    /**
-     * Sort every element <b>currently</b> in this {@link TabCompleteHelper} alphabetically and return this object for
-     * chaining
-     *
-     * @return This {@link TabCompleteHelper}
-     */
-    public TabCompleteHelper sortAlphabetically() {
-        return sort(String.CASE_INSENSITIVE_ORDER);
-    }
-
-    /**
-     * Filter out any element that doesn't start with {@code prefix} and return this object for chaining
-     *
-     * @param prefix The prefix to filter for
-     * @return This {@link TabCompleteHelper}
-     */
-    public TabCompleteHelper filterPrefix(String prefix) {
-        return filter(x -> x.toLowerCase(Locale.US).startsWith(prefix.toLowerCase(Locale.US)));
-    }
-
-    /**
-     * Filter out any element that doesn't start with {@code prefix} and return this object for chaining
-     * <p>
-     * Assumes every element in this {@link TabCompleteHelper} is a {@link ResourceLocation}
-     *
-     * @param prefix The prefix to filter for
-     * @return This {@link TabCompleteHelper}
-     */
-    public TabCompleteHelper filterPrefixNamespaced(String prefix) {
-        return filterPrefix(new ResourceLocation(prefix).toString());
-    }
-
-    /**
-     * @return An array containing every element in this {@link TabCompleteHelper}
-     * @see #stream()
-     */
-    public String[] build() {
-        return stream.toArray(String[]::new);
-    }
-
-    /**
-     * @return A stream containing every element in this {@link TabCompleteHelper}
-     * @see #build()
-     */
-    public Stream<String> stream() {
-        return stream;
-    }
-
-    /**
-     * Appends every command in the specified {@link ICommandManager} to this {@link TabCompleteHelper}
-     *
-     * @param manager A command manager
-     * @return This {@link TabCompleteHelper}
-     */
-    public TabCompleteHelper addCommands(ICommandManager manager) {
-        return append(manager.getRegistry().descendingStream()
-                .flatMap(command -> command.getNames().stream())
-                .distinct()
-        );
-    }
-
-    /**
-     * Appends every setting in the {@link Settings} to this {@link TabCompleteHelper}
-     *
-     * @return This {@link TabCompleteHelper}
-     */
-    public TabCompleteHelper addSettings() {
-        return append(
-                BaritoneAPI.getSettings().allSettings.stream()
-                        .filter(s -> !SettingsUtil.javaOnlySetting(s))
-                        .map(Settings.Setting::getName)
-                        .sorted(String.CASE_INSENSITIVE_ORDER)
-        );
-    }
-
-    /**
-     * Appends every modified setting in the {@link Settings} to this {@link TabCompleteHelper}
-     *
-     * @return This {@link TabCompleteHelper}
-     */
-    public TabCompleteHelper addModifiedSettings() {
-        return append(
-                SettingsUtil.modifiedSettings(BaritoneAPI.getSettings()).stream()
-                        .map(Settings.Setting::getName)
-                        .sorted(String.CASE_INSENSITIVE_ORDER)
-        );
-    }
-
-    /**
-     * Appends every {@link Boolean} setting in the {@link Settings} to this {@link TabCompleteHelper}
-     *
-     * @return This {@link TabCompleteHelper}
-     */
-    public TabCompleteHelper addToggleableSettings() {
-        return append(
-                BaritoneAPI.getSettings().getAllValuesByType(Boolean.class).stream()
-                        .map(Settings.Setting::getName)
-                        .sorted(String.CASE_INSENSITIVE_ORDER)
-        );
-    }
-}

src/api/java/baritone/api/command/manager/ICommandManager.java

@@ -1,52 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.manager;
-
-import baritone.api.IBaritone;
-import baritone.api.command.ICommand;
-import baritone.api.command.argument.ICommandArgument;
-import baritone.api.command.registry.Registry;
-import net.minecraft.util.Tuple;
-
-import java.util.List;
-import java.util.stream.Stream;
-
-/**
- * @author Brady
- * @since 9/21/2019
- */
-public interface ICommandManager {
-
-    IBaritone getBaritone();
-
-    Registry<ICommand> getRegistry();
-
-    /**
-     * @param name The command name to search for.
-     * @return The command, if found.
-     */
-    ICommand getCommand(String name);
-
-    boolean execute(String string);
-
-    boolean execute(Tuple<String, List<ICommandArgument>> expanded);
-
-    Stream<String> tabComplete(Tuple<String, List<ICommandArgument>> expanded);
-
-    Stream<String> tabComplete(String prefix);
-}

src/api/java/baritone/api/command/registry/Registry.java

@@ -1,135 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.registry;
-
-import java.util.*;
-import java.util.function.Consumer;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-/**
- * This registry class allows for registration and unregistration of a certain type. This is mainly designed for use by
- * event handlers where newly registered ones are encountered first during iteration and can therefore override older
- * ones. In Baritone, this is used for commands and argument parsers so that mods and addons can extend Baritone's
- * functionality without resorting to hacks, wrappers, or mixins.
- *
- * @param <V> The entry type that will be stored in this registry. This can be anything, really - preferably anything
- *            that works as a HashMap key, as that's what's used to keep track of which entries are registered or not.
- */
-public class Registry<V> {
-
-    /**
-     * An internal linked list of all the entries that are currently registered. This is a linked list so that entries
-     * can be inserted at the beginning, which means that newer entries are encountered first during iteration. This is
-     * an important property of the registry that makes it more useful than a simple list, and also the reason it does
-     * not just use a map.
-     */
-    private final Deque<V> _entries = new LinkedList<>();
-    /**
-     * A HashSet containing every entry currently registered. Entries are added to this set when something is registered
-     * and removed from the set when they are unregistered. An entry being present in this set indicates that it is
-     * currently registered, can be removed, and should not be reregistered until it is removed.
-     */
-    private final Set<V> registered = new HashSet<>();
-    /**
-     * The collection of entries that are currently in this registry. This is a collection (and not a list) because,
-     * internally, entries are stored in a linked list, which is not the same as a normal list.
-     */
-    public final Collection<V> entries = Collections.unmodifiableCollection(_entries);
-
-    /**
-     * @param entry The entry to check.
-     * @return If this entry is currently registered in this registry.
-     */
-    public boolean registered(V entry) {
-        return registered.contains(entry);
-    }
-
-    /**
-     * Ensures that the entry {@code entry} is registered.
-     *
-     * @param entry The entry to register.
-     * @return A boolean indicating whether or not this is a new registration. No matter the value of this boolean, the
-     * entry is always guaranteed to now be in this registry. This boolean simply indicates if the entry was <i>not</i>
-     * in the map prior to this method call.
-     */
-    public boolean register(V entry) {
-        if (!registered(entry)) {
-            _entries.addFirst(entry);
-            registered.add(entry);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Unregisters this entry from this registry. After this method call, the entry is guaranteed to be removed from the
-     * registry, since each entry only ever appears once.
-     *
-     * @param entry The entry to unregister.
-     */
-    public void unregister(V entry) {
-        if (!registered(entry)) {
-            return;
-        }
-        _entries.remove(entry);
-        registered.remove(entry);
-    }
-
-    /**
-     * Returns an iterator that iterates over each entry in this registry, with the newest elements iterated over first.
-     * Internally, as new elements are prepended to the registry rather than appended to the end, this order is the best
-     * way to search through the registry if you want to discover newer items first.
-     */
-    public Iterator<V> iterator() {
-        return _entries.iterator();
-    }
-
-    /**
-     * Returns an iterator that iterates over each entry in this registry, in the order they were added. Internally,
-     * this iterates through the registry backwards, as new elements are prepended to the registry rather than appended
-     * to the end. You should only do this when you need to, for example, list elements in order - it is almost always
-     * fine to simply use {@link Iterable#forEach(Consumer) forEach} on the {@link #entries} collection instead.
-     */
-    public Iterator<V> descendingIterator() {
-        return _entries.descendingIterator();
-    }
-
-    /**
-     * Returns a stream that contains each entry in this registry, with the newest elements ordered first. Internally,
-     * as new elements are prepended to the registry rather than appended to the end, this order is the best way to
-     * search through the registry if you want to discover newer items first.
-     */
-    public Stream<V> stream() {
-        return _entries.stream();
-    }
-
-    /**
-     * Returns a stream that returns each entry in this registry, in the order they were added. Internally, this orders
-     * the registry backwards, as new elements are prepended to the registry rather than appended to the end. You should
-     * only use this when you need to, for example, list elements in order - it is almost always fine to simply use the
-     * regular {@link #stream()} method instead.
-     */
-    public Stream<V> descendingStream() {
-        return StreamSupport.stream(Spliterators.spliterator(
-                descendingIterator(),
-                _entries.size(),
-                Spliterator.SIZED | Spliterator.SUBSIZED
-        ), false);
-    }
-}

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

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

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

@@ -17,9 +17,6 @@
 
 package baritone.api.event.events;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
-import net.minecraft.util.math.vector.Matrix4f;
-
 /**
  * @author Brady
  * @since 8/5/2018
@@ -31,13 +28,8 @@ public final class RenderEvent {
      */
     private final float partialTicks;
 
-    private final Matrix4f projectionMatrix;
-    private final MatrixStack modelViewStack;
-
-    public RenderEvent(float partialTicks, MatrixStack modelViewStack, Matrix4f projectionMatrix) {
+    public RenderEvent(float partialTicks) {
         this.partialTicks = partialTicks;
-        this.modelViewStack = modelViewStack;
-        this.projectionMatrix = projectionMatrix;
     }
 
     /**
@@ -46,12 +38,4 @@ public final class RenderEvent {
     public final float getPartialTicks() {
         return this.partialTicks;
     }
-
-    public MatrixStack getModelViewStack() {
-        return this.modelViewStack;
-    }
-
-    public Matrix4f getProjectionMatrix() {
-        return this.projectionMatrix;
-    }
 }

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

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

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

@@ -1,34 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.event.events;
-
-import baritone.api.event.events.type.Cancellable;
-
-/**
- * @author LoganDark
- */
-public final class TabCompleteEvent extends Cancellable {
-
-    public final String prefix;
-    public String[] completions;
-
-    public TabCompleteEvent(String prefix) {
-        this.prefix = prefix;
-        this.completions = null;
-    }
-}

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

@@ -19,20 +19,22 @@ package baritone.api.event.events;
 
 import baritone.api.event.events.type.EventState;
 
-import java.util.function.BiFunction;
-
 public final class TickEvent {
 
-    private static int overallTickCount;
-
     private final EventState state;
     private final Type type;
     private final int count;
 
-    public TickEvent(EventState state, Type type, int count) {
+    private static int overallTickCount;
+
+    public TickEvent(EventState state, Type type) {
         this.state = state;
         this.type = type;
-        this.count = count;
+        this.count = incrementCount();
+    }
+
+    private static synchronized int incrementCount() {
+        return overallTickCount++;
     }
 
     public int getCount() {
@@ -47,10 +49,6 @@ public final class TickEvent {
         return state;
     }
 
-    public static synchronized BiFunction<EventState, Type, TickEvent> createNextProvider() {
-        final int count = overallTickCount++;
-        return (state, type) -> new TickEvent(state, type, count);
-    }
 
     public enum Type {
         /**

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

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

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

@@ -1,53 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.event.events.type;
-
-/**
- * @author LoganDark
- */
-public class Overrideable<T> {
-
-    private T value;
-    private boolean modified;
-
-    public Overrideable(T current) {
-        value = current;
-    }
-
-    public T get() {
-        return value;
-    }
-
-    public void set(T newValue) {
-        value = newValue;
-        modified = true;
-    }
-
-    public boolean wasModified() {
-        return modified;
-    }
-
-    @Override
-    public String toString() {
-        return String.format(
-                "Overrideable{modified=%b,value=%s}",
-                modified,
-                value.toString()
-        );
-    }
-}

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

@@ -39,9 +39,6 @@ public interface AbstractGameEventListener extends IGameEventListener {
     @Override
     default void onSendChatMessage(ChatEvent event) {}
 
-    @Override
-    default void onPreTabComplete(TabCompleteEvent event) {}
-
     @Override
     default void onChunkEvent(ChunkEvent event) {}
 

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

@@ -18,13 +18,14 @@
 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.player.ClientPlayerEntity;
-import net.minecraft.client.gui.screen.DeathScreen;
-import net.minecraft.client.world.ClientWorld;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.GuiGameOver;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.settings.GameSettings;
 import net.minecraft.entity.Entity;
-import net.minecraft.network.IPacket;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.network.Packet;
 
 /**
  * @author Brady
@@ -44,7 +45,7 @@ public interface IGameEventListener {
      * Run once per game tick from before and after the player rotation is sent to the server.
      *
      * @param event The event
-     * @see ClientPlayerEntity#tick()
+     * @see EntityPlayerSP#onUpdate()
      */
     void onPlayerUpdate(PlayerUpdateEvent event);
 
@@ -52,26 +53,22 @@ public interface IGameEventListener {
      * Runs whenever the client player sends a message to the server.
      *
      * @param event The event
-     * @see ClientPlayerEntity#sendChatMessage(String)
+     * @see EntityPlayerSP#sendChatMessage(String)
      */
     void onSendChatMessage(ChatEvent event);
 
-    /**
-     * Runs whenever the client player tries to tab complete in chat.
-     *
-     * @param event The event
-     */
-    void onPreTabComplete(TabCompleteEvent event);
-
     /**
      * Runs before and after whenever a chunk is either loaded, unloaded, or populated.
      *
      * @param event The event
+     * @see WorldClient#doPreChunk(int, int, boolean)
      */
     void onChunkEvent(ChunkEvent event);
 
     /**
-     * Runs 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
      */
@@ -81,7 +78,7 @@ public interface IGameEventListener {
      * Runs before and after whenever a new world is loaded
      *
      * @param event The event
-     * @see Minecraft#loadWorld(ClientWorld)
+     * @see Minecraft#loadWorld(WorldClient, String)
      */
     void onWorldEvent(WorldEvent event);
 
@@ -89,7 +86,8 @@ public interface IGameEventListener {
      * Runs before a outbound packet is sent
      *
      * @param event The event
-     * @see IPacket
+     * @see Packet
+     * @see GenericFutureListener
      */
     void onSendPacket(PacketEvent event);
 
@@ -97,7 +95,8 @@ public interface IGameEventListener {
      * Runs before an inbound packet is processed
      *
      * @param event The event
-     * @see IPacket
+     * @see Packet
+     * @see GenericFutureListener
      */
     void onReceivePacket(PacketEvent event);
 
@@ -106,15 +105,15 @@ public interface IGameEventListener {
      * and before and after the player jumps.
      *
      * @param event The event
-     * @see Entity#moveRelative(float, Vector3d)
+     * @see Entity#moveRelative(float, float, float, float)
      */
     void onPlayerRotationMove(RotationMoveEvent event);
 
     /**
-     * Called whenever the sprint keybind state is checked in {@link ClientPlayerEntity#livingTick}
+     * Called whenever the sprint keybind state is checked in {@link EntityPlayerSP#onLivingUpdate}
      *
      * @param event The event
-     * @see ClientPlayerEntity#livingTick()
+     * @see EntityPlayerSP#onLivingUpdate()
      */
     void onPlayerSprintState(SprintStateEvent event);
 
@@ -126,9 +125,9 @@ public interface IGameEventListener {
     void onBlockInteract(BlockInteractEvent event);
 
     /**
-     * Called when the local player dies, as indicated by the creation of the {@link DeathScreen} screen.
+     * Called when the local player dies, as indicated by the creation of the {@link GuiGameOver} screen.
      *
-     * @see DeathScreen
+     * @see GuiGameOver
      */
     void onPlayerDeath();
 

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

@@ -54,18 +54,4 @@ public interface Goal {
     default double heuristic(BlockPos pos) {
         return heuristic(pos.getX(), pos.getY(), pos.getZ());
     }
-
-    /**
-     * Returns the heuristic at the goal.
-     * i.e. {@code heuristic() == heuristic(x,y,z)}
-     * when {@code isInGoal(x,y,z) == true}
-     * This is needed by {@code PathingBehavior#estimatedTicksToGoal} because
-     * some Goals actually do not have a heuristic of 0 when that condition is met
-     *
-     * @return The estimate number of ticks to satisfy the goal when the goal
-     * is already satisfied
-     */
-    default double heuristic() {
-        return 0;
-    }
 }

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

@@ -17,7 +17,6 @@
 
 package baritone.api.pathing.goals;
 
-import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.interfaces.IGoalRenderPos;
 import net.minecraft.util.math.BlockPos;
 
@@ -31,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());
@@ -68,12 +67,7 @@ public class GoalBlock implements Goal, IGoalRenderPos {
 
     @Override
     public String toString() {
-        return String.format(
-                "GoalBlock{x=%s,y=%s,z=%s}",
-                SettingsUtil.maybeCensor(x),
-                SettingsUtil.maybeCensor(y),
-                SettingsUtil.maybeCensor(z)
-        );
+        return "GoalBlock{x=" + x + ",y=" + y + ",z=" + z + "}";
     }
 
     /**
@@ -87,9 +81,9 @@ public class GoalBlock implements Goal, IGoalRenderPos {
     public static double calculate(double xDiff, int yDiff, double zDiff) {
         double heuristic = 0;
 
-        // if yDiff is 1 that means that currentY-goalY==1 which means that we're 1 block above where we should be
-        // therefore going from 0,yDiff,0 to a GoalYLevel of 0 is accurate
-        heuristic += GoalYLevel.calculate(0, yDiff);
+        // if yDiff is 1 that means that pos.getY()-this.y==1 which means that we're 1 block below where we should be
+        // therefore going from 0,0,0 to a GoalYLevel of pos.getY()-this.y is accurate
+        heuristic += GoalYLevel.calculate(yDiff, 0);
 
         //use the pythagorean and manhattan mixture from GoalXZ
         heuristic += GoalXZ.calculate(xDiff, zDiff);

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

@@ -57,16 +57,6 @@ public class GoalComposite implements Goal {
         return min;
     }
 
-    @Override
-    public double heuristic() {
-        double min = Double.MAX_VALUE;
-        for (Goal g : goals) {
-            // just take the highest value that is guaranteed to be inside the goal
-            min = Math.min(min, g.heuristic());
-        }
-        return min;
-    }
-
     @Override
     public String toString() {
         return "GoalComposite" + Arrays.toString(goals);

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

@@ -17,7 +17,6 @@
 
 package baritone.api.pathing.goals;
 
-import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.interfaces.IGoalRenderPos;
 import net.minecraft.util.math.BlockPos;
 
@@ -29,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();
@@ -62,11 +61,6 @@ public class GoalGetToBlock implements Goal, IGoalRenderPos {
 
     @Override
     public String toString() {
-        return String.format(
-                "GoalGetToBlock{x=%s,y=%s,z=%s}",
-                SettingsUtil.maybeCensor(x),
-                SettingsUtil.maybeCensor(y),
-                SettingsUtil.maybeCensor(z)
-        );
+        return "GoalGetToBlock{x=" + x + ",y=" + y + ",z=" + z + "}";
     }
 }

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

@@ -1,57 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.pathing.goals;
-
-/**
- * Invert any goal.
- * <p>
- * In the old chat control system, #invert just tried to pick a {@link GoalRunAway} that <i>effectively</i> inverted the
- * current goal. This goal just reverses the heuristic to act as a TRUE invert. Inverting a Y level? Baritone tries to
- * get away from that Y level. Inverting a GoalBlock? Baritone will try to make distance whether it's in the X, Y or Z
- * directions. And of course, you can always invert a GoalXZ.
- *
- * @author LoganDark
- */
-public class GoalInverted implements Goal {
-
-    public final Goal origin;
-
-    public GoalInverted(Goal origin) {
-        this.origin = origin;
-    }
-
-    @Override
-    public boolean isInGoal(int x, int y, int z) {
-        return false;
-    }
-
-    @Override
-    public double heuristic(int x, int y, int z) {
-        return -origin.heuristic(x, y, z);
-    }
-
-    @Override
-    public double heuristic() {
-        return Double.NEGATIVE_INFINITY;
-    }
-
-    @Override
-    public String toString() {
-        return String.format("GoalInverted{%s}", origin.toString());
-    }
-}

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

@@ -17,14 +17,10 @@
 
 package baritone.api.pathing.goals;
 
-import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.interfaces.IGoalRenderPos;
-import it.unimi.dsi.fastutil.doubles.DoubleIterator;
-import it.unimi.dsi.fastutil.doubles.DoubleOpenHashSet;
 import net.minecraft.util.math.BlockPos;
 
 public class GoalNear implements Goal, IGoalRenderPos {
-
     private final int x;
     private final int y;
     private final int z;
@@ -53,34 +49,6 @@ public class GoalNear implements Goal, IGoalRenderPos {
         return GoalBlock.calculate(xDiff, yDiff, zDiff);
     }
 
-    @Override
-    public double heuristic() {// TODO less hacky solution
-        int range = (int) Math.ceil(Math.sqrt(rangeSq));
-        DoubleOpenHashSet maybeAlwaysInside = new DoubleOpenHashSet(); // see pull request #1978
-        double minOutside = Double.POSITIVE_INFINITY;
-        for (int dx = -range; dx <= range; dx++) {
-            for (int dy = -range; dy <= range; dy++) {
-                for (int dz = -range; dz <= range; dz++) {
-                    double h = heuristic(x + dx, y + dy, z + dz);
-                    if (h < minOutside && isInGoal(x + dx, y + dy, z + dz)) {
-                        maybeAlwaysInside.add(h);
-                    } else {
-                        minOutside = Math.min(minOutside, h);
-                    }
-                }
-            }
-        }
-        double maxInside = Double.NEGATIVE_INFINITY;
-        DoubleIterator it = maybeAlwaysInside.iterator();
-        while (it.hasNext()) {
-            double inside = it.nextDouble();
-            if (inside < minOutside) {
-                maxInside = Math.max(maxInside, inside);
-            }
-        }
-        return maxInside;
-    }
-
     @Override
     public BlockPos getGoalPos() {
         return new BlockPos(x, y, z);
@@ -88,12 +56,11 @@ public class GoalNear implements Goal, IGoalRenderPos {
 
     @Override
     public String toString() {
-        return String.format(
-                "GoalNear{x=%s, y=%s, z=%s, rangeSq=%d}",
-                SettingsUtil.maybeCensor(x),
-                SettingsUtil.maybeCensor(y),
-                SettingsUtil.maybeCensor(z),
-                rangeSq
-        );
+        return "GoalNear{" +
+                "x=" + x +
+                ", y=" + y +
+                ", z=" + z +
+                ", rangeSq=" + rangeSq +
+                '}';
     }
 }

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

@@ -17,9 +17,6 @@
 
 package baritone.api.pathing.goals;
 
-import baritone.api.utils.SettingsUtil;
-import it.unimi.dsi.fastutil.doubles.DoubleIterator;
-import it.unimi.dsi.fastutil.doubles.DoubleOpenHashSet;
 import net.minecraft.util.math.BlockPos;
 
 import java.util.Arrays;
@@ -33,7 +30,7 @@ public class GoalRunAway implements Goal {
 
     private final BlockPos[] from;
 
-    private final int distanceSq;
+    private final double distanceSq;
 
     private final Integer maintainY;
 
@@ -46,7 +43,7 @@ public class GoalRunAway implements Goal {
             throw new IllegalArgumentException();
         }
         this.from = from;
-        this.distanceSq = (int) (distance * distance);
+        this.distanceSq = distance * distance;
         this.maintainY = maintainY;
     }
 
@@ -58,7 +55,7 @@ public class GoalRunAway implements Goal {
         for (BlockPos p : from) {
             int diffX = x - p.getX();
             int diffZ = z - p.getZ();
-            int distSq = diffX * diffX + diffZ * diffZ;
+            double distSq = diffX * diffX + diffZ * diffZ;
             if (distSq < distanceSq) {
                 return false;
             }
@@ -67,7 +64,7 @@ public class GoalRunAway implements Goal {
     }
 
     @Override
-    public double heuristic(int x, int y, int z) {// mostly copied from GoalBlock
+    public double heuristic(int x, int y, int z) {//mostly copied from GoalBlock
         double min = Double.MAX_VALUE;
         for (BlockPos p : from) {
             double h = GoalXZ.calculate(p.getX() - x, p.getZ() - z);
@@ -82,56 +79,10 @@ public class GoalRunAway implements Goal {
         return min;
     }
 
-    @Override
-    public double heuristic() {// TODO less hacky solution
-        int distance = (int) Math.ceil(Math.sqrt(distanceSq));
-        int minX = Integer.MAX_VALUE;
-        int minY = Integer.MAX_VALUE;
-        int minZ = Integer.MAX_VALUE;
-        int maxX = Integer.MIN_VALUE;
-        int maxY = Integer.MIN_VALUE;
-        int maxZ = Integer.MIN_VALUE;
-        for (BlockPos p : from) {
-            minX = Math.min(minX, p.getX() - distance);
-            minY = Math.min(minY, p.getY() - distance);
-            minZ = Math.min(minZ, p.getZ() - distance);
-            maxX = Math.max(minX, p.getX() + distance);
-            maxY = Math.max(minY, p.getY() + distance);
-            maxZ = Math.max(minZ, p.getZ() + distance);
-        }
-        DoubleOpenHashSet maybeAlwaysInside = new DoubleOpenHashSet(); // see pull request #1978
-        double minOutside = Double.POSITIVE_INFINITY;
-        for (int x = minX; x <= maxX; x++) {
-            for (int y = minY; y <= maxY; y++) {
-                for (int z = minZ; z <= maxZ; z++) {
-                    double h = heuristic(x, y, z);
-                    if (h < minOutside && isInGoal(x, y, z)) {
-                        maybeAlwaysInside.add(h);
-                    } else {
-                        minOutside = Math.min(minOutside, h);
-                    }
-                }
-            }
-        }
-        double maxInside = Double.NEGATIVE_INFINITY;
-        DoubleIterator it = maybeAlwaysInside.iterator();
-        while (it.hasNext()) {
-            double inside = it.nextDouble();
-            if (inside < minOutside) {
-                maxInside = Math.max(maxInside, inside);
-            }
-        }
-        return maxInside;
-    }
-
     @Override
     public String toString() {
         if (maintainY != null) {
-            return String.format(
-                    "GoalRunAwayFromMaintainY y=%s, %s",
-                    SettingsUtil.maybeCensor(maintainY),
-                    Arrays.asList(from)
-            );
+            return "GoalRunAwayFromMaintainY y=" + maintainY + ", " + Arrays.asList(from);
         } else {
             return "GoalRunAwayFrom" + Arrays.asList(from);
         }