Merge branch 'master' into mapping

package refactor

.circleci/config.yml

@@ -0,0 +1,43 @@
+# Java Gradle CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-java/ for more details
+#
+version: 2
+jobs:
+  build:
+    docker:
+    # specify the version you desire here
+    - image: circleci/openjdk:8-jdk
+
+    # Specify service dependencies here if necessary
+    # CircleCI maintains a library of pre-built images
+    # documented at https://circleci.com/docs/2.0/circleci-images/
+    # - image: circleci/postgres:9.4
+
+    working_directory: ~/repo
+
+    environment:
+      # Customize the JVM maximum heap limit
+      JVM_OPTS: -Xmx3200m
+      TERM: dumb
+
+    steps:
+    - checkout
+
+    # Download and cache dependencies
+    - restore_cache:
+        keys:
+        - v1-dependencies-{{ checksum "build.gradle" }}
+        # fallback to using the latest cache if no exact match is found
+        - v1-dependencies-
+
+    - run: gradle dependencies
+
+    - save_cache:
+        paths:
+        - ~/.gradle
+        key: v1-dependencies-{{ checksum "build.gradle" }}
+
+    # run tests!
+    - run: gradle test
+

.gitignore

@@ -2,8 +2,6 @@
 **/*.swp
 
 run/
-autotest/
-dist/
 
 # Gradle
 build/

.idea/copyright/Baritone.xml

@@ -1,7 +1,6 @@
 <component name="CopyrightManager">
   <copyright>
-    <option name="keyword" value="This file is part of Baritone" />
-    <option name="notice" value="This file is part of Baritone.&#10;&#10;Baritone is free software: you can redistribute it and/or modify&#10;it under the terms of the GNU Lesser General Public License as published by&#10;the Free Software Foundation, either version 3 of the License, or&#10;(at your option) any later version.&#10;&#10;Baritone is distributed in the hope that it will be useful,&#10;but WITHOUT ANY WARRANTY; without even the implied warranty of&#10;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the&#10;GNU Lesser General Public License for more details.&#10;&#10;You should have received a copy of the GNU Lesser General Public License&#10;along with Baritone.  If not, see &lt;https://www.gnu.org/licenses/&gt;." />
+    <option name="notice" value="This file is part of Baritone.&#10;&#10;Baritone is free software: you can redistribute it and/or modify&#10;it under the terms of the GNU General Public License as published by&#10;the Free Software Foundation, either version 3 of the License, or&#10;(at your option) any later version.&#10;&#10;Baritone is distributed in the hope that it will be useful,&#10;but WITHOUT ANY WARRANTY; without even the implied warranty of&#10;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the&#10;GNU General Public License for more details.&#10;&#10;You should have received a copy of the GNU General Public License&#10;along with Baritone.  If not, see &lt;https://www.gnu.org/licenses/&gt;." />
     <option name="myName" value="Baritone" />
   </copyright>
 </component>

.travis.yml

@@ -1,28 +0,0 @@
-language: java
-
-sudo: required
-
-services:
-- docker
-
-install:
-- travis_retry docker build -t cabaletta/baritone .
-
-script:
-- 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

Dockerfile

@@ -1,24 +0,0 @@
-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 --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
-
-# this .deb is specially patched to support lwjgl
-# source: https://github.com/tectonicus/tectonicus/issues/60#issuecomment-154239173
-RUN dpkg -i /code/scripts/xvfb_1.16.4-1_amd64.deb
-
-WORKDIR /code
-
-RUN ./gradlew build

FEATURES.md

@@ -1,52 +0,0 @@
-# Pathing features
-- **Long distance pathing and splicing** Baritone calculates paths in segments, and precalculates the next segment when the current one is about to end, so that it's moving towards the goal at all times.
-- **Chunk caching** Baritone simplifies chunks to a compacted internal 2-bit representation (AIR, SOLID, WATER, AVOID) and stores them in RAM for better very-long-distance pathing. There is also an option to save these cached chunks to disk. <a href="https://www.youtube.com/watch?v=dyfYKSubhdc">Example</a>
-- **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`).
-- **Opening fence gates and doors**
-- **Slabs and stairs**
-- **Falling blocks** Baritone understands the costs of breaking blocks with falling blocks on top, and includes all of their break costs. Additionally, since it avoids breaking any blocks touching a liquid, it won't break the bottom of a gravel stack below a lava lake (anymore).
-- **Avoiding dangerous blocks** Obviously, it knows not to walk through fire or on magma, not to corner over lava (that deals some damage), not to break any blocks touching a liquid (it might drown), etc.
-- **Parkour** Sprint jumping over 1, 2, or 3 block gaps
-- **Parkour place** Sprint jumping over a 3 block gap and placing the block to land on while executing the jump. It's really cool.
-
-# Pathing method
-Baritone uses A*, with some modifications: 
-
-- **Segmented calculation** Traditional A* calculates until the most promising node is in the goal, however in the environment of Minecraft with a limited render distance, we don't know the environment all the way to our goal. Baritone has three possible ways for path calculation to end: finding a path all the way to the goal, running out of time, or getting to the render distance. In the latter two scenarios, the selection of which segment to actually execute falls to the next item (incremental cost backoff). Whenever the path calculation thread finds that the best / most promising node is at the edge of loaded chunks, it increments a counter. If this happens more than 50 times (configurable), path calculation exits early. This happens with very low render distances. Otherwise, calculation continues until the timeout is hit (also configurable) or we find a path all the way to the goal.
-- **Incremental cost backoff** When path calculation exits early without getting all the way to the goal, Baritone it needs to select a segment to execute first (assuming it will calculate the next segment at the end of this one). It uses incremental cost backoff to select the best node by varying metrics, then paths to that node. This is unchanged from MineBot and I made a <a href="https://docs.google.com/document/d/1WVHHXKXFdCR1Oz__KtK8sFqyvSwJN_H4lftkHFgmzlc/edit">write-up</a> that still applies. In essence, it keeps track of the best node by various increasing coefficients, then picks the node with the least coefficient that goes at least 5 blocks from the starting position.
-- **Minimum improvement repropagation** The pathfinder ignores alternate routes that provide minimal improvements (less than 0.01 ticks of improvement), because the calculation cost of repropagating this to all connected nodes is much higher than the half-millisecond path time improvement it would get.
-- **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.
-
-# 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:
-- **GoalBlock** one specific block that the player should stand inside at foot level
-- **GoalXZ** an X and a Z coordinate, used for long distance pathing
-- **GoalYLevel** a Y coordinate
-- **GoalTwoBlocks** a block position that the player should stand in, either at foot or eye level
-- **GoalGetToBlock** a block position that the player should stand adjacent to, below, or on top of
-- **GoalNear** a block position that the player should get within a certain radius of, used for following entities
-- **GoalAxis** a block position on an axis or diagonal axis (so x=0, z=0, or x=z), and y=120 (configurable)
-
-And finally `GoalComposite`. `GoalComposite` is a list of other goals, any one of which satisfies the goal. For example, `mine diamond_ore` creates a `GoalComposite` of `GoalTwoBlocks`s for every diamond ore location it knows of.
-
-
-# Future features
-Things it doesn't have yet
-- Trapdoors
-- Sprint jumping in a 1x2 corridor
-
-See <a href="https://github.com/cabaletta/baritone/issues">issues</a> for more.
-
-Things it may not ever have, from most likely to least likely =(
-- Pigs
-- Boats
-- Horses (2x3 path instead of 1x2)
-- Elytra

IMPACT.md

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

INSTALL.md

@@ -1,98 +0,0 @@
-# Integration between Baritone and Impact
-Impact 4.4 has Baritone included.
-
-These instructions apply to Impact 4.3 (and potentially other hacked clients).
-
-
-## 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 3 methods of acquiring a build of Baritone (While it is still in development)
-
-### Official Release (Not always up to date)
-https://github.com/cabaletta/baritone/releases
-
-For Impact 4.3, there is no Baritone integration yet, so you will want `baritone-standalone-X.Y.Z.jar`.
-
-Any official release will be GPG signed by leijurv (44A3EA646EADAC6A) and ZeroMemes (73A788379A197567). Please verify that the hash of the file you download is in `checksums.txt` and that `checksums_signed.asc` is a valid signature by those two public keys of `checksums.txt`. 
-
-The build is fully deterministic and reproducible, and you can verify Travis did it properly by running `docker build --no-cache -t cabaletta/baritone . && docker run --rm cabaletta/baritone cat /code/dist/checksums.txt` yourself and comparing the shasum. This works identically on Travis, Mac, and Linux (if you have docker on Windows, I'd be grateful if you could let me know if it works there too).
-
-### Building Baritone yourself
-There are a few steps to this
-- Clone this repository
-- Setup the project as instructed in the README
-- Run the ``build`` gradle task. You can either do this using IntelliJ's gradle UI or through a
-command line
-  - Windows: ``gradlew build``
-  - Mac/Linux: ``./gradlew build``
-- The build should be exported into ``/build/libs/baritone-X.Y.Z.jar``
-
-### Cutting Edge Release
-If you want to trust @Plutie#9079, you can download an automatically generated build of the latest commit
-from his Jenkins server, found <a href="https://plutiejenkins.leijurv.com/job/baritone/lastSuccessfulBuild/">here</a>.
-
-## 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.1",
-        "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>.

LICENSE

@@ -1,165 +0,0 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.

LICENSE.txt

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    Baritone  Copyright (C) 2018  Cabaletta
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

README.md

@@ -1,73 +1,10 @@
 # Baritone
-[![Build Status](https://travis-ci.com/cabaletta/baritone.svg?branch=master)](https://travis-ci.com/cabaletta/baritone)
-[![License](https://img.shields.io/github/license/cabaletta/baritone.svg)](LICENSE)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/a73d037823b64a5faf597a18d71e3400)](https://www.codacy.com/app/leijurv/baritone?utm_source=github.com&utm_medium=referral&utm_content=cabaletta/baritone&utm_campaign=Badge_Grade)
-
-<!-- Unofficial Jenkins: [![Build Status](https://plutiejenkins.leijurv.com/job/baritone/badge/icon)](https://plutiejenkins.leijurv.com/job/baritone/lastSuccessfulBuild/) -->
-
-A Minecraft pathfinder bot. This project is an updated version of [MineBot](https://github.com/leijurv/MineBot/),
-the original version of the bot for Minecraft 1.8, rebuilt for 1.12.2. Baritone focuses on reliability and particularly performance (it's over [29x faster](https://github.com/cabaletta/baritone/pull/180#issuecomment-423822928) than MineBot at calculating paths).
-
-Baritone is the pathfinding system used in [Impact](https://impactdevelopment.github.io/) since 4.4.
-
-Here are some links to help to get started:
-
-- [Features](FEATURES.md)
-
-- [Installation](INSTALL.md)
-
-There's also some useful information down below
+A Minecraft bot. This project is an updated version of [Minebot](https://github.com/leijurv/MineBot/),
+the original version of the bot for Minecraft 1.8, rebuilt for 1.12.2.
 
 # Setup
-
-## IntelliJ's Gradle UI
 - Open the project in IntelliJ as a Gradle project
 - Run the Gradle task `setupDecompWorkspace`
 - Run the Gradle task `genIntellijRuns`
-- Refresh the Gradle project (or just restart IntelliJ)
-- Select the "Minecraft Client" launch config and run
-
-## Command Line
-On Mac OSX and Linux, use `./gradlew` instead of `gradlew`.
-
-Running Baritone:
-
-```
-$ gradlew run
-```
-
-Setting up for IntelliJ:
-```
-$ gradlew setupDecompWorkspace
-$ gradlew --refresh-dependencies
-$ gradlew genIntellijRuns
-```
-
-# Chat control
-[Defined Here](src/main/java/baritone/utils/ExampleBaritoneControl.java)
-
-Quick start example: `thisway 1000` or `goal 70` to set the goal, `path` to actually start pathing. Also try `mine diamond_ore`. `cancel` to cancel.
-
-# API example
-
-```
-BaritoneAPI.getSettings().allowSprint.value = true;
-BaritoneAPI.getSettings().pathTimeoutMS.value = 2000L;
-
-BaritoneAPI.getPathingBehavior().setGoal(new GoalXZ(10000, 20000));
-BaritoneAPI.getPathingBehavior().path();
-```
-
-# FAQ
-
-## Can I use Baritone as a library in my hacked client?
-
-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)
-
-## Why is it called Baritone?
-
-It's named for FitMC's deep sultry voice. 
+- Restart IntelliJ and import Gradle changes
+- Select the "Minecraft Client" launch config and run

build.gradle

@@ -2,21 +2,21 @@
  * 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
+ * it under the terms of the GNU 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 group 'baritone'
-version '1.0.0-hotfix-1'
+version '1.0.0'
 
 buildscript {
     repositories {
@@ -37,33 +37,22 @@ buildscript {
     }
 }
 
-
-import baritone.gradle.task.CreateDistTask
-import baritone.gradle.task.ProguardTask
-
 apply plugin: 'java'
-apply plugin: 'net.minecraftforge.gradle.tweaker-client'
-apply plugin: 'org.spongepowered.mixin'
 
 sourceCompatibility = targetCompatibility = '1.8'
 compileJava {
     sourceCompatibility = targetCompatibility = '1.8'
 }
 
-sourceSets {
-    launch {
-        compileClasspath += main.compileClasspath + main.runtimeClasspath + main.output
-    }
-}
+apply plugin: 'net.minecraftforge.gradle.tweaker-client'
+apply plugin: 'org.spongepowered.mixin'
 
 minecraft {
     version = '1.12.2'
     mappings = 'snapshot_20180731'
     tweakClass = 'baritone.launch.BaritoneTweaker'
     runDir = 'run'
-
-    // The sources jar should use SRG names not MCP to ensure compatibility with all mappings
-    makeObfSourceJar = true
+    makeObfSourceJar = false
 }
 
 repositories {
@@ -73,16 +62,10 @@ repositories {
         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') {
+    implementation ('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'
@@ -95,21 +78,5 @@ dependencies {
 
 mixin {
     defaultObfuscationEnv notch
-    add sourceSets.launch, 'mixins.baritone.refmap.json'
+    add sourceSets.main, 'mixins.baritone.refmap.json'
 }
-
-jar {
-    from sourceSets.launch.output, sourceSets.api.output
-    preserveFileTimestamps = false
-    reproducibleFileOrder = true
-}
-
-task proguard(type: ProguardTask) {
-    url 'https://downloads.sourceforge.net/project/proguard/proguard/6.0/proguard6.0.3.zip'
-    extract 'proguard6.0.3/lib/proguard.jar'
-    versionManifest 'https://launchermeta.mojang.com/mc/game/version_manifest.json'
-}
-
-task createDist(type: CreateDistTask, dependsOn: proguard)
-
-build.finalizedBy(createDist)

buildSrc/.gitignore

@@ -1,3 +0,0 @@
-build/
-.gradle/
-out/

buildSrc/build.gradle

@@ -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/>.
- */
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
-    compile group: 'commons-io', name: 'commons-io', version: '2.6'
-}

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

@@ -1,102 +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.task;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParser;
-import org.gradle.api.DefaultTask;
-
-import java.io.File;
-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
- * @since 10/12/2018
- */
-class BaritoneGradleTask extends DefaultTask {
-
-    static final JsonParser PARSER = new JsonParser();
-
-    static final String
-            PROGUARD_ZIP                    = "proguard.zip",
-            PROGUARD_JAR                    = "proguard.jar",
-            PROGUARD_CONFIG_TEMPLATE        = "scripts/proguard.pro",
-            PROGUARD_CONFIG_DEST            = "template.pro",
-            PROGUARD_API_CONFIG             = "api.pro",
-            PROGUARD_STANDALONE_CONFIG      = "standalone.pro",
-            PROGUARD_EXPORT_PATH            = "proguard_out.jar",
-
-            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";
-
-    String artifactName, artifactVersion;
-    Path artifactPath, artifactUnoptimizedPath, artifactApiPath, artifactStandalonePath, proguardOut;
-
-    void verifyArtifacts() throws Exception {
-        this.artifactName = getProject().getName();
-        this.artifactVersion = getProject().getVersion().toString();
-
-        this.artifactPath            = this.getBuildFile(formatVersion(ARTIFACT_STANDARD));
-        this.artifactUnoptimizedPath = this.getBuildFile(formatVersion(ARTIFACT_UNOPTIMIZED));
-        this.artifactApiPath         = this.getBuildFile(formatVersion(ARTIFACT_API));
-        this.artifactStandalonePath  = this.getBuildFile(formatVersion(ARTIFACT_STANDALONE));
-
-        this.proguardOut = this.getTemporaryFile(PROGUARD_EXPORT_PATH);
-
-        if (!Files.exists(this.artifactPath)) {
-            throw new Exception("Artifact not found! Run build first!");
-        }
-    }
-
-    void write(InputStream stream, Path file) throws Exception {
-        if (Files.exists(file)) {
-            Files.delete(file);
-        }
-        Files.copy(stream, file);
-    }
-
-    String formatVersion(String string) {
-        return String.format(string, this.artifactName, this.artifactVersion);
-    }
-
-    Path getRelativeFile(String file) {
-        return Paths.get(new File(file).getAbsolutePath());
-    }
-
-    Path getTemporaryFile(String file) {
-        return Paths.get(new File(getTemporaryDir(), file).getAbsolutePath());
-    }
-
-    Path getBuildFile(String file) {
-        return getRelativeFile("build/libs/" + file);
-    }
-
-    JsonElement readJson(List<String> lines) {
-        return PARSER.parse(String.join("\n", lines));
-    }
-}

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

@@ -1,80 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.gradle.task;
-
-import org.gradle.api.tasks.TaskAction;
-
-import javax.xml.bind.DatatypeConverter;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.security.MessageDigest;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
-
-/**
- * @author Brady
- * @since 10/12/2018
- */
-public class CreateDistTask extends BaritoneGradleTask {
-
-    private static MessageDigest SHA1_DIGEST;
-
-    @TaskAction
-    protected void exec() throws Exception {
-        super.verifyArtifacts();
-
-        // Define the distribution file paths
-        Path api         = getRelativeFile("dist/" + formatVersion(ARTIFACT_API));
-        Path standalone  = getRelativeFile("dist/" + formatVersion(ARTIFACT_STANDALONE));
-        Path unoptimized = getRelativeFile("dist/" + formatVersion(ARTIFACT_UNOPTIMIZED));
-
-        // NIO will not automatically create directories
-        Path dir = getRelativeFile("dist/");
-        if (!Files.exists(dir)) {
-            Files.createDirectory(dir);
-        }
-
-        // Copy build jars to dist/
-        Files.copy(this.artifactApiPath,         api,         REPLACE_EXISTING);
-        Files.copy(this.artifactStandalonePath,  standalone,  REPLACE_EXISTING);
-        Files.copy(this.artifactUnoptimizedPath, unoptimized, REPLACE_EXISTING);
-
-        // Calculate all checksums and format them like "shasum"
-        List<String> shasum = Stream.of(api, standalone, unoptimized)
-                .map(path -> sha1(path) + "  " + path.getFileName().toString())
-                .collect(Collectors.toList());
-
-        // Write the checksums to a file
-        Files.write(getRelativeFile("dist/checksums.txt"), shasum);
-    }
-
-    private static synchronized String sha1(Path path) {
-        try {
-            if (SHA1_DIGEST == null) {
-                SHA1_DIGEST = MessageDigest.getInstance("SHA-1");
-            }
-            return DatatypeConverter.printHexBinary(SHA1_DIGEST.digest(Files.readAllBytes(path))).toLowerCase();
-        } catch (Exception e) {
-            // haha no thanks
-            throw new RuntimeException(e);
-        }
-    }
-}

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

@@ -1,260 +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.task;
-
-import baritone.gradle.util.Determinizer;
-import com.google.gson.*;
-import org.apache.commons.io.IOUtils;
-import org.gradle.api.artifacts.Configuration;
-import org.gradle.api.artifacts.Dependency;
-import org.gradle.api.tasks.Input;
-import org.gradle.api.tasks.TaskAction;
-import org.gradle.internal.Pair;
-
-import java.io.*;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
-
-/**
- * @author Brady
- * @since 10/11/2018
- */
-public class ProguardTask extends BaritoneGradleTask {
-
-    private static final Pattern TEMP_LIBRARY_PATTERN = Pattern.compile("-libraryjars 'tempLibraries\\/([a-zA-Z0-9/_\\-\\.]+)\\.jar'");
-
-    @Input
-    private String url;
-
-    @Input
-    private String extract;
-
-    @Input
-    private String versionManifest;
-
-    private Map<String, String> versionDownloadMap;
-    private List<String> requiredLibraries;
-
-    @TaskAction
-    protected void exec() throws Exception {
-        super.verifyArtifacts();
-
-        // "Haha brady why don't you make separate tasks"
-        processArtifact();
-        downloadProguard();
-        extractProguard();
-        generateConfigs();
-        downloadVersionManifest();
-        acquireDependencies();
-        proguardApi();
-        proguardStandalone();
-        cleanup();
-    }
-
-    private void processArtifact() throws Exception {
-        if (Files.exists(this.artifactUnoptimizedPath)) {
-            Files.delete(this.artifactUnoptimizedPath);
-        }
-
-        Determinizer.determinize(this.artifactPath.toString(), this.artifactUnoptimizedPath.toString());
-    }
-
-    private void downloadProguard() throws Exception {
-        Path proguardZip = getTemporaryFile(PROGUARD_ZIP);
-        if (!Files.exists(proguardZip)) {
-            write(new URL(this.url).openStream(), proguardZip);
-        }
-    }
-
-    private void extractProguard() throws Exception {
-        Path proguardJar = getTemporaryFile(PROGUARD_JAR);
-        if (!Files.exists(proguardJar)) {
-            ZipFile zipFile = new ZipFile(getTemporaryFile(PROGUARD_ZIP).toFile());
-            ZipEntry zipJarEntry = zipFile.getEntry(this.extract);
-            write(zipFile.getInputStream(zipJarEntry), proguardJar);
-            zipFile.close();
-        }
-    }
-
-    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));
-
-        // Acquire the RT jar using "java -verbose". This doesn't work on Java 9+
-        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 + "'");
-
-        // API config doesn't require any changes from the changes that we made to the template
-        Files.write(getTemporaryFile(PROGUARD_API_CONFIG), template);
-
-        // For the Standalone config, don't keep the API package
-        List<String> standalone = new ArrayList<>(template);
-        standalone.removeIf(s -> s.contains("# this is the keep api"));
-        Files.write(getTemporaryFile(PROGUARD_STANDALONE_CONFIG), standalone);
-
-        // Discover all of the libraries that we will need to acquire from gradle
-        this.requiredLibraries = new ArrayList<>();
-        template.forEach(line -> {
-            if (!line.startsWith("#")) {
-                Matcher m = TEMP_LIBRARY_PATTERN.matcher(line);
-                if (m.find()) {
-                    this.requiredLibraries.add(m.group(1));
-                }
-            }
-        });
-    }
-
-    private void downloadVersionManifest() throws Exception {
-        Path manifestJson = getTemporaryFile(VERSION_MANIFEST);
-        write(new URL(this.versionManifest).openStream(), manifestJson);
-
-        // Place all the versions in the map with their download URL
-        this.versionDownloadMap = new HashMap<>();
-        JsonObject json = readJson(Files.readAllLines(manifestJson)).getAsJsonObject();
-        JsonArray versions = json.getAsJsonArray("versions");
-        versions.forEach(element -> {
-            JsonObject object = element.getAsJsonObject();
-            this.versionDownloadMap.put(object.get("id").getAsString(), object.get("url").getAsString());
-        });
-    }
-
-    private void acquireDependencies() throws Exception {
-
-        // Create a map of all of the dependencies that we are able to access in this project
-        // Likely a better way to do this, I just pair the dependency with the first valid configuration
-        Map<String, Pair<Configuration, Dependency>> dependencyLookupMap = new HashMap<>();
-        getProject().getConfigurations().stream().filter(Configuration::isCanBeResolved).forEach(config ->
-                config.getAllDependencies().forEach(dependency ->
-                        dependencyLookupMap.putIfAbsent(dependency.getName() + "-" + dependency.getVersion(), Pair.of(config, dependency))));
-
-        // Create the directory if it doesn't already exist
-        Path tempLibraries = getTemporaryFile(TEMP_LIBRARY_DIR);
-        if (!Files.exists(tempLibraries)) {
-            Files.createDirectory(tempLibraries);
-        }
-
-        // Iterate the required libraries to copy them to tempLibraries
-        for (String lib : this.requiredLibraries) {
-            // Download the version jar from the URL acquired from the version manifest
-            if (lib.startsWith("minecraft")) {
-                String version = lib.split("-")[1];
-                Path versionJar = getTemporaryFile("tempLibraries/" + lib + ".jar");
-                if (!Files.exists(versionJar)) {
-                    JsonObject versionJson = PARSER.parse(new InputStreamReader(new URL(this.versionDownloadMap.get(version)).openStream())).getAsJsonObject();
-                    String url = versionJson.getAsJsonObject("downloads").getAsJsonObject("client").getAsJsonPrimitive("url").getAsString();
-                    write(new URL(url).openStream(), versionJar);
-                }
-                continue;
-            }
-
-            // Find a configuration/dependency pair that matches the desired library
-            Pair<Configuration, Dependency> pair = null;
-            for (Map.Entry<String, Pair<Configuration, Dependency>> entry : dependencyLookupMap.entrySet()) {
-                if (entry.getKey().startsWith(lib)) {
-                    pair = entry.getValue();
-                }
-            }
-
-            // The pair must be non-null
-            Objects.requireNonNull(pair);
-
-            // Find the library jar file, and copy it to tempLibraries
-            for (File file : pair.getLeft().files(pair.getRight())) {
-                if (file.getName().startsWith(lib)) {
-                    Files.copy(file.toPath(), getTemporaryFile("tempLibraries/" + lib + ".jar"), REPLACE_EXISTING);
-                }
-            }
-        }
-    }
-
-    private void proguardApi() throws Exception {
-        runProguard(getTemporaryFile(PROGUARD_API_CONFIG));
-        Determinizer.determinize(this.proguardOut.toString(), this.artifactApiPath.toString());
-    }
-
-    private void proguardStandalone() throws Exception {
-        runProguard(getTemporaryFile(PROGUARD_STANDALONE_CONFIG));
-        Determinizer.determinize(this.proguardOut.toString(), this.artifactStandalonePath.toString());
-    }
-
-    private void cleanup() {
-        try {
-            Files.delete(this.proguardOut);
-        } catch (IOException ignored) {}
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public void setExtract(String extract) {
-        this.extract = extract;
-    }
-
-    public void setVersionManifest(String versionManifest) {
-        this.versionManifest = versionManifest;
-    }
-
-    private void runProguard(Path config) throws Exception {
-        // Delete the existing proguard output file. Proguard probably handles this already, but why not do it ourselves
-        if (Files.exists(this.proguardOut)) {
-            Files.delete(this.proguardOut);
-        }
-
-        Path proguardJar = getTemporaryFile(PROGUARD_JAR);
-        Process p = new ProcessBuilder("java", "-jar", proguardJar.toString(), "@" + config.toString())
-                .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());
-        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();
-        if (exitCode != 0) {
-            throw new Exception("Proguard exited with code " + exitCode);
-        }
-    }
-
-    private void printOutputLog(InputStream stream) {
-        new Thread(() -> {
-            try (BufferedReader reader = new BufferedReader(new InputStreamReader(stream))) {
-                String line;
-                while ((line = reader.readLine()) != null) {
-                    System.out.println(line);
-                }
-            } catch (final Exception e) {
-                e.printStackTrace();
-            }
-        }).start();
-    }
-}

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

@@ -1,143 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.gradle.util;
-
-import com.google.gson.*;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-
-import java.io.*;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-import java.util.jar.JarOutputStream;
-import java.util.stream.Collectors;
-
-/**
- * Make a .jar file deterministic by sorting all entries by name, and setting all the last modified times to 0.
- * This makes the build 100% reproducible since the timestamp when you built it no longer affects the final file.
- *
- * @author leijurv
- */
-public class Determinizer {
-
-    public static void determinize(String inputPath, String outputPath) throws IOException {
-        System.out.println("Running Determinizer");
-        System.out.println(" Input path: " + inputPath);
-        System.out.println(" Output path: " + outputPath);
-
-        try (
-                JarFile jarFile = new JarFile(new File(inputPath));
-                JarOutputStream jos = new JarOutputStream(new FileOutputStream(new File(outputPath)))
-        ) {
-
-            List<JarEntry> entries = jarFile.stream()
-                    .sorted(Comparator.comparing(JarEntry::getName))
-                    .collect(Collectors.toList());
-
-            for (JarEntry entry : entries) {
-                if (entry.getName().equals("META-INF/fml_cache_annotation.json")) {
-                    continue;
-                }
-                if (entry.getName().equals("META-INF/fml_cache_class_versions.json")) {
-                    continue;
-                }
-                JarEntry clone = new JarEntry(entry.getName());
-                clone.setTime(42069);
-                jos.putNextEntry(clone);
-                if (entry.getName().endsWith(".refmap.json")) {
-                    JsonObject object = new JsonParser().parse(new InputStreamReader(jarFile.getInputStream(entry))).getAsJsonObject();
-                    jos.write(writeSorted(object).getBytes());
-                } else {
-                    copy(jarFile.getInputStream(entry), jos);
-                }
-            }
-            jos.finish();
-        }
-    }
-
-    private static void copy(InputStream is, OutputStream os) throws IOException {
-        byte[] buffer = new byte[1024];
-        int len;
-        while ((len = is.read(buffer)) != -1) {
-            os.write(buffer, 0, len);
-        }
-    }
-
-    private static String writeSorted(JsonObject in) throws IOException {
-        StringWriter writer = new StringWriter();
-        JsonWriter jw = new JsonWriter(writer);
-        ORDERED_JSON_WRITER.write(jw, in);
-        return writer.toString() + "\n";
-    }
-
-    /**
-     * All credits go to GSON and its contributors. GSON is licensed under the Apache 2.0 License.
-     * This implementation has been modified to write {@link JsonObject} keys in order.
-     *
-     * @see <a href="https://github.com/google/gson/blob/master/LICENSE">GSON License</a>
-     * @see <a href="https://github.com/google/gson/blob/master/gson/src/main/java/com/google/gson/internal/bind/TypeAdapters.java#L698">Original Source</a>
-     */
-    private static final TypeAdapter<JsonElement> ORDERED_JSON_WRITER = new TypeAdapter<JsonElement>() {
-
-        @Override
-        public JsonElement read(JsonReader in) {
-            return null;
-        }
-
-        @Override
-        public void write(JsonWriter out, JsonElement value) throws IOException {
-            if (value == null || value.isJsonNull()) {
-                out.nullValue();
-            } else if (value.isJsonPrimitive()) {
-                JsonPrimitive primitive = value.getAsJsonPrimitive();
-                if (primitive.isNumber()) {
-                    out.value(primitive.getAsNumber());
-                } else if (primitive.isBoolean()) {
-                    out.value(primitive.getAsBoolean());
-                } else {
-                    out.value(primitive.getAsString());
-                }
-
-            } else if (value.isJsonArray()) {
-                out.beginArray();
-                for (JsonElement e : value.getAsJsonArray()) {
-                    write(out, e);
-                }
-                out.endArray();
-
-            } else if (value.isJsonObject()) {
-                out.beginObject();
-
-                List<Map.Entry<String, JsonElement>> entries = new ArrayList<>(value.getAsJsonObject().entrySet());
-                entries.sort(Comparator.comparing(Map.Entry::getKey));
-                for (Map.Entry<String, JsonElement> e : entries) {
-                    out.name(e.getKey());
-                    write(out, e.getValue());
-                }
-                out.endObject();
-
-            } else {
-                throw new IllegalArgumentException("Couldn't write " + value.getClass());
-            }
-        }
-    };
-}

scripts/proguard.pro

@@ -1,365 +0,0 @@
--keepattributes Signature
--keepattributes *Annotation*
-
--optimizationpasses 5
--verbose
-
--allowaccessmodification # anything not kept can be changed from public to private and inlined etc
--overloadaggressively
--dontusemixedcaseclassnames
-
-# instead of renaming to a, b, c, rename to baritone.a, baritone.b, baritone.c so as to not conflict with minecraft's obfd classes
--flattenpackagehierarchy
--repackageclasses 'baritone'
-
--keep class baritone.api.** { *; } # this is the keep api
--keep class baritone.BaritoneProvider
--keep class baritone.api.IBaritoneProvider
-
--keep class baritone.utils.ExampleBaritoneControl { *; }
-
-# setting names are reflected from field names, so keep field names
--keepclassmembers class baritone.api.Settings {
-    public <fields>;    
-}
-
-# need to keep mixin names
--keep class baritone.launch.** { *; }
-
-# copy all necessary libraries into tempLibraries to build
-
--libraryjars 'tempLibraries/minecraft-1.12.2.jar'
-
--libraryjars 'tempLibraries/SimpleTweaker-1.2.jar'
-
--libraryjars 'tempLibraries/authlib-1.5.25.jar'
--libraryjars 'tempLibraries/codecjorbis-20101023.jar'
--libraryjars 'tempLibraries/codecwav-20101023.jar'
--libraryjars 'tempLibraries/commons-codec-1.10.jar'
--libraryjars 'tempLibraries/commons-compress-1.8.1.jar'
--libraryjars 'tempLibraries/commons-io-2.5.jar'
--libraryjars 'tempLibraries/commons-lang3-3.5.jar'
--libraryjars 'tempLibraries/commons-logging-1.1.3.jar'
--libraryjars 'tempLibraries/fastutil-7.1.0.jar'
--libraryjars 'tempLibraries/gson-2.8.0.jar'
--libraryjars 'tempLibraries/guava-21.0.jar'
--libraryjars 'tempLibraries/httpclient-4.3.3.jar'
--libraryjars 'tempLibraries/httpcore-4.3.2.jar'
--libraryjars 'tempLibraries/icu4j-core-mojang-51.2.jar'
--libraryjars 'tempLibraries/jinput-2.0.5.jar'
--libraryjars 'tempLibraries/jna-4.4.0.jar'
--libraryjars 'tempLibraries/jopt-simple-5.0.3.jar'
--libraryjars 'tempLibraries/jsr305-3.0.1.jar'
--libraryjars 'tempLibraries/jutils-1.0.0.jar'
--libraryjars 'tempLibraries/libraryjavasound-20101123.jar'
--libraryjars 'tempLibraries/librarylwjglopenal-20100824.jar'
--libraryjars 'tempLibraries/log4j-api-2.8.1.jar'
--libraryjars 'tempLibraries/log4j-core-2.8.1.jar'
-
-# startsWith is used to check the library, and mac/linux differ in which version they use
-# this is FINE
--libraryjars 'tempLibraries/lwjgl-.jar'
--libraryjars 'tempLibraries/lwjgl_util-.jar'
-
--libraryjars 'tempLibraries/netty-all-4.1.9.Final.jar'
--libraryjars 'tempLibraries/oshi-core-1.1.jar'
--libraryjars 'tempLibraries/patchy-1.1.jar'
--libraryjars 'tempLibraries/platform-3.4.0.jar'
--libraryjars 'tempLibraries/realms-1.10.22.jar'
--libraryjars 'tempLibraries/soundsystem-20120107.jar'
--libraryjars 'tempLibraries/text2speech-1.10.3.jar'
-
--libraryjars 'tempLibraries/mixin-0.7.11-SNAPSHOT.jar'
--libraryjars 'tempLibraries/launchwrapper-1.11.jar' # TODO why does only 1.11.jar exist?
-
-
-
-
-# Keep - Applications. Keep all application classes, along with their 'main'
-# methods.
--keepclasseswithmembers public class * {
-    public static void main(java.lang.String[]);
-}
-
-# Also keep - Enumerations. Keep the special static methods that are required in
-# enumeration classes.
--keepclassmembers enum  * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
-
-# Also keep - Database drivers. Keep all implementations of java.sql.Driver.
--keep class * extends java.sql.Driver
-
-# Also keep - Swing UI L&F. Keep all extensions of javax.swing.plaf.ComponentUI,
-# along with the special 'createUI' method.
--keep class * extends javax.swing.plaf.ComponentUI {
-    public static javax.swing.plaf.ComponentUI createUI(javax.swing.JComponent);
-}
-
-# Keep names - Native method names. Keep all native class/method names.
--keepclasseswithmembers,includedescriptorclasses,allowshrinking class * {
-    native <methods>;
-}
-
-# Remove - System method calls. Remove all invocations of System
-# methods without side effects whose return values are not used.
--assumenosideeffects public class java.lang.System {
-    public static long currentTimeMillis();
-    static java.lang.Class getCallerClass();
-    public static int identityHashCode(java.lang.Object);
-    public static java.lang.SecurityManager getSecurityManager();
-    public static java.util.Properties getProperties();
-    public static java.lang.String getProperty(java.lang.String);
-    public static java.lang.String getenv(java.lang.String);
-    public static java.lang.String mapLibraryName(java.lang.String);
-    public static java.lang.String getProperty(java.lang.String,java.lang.String);
-}
-
-# Remove - Math method calls. Remove all invocations of Math
-# methods without side effects whose return values are not used.
--assumenosideeffects public class java.lang.Math {
-    public static double sin(double);
-    public static double cos(double);
-    public static double tan(double);
-    public static double asin(double);
-    public static double acos(double);
-    public static double atan(double);
-    public static double toRadians(double);
-    public static double toDegrees(double);
-    public static double exp(double);
-    public static double log(double);
-    public static double log10(double);
-    public static double sqrt(double);
-    public static double cbrt(double);
-    public static double IEEEremainder(double,double);
-    public static double ceil(double);
-    public static double floor(double);
-    public static double rint(double);
-    public static double atan2(double,double);
-    public static double pow(double,double);
-    public static int round(float);
-    public static long round(double);
-    public static double random();
-    public static int abs(int);
-    public static long abs(long);
-    public static float abs(float);
-    public static double abs(double);
-    public static int max(int,int);
-    public static long max(long,long);
-    public static float max(float,float);
-    public static double max(double,double);
-    public static int min(int,int);
-    public static long min(long,long);
-    public static float min(float,float);
-    public static double min(double,double);
-    public static double ulp(double);
-    public static float ulp(float);
-    public static double signum(double);
-    public static float signum(float);
-    public static double sinh(double);
-    public static double cosh(double);
-    public static double tanh(double);
-    public static double hypot(double,double);
-    public static double expm1(double);
-    public static double log1p(double);
-}
-
-# Remove - Number method calls. Remove all invocations of Number
-# methods without side effects whose return values are not used.
--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 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 java.lang.Short valueOf(short);
-    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);
-    public static java.lang.String toHexString(int);
-    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 java.lang.Integer valueOf(int);
-    public static java.lang.Integer getInteger(java.lang.String);
-    public static java.lang.Integer getInteger(java.lang.String,int);
-    public static java.lang.Integer getInteger(java.lang.String,java.lang.Integer);
-    public static java.lang.Integer decode(java.lang.String);
-    public static int highestOneBit(int);
-    public static int lowestOneBit(int);
-    public static int numberOfLeadingZeros(int);
-    public static int numberOfTrailingZeros(int);
-    public static int bitCount(int);
-    public static int rotateLeft(int,int);
-    public static int rotateRight(int,int);
-    public static int reverse(int);
-    public static int signum(int);
-    public static int reverseBytes(int);
-    public int compareTo(java.lang.Integer);
-    public static java.lang.String toString(long,int);
-    public static java.lang.String toHexString(long);
-    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 java.lang.Long valueOf(long);
-    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);
-    public static long highestOneBit(long);
-    public static long lowestOneBit(long);
-    public static int numberOfLeadingZeros(long);
-    public static int numberOfTrailingZeros(long);
-    public static int bitCount(long);
-    public static long rotateLeft(long,int);
-    public static long rotateRight(long,int);
-    public static long reverse(long);
-    public static int signum(long);
-    public static long reverseBytes(long);
-    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(float);
-    public static float parseFloat(java.lang.String);
-    public static boolean isNaN(float);
-    public static boolean isInfinite(float);
-    public static int floatToIntBits(float);
-    public static int floatToRawIntBits(float);
-    public static float intBitsToFloat(int);
-    public static int compare(float,float);
-    public boolean isNaN();
-    public boolean isInfinite();
-    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 boolean isNaN(double);
-    public static boolean isInfinite(double);
-    public static long doubleToLongBits(double);
-    public static long doubleToRawLongBits(double);
-    public static double longBitsToDouble(long);
-    public static int compare(double,double);
-    public boolean isNaN();
-    public boolean isInfinite();
-    public int compareTo(java.lang.Double);
-    public byte byteValue();
-    public short shortValue();
-    public int intValue();
-    public long longValue();
-    public float floatValue();
-    public double doubleValue();
-    public int compareTo(java.lang.Object);
-    public boolean equals(java.lang.Object);
-    public int hashCode();
-    public java.lang.String toString();
-}
-
-# Remove - String method calls. Remove all invocations of String
-# methods without side effects whose return values are not used.
--assumenosideeffects public class java.lang.String {
-    public static java.lang.String copyValueOf(char[]);
-    public static java.lang.String copyValueOf(char[],int,int);
-    public static java.lang.String valueOf(boolean);
-    public static java.lang.String valueOf(char);
-    public static java.lang.String valueOf(char[]);
-    public static java.lang.String valueOf(char[],int,int);
-    public static java.lang.String valueOf(double);
-    public static java.lang.String valueOf(float);
-    public static java.lang.String valueOf(int);
-    public static java.lang.String valueOf(java.lang.Object);
-    public static java.lang.String valueOf(long);
-    public boolean contentEquals(java.lang.StringBuffer);
-    public boolean endsWith(java.lang.String);
-    public boolean equalsIgnoreCase(java.lang.String);
-    public boolean equals(java.lang.Object);
-    public boolean matches(java.lang.String);
-    public boolean regionMatches(boolean,int,java.lang.String,int,int);
-    public boolean regionMatches(int,java.lang.String,int,int);
-    public boolean startsWith(java.lang.String);
-    public boolean startsWith(java.lang.String,int);
-    public byte[] getBytes();
-    public byte[] getBytes(java.lang.String);
-    public char charAt(int);
-    public char[] toCharArray();
-    public int compareToIgnoreCase(java.lang.String);
-    public int compareTo(java.lang.Object);
-    public int compareTo(java.lang.String);
-    public int hashCode();
-    public int indexOf(int);
-    public int indexOf(int,int);
-    public int indexOf(java.lang.String);
-    public int indexOf(java.lang.String,int);
-    public int lastIndexOf(int);
-    public int lastIndexOf(int,int);
-    public int lastIndexOf(java.lang.String);
-    public int lastIndexOf(java.lang.String,int);
-    public int length();
-    public java.lang.CharSequence subSequence(int,int);
-    public java.lang.String concat(java.lang.String);
-    public java.lang.String replaceAll(java.lang.String,java.lang.String);
-    public java.lang.String replace(char,char);
-    public java.lang.String replaceFirst(java.lang.String,java.lang.String);
-    public java.lang.String[] split(java.lang.String);
-    public java.lang.String[] split(java.lang.String,int);
-    public java.lang.String substring(int);
-    public java.lang.String substring(int,int);
-    public java.lang.String toLowerCase();
-    public java.lang.String toLowerCase(java.util.Locale);
-    public java.lang.String toString();
-    public java.lang.String toUpperCase();
-    public java.lang.String toUpperCase(java.util.Locale);
-    public java.lang.String trim();
-}
-
-# Remove - StringBuffer method calls. Remove all invocations of StringBuffer
-# methods without side effects whose return values are not used.
--assumenosideeffects public class java.lang.StringBuffer {
-    public java.lang.String toString();
-    public char charAt(int);
-    public int capacity();
-    public int codePointAt(int);
-    public int codePointBefore(int);
-    public int indexOf(java.lang.String,int);
-    public int lastIndexOf(java.lang.String);
-    public int lastIndexOf(java.lang.String,int);
-    public int length();
-    public java.lang.String substring(int);
-    public java.lang.String substring(int,int);
-}
-
-# Remove - StringBuilder method calls. Remove all invocations of StringBuilder
-# methods without side effects whose return values are not used.
--assumenosideeffects public class java.lang.StringBuilder {
-    public java.lang.String toString();
-    public char charAt(int);
-    public int capacity();
-    public int codePointAt(int);
-    public int codePointBefore(int);
-    public int indexOf(java.lang.String,int);
-    public int lastIndexOf(java.lang.String);
-    public int lastIndexOf(java.lang.String,int);
-    public int length();
-    public java.lang.String substring(int);
-    public java.lang.String substring(int,int);
-}

settings.gradle

@@ -2,16 +2,16 @@
  * 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
+ * it under the terms of the GNU 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 

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

@@ -1,86 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api;
-
-import baritone.api.behavior.*;
-import baritone.api.cache.IWorldProvider;
-import baritone.api.cache.IWorldScanner;
-import baritone.api.event.listener.IGameEventListener;
-import baritone.api.utils.SettingsUtil;
-
-import java.util.Iterator;
-import java.util.ServiceLoader;
-
-/**
- * API exposure for various things implemented in Baritone.
- * <p>
- * W.I.P
- *
- * @author Brady
- * @since 9/23/2018
- */
-public final class BaritoneAPI {
-
-    private static final IBaritoneProvider baritone;
-    private static final Settings settings;
-
-    static {
-        ServiceLoader<IBaritoneProvider> baritoneLoader = ServiceLoader.load(IBaritoneProvider.class);
-        Iterator<IBaritoneProvider> instances = baritoneLoader.iterator();
-        baritone = instances.next();
-
-        settings = new Settings();
-        SettingsUtil.readAndApply(settings);
-    }
-
-    public static IFollowBehavior getFollowBehavior() {
-        return baritone.getFollowBehavior();
-    }
-
-    public static ILookBehavior getLookBehavior() {
-        return baritone.getLookBehavior();
-    }
-
-    public static IMemoryBehavior getMemoryBehavior() {
-        return baritone.getMemoryBehavior();
-    }
-
-    public static IMineBehavior getMineBehavior() {
-        return baritone.getMineBehavior();
-    }
-
-    public static IPathingBehavior getPathingBehavior() {
-        return baritone.getPathingBehavior();
-    }
-
-    public static Settings getSettings() {
-        return settings;
-    }
-
-    public static IWorldProvider getWorldProvider() {
-        return baritone.getWorldProvider();
-    }
-
-    public static IWorldScanner getWorldScanner() {
-        return baritone.getWorldScanner();
-    }
-
-    public static void registerEventListener(IGameEventListener listener) {
-        baritone.registerEventListener(listener);
-    }
-}

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

@@ -1,86 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api;
-
-import baritone.api.behavior.*;
-import baritone.api.cache.IWorldProvider;
-import baritone.api.cache.IWorldScanner;
-import baritone.api.event.listener.IGameEventListener;
-
-/**
- * @author Brady
- * @since 9/29/2018
- */
-public interface IBaritoneProvider {
-
-    /**
-     * @see IFollowBehavior
-     *
-     * @return The {@link IFollowBehavior} instance
-     */
-    IFollowBehavior getFollowBehavior();
-
-    /**
-     * @see ILookBehavior
-     *
-     * @return The {@link ILookBehavior} instance
-     */
-    ILookBehavior getLookBehavior();
-
-    /**
-     * @see IMemoryBehavior
-     *
-     * @return The {@link IMemoryBehavior} instance
-     */
-    IMemoryBehavior getMemoryBehavior();
-
-    /**
-     * @see IMineBehavior
-     *
-     * @return The {@link IMineBehavior} instance
-     */
-    IMineBehavior getMineBehavior();
-
-    /**
-     * @see IPathingBehavior
-     *
-     * @return The {@link IPathingBehavior} instance
-     */
-    IPathingBehavior getPathingBehavior();
-
-    /**
-     * @see IWorldProvider
-     *
-     * @return The {@link IWorldProvider} instance
-     */
-    IWorldProvider getWorldProvider();
-
-    /**
-     * @see IWorldScanner
-     *
-     * @return The {@link IWorldScanner} instance
-     */
-    IWorldScanner getWorldScanner();
-
-    /**
-     * Registers a {@link IGameEventListener} with Baritone's "event bus".
-     *
-     * @param listener The listener
-     */
-    void registerEventListener(IGameEventListener listener);
-}

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

@@ -1,27 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.behavior;
-
-import baritone.api.event.listener.AbstractGameEventListener;
-import baritone.api.utils.interfaces.Toggleable;
-
-/**
- * @author Brady
- * @since 9/23/2018
- */
-public interface IBehavior extends AbstractGameEventListener, Toggleable {}

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

@@ -1,44 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.behavior;
-
-import net.minecraft.entity.Entity;
-
-/**
- * @author Brady
- * @since 9/23/2018
- */
-public interface IFollowBehavior extends IBehavior {
-
-    /**
-     * Set the follow target to the specified entity;
-     *
-     * @param entity The entity to follow
-     */
-    void follow(Entity entity);
-
-    /**
-     * @return The entity that is currently being followed
-     */
-    Entity following();
-
-    /**
-     * Cancels the follow behavior, this will clear the current follow target.
-     */
-    void cancel();
-}

src/api/java/baritone/api/behavior/ILookBehavior.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.behavior;
-
-import baritone.api.utils.Rotation;
-
-/**
- * @author Brady
- * @since 9/23/2018
- */
-public interface ILookBehavior extends IBehavior {
-
-    /**
-     * Updates the current {@link ILookBehavior} target to target
-     * the specified rotations on the next tick. If force is {@code true},
-     * then freeLook will be overriden and angles will be set regardless.
-     * If any sort of block interaction is required, force should be {@code true},
-     * otherwise, it should be {@code false};
-     *
-     * @param rotation The target rotations
-     * @param force Whether or not to "force" the rotations
-     */
-    void updateTarget(Rotation rotation, boolean force);
-}

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

@@ -1,45 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.behavior;
-
-import baritone.api.behavior.memory.IRememberedInventory;
-import net.minecraft.util.math.BlockPos;
-
-import java.util.Map;
-
-/**
- * @author Brady
- * @since 9/23/2018
- */
-public interface IMemoryBehavior extends IBehavior {
-
-    /**
-     * Gets a remembered inventory by its block position.
-     *
-     * @param pos The position of the container block
-     * @return The remembered inventory
-     */
-    IRememberedInventory getInventoryByPos(BlockPos pos);
-
-    /**
-     * Gets the map of all block positions to their remembered inventories.
-     *
-     * @return Map of block positions to their respective remembered inventories
-     */
-    Map<BlockPos, IRememberedInventory> getRememberedInventories();
-}

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

@@ -1,70 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.behavior;
-
-import net.minecraft.block.Block;
-
-/**
- * @author Brady
- * @since 9/23/2018
- */
-public interface IMineBehavior extends IBehavior {
-
-    /**
-     * Begin to search for and mine the specified blocks until
-     * the number of specified items to get from the blocks that
-     * are mined. This is based on the first target block to mine.
-     *
-     * @param quantity The number of items to get from blocks mined
-     * @param blocks The blocks to mine
-     */
-    void mine(int quantity, String... blocks);
-
-    /**
-     * Begin to search for and mine the specified blocks until
-     * the number of specified items to get from the blocks that
-     * are mined. This is based on the first target block to mine.
-     *
-     * @param quantity The number of items to get from blocks mined
-     * @param blocks The blocks to mine
-     */
-    void mine(int quantity, Block... blocks);
-
-    /**
-     * Begin to search for and mine the specified blocks.
-     *
-     * @param blocks The blocks to mine
-     */
-    default void mine(String... blocks) {
-        this.mine(0, blocks);
-    }
-
-    /**
-     * Begin to search for and mine the specified blocks.
-     *
-     * @param blocks The blocks to mine
-     */
-    default void mine(Block... blocks) {
-        this.mine(0, blocks);
-    }
-
-    /**
-     * Cancels the current mining task
-     */
-    void cancel();
-}

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

@@ -1,97 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.behavior;
-
-import baritone.api.pathing.calc.IPath;
-import baritone.api.pathing.calc.IPathFinder;
-import baritone.api.pathing.goals.Goal;
-import baritone.api.pathing.path.IPathExecutor;
-
-import java.util.Optional;
-
-/**
- * @author Brady
- * @since 9/23/2018
- */
-public interface IPathingBehavior extends IBehavior {
-
-    /**
-     * 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.
-     *
-     * @return The estimated remaining ticks in the current segment.
-     */
-    Optional<Double> ticksRemainingInSegment();
-
-    /**
-     * Sets the pathing goal.
-     *
-     * @param goal The pathing goal
-     */
-    void setGoal(Goal goal);
-
-    /**
-     * @return The current pathing goal
-     */
-    Goal getGoal();
-
-    /**
-     * Begins pathing. Calculation will start in a new thread, and once completed,
-     * movement will commence. Returns whether or not the operation was successful.
-     *
-     * @return Whether or not the operation was successful
-     */
-    boolean path();
-
-    /**
-     * @return Whether or not a path is currently being executed.
-     */
-    boolean isPathing();
-
-    /**
-     * Cancels the pathing behavior or the current path calculation.
-     */
-    void cancel();
-
-    /**
-     * Returns the current path, from the current path executor, if there is one.
-     *
-     * @return The current path
-     */
-    default Optional<IPath> getPath() {
-        return Optional.ofNullable(getCurrent()).map(IPathExecutor::getPath);
-    }
-
-    /**
-     * @return The current path finder being executed
-     */
-    Optional<IPathFinder> getPathFinder();
-
-    /**
-     * @return The current path executor
-     */
-    IPathExecutor getCurrent();
-
-    /**
-     * Returns the next path executor, created when planning ahead.
-     *
-     * @return The next path executor
-     */
-    IPathExecutor getNext();
-}

src/api/java/baritone/api/behavior/memory/IRememberedInventory.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.behavior.memory;
-
-import net.minecraft.item.ItemStack;
-
-import java.util.List;
-
-/**
- * @author Brady
- * @since 9/23/2018
- */
-public interface IRememberedInventory {
-
-    /**
-     * @return The contents of this inventory
-     */
-    List<ItemStack> getContents();
-
-    /**
-     * @return The number of slots in this inventory
-     */
-    int getSize();
-}

src/api/java/baritone/api/cache/ICachedRegion.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.cache;
-
-/**
- * @author Brady
- * @since 9/24/2018
- */
-public interface ICachedRegion extends IBlockTypeAccess {
-
-    /**
-     * Returns whether or not the block at the specified X and Z coordinates
-     * is cached in this world. Similar to {@link ICachedWorld#isCached(int, int)},
-     * however, the block coordinates should in on a scale from 0 to 511 (inclusive)
-     * because region sizes are 512x512 blocks.
-     *
-     * @see ICachedWorld#isCached(int, int)
-     *
-     * @param blockX The block X coordinate
-     * @param blockZ The block Z coordinate
-     * @return Whether or not the specified XZ location is cached
-     */
-    boolean isCached(int blockX, int blockZ);
-
-    /**
-     * The X coordinate of this region
-     */
-    int getX();
-
-    /**
-     * The Z coordinate of this region
-     */
-    int getZ();
-}

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

@@ -1,82 +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.cache;
-
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.chunk.Chunk;
-
-import java.util.LinkedList;
-
-/**
- * @author Brady
- * @since 9/24/2018
- */
-public interface ICachedWorld {
-
-    /**
-     * Returns the region at the specified region coordinates
-     *
-     * @param regionX The region X coordinate
-     * @param regionZ The region Z coordinate
-     * @return The region located at the specified coordinates
-     */
-    ICachedRegion getRegion(int regionX, int regionZ);
-
-    /**
-     * Queues the specified chunk for packing. This entails reading the contents
-     * of the chunk, then packing the data into the 2-bit format, and storing that
-     * in this cached world.
-     *
-     * @param chunk The chunk to pack and store
-     */
-    void queueForPacking(Chunk chunk);
-
-    /**
-     * Returns whether or not the block at the specified X and Z coordinates
-     * is cached in this world.
-     *
-     * @param blockX The block X coordinate
-     * @param blockZ The block Z coordinate
-     * @return Whether or not the specified XZ location is cached
-     */
-    boolean isCached(int blockX, int blockZ);
-
-    /**
-     * Scans the cached chunks for location of the specified special block. The
-     * information that is returned by this method may not be up to date, because
-     * older cached chunks can contain data that is much more likely to have changed.
-     *
-     * @param block The special block to search for
-     * @param maximum The maximum number of position results to receive
-     * @param maxRegionDistanceSq The maximum region distance, squared
-     * @return The locations found that match the special block
-     */
-    LinkedList<BlockPos> getLocationsOf(String block, int maximum, int maxRegionDistanceSq);
-
-    /**
-     * Reloads all of the cached regions in this world from disk. Anything that is not saved
-     * will be lost. This operation does not execute in a new thread by default.
-     */
-    void reloadAllFromDisk();
-
-    /**
-     * Saves all of the cached regions in this world to disk. This operation does not execute
-     * in a new thread by default.
-     */
-    void save();
-}

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

@@ -1,111 +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.cache;
-
-import net.minecraft.util.math.BlockPos;
-import org.apache.commons.lang3.ArrayUtils;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * A marker for a position in the world.
- *
- * @author Brady
- * @since 9/24/2018
- */
-public interface IWaypoint {
-
-    /**
-     * @return The label for this waypoint
-     */
-    String getName();
-
-    /**
-     * Returns the tag for this waypoint. The tag is a category
-     * for the waypoint in a sense, it describes the source of
-     * the waypoint.
-     *
-     * @return The waypoint tag
-     */
-    Tag getTag();
-
-    /**
-     * Returns the unix epoch time in milliseconds that this waypoint
-     * was created. This value should only be set once, when the waypoint
-     * is initially created, and not when it is being loaded from file.
-     *
-     * @return The unix epoch milliseconds that this waypoint was created
-     */
-    long getCreationTimestamp();
-
-    /**
-     * Returns the actual block position of this waypoint.
-     *
-     * @return The block position of this waypoint
-     */
-    BlockPos getLocation();
-
-    enum Tag {
-
-        /**
-         * Tag indicating a position explictly marked as a home base
-         */
-        HOME("home", "base"),
-
-        /**
-         * Tag indicating a position that the local player has died at
-         */
-        DEATH("death"),
-
-        /**
-         * Tag indicating a bed position
-         */
-        BED("bed", "spawn"),
-
-        /**
-         * Tag indicating that the waypoint was user-created
-         */
-        USER("user");
-
-        /**
-         * A list of all of the
-         */
-        private static final List<Tag> TAG_LIST = Collections.unmodifiableList(Arrays.asList(Tag.values()));
-
-        /**
-         * The names for the tag, anything that the tag can be referred to as.
-         */
-        private final String[] names;
-
-        Tag(String... names) {
-            this.names = names;
-        }
-
-        /**
-         * Finds a tag from one of the names that could be used to identify said tag.
-         *
-         * @param name The name of the tag
-         * @return The tag, if one is found, otherwise, {@code null}
-         */
-        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/IWaypointCollection.java

@@ -1,68 +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.cache;
-
-import java.util.Set;
-
-/**
- * @author Brady
- * @since 9/24/2018
- */
-public interface IWaypointCollection {
-
-    /**
-     * Adds a waypoint to this collection
-     *
-     * @param waypoint The waypoint
-     */
-    void addWaypoint(IWaypoint waypoint);
-
-    /**
-     * Removes a waypoint from this collection
-     *
-     * @param waypoint The waypoint
-     */
-    void removeWaypoint(IWaypoint waypoint);
-
-    /**
-     * Gets the most recently created waypoint by the specified {@link IWaypoint.Tag}
-     *
-     * @param tag The tag
-     * @return The most recently created waypoint with the specified tag
-     */
-    IWaypoint getMostRecentByTag(IWaypoint.Tag tag);
-
-    /**
-     * Gets all of the waypoints that have the specified tag
-     *
-     * @see IWaypointCollection#getAllWaypoints()
-     *
-     * @param tag The tag
-     * @return All of the waypoints with the specified tag
-     */
-    Set<IWaypoint> getByTag(IWaypoint.Tag tag);
-
-    /**
-     * Gets all of the waypoints in this collection, regardless of the tag.
-     *
-     * @see IWaypointCollection#getByTag(IWaypoint.Tag)
-     *
-     * @return All of the waypoints in this collection
-     */
-    Set<IWaypoint> getAllWaypoints();
-}

src/api/java/baritone/api/cache/IWorldData.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.cache;
-
-/**
- * @author Brady
- * @since 9/24/2018
- */
-public interface IWorldData {
-
-    /**
-     * Returns the cached world for this world. A cached world is a simplified format
-     * of a regular world, intended for use on multiplayer servers where chunks are not
-     * traditionally stored to disk, allowing for long distance pathing with minimal disk usage.
-     */
-    ICachedWorld getCachedWorld();
-
-    /**
-     * Returns the waypoint collection for this world.
-     *
-     * @return The waypoint collection for this world
-     */
-    IWaypointCollection getWaypoints();
-}

src/api/java/baritone/api/cache/IWorldProvider.java

@@ -1,32 +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.cache;
-
-/**
- * @author Brady
- * @since 9/24/2018
- */
-public interface IWorldProvider {
-
-    /**
-     * Returns the data of the currently loaded world
-     *
-     * @return The current world data
-     */
-    IWorldData getCurrentWorld();
-}

src/api/java/baritone/api/cache/IWorldScanner.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.cache;
-
-import net.minecraft.block.Block;
-import net.minecraft.util.math.BlockPos;
-
-import java.util.List;
-
-/**
- * @author Brady
- * @since 10/6/2018
- */
-public interface IWorldScanner {
-
-    /**
-     * Scans the world, up to the specified max chunk radius, for the specified blocks.
-     *
-     * @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 maxSearchRadius The maximum chunk search radius
-     * @return The matching block positions
-     */
-    List<BlockPos> scanChunkRadius(List<Block> blocks, int max, int yLevelThreshold, int maxSearchRadius);
-}

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

@@ -1,78 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.event.events;
-
-import baritone.api.event.events.type.EventState;
-import baritone.api.event.events.type.ManagedPlayerEvent;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-
-/**
- * @author Brady
- * @since 8/21/2018
- */
-public final class RotationMoveEvent extends ManagedPlayerEvent {
-
-    /**
-     * The type of event
-     */
-    private final Type type;
-
-    /**
-     * The state of the event
-     */
-    private final EventState state;
-
-    public RotationMoveEvent(EntityPlayerSP player, EventState state, Type type) {
-        super(player);
-        this.state = state;
-        this.type = type;
-    }
-
-    /**
-     * @return The state of the event
-     */
-    public final EventState getState() {
-        return this.state;
-    }
-
-    /**
-     * @return The type of the event
-     */
-    public final Type getType() {
-        return this.type;
-    }
-
-    public enum Type {
-
-        /**
-         * Called when the player's motion is updated.
-         *
-         * @see Entity#moveRelative(float, float, float, float)
-         */
-        MOTION_UPDATE,
-
-        /**
-         * Called when the player jumps.
-         *
-         * @see EntityLivingBase#jump
-         */
-        JUMP
-    }
-}

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

@@ -1,35 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.event.events.type;
-
-/**
- * @author Brady
- * @since 10/11/2018
- */
-public interface ICancellable {
-
-    /**
-     * Cancels this event
-     */
-    void cancel();
-
-    /**
-     * @return Whether or not this event has been cancelled
-     */
-    boolean isCancelled();
-}

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

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

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

@@ -1,136 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.pathing.calc;
-
-import baritone.api.Settings;
-import baritone.api.pathing.goals.Goal;
-import baritone.api.pathing.movement.IMovement;
-import baritone.api.utils.BetterBlockPos;
-
-import java.util.List;
-
-/**
- * @author leijurv, Brady
- */
-public interface IPath {
-
-    /**
-     * Ordered list of movements to carry out.
-     * movements.get(i).getSrc() should equal positions.get(i)
-     * movements.get(i).getDest() should equal positions.get(i+1)
-     * movements.size() should equal positions.size()-1
-     *
-     * @return All of the movements to carry out
-     */
-    List<IMovement> movements();
-
-    /**
-     * All positions along the way.
-     * Should begin with the same as getSrc and end with the same as getDest
-     *
-     * @return All of the positions along this path
-     */
-    List<BetterBlockPos> positions();
-
-    /**
-     * This path is actually going to be executed in the world. Do whatever additional processing is required.
-     * (as opposed to Path objects that are just constructed every frame for rendering)
-     */
-    default void postProcess() {}
-
-    /**
-     * Returns the number of positions in this path. Equivalent to {@code positions().size()}.
-     *
-     * @return Number of positions in this path
-     */
-    default int length() {
-        return positions().size();
-    }
-
-    /**
-     * @return The goal that this path was calculated towards
-     */
-    Goal getGoal();
-
-    /**
-     * Returns the number of nodes that were considered during calculation before
-     * this path was found.
-     *
-     * @return The number of nodes that were considered before finding this path
-     */
-    int getNumNodesConsidered();
-
-    /**
-     * Returns the start position of this path. This is the first element in the
-     * {@link List} that is returned by {@link IPath#positions()}.
-     *
-     * @return The start position of this path
-     */
-    default BetterBlockPos getSrc() {
-        return positions().get(0);
-    }
-
-    /**
-     * Returns the end position of this path. This is the last element in the
-     * {@link List} that is returned by {@link IPath#positions()}.
-     *
-     * @return The end position of this path.
-     */
-    default BetterBlockPos getDest() {
-        List<BetterBlockPos> pos = positions();
-        return pos.get(pos.size() - 1);
-    }
-
-    /**
-     * Returns the estimated number of ticks to complete the path from the given node index.
-     *
-     * @param pathPosition The index of the node we're calculating from
-     * @return The estimated number of ticks remaining frm the given position
-     */
-    default double ticksRemainingFrom(int pathPosition) {
-        double sum = 0;
-        //this is fast because we aren't requesting recalculation, it's just cached
-        for (int i = pathPosition; i < movements().size(); i++) {
-            sum += movements().get(i).getCost();
-        }
-        return sum;
-    }
-
-    /**
-     * Cuts off this path at the loaded chunk border, and returns the resulting path. Default
-     * implementation just returns this path, without the intended functionality.
-     *
-     * @return The result of this cut-off operation
-     */
-    default IPath cutoffAtLoadedChunks() {
-        return this;
-    }
-
-    /**
-     * Cuts off this path using the min length and cutoff factor settings, and returns the resulting path.
-     * Default implementation just returns this path, without the intended functionality.
-     *
-     * @see Settings#pathCutoffMinimumLength
-     * @see Settings#pathCutoffFactor
-     *
-     * @return The result of this cut-off operation
-     */
-    default IPath staticCutoff(Goal destination) {
-        return this;
-    }
-}

src/api/java/baritone/api/pathing/goals/GoalAxis.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.pathing.goals;
-
-import baritone.api.BaritoneAPI;
-
-public class GoalAxis implements Goal {
-
-    private static final double SQRT_2_OVER_2 = Math.sqrt(2) / 2;
-
-    @Override
-    public boolean isInGoal(int x, int y, int z) {
-        return y == BaritoneAPI.getSettings().axisHeight.get() && (x == 0 || z == 0 || Math.abs(x) == Math.abs(z));
-    }
-
-    @Override
-    public double heuristic(int x0, int y, int z0) {
-        int x = Math.abs(x0);
-        int z = Math.abs(z0);
-
-        int shrt = Math.min(x, z);
-        int lng = Math.max(x, z);
-        int diff = lng - shrt;
-
-        double flatAxisDistance = Math.min(x, Math.min(z, diff * SQRT_2_OVER_2));
-
-        return flatAxisDistance * BaritoneAPI.getSettings().costHeuristic.get() + GoalYLevel.calculate(BaritoneAPI.getSettings().axisHeight.get(), y);
-    }
-
-    @Override
-    public String toString() {
-        return "GoalAxis";
-    }
-}

src/api/java/baritone/api/pathing/goals/GoalGetToBlock.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.pathing.goals;
-
-import baritone.api.utils.interfaces.IGoalRenderPos;
-import net.minecraft.util.math.BlockPos;
-
-
-/**
- * Don't get into the block, but get directly adjacent to it. Useful for chests.
- *
- * @author avecowa
- */
-public class GoalGetToBlock implements Goal, IGoalRenderPos {
-
-    private final int x;
-    private final int y;
-    private final int z;
-
-    public GoalGetToBlock(BlockPos pos) {
-        this.x = pos.getX();
-        this.y = pos.getY();
-        this.z = pos.getZ();
-    }
-
-    @Override
-    public BlockPos getGoalPos() {
-        return new BlockPos(x, y, z);
-    }
-
-    @Override
-    public boolean isInGoal(int x, int y, int z) {
-        int xDiff = x - this.x;
-        int yDiff = y - this.y;
-        int zDiff = z - this.z;
-        if (yDiff < 0) {
-            yDiff++;
-        }
-        return Math.abs(xDiff) + Math.abs(yDiff) + Math.abs(zDiff) <= 1;
-    }
-
-    @Override
-    public double heuristic(int x, int y, int z) {
-        int xDiff = x - this.x;
-        int yDiff = y - this.y;
-        int zDiff = z - this.z;
-        return GoalBlock.calculate(xDiff, yDiff, zDiff);
-    }
-
-    @Override
-    public String toString() {
-        return "GoalGetToBlock{x=" + x + ",y=" + y + ",z=" + z + "}";
-    }
-}

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

@@ -1,66 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.pathing.goals;
-
-import baritone.api.utils.interfaces.IGoalRenderPos;
-import net.minecraft.util.math.BlockPos;
-
-public class GoalNear implements Goal, IGoalRenderPos {
-    private final int x;
-    private final int y;
-    private final int z;
-    private final int rangeSq;
-
-    public GoalNear(BlockPos pos, int range) {
-        this.x = pos.getX();
-        this.y = pos.getY();
-        this.z = pos.getZ();
-        this.rangeSq = range * range;
-    }
-
-    @Override
-    public boolean isInGoal(int x, int y, int z) {
-        int xDiff = x - this.x;
-        int yDiff = y - this.y;
-        int zDiff = z - this.z;
-        return xDiff * xDiff + yDiff * yDiff + zDiff * zDiff <= rangeSq;
-    }
-
-    @Override
-    public double heuristic(int x, int y, int z) {
-        int xDiff = x - this.x;
-        int yDiff = y - this.y;
-        int zDiff = z - this.z;
-        return GoalBlock.calculate(xDiff, yDiff, zDiff);
-    }
-
-    @Override
-    public BlockPos getGoalPos() {
-        return new BlockPos(x, y, z);
-    }
-
-    @Override
-    public String toString() {
-        return "GoalNear{" +
-                "x=" + x +
-                ", y=" + y +
-                ", z=" + z +
-                ", rangeSq=" + rangeSq +
-                '}';
-    }
-}

src/api/java/baritone/api/pathing/movement/IMovement.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.pathing.movement;
-
-import baritone.api.utils.BetterBlockPos;
-import net.minecraft.util.math.BlockPos;
-
-import java.util.List;
-
-/**
- * @author Brady
- * @since 10/8/2018
- */
-public interface IMovement {
-
-    double getCost();
-
-    MovementStatus update();
-
-    /**
-     * Resets the current state status to {@link MovementStatus#PREPPING}
-     */
-    void reset();
-
-    /**
-     * Resets the cache for special break, place, and walk into blocks
-     */
-    void resetBlockCache();
-
-    /**
-     * @return Whether or not it is safe to cancel the current movement state
-     */
-    boolean safeToCancel();
-
-    double recalculateCost();
-
-    double calculateCostWithoutCaching();
-
-    boolean calculatedWhileLoaded();
-
-    BetterBlockPos getSrc();
-
-    BetterBlockPos getDest();
-
-    BlockPos getDirection();
-
-    List<BlockPos> toBreak();
-
-    List<BlockPos> toPlace();
-
-    List<BlockPos> toWalkInto();
-}

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

@@ -1,74 +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.movement;
-
-/**
- * @author Brady
- * @since 10/8/2018
- */
-public enum MovementStatus {
-
-    /**
-     * We are preparing the movement to be executed. This is when any blocks obstructing the destination are broken.
-     */
-    PREPPING(false),
-
-    /**
-     * We are waiting for the movement to begin, after {@link MovementStatus#PREPPING}.
-     */
-    WAITING(false),
-
-    /**
-     * The movement is currently in progress, after {@link MovementStatus#WAITING}
-     */
-    RUNNING(false),
-
-    /**
-     * The movement has been completed and we are at our destination
-     */
-    SUCCESS(true),
-
-    /**
-     * There was a change in state between calculation and actual
-     * movement execution, and the movement has now become impossible.
-     */
-    UNREACHABLE(true),
-
-    /**
-     * Unused
-     */
-    FAILED(true),
-
-    /**
-     * "Unused"
-     */
-    CANCELED(true);
-
-    /**
-     * Whether or not this status indicates a complete movement.
-     */
-    private final boolean complete;
-
-    MovementStatus(boolean complete) {
-        this.complete = complete;
-    }
-
-    public final boolean isComplete() {
-        return this.complete;
-    }
-}

src/api/java/baritone/api/pathing/path/IPathExecutor.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.pathing.path;
-
-import baritone.api.pathing.calc.IPath;
-
-/**
- * @author Brady
- * @since 10/8/2018
- */
-public interface IPathExecutor {
-
-    IPath getPath();
-}

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

@@ -1,183 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.utils;
-
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.math.Vec3i;
-
-/**
- * A better BlockPos that has fewer hash collisions (and slightly more performant offsets)
- * <p>
- * Is it really faster to subclass BlockPos and calculate a hash in the constructor like this, taking everything into account?
- * Yes. 20% faster actually. It's called BETTER BlockPos for a reason. Source:
- * <a href="https://docs.google.com/spreadsheets/d/1GWjOjOZINkg_0MkRgKRPH1kUzxjsnEROD9u3UFh_DJc">Benchmark Spreadsheet</a>
- *
- * @author leijurv
- */
-public final class BetterBlockPos extends BlockPos {
-    public final int x;
-    public final int y;
-    public final int z;
-
-    public BetterBlockPos(int x, int y, int z) {
-        super(x, y, z);
-        this.x = x;
-        this.y = y;
-        this.z = z;
-    }
-
-    public BetterBlockPos(double x, double y, double z) {
-        this(MathHelper.floor(x), MathHelper.floor(y), MathHelper.floor(z));
-    }
-
-    public BetterBlockPos(BlockPos pos) {
-        this(pos.getX(), pos.getY(), pos.getZ());
-    }
-
-    @Override
-    public int hashCode() {
-        return (int) longHash(x, y, z);
-    }
-
-    public static long longHash(BetterBlockPos pos) {
-        return longHash(pos.x, pos.y, pos.z);
-    }
-
-    public static long longHash(int x, int y, int z) {
-        /*
-         *   This is the hashcode implementation of Vec3i (the superclass of the class which I shall not name)
-         *
-         *   public int hashCode() {
-         *       return (this.getY() + this.getZ() * 31) * 31 + this.getX();
-         *   }
-         *
-         *   That is terrible and has tons of collisions and makes the HashMap terribly inefficient.
-         *
-         *   That's why we grab out the X, Y, Z and calculate our own hashcode
-         */
-        long hash = 3241;
-        hash = 3457689L * hash + x;
-        hash = 8734625L * hash + y;
-        hash = 2873465L * hash + z;
-        return hash;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (o == null) {
-            return false;
-        }
-        if (o instanceof BetterBlockPos) {
-            BetterBlockPos oth = (BetterBlockPos) o;
-            return oth.x == x && oth.y == y && oth.z == z;
-        }
-        // during path execution, like "if (whereShouldIBe.equals(whereAmI)) {"
-        // sometimes we compare a BlockPos to a BetterBlockPos
-        BlockPos oth = (BlockPos) o;
-        return oth.getX() == x && oth.getY() == y && oth.getZ() == z;
-    }
-
-    @Override
-    public BetterBlockPos up() {
-        // this is unimaginably faster than blockpos.up
-        // that literally calls
-        // this.up(1)
-        // which calls this.offset(EnumFacing.UP, 1)
-        // which does return n == 0 ? this : new BlockPos(this.getX() + facing.getXOffset() * n, this.getY() + facing.getYOffset() * n, this.getZ() + facing.getZOffset() * n);
-
-        // how many function calls is that? up(), up(int), offset(EnumFacing, int), new BlockPos, getX, getXOffset, getY, getYOffset, getZ, getZOffset
-        // that's ten.
-        // this is one function call.
-        return new BetterBlockPos(x, y + 1, z);
-    }
-
-    @Override
-    public BetterBlockPos up(int amt) {
-        // see comment in up()
-        return amt == 0 ? this : new BetterBlockPos(x, y + amt, z);
-    }
-
-    @Override
-    public BetterBlockPos down() {
-        // see comment in up()
-        return new BetterBlockPos(x, y - 1, z);
-    }
-
-    @Override
-    public BetterBlockPos down(int amt) {
-        // see comment in up()
-        return amt == 0 ? this : new BetterBlockPos(x, y - amt, z);
-    }
-
-    @Override
-    public BetterBlockPos offset(EnumFacing dir) {
-        Vec3i vec = dir.getDirectionVec();
-        return new BetterBlockPos(x + vec.getX(), y + vec.getY(), z + vec.getZ());
-    }
-
-    @Override
-    public BetterBlockPos offset(EnumFacing dir, int dist) {
-        if (dist == 0) {
-            return this;
-        }
-        Vec3i vec = dir.getDirectionVec();
-        return new BetterBlockPos(x + vec.getX() * dist, y + vec.getY() * dist, z + vec.getZ() * dist);
-    }
-
-    @Override
-    public BetterBlockPos north() {
-        return new BetterBlockPos(x, y, z - 1);
-    }
-
-    @Override
-    public BetterBlockPos north(int amt) {
-        return amt == 0 ? this : new BetterBlockPos(x, y, z - amt);
-    }
-
-    @Override
-    public BetterBlockPos south() {
-        return new BetterBlockPos(x, y, z + 1);
-    }
-
-    @Override
-    public BetterBlockPos south(int amt) {
-        return amt == 0 ? this : new BetterBlockPos(x, y, z + amt);
-    }
-
-    @Override
-    public BetterBlockPos east() {
-        return new BetterBlockPos(x + 1, y, z);
-    }
-
-    @Override
-    public BetterBlockPos east(int amt) {
-        return amt == 0 ? this : new BetterBlockPos(x + amt, y, z);
-    }
-
-    @Override
-    public BetterBlockPos west() {
-        return new BetterBlockPos(x - 1, y, z);
-    }
-
-    @Override
-    public BetterBlockPos west(int amt) {
-        return amt == 0 ? this : new BetterBlockPos(x - amt, y, z);
-    }
-}

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

@@ -1,114 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.utils;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.math.Vec3d;
-
-import java.util.Optional;
-
-/**
- * @author Brady
- * @since 8/25/2018
- */
-public final class RayTraceUtils {
-
-    private RayTraceUtils() {}
-
-    /**
-     * The {@link Minecraft} instance
-     */
-    private static final Minecraft mc = Minecraft.getMinecraft();
-
-    /**
-     * Simulates a "vanilla" raytrace. A RayTraceResult returned by this method
-     * will be that of the next render pass given that the local player's yaw and
-     * pitch match the specified yaw and pitch values. This is particularly useful
-     * when you would like to simulate a "legit" raytrace with certainty that the only
-     * thing to achieve the desired outcome (whether it is hitting and entity or placing
-     * a block) can be done just by modifying user input.
-     *
-     * @param yaw The yaw to raytrace with
-     * @param pitch The pitch to raytrace with
-     * @return The calculated raytrace result
-     */
-    public static RayTraceResult simulateRayTrace(float yaw, float pitch) {
-        RayTraceResult oldTrace = mc.objectMouseOver;
-        float oldYaw = mc.player.rotationYaw;
-        float oldPitch = mc.player.rotationPitch;
-
-        mc.player.rotationYaw = yaw;
-        mc.player.rotationPitch = pitch;
-
-        mc.entityRenderer.getMouseOver(1.0F);
-        RayTraceResult result = mc.objectMouseOver;
-        mc.objectMouseOver = oldTrace;
-
-        mc.player.rotationYaw = oldYaw;
-        mc.player.rotationPitch = oldPitch;
-
-        return result;
-    }
-
-    /**
-     * Performs a block raytrace with the specified rotations. This should only be used when
-     * any entity collisions can be ignored, because this method will not recognize if an
-     * entity is in the way or not. The local player's block reach distance will be used.
-     *
-     * @param rotation The rotation to raytrace towards
-     * @return The calculated raytrace result
-     */
-    public static RayTraceResult rayTraceTowards(Rotation rotation) {
-        double blockReachDistance = mc.playerController.getBlockReachDistance();
-        Vec3d start = mc.player.getPositionEyes(1.0F);
-        Vec3d direction = RotationUtils.calcVec3dFromRotation(rotation);
-        Vec3d end = start.add(
-                direction.x * blockReachDistance,
-                direction.y * blockReachDistance,
-                direction.z * blockReachDistance
-        );
-        return mc.world.rayTraceBlocks(start, end, false, false, true);
-    }
-
-    /**
-     * Returns the block that the crosshair is currently placed over. Updated once per render tick.
-     *
-     * @return The position of the highlighted block
-     */
-    public static Optional<BlockPos> getSelectedBlock() {
-        if (mc.objectMouseOver != null && mc.objectMouseOver.typeOfHit == RayTraceResult.Type.BLOCK) {
-            return Optional.of(mc.objectMouseOver.getBlockPos());
-        }
-        return Optional.empty();
-    }
-
-    /**
-     * Returns the entity that the crosshair is currently placed over. Updated once per render tick.
-     *
-     * @return The entity
-     */
-    public static Optional<Entity> getSelectedEntity() {
-        if (mc.objectMouseOver != null && mc.objectMouseOver.typeOfHit == RayTraceResult.Type.ENTITY) {
-            return Optional.of(mc.objectMouseOver.entityHit);
-        }
-        return Optional.empty();
-    }
-}

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

@@ -1,112 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.utils;
-
-/**
- * @author Brady
- * @since 9/25/2018
- */
-public class Rotation {
-
-    /**
-     * The yaw angle of this Rotation
-     */
-    private float yaw;
-
-    /**
-     * The pitch angle of this Rotation
-     */
-    private float pitch;
-
-    public Rotation(float yaw, float pitch) {
-        this.yaw = yaw;
-        this.pitch = pitch;
-    }
-
-    /**
-     * @return The yaw of this rotation
-     */
-    public float getYaw() {
-        return this.yaw;
-    }
-
-    /**
-     * @return The pitch of this rotation
-     */
-    public float getPitch() {
-        return this.pitch;
-    }
-
-    /**
-     * Adds the yaw/pitch of the specified rotations to this
-     * rotation's yaw/pitch, and returns the result.
-     *
-     * @param other Another rotation
-     * @return The result from adding the other rotation to this rotation
-     */
-    public Rotation add(Rotation other) {
-        return new Rotation(
-                this.yaw + other.yaw,
-                this.pitch + other.pitch
-        );
-    }
-
-    /**
-     * Subtracts the yaw/pitch of the specified rotations from this
-     * rotation's yaw/pitch, and returns the result.
-     *
-     * @param other Another rotation
-     * @return The result from subtracting the other rotation from this rotation
-     */
-    public Rotation subtract(Rotation other) {
-        return new Rotation(
-                this.yaw - other.yaw,
-                this.pitch - other.pitch
-        );
-    }
-
-    /**
-     * @return A copy of this rotation with the pitch clamped
-     */
-    public Rotation clamp() {
-        return new Rotation(
-                this.yaw,
-                RotationUtils.clampPitch(this.pitch)
-        );
-    }
-
-    /**
-     * @return A copy of this rotation with the yaw normalized
-     */
-    public Rotation normalize() {
-        return new Rotation(
-                RotationUtils.normalizeYaw(this.yaw),
-                this.pitch
-        );
-    }
-
-    /**
-     * @return A copy of this rotation with the pitch clamped and the yaw normalized
-     */
-    public Rotation normalizeAndClamp() {
-        return new Rotation(
-                RotationUtils.normalizeYaw(this.yaw),
-                RotationUtils.clampPitch(this.pitch)
-        );
-    }
-}

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

@@ -1,241 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.utils;
-
-import net.minecraft.block.BlockFire;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.Minecraft;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.math.*;
-
-import java.util.Optional;
-
-/**
- * @author Brady
- * @since 9/25/2018
- */
-public final class RotationUtils {
-
-    private RotationUtils() {}
-
-    /**
-     * The {@link Minecraft} instance
-     */
-    private static final Minecraft mc = Minecraft.getMinecraft();
-
-    /**
-     * Constant that a degree value is multiplied by to get the equivalent radian value
-     */
-    public static final double DEG_TO_RAD = Math.PI / 180.0;
-
-    /**
-     * Constant that a radian value is multiplied by to get the equivalent degree value
-     */
-    public static final double RAD_TO_DEG = 180.0 / Math.PI;
-
-    /**
-     * Offsets from the root block position to the center of each side.
-     */
-    private static final Vec3d[] BLOCK_SIDE_MULTIPLIERS = new Vec3d[]{
-            new Vec3d(0.5, 0, 0.5), // Down
-            new Vec3d(0.5, 1, 0.5), // Up
-            new Vec3d(0.5, 0.5, 0), // North
-            new Vec3d(0.5, 0.5, 1), // South
-            new Vec3d(0, 0.5, 0.5), // West
-            new Vec3d(1, 0.5, 0.5)  // East
-    };
-
-    /**
-     * Clamps the specified pitch value between -90 and 90.
-     *
-     * @param pitch The input pitch
-     * @return The clamped pitch
-     */
-    public static float clampPitch(float pitch) {
-        return Math.max(-90, Math.min(90, pitch));
-    }
-
-    /**
-     * Normalizes the specified yaw value between -180 and 180.
-     *
-     * @param yaw The input yaw
-     * @return The normalized yaw
-     */
-    public static float normalizeYaw(float yaw) {
-        float newYaw = yaw % 360F;
-        if (newYaw < -180F) {
-            newYaw += 360F;
-        }
-        if (newYaw >= 180F) {
-            newYaw -= 360F;
-        }
-        return newYaw;
-    }
-
-    /**
-     * Calculates the rotation from BlockPos<sub>dest</sub> to BlockPos<sub>orig</sub>
-     *
-     * @param orig The origin position
-     * @param dest The destination position
-     * @return The rotation from the origin to the destination
-     */
-    public static Rotation calcRotationFromCoords(BlockPos orig, BlockPos dest) {
-        return calcRotationFromVec3d(new Vec3d(orig), new Vec3d(dest));
-    }
-
-    /**
-     * Wraps the target angles to a relative value from the current angles. This is done by
-     * subtracting the current from the target, normalizing it, and then adding the current
-     * angles back to it.
-     *
-     * @param current The current angles
-     * @param target  The target angles
-     * @return The wrapped angles
-     */
-    public static Rotation wrapAnglesToRelative(Rotation current, Rotation target) {
-        return target.subtract(current).normalize().add(current);
-    }
-
-    /**
-     * Calculates the rotation from Vec<sub>dest</sub> to Vec<sub>orig</sub> and makes the
-     * return value relative to the specified current rotations.
-     *
-     * @param orig    The origin position
-     * @param dest    The destination position
-     * @param current The current rotations
-     * @return The rotation from the origin to the destination
-     * @see #wrapAnglesToRelative(Rotation, Rotation)
-     */
-    public static Rotation calcRotationFromVec3d(Vec3d orig, Vec3d dest, Rotation current) {
-        return wrapAnglesToRelative(current, calcRotationFromVec3d(orig, dest));
-    }
-
-    /**
-     * Calculates the rotation from Vec<sub>dest</sub> to Vec<sub>orig</sub>
-     *
-     * @param orig The origin position
-     * @param dest The destination position
-     * @return The rotation from the origin to the destination
-     */
-    public static Rotation calcRotationFromVec3d(Vec3d orig, Vec3d dest) {
-        double[] delta = {orig.x - dest.x, orig.y - dest.y, orig.z - dest.z};
-        double yaw = MathHelper.atan2(delta[0], -delta[2]);
-        double dist = Math.sqrt(delta[0] * delta[0] + delta[2] * delta[2]);
-        double pitch = MathHelper.atan2(delta[1], dist);
-        return new Rotation(
-                (float) (yaw * RAD_TO_DEG),
-                (float) (pitch * RAD_TO_DEG)
-        );
-    }
-
-    /**
-     * Calculates the look vector for the specified yaw/pitch rotations.
-     *
-     * @param rotation The input rotation
-     * @return Look vector for the rotation
-     */
-    public static Vec3d calcVec3dFromRotation(Rotation rotation) {
-        float f = MathHelper.cos(-rotation.getYaw() * (float) DEG_TO_RAD - (float) Math.PI);
-        float f1 = MathHelper.sin(-rotation.getYaw() * (float) DEG_TO_RAD - (float) Math.PI);
-        float f2 = -MathHelper.cos(-rotation.getPitch() * (float) DEG_TO_RAD);
-        float f3 = MathHelper.sin(-rotation.getPitch() * (float) DEG_TO_RAD);
-        return new Vec3d((double) (f1 * f2), (double) f3, (double) (f * f2));
-    }
-
-    /**
-     * Determines if the specified entity is able to reach the center of any of the sides
-     * of the specified block. It first checks if the block center is reachable, and if so,
-     * that rotation will be returned. If not, it will return the first center of a given
-     * side that is reachable. The return type will be {@link Optional#empty()} if the entity is
-     * unable to reach any of the sides of the block.
-     *
-     * @param entity The viewing entity
-     * @param pos    The target block position
-     * @return The optional rotation
-     */
-    public static Optional<Rotation> reachable(Entity entity, BlockPos pos) {
-        if (pos.equals(RayTraceUtils.getSelectedBlock().orElse(null))) {
-            /*
-             * why add 0.0001?
-             * to indicate that we actually have a desired pitch
-             * the way we indicate that the pitch can be whatever and we only care about the yaw
-             * is by setting the desired pitch to the current pitch
-             * setting the desired pitch to the current pitch + 0.0001 means that we do have a desired pitch, it's
-             * just what it currently is
-             */
-            return Optional.of(new Rotation(entity.rotationYaw, entity.rotationPitch + 0.0001F));
-        }
-        Optional<Rotation> possibleRotation = reachableCenter(entity, pos);
-        //System.out.println("center: " + possibleRotation);
-        if (possibleRotation.isPresent()) {
-            return possibleRotation;
-        }
-
-        IBlockState state = mc.world.getBlockState(pos);
-        AxisAlignedBB aabb = state.getBoundingBox(entity.world, pos);
-        for (Vec3d sideOffset : BLOCK_SIDE_MULTIPLIERS) {
-            double xDiff = aabb.minX * sideOffset.x + aabb.maxX * (1 - sideOffset.x);
-            double yDiff = aabb.minY * sideOffset.y + aabb.maxY * (1 - sideOffset.y);
-            double zDiff = aabb.minZ * sideOffset.z + aabb.maxZ * (1 - sideOffset.z);
-            possibleRotation = reachableOffset(entity, pos, new Vec3d(pos).add(xDiff, yDiff, zDiff));
-            if (possibleRotation.isPresent()) {
-                return possibleRotation;
-            }
-        }
-        return Optional.empty();
-    }
-
-    /**
-     * Determines if the specified entity is able to reach the specified block with
-     * the given offsetted position. The return type will be {@link Optional#empty()} if
-     * the entity is unable to reach the block with the offset applied.
-     *
-     * @param entity    The viewing entity
-     * @param pos       The target block position
-     * @param offsetPos The position of the block with the offset applied.
-     * @return The optional rotation
-     */
-    public static Optional<Rotation> reachableOffset(Entity entity, BlockPos pos, Vec3d offsetPos) {
-        Rotation rotation = calcRotationFromVec3d(entity.getPositionEyes(1.0F), offsetPos);
-        RayTraceResult result = RayTraceUtils.rayTraceTowards(rotation);
-        //System.out.println(result);
-        if (result != null && result.typeOfHit == RayTraceResult.Type.BLOCK) {
-            if (result.getBlockPos().equals(pos)) {
-                return Optional.of(rotation);
-            }
-            if (entity.world.getBlockState(pos).getBlock() instanceof BlockFire) {
-                if (result.getBlockPos().equals(pos.down())) {
-                    return Optional.of(rotation);
-                }
-            }
-        }
-        return Optional.empty();
-    }
-
-    /**
-     * Determines if the specified entity is able to reach the specified block where it is
-     * looking at the direct center of it's hitbox.
-     *
-     * @param entity The viewing entity
-     * @param pos    The target block position
-     * @return The optional rotation
-     */
-    public static Optional<Rotation> reachableCenter(Entity entity, BlockPos pos) {
-        return reachableOffset(entity, pos, VecUtils.calculateBlockCenter(pos));
-    }
-}

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

@@ -1,141 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.utils;
-
-import baritone.api.Settings;
-import net.minecraft.client.Minecraft;
-import net.minecraft.item.Item;
-import net.minecraft.util.ResourceLocation;
-
-import java.awt.*;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-public class SettingsUtil {
-
-    private static final File settingsFile = new File(new File(Minecraft.getMinecraft().gameDir, "baritone"), "settings.txt");
-
-    private static final Map<Class<?>, SettingsIO> map;
-
-    public static void readAndApply(Settings settings) {
-        try (Scanner scan = new Scanner(settingsFile)) {
-            while (scan.hasNextLine()) {
-                String line = scan.nextLine();
-                if (line.isEmpty()) {
-                    continue;
-                }
-                if (line.startsWith("#") || line.startsWith("//")) {
-                    continue;
-                }
-                int space = line.indexOf(" ");
-                if (space == -1) {
-                    System.out.println("Skipping invalid line with no space: " + line);
-                    continue;
-                }
-                String settingName = line.substring(0, space).trim().toLowerCase();
-                String settingValue = line.substring(space).trim();
-                try {
-                    parseAndApply(settings, settingName, settingValue);
-                } catch (Exception ex) {
-                    ex.printStackTrace();
-                    System.out.println("Unable to parse line " + line);
-                }
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            System.out.println("Exception while reading Baritone settings, some settings may be reset to default values!");
-        }
-    }
-
-    public static synchronized void save(Settings settings) {
-        try (FileOutputStream out = new FileOutputStream(settingsFile)) {
-            for (Settings.Setting setting : settings.allSettings) {
-                if (setting.get() == null) {
-                    System.out.println("NULL SETTING?" + setting.getName());
-                    continue;
-                }
-                if (setting.getName().equals("logger")) {
-                    continue; // NO
-                }
-                if (setting.value == setting.defaultValue) {
-                    continue;
-                }
-                SettingsIO io = map.get(setting.getValueClass());
-                if (io == null) {
-                    throw new IllegalStateException("Missing " + setting.getValueClass() + " " + setting + " " + setting.getName());
-                }
-                out.write((setting.getName() + " " + io.toString.apply(setting.get()) + "\n").getBytes());
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            System.out.println("Exception while saving Baritone settings!");
-        }
-    }
-
-    private static void parseAndApply(Settings settings, String settingName, String settingValue) throws IllegalStateException, NumberFormatException {
-        Settings.Setting setting = settings.byLowerName.get(settingName);
-        if (setting == null) {
-            throw new IllegalStateException("No setting by that name");
-        }
-        Class intendedType = setting.getValueClass();
-        SettingsIO ioMethod = map.get(intendedType);
-        Object parsed = ioMethod.parser.apply(settingValue);
-        if (!intendedType.isInstance(parsed)) {
-            throw new IllegalStateException(ioMethod + " parser returned incorrect type, expected " + intendedType + " got " + parsed + " which is " + parsed.getClass());
-        }
-        setting.value = parsed;
-    }
-
-    private enum SettingsIO {
-        DOUBLE(Double.class, Double::parseDouble),
-        BOOLEAN(Boolean.class, Boolean::parseBoolean),
-        INTEGER(Integer.class, Integer::parseInt),
-        FLOAT(Float.class, Float::parseFloat),
-        LONG(Long.class, Long::parseLong),
-
-        ITEM_LIST(ArrayList.class, str -> Stream.of(str.split(",")).map(Item::getByNameOrId).collect(Collectors.toCollection(ArrayList::new)), list -> ((ArrayList<Item>) list).stream().map(Item.REGISTRY::getNameForObject).map(ResourceLocation::toString).collect(Collectors.joining(","))),
-        COLOR(Color.class, str -> new Color(Integer.parseInt(str.split(",")[0]), Integer.parseInt(str.split(",")[1]), Integer.parseInt(str.split(",")[2])), color -> color.getRed() + "," + color.getGreen() + "," + color.getBlue());
-
-
-        Class<?> klass;
-        Function<String, Object> parser;
-        Function<Object, String> toString;
-
-        <T> SettingsIO(Class<T> klass, Function<String, T> parser) {
-            this(klass, parser, Object::toString);
-        }
-
-        <T> SettingsIO(Class<T> klass, Function<String, T> parser, Function<T, String> toString) {
-            this.klass = klass;
-            this.parser = parser::apply;
-            this.toString = x -> toString.apply((T) x);
-        }
-    }
-
-    static {
-        HashMap<Class<?>, SettingsIO> tempMap = new HashMap<>();
-        for (SettingsIO type : SettingsIO.values()) {
-            tempMap.put(type.klass, type);
-        }
-        map = Collections.unmodifiableMap(tempMap);
-    }
-}

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

@@ -1,126 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.utils;
-
-import net.minecraft.block.BlockFire;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.Minecraft;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.math.AxisAlignedBB;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec3d;
-
-/**
- * @author Brady
- * @since 10/13/2018
- */
-public final class VecUtils {
-
-    private VecUtils() {}
-
-    /**
-     * The {@link Minecraft} instance
-     */
-    private static final Minecraft mc = Minecraft.getMinecraft();
-
-    /**
-     * Calculates the center of the block at the specified position's bounding box
-     *
-     * @see #getBlockPosCenter(BlockPos)
-     *
-     * @param pos The block position
-     * @return The center of the block's bounding box
-     */
-    public static Vec3d calculateBlockCenter(BlockPos pos) {
-        IBlockState b = mc.world.getBlockState(pos);
-        AxisAlignedBB bbox = b.getBoundingBox(mc.world, pos);
-        double xDiff = (bbox.minX + bbox.maxX) / 2;
-        double yDiff = (bbox.minY + bbox.maxY) / 2;
-        double zDiff = (bbox.minZ + bbox.maxZ) / 2;
-        if (b.getBlock() instanceof BlockFire) {//look at bottom of fire when putting it out
-            yDiff = 0;
-        }
-        return new Vec3d(
-                pos.getX() + xDiff,
-                pos.getY() + yDiff,
-                pos.getZ() + zDiff
-        );
-    }
-
-    /**
-     * Gets the assumed center position of the given block position.
-     * This is done by adding 0.5 to the X, Y, and Z axes.
-     * <p>
-     * TODO: We may want to consider replacing many usages of this method with #calculateBlockCenter(BlockPos)
-     *
-     * @see #calculateBlockCenter(BlockPos)
-     *
-     * @param pos The block position
-     * @return The assumed center of the position
-     */
-    public static Vec3d getBlockPosCenter(BlockPos pos) {
-        return new Vec3d(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
-    }
-
-    /**
-     * Gets the distance from the specified position to the assumed center of the specified block position.
-     *
-     * @see #getBlockPosCenter(BlockPos)
-     *
-     * @param pos The block position
-     * @param x The x pos
-     * @param y The y pos
-     * @param z The z pos
-     * @return The distance from the assumed block center to the position
-     */
-    public static double distanceToCenter(BlockPos pos, double x, double y, double z) {
-        Vec3d center = getBlockPosCenter(pos);
-        double xdiff = x - center.x;
-        double ydiff = y - center.y;
-        double zdiff = z - center.z;
-        return Math.sqrt(xdiff * xdiff + ydiff * ydiff + zdiff * zdiff);
-    }
-
-    /**
-     * Gets the distance from the specified entity's position to the assumed
-     * center of the specified block position.
-     *
-     * @see #getBlockPosCenter(BlockPos)
-     *
-     * @param entity The entity
-     * @param pos The block position
-     * @return The distance from the entity to the block's assumed center
-     */
-    public static double entityDistanceToCenter(Entity entity, BlockPos pos) {
-        return distanceToCenter(pos, entity.posX, entity.posY, entity.posZ);
-    }
-
-    /**
-     * Gets the distance from the specified entity's position to the assumed
-     * center of the specified block position, ignoring the Y axis.
-     *
-     * @see #getBlockPosCenter(BlockPos)
-     *
-     * @param entity The entity
-     * @param pos The block position
-     * @return The horizontal distance from the entity to the block's assumed center
-     */
-    public static double entityFlatDistanceToCenter(Entity entity, BlockPos pos) {
-        return distanceToCenter(pos, entity.posX, pos.getY() + 0.5, entity.posZ);
-    }
-}

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

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

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

@@ -1,55 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.launch;
-
-import io.github.impactdevelopment.simpletweaker.SimpleTweaker;
-import net.minecraft.launchwrapper.Launch;
-import net.minecraft.launchwrapper.LaunchClassLoader;
-import org.spongepowered.asm.launch.MixinBootstrap;
-import org.spongepowered.asm.mixin.MixinEnvironment;
-import org.spongepowered.asm.mixin.Mixins;
-import org.spongepowered.tools.obfuscation.mcp.ObfuscationServiceMCP;
-
-import java.util.List;
-
-/**
- * @author Brady
- * @since 7/31/2018 9:59 PM
- */
-public class BaritoneTweaker extends SimpleTweaker {
-
-    @Override
-    public void injectIntoClassLoader(LaunchClassLoader classLoader) {
-        super.injectIntoClassLoader(classLoader);
-
-        MixinBootstrap.init();
-
-        // noinspection unchecked
-        List<String> tweakClasses = (List<String>) Launch.blackboard.get("TweakClasses");
-
-        String obfuscation = ObfuscationServiceMCP.NOTCH;
-        if (tweakClasses.stream().anyMatch(s -> s.contains("net.minecraftforge.fml.common.launcher"))) {
-            obfuscation = ObfuscationServiceMCP.SEARGE;
-        }
-
-        MixinEnvironment.getDefaultEnvironment().setSide(MixinEnvironment.Side.CLIENT);
-        MixinEnvironment.getDefaultEnvironment().setObfuscationContext(obfuscation);
-
-        Mixins.addConfiguration("mixins.baritone.json");
-    }
-}

src/launch/java/baritone/launch/mixins/MixinAnvilChunkLoader.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.launch.mixins;
-
-import baritone.utils.accessor.IAnvilChunkLoader;
-import net.minecraft.world.chunk.storage.AnvilChunkLoader;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-import java.io.File;
-
-/**
- * @author Brady
- * @since 9/4/2018
- */
-@Mixin(AnvilChunkLoader.class)
-public class MixinAnvilChunkLoader implements IAnvilChunkLoader {
-
-    @Shadow @Final private File chunkSaveLocation;
-
-    @Override
-    public File getChunkSaveLocation() {
-        return this.chunkSaveLocation;
-    }
-}

src/launch/java/baritone/launch/mixins/MixinChunkProviderServer.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.launch.mixins;
-
-import baritone.utils.accessor.IChunkProviderServer;
-import net.minecraft.world.chunk.storage.IChunkLoader;
-import net.minecraft.world.gen.ChunkProviderServer;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-/**
- * @author Brady
- * @since 9/4/2018
- */
-@Mixin(ChunkProviderServer.class)
-public class MixinChunkProviderServer implements IChunkProviderServer {
-
-    @Shadow @Final private IChunkLoader chunkLoader;
-
-    @Override
-    public IChunkLoader getChunkLoader() {
-        return this.chunkLoader;
-    }
-}

src/launch/java/baritone/launch/mixins/MixinEntityLivingBase.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.launch.mixins;
-
-import baritone.Baritone;
-import baritone.api.event.events.RotationMoveEvent;
-import baritone.api.event.events.type.EventState;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.entity.EntityLivingBase;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-/**
- * @author Brady
- * @since 9/10/2018
- */
-@Mixin(EntityLivingBase.class)
-public class MixinEntityLivingBase {
-
-    @Inject(
-            method = "jump",
-            at = @At("HEAD")
-    )
-    private void preJump(CallbackInfo ci) {
-        EntityLivingBase _this = (EntityLivingBase) (Object) this;
-        if (EntityPlayerSP.class.isInstance(_this))
-            Baritone.INSTANCE.getGameEventHandler().onPlayerRotationMove(new RotationMoveEvent((EntityPlayerSP) _this, EventState.PRE, RotationMoveEvent.Type.JUMP));
-    }
-
-    @Inject(
-            method = "jump",
-            at = @At("RETURN")
-    )
-    private void postJump(CallbackInfo ci) {
-        EntityLivingBase _this = (EntityLivingBase) (Object) this;
-        if (EntityPlayerSP.class.isInstance(_this))
-            Baritone.INSTANCE.getGameEventHandler().onPlayerRotationMove(new RotationMoveEvent((EntityPlayerSP) _this, EventState.POST, RotationMoveEvent.Type.JUMP));
-    }
-}

src/main/java/baritone/Baritone.java

@@ -2,27 +2,28 @@
  * 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
+ * it under the terms of the GNU 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 package baritone;
 
-import baritone.api.BaritoneAPI;
-import baritone.api.Settings;
-import baritone.api.event.listener.IGameEventListener;
-import baritone.behavior.*;
+import baritone.behavior.Behavior;
+import baritone.behavior.impl.LookBehavior;
+import baritone.behavior.impl.MemoryBehavior;
+import baritone.behavior.impl.PathingBehavior;
+import baritone.behavior.impl.LocationTrackingBehavior;
 import baritone.event.GameEventHandler;
-import baritone.utils.BaritoneAutoTest;
+import baritone.map.Map;
 import baritone.utils.InputOverrideHandler;
 import net.minecraft.client.Minecraft;
 
@@ -31,10 +32,6 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.Executor;
-import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
 
 /**
  * @author Brady
@@ -57,40 +54,28 @@ public enum Baritone {
     private Settings settings;
     private List<Behavior> behaviors;
     private File dir;
-    private ThreadPoolExecutor threadPool;
 
     /**
      * Whether or not Baritone is active
      */
     private boolean active;
 
-    Baritone() {
-        this.gameEventHandler = new GameEventHandler();
-    }
-
     public synchronized void init() {
         if (initialized) {
             return;
         }
-        this.threadPool = new ThreadPoolExecutor(4, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS, new SynchronousQueue<>());
+        this.gameEventHandler = new GameEventHandler();
         this.inputOverrideHandler = new InputOverrideHandler();
-
-        // Acquire the "singleton" instance of the settings directly from the API
-        // We might want to change this...
-        this.settings = BaritoneAPI.getSettings();
-
+        this.settings = new Settings();
         this.behaviors = new ArrayList<>();
         {
             registerBehavior(PathingBehavior.INSTANCE);
             registerBehavior(LookBehavior.INSTANCE);
             registerBehavior(MemoryBehavior.INSTANCE);
+            registerBehavior(Map.INSTANCE);
             registerBehavior(LocationTrackingBehavior.INSTANCE);
-            registerBehavior(FollowBehavior.INSTANCE);
-            registerBehavior(MineBehavior.INSTANCE);
-        }
-        if (BaritoneAutoTest.ENABLE_AUTO_TEST) {
-            registerEventListener(BaritoneAutoTest.INSTANCE);
         }
+        
         this.dir = new File(Minecraft.getMinecraft().gameDir, "baritone");
         if (!Files.exists(dir.toPath())) {
             try {
@@ -102,40 +87,32 @@ public enum Baritone {
         this.initialized = true;
     }
 
-    public boolean isInitialized() {
+    public final boolean isInitialized() {
         return this.initialized;
     }
 
-    public IGameEventListener getGameEventHandler() {
+    public final GameEventHandler getGameEventHandler() {
         return this.gameEventHandler;
     }
 
-    public InputOverrideHandler getInputOverrideHandler() {
+    public final InputOverrideHandler getInputOverrideHandler() {
         return this.inputOverrideHandler;
     }
 
-    public List<Behavior> getBehaviors() {
+    public final List<Behavior> getBehaviors() {
         return this.behaviors;
     }
 
-    public Executor getExecutor() {
-        return threadPool;
-    }
-
     public void registerBehavior(Behavior behavior) {
         this.behaviors.add(behavior);
-        this.registerEventListener(behavior);
+        this.gameEventHandler.registerEventListener(behavior);
     }
 
-    public void registerEventListener(IGameEventListener listener) {
-        this.gameEventHandler.registerEventListener(listener);
-    }
-
-    public boolean isActive() {
+    public final boolean isActive() {
         return this.active;
     }
 
-    public Settings getSettings() {
+    public final Settings getSettings() {
         return this.settings;
     }
 
@@ -143,7 +120,7 @@ public enum Baritone {
         return Baritone.INSTANCE.settings; // yolo
     }
 
-    public File getDir() {
+    public final File getDir() {
         return this.dir;
     }
 }

src/main/java/baritone/BaritoneProvider.java

@@ -1,74 +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;
-
-import baritone.api.IBaritoneProvider;
-import baritone.api.behavior.*;
-import baritone.api.cache.IWorldProvider;
-import baritone.api.cache.IWorldScanner;
-import baritone.api.event.listener.IGameEventListener;
-import baritone.behavior.*;
-import baritone.cache.WorldProvider;
-import baritone.cache.WorldScanner;
-
-/**
- * @author Brady
- * @since 9/29/2018
- */
-public final class BaritoneProvider implements IBaritoneProvider {
-
-    @Override
-    public IFollowBehavior getFollowBehavior() {
-        return FollowBehavior.INSTANCE;
-    }
-
-    @Override
-    public ILookBehavior getLookBehavior() {
-        return LookBehavior.INSTANCE;
-    }
-
-    @Override
-    public IMemoryBehavior getMemoryBehavior() {
-        return MemoryBehavior.INSTANCE;
-    }
-
-    @Override
-    public IMineBehavior getMineBehavior() {
-        return MineBehavior.INSTANCE;
-    }
-
-    @Override
-    public IPathingBehavior getPathingBehavior() {
-        return PathingBehavior.INSTANCE;
-    }
-
-    @Override
-    public IWorldProvider getWorldProvider() {
-        return WorldProvider.INSTANCE;
-    }
-
-    @Override
-    public IWorldScanner getWorldScanner() {
-        return WorldScanner.INSTANCE;
-    }
-
-    @Override
-    public void registerEventListener(IGameEventListener listener) {
-        Baritone.INSTANCE.registerEventListener(listener);
-    }
-}

src/main/java/baritone/Settings.java

@@ -2,31 +2,26 @@
  * 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
+ * it under the terms of the GNU 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api;
+package baritone;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
-import net.minecraft.util.text.ITextComponent;
 
-import java.awt.*;
 import java.lang.reflect.Field;
 import java.util.*;
-import java.util.List;
-import java.util.function.Consumer;
 
 /**
  * Baritone's settings
@@ -34,7 +29,6 @@ import java.util.function.Consumer;
  * @author leijurv
  */
 public class Settings {
-
     /**
      * Allow Baritone to break blocks
      */
@@ -56,47 +50,20 @@ public class Settings {
      */
     public Setting<Double> blockPlacementPenalty = new Setting<>(20D);
 
-    /**
-     * This is just a tiebreaker to make it less likely to break blocks if it can avoid it.
-     * For example, fire has a break cost of 0, this makes it nonzero, so all else being equal
-     * it will take an otherwise equivalent route that doesn't require it to put out fire.
-     */
-    public Setting<Double> blockBreakAdditionalPenalty = new Setting<>(2D);
-
     /**
      * Allow Baritone to fall arbitrary distances and place a water bucket beneath it.
      * Reliability: questionable.
      */
     public Setting<Boolean> allowWaterBucketFall = new Setting<>(true);
 
-    /**
-     * Allow Baritone to assume it can walk on still water just like any other block.
-     * This functionality is assumed to be provided by a separate library that might have imported Baritone.
-     */
-    public Setting<Boolean> assumeWalkOnWater = new Setting<>(false);
-
-    /**
-     * Assume step functionality; don't jump on an Ascend.
-     */
-    public Setting<Boolean> assumeStep = new Setting<>(false);
-
-    /**
-     * Assume safe walk functionality; don't sneak on a backplace traverse.
-     * <p>
-     * Warning: if you do something janky like sneak-backplace from an ender chest, if this is true
-     * it won't sneak right click, it'll just right click, which means it'll open the chest instead of placing
-     * against it. That's why this defaults to off.
-     */
-    public Setting<Boolean> assumeSafeWalk = new Setting<>(false);
-
     /**
      * Blocks that Baritone is allowed to place (as throwaway, for sneak bridging, pillaring, etc.)
      */
-    public Setting<List<Item>> acceptableThrowawayItems = new Setting<>(new ArrayList<>(Arrays.asList(
+    public Setting<List<Item>> acceptableThrowawayItems = new Setting<>(Arrays.asList(
             Item.getItemFromBlock(Blocks.DIRT),
             Item.getItemFromBlock(Blocks.COBBLESTONE),
             Item.getItemFromBlock(Blocks.NETHERRACK)
-    )));
+    ));
 
     /**
      * Enables some more advanced vine features. They're honestly just gimmicks and won't ever be needed in real
@@ -104,29 +71,6 @@ public class Settings {
      */
     public Setting<Boolean> allowVines = new Setting<>(false);
 
-    /**
-     * Slab behavior is complicated, disable this for higher path reliability. Leave enabled if you have bottom slabs
-     * everywhere in your base.
-     */
-    public Setting<Boolean> allowWalkOnBottomSlab = new Setting<>(true);
-
-    /**
-     * You know what it is
-     * <p>
-     * But it's very unreliable and falls off when cornering like all the time so.
-     */
-    public Setting<Boolean> allowParkour = new Setting<>(false);
-
-    /**
-     * Like parkour, but even more unreliable!
-     */
-    public Setting<Boolean> allowParkourPlace = new Setting<>(false);
-
-    /**
-     * For example, if you have Mining Fatigue or Haste, adjust the costs of breaking blocks accordingly.
-     */
-    public Setting<Boolean> considerPotionEffects = new Setting<>(true);
-
     /**
      * This is the big A* setting.
      * As long as your cost heuristic is an *underestimate*, it's guaranteed to find you the best path.
@@ -142,7 +86,7 @@ public class Settings {
      * <p>
      * Finding the optimal path is worth it, so it's the default.
      */
-    public Setting<Double> costHeuristic = new Setting<>(3.5D);
+    public Setting<Double> costHeuristic = this.new <Double>Setting<Double>(3.5D);
 
     // a bunch of obscure internal A* settings that you probably don't want to change
     /**
@@ -152,11 +96,10 @@ public class Settings {
     public Setting<Integer> pathingMaxChunkBorderFetch = new Setting<>(50);
 
     /**
+     * See issue #18
      * Set to 1.0 to effectively disable this feature
-     *
-     * @see <a href="https://github.com/cabaletta/baritone/issues/18">Issue #18</a>
      */
-    public Setting<Double> backtrackCostFavoringCoefficient = new Setting<>(0.5);
+    public Setting<Double> backtrackCostFavoringCoefficient = new Setting<>(0.9);
 
     /**
      * Don't repropagate cost improvements below 0.01 ticks. They're all just floating point inaccuracies,
@@ -165,18 +108,16 @@ public class Settings {
     public Setting<Boolean> minimumImprovementRepropagation = new Setting<>(true);
 
     /**
-     * After calculating a path (potentially through cached chunks), artificially cut it off to just the part that is
-     * entirely within currently loaded chunks. Improves path safety because cached chunks are heavily simplified.
-     *
-     * @see <a href="https://github.com/cabaletta/baritone/issues/144">Issue #144</a>
+     * Use a pythagorean metric (as opposed to the more accurate hybrid diagonal / traverse).
+     * You probably don't want this. It roughly triples nodes considered for no real advantage.
      */
-    public Setting<Boolean> cutoffAtLoadBoundary = new Setting<>(false);
+    public Setting<Boolean> pythagoreanMetric = new Setting<>(false);
 
     /**
-     * If a movement's cost increases by more than this amount between calculation and execution (due to changes
-     * in the environment / world), cancel and recalculate
+     * After calculating a path (potentially through cached chunks), artificially cut it off to just the part that is
+     * entirely within currently loaded chunks. Improves path safety because cached chunks are heavily simplified.
      */
-    public Setting<Double> maxCostIncrease = new Setting<>(10D);
+    public Setting<Boolean> cutoffAtLoadBoundary = new Setting<>(true);
 
     /**
      * Stop 5 movements before anything that made the path COST_INF.
@@ -198,19 +139,7 @@ public class Settings {
     /**
      * Start planning the next path once the remaining movements tick estimates sum up to less than this value
      */
-    public Setting<Integer> planningTickLookAhead = new Setting<>(150);
-
-    /**
-     * Default size of the Long2ObjectOpenHashMap used in pathing
-     */
-    public Setting<Integer> pathingMapDefaultSize = new Setting<>(1024);
-
-    /**
-     * Load factor coefficient for the Long2ObjectOpenHashMap used in pathing
-     * <p>
-     * Decrease for faster map operations, but higher memory usage
-     */
-    public Setting<Float> pathingMapLoadFactor = new Setting<>(0.75f);
+    public Setting<Integer> planningTickLookAhead = new Setting<>(100);
 
     /**
      * How far are you allowed to fall onto solid ground (without a water bucket)?
@@ -249,12 +178,7 @@ public class Settings {
     /**
      * Pathing can never take longer than this
      */
-    public Setting<Long> pathTimeoutMS = new Setting<>(2000L);
-
-    /**
-     * Planning ahead while executing a segment can never take longer than this
-     */
-    public Setting<Long> planAheadTimeoutMS = new Setting<>(4000L);
+    public Setting<Number> pathTimeoutMS = new Setting<>(4000L);
 
     /**
      * For debugging, consider nodes much much slower
@@ -264,12 +188,12 @@ public class Settings {
     /**
      * Milliseconds between each node
      */
-    public Setting<Long> slowPathTimeDelayMS = new Setting<>(100L);
+    public Setting<Number> slowPathTimeDelayMS = new Setting<>(100L);
 
     /**
      * The alternative timeout number when slowPath is on
      */
-    public Setting<Long> slowPathTimeoutMS = new Setting<>(40000L);
+    public Setting<Number> slowPathTimeoutMS = new Setting<>(40000L);
 
     /**
      * The big one. Download all chunks in simplified 2-bit format and save them for better very-long-distance pathing.
@@ -287,11 +211,6 @@ public class Settings {
      */
     public Setting<Boolean> chatControl = new Setting<>(true);
 
-    /**
-     * A second override over chatControl to force it on
-     */
-    public Setting<Boolean> removePrefix = new Setting<>(false);
-
     /**
      * Render the path
      */
@@ -302,21 +221,6 @@ public class Settings {
      */
     public Setting<Boolean> renderGoal = new Setting<>(true);
 
-    /**
-     * Ignore depth when rendering the goal
-     */
-    public Setting<Boolean> renderGoalIgnoreDepth = new Setting<>(false);
-
-    /**
-     * Ignore depth when rendering the selection boxes (to break, to place, to walk into)
-     */
-    public Setting<Boolean> renderSelectionBoxesIgnoreDepth = new Setting<>(false);
-
-    /**
-     * Ignore depth when rendering the path
-     */
-    public Setting<Boolean> renderPathIgnoreDepth = new Setting<>(false);
-
     /**
      * Line width of the path when rendered, in pixels
      */
@@ -356,158 +260,11 @@ public class Settings {
      */
     public Setting<Boolean> prefix = new Setting<>(false);
 
-    /**
-     * {@code true}: can mine blocks when in inventory, chat, or tabbed away in ESC menu
-     * <p>
-     * {@code false}: works on cosmic prisons
-     * <p>
-     * LOL
-     */
-    public Setting<Boolean> leftClickWorkaround = new Setting<>(true);
-
-    /**
-     * Don't stop walking forward when you need to break blocks in your way
-     */
-    public Setting<Boolean> walkWhileBreaking = new Setting<>(true);
-
-    /**
-     * Rescan for the goal once every 5 ticks.
-     * Set to 0 to disable.
-     */
-    public Setting<Integer> mineGoalUpdateInterval = new Setting<>(5);
-
-    /**
-     * Cancel the current path if the goal has changed, and the path originally ended in the goal but doesn't anymore.
-     * <p>
-     * Currently only runs when either MineBehavior or FollowBehavior is active.
-     * <p>
-     * For example, if Baritone is doing "mine iron_ore", the instant it breaks the ore (and it becomes air), that location
-     * is no longer a goal. This means that if this setting is true, it will stop there. If this setting were off, it would
-     * continue with its path, and walk into that location. The tradeoff is if this setting is true, it mines ores much faster
-     * since it doesn't waste any time getting into locations that no longer contain ores, but on the other hand, it misses
-     * some drops, and continues on without ever picking them up.
-     * <p>
-     * Also on cosmic prisons this should be set to true since you don't actually mine the ore it just gets replaced with stone.
-     */
-    public Setting<Boolean> cancelOnGoalInvalidation = new Setting<>(false);
-
-    /**
-     * The "axis" command (aka GoalAxis) will go to a axis, or diagonal axis, at this Y level.
-     */
-    public Setting<Integer> axisHeight = new Setting<>(120);
-
-    /**
-     * When mining block of a certain type, try to mine two at once instead of one.
-     * If the block above is also a goal block, set GoalBlock instead of GoalTwoBlocks
-     * If the block below is also a goal block, set GoalBlock to the position one down instead of GoalTwoBlocks
-     */
-    public Setting<Boolean> forceInternalMining = new Setting<>(true);
-
-    /**
-     * Modification to the previous setting, only has effect if forceInternalMining is true
-     * If true, only apply the previous setting if the block adjacent to the goal isn't air.
-     */
-    public Setting<Boolean> internalMiningAirException = new Setting<>(true);
-
-    /**
-     * The actual GoalNear is set this distance away from the entity you're following
-     * <p>
-     * For example, set followOffsetDistance to 5 and followRadius to 0 to always stay precisely 5 blocks north of your follow target.
-     */
-    public Setting<Double> followOffsetDistance = new Setting<>(0D);
-
-    /**
-     * The actual GoalNear is set in this direction from the entity you're following
-     */
-    public Setting<Float> followOffsetDirection = new Setting<>(0F);
-
-    /**
-     * The radius (for the GoalNear) of how close to your target position you actually have to be
-     */
-    public Setting<Integer> followRadius = new Setting<>(3);
-
-    /**
-     * Cached chunks (regardless of if they're in RAM or saved to disk) expire and are deleted after this number of seconds
-     * -1 to disable
-     * <p>
-     * I would highly suggest leaving this setting disabled (-1).
-     * <p>
-     * The only valid reason I can think of enable this setting is if you are extremely low on disk space and you play on multiplayer,
-     * and can't take (average) 300kb saved for every 512x512 area. (note that more complicated terrain is less compressible and will take more space)
-     * <p>
-     * However, simply discarding old chunks because they are old is inadvisable. Baritone is extremely good at correcting
-     * itself and its paths as it learns new information, as new chunks load. There is no scenario in which having an
-     * incorrect cache can cause Baritone to get stuck, take damage, or perform any action it wouldn't otherwise, everything
-     * is rechecked once the real chunk is in range.
-     * <p>
-     * Having a robust cache greatly improves long distance pathfinding, as it's able to go around large scale obstacles
-     * before they're in render distance. In fact, when the chunkCaching setting is disabled and Baritone starts anew
-     * every time, or when you enter a completely new and very complicated area, it backtracks far more often because it
-     * has to build up that cache from scratch. But after it's gone through an area just once, the next time will have zero
-     * backtracking, since the entire area is now known and cached.
-     */
-    public Setting<Long> cachedChunksExpirySeconds = new Setting<>(-1L);
-
-    /**
-     * The function that is called when Baritone will log to chat. This function can be added to
-     * via {@link Consumer#andThen(Consumer)} or it can completely be overriden via setting
-     * {@link Setting#value};
-     */
-    public Setting<Consumer<ITextComponent>> logger = new Setting<>(Minecraft.getMinecraft().ingameGUI.getChatGUI()::printChatMessage);
-
-    /**
-     * The color of the current path
-     */
-    public Setting<Color> colorCurrentPath = new Setting<>(Color.RED);
-
-    /**
-     * The color of the next path
-     */
-    public Setting<Color> colorNextPath = new Setting<>(Color.MAGENTA);
-
-    /**
-     * The color of the blocks to break
-     */
-    public Setting<Color> colorBlocksToBreak = new Setting<>(Color.RED);
-
-    /**
-     * The color of the blocks to place
-     */
-    public Setting<Color> colorBlocksToPlace = new Setting<>(Color.GREEN);
-
-    /**
-     * The color of the blocks to walk into
-     */
-    public Setting<Color> colorBlocksToWalkInto = new Setting<>(Color.MAGENTA);
-
-    /**
-     * The color of the best path so far
-     */
-    public Setting<Color> colorBestPathSoFar = new Setting<>(Color.BLUE);
-
-    /**
-     * The color of the path to the most recent considered node
-     */
-    public Setting<Color> colorMostRecentConsidered = new Setting<>(Color.CYAN);
-
-    /**
-     * The color of the goal box
-     */
-    public Setting<Color> colorGoalBox = new Setting<>(Color.GREEN);
-
-    /**
-     * A map of lowercase setting field names to their respective setting
-     */
     public final Map<String, Setting<?>> byLowerName;
-
-    /**
-     * A list of all settings
-     */
     public final List<Setting<?>> allSettings;
 
     public class Setting<T> {
         public T value;
-        public final T defaultValue;
         private String name;
         private final Class<T> klass;
 
@@ -517,7 +274,6 @@ public class Settings {
                 throw new IllegalArgumentException("Cannot determine value type class from null");
             }
             this.value = value;
-            this.defaultValue = value;
             this.klass = (Class<T>) value.getClass();
         }
 
@@ -541,7 +297,7 @@ public class Settings {
 
     // here be dragons
 
-    Settings() {
+    {
         Field[] temp = getClass().getFields();
         HashMap<String, Setting<?>> tmpByName = new HashMap<>();
         List<Setting<?>> tmpAll = new ArrayList<>();
@@ -560,20 +316,22 @@ public class Settings {
                 }
             }
         } catch (IllegalAccessException e) {
-            throw new IllegalStateException(e);
+            throw new RuntimeException(e);
         }
         byLowerName = Collections.unmodifiableMap(tmpByName);
         allSettings = Collections.unmodifiableList(tmpAll);
     }
 
     @SuppressWarnings("unchecked")
-    public <T> List<Setting<T>> getAllValuesByType(Class<T> klass) {
+    public <T> List<Setting<T>> getByValueType(Class<T> klass) {
         List<Setting<T>> result = new ArrayList<>();
         for (Setting<?> setting : allSettings) {
-            if (setting.getValueClass().equals(klass)) {
+            if (setting.klass.equals(klass)) {
                 result.add((Setting<T>) setting);
             }
         }
         return result;
     }
+
+    Settings() { }
 }

src/main/java/baritone/behavior/Behavior.java

@@ -2,30 +2,32 @@
  * 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
+ * it under the terms of the GNU 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 package baritone.behavior;
 
-import baritone.api.behavior.IBehavior;
+import baritone.event.listener.AbstractGameEventListener;
+import baritone.utils.Helper;
+import baritone.utils.interfaces.Toggleable;
 
 /**
- * A type of game event listener that can be toggled.
+ * A generic bot behavior.
  *
  * @author Brady
  * @since 8/1/2018 6:29 PM
  */
-public class Behavior implements IBehavior {
+public class Behavior implements AbstractGameEventListener, Toggleable, Helper {
 
     /**
      * Whether or not this behavior is enabled
@@ -39,7 +41,7 @@ public class Behavior implements IBehavior {
      */
     @Override
     public final boolean toggle() {
-        return this.setEnabled(!this.isEnabled());
+        return this.setEnabled(!this.enabled);
     }
 
     /**
@@ -49,17 +51,34 @@ public class Behavior implements IBehavior {
      */
     @Override
     public final boolean setEnabled(boolean enabled) {
-        if (enabled == this.enabled) {
+        boolean newState = getNewState(this.enabled, enabled);
+        if (newState == this.enabled)
             return this.enabled;
-        }
-        if (this.enabled = enabled) {
-            this.onEnable();
+
+        if (this.enabled = newState) {
+            onStart();
         } else {
-            this.onDisable();
+            onCancel();
         }
+
         return this.enabled;
     }
 
+    /**
+     * Function to determine what the new enabled state of this
+     * {@link Behavior} should be given the old state, and the
+     * proposed state. Intended to be overridden by behaviors
+     * that should always be active, given that the bot itself is
+     * active.
+     *
+     * @param oldState      The old state
+     * @param proposedState The proposed state
+     * @return The new  state
+     */
+    public boolean getNewState(boolean oldState, boolean proposedState) {
+        return proposedState;
+    }
+
     /**
      * @return Whether or not this {@link Behavior} is active.
      */
@@ -67,4 +86,14 @@ public class Behavior implements IBehavior {
     public final boolean isEnabled() {
         return this.enabled;
     }
+
+    /**
+     * Called when the state changes from disabled to enabled
+     */
+    public void onStart() {}
+
+    /**
+     * Called when the state changes from enabled to disabled
+     */
+    public void onCancel() {}
 }

src/main/java/baritone/behavior/FollowBehavior.java

@@ -1,79 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.behavior;
-
-import baritone.Baritone;
-import baritone.api.behavior.IFollowBehavior;
-import baritone.api.event.events.TickEvent;
-import baritone.api.pathing.goals.GoalNear;
-import baritone.api.pathing.goals.GoalXZ;
-import baritone.utils.Helper;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.math.BlockPos;
-
-/**
- * Follow an entity
- *
- * @author leijurv
- */
-public final class FollowBehavior extends Behavior implements IFollowBehavior, Helper {
-
-    public static final FollowBehavior INSTANCE = new FollowBehavior();
-
-    private Entity following;
-
-    private FollowBehavior() {}
-
-    @Override
-    public void onTick(TickEvent event) {
-        if (event.getType() == TickEvent.Type.OUT) {
-            following = null;
-            return;
-        }
-        if (following == null) {
-            return;
-        }
-        // lol this is trashy but it works
-        BlockPos pos;
-        if (Baritone.settings().followOffsetDistance.get() == 0) {
-            pos = following.getPosition();
-        } else {
-            GoalXZ g = GoalXZ.fromDirection(following.getPositionVector(), Baritone.settings().followOffsetDirection.get(), Baritone.settings().followOffsetDistance.get());
-            pos = new BlockPos(g.getX(), following.posY, g.getZ());
-        }
-        PathingBehavior.INSTANCE.setGoal(new GoalNear(pos, Baritone.settings().followRadius.get()));
-        PathingBehavior.INSTANCE.revalidateGoal();
-        PathingBehavior.INSTANCE.path();
-    }
-
-    @Override
-    public void follow(Entity entity) {
-        this.following = entity;
-    }
-
-    @Override
-    public Entity following() {
-        return this.following;
-    }
-
-    @Override
-    public void cancel() {
-        PathingBehavior.INSTANCE.cancel();
-        follow(null);
-    }
-}

src/main/java/baritone/behavior/MemoryBehavior.java

@@ -1,225 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.behavior;
-
-import baritone.api.behavior.IMemoryBehavior;
-import baritone.api.behavior.memory.IRememberedInventory;
-import baritone.api.cache.IWorldData;
-import baritone.api.event.events.PacketEvent;
-import baritone.api.event.events.PlayerUpdateEvent;
-import baritone.api.event.events.type.EventState;
-import baritone.cache.WorldProvider;
-import baritone.utils.Helper;
-import net.minecraft.item.ItemStack;
-import net.minecraft.network.Packet;
-import net.minecraft.network.play.client.CPacketCloseWindow;
-import net.minecraft.network.play.client.CPacketPlayerTryUseItemOnBlock;
-import net.minecraft.network.play.server.SPacketCloseWindow;
-import net.minecraft.network.play.server.SPacketOpenWindow;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.tileentity.TileEntityLockable;
-import net.minecraft.util.math.BlockPos;
-
-import java.util.*;
-
-/**
- * @author Brady
- * @since 8/6/2018 9:47 PM
- */
-public final class MemoryBehavior extends Behavior implements IMemoryBehavior, Helper {
-
-    public static MemoryBehavior INSTANCE = new MemoryBehavior();
-
-    private final Map<IWorldData, WorldDataContainer> worldDataContainers = new HashMap<>();
-
-    private MemoryBehavior() {}
-
-    @Override
-    public synchronized void onPlayerUpdate(PlayerUpdateEvent event) {
-        if (event.getState() == EventState.PRE) {
-            updateInventory();
-        }
-    }
-
-    @Override
-    public synchronized void onSendPacket(PacketEvent event) {
-        Packet p = event.getPacket();
-
-        if (event.getState() == EventState.PRE) {
-            if (p instanceof CPacketPlayerTryUseItemOnBlock) {
-                CPacketPlayerTryUseItemOnBlock packet = event.cast();
-
-                TileEntity tileEntity = world().getTileEntity(packet.getPos());
-
-                // Ensure the TileEntity is a container of some sort
-                if (tileEntity instanceof TileEntityLockable) {
-
-                    TileEntityLockable lockable = (TileEntityLockable) tileEntity;
-                    int size = lockable.getSizeInventory();
-
-                    this.getCurrentContainer().futureInventories.add(new FutureInventory(System.nanoTime() / 1000000L, size, lockable.getGuiID(), tileEntity.getPos()));
-                }
-            }
-
-            if (p instanceof CPacketCloseWindow) {
-                updateInventory();
-            }
-        }
-    }
-
-    @Override
-    public synchronized void onReceivePacket(PacketEvent event) {
-        Packet p = event.getPacket();
-
-        if (event.getState() == EventState.PRE) {
-            if (p instanceof SPacketOpenWindow) {
-                SPacketOpenWindow packet = event.cast();
-
-                WorldDataContainer container = this.getCurrentContainer();
-
-                // Remove any entries that were created over a second ago, this should make up for INSANE latency
-                container.futureInventories.removeIf(i -> System.nanoTime() / 1000000L - i.time > 1000);
-
-                container.futureInventories.stream()
-                        .filter(i -> i.type.equals(packet.getGuiId()) && i.slots == packet.getSlotCount())
-                        .findFirst().ifPresent(matched -> {
-                    // Remove the future inventory
-                    container.futureInventories.remove(matched);
-
-                    // Setup the remembered inventory
-                    RememberedInventory inventory = container.rememberedInventories.computeIfAbsent(matched.pos, pos -> new RememberedInventory());
-                    inventory.windowId = packet.getWindowId();
-                    inventory.size = packet.getSlotCount();
-                });
-            }
-
-            if (p instanceof SPacketCloseWindow) {
-                updateInventory();
-            }
-        }
-    }
-
-    private Optional<RememberedInventory> getInventoryFromWindow(int windowId) {
-        return this.getCurrentContainer().rememberedInventories.values().stream().filter(i -> i.windowId == windowId).findFirst();
-    }
-
-    private void updateInventory() {
-        getInventoryFromWindow(player().openContainer.windowId).ifPresent(inventory -> {
-            inventory.items.clear();
-            inventory.items.addAll(player().openContainer.getInventory().subList(0, inventory.size));
-        });
-    }
-
-    private WorldDataContainer getCurrentContainer() {
-        return this.worldDataContainers.computeIfAbsent(WorldProvider.INSTANCE.getCurrentWorld(), data -> new WorldDataContainer());
-    }
-
-    @Override
-    public final synchronized RememberedInventory getInventoryByPos(BlockPos pos) {
-        return this.getCurrentContainer().rememberedInventories.get(pos);
-    }
-
-    @Override
-    public final synchronized Map<BlockPos, IRememberedInventory> getRememberedInventories() {
-        // make a copy since this map is modified from the packet thread
-        return new HashMap<>(this.getCurrentContainer().rememberedInventories);
-    }
-
-    private static final class WorldDataContainer {
-
-        /**
-         * Possible future inventories that we will be able to remember
-         */
-        private final List<FutureInventory> futureInventories = new ArrayList<>();
-
-        /**
-         * The current remembered inventories
-         */
-        private final Map<BlockPos, RememberedInventory> rememberedInventories = new HashMap<>();
-    }
-
-    /**
-     * An inventory that we are not yet fully aware of, but are expecting to exist at some point in the future.
-     */
-    private static final class FutureInventory {
-
-        /**
-         * The time that we initially expected the inventory to be provided, in milliseconds
-         */
-        private final long time;
-
-        /**
-         * The amount of slots in the inventory
-         */
-        private final int slots;
-
-        /**
-         * The type of inventory
-         */
-        private final String type;
-
-        /**
-         * The position of the inventory container
-         */
-        private final BlockPos pos;
-
-        private FutureInventory(long time, int slots, String type, BlockPos pos) {
-            this.time = time;
-            this.slots = slots;
-            this.type = type;
-            this.pos = pos;
-        }
-    }
-
-    /**
-     * An inventory that we are aware of.
-     * <p>
-     * Associated with a {@link BlockPos} in {@link WorldDataContainer#rememberedInventories}.
-     */
-    public static class RememberedInventory implements IRememberedInventory {
-
-        /**
-         * The list of items in the inventory
-         */
-        private final List<ItemStack> items;
-
-        /**
-         * The last known window ID of the inventory
-         */
-        private int windowId;
-
-        /**
-         * The size of the inventory
-         */
-        private int size;
-
-        private RememberedInventory() {
-            this.items = new ArrayList<>();
-        }
-
-        @Override
-        public final List<ItemStack> getContents() {
-            return Collections.unmodifiableList(this.items);
-        }
-
-        @Override
-        public final int getSize() {
-            return this.size;
-        }
-    }
-}

src/main/java/baritone/behavior/MineBehavior.java

@@ -1,200 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.behavior;
-
-import baritone.Baritone;
-import baritone.api.behavior.IMineBehavior;
-import baritone.api.event.events.TickEvent;
-import baritone.api.pathing.goals.Goal;
-import baritone.api.pathing.goals.GoalBlock;
-import baritone.api.pathing.goals.GoalComposite;
-import baritone.api.pathing.goals.GoalTwoBlocks;
-import baritone.cache.CachedChunk;
-import baritone.cache.ChunkPacker;
-import baritone.cache.WorldProvider;
-import baritone.cache.WorldScanner;
-import baritone.utils.BlockStateInterface;
-import baritone.utils.Helper;
-import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.chunk.EmptyChunk;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * Mine blocks of a certain type
- *
- * @author leijurv
- */
-public final class MineBehavior extends Behavior implements IMineBehavior, Helper {
-
-    public static final MineBehavior INSTANCE = new MineBehavior();
-
-    private List<Block> mining;
-    private List<BlockPos> locationsCache;
-    private int quantity;
-
-    private MineBehavior() {}
-
-    @Override
-    public void onTick(TickEvent event) {
-        if (event.getType() == TickEvent.Type.OUT) {
-            cancel();
-            return;
-        }
-        if (mining == null) {
-            return;
-        }
-        if (quantity > 0) {
-            Item item = mining.get(0).getItemDropped(mining.get(0).getDefaultState(), new Random(), 0);
-            int curr = player().inventory.mainInventory.stream().filter(stack -> item.equals(stack.getItem())).mapToInt(ItemStack::getCount).sum();
-            System.out.println("Currently have " + curr + " " + item);
-            if (curr >= quantity) {
-                logDirect("Have " + curr + " " + item.getItemStackDisplayName(new ItemStack(item, 1)));
-                cancel();
-                return;
-            }
-        }
-        int mineGoalUpdateInterval = Baritone.settings().mineGoalUpdateInterval.get();
-        if (mineGoalUpdateInterval != 0) {
-            if (event.getCount() % mineGoalUpdateInterval == 0) {
-                Baritone.INSTANCE.getExecutor().execute(this::rescan);
-            }
-        }
-        updateGoal();
-        PathingBehavior.INSTANCE.revalidateGoal();
-    }
-
-    private void updateGoal() {
-        if (mining == null) {
-            return;
-        }
-        List<BlockPos> locs = locationsCache;
-        if (!locs.isEmpty()) {
-            locs = prune(new ArrayList<>(locs), mining, 64);
-            PathingBehavior.INSTANCE.setGoal(coalesce(locs));
-            PathingBehavior.INSTANCE.path();
-            locationsCache = locs;
-        }
-    }
-
-    private void rescan() {
-        if (mining == null) {
-            return;
-        }
-        List<BlockPos> locs = scanFor(mining, 64);
-        if (locs.isEmpty()) {
-            logDebug("No locations for " + mining + " known, cancelling");
-            mine(0, (String[]) null);
-            return;
-        }
-        locationsCache = locs;
-    }
-
-    public Goal coalesce(BlockPos loc, List<BlockPos> locs) {
-        if (!Baritone.settings().forceInternalMining.get()) {
-            return new GoalTwoBlocks(loc);
-        }
-
-        boolean upwardGoal = locs.contains(loc.up()) || (Baritone.settings().internalMiningAirException.get() && BlockStateInterface.getBlock(loc.up()) == Blocks.AIR);
-        boolean downwardGoal = locs.contains(loc.down()) || (Baritone.settings().internalMiningAirException.get() && BlockStateInterface.getBlock(loc.up()) == Blocks.AIR);
-        if (upwardGoal) {
-            if (downwardGoal) {
-                return new GoalTwoBlocks(loc);
-            } else {
-                return new GoalBlock(loc);
-            }
-        } else {
-            if (downwardGoal) {
-                return new GoalBlock(loc.down());
-            } else {
-                return new GoalTwoBlocks(loc);
-            }
-        }
-    }
-
-    public GoalComposite coalesce(List<BlockPos> locs) {
-        return new GoalComposite(locs.stream().map(loc -> coalesce(loc, locs)).toArray(Goal[]::new));
-    }
-
-    public List<BlockPos> scanFor(List<Block> mining, int max) {
-        List<BlockPos> locs = new ArrayList<>();
-        List<Block> uninteresting = new ArrayList<>();
-        //long b = System.currentTimeMillis();
-        for (Block m : mining) {
-            if (CachedChunk.BLOCKS_TO_KEEP_TRACK_OF.contains(m)) {
-                locs.addAll(WorldProvider.INSTANCE.getCurrentWorld().getCachedWorld().getLocationsOf(ChunkPacker.blockToString(m), 1, 1));
-            } else {
-                uninteresting.add(m);
-            }
-        }
-        //System.out.println("Scan of cached chunks took " + (System.currentTimeMillis() - b) + "ms");
-        if (locs.isEmpty()) {
-            uninteresting = mining;
-        }
-        if (!uninteresting.isEmpty()) {
-            //long before = System.currentTimeMillis();
-            locs.addAll(WorldScanner.INSTANCE.scanChunkRadius(uninteresting, max, 10, 26));
-            //System.out.println("Scan of loaded chunks took " + (System.currentTimeMillis() - before) + "ms");
-        }
-        return prune(locs, mining, max);
-    }
-
-    public List<BlockPos> prune(List<BlockPos> locs, List<Block> mining, int max) {
-        BlockPos playerFeet = MineBehavior.INSTANCE.playerFeet();
-        locs.sort(Comparator.comparingDouble(playerFeet::distanceSq));
-
-        // remove any that are within loaded chunks that aren't actually what we want
-        locs.removeAll(locs.stream()
-                .filter(pos -> !(MineBehavior.INSTANCE.world().getChunk(pos) instanceof EmptyChunk))
-                .filter(pos -> !mining.contains(BlockStateInterface.get(pos).getBlock()))
-                .collect(Collectors.toList()));
-        if (locs.size() > max) {
-            return locs.subList(0, max);
-        }
-        return locs;
-    }
-
-    @Override
-    public void mine(int quantity, String... blocks) {
-        this.mining = blocks == null || blocks.length == 0 ? null : Arrays.stream(blocks).map(ChunkPacker::stringToBlock).collect(Collectors.toList());
-        this.quantity = quantity;
-        this.locationsCache = new ArrayList<>();
-        rescan();
-        updateGoal();
-    }
-
-    @Override
-    public void mine(int quantity, Block... blocks) {
-        this.mining = blocks == null || blocks.length == 0 ? null : Arrays.asList(blocks);
-        this.quantity = quantity;
-        this.locationsCache = new ArrayList<>();
-        rescan();
-        updateGoal();
-    }
-
-    @Override
-    public void cancel() {
-        mine(0, (String[]) null);
-        PathingBehavior.INSTANCE.cancel();
-    }
-}

src/main/java/baritone/behavior/impl/LocationTrackingBehavior.java

@@ -2,26 +2,26 @@
  * 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
+ * it under the terms of the GNU 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.behavior;
+package baritone.behavior.impl;
 
-import baritone.api.event.events.BlockInteractEvent;
-import baritone.cache.Waypoint;
-import baritone.cache.WorldProvider;
+import baritone.behavior.Behavior;
+import baritone.chunk.Waypoint;
+import baritone.chunk.WorldProvider;
+import baritone.event.events.BlockInteractEvent;
 import baritone.utils.BlockStateInterface;
-import baritone.utils.Helper;
 import net.minecraft.block.BlockBed;
 
 /**
@@ -33,7 +33,7 @@ import net.minecraft.block.BlockBed;
  * @author Brady
  * @since 8/22/2018
  */
-public final class LocationTrackingBehavior extends Behavior implements Helper {
+public final class LocationTrackingBehavior extends Behavior {
 
     public static final LocationTrackingBehavior INSTANCE = new LocationTrackingBehavior();
 
@@ -42,12 +42,12 @@ public final class LocationTrackingBehavior extends Behavior implements Helper {
     @Override
     public void onBlockInteract(BlockInteractEvent event) {
         if (event.getType() == BlockInteractEvent.Type.USE && BlockStateInterface.getBlock(event.getPos()) instanceof BlockBed) {
-            WorldProvider.INSTANCE.getCurrentWorld().getWaypoints().addWaypoint(new Waypoint("bed", Waypoint.Tag.BED, event.getPos()));
+            WorldProvider.INSTANCE.getCurrentWorld().waypoints.addWaypoint(new Waypoint("bed", Waypoint.Tag.BED, event.getPos()));
         }
     }
 
     @Override
     public void onPlayerDeath() {
-        WorldProvider.INSTANCE.getCurrentWorld().getWaypoints().addWaypoint(new Waypoint("death", Waypoint.Tag.DEATH, playerFeet()));
+        WorldProvider.INSTANCE.getCurrentWorld().waypoints.addWaypoint(new Waypoint("death", Waypoint.Tag.DEATH, playerFeet()));
     }
 }

src/main/java/baritone/behavior/impl/LookBehavior.java

@@ -2,33 +2,35 @@
  * 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
+ * it under the terms of the GNU 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.behavior;
+package baritone.behavior.impl;
 
 import baritone.Baritone;
-import baritone.api.Settings;
-import baritone.api.behavior.ILookBehavior;
-import baritone.api.event.events.PlayerUpdateEvent;
-import baritone.api.event.events.RotationMoveEvent;
-import baritone.api.utils.Rotation;
-import baritone.utils.Helper;
+import baritone.Settings;
+import baritone.behavior.Behavior;
+import baritone.event.events.PlayerUpdateEvent;
+import baritone.event.events.RelativeMoveEvent;
+import baritone.event.events.type.EventState;
+import baritone.utils.Rotation;
 
-public final class LookBehavior extends Behavior implements ILookBehavior, Helper {
+public class LookBehavior extends Behavior {
 
     public static final LookBehavior INSTANCE = new LookBehavior();
 
+    private LookBehavior() {}
+
     /**
      * Target's values are as follows:
      * <p>
@@ -49,9 +51,6 @@ public final class LookBehavior extends Behavior implements ILookBehavior, Helpe
      */
     private float lastYaw;
 
-    private LookBehavior() {}
-
-    @Override
     public void updateTarget(Rotation target, boolean force) {
         this.target = target;
         this.force = force || !Baritone.settings().freeLook.get();
@@ -59,9 +58,8 @@ public final class LookBehavior extends Behavior implements ILookBehavior, Helpe
 
     @Override
     public void onPlayerUpdate(PlayerUpdateEvent event) {
-        if (this.target == null) {
+        if (this.target == null)
             return;
-        }
 
         // Whether or not we're going to silently set our angles
         boolean silent = Baritone.settings().antiCheatCompatibility.get();
@@ -69,9 +67,9 @@ public final class LookBehavior extends Behavior implements ILookBehavior, Helpe
         switch (event.getState()) {
             case PRE: {
                 if (this.force) {
-                    player().rotationYaw = this.target.getYaw();
+                    player().rotationYaw = this.target.getFirst();
                     float oldPitch = player().rotationPitch;
-                    float desiredPitch = this.target.getPitch();
+                    float desiredPitch = this.target.getSecond();
                     player().rotationPitch = desiredPitch;
                     if (desiredPitch == oldPitch) {
                         nudgeToLevel();
@@ -79,7 +77,7 @@ public final class LookBehavior extends Behavior implements ILookBehavior, Helpe
                     this.target = null;
                 } else if (silent) {
                     this.lastYaw = player().rotationYaw;
-                    player().rotationYaw = this.target.getYaw();
+                    player().rotationYaw = this.target.getFirst();
                 }
                 break;
             }
@@ -90,29 +88,23 @@ public final class LookBehavior extends Behavior implements ILookBehavior, Helpe
                 }
                 break;
             }
-            default:
-                break;
         }
     }
 
     @Override
-    public void onPlayerRotationMove(RotationMoveEvent event) {
+    public void onPlayerRelativeMove(RelativeMoveEvent event) {
         if (this.target != null && !this.force) {
             switch (event.getState()) {
                 case PRE:
                     this.lastYaw = player().rotationYaw;
-                    player().rotationYaw = this.target.getYaw();
+                    player().rotationYaw = this.target.getFirst();
                     break;
                 case POST:
                     player().rotationYaw = this.lastYaw;
 
                     // If we have antiCheatCompatibility on, we're going to use the target value later in onPlayerUpdate()
-                    // Also the type has to be MOTION_UPDATE because that is called after JUMP
-                    if (!Baritone.settings().antiCheatCompatibility.get() && event.getType() == RotationMoveEvent.Type.MOTION_UPDATE) {
+                    if (!Baritone.settings().antiCheatCompatibility.get())
                         this.target = null;
-                    }
-                    break;
-                default:
                     break;
             }
         }

src/main/java/baritone/behavior/impl/LookBehaviorUtils.java

@@ -0,0 +1,148 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.behavior.impl;
+
+import baritone.utils.BlockStateInterface;
+import baritone.utils.Helper;
+import baritone.utils.Rotation;
+import baritone.utils.Utils;
+import net.minecraft.block.BlockFire;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.math.*;
+
+import java.util.Optional;
+
+import static baritone.utils.Utils.DEG_TO_RAD;
+
+public final class LookBehaviorUtils implements Helper {
+
+    /**
+     * Offsets from the root block position to the center of each side.
+     */
+    private static final Vec3d[] BLOCK_SIDE_MULTIPLIERS = new Vec3d[]{
+            new Vec3d(0.5, 0, 0.5), // Down
+            new Vec3d(0.5, 1, 0.5), // Up
+            new Vec3d(0.5, 0.5, 0), // North
+            new Vec3d(0.5, 0.5, 1), // South
+            new Vec3d(0, 0.5, 0.5), // West
+            new Vec3d(1, 0.5, 0.5)  // East
+    };
+
+    /**
+     * Calculates a vector given a rotation array
+     *
+     * @param rotation {@link LookBehavior#target}
+     * @return vector of the rotation
+     */
+    public static Vec3d calcVec3dFromRotation(Rotation rotation) {
+        float f = MathHelper.cos(-rotation.getFirst() * (float) DEG_TO_RAD - (float) Math.PI);
+        float f1 = MathHelper.sin(-rotation.getFirst() * (float) DEG_TO_RAD - (float) Math.PI);
+        float f2 = -MathHelper.cos(-rotation.getSecond() * (float) DEG_TO_RAD);
+        float f3 = MathHelper.sin(-rotation.getSecond() * (float) DEG_TO_RAD);
+        return new Vec3d((double) (f1 * f2), (double) f3, (double) (f * f2));
+    }
+
+    public static Optional<Rotation> reachable(BlockPos pos) {
+        if (pos.equals(getSelectedBlock().orElse(null))) {
+            /*
+             * why add 0.0001?
+             * to indicate that we actually have a desired pitch
+             * the way we indicate that the pitch can be whatever and we only care about the yaw
+             * is by setting the desired pitch to the current pitch
+             * setting the desired pitch to the current pitch + 0.0001 means that we do have a desired pitch, it's
+             * just what it currently is
+             */
+            return Optional.of(new Rotation(mc.player.rotationYaw, mc.player.rotationPitch + 0.0001f));
+        }
+        Optional<Rotation> possibleRotation = reachableCenter(pos);
+        System.out.println("center: " + possibleRotation);
+        if (possibleRotation.isPresent())
+            return possibleRotation;
+
+        IBlockState state = BlockStateInterface.get(pos);
+        AxisAlignedBB aabb = state.getBoundingBox(mc.world, pos);
+        for (Vec3d sideOffset : BLOCK_SIDE_MULTIPLIERS) {
+            double xDiff = aabb.minX * sideOffset.x + aabb.maxX * (1 - sideOffset.x);
+            double yDiff = aabb.minY * sideOffset.y + aabb.maxY * (1 - sideOffset.y);
+            double zDiff = aabb.minZ * sideOffset.z + aabb.maxZ * (1 - sideOffset.z);
+            possibleRotation = reachableOffset(pos, new Vec3d(pos).add(xDiff, yDiff, zDiff));
+            if (possibleRotation.isPresent())
+                return possibleRotation;
+        }
+        return Optional.empty();
+    }
+
+    private static RayTraceResult rayTraceTowards(Rotation rotation) {
+        double blockReachDistance = mc.playerController.getBlockReachDistance();
+        Vec3d start = mc.player.getPositionEyes(1.0F);
+        Vec3d direction = calcVec3dFromRotation(rotation);
+        Vec3d end = start.add(
+                direction.x * blockReachDistance,
+                direction.y * blockReachDistance,
+                direction.z * blockReachDistance
+        );
+        return mc.world.rayTraceBlocks(start, end, false, false, true);
+    }
+
+    /**
+     * Checks if coordinate is reachable with the given block-face rotation offset
+     *
+     * @param pos
+     * @param offsetPos
+     * @return
+     */
+    protected static Optional<Rotation> reachableOffset(BlockPos pos, Vec3d offsetPos) {
+        Rotation rotation = Utils.calcRotationFromVec3d(mc.player.getPositionEyes(1.0F), offsetPos);
+        RayTraceResult result = rayTraceTowards(rotation);
+        System.out.println(result);
+        if (result != null && result.typeOfHit == RayTraceResult.Type.BLOCK) {
+            if (result.getBlockPos().equals(pos)) {
+                return Optional.of(rotation);
+            }
+            if (BlockStateInterface.get(pos).getBlock() instanceof BlockFire) {
+                if (result.getBlockPos().equals(pos.down())) {
+                    return Optional.of(rotation);
+                }
+            }
+        }
+        return Optional.empty();
+    }
+
+    /**
+     * Checks if center of block at coordinate is reachable
+     *
+     * @param pos
+     * @return
+     */
+    protected static Optional<Rotation> reachableCenter(BlockPos pos) {
+        return reachableOffset(pos, Utils.calcCenterFromCoords(pos, mc.world));
+    }
+
+    /**
+     * The currently highlighted block.
+     * Updated once a tick by Minecraft.
+     *
+     * @return the position of the highlighted block
+     */
+    public static Optional<BlockPos> getSelectedBlock() {
+        if (mc.objectMouseOver != null && mc.objectMouseOver.typeOfHit == RayTraceResult.Type.BLOCK) {
+            return Optional.of(mc.objectMouseOver.getBlockPos());
+        }
+        return Optional.empty();
+    }
+}

src/main/java/baritone/behavior/impl/MemoryBehavior.java

@@ -0,0 +1,188 @@
+package baritone.behavior.impl;
+
+import baritone.behavior.Behavior;
+import baritone.event.events.PacketEvent;
+import baritone.event.events.PlayerUpdateEvent;
+import baritone.event.events.type.EventState;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.Packet;
+import net.minecraft.network.play.client.CPacketCloseWindow;
+import net.minecraft.network.play.client.CPacketPlayerTryUseItemOnBlock;
+import net.minecraft.network.play.server.SPacketCloseWindow;
+import net.minecraft.network.play.server.SPacketOpenWindow;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityLockable;
+import net.minecraft.util.math.BlockPos;
+
+import java.util.*;
+
+/**
+ * @author Brady
+ * @since 8/6/2018 9:47 PM
+ */
+public class MemoryBehavior extends Behavior {
+
+    public static MemoryBehavior INSTANCE = new MemoryBehavior();
+
+    private MemoryBehavior() {}
+
+    /**
+     * Possible future inventories that we will be able to remember
+     */
+    private final List<FutureInventory> futureInventories = new ArrayList<>();
+
+    /**
+     * The current remembered inventories
+     */
+    private final Map<BlockPos, RememberedInventory> rememberedInventories = new HashMap<>();
+
+    @Override
+    public void onPlayerUpdate(PlayerUpdateEvent event) {
+        if (event.getState() == EventState.PRE)
+            updateInventory();
+    }
+
+    @Override
+    public void onSendPacket(PacketEvent event) {
+        Packet p = event.getPacket();
+
+        switch (event.getState()) {
+            case PRE: {
+                if (p instanceof CPacketPlayerTryUseItemOnBlock) {
+                    CPacketPlayerTryUseItemOnBlock packet = event.cast();
+
+                    TileEntity tileEntity = world().getTileEntity(packet.getPos());
+
+                    // Ensure the TileEntity is a container of some sort
+                    if (tileEntity instanceof TileEntityLockable) {
+
+                        TileEntityLockable lockable = (TileEntityLockable) tileEntity;
+                        int size = lockable.getSizeInventory();
+
+                        this.futureInventories.add(new FutureInventory(System.currentTimeMillis(), size, lockable.getGuiID(), tileEntity.getPos()));
+                    }
+                }
+
+                if (p instanceof CPacketCloseWindow) {
+                    updateInventory();
+                }
+                break;
+            }
+        }
+    }
+
+    @Override
+    public void onReceivePacket(PacketEvent event) {
+        Packet p = event.getPacket();
+
+        switch (event.getState()) {
+            case PRE: {
+                if (p instanceof SPacketOpenWindow) {
+                    SPacketOpenWindow packet = event.cast();
+
+                    // Remove any entries that were created over a second ago, this should make up for INSANE latency
+                    this.futureInventories.removeIf(i -> System.currentTimeMillis() - i.time > 1000);
+
+                    this.futureInventories.stream()
+                            .filter(i -> i.type.equals(packet.getGuiId()) && i.slots == packet.getSlotCount())
+                            .findFirst().ifPresent(matched -> {
+                                // Remove the future inventory
+                                this.futureInventories.remove(matched);
+
+                                // Setup the remembered inventory
+                                RememberedInventory inventory = this.rememberedInventories.computeIfAbsent(matched.pos, pos -> new RememberedInventory());
+                                inventory.windowId = packet.getWindowId();
+                                inventory.size = packet.getSlotCount();
+                    });
+                }
+
+                if (p instanceof SPacketCloseWindow) {
+                    updateInventory();
+                }
+                break;
+            }
+        }
+    }
+
+    private Optional<RememberedInventory> getInventoryFromWindow(int windowId) {
+        return this.rememberedInventories.values().stream().filter(i -> i.windowId == windowId).findFirst();
+    }
+
+    private void updateInventory() {
+        getInventoryFromWindow(player().openContainer.windowId).ifPresent(inventory -> {
+            inventory.items.clear();
+            inventory.items.addAll(player().openContainer.getInventory().subList(0, inventory.size));
+        });
+    }
+
+    public final RememberedInventory getInventoryByPos(BlockPos pos) {
+        return this.rememberedInventories.get(pos);
+    }
+
+    /**
+     * An inventory that we are not yet fully aware of, but are expecting to exist at some point in the future.
+     */
+    private static final class FutureInventory {
+
+        /**
+         * The time that we initially expected the inventory to be provided, in milliseconds
+         */
+        private final long time;
+
+        /**
+         * The amount of slots in the inventory
+         */
+        private final int slots;
+
+        /**
+         * The type of inventory
+         */
+        private final String type;
+
+        /**
+         * The position of the inventory container
+         */
+        private final BlockPos pos;
+
+        private FutureInventory(long time, int slots, String type, BlockPos pos) {
+            this.time = time;
+            this.slots = slots;
+            this.type = type;
+            this.pos = pos;
+        }
+    }
+
+    /**
+     * An inventory that we are aware of.
+     * <p>
+     * Associated with a {@link BlockPos} in {@link MemoryBehavior#rememberedInventories}.
+     */
+    public static class RememberedInventory {
+
+        /**
+         * The list of items in the inventory
+         */
+        private final List<ItemStack> items;
+
+        /**
+         * The last known window ID of the inventory
+         */
+        private int windowId;
+
+        /**
+         * The size of the inventory
+         */
+        private int size;
+
+        private RememberedInventory() {
+            this.items = new ArrayList<>();
+        }
+
+        /**
+         * @return The list of items in the inventory
+         */
+        public final List<ItemStack> getItems() {
+            return this.items;
+        }
+    }
+}

src/main/java/baritone/behavior/impl/PathingBehavior.java

@@ -2,51 +2,52 @@
  * 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
+ * it under the terms of the GNU 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.behavior;
+package baritone.behavior.impl;
 
 import baritone.Baritone;
-import baritone.api.behavior.IPathingBehavior;
-import baritone.api.event.events.PathEvent;
-import baritone.api.event.events.PlayerUpdateEvent;
-import baritone.api.event.events.RenderEvent;
-import baritone.api.event.events.TickEvent;
-import baritone.api.pathing.calc.IPath;
-import baritone.api.pathing.calc.IPathFinder;
-import baritone.api.pathing.goals.Goal;
-import baritone.api.pathing.goals.GoalXZ;
-import baritone.api.utils.BetterBlockPos;
-import baritone.api.utils.interfaces.IGoalRenderPos;
+import baritone.behavior.Behavior;
+import baritone.event.events.PathEvent;
+import baritone.event.events.PlayerUpdateEvent;
+import baritone.event.events.RenderEvent;
+import baritone.event.events.TickEvent;
 import baritone.pathing.calc.AStarPathFinder;
 import baritone.pathing.calc.AbstractNodeCostSearch;
-import baritone.pathing.calc.CutoffPath;
-import baritone.pathing.movement.MovementHelper;
+import baritone.pathing.calc.IPathFinder;
+import baritone.pathing.goals.Goal;
+import baritone.pathing.goals.GoalBlock;
+import baritone.pathing.goals.GoalXZ;
+import baritone.pathing.path.IPath;
 import baritone.pathing.path.PathExecutor;
-import baritone.utils.BlockBreakHelper;
-import baritone.utils.Helper;
+import baritone.utils.BlockStateInterface;
 import baritone.utils.PathRenderer;
+import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.chunk.EmptyChunk;
 
-import java.util.*;
-import java.util.stream.Collectors;
+import java.awt.*;
+import java.util.Collections;
+import java.util.Optional;
 
-public final class PathingBehavior extends Behavior implements IPathingBehavior, Helper {
+public class PathingBehavior extends Behavior {
 
     public static final PathingBehavior INSTANCE = new PathingBehavior();
 
+    private PathingBehavior() {
+    }
+
     private PathExecutor current;
     private PathExecutor next;
 
@@ -59,10 +60,8 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
 
     private boolean lastAutoJump;
 
-    private PathingBehavior() {}
-
     private void dispatchPathEvent(PathEvent event) {
-        Baritone.INSTANCE.getExecutor().execute(() -> Baritone.INSTANCE.getGameEventHandler().onPathEvent(event));
+        new Thread(() -> Baritone.INSTANCE.getGameEventHandler().onPathEvent(event)).start();
     }
 
     @Override
@@ -71,7 +70,6 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
             this.cancel();
             return;
         }
-        mc.playerController.setPlayerCapabilities(mc.player);
         if (current == null) {
             return;
         }
@@ -80,14 +78,14 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
             if (current.failed() || current.finished()) {
                 current = null;
                 if (goal == null || goal.isInGoal(playerFeet())) {
-                    logDebug("All done. At " + goal);
+                    displayChatMessageRaw("All done. At " + goal);
                     dispatchPathEvent(PathEvent.AT_GOAL);
                     next = null;
                     return;
                 }
                 if (next != null && !next.getPath().positions().contains(playerFeet())) {
                     // if the current path failed, we may not actually be on the next one, so make sure
-                    logDebug("Discarding next path as it does not contain current position");
+                    displayChatMessageRaw("Discarding next path as it does not contain current position");
                     // for example if we had a nicely planned ahead path that starts where current ends
                     // that's all fine and good
                     // but if we fail in the middle of current
@@ -97,11 +95,10 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
                     next = null;
                 }
                 if (next != null) {
-                    logDebug("Continuing on to planned next path");
+                    displayChatMessageRaw("Continuing on to planned next path");
                     dispatchPathEvent(PathEvent.CONTINUING_ONTO_PLANNED_NEXT);
                     current = next;
                     next = null;
-                    current.onTick(event);
                     return;
                 }
                 // at this point, current just ended, but we aren't in the goal and have no plan for the future
@@ -120,13 +117,12 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
             if (safe) {
                 // a movement just ended
                 if (next != null) {
-                    if (next.snipsnapifpossible()) {
+                    if (next.getPath().positions().contains(playerFeet())) {
                         // jump directly onto the next path
-                        logDebug("Splicing into planned next path early...");
+                        displayChatMessageRaw("Splicing into planned next path early...");
                         dispatchPathEvent(PathEvent.SPLICING_ONTO_NEXT_EARLY);
                         current = next;
                         next = null;
-                        current.onTick(event);
                         return;
                     }
                 }
@@ -146,7 +142,7 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
                 }
                 if (ticksRemainingInSegment().get() < Baritone.settings().planningTickLookAhead.get()) {
                     // and this path has 5 seconds or less left
-                    logDebug("Path almost over. Planning ahead...");
+                    displayChatMessageRaw("Path almost over. Planning ahead...");
                     dispatchPathEvent(PathEvent.NEXT_SEGMENT_CALC_STARTED);
                     findPathInNewThread(current.getPath().getDest(), false, Optional.of(current.getPath()));
                 }
@@ -165,13 +161,10 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
                 case POST:
                     mc.gameSettings.autoJump = lastAutoJump;
                     break;
-                default:
-                    break;
             }
         }
     }
 
-    @Override
     public Optional<Double> ticksRemainingInSegment() {
         if (current == null) {
             return Optional.empty();
@@ -179,119 +172,52 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
         return Optional.of(current.getPath().ticksRemainingFrom(current.getPosition()));
     }
 
-    @Override
     public void setGoal(Goal goal) {
         this.goal = goal;
     }
 
-    @Override
     public Goal getGoal() {
         return goal;
     }
 
-    @Override
     public PathExecutor getCurrent() {
         return current;
     }
 
-    @Override
     public PathExecutor getNext() {
         return next;
     }
 
-    @Override
-    public Optional<IPathFinder> getPathFinder() {
-        return Optional.ofNullable(AbstractNodeCostSearch.currentlyRunning());
+    public Optional<IPath> getPath() {
+        return Optional.ofNullable(current).map(PathExecutor::getPath);
     }
 
-    @Override
-    public boolean isPathing() {
-        return this.current != null;
-    }
-
-    @Override
     public void cancel() {
-        dispatchPathEvent(PathEvent.CANCELED);
         current = null;
         next = null;
         Baritone.INSTANCE.getInputOverrideHandler().clearAllKeys();
-        AbstractNodeCostSearch.getCurrentlyRunning().ifPresent(AbstractNodeCostSearch::cancel);
-        BlockBreakHelper.stopBreakingBlock();
     }
 
-    public void forceCancel() { // NOT exposed on public api
-        isPathCalcInProgress = false;
-    }
-
-    /**
-     * Start calculating a path if we aren't already
-     *
-     * @return true if this call started path calculation, false if it was already calculating or executing a path
-     */
-    @Override
-    public boolean path() {
-        if (goal == null) {
-            return false;
-        }
-        if (goal.isInGoal(playerFeet())) {
-            return false;
-        }
+    public void path() {
         synchronized (pathPlanLock) {
             if (current != null) {
-                return false;
+                displayChatMessageRaw("Currently executing a path. Please cancel it first.");
+                return;
             }
             synchronized (pathCalcLock) {
                 if (isPathCalcInProgress) {
-                    return false;
+                    return;
                 }
                 dispatchPathEvent(PathEvent.CALC_STARTED);
                 findPathInNewThread(pathStart(), true, Optional.empty());
-                return true;
             }
         }
     }
 
-    /**
-     * See issue #209
-     *
-     * @return The starting {@link BlockPos} for a new path
-     */
     public BlockPos pathStart() {
-        BetterBlockPos feet = playerFeet();
-        if (!MovementHelper.canWalkOn(feet.down())) {
-            if (player().onGround) {
-                double playerX = player().posX;
-                double playerZ = player().posZ;
-                ArrayList<BetterBlockPos> closest = new ArrayList<>();
-                for (int dx = -1; dx <= 1; dx++) {
-                    for (int dz = -1; dz <= 1; dz++) {
-                        closest.add(new BetterBlockPos(feet.x + dx, feet.y, feet.z + dz));
-                    }
-                }
-                closest.sort(Comparator.comparingDouble(pos -> ((pos.x + 0.5D) - playerX) * ((pos.x + 0.5D) - playerX) + ((pos.z + 0.5D) - playerZ) * ((pos.z + 0.5D) - playerZ)));
-                for (int i = 0; i < 4; i++) {
-                    BetterBlockPos possibleSupport = closest.get(i);
-                    double xDist = Math.abs((possibleSupport.x + 0.5D) - playerX);
-                    double zDist = Math.abs((possibleSupport.z + 0.5D) - playerZ);
-                    if (xDist > 0.8 && zDist > 0.8) {
-                        // can't possibly be sneaking off of this one, we're too far away
-                        continue;
-                    }
-                    if (MovementHelper.canWalkOn(possibleSupport.down()) && MovementHelper.canWalkThrough(possibleSupport) && MovementHelper.canWalkThrough(possibleSupport.up())) {
-                        // this is plausible
-                        logDebug("Faking path start assuming player is standing off the edge of a block");
-                        return possibleSupport;
-                    }
-                }
-
-            } else {
-                // !onGround
-                // we're in the middle of a jump
-                if (MovementHelper.canWalkOn(feet.down().down())) {
-                    logDebug("Faking path start assuming player is midair and falling");
-                    return feet.down();
-                }
-            }
+        BlockPos feet = playerFeet();
+        if (BlockStateInterface.get(feet.down()).getBlock().equals(Blocks.AIR)) {
+            return feet.down();
         }
         return feet;
     }
@@ -309,37 +235,16 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
             }
             isPathCalcInProgress = true;
         }
-        Baritone.INSTANCE.getExecutor().execute(() -> {
+        new Thread(() -> {
             if (talkAboutIt) {
-                logDebug("Starting to search for path from " + start + " to " + goal);
+                displayChatMessageRaw("Starting to search for path from " + start + " to " + goal);
             }
 
             Optional<IPath> path = findPath(start, previous);
             if (Baritone.settings().cutoffAtLoadBoundary.get()) {
-                path = path.map(p -> {
-                    IPath result = p.cutoffAtLoadedChunks();
-
-                    if (result instanceof CutoffPath) {
-                        logDebug("Cutting off path at edge of loaded chunks");
-                        logDebug("Length decreased by " + (p.length() - result.length()));
-                    } else {
-                        logDebug("Path ends within loaded chunks");
-                    }
-
-                    return result;
-                });
+                path = path.map(IPath::cutoffAtLoadedChunks);
             }
-
-            Optional<PathExecutor> executor = path.map(p -> {
-                IPath result = p.staticCutoff(goal);
-
-                if (result instanceof CutoffPath) {
-                    logDebug("Static cutoff " + p.length() + " to " + result.length());
-                }
-
-                return result;
-            }).map(PathExecutor::new);
-
+            Optional<PathExecutor> executor = path.map(p -> p.staticCutoff(goal)).map(PathExecutor::new);
             synchronized (pathPlanLock) {
                 if (current == null) {
                     if (executor.isPresent()) {
@@ -364,16 +269,16 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
 
             if (talkAboutIt && current != null && current.getPath() != null) {
                 if (goal == null || goal.isInGoal(current.getPath().getDest())) {
-                    logDebug("Finished finding a path from " + start + " to " + goal + ". " + current.getPath().getNumNodesConsidered() + " nodes considered");
+                    displayChatMessageRaw("Finished finding a path from " + start + " to " + goal + ". " + current.getPath().getNumNodesConsidered() + " nodes considered");
                 } else {
-                    logDebug("Found path segment from " + start + " towards " + goal + ". " + current.getPath().getNumNodesConsidered() + " nodes considered");
+                    displayChatMessageRaw("Found path segment from " + start + " towards " + goal + ". " + current.getPath().getNumNodesConsidered() + " nodes considered");
 
                 }
             }
             synchronized (pathCalcLock) {
                 isPathCalcInProgress = false;
             }
-        });
+        }).start();
     }
 
     /**
@@ -385,67 +290,77 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
     private Optional<IPath> findPath(BlockPos start, Optional<IPath> previous) {
         Goal goal = this.goal;
         if (goal == null) {
-            logDebug("no goal");
+            displayChatMessageRaw("no goal");
             return Optional.empty();
         }
-        if (Baritone.settings().simplifyUnloadedYCoord.get()) {
-            BlockPos pos = null;
-            if (goal instanceof IGoalRenderPos) {
-                pos = ((IGoalRenderPos) goal).getGoalPos();
-            }
-
-            if (pos != null && world().getChunk(pos) instanceof EmptyChunk) {
-                logDebug("Simplifying " + goal.getClass() + " to GoalXZ due to distance");
+        if (Baritone.settings().simplifyUnloadedYCoord.get() && goal instanceof GoalBlock) {
+            BlockPos pos = ((GoalBlock) goal).getGoalPos();
+            if (world().getChunk(pos) instanceof EmptyChunk) {
+                displayChatMessageRaw("Simplifying GoalBlock to GoalXZ due to distance");
                 goal = new GoalXZ(pos.getX(), pos.getZ());
             }
         }
-        long timeout;
-        if (current == null) {
-            timeout = Baritone.settings().pathTimeoutMS.<Long>get();
-        } else {
-            timeout = Baritone.settings().planAheadTimeoutMS.<Long>get();
-        }
-        Optional<HashSet<Long>> favoredPositions;
-        if (Baritone.settings().backtrackCostFavoringCoefficient.get() == 1D) {
-            favoredPositions = Optional.empty();
-        } else {
-            favoredPositions = previous.map(IPath::positions).map(Collection::stream).map(x -> x.map(BetterBlockPos::longHash)).map(x -> x.collect(Collectors.toList())).map(HashSet::new); // <-- okay this is EPIC
-        }
         try {
-            IPathFinder pf = new AStarPathFinder(start.getX(), start.getY(), start.getZ(), goal, favoredPositions);
-            return pf.calculate(timeout);
+            IPathFinder pf = new AStarPathFinder(start, goal, previous.map(IPath::positions));
+            return pf.calculate();
         } catch (Exception e) {
-            logDebug("Pathing exception: " + e);
+            displayChatMessageRaw("Exception: " + e);
             e.printStackTrace();
             return Optional.empty();
         }
     }
 
-    public void revalidateGoal() {
-        if (!Baritone.settings().cancelOnGoalInvalidation.get()) {
-            return;
-        }
-        synchronized (pathPlanLock) {
-            if (current == null || goal == null) {
-                return;
-            }
-            Goal intended = current.getPath().getGoal();
-            BlockPos end = current.getPath().getDest();
-            if (intended.isInGoal(end) && !goal.isInGoal(end)) {
-                // this path used to end in the goal
-                // but the goal has changed, so there's no reason to continue...
-                cancel();
-            }
-        }
-    }
-
     @Override
     public void onRenderPass(RenderEvent event) {
-        PathRenderer.render(event, this);
-    }
+        // System.out.println("Render passing");
+        // System.out.println(event.getPartialTicks());
+        float partialTicks = event.getPartialTicks();
+        if (goal != null && Baritone.settings().renderGoal.value) {
+            PathRenderer.drawLitDankGoalBox(player(), goal, partialTicks, Color.GREEN);
+        }
+        if (!Baritone.settings().renderPath.get()) {
+            return;
+        }
+
+        long start = System.nanoTime();
+
+
+        PathExecutor current = this.current; // this should prevent most race conditions?
+        PathExecutor next = this.next; // like, now it's not possible for current!=null to be true, then suddenly false because of another thread
+        // TODO is this enough, or do we need to acquire a lock here?
+        // TODO benchmark synchronized in render loop
+
+        // Render the current path, if there is one
+        if (current != null && current.getPath() != null) {
+            int renderBegin = Math.max(current.getPosition() - 3, 0);
+            PathRenderer.drawPath(current.getPath(), renderBegin, player(), partialTicks, Color.RED, Baritone.settings().fadePath.get(), 10, 20);
+        }
+        if (next != null && next.getPath() != null) {
+            PathRenderer.drawPath(next.getPath(), 0, player(), partialTicks, Color.MAGENTA, Baritone.settings().fadePath.get(), 10, 20);
+        }
+
+        long split = System.nanoTime();
+        if (current != null) {
+            PathRenderer.drawManySelectionBoxes(player(), current.toBreak(), partialTicks, Color.RED);
+            PathRenderer.drawManySelectionBoxes(player(), current.toPlace(), partialTicks, Color.GREEN);
+            PathRenderer.drawManySelectionBoxes(player(), current.toWalkInto(), partialTicks, Color.MAGENTA);
+        }
+
+        // If there is a path calculation currently running, render the path calculation process
+        AbstractNodeCostSearch.getCurrentlyRunning().ifPresent(currentlyRunning -> {
+            currentlyRunning.bestPathSoFar().ifPresent(p -> {
+                PathRenderer.drawPath(p, 0, player(), partialTicks, Color.BLUE, Baritone.settings().fadePath.get(), 10, 20);
+                currentlyRunning.pathToMostRecentNodeConsidered().ifPresent(mr -> {
+
+                    PathRenderer.drawPath(mr, 0, player(), partialTicks, Color.CYAN, Baritone.settings().fadePath.get(), 10, 20);
+                    PathRenderer.drawManySelectionBoxes(player(), Collections.singletonList(mr.getDest()), partialTicks, Color.CYAN);
+                });
+            });
+        });
+        long end = System.nanoTime();
+        //System.out.println((end - split) + " " + (split - start));
+        // if (end - start > 0)
+        //   System.out.println("Frame took " + (split - start) + " " + (end - split));
 
-    @Override
-    public void onDisable() {
-        Baritone.INSTANCE.getInputOverrideHandler().clearAllKeys();
     }
 }

src/main/java/baritone/cache/ChunkPacker.java

@@ -1,170 +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.cache;
-
-import baritone.pathing.movement.MovementHelper;
-import baritone.utils.Helper;
-import baritone.utils.pathing.PathingBlockType;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockDoublePlant;
-import net.minecraft.block.BlockFlower;
-import net.minecraft.block.BlockTallGrass;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.init.Blocks;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.chunk.BlockStateContainer;
-import net.minecraft.world.chunk.Chunk;
-import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
-
-import java.util.*;
-
-/**
- * @author Brady
- * @since 8/3/2018 1:09 AM
- */
-public final class ChunkPacker implements Helper {
-
-    private ChunkPacker() {}
-
-    public static CachedChunk pack(Chunk chunk) {
-        //long start = System.nanoTime() / 1000000L;
-
-        Map<String, List<BlockPos>> specialBlocks = new HashMap<>();
-        BitSet bitSet = new BitSet(CachedChunk.SIZE);
-        try {
-            ExtendedBlockStorage[] chunkInternalStorageArray = chunk.getBlockStorageArray();
-            for (int y0 = 0; y0 < 16; y0++) {
-                ExtendedBlockStorage extendedblockstorage = chunkInternalStorageArray[y0];
-                if (extendedblockstorage == null) {
-                    // any 16x16x16 area that's all air will have null storage
-                    // for example, in an ocean biome, with air from y=64 to y=256
-                    // the first 4 extended blocks storages will be full
-                    // and the remaining 12 will be null
-
-                    // since the index into the bitset is calculated from the x y and z
-                    // and doesn't function as an append, we can entirely skip the scanning
-                    // since a bitset is initialized to all zero, and air is saved as zeros
-                    continue;
-                }
-                BlockStateContainer bsc = extendedblockstorage.getData();
-                int yReal = y0 << 4;
-                // the mapping of BlockStateContainer.getIndex from xyz to index is y << 8 | z << 4 | x;
-                // for better cache locality, iterate in that order
-                for (int y1 = 0; y1 < 16; y1++) {
-                    int y = y1 | yReal;
-                    for (int z = 0; z < 16; z++) {
-                        for (int x = 0; x < 16; x++) {
-                            int index = CachedChunk.getPositionIndex(x, y, z);
-                            IBlockState state = bsc.get(x, y1, z);
-                            boolean[] bits = getPathingBlockType(state).getBits();
-                            bitSet.set(index, bits[0]);
-                            bitSet.set(index + 1, bits[1]);
-                            Block block = state.getBlock();
-                            if (CachedChunk.BLOCKS_TO_KEEP_TRACK_OF.contains(block)) {
-                                String name = blockToString(block);
-                                specialBlocks.computeIfAbsent(name, b -> new ArrayList<>()).add(new BlockPos(x, y, z));
-                            }
-                        }
-                    }
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        //long end = System.nanoTime() / 1000000L;
-        //System.out.println("Chunk packing took " + (end - start) + "ms for " + chunk.x + "," + chunk.z);
-        IBlockState[] blocks = new IBlockState[256];
-
-        for (int z = 0; z < 16; z++) {
-            // @formatter:off
-            https://www.ibm.com/developerworks/library/j-perry-writing-good-java-code/index.html
-            // @formatter:on
-            for (int x = 0; x < 16; x++) {
-                for (int y = 255; y >= 0; y--) {
-                    int index = CachedChunk.getPositionIndex(x, y, z);
-                    if (bitSet.get(index) || bitSet.get(index + 1)) {
-                        blocks[z << 4 | x] = chunk.getBlockState(x, y, z);
-                        continue https;
-                    }
-                }
-                blocks[z << 4 | x] = Blocks.AIR.getDefaultState();
-            }
-        }
-        return new CachedChunk(chunk.x, chunk.z, bitSet, blocks, specialBlocks, System.currentTimeMillis());
-    }
-
-    public static String blockToString(Block block) {
-        ResourceLocation loc = Block.REGISTRY.getNameForObject(block);
-        String name = loc.getPath(); // normally, only write the part after the minecraft:
-        if (!loc.getNamespace().equals("minecraft")) {
-            // Baritone is running on top of forge with mods installed, perhaps?
-            name = loc.toString(); // include the namespace with the colon
-        }
-        return name;
-    }
-
-    public static Block stringToBlock(String name) {
-        return Block.getBlockFromName(name.contains(":") ? name : "minecraft:" + name);
-    }
-
-    private static PathingBlockType getPathingBlockType(IBlockState state) {
-        Block block = state.getBlock();
-        if (block.equals(Blocks.WATER)) {
-            // only water source blocks are plausibly usable, flowing water should be avoid
-            return PathingBlockType.WATER;
-        }
-
-        if (MovementHelper.avoidWalkingInto(block) || block == Blocks.FLOWING_WATER || MovementHelper.isBottomSlab(state)) {
-            return PathingBlockType.AVOID;
-        }
-        // We used to do an AABB check here
-        // however, this failed in the nether when you were near a nether fortress
-        // because fences check their adjacent blocks in the world for their fence connection status to determine AABB shape
-        // this caused a nullpointerexception when we saved chunks on unload, because they were unable to check their neighbors
-        if (block == Blocks.AIR || block instanceof BlockTallGrass || block instanceof BlockDoublePlant || block instanceof BlockFlower) {
-            return PathingBlockType.AIR;
-        }
-
-        return PathingBlockType.SOLID;
-    }
-
-    public static IBlockState pathingTypeToBlock(PathingBlockType type) {
-        switch (type) {
-            case AIR:
-                return Blocks.AIR.getDefaultState();
-            case WATER:
-                return Blocks.WATER.getDefaultState();
-            case AVOID:
-                return Blocks.LAVA.getDefaultState();
-            case SOLID:
-                // Dimension solid types
-                switch (mc.player.dimension) {
-                    case -1:
-                        return Blocks.NETHERRACK.getDefaultState();
-                    case 0:
-                    default: // The fallback solid type
-                        return Blocks.STONE.getDefaultState();
-                    case 1:
-                        return Blocks.END_STONE.getDefaultState();
-                }
-            default:
-                return null;
-        }
-    }
-}

src/main/java/baritone/cache/WorldScanner.java

@@ -1,110 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.cache;
-
-import baritone.api.cache.IWorldScanner;
-import baritone.utils.Helper;
-import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.multiplayer.ChunkProviderClient;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.chunk.BlockStateContainer;
-import net.minecraft.world.chunk.Chunk;
-import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
-
-import java.util.LinkedList;
-import java.util.List;
-
-public enum WorldScanner implements IWorldScanner, Helper {
-
-    INSTANCE;
-
-    @Override
-    public List<BlockPos> scanChunkRadius(List<Block> blocks, int max, int yLevelThreshold, int maxSearchRadius) {
-        if (blocks.contains(null)) {
-            throw new IllegalStateException("Invalid block name should have been caught earlier: " + blocks.toString());
-        }
-        LinkedList<BlockPos> res = new LinkedList<>();
-        if (blocks.isEmpty()) {
-            return res;
-        }
-        ChunkProviderClient chunkProvider = world().getChunkProvider();
-
-        int maxSearchRadiusSq = maxSearchRadius * maxSearchRadius;
-        int playerChunkX = playerFeet().getX() >> 4;
-        int playerChunkZ = playerFeet().getZ() >> 4;
-        int playerY = playerFeet().getY();
-
-        int searchRadiusSq = 0;
-        boolean foundWithinY = false;
-        while (true) {
-            boolean allUnloaded = true;
-            boolean foundChunks = false;
-            for (int xoff = -searchRadiusSq; xoff <= searchRadiusSq; xoff++) {
-                for (int zoff = -searchRadiusSq; zoff <= searchRadiusSq; zoff++) {
-                    int distance = xoff * xoff + zoff * zoff;
-                    if (distance != searchRadiusSq) {
-                        continue;
-                    }
-                    foundChunks = true;
-                    int chunkX = xoff + playerChunkX;
-                    int chunkZ = zoff + playerChunkZ;
-                    Chunk chunk = chunkProvider.getLoadedChunk(chunkX, chunkZ);
-                    if (chunk == null) {
-                        continue;
-                    }
-                    allUnloaded = false;
-                    ExtendedBlockStorage[] chunkInternalStorageArray = chunk.getBlockStorageArray();
-                    chunkX = chunkX << 4;
-                    chunkZ = chunkZ << 4;
-                    for (int y0 = 0; y0 < 16; y0++) {
-                        ExtendedBlockStorage extendedblockstorage = chunkInternalStorageArray[y0];
-                        if (extendedblockstorage == null) {
-                            continue;
-                        }
-                        int yReal = y0 << 4;
-                        BlockStateContainer bsc = extendedblockstorage.getData();
-                        // the mapping of BlockStateContainer.getIndex from xyz to index is y << 8 | z << 4 | x;
-                        // for better cache locality, iterate in that order
-                        for (int y = 0; y < 16; y++) {
-                            for (int z = 0; z < 16; z++) {
-                                for (int x = 0; x < 16; x++) {
-                                    IBlockState state = bsc.get(x, y, z);
-                                    if (blocks.contains(state.getBlock())) {
-                                        int yy = yReal | y;
-                                        res.add(new BlockPos(chunkX | x, yy, chunkZ | z));
-                                        if (Math.abs(yy - playerY) < yLevelThreshold) {
-                                            foundWithinY = true;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            if ((allUnloaded && foundChunks)
-                    || (res.size() >= max
-                    && (searchRadiusSq > maxSearchRadiusSq || (searchRadiusSq > 1 && foundWithinY)))
-            ) {
-                return res;
-            }
-            searchRadiusSq++;
-        }
-    }
-}

src/main/java/baritone/chunk/CachedChunk.java

@@ -2,23 +2,22 @@
  * 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
+ * it under the terms of the GNU 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.cache;
+package baritone.chunk;
 
-import baritone.api.cache.IBlockTypeAccess;
-import baritone.utils.Helper;
+import baritone.utils.pathing.IBlockTypeAccess;
 import baritone.utils.pathing.PathingBlockType;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
@@ -31,7 +30,7 @@ import java.util.*;
  * @author Brady
  * @since 8/3/2018 1:04 AM
  */
-public final class CachedChunk implements IBlockTypeAccess, Helper {
+public final class CachedChunk implements IBlockTypeAccess {
 
     public static final Set<Block> BLOCKS_TO_KEEP_TRACK_OF = Collections.unmodifiableSet(new HashSet<Block>() {{
         add(Blocks.DIAMOND_ORE);
@@ -64,8 +63,6 @@ public final class CachedChunk implements IBlockTypeAccess, Helper {
         add(Blocks.DRAGON_EGG);
         add(Blocks.JUKEBOX);
         add(Blocks.END_GATEWAY);
-        add(Blocks.WEB);
-        add(Blocks.NETHER_WART);
     }});
 
     /**
@@ -100,15 +97,13 @@ public final class CachedChunk implements IBlockTypeAccess, Helper {
     /**
      * The block names of each surface level block for generating an overview
      */
-    private final IBlockState[] overview;
+    private final String[] overview;
 
     private final int[] heightMap;
 
     private final Map<String, List<BlockPos>> specialBlockLocations;
 
-    public final long cacheTimestamp;
-
-    CachedChunk(int x, int z, BitSet data, IBlockState[] overview, Map<String, List<BlockPos>> specialBlockLocations, long cacheTimestamp) {
+    CachedChunk(int x, int z, BitSet data, String[] overview, Map<String, List<BlockPos>> specialBlockLocations) {
         validateSize(data);
 
         this.x = x;
@@ -117,7 +112,6 @@ public final class CachedChunk implements IBlockTypeAccess, Helper {
         this.overview = overview;
         this.heightMap = new int[256];
         this.specialBlockLocations = specialBlockLocations;
-        this.cacheTimestamp = cacheTimestamp;
         calculateHeightMap();
     }
 
@@ -126,16 +120,11 @@ public final class CachedChunk implements IBlockTypeAccess, Helper {
         int internalPos = z << 4 | x;
         if (heightMap[internalPos] == y) {
             // we have this exact block, it's a surface block
-            /*System.out.println("Saying that " + x + "," + y + "," + z + " is " + state);
-            if (!Minecraft.getMinecraft().world.getBlockState(new BlockPos(x + this.x * 16, y, z + this.z * 16)).getBlock().equals(state.getBlock())) {
-                throw new IllegalStateException("failed " + Minecraft.getMinecraft().world.getBlockState(new BlockPos(x + this.x * 16, y, z + this.z * 16)).getBlock() + " " + state.getBlock() + " " + (x + this.x * 16) + " " + y + " " + (z + this.z * 16));
-            }*/
-            return overview[internalPos];
+            IBlockState state = ChunkPacker.stringToBlock(overview[internalPos]).getDefaultState();
+            //System.out.println("Saying that " + x + "," + y + "," + z + " is " + state);
+            return state;
         }
         PathingBlockType type = getType(x, y, z);
-        if (type == PathingBlockType.SOLID && y == 127 && mc.player.dimension == -1) {
-            return Blocks.BEDROCK.getDefaultState();
-        }
         return ChunkPacker.pathingTypeToBlock(type);
     }
 
@@ -150,8 +139,7 @@ public final class CachedChunk implements IBlockTypeAccess, Helper {
                 int index = z << 4 | x;
                 heightMap[index] = 0;
                 for (int y = 256; y >= 0; y--) {
-                    int i = getPositionIndex(x, y, z);
-                    if (data.get(i) || data.get(i + 1)) {
+                    if (getType(x, y, z) != PathingBlockType.AIR) {
                         heightMap[index] = y;
                         break;
                     }
@@ -160,7 +148,7 @@ public final class CachedChunk implements IBlockTypeAccess, Helper {
         }
     }
 
-    public final IBlockState[] getOverview() {
+    public final String[] getOverview() {
         return overview;
     }
 
@@ -195,7 +183,7 @@ public final class CachedChunk implements IBlockTypeAccess, Helper {
      * @return The bit index
      */
     public static int getPositionIndex(int x, int y, int z) {
-        return (x << 1) | (z << 5) | (y << 9);
+        return (x + (z << 4) + (y << 8)) * 2;
     }
 
     /**
@@ -207,8 +195,7 @@ public final class CachedChunk implements IBlockTypeAccess, Helper {
      * @throws IllegalArgumentException if the bitset size exceeds the maximum size
      */
     private static void validateSize(BitSet data) {
-        if (data.size() > SIZE) {
+        if (data.size() > SIZE)
             throw new IllegalArgumentException("BitSet of invalid length provided");
-        }
     }
 }

src/main/java/baritone/chunk/CachedRegion.java

@@ -2,23 +2,22 @@
  * 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
+ * it under the terms of the GNU 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.cache;
+package baritone.chunk;
 
-import baritone.Baritone;
-import baritone.api.cache.ICachedRegion;
+import baritone.utils.pathing.IBlockTypeAccess;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.util.math.BlockPos;
 
@@ -34,8 +33,7 @@ import java.util.zip.GZIPOutputStream;
  * @author Brady
  * @since 8/3/2018 9:35 PM
  */
-public final class CachedRegion implements ICachedRegion {
-
+public final class CachedRegion implements IBlockTypeAccess {
     private static final byte CHUNK_NOT_PRESENT = 0;
     private static final byte CHUNK_PRESENT = 1;
 
@@ -79,11 +77,6 @@ public final class CachedRegion implements ICachedRegion {
         return null;
     }
 
-    @Override
-    public final boolean isCached(int x, int z) {
-        return chunks[x >> 4][z >> 4] != null;
-    }
-
     public final LinkedList<BlockPos> getLocationsOf(String block) {
         LinkedList<BlockPos> res = new LinkedList<>();
         for (int chunkX = 0; chunkX < 32; chunkX++) {
@@ -103,7 +96,7 @@ public final class CachedRegion implements ICachedRegion {
         return res;
     }
 
-    public final synchronized void updateCachedChunk(int chunkX, int chunkZ, CachedChunk chunk) {
+    final synchronized void updateCachedChunk(int chunkX, int chunkZ, CachedChunk chunk) {
         this.chunks[chunkX][chunkZ] = chunk;
         hasUnsavedChanges = true;
     }
@@ -113,26 +106,23 @@ public final class CachedRegion implements ICachedRegion {
         if (!hasUnsavedChanges) {
             return;
         }
-        removeExpired();
         try {
             Path path = Paths.get(directory);
-            if (!Files.exists(path)) {
+            if (!Files.exists(path))
                 Files.createDirectories(path);
 
-            }
             System.out.println("Saving region " + x + "," + z + " to disk " + path);
             Path regionFile = getRegionFile(path, this.x, this.z);
-            if (!Files.exists(regionFile)) {
+            if (!Files.exists(regionFile))
                 Files.createFile(regionFile);
-            }
             try (
                     FileOutputStream fileOut = new FileOutputStream(regionFile.toFile());
-                    GZIPOutputStream gzipOut = new GZIPOutputStream(fileOut, 16384);
-                    DataOutputStream out = new DataOutputStream(gzipOut)
+                    GZIPOutputStream gzipOut = new GZIPOutputStream(fileOut);
+                    DataOutputStream out = new DataOutputStream(gzipOut);
             ) {
                 out.writeInt(CACHED_REGION_MAGIC);
-                for (int x = 0; x < 32; x++) {
-                    for (int z = 0; z < 32; z++) {
+                for (int z = 0; z < 32; z++) {
+                    for (int x = 0; x < 32; x++) {
                         CachedChunk chunk = this.chunks[x][z];
                         if (chunk == null) {
                             out.write(CHUNK_NOT_PRESENT);
@@ -145,17 +135,17 @@ public final class CachedRegion implements ICachedRegion {
                         }
                     }
                 }
-                for (int x = 0; x < 32; x++) {
-                    for (int z = 0; z < 32; z++) {
+                for (int z = 0; z < 32; z++) {
+                    for (int x = 0; x < 32; x++) {
                         if (chunks[x][z] != null) {
                             for (int i = 0; i < 256; i++) {
-                                out.writeUTF(ChunkPacker.blockToString(chunks[x][z].getOverview()[i].getBlock()));
+                                out.writeUTF(chunks[x][z].getOverview()[i]);
                             }
                         }
                     }
                 }
-                for (int x = 0; x < 32; x++) {
-                    for (int z = 0; z < 32; z++) {
+                for (int z = 0; z < 32; z++) {
+                    for (int x = 0; x < 32; x++) {
                         if (chunks[x][z] != null) {
                             Map<String, List<BlockPos>> locs = chunks[x][z].getRelativeBlocks();
                             out.writeShort(locs.entrySet().size());
@@ -170,17 +160,10 @@ public final class CachedRegion implements ICachedRegion {
                         }
                     }
                 }
-                for (int x = 0; x < 32; x++) {
-                    for (int z = 0; z < 32; z++) {
-                        if (chunks[x][z] != null) {
-                            out.writeLong(chunks[x][z].cacheTimestamp);
-                        }
-                    }
-                }
             }
             hasUnsavedChanges = false;
             System.out.println("Saved region successfully");
-        } catch (Exception ex) {
+        } catch (IOException ex) {
             ex.printStackTrace();
         }
     }
@@ -188,22 +171,20 @@ public final class CachedRegion implements ICachedRegion {
     public synchronized void load(String directory) {
         try {
             Path path = Paths.get(directory);
-            if (!Files.exists(path)) {
+            if (!Files.exists(path))
                 Files.createDirectories(path);
-            }
 
             Path regionFile = getRegionFile(path, this.x, this.z);
-            if (!Files.exists(regionFile)) {
+            if (!Files.exists(regionFile))
                 return;
-            }
 
             System.out.println("Loading region " + x + "," + z + " from disk " + path);
-            long start = System.nanoTime() / 1000000L;
+            long start = System.currentTimeMillis();
 
             try (
                     FileInputStream fileIn = new FileInputStream(regionFile.toFile());
-                    GZIPInputStream gzipIn = new GZIPInputStream(fileIn, 32768);
-                    DataInputStream in = new DataInputStream(gzipIn)
+                    GZIPInputStream gzipIn = new GZIPInputStream(fileIn);
+                    DataInputStream in = new DataInputStream(gzipIn);
             ) {
                 int magic = in.readInt();
                 if (magic != CACHED_REGION_MAGIC) {
@@ -212,42 +193,42 @@ public final class CachedRegion implements ICachedRegion {
                     // by switching on the magic value, and either loading it normally, or loading through a converter.
                     throw new IOException("Bad magic value " + magic);
                 }
-                boolean[][] present = new boolean[32][32];
-                BitSet[][] bitSets = new BitSet[32][32];
+                CachedChunk[][] tmpCached = new CachedChunk[32][32];
                 Map<String, List<BlockPos>>[][] location = new Map[32][32];
-                IBlockState[][][] overview = new IBlockState[32][32][];
-                long[][] cacheTimestamp = new long[32][32];
-                for (int x = 0; x < 32; x++) {
-                    for (int z = 0; z < 32; z++) {
+                for (int z = 0; z < 32; z++) {
+                    for (int x = 0; x < 32; x++) {
                         int isChunkPresent = in.read();
                         switch (isChunkPresent) {
                             case CHUNK_PRESENT:
                                 byte[] bytes = new byte[CachedChunk.SIZE_IN_BYTES];
                                 in.readFully(bytes);
-                                bitSets[x][z] = BitSet.valueOf(bytes);
                                 location[x][z] = new HashMap<>();
-                                overview[x][z] = new IBlockState[256];
-                                present[x][z] = true;
+                                int regionX = this.x;
+                                int regionZ = this.z;
+                                int chunkX = x + 32 * regionX;
+                                int chunkZ = z + 32 * regionZ;
+                                tmpCached[x][z] = new CachedChunk(chunkX, chunkZ, BitSet.valueOf(bytes), new String[256], location[x][z]);
                                 break;
                             case CHUNK_NOT_PRESENT:
+                                tmpCached[x][z] = null;
                                 break;
                             default:
                                 throw new IOException("Malformed stream");
                         }
                     }
                 }
-                for (int x = 0; x < 32; x++) {
-                    for (int z = 0; z < 32; z++) {
-                        if (present[x][z]) {
+                for (int z = 0; z < 32; z++) {
+                    for (int x = 0; x < 32; x++) {
+                        if (tmpCached[x][z] != null) {
                             for (int i = 0; i < 256; i++) {
-                                overview[x][z][i] = ChunkPacker.stringToBlock(in.readUTF()).getDefaultState();
+                                tmpCached[x][z].getOverview()[i] = in.readUTF();
                             }
                         }
                     }
                 }
-                for (int x = 0; x < 32; x++) {
-                    for (int z = 0; z < 32; z++) {
-                        if (present[x][z]) {
+                for (int z = 0; z < 32; z++) {
+                    for (int x = 0; x < 32; x++) {
+                        if (tmpCached[x][z] != null) {
                             // 16 * 16 * 256 = 65536 so a short is enough
                             // ^ haha jokes on leijurv, java doesn't have unsigned types so that isn't correct
                             //   also why would you have more than 32767 special blocks in a chunk
@@ -273,71 +254,24 @@ public final class CachedRegion implements ICachedRegion {
                         }
                     }
                 }
-                for (int x = 0; x < 32; x++) {
-                    for (int z = 0; z < 32; z++) {
-                        if (present[x][z]) {
-                            cacheTimestamp[x][z] = in.readLong();
-                        }
-                    }
-                }
                 // only if the entire file was uncorrupted do we actually set the chunks
                 for (int x = 0; x < 32; x++) {
                     for (int z = 0; z < 32; z++) {
-                        if (present[x][z]) {
-                            int regionX = this.x;
-                            int regionZ = this.z;
-                            int chunkX = x + 32 * regionX;
-                            int chunkZ = z + 32 * regionZ;
-                            this.chunks[x][z] = new CachedChunk(chunkX, chunkZ, bitSets[x][z], overview[x][z], location[x][z], cacheTimestamp[x][z]);
-                        }
+                        this.chunks[x][z] = tmpCached[x][z];
                     }
                 }
             }
-            removeExpired();
             hasUnsavedChanges = false;
-            long end = System.nanoTime() / 1000000L;
+            long end = System.currentTimeMillis();
             System.out.println("Loaded region successfully in " + (end - start) + "ms");
-        } catch (Exception ex) { // corrupted files can cause NullPointerExceptions as well as IOExceptions
+        } catch (IOException ex) {
             ex.printStackTrace();
         }
     }
 
-    public synchronized final void removeExpired() {
-        long expiry = Baritone.settings().cachedChunksExpirySeconds.get();
-        if (expiry < 0) {
-            return;
-        }
-        long now = System.currentTimeMillis();
-        long oldestAcceptableAge = now - expiry * 1000L;
-        for (int x = 0; x < 32; x++) {
-            for (int z = 0; z < 32; z++) {
-                if (this.chunks[x][z] != null && this.chunks[x][z].cacheTimestamp < oldestAcceptableAge) {
-                    System.out.println("Removing chunk " + (x + 32 * this.x) + "," + (z + 32 * this.z) + " because it was cached " + (now - this.chunks[x][z].cacheTimestamp) / 1000L + " seconds ago, and max age is " + expiry);
-                    this.chunks[x][z] = null;
-                }
-            }
-        }
-    }
-
-    public synchronized final CachedChunk mostRecentlyModified() {
-        CachedChunk recent = null;
-        for (int x = 0; x < 32; x++) {
-            for (int z = 0; z < 32; z++) {
-                if (this.chunks[x][z] == null) {
-                    continue;
-                }
-                if (recent == null || this.chunks[x][z].cacheTimestamp > recent.cacheTimestamp) {
-                    recent = this.chunks[x][z];
-                }
-            }
-        }
-        return recent;
-    }
-
     /**
      * @return The region x coordinate
      */
-    @Override
     public final int getX() {
         return this.x;
     }
@@ -345,7 +279,6 @@ public final class CachedRegion implements ICachedRegion {
     /**
      * @return The region z coordinate
      */
-    @Override
     public final int getZ() {
         return this.z;
     }

src/main/java/baritone/chunk/CachedWorld.java

@@ -2,42 +2,41 @@
  * 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
+ * it under the terms of the GNU 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.cache;
+package baritone.chunk;
 
 import baritone.Baritone;
-import baritone.api.cache.ICachedWorld;
-import baritone.utils.Helper;
+import baritone.utils.pathing.IBlockTypeAccess;
 import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
 import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.chunk.Chunk;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.LinkedList;
-import java.util.List;
 import java.util.concurrent.LinkedBlockingQueue;
+import java.util.function.Consumer;
 
 /**
  * @author Brady
  * @since 8/4/2018 12:02 AM
  */
-public final class CachedWorld implements ICachedWorld, Helper {
+public final class CachedWorld implements IBlockTypeAccess {
 
     /**
      * The maximum number of regions in any direction from (0,0)
@@ -60,31 +59,30 @@ public final class CachedWorld implements ICachedWorld, Helper {
         if (!Files.exists(directory)) {
             try {
                 Files.createDirectories(directory);
-            } catch (IOException ignored) {
-            }
+            } catch (IOException ignored) {}
         }
         this.directory = directory.toString();
         System.out.println("Cached world directory: " + directory);
         // Insert an invalid region element
         cachedRegions.put(0, null);
-        Baritone.INSTANCE.getExecutor().execute(new PackerThread());
-        Baritone.INSTANCE.getExecutor().execute(() -> {
-            try {
-                Thread.sleep(30000);
-                while (true) {
-                    // since a region only saves if it's been modified since its last save
-                    // saving every 10 minutes means that once it's time to exit
-                    // we'll only have a couple regions to save
-                    save();
-                    Thread.sleep(600000);
+        new PackerThread().start();
+        new Thread() {
+            public void run() {
+                try {
+                    while (true) {
+                        // since a region only saves if it's been modified since its last save
+                        // saving every 10 minutes means that once it's time to exit
+                        // we'll only have a couple regions to save
+                        save();
+                        Thread.sleep(600000);
+                    }
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
                 }
-            } catch (InterruptedException e) {
-                e.printStackTrace();
             }
-        });
+        }.start();
     }
 
-    @Override
     public final void queueForPacking(Chunk chunk) {
         try {
             toPack.put(chunk);
@@ -94,16 +92,16 @@ public final class CachedWorld implements ICachedWorld, Helper {
     }
 
     @Override
-    public final boolean isCached(int blockX, int blockZ) {
-        CachedRegion region = getRegion(blockX >> 9, blockZ >> 9);
+    public final IBlockState getBlock(int x, int y, int z) {
+        // no point in doing getOrCreate region, if we don't have it we don't have it
+        CachedRegion region = getRegion(x >> 9, z >> 9);
         if (region == null) {
-            return false;
+            return null;
         }
-        return region.isCached(blockX & 511, blockZ & 511);
+        return region.getBlock(x & 511, y, z & 511);
     }
 
-    @Override
-    public final LinkedList<BlockPos> getLocationsOf(String block, int maximum, int maxRegionDistanceSq) {
+    public final LinkedList<BlockPos> getLocationsOf(String block, int minimum, int maxRegionDistanceSq) {
         LinkedList<BlockPos> res = new LinkedList<>();
         int playerRegionX = playerFeet().getX() >> 9;
         int playerRegionZ = playerFeet().getZ() >> 9;
@@ -119,13 +117,12 @@ public final class CachedWorld implements ICachedWorld, Helper {
                     int regionX = xoff + playerRegionX;
                     int regionZ = zoff + playerRegionZ;
                     CachedRegion region = getOrCreateRegion(regionX, regionZ);
-                    if (region != null) {
-                        // TODO: 100% verify if this or addAll is faster.
-                        region.getLocationsOf(block).forEach(res::add);
-                    }
+                    if (region != null)
+                        for (BlockPos pos : region.getLocationsOf(block))
+                            res.add(pos);
                 }
             }
-            if (res.size() >= maximum) {
+            if (res.size() >= minimum) {
                 return res;
             }
             searchRadius++;
@@ -138,93 +135,38 @@ public final class CachedWorld implements ICachedWorld, Helper {
         region.updateCachedChunk(chunk.x & 31, chunk.z & 31, chunk);
     }
 
-    @Override
     public final void save() {
         if (!Baritone.settings().chunkCaching.get()) {
             System.out.println("Not saving to disk; chunk caching is disabled.");
-            allRegions().forEach(region -> {
-                if (region != null) {
-                    region.removeExpired();
-                }
-            }); // even if we aren't saving to disk, still delete expired old chunks from RAM
-            prune();
             return;
         }
-        long start = System.nanoTime() / 1000000L;
-        allRegions().parallelStream().forEach(region -> {
-            if (region != null) {
+        long start = System.currentTimeMillis();
+        this.cachedRegions.values().forEach(region -> {
+            if (region != null)
                 region.save(this.directory);
-            }
         });
-        long now = System.nanoTime() / 1000000L;
+        long now = System.currentTimeMillis();
         System.out.println("World save took " + (now - start) + "ms");
-        prune();
     }
 
-    /**
-     * Delete regions that are too far from the player
-     */
-    private synchronized void prune() {
-        BlockPos pruneCenter = guessPosition();
-        for (CachedRegion region : allRegions()) {
-            if (region == null) {
-                continue;
-            }
-            int distX = (region.getX() * 512 + 256) - pruneCenter.getX();
-            int distZ = (region.getZ() * 512 + 256) - pruneCenter.getZ();
-            double dist = Math.sqrt(distX * distX + distZ * distZ);
-            if (dist > 1024) {
-                logDebug("Deleting cached region " + region.getX() + "," + region.getZ() + " from ram");
-                cachedRegions.remove(getRegionID(region.getX(), region.getZ()));
-            }
-        }
-    }
-
-    /**
-     * If we are still in this world and dimension, return player feet, otherwise return most recently modified chunk
-     */
-    private BlockPos guessPosition() {
-        WorldData data = WorldProvider.INSTANCE.getCurrentWorld();
-        if (data != null && data.getCachedWorld() == this) {
-            return playerFeet();
-        }
-        CachedChunk mostRecentlyModified = null;
-        for (CachedRegion region : allRegions()) {
-            if (region == null) {
-                continue;
-            }
-            CachedChunk ch = region.mostRecentlyModified();
-            if (ch == null) {
-                continue;
-            }
-            if (mostRecentlyModified == null || mostRecentlyModified.cacheTimestamp < ch.cacheTimestamp) {
-                mostRecentlyModified = ch;
-            }
-        }
-        if (mostRecentlyModified == null) {
-            return new BlockPos(0, 0, 0);
-        }
-        return new BlockPos(mostRecentlyModified.x * 16 + 8, 0, mostRecentlyModified.z * 16 + 8);
-    }
-
-    private synchronized List<CachedRegion> allRegions() {
-        return new ArrayList<>(this.cachedRegions.values());
-    }
-
-    @Override
     public final void reloadAllFromDisk() {
-        long start = System.nanoTime() / 1000000L;
-        allRegions().forEach(region -> {
-            if (region != null) {
+        long start = System.currentTimeMillis();
+        this.cachedRegions.values().forEach(region -> {
+            if (region != null)
                 region.load(this.directory);
-            }
         });
-        long now = System.nanoTime() / 1000000L;
+        long now = System.currentTimeMillis();
         System.out.println("World load took " + (now - start) + "ms");
     }
 
-    @Override
-    public final synchronized CachedRegion getRegion(int regionX, int regionZ) {
+    /**
+     * Returns the region at the specified region coordinates
+     *
+     * @param regionX The region X coordinate
+     * @param regionZ The region Z coordinate
+     * @return The region located at the specified coordinates
+     */
+    public final CachedRegion getRegion(int regionX, int regionZ) {
         return cachedRegions.get(getRegionID(regionX, regionZ));
     }
 
@@ -244,6 +186,13 @@ public final class CachedWorld implements ICachedWorld, Helper {
         });
     }
 
+    public void forEachRegion(Consumer<CachedRegion> consumer) {
+        this.cachedRegions.forEach((id, r) -> {
+            if (r != null)
+                consumer.accept(r);
+        });
+    }
+
     /**
      * Returns the region ID based on the region coordinates. 0 will be
      * returned if the specified region coordinates are out of bounds.
@@ -253,9 +202,8 @@ public final class CachedWorld implements ICachedWorld, Helper {
      * @return The region ID
      */
     private long getRegionID(int regionX, int regionZ) {
-        if (!isRegionInWorld(regionX, regionZ)) {
+        if (!isRegionInWorld(regionX, regionZ))
             return 0;
-        }
 
         return (long) regionX & 0xFFFFFFFFL | ((long) regionZ & 0xFFFFFFFFL) << 32;
     }
@@ -271,10 +219,9 @@ public final class CachedWorld implements ICachedWorld, Helper {
         return regionX <= REGION_MAX && regionX >= -REGION_MAX && regionZ <= REGION_MAX && regionZ >= -REGION_MAX;
     }
 
-    private class PackerThread implements Runnable {
+    private class PackerThread extends Thread {
         public void run() {
             while (true) {
-                // TODO: Add CachedWorld unloading to remove the redundancy of having this
                 LinkedBlockingQueue<Chunk> queue = toPack;
                 if (queue == null) {
                     break;

src/main/java/baritone/chunk/ChunkPacker.java

@@ -0,0 +1,152 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.chunk;
+
+import baritone.pathing.movement.MovementHelper;
+import baritone.utils.BlockStateInterface;
+import baritone.utils.Helper;
+import baritone.utils.pathing.PathingBlockType;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockAir;
+import net.minecraft.block.BlockDoublePlant;
+import net.minecraft.block.BlockTallGrass;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.chunk.Chunk;
+
+import java.util.*;
+
+/**
+ * @author Brady
+ * @since 8/3/2018 1:09 AM
+ */
+public final class ChunkPacker implements Helper {
+
+    private ChunkPacker() {}
+
+    public static CachedChunk pack(Chunk chunk) {
+        long start = System.currentTimeMillis();
+
+        Map<String, List<BlockPos>> specialBlocks = new HashMap<>();
+        BitSet bitSet = new BitSet(CachedChunk.SIZE);
+        try {
+            for (int y = 0; y < 256; y++) {
+                for (int z = 0; z < 16; z++) {
+                    for (int x = 0; x < 16; x++) {
+                        int index = CachedChunk.getPositionIndex(x, y, z);
+                        Block block = chunk.getBlockState(x, y, z).getBlock();
+                        boolean[] bits = getPathingBlockType(block).getBits();
+                        bitSet.set(index, bits[0]);
+                        bitSet.set(index + 1, bits[1]);
+                        if (CachedChunk.BLOCKS_TO_KEEP_TRACK_OF.contains(block)) {
+                            String name = blockToString(block);
+                            specialBlocks.computeIfAbsent(name, b -> new ArrayList<>()).add(new BlockPos(x, y, z));
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        //System.out.println("Packed special blocks: " + specialBlocks);
+        long end = System.currentTimeMillis();
+        //System.out.println("Chunk packing took " + (end - start) + "ms for " + chunk.x + "," + chunk.z);
+        String[] blockNames = new String[256];
+        for (int z = 0; z < 16; z++) {
+            for (int x = 0; x < 16; x++) {
+                int height = chunk.getHeightValue(x, z);
+                IBlockState blockState = chunk.getBlockState(x, height, z);
+                for (int y = height; y > 0; y--) {
+                    blockState = chunk.getBlockState(x, y, z);
+                    if (getPathingBlockType(blockState.getBlock()) != PathingBlockType.AIR) {
+                        break;
+                    }
+                }
+                String name = blockToString(blockState.getBlock());
+                blockNames[z << 4 | x] = name;
+            }
+        }
+        CachedChunk cached = new CachedChunk(chunk.x, chunk.z, bitSet, blockNames, specialBlocks);
+        return cached;
+    }
+
+    public static String blockToString(Block block) {
+        ResourceLocation loc = Block.REGISTRY.getNameForObject(block);
+        String name = loc.getPath(); // normally, only write the part after the minecraft:
+        if (!loc.getNamespace().equals("minecraft")) {
+            // Baritone is running on top of forge with mods installed, perhaps?
+            name = loc.toString(); // include the namespace with the colon
+        }
+        return name;
+    }
+
+    public static Block stringToBlock(String name) {
+        if (!name.contains(":")) {
+            name = "minecraft:" + name;
+        }
+        return Block.getBlockFromName(name);
+    }
+
+    private static PathingBlockType getPathingBlockType(Block block) {
+        if (BlockStateInterface.isWater(block)) {
+            return PathingBlockType.WATER;
+        }
+
+        if (MovementHelper.avoidWalkingInto(block)) {
+            return PathingBlockType.AVOID;
+        }
+        // We used to do an AABB check here
+        // however, this failed in the nether when you were near a nether fortress
+        // because fences check their adjacent blocks in the world for their fence connection status to determine AABB shape
+        // this caused a nullpointerexception when we saved chunks on unload, because they were unable to check their neighbors
+        if (block instanceof BlockAir || block instanceof BlockTallGrass || block instanceof BlockDoublePlant) {
+            return PathingBlockType.AIR;
+        }
+
+        return PathingBlockType.SOLID;
+    }
+
+    static IBlockState pathingTypeToBlock(PathingBlockType type) {
+        if (type != null) {
+            switch (type) {
+                case AIR:
+                    return Blocks.AIR.getDefaultState();
+                case WATER:
+                    return Blocks.WATER.getDefaultState();
+                case AVOID:
+                    return Blocks.LAVA.getDefaultState();
+                case SOLID:
+                    // Dimension solid types
+                    switch (mc.player.dimension) {
+                        case -1:
+                            return Blocks.NETHERRACK.getDefaultState();
+                        case 0:
+                            return Blocks.STONE.getDefaultState();
+                        case 1:
+                            return Blocks.END_STONE.getDefaultState();
+                    }
+
+                    // The fallback solid type
+                    return Blocks.STONE.getDefaultState();
+            }
+        }
+        return null;
+    }
+}

src/main/java/baritone/chunk/Waypoint.java

@@ -2,97 +2,89 @@
  * 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
+ * it under the terms of the GNU 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.cache;
+package baritone.chunk;
 
-import baritone.api.cache.IWaypoint;
 import net.minecraft.util.math.BlockPos;
 
+import java.util.Collections;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
- * Basic implementation of {@link IWaypoint}
+ * A single waypoint
  *
  * @author leijurv
  */
-public class Waypoint implements IWaypoint {
-
-    private final String name;
-    private final Tag tag;
+public class Waypoint {
+    public final String name;
+    public final Tag tag;
     private final long creationTimestamp;
-    private final BlockPos location;
+    public final BlockPos location;
 
     public Waypoint(String name, Tag tag, BlockPos location) {
         this(name, tag, location, System.currentTimeMillis());
     }
 
-    /**
-     * Constructor called when a Waypoint is read from disk, adds the creationTimestamp
-     * as a parameter so that it is reserved after a waypoint is wrote to the disk.
-     *
-     * @param name The waypoint name
-     * @param tag The waypoint tag
-     * @param location The waypoint location
-     * @param creationTimestamp When the waypoint was created
-     */
-    Waypoint(String name, Tag tag, BlockPos location, long creationTimestamp) {
+    Waypoint(String name, Tag tag, BlockPos location, long creationTimestamp) { // read from disk
         this.name = name;
         this.tag = tag;
         this.location = location;
         this.creationTimestamp = creationTimestamp;
     }
 
-    @Override
-    public int hashCode() {
-        return name.hashCode() + tag.hashCode() + location.hashCode(); //lol
-    }
-
-    @Override
-    public String getName() {
-        return this.name;
-    }
-
-    @Override
-    public Tag getTag() {
-        return this.tag;
-    }
-
-    @Override
-    public long getCreationTimestamp() {
-        return this.creationTimestamp;
-    }
-
-    @Override
-    public BlockPos getLocation() {
-        return this.location;
-    }
-
-    @Override
-    public String toString() {
-        return name + " " + location.toString() + " " + new Date(creationTimestamp).toString();
-    }
-
     @Override
     public boolean equals(Object o) {
         if (o == null) {
             return false;
         }
-        if (!(o instanceof IWaypoint)) {
+        if (!(o instanceof Waypoint)) {
             return false;
         }
-        IWaypoint w = (IWaypoint) o;
-        return name.equals(w.getName()) && tag == w.getTag() && location.equals(w.getLocation());
+        Waypoint w = (Waypoint) o;
+        return name.equals(w.name) && tag == w.tag && location.equals(w.location);
+    }
+
+    @Override
+    public int hashCode() {
+        return name.hashCode() + tag.hashCode() + location.hashCode(); //lol
+    }
+
+    public long creationTimestamp() {
+        return creationTimestamp;
+    }
+
+    public String toString() {
+        return name + " " + location.toString() + " " + new Date(creationTimestamp).toString();
+    }
+
+    public enum Tag {
+        HOME, DEATH, BED, USER;
+
+    }
+
+    public static final Map<String, Tag> TAG_MAP;
+
+    static {
+        HashMap<String, Tag> map = new HashMap<>();
+        map.put("home", Tag.HOME);
+        map.put("base", Tag.HOME);
+        map.put("bed", Tag.BED);
+        map.put("spawn", Tag.BED);
+        map.put("death", Tag.DEATH);
+        TAG_MAP = Collections.unmodifiableMap(map);
     }
 }

src/main/java/baritone/chunk/Waypoints.java

@@ -2,37 +2,34 @@
  * 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
+ * it under the terms of the GNU 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.cache;
+package baritone.chunk;
 
-import baritone.api.cache.IWaypoint;
-import baritone.api.cache.IWaypointCollection;
 import net.minecraft.util.math.BlockPos;
 
 import java.io.*;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * Waypoints for a world
  *
  * @author leijurv
  */
-public class Waypoints implements IWaypointCollection {
+public class Waypoints {
 
     /**
      * Magic value to detect invalid waypoint files
@@ -40,7 +37,7 @@ public class Waypoints implements IWaypointCollection {
     private static final long WAYPOINT_MAGIC_VALUE = 121977993584L; // good value
 
     private final Path directory;
-    private final Map<IWaypoint.Tag, Set<IWaypoint>> waypoints;
+    private final Map<Waypoint.Tag, Set<Waypoint>> waypoints;
 
     Waypoints(Path directory) {
         this.directory = directory;
@@ -61,12 +58,11 @@ public class Waypoints implements IWaypointCollection {
     }
 
     private synchronized void load(Waypoint.Tag tag) {
-        this.waypoints.put(tag, new HashSet<>());
+        waypoints.put(tag, new HashSet<>());
 
-        Path fileName = this.directory.resolve(tag.name().toLowerCase() + ".mp4");
-        if (!Files.exists(fileName)) {
+        Path fileName = directory.resolve(tag.name().toLowerCase() + ".mp4");
+        if (!Files.exists(fileName))
             return;
-        }
 
         try (
                 FileInputStream fileIn = new FileInputStream(fileName.toFile());
@@ -85,60 +81,44 @@ public class Waypoints implements IWaypointCollection {
                 int x = in.readInt();
                 int y = in.readInt();
                 int z = in.readInt();
-                this.waypoints.get(tag).add(new Waypoint(name, tag, new BlockPos(x, y, z), creationTimestamp));
+                waypoints.get(tag).add(new Waypoint(name, tag, new BlockPos(x, y, z), creationTimestamp));
             }
         } catch (IOException ignored) {}
     }
 
     private synchronized void save(Waypoint.Tag tag) {
-        Path fileName = this.directory.resolve(tag.name().toLowerCase() + ".mp4");
+        Path fileName = directory.resolve(tag.name().toLowerCase() + ".mp4");
         try (
                 FileOutputStream fileOut = new FileOutputStream(fileName.toFile());
                 BufferedOutputStream bufOut = new BufferedOutputStream(fileOut);
                 DataOutputStream out = new DataOutputStream(bufOut)
         ) {
             out.writeLong(WAYPOINT_MAGIC_VALUE);
-            out.writeLong(this.waypoints.get(tag).size());
-            for (IWaypoint waypoint : this.waypoints.get(tag)) {
-                out.writeUTF(waypoint.getName());
-                out.writeLong(waypoint.getCreationTimestamp());
-                out.writeInt(waypoint.getLocation().getX());
-                out.writeInt(waypoint.getLocation().getY());
-                out.writeInt(waypoint.getLocation().getZ());
+            out.writeLong(waypoints.get(tag).size());
+            for (Waypoint waypoint : waypoints.get(tag)) {
+                out.writeUTF(waypoint.name);
+                out.writeLong(waypoint.creationTimestamp());
+                out.writeInt(waypoint.location.getX());
+                out.writeInt(waypoint.location.getY());
+                out.writeInt(waypoint.location.getZ());
             }
         } catch (IOException ex) {
             ex.printStackTrace();
         }
     }
 
-    @Override
-    public void addWaypoint(IWaypoint waypoint) {
-        // no need to check for duplicate, because it's a Set not a List
-        if (waypoints.get(waypoint.getTag()).add(waypoint)) {
-            save(waypoint.getTag());
-        }
+    public Set<Waypoint> getByTag(Waypoint.Tag tag) {
+        return Collections.unmodifiableSet(waypoints.get(tag));
     }
 
-    @Override
-    public void removeWaypoint(IWaypoint waypoint) {
-        if (waypoints.get(waypoint.getTag()).remove(waypoint)) {
-            save(waypoint.getTag());
-        }
-    }
-
-    @Override
-    public IWaypoint getMostRecentByTag(IWaypoint.Tag tag) {
+    public Waypoint getMostRecentByTag(Waypoint.Tag tag) {
         // Find a waypoint of the given tag which has the greatest timestamp value, indicating the most recent
-        return this.waypoints.get(tag).stream().min(Comparator.comparingLong(w -> -w.getCreationTimestamp())).orElse(null);
+        return this.waypoints.get(tag).stream().min(Comparator.comparingLong(w -> -w.creationTimestamp())).orElse(null);
     }
 
-    @Override
-    public Set<IWaypoint> getByTag(IWaypoint.Tag tag) {
-        return Collections.unmodifiableSet(this.waypoints.get(tag));
-    }
-
-    @Override
-    public Set<IWaypoint> getAllWaypoints() {
-        return this.waypoints.values().stream().flatMap(Collection::stream).collect(Collectors.toSet());
+    public void addWaypoint(Waypoint waypoint) {
+        // no need to check for duplicate, because it's a Set not a List
+        waypoints.get(waypoint.tag).add(waypoint);
+        save(waypoint.tag);
     }
 }

src/main/java/baritone/chunk/WorldData.java

@@ -2,25 +2,20 @@
  * 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
+ * it under the terms of the GNU 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.cache;
-
-import baritone.Baritone;
-import baritone.api.cache.ICachedWorld;
-import baritone.api.cache.IWaypointCollection;
-import baritone.api.cache.IWorldData;
+package baritone.chunk;
 
 import java.nio.file.Path;
 
@@ -29,10 +24,9 @@ import java.nio.file.Path;
  *
  * @author leijurv
  */
-public class WorldData implements IWorldData {
-
+public class WorldData {
     public final CachedWorld cache;
-    private final Waypoints waypoints;
+    public final Waypoints waypoints;
     //public final MapData map;
     public final Path directory;
 
@@ -42,20 +36,16 @@ public class WorldData implements IWorldData {
         this.waypoints = new Waypoints(directory.resolve("waypoints"));
     }
 
-    public void onClose() {
-        Baritone.INSTANCE.getExecutor().execute(() -> {
-            System.out.println("Started saving the world in a new thread");
-            cache.save();
-        });
+    public Path getMapDirectory() {
+        return directory.resolve("map");
     }
 
-    @Override
-    public ICachedWorld getCachedWorld() {
-        return this.cache;
-    }
-
-    @Override
-    public IWaypointCollection getWaypoints() {
-        return this.waypoints;
+    void onClose() {
+        new Thread() {
+            public void run() {
+                System.out.println("Started saving the world in a new thread");
+                cache.save();
+            }
+        }.start();
     }
 }

src/main/java/baritone/chunk/WorldProvider.java

@@ -2,26 +2,25 @@
  * 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
+ * it under the terms of the GNU 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.cache;
+package baritone.chunk;
 
 import baritone.Baritone;
-import baritone.api.cache.IWorldProvider;
+import baritone.launch.mixins.accessor.IAnvilChunkLoader;
+import baritone.launch.mixins.accessor.IChunkProviderServer;
 import baritone.utils.Helper;
-import baritone.utils.accessor.IAnvilChunkLoader;
-import baritone.utils.accessor.IChunkProviderServer;
 import net.minecraft.client.multiplayer.WorldClient;
 import net.minecraft.server.integrated.IntegratedServer;
 import net.minecraft.world.WorldServer;
@@ -39,7 +38,7 @@ import java.util.function.Consumer;
  * @author Brady
  * @since 8/4/2018 11:06 AM
  */
-public enum WorldProvider implements IWorldProvider, Helper {
+public enum WorldProvider implements Helper {
 
     INSTANCE;
 
@@ -47,7 +46,6 @@ public enum WorldProvider implements IWorldProvider, Helper {
 
     private WorldData currentWorld;
 
-    @Override
     public final WorldData getCurrentWorld() {
         return this.currentWorld;
     }
@@ -71,7 +69,7 @@ public enum WorldProvider implements IWorldProvider, Helper {
 
             directory = new File(directory, "baritone");
             readme = directory;
-
+            
         } else {
             //remote
             directory = new File(Baritone.INSTANCE.getDir(), mc.getCurrentServerData().serverIP);
@@ -104,8 +102,7 @@ public enum WorldProvider implements IWorldProvider, Helper {
     }
 
     public final void ifWorldLoaded(Consumer<WorldData> currentWorldConsumer) {
-        if (this.currentWorld != null) {
+        if (this.currentWorld != null)
             currentWorldConsumer.accept(this.currentWorld);
-        }
     }
 }

src/main/java/baritone/event/GameEventHandler.java

@@ -2,35 +2,53 @@
  * 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
+ * it under the terms of the GNU 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 package baritone.event;
 
 import baritone.Baritone;
-import baritone.api.event.events.*;
-import baritone.api.event.events.type.EventState;
-import baritone.api.event.listener.IGameEventListener;
-import baritone.api.utils.interfaces.Toggleable;
-import baritone.cache.WorldProvider;
-import baritone.utils.BlockStateInterface;
+import baritone.chunk.WorldProvider;
+import baritone.event.events.*;
+import baritone.event.events.type.EventState;
+import baritone.event.listener.IGameEventListener;
 import baritone.utils.Helper;
 import baritone.utils.InputOverrideHandler;
+import baritone.utils.interfaces.Toggleable;
 import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.world.chunk.Chunk;
 import org.lwjgl.input.Keyboard;
 
 import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
 
 /**
  * @author Brady
@@ -38,24 +56,16 @@ import java.util.ArrayList;
  */
 public final class GameEventHandler implements IGameEventListener, Helper {
 
-    private final ArrayList<IGameEventListener> listeners = new ArrayList<>();
+    private final List<IGameEventListener> listeners = new ArrayList<>();
 
     @Override
     public final void onTick(TickEvent event) {
-        listeners.forEach(l -> {
-            if (canDispatch(l)) {
-                l.onTick(event);
-            }
-        });
+        dispatch(listener -> listener.onTick(event));
     }
 
     @Override
     public final void onPlayerUpdate(PlayerUpdateEvent event) {
-        listeners.forEach(l -> {
-            if (canDispatch(l)) {
-                l.onPlayerUpdate(event);
-            }
-        });
+        dispatch(listener -> listener.onPlayerUpdate(event));
     }
 
     @Override
@@ -69,26 +79,17 @@ public final class GameEventHandler implements IGameEventListener, Helper {
             if (inputHandler.isInputForcedDown(keyBinding) && !keyBinding.isKeyDown()) {
                 int keyCode = keyBinding.getKeyCode();
 
-                if (keyCode < Keyboard.KEYBOARD_SIZE) {
+                if (keyCode < Keyboard.KEYBOARD_SIZE)
                     KeyBinding.onTick(keyCode < 0 ? keyCode + 100 : keyCode);
-                }
             }
         }
 
-        listeners.forEach(l -> {
-            if (canDispatch(l)) {
-                l.onProcessKeyBinds();
-            }
-        });
+        dispatch(IGameEventListener::onProcessKeyBinds);
     }
 
     @Override
     public final void onSendChatMessage(ChatEvent event) {
-        listeners.forEach(l -> {
-            if (canDispatch(l)) {
-                l.onSendChatMessage(event);
-            }
-        });
+        dispatch(listener -> listener.onSendChatMessage(event));
     }
 
     @Override
@@ -109,105 +110,86 @@ public final class GameEventHandler implements IGameEventListener, Helper {
         if (isPostPopulate || isPreUnload) {
             WorldProvider.INSTANCE.ifWorldLoaded(world -> {
                 Chunk chunk = mc.world.getChunk(event.getX(), event.getZ());
-                world.getCachedWorld().queueForPacking(chunk);
+                world.cache.queueForPacking(chunk);
             });
         }
 
 
-        listeners.forEach(l -> {
-            if (canDispatch(l)) {
-                l.onChunkEvent(event);
-            }
-        });
+        dispatch(listener -> listener.onChunkEvent(event));
     }
 
     @Override
     public final void onRenderPass(RenderEvent event) {
-        listeners.forEach(l -> {
-            if (canDispatch(l)) {
-                l.onRenderPass(event);
-            }
-        });
+        /*
+        WorldProvider.INSTANCE.ifWorldLoaded(world -> world.forEachRegion(region -> region.forEachChunk(chunk -> {
+            drawChunkLine(region.getX() * 512 + chunk.getX() * 16, region.getZ() * 512 + chunk.getZ() * 16, event.getPartialTicks());
+        })));
+        */
+
+        dispatch(listener -> listener.onRenderPass(event));
     }
 
     @Override
     public final void onWorldEvent(WorldEvent event) {
         WorldProvider cache = WorldProvider.INSTANCE;
 
-        BlockStateInterface.clearCachedChunk();
-
-        if (event.getState() == EventState.POST) {
-            cache.closeWorld();
-            if (event.getWorld() != null) {
-                cache.initWorld(event.getWorld());
-            }
+        switch (event.getState()) {
+            case PRE:
+                cache.closeWorld();
+                break;
+            case POST:
+                cache.closeWorld();
+                if (event.getWorld() != null)
+                    cache.initWorld(event.getWorld());
+                break;
         }
 
-        listeners.forEach(l -> {
-            if (canDispatch(l)) {
-                l.onWorldEvent(event);
-            }
-        });
+        dispatch(listener -> listener.onWorldEvent(event));
     }
 
     @Override
     public final void onSendPacket(PacketEvent event) {
-        listeners.forEach(l -> {
-            if (canDispatch(l)) {
-                l.onSendPacket(event);
-            }
-        });
+        dispatch(listener -> listener.onSendPacket(event));
     }
 
     @Override
     public final void onReceivePacket(PacketEvent event) {
-        listeners.forEach(l -> {
-            if (canDispatch(l)) {
-                l.onReceivePacket(event);
-            }
-        });
+        dispatch(listener -> listener.onReceivePacket(event));
     }
 
     @Override
-    public void onPlayerRotationMove(RotationMoveEvent event) {
-        listeners.forEach(l -> {
-            if (canDispatch(l)) {
-                l.onPlayerRotationMove(event);
-            }
-        });
+    public final void onQueryItemSlotForBlocks(ItemSlotEvent event) {
+        dispatch(listener -> listener.onQueryItemSlotForBlocks(event));
+    }
+
+    @Override
+    public void onPlayerRelativeMove(RelativeMoveEvent event) {
+        dispatch(listener -> listener.onPlayerRelativeMove(event));
     }
 
     @Override
     public void onBlockInteract(BlockInteractEvent event) {
-        listeners.forEach(l -> {
-            if (canDispatch(l)) {
-                l.onBlockInteract(event);
-            }
-        });
+        dispatch(listener -> listener.onBlockInteract(event));
     }
 
     @Override
     public void onPlayerDeath() {
-        listeners.forEach(l -> {
-            if (canDispatch(l)) {
-                l.onPlayerDeath();
-            }
-        });
+        dispatch(IGameEventListener::onPlayerDeath);
     }
 
     @Override
     public void onPathEvent(PathEvent event) {
-        listeners.forEach(l -> {
-            if (canDispatch(l)) {
-                l.onPathEvent(event);
-            }
-        });
+        dispatch(listener -> listener.onPathEvent(event));
     }
 
     public final void registerEventListener(IGameEventListener listener) {
         this.listeners.add(listener);
     }
 
+    private void dispatch(Consumer<IGameEventListener> dispatchFunction) {
+        this.listeners.stream().filter(this::canDispatch).forEach(dispatchFunction);
+    }
+
     private boolean canDispatch(IGameEventListener listener) {
         return !(listener instanceof Toggleable) || ((Toggleable) listener).isEnabled();
     }

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

@@ -2,26 +2,24 @@
  * 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
+ * it under the terms of the GNU 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.event.events;
+package baritone.event.events;
 
 import net.minecraft.util.math.BlockPos;
 
 /**
- * Called when the local player interacts with a block, can be either {@link Type#BREAK} or {@link Type#USE}.
- *
  * @author Brady
  * @since 8/22/2018
  */

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

@@ -2,37 +2,35 @@
  * 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
+ * it under the terms of the GNU 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.event.events;
+package baritone.event.events;
 
-import baritone.api.event.events.type.ManagedPlayerEvent;
-import net.minecraft.client.entity.EntityPlayerSP;
+import baritone.event.events.type.Cancellable;
 
 /**
  * @author Brady
  * @since 8/1/2018 6:39 PM
  */
-public final class ChatEvent extends ManagedPlayerEvent.Cancellable {
+public final class ChatEvent extends Cancellable {
 
     /**
      * The message being sent
      */
     private final String message;
 
-    public ChatEvent(EntityPlayerSP player, String message) {
-        super(player);
+    public ChatEvent(String message) {
         this.message = message;
     }
 

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

@@ -2,22 +2,22 @@
  * 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
+ * it under the terms of the GNU 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.event.events;
+package baritone.event.events;
 
-import baritone.api.event.events.type.EventState;
+import baritone.event.events.type.EventState;
 
 /**
  * @author Brady

src/main/java/baritone/event/events/ItemSlotEvent.java

@@ -0,0 +1,56 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.event.events;
+
+import baritone.event.listener.IGameEventListener;
+
+/**
+ * Called in some cases where a player's inventory has it's current slot queried.
+ * <p>
+ * @see IGameEventListener#onQueryItemSlotForBlocks()
+ *
+ * @author Brady
+ * @since 8/20/2018
+ */
+public final class ItemSlotEvent {
+
+    /**
+     * The current slot index
+     */
+    private int slot;
+
+    public ItemSlotEvent(int slot) {
+        this.slot = slot;
+    }
+
+    /**
+     * Sets the new slot index that will be used
+     *
+     * @param slot The slot index
+     */
+    public final void setSlot(int slot) {
+        this.slot = slot;
+    }
+
+    /**
+     * @return The current slot index
+     */
+    public final int getSlot() {
+        return this.slot;
+    }
+}

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

@@ -2,23 +2,22 @@
  * 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
+ * it under the terms of the GNU 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.event.events;
+package baritone.event.events;
 
-import baritone.api.event.events.type.EventState;
-import net.minecraft.network.NetworkManager;
+import baritone.event.events.type.EventState;
 import net.minecraft.network.Packet;
 
 /**
@@ -27,22 +26,15 @@ import net.minecraft.network.Packet;
  */
 public final class PacketEvent {
 
-    private final NetworkManager networkManager;
-
     private final EventState state;
 
     private final Packet<?> packet;
 
-    public PacketEvent(NetworkManager networkManager, EventState state, Packet<?> packet) {
-        this.networkManager = networkManager;
+    public PacketEvent(EventState state, Packet<?> packet) {
         this.state = state;
         this.packet = packet;
     }
 
-    public final NetworkManager getNetworkManager() {
-        return this.networkManager;
-    }
-
     public final EventState getState() {
         return this.state;
     }

src/main/java/baritone/event/events/PathEvent.java

@@ -2,20 +2,20 @@
  * 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
+ * it under the terms of the GNU 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.event.events;
+package baritone.event.events;
 
 public enum PathEvent {
     CALC_STARTED,
@@ -28,6 +28,5 @@ public enum PathEvent {
     AT_GOAL,
     PATH_FINISHED_NEXT_STILL_CALCULATING,
     NEXT_CALC_FAILED,
-    DISCARD_NEXT,
-    CANCELED;
+    DISCARD_NEXT
 }

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

@@ -2,38 +2,35 @@
  * 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
+ * it under the terms of the GNU 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.event.events;
+package baritone.event.events;
 
-import baritone.api.event.events.type.EventState;
-import baritone.api.event.events.type.ManagedPlayerEvent;
-import net.minecraft.client.entity.EntityPlayerSP;
+import baritone.event.events.type.EventState;
 
 /**
  * @author Brady
  * @since 8/21/2018
  */
-public final class PlayerUpdateEvent extends ManagedPlayerEvent {
+public final class PlayerUpdateEvent {
 
     /**
      * The state of the event
      */
     private final EventState state;
 
-    public PlayerUpdateEvent(EntityPlayerSP player, EventState state) {
-        super(player);
+    public PlayerUpdateEvent(EventState state) {
         this.state = state;
     }
 

src/main/java/baritone/event/events/RelativeMoveEvent.java

@@ -0,0 +1,43 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.event.events;
+
+import baritone.event.events.type.EventState;
+
+/**
+ * @author Brady
+ * @since 8/21/2018
+ */
+public final class RelativeMoveEvent {
+
+    /**
+     * The state of the event
+     */
+    private final EventState state;
+
+    public RelativeMoveEvent(EventState state) {
+        this.state = state;
+    }
+
+    /**
+     * @return The state of the event
+     */
+    public final EventState getState() {
+        return this.state;
+    }
+}

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

@@ -2,20 +2,20 @@
  * 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
+ * it under the terms of the GNU 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.event.events;
+package baritone.event.events;
 
 /**
  * @author Brady

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

@@ -2,43 +2,31 @@
  * 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
+ * it under the terms of the GNU 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.event.events;
+package baritone.event.events;
 
-import baritone.api.event.events.type.EventState;
+import baritone.event.events.type.EventState;
 
 public final class TickEvent {
 
     private final EventState state;
     private final Type type;
-    private final int count;
-
-    private static int overallTickCount;
 
     public TickEvent(EventState state, Type type) {
         this.state = state;
         this.type = type;
-        this.count = incrementCount();
-    }
-
-    private static synchronized int incrementCount() {
-        return overallTickCount++;
-    }
-
-    public int getCount() {
-        return count;
     }
 
     public Type getType() {

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

@@ -2,22 +2,22 @@
  * 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
+ * it under the terms of the GNU 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.event.events;
+package baritone.event.events;
 
-import baritone.api.event.events.type.EventState;
+import baritone.event.events.type.EventState;
 import net.minecraft.client.multiplayer.WorldClient;
 
 /**

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

@@ -2,38 +2,42 @@
  * 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
+ * it under the terms of the GNU 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.event.events.type;
+package baritone.event.events.type;
 
 /**
  * @author Brady
  * @since 8/1/2018 6:41 PM
  */
-public class Cancellable implements ICancellable {
+public class Cancellable {
 
     /**
      * Whether or not this event has been cancelled
      */
     private boolean cancelled;
 
-    @Override
+    /**
+     * Cancels this event
+     */
     public final void cancel() {
         this.cancelled = true;
     }
 
-    @Override
+    /**
+     * @return Whether or not this event has been cancelled
+     */
     public final boolean isCancelled() {
         return this.cancelled;
     }

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

@@ -2,20 +2,20 @@
  * 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
+ * it under the terms of the GNU 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.event.events.type;
+package baritone.event.events.type;
 
 /**
  * @author Brady
@@ -31,7 +31,7 @@ public enum EventState {
 
     /**
      * Indicates that whatever movement the event is being
-     * dispatched as a result of has already occurred.
+     * dispatched as a result of has already occured.
      */
     POST
 }

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

@@ -2,22 +2,39 @@
  * 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
+ * it under the terms of the GNU 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.event.listener;
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
 
-import baritone.api.event.events.*;
+package baritone.event.listener;
+
+import baritone.event.events.*;
 
 /**
  * An implementation of {@link IGameEventListener} that has all methods
@@ -58,7 +75,10 @@ public interface AbstractGameEventListener extends IGameEventListener {
     default void onReceivePacket(PacketEvent event) {}
 
     @Override
-    default void onPlayerRotationMove(RotationMoveEvent event) {}
+    default void onQueryItemSlotForBlocks(ItemSlotEvent event) {}
+
+    @Override
+    default void onPlayerRelativeMove(RelativeMoveEvent event) {}
 
     @Override
     default void onBlockInteract(BlockInteractEvent event) {}

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

@@ -2,23 +2,41 @@
  * 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
+ * it under the terms of the GNU 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.event.listener;
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
 
-import baritone.api.event.events.*;
+package baritone.event.listener;
+
+import baritone.event.events.*;
 import io.netty.util.concurrent.GenericFutureListener;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.gui.GuiGameOver;
@@ -26,7 +44,7 @@ import net.minecraft.client.multiplayer.WorldClient;
 import net.minecraft.client.renderer.EntityRenderer;
 import net.minecraft.client.settings.GameSettings;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.network.NetworkManager;
 import net.minecraft.network.Packet;
 import net.minecraft.util.text.ITextComponent;
@@ -92,8 +110,6 @@ public interface IGameEventListener {
      * Runs before a outbound packet is sent
      *
      * @see NetworkManager#dispatchPacket(Packet, GenericFutureListener[])
-     * @see Packet
-     * @see GenericFutureListener
      */
     void onSendPacket(PacketEvent event);
 
@@ -101,19 +117,23 @@ public interface IGameEventListener {
      * Runs before an inbound packet is processed
      *
      * @see NetworkManager#dispatchPacket(Packet, GenericFutureListener[])
-     * @see Packet
-     * @see GenericFutureListener
      */
     void onReceivePacket(PacketEvent event);
 
+    /**
+     * Run when a query is made for a player's inventory current slot in the context of blocks
+     *
+     * @see InventoryPlayer#getDestroySpeed(IBlockState)
+     * @see InventoryPlayer#canHarvestBlock(IBlockState)
+     */
+    void onQueryItemSlotForBlocks(ItemSlotEvent event);
+
     /**
      * Run once per game tick from before and after the player's moveRelative method is called
-     * and before and after the player jumps.
      *
      * @see Entity#moveRelative(float, float, float, float)
-     * @see EntityLivingBase#jump()
      */
-    void onPlayerRotationMove(RotationMoveEvent event);
+    void onPlayerRelativeMove(RelativeMoveEvent event);
 
     /**
      * Called when the local player interacts with a block, whether it is breaking or opening/placing.
@@ -127,7 +147,6 @@ public interface IGameEventListener {
      * Called when the local player dies, as indicated by the creation of the {@link GuiGameOver} screen.
      *
      * @see GuiGameOver(ITextComponent)
-     * @see ITextComponent
      */
     void onPlayerDeath();
 

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

@@ -0,0 +1,71 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.launch;
+
+import net.minecraft.launchwrapper.ITweaker;
+import net.minecraft.launchwrapper.LaunchClassLoader;
+import org.spongepowered.asm.launch.MixinBootstrap;
+import org.spongepowered.asm.mixin.MixinEnvironment;
+import org.spongepowered.asm.mixin.Mixins;
+import org.spongepowered.tools.obfuscation.mcp.ObfuscationServiceMCP;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Brady
+ * @since 7/31/2018 9:59 PM
+ */
+public class BaritoneTweaker implements ITweaker {
+
+    List<String> args;
+
+    @Override
+    public void acceptOptions(List<String> args, File gameDir, File assetsDir, String profile) {
+        this.args = new ArrayList<>(args);
+        if (gameDir   != null) addArg("gameDir",   gameDir.getAbsolutePath());
+        if (assetsDir != null) addArg("assetsDir", assetsDir.getAbsolutePath());
+        if (profile   != null) addArg("version",   profile);
+    }
+
+    @Override
+    public void injectIntoClassLoader(LaunchClassLoader classLoader) {
+        MixinBootstrap.init();
+        MixinEnvironment.getDefaultEnvironment().setSide(MixinEnvironment.Side.CLIENT);
+        MixinEnvironment.getDefaultEnvironment().setObfuscationContext(ObfuscationServiceMCP.NOTCH);
+        Mixins.addConfiguration("mixins.baritone.json");
+    }
+
+    @Override
+    public final String getLaunchTarget() {
+        return "net.minecraft.client.main.Main";
+    }
+
+    @Override
+    public final String[] getLaunchArguments() {
+        return this.args.toArray(new String[0]);
+    }
+
+    private void addArg(String label, String value) {
+        if (!args.contains("--" + label) && value != null) {
+            this.args.add("--" + label);
+            this.args.add(value);
+        }
+    }
+}

src/main/java/baritone/launch/BaritoneTweakerForge.java

@@ -0,0 +1,44 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.launch;
+
+import net.minecraft.launchwrapper.LaunchClassLoader;
+import org.spongepowered.asm.mixin.MixinEnvironment;
+import org.spongepowered.tools.obfuscation.mcp.ObfuscationServiceMCP;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Brady
+ * @since 7/31/2018 10:09 PM
+ */
+public class BaritoneTweakerForge extends BaritoneTweaker {
+
+    @Override
+    public final void acceptOptions(List<String> args, File gameDir, File assetsDir, String profile) {
+        this.args = new ArrayList<>();
+    }
+
+    @Override
+    public final void injectIntoClassLoader(LaunchClassLoader classLoader) {
+        super.injectIntoClassLoader(classLoader);
+        MixinEnvironment.getDefaultEnvironment().setObfuscationContext(ObfuscationServiceMCP.SEARGE);
+    }
+}

src/main/java/baritone/launch/BaritoneTweakerOptifine.java

@@ -0,0 +1,34 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.launch;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Brady
+ * @since 7/31/2018 10:10 PM
+ */
+public class BaritoneTweakerOptifine extends BaritoneTweaker {
+
+    @Override
+    public final void acceptOptions(List<String> args, File gameDir, File assetsDir, String profile) {
+        this.args = new ArrayList<>();
+    }
+}

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

@@ -2,16 +2,16 @@
  * 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
+ * it under the terms of the GNU 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.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
@@ -29,7 +29,7 @@ import javax.annotation.Nonnull;
  * @since 8/25/2018
  */
 @Mixin(BlockPos.class)
-public class MixinBlockPos extends Vec3i {
+public abstract class MixinBlockPos extends Vec3i {
 
     public MixinBlockPos(int xIn, int yIn, int zIn) {
         super(xIn, yIn, zIn);