started on simultaneous dijkstra scaffolder, saving progress here for now

This adds my assessment of the performance of the ancestor pointers optimization in practice to optimization_ideas.txt.

.github/workflows/gradle_build.yml

@@ -13,12 +13,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
     - name: Set up JDK 8
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v2
       with:
         java-version: '8'
-        distribution: 'temurin'
+        distribution: 'adopt'
         
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
@@ -26,20 +26,14 @@ jobs:
     - name: Build with Gradle
       run: ./gradlew build
       
-    - name: Build (fabric) with Gradle
-      run: ./gradlew build -Pbaritone.fabric_build
-
-    - name: Build (forge) with Gradle
-      run: ./gradlew build -Pbaritone.forge_build
-
     - name: Archive Artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v2
       with:
         name: Artifacts
         path: dist/
         
     - name: Archive mapping.txt
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v2
       with:
         name: Mappings
         path: build/tmp/proguard/mapping.txt

.github/workflows/run_tests.yml

@@ -11,12 +11,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 8
-      uses: actions/setup-java@v3
+    - uses: actions/checkout@v2
+    - name: Set up JDK 9
+      uses: actions/setup-java@v2
       with:
         java-version: '8'
-        distribution: 'temurin'
+        distribution: 'adopt'
         
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew

.gitignore

@@ -4,7 +4,6 @@
 run/
 autotest/
 dist/
-volderyarn/
 
 # Gradle
 build/
@@ -12,8 +11,6 @@ build/
 classes/
 *.class
 
-/out
-
 # IntelliJ Files
 .idea/
 *.iml
@@ -30,6 +27,3 @@ baritone_Client.launch
 # Copyright Files
 !/.idea/copyright/Baritone.xml
 !/.idea/copyright/profiles_settings.xml
-
-.vscode/launch.json
-

.gitlab-ci.yml

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

Dockerfile

@@ -13,5 +13,3 @@ COPY . /code
 WORKDIR /code
 
 RUN ./gradlew build
-RUN ./gradlew build -Pbaritone.forge_build
-RUN ./gradlew build -Pbaritone.fabric_build

README.md

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

SETUP.md

@@ -11,7 +11,7 @@ These releases are not always completely up to date with latest features, and ar
 
 Link to the releases page: [Releases](https://github.com/cabaletta/baritone/releases)
 
-v1.2.* is for 1.12.2, v1.3.* is for 1.13.2, v1.4.* is for 1.14.4, v1.5.* is for 1.15.2, v1.6.* is for 1.16.5, v1.7.* is for 1.17.1, v1.8.* is for 1.18.1
+v1.2.* is for 1.12.2, v1.3.* is for 1.13.2, v1.4.* is for 1.14.4, v1.5.* is for 1.15.2, v1.6.* is for 1.16.2 or 1.16.4 or 1.16.5 (LOL)
 
 Any official release will be GPG signed by leijurv (44A3EA646EADAC6A). Please verify that the hash of the file you download is in `checksums.txt` and that `checksums_signed.asc` is a valid signature by that public keys of `checksums.txt`. 
 
@@ -22,16 +22,15 @@ The build is fully deterministic and reproducible, and you can verify Travis did
 
 Building Baritone will result in 5 artifacts created in the ``dist`` directory. These are the same as the artifacts created in the [releases](https://github.com/cabaletta/baritone/releases).
 
-**The Forge and Fabric releases can simply be added as a Forge/Fabric mods.**
+**The Forge release can simply be added as a Forge mod.**
 
 If another one of your Forge mods has a Baritone integration, you want `baritone-api-forge-VERSION.jar`. Otherwise, you want `baritone-standalone-forge-VERSION.jar`
 
 - **API**: Only the non-api packages are obfuscated. This should be used in environments where other mods would like to use Baritone's features.
-- **Forge/Fabric API**: Same as API, but packaged for Forge/Fabric. This should be used where another mod has a Baritone integration.
+- **Forge API**: Same as API, but packaged for Forge. This should be used where another mod has a Baritone integration.
 - **Standalone**: Everything is obfuscated. This should be used in environments where there are no other mods present that would like to use Baritone's features.
-- **Forge/Fabric Standalone**: Same as Standalone, but packaged for Forge/Fabric. This should be used when Baritone is your only Forge/Fabric mod, or none of your other Forge/Fabric mods integrate with Baritone.
+- **Forge Standalone**: Same as Standalone, but packaged for Forge. This should be used when Baritone is your only Forge mod, or none of your other Forge mods integrate with Baritone.
 - **Unoptimized**: Nothing is obfuscated. This shouldn't be used ever in production.
-- **Forge/Fabric Unoptimized**: Same as Unoptimized, but packaged for Forge/Fabric.
 
 ## Build it yourself
 - Clone or download Baritone
@@ -43,13 +42,13 @@ If another one of your Forge mods has a Baritone integration, you want `baritone
 ## Command Line
 On Mac OSX and Linux, use `./gradlew` instead of `gradlew`.
 
-If you have errors with a package missing please make sure you have setup your environment, and are using Oracle JDK 8 for 1.12.2-1.16.5, JDK 16+ for 1.17.1, and JDK 17+ for 1.18.1.
+If you have errors with a package missing please make sure you have setup your environment, and are using Oracle JDK 8.
 
 To check which java you are using do 
 `java -version` in a command prompt or terminal.
-If you are using anything above OpenJDK 8 for 1.12.2-1.16.5, it might not work because the Java distributions above JDK 8 using may not have the needed javax classes.
+If you are using anything above OpenJDK 8, it might not work because the Java distributions above JDK 8 using may not have the needed javax classes.
 
-Download java: https://adoptium.net/
+Open JDK 8 download: https://openjdk.java.net/install/
 #### macOS guide
 In order to get JDK 8, Try running the following command:
 `% /usr/libexec/java_home -V`
@@ -66,13 +65,62 @@ In order to get JDK 8 running in the **current terminal window** you will have t
 
 To add OpenJDK 8 to your PATH add the export line to the end of your `.zshrc / .bashrc` if you want it to apply to each new terminal. If you're using bash change the .bachrc and if you're using zsh change the .zshrc
 
-### Building Baritone
+Setting up the Environment:
 
-These tasks depend on the minecraft version, but are (for the most part) standard for building mods.
+```
+$ gradlew setupDecompWorkspace
+$ gradlew --refresh-dependencies
+```
 
-for more details, see [the build ci action](/.github/workflows/gradle_build.yml)
+Building Baritone: 
+
+```
+$ gradlew build
+```
+
+For minecraft 1.15.2+, run the following instead to include the Forge jars:
+
+```
+$ gradlew build -Pbaritone.forge_build
+```
+
+Running Baritone:
+
+```
+$ gradlew runClient
+```
+
+For information on how to build baritone, see [Building Baritone](#building-baritone)
 
 ## IntelliJ
 - Open the project in IntelliJ as a Gradle project
+  
+  ![Image](https://i.imgur.com/jw7Q6vY.png)
+
+- Run the Gradle tasks `setupDecompWorkspace` then `genIntellijRuns`
+  
+  ![Image](https://i.imgur.com/QEfVvWP.png)
+
 - Refresh the Gradle project (or, to be safe, just restart IntelliJ)
-- depending on the minecraft version, you may need to run `setupDecompWorkspace` or `genIntellijRuns` in order to get everything working
+  
+  ![Image](https://i.imgur.com/3V7EdWr.png)
+
+- Select the "Minecraft Client" launch config
+  
+  ![Image](https://i.imgur.com/1qz2QGV.png)
+
+- Click on ``Edit Configurations...`` from the same dropdown and select the "Minecraft Client" config
+  
+  ![Image](https://i.imgur.com/s4ly0ZF.png)
+
+- In `Edit Configurations...` you need to select `baritone_launch` for `Use classpath of module:`.
+  
+  ![Image](https://i.imgur.com/hrLhG9u.png)
+
+## IntelliJ
+
+- Navigate to the gradle tasks on the right tab as follows
+
+  ![Image](https://i.imgur.com/PE6r9iN.png)
+
+- Double click on **build** to run it

USAGE.md

@@ -32,13 +32,13 @@ Watch this [showcase video](https://youtu.be/CZkLXWo4Fg4)!
 
 To toggle a boolean setting, just say its name in chat (for example saying `allowBreak` toggles whether Baritone will consider breaking blocks). For a numeric setting, say its name then the new value (like `primaryTimeoutMS 250`). It's case insensitive. To reset a setting to its default value, say `acceptableThrowawayItems reset`. To reset all settings, say `reset`. To see all settings that have been modified from their default values, say `modified`.
 
-Commands in Baritone:
+Some common examples:
 - `thisway 1000` then `path` to go in the direction you're facing for a thousand blocks
 - `goal x y z` or `goal x z` or `goal y`, then `path` to set a goal to a certain coordinate then path to it
 - `goto x y z` or `goto x z` or `goto y` to go to a certain coordinate (in a single step, starts going immediately)
 - `goal` to set the goal to your player's feet
 - `goal clear` to clear the goal
-- `cancel` or `stop` to stop everything, `forcecancel` is also an option
+- `cancel` or `stop` to stop everything
 - `goto portal` or `goto ender_chest` or `goto block_type` to go to a block. (in Impact, `.goto` is an alias for `.b goto` for the most part)
 - `mine diamond_ore iron_ore` to mine diamond ore or iron ore (turn on the setting `legitMine` to only mine ores that it can actually see. It will explore randomly around y=11 until it finds them.) An amount of blocks can also be specified, for example, `mine 64 diamond_ore`.
 - `click` to click your destination on the screen. Right click path to on top of the block, left click to path into it (either at foot level or eye level), and left click and drag to select an area (`#help sel` to see what you can do with that selection).
@@ -51,19 +51,11 @@ Commands in Baritone:
 - `axis` to go to an axis or diagonal axis at y=120 (`axisHeight` is a configurable setting, defaults to 120).
 - `explore x z` to explore the world from the origin of x,z. Leave out x and z to default to player feet. This will continually path towards the closest chunk to the origin that it's never seen before. `explorefilter filter.json` with optional invert can be used to load in a list of chunks to load.
 - `invert` to invert the current goal and path. This gets as far away from it as possible, instead of as close as possible. For example, do `goal` then `invert` to run as far as possible from where you're standing at the start.
-- `come` tells Baritone to head towards your camera, useful when freecam doesn't move your player position.
-- `blacklist` will stop baritone from going to the closest block so it won't attempt to get to it.
-- `eta` to get information about the estimated time until the next segment and the goal, be aware that the ETA to your goal is really unprecise.
-- `proc` to view miscellaneous information about the process currently controlling Baritone.
-- `repack` to re-cache the chunks around you.
-- `gc` to call `System.gc()` which may free up some memory.
-- `render` to fix glitched chunk rendering without having to reload all of them.
-- `reloadall` to reload Baritone's world cache or `saveall` to save Baritone's world cache.
-- `find` to search through Baritone's cache and attempt to find the location of the block.
-- `surface` or `top` to tell Baritone to head towards the closest surface-like area, this can be the surface or highest available air space.
 - `version` to get the version of Baritone you're running
 - `damn` daniel
 
+For the rest of the commands, you can take a look at the code [here](https://baritone.leijurv.com/baritone/api/Settings.html).
+
 All the settings and documentation are <a href="https://github.com/cabaletta/baritone/blob/master/src/api/java/baritone/api/Settings.java">here</a>. If you find HTML easier to read than Javadoc, you can look <a href="https://baritone.leijurv.com/baritone/api/Settings.html#field.detail">here</a>.
 
 There are about a hundred settings, but here are some fun / interesting / important ones that you might want to look at changing in normal usage of Baritone. The documentation for each can be found at the above links.

build.gradle

@@ -16,7 +16,7 @@
  */
 
 group 'baritone'
-version '1.6.5'
+version '1.2.15'
 
 buildscript {
     repositories {
@@ -25,49 +25,26 @@ buildscript {
             url = 'http://files.minecraftforge.net/maven'
         }
         maven {
-            name = 'impactdevelopment-repo'
-            url = 'https://impactdevelopment.github.io/maven/'
+            name = 'SpongePowered'
+            url = 'https://repo.spongepowered.org/repository/maven-public/'
         }
-        maven {
-            url = 'https://www.dogforce-games.com/maven/'
-        }
-        maven {
-            url = 'https://maven.fabricmc.net/'
-        }
-        maven {
-            url = 'https://libraries.minecraft.net/'
-        }
-        mavenCentral()
         jcenter()
     }
 
     dependencies {
-        classpath group: 'com.github.ImpactDevelopment', name: 'ForgeGradle', version: '3.0.115'
-        classpath group: 'com.github.ImpactDevelopment', name: 'MixinGradle', version: '0.6.2'
-        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.7-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
+        classpath 'org.spongepowered:mixingradle:0.6-SNAPSHOT'
     }
 }
 
 
-import baritone.gradle.fabric.CreateVolderYarn
 import baritone.gradle.task.CreateDistTask
 import baritone.gradle.task.ProguardTask
-import net.minecraftforge.gradle.userdev.tasks.RenameJarInPlace
-import org.apache.tools.ant.taskdefs.condition.Os
 
 apply plugin: 'java'
 apply plugin: 'maven'
-
-def mcpVersion = [channel: 'snapshot', version: '20201028-1.16.3']
-
-if (getProject().hasProperty("baritone.fabric_build")) {
-    CreateVolderYarn.genMappings("1.16.5", mcpVersion)
-    apply plugin: 'fabric-loom'
-} else {
-    apply plugin: 'net.minecraftforge.gradle'
-    apply plugin: 'org.spongepowered.mixin'
-}
-
+apply plugin: 'net.minecraftforge.gradle.tweaker-client'
+apply plugin: 'org.spongepowered.mixin'
 
 sourceCompatibility = targetCompatibility = '1.8'
 compileJava {
@@ -75,21 +52,9 @@ compileJava {
     options.encoding = "UTF-8" // allow emoji in comments :^)
 }
 
-
 sourceSets {
-    api {
-        compileClasspath += main.compileClasspath
-    }
-    main {
-        compileClasspath += api.output
-    }
-    test {
-        compileClasspath += main.compileClasspath + main.runtimeClasspath + main.output
-        runtimeClasspath += main.compileClasspath + main.runtimeClasspath + main.output
-    }
     launch {
         compileClasspath += main.compileClasspath + main.runtimeClasspath + main.output
-        runtimeClasspath += main.compileClasspath + main.runtimeClasspath + main.output
     }
 
     schematica_api {
@@ -101,116 +66,48 @@ sourceSets {
     }
 }
 
-task sourceJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
-    from sourceSets.api.allSource
-}
-if (getProject().hasProperty("baritone.fabric_build")) {
-    minecraft.refmapName = "mixins.baritone.refmap.json"
-} else {
-    minecraft {
-        mappings mcpVersion
+minecraft {
+    version = '1.12.2'
+    mappings = 'stable_39'
+    tweakClass = 'baritone.launch.BaritoneTweaker'
+    runDir = 'run'
 
-        if (getProject().hasProperty("baritone.forge_build")) {
-            reobfMappings 'searge'
-        } else {
-            reobfMappings 'notch'
-        }
-
-        runs {
-            client {
-                workingDirectory project.file('run')
-                source sourceSets.launch
-
-                main 'baritone.launch.LaunchTesting'
-
-                environment 'assetIndex', '{asset_index}'
-                environment 'assetDirectory', downloadAssets.output
-                environment 'nativesDirectory', extractNatives.output
-
-                environment 'tweakClass', 'baritone.launch.BaritoneTweaker'
-
-                if (Os.isFamily(Os.FAMILY_MAC)) {
-                    jvmArgs "-XstartOnFirstThread"
-                }
-            }
-
-            autoTest {
-                workingDirectory project.file('autotest')
-                source sourceSets.launch
-
-                main 'baritone.launch.LaunchTesting'
-
-                environment 'assetIndex', '{asset_index}'
-                environment 'assetDirectory', downloadAssets.output
-                environment 'nativesDirectory', extractNatives.output
-
-                environment 'tweakClass', 'baritone.launch.BaritoneTweaker'
-                environment 'BARITONE_AUTO_TEST', 'true'
-
-                if (Os.isFamily(Os.FAMILY_MAC)) {
-                    jvmArgs "-XstartOnFirstThread"
-                }
-            }
-        }
-    }
-
-    mixin {
-        defaultObfuscationEnv searge
-        add sourceSets.launch, 'mixins.baritone.refmap.json'
-    }
+    // The sources jar should use SRG names not MCP to ensure compatibility with all mappings
+    makeObfSourceJar = true
 }
 
 repositories {
     mavenCentral()
 
     maven {
-        name = 'SpongePowered'
+        name = 'spongepowered-repo'
         url = 'https://repo.spongepowered.org/repository/maven-public/'
     }
+
     maven {
         name = 'impactdevelopment-repo'
         url = 'https://impactdevelopment.github.io/maven/'
     }
-    maven {
-        url = 'https://www.dogforce-games.com/maven/'
-    }
 }
 
 dependencies {
-    if (getProject().hasProperty("baritone.fabric_build")) {
-        minecraft "com.mojang:minecraft:1.16.5"
-        mappings fileTree(dir: "./build/volderyarn", include: "**.jar")
-        modImplementation "net.fabricmc:fabric-loader:0.9.1+build.205"
-
-        // this makes it compile with the forge tweak stuff
-        implementation 'com.github.ImpactDevelopment:SimpleTweaker:1.2'
-        implementation('net.minecraft:launchwrapper:1.12') {
-            exclude module: 'lwjgl'
-        }
-
-        implementation 'com.google.code.findbugs:jsr305:3.0.2'
-    } else {
-        minecraft 'com.github.ImpactDevelopment:Vanilla:1.16.5'
-
-        runtime launchCompile('net.minecraft:launchwrapper:1.12') {
-            exclude module: 'lwjgl'
-        }
-        runtime launchCompile('org.ow2.asm:asm-debug-all:5.2')
-        runtime launchCompile('com.github.ImpactDevelopment:SimpleTweaker:1.2')
-        runtime launchCompile('org.spongepowered:mixin:0.8.3') {
-            // Mixin includes a lot of dependencies that are too up-to-date
-            exclude module: 'launchwrapper'
-            exclude module: 'guava'
-            exclude module: 'gson'
-            exclude module: 'commons-io'
-            exclude module: 'log4j-core'
-        }
+    runtime launchCompile('com.github.ImpactDevelopment:SimpleTweaker:1.2')
+    runtime launchCompile('org.spongepowered:mixin:0.7.11-SNAPSHOT') {
+        // Mixin includes a lot of dependencies that are too up-to-date
+        exclude module: 'launchwrapper'
+        exclude module: 'guava'
+        exclude module: 'gson'
+        exclude module: 'commons-io'
+        exclude module: 'log4j-core'
     }
-
     testImplementation 'junit:junit:4.12'
 }
 
+mixin {
+    defaultObfuscationEnv searge
+    add sourceSets.launch, 'mixins.baritone.refmap.json'
+}
+
 javadoc {
     options.addStringOption('Xwerror', '-quiet') // makes the build fail on travis when there is a javadoc error
     options.linkSource true
@@ -219,25 +116,6 @@ javadoc {
     classpath += sourceSets.api.compileClasspath
 }
 
-if (getProject().hasProperty("baritone.fabric_build")) {
-    // skidded from fabric-example-mod (comments and all)
-    tasks.withType(JavaCompile).configureEach {
-        // ensure that the encoding is set to UTF-8, no matter what the system default is
-        // this fixes some edge cases with special characters not displaying correctly
-        // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-        // If Javadoc is generated, this must be specified in that task too.
-        it.options.encoding = "UTF-8"
-
-        // The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
-        // JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
-        // We'll use that if it's available, but otherwise we'll use the older option.
-        def targetVersion = 8
-        if (JavaVersion.current().isJava9Compatible()) {
-            it.options.release = targetVersion
-        }
-    }
-}
-
 jar {
     from sourceSets.launch.output, sourceSets.api.output
 
@@ -249,93 +127,23 @@ jar {
     preserveFileTimestamps = false
     reproducibleFileOrder = true
 
-    if (getProject().hasProperty("baritone.fabric_build")) {
-        filesMatching("fabric.mod.json") {
-            expand "version": version
-        }
-    } else {
-        exclude("fabric.mod.json")
-    }
-
-
     manifest {
         attributes(
                 'MixinConfigs': 'mixins.baritone.json',
-                "MixinConnector": "baritone.launch.BaritoneMixinConnector",
 
                 'Implementation-Title': 'Baritone',
-                'Implementation-Version': version,
+                'Implementation-Version': version
         )
     }
 }
 
-// skidded from ProguardTask
-File getClientJar() {
-    return project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("launch").getRuntimeClasspath().getFiles()
-            .stream()
-            .filter({ f -> f.toString().endsWith("client-extra.jar") })
-            .map({ f -> new File(f.getParentFile(), "client.jar") })
-            .findFirst()
-            .get()
+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'
 }
 
-File getClientJarFabric() {
-    return project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("launch").getRuntimeClasspath().getFiles()
-            .stream()
-            .filter({ f -> f.getName().endsWith("-v2.jar") && f.getName().startsWith("minecraft-") })
-            .map({ f -> new File(f.getParentFile().getParentFile(), f.getName().toString().replace("mapped", "intermediary")) })
-            .findFirst()
-            .get()
-}
+task createDist(type: CreateDistTask, dependsOn: proguard)
 
-if (getProject().hasProperty("baritone.fabric_build")) {
-    task copyMcJar(type: Copy) {
-        def mcJar = { getClientJarFabric() }
-
-        from mcJar
-        into 'build/createMcIntermediaryJar/'
-        rename { 'client.jar' }
-    }
-
-    task proguard(type: ProguardTask, dependsOn: copyMcJar) {
-        url 'https://downloads.sourceforge.net/project/proguard/proguard/6.0/proguard6.0.3.zip'
-        extract 'proguard6.0.3/lib/proguard.jar'
-    }
-
-    task createDist(type: CreateDistTask, dependsOn: proguard)
-
-} else {
-    task copyMcJar(type: Copy) {
-        def mcJar = { getClientJar() }
-
-        from mcJar
-        into 'build/createMcSrgJar/'
-        rename { 'client-srg.jar' }
-    }
-
-    task createSrgMc(type: RenameJarInPlace) {
-        setInput(new File(copyMcJar.getOutputs().getFiles().getSingleFile(), "client-srg.jar"))
-        setClasspath(files({ getClientJar() }))
-
-        // fork
-        setMappingType(net.minecraftforge.gradle.common.util.MappingFile.Mapping.SEARGE)
-        setJarTask('trans alaska pipeline')
-    }
-
-    project.afterEvaluate {
-        createSrgMc.dependsOn(extractSrg, copyMcJar)
-        createSrgMc.setMappings(extractSrg.getOutput())
-    }
-
-
-    task proguard(type: ProguardTask, dependsOn: createSrgMc) { // TODO: dont need to create srg mc if doing notch build
-        url 'https://downloads.sourceforge.net/project/proguard/proguard/6.0/proguard6.0.3.zip'
-        extract 'proguard6.0.3/lib/proguard.jar'
-    }
-
-    task createDist(type: CreateDistTask, dependsOn: proguard)
-
-}
 build.finalizedBy(createDist)
 
 install {

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

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

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

@@ -20,7 +20,6 @@ package baritone.gradle.task;
 import org.gradle.api.DefaultTask;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -41,53 +40,37 @@ class BaritoneGradleTask extends DefaultTask {
             PROGUARD_STANDALONE_CONFIG      = "standalone.pro",
             PROGUARD_EXPORT_PATH            = "proguard_out.jar",
 
-            ARTIFACT_STANDARD           = "%s-%s.jar",
-            ARTIFACT_UNOPTIMIZED        = "%s-unoptimized-%s.jar",
-            ARTIFACT_API                = "%s-api-%s.jar",
-            ARTIFACT_STANDALONE         = "%s-standalone-%s.jar",
-            ARTIFACT_FORGE_UNOPTIMIZED  = "%s-unoptimized-forge-%s.jar",
-            ARTIFACT_FORGE_API          = "%s-api-forge-%s.jar",
-            ARTIFACT_FORGE_STANDALONE   = "%s-standalone-forge-%s.jar",
-            ARTIFACT_FABRIC_UNOPTIMIZED = "%s-unoptimized-fabric-%s.jar",
-            ARTIFACT_FABRIC_API         = "%s-api-fabric-%s.jar",
-            ARTIFACT_FABRIC_STANDALONE  = "%s-standalone-fabric-%s.jar";
+            TEMP_LIBRARY_DIR = "tempLibraries/",
+
+            ARTIFACT_STANDARD         = "%s-%s.jar",
+            ARTIFACT_UNOPTIMIZED      = "%s-unoptimized-%s.jar",
+            ARTIFACT_API              = "%s-api-%s.jar",
+            ARTIFACT_STANDALONE       = "%s-standalone-%s.jar",
+            ARTIFACT_FORGE_API        = "%s-api-forge-%s.jar",
+            ARTIFACT_FORGE_STANDALONE = "%s-standalone-forge-%s.jar";
 
     protected String artifactName, artifactVersion;
-    protected final Path
-        artifactPath,
-        artifactUnoptimizedPath, artifactApiPath, artifactStandalonePath, // these are different for forge builds
-        proguardOut;
+    protected Path artifactPath, artifactUnoptimizedPath, artifactApiPath, artifactStandalonePath, artifactForgeApiPath, artifactForgeStandalonePath, proguardOut;
 
-    public BaritoneGradleTask() {
+    protected void verifyArtifacts() throws IllegalStateException {
         this.artifactName = getProject().getName();
         this.artifactVersion = getProject().getVersion().toString();
 
-        this.artifactPath = this.getBuildFile(formatVersion(ARTIFACT_STANDARD));
-
-        if (getProject().hasProperty("baritone.forge_build")) {
-            this.artifactUnoptimizedPath = this.getBuildFile(formatVersion(ARTIFACT_FORGE_UNOPTIMIZED));
-            this.artifactApiPath         = this.getBuildFile(formatVersion(ARTIFACT_FORGE_API));
-            this.artifactStandalonePath  = this.getBuildFile(formatVersion(ARTIFACT_FORGE_STANDALONE));
-        } else if (getProject().hasProperty("baritone.fabric_build")) {
-            this.artifactUnoptimizedPath = this.getBuildFile(formatVersion(ARTIFACT_FABRIC_UNOPTIMIZED));
-            this.artifactApiPath         = this.getBuildFile(formatVersion(ARTIFACT_FABRIC_API));
-            this.artifactStandalonePath  = this.getBuildFile(formatVersion(ARTIFACT_FABRIC_STANDALONE));
-        } else {
-            this.artifactUnoptimizedPath = this.getBuildFile(formatVersion(ARTIFACT_UNOPTIMIZED));
-            this.artifactApiPath         = this.getBuildFile(formatVersion(ARTIFACT_API));
-            this.artifactStandalonePath  = this.getBuildFile(formatVersion(ARTIFACT_STANDALONE));
-        }
+        this.artifactPath                = this.getBuildFile(formatVersion(ARTIFACT_STANDARD));
+        this.artifactUnoptimizedPath     = this.getBuildFile(formatVersion(ARTIFACT_UNOPTIMIZED));
+        this.artifactApiPath             = this.getBuildFile(formatVersion(ARTIFACT_API));
+        this.artifactStandalonePath      = this.getBuildFile(formatVersion(ARTIFACT_STANDALONE));
+        this.artifactForgeApiPath        = this.getBuildFile(formatVersion(ARTIFACT_FORGE_API));
+        this.artifactForgeStandalonePath = this.getBuildFile(formatVersion(ARTIFACT_FORGE_STANDALONE));
 
         this.proguardOut = this.getTemporaryFile(PROGUARD_EXPORT_PATH);
-    }
 
-    protected void verifyArtifacts() throws IllegalStateException {
         if (!Files.exists(this.artifactPath)) {
             throw new IllegalStateException("Artifact not found! Run build first!");
         }
     }
 
-    protected void write(InputStream stream, Path file) throws IOException {
+    protected void write(InputStream stream, Path file) throws Exception {
         if (Files.exists(file)) {
             Files.delete(file);
         }

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

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

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

@@ -18,10 +18,9 @@
 package baritone.gradle.task;
 
 import baritone.gradle.util.Determinizer;
+import baritone.gradle.util.MappingType;
+import baritone.gradle.util.ReobfWrapper;
 import org.apache.commons.io.IOUtils;
-import org.gradle.api.plugins.JavaPluginConvention;
-import org.gradle.api.tasks.Input;
-import org.gradle.api.tasks.TaskAction;
 import org.gradle.api.JavaVersion;
 import org.gradle.api.NamedDomainObjectContainer;
 import org.gradle.api.artifacts.Configuration;
@@ -39,12 +38,14 @@ import org.gradle.internal.jvm.inspection.DefaultJvmVersionDetector;
 import org.gradle.process.internal.DefaultExecActionFactory;
 
 import java.io.*;
+import java.lang.reflect.Field;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Stream;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
@@ -56,12 +57,18 @@ import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
  */
 public class ProguardTask extends BaritoneGradleTask {
 
+    private static final Pattern TEMP_LIBRARY_PATTERN = Pattern.compile("-libraryjars 'tempLibraries\\/([a-zA-Z0-9/_\\-\\.]+)\\.jar'");
+
     @Input
     private String url;
 
     @Input
     private String extract;
 
+    private List<String> requiredLibraries;
+
+    private File mixin;
+
     @TaskAction
     protected void exec() throws Exception {
         super.verifyArtifacts();
@@ -71,6 +78,7 @@ public class ProguardTask extends BaritoneGradleTask {
         downloadProguard();
         extractProguard();
         generateConfigs();
+        acquireDependencies();
         proguardApi();
         proguardStandalone();
         cleanup();
@@ -81,7 +89,7 @@ public class ProguardTask extends BaritoneGradleTask {
             Files.delete(this.artifactUnoptimizedPath);
         }
 
-        Determinizer.determinize(this.artifactPath.toString(), this.artifactUnoptimizedPath.toString());
+        Determinizer.determinize(this.artifactPath.toString(), this.artifactUnoptimizedPath.toString(), Optional.empty());
     }
 
     private void downloadProguard() throws Exception {
@@ -201,39 +209,14 @@ public class ProguardTask extends BaritoneGradleTask {
 
         // Setup the template that will be used to derive the API and Standalone configs
         List<String> template = Files.readAllLines(getTemporaryFile(PROGUARD_CONFIG_DEST));
-        template.add(0, "-injars '" + this.artifactPath.toString() + "'");
-        template.add(1, "-outjars '" + this.getTemporaryFile(PROGUARD_EXPORT_PATH) + "'");
+        template.add(0, "-injars " + this.artifactPath.toString());
+        template.add(1, "-outjars " + this.getTemporaryFile(PROGUARD_EXPORT_PATH));
 
         // Acquire the RT jar using "java -verbose". This doesn't work on Java 9+
         Process p = new ProcessBuilder(this.getJavaBinPathForProguard(), "-verbose").start();
         String out = IOUtils.toString(p.getInputStream(), "UTF-8").split("\n")[0].split("Opened ")[1].replace("]", "");
         template.add(2, "-libraryjars '" + out + "'");
 
-        {
-            final Stream<File> libraries;
-            {
-                // Discover all of the libraries that we will need to acquire from gradle
-                final Stream<File> dependencies = acquireDependencies()
-                    // remove MCP mapped jar
-                    .filter(f -> !f.toString().endsWith("-recomp.jar"))
-                    // go from the extra to the original downloaded client
-                    .map(f -> f.toString().endsWith("client-extra.jar") ? new File(f.getParentFile(), "client.jar") : f);
-
-                if (getProject().hasProperty("baritone.forge_build")) {
-                    libraries = dependencies
-                        .map(f -> f.toString().endsWith("client.jar") ? getSrgMcJar() : f);
-                } else if (getProject().hasProperty("baritone.fabric_build")) {
-                    libraries = dependencies
-                        .map(f -> f.getName().endsWith("-v2.jar") && f.getName().startsWith("minecraft-") ? getSrgMcJar() : f);
-                } else {
-                    libraries = dependencies;
-                }
-            }
-            libraries.forEach(f -> {
-                template.add(2, "-libraryjars '" + f + "'");
-            });
-        }
-
         // API config doesn't require any changes from the changes that we made to the template
         Files.write(getTemporaryFile(PROGUARD_API_CONFIG), template);
 
@@ -241,26 +224,165 @@ public class ProguardTask extends BaritoneGradleTask {
         List<String> standalone = new ArrayList<>(template);
         standalone.removeIf(s -> s.contains("# this is the keep api"));
         Files.write(getTemporaryFile(PROGUARD_STANDALONE_CONFIG), standalone);
+
+        // Discover all of the libraries that we will need to acquire from gradle
+        this.requiredLibraries = new ArrayList<>();
+        template.forEach(line -> {
+            if (!line.startsWith("#")) {
+                Matcher m = TEMP_LIBRARY_PATTERN.matcher(line);
+                if (m.find()) {
+                    this.requiredLibraries.add(m.group(1));
+                }
+            }
+        });
     }
 
-    private File getSrgMcJar() {
-        return getProject().getTasks().findByName("copyMcJar").getOutputs().getFiles().getSingleFile();
+    private void acquireDependencies() throws Exception {
+
+        // Create a map of all of the dependencies that we are able to access in this project
+        // Likely a better way to do this, I just pair the dependency with the first valid configuration
+        Map<String, Pair<Configuration, Dependency>> dependencyLookupMap = new HashMap<>();
+        getProject().getConfigurations().stream().filter(Configuration::isCanBeResolved).forEach(config ->
+                config.getAllDependencies().forEach(dependency ->
+                        dependencyLookupMap.putIfAbsent(dependency.getName() + "-" + dependency.getVersion(), Pair.of(config, dependency))));
+
+        // Create the directory if it doesn't already exist
+        Path tempLibraries = getTemporaryFile(TEMP_LIBRARY_DIR);
+        if (!Files.exists(tempLibraries)) {
+            Files.createDirectory(tempLibraries);
+        }
+
+        // Iterate the required libraries to copy them to tempLibraries
+        for (String lib : this.requiredLibraries) {
+            // copy from the forgegradle cache
+            if (lib.equals("minecraft")) {
+                Path cachedJar = getMinecraftJar();
+                Path inTempDir = getTemporaryFile("tempLibraries/minecraft.jar");
+                // TODO: maybe try not to copy every time
+                Files.copy(cachedJar, inTempDir, REPLACE_EXISTING);
+
+                continue;
+            }
+
+            // Find a configuration/dependency pair that matches the desired library
+            Pair<Configuration, Dependency> pair = null;
+            for (Map.Entry<String, Pair<Configuration, Dependency>> entry : dependencyLookupMap.entrySet()) {
+                if (entry.getKey().startsWith(lib)) {
+                    pair = entry.getValue();
+                }
+            }
+
+            // The pair must be non-null
+            Objects.requireNonNull(pair);
+
+            // Find the library jar file, and copy it to tempLibraries
+            for (File file : pair.getLeft().files(pair.getRight())) {
+                if (file.getName().startsWith(lib)) {
+                    if (lib.contains("mixin")) {
+                        mixin = file;
+                    }
+                    Files.copy(file.toPath(), getTemporaryFile("tempLibraries/" + lib + ".jar"), REPLACE_EXISTING);
+                }
+            }
+        }
+        if (mixin == null) {
+            throw new IllegalStateException("Unable to find mixin jar");
+        }
     }
 
-    private Stream<File> acquireDependencies() {
-        return getProject().getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("launch").getRuntimeClasspath().getFiles()
-            .stream()
-            .filter(File::isFile);
+    // a bunch of epic stuff to get the path to the cached jar
+    private Path getMinecraftJar() throws Exception {
+        MappingType mappingType;
+        try {
+            mappingType = getMappingType();
+        } catch (Exception e) {
+            System.err.println("Failed to get mapping type, assuming NOTCH.");
+            mappingType = MappingType.NOTCH;
+        }
+
+        String suffix;
+        switch (mappingType) {
+            case NOTCH:
+                suffix = "";
+                break;
+            case SEARGE:
+                suffix = "-srgBin";
+                break;
+            case CUSTOM:
+                throw new IllegalStateException("Custom mappings not supported!");
+            default:
+                throw new IllegalStateException("Unknown mapping type: " + mappingType);
+        }
+
+        DefaultConvention convention = (DefaultConvention) this.getProject().getConvention();
+        Object extension = convention.getAsMap().get("minecraft");
+        Objects.requireNonNull(extension);
+
+        // for some reason cant use Class.forName
+        Class<?> class_baseExtension = extension.getClass().getSuperclass().getSuperclass().getSuperclass(); // <-- cursed
+        Field f_replacer = class_baseExtension.getDeclaredField("replacer");
+        f_replacer.setAccessible(true);
+        Object replacer = f_replacer.get(extension);
+        Class<?> class_replacementProvider = replacer.getClass();
+        Field replacement_replaceMap = class_replacementProvider.getDeclaredField("replaceMap");
+        replacement_replaceMap.setAccessible(true);
+
+        Map<String, Object> replacements = (Map) replacement_replaceMap.get(replacer);
+        String cacheDir = replacements.get("CACHE_DIR").toString() + "/net/minecraft";
+        String mcVersion = replacements.get("MC_VERSION").toString();
+        String mcpInsert = replacements.get("MAPPING_CHANNEL").toString() + "/" + replacements.get("MAPPING_VERSION").toString();
+        String fullJarName = "minecraft-" + mcVersion + suffix + ".jar";
+
+        String baseDir = String.format("%s/minecraft/%s/", cacheDir, mcVersion);
+
+        String jarPath;
+        if (mappingType == MappingType.SEARGE) {
+            jarPath = String.format("%s/%s/%s", baseDir, mcpInsert, fullJarName);
+        } else {
+            jarPath = baseDir + fullJarName;
+        }
+        jarPath = jarPath
+                .replace("/", File.separator)
+                .replace("\\", File.separator); // hecking regex
+
+        return new File(jarPath).toPath();
+    }
+
+    // throws IllegalStateException if mapping type is ambiguous or it fails to find it
+    private MappingType getMappingType() {
+        // if it fails to find this then its probably a forgegradle version problem
+        Set<Object> reobf = (NamedDomainObjectContainer<Object>) this.getProject().getExtensions().getByName("reobf");
+
+        List<MappingType> mappingTypes = getUsedMappingTypes(reobf);
+        long mappingTypesUsed = mappingTypes.size();
+        if (mappingTypesUsed == 0) {
+            throw new IllegalStateException("Failed to find mapping type (no jar task?)");
+        }
+        if (mappingTypesUsed > 1) {
+            throw new IllegalStateException("Ambiguous mapping type (multiple jars with different mapping types?)");
+        }
+
+        return mappingTypes.get(0);
+    }
+
+    private List<MappingType> getUsedMappingTypes(Set<Object> reobf) {
+        return reobf.stream()
+                .map(ReobfWrapper::new)
+                .map(ReobfWrapper::getMappingType)
+                .distinct()
+                .collect(Collectors.toList());
     }
 
     private void proguardApi() throws Exception {
         runProguard(getTemporaryFile(PROGUARD_API_CONFIG));
-        Determinizer.determinize(this.proguardOut.toString(), this.artifactApiPath.toString());
+        Determinizer.determinize(this.proguardOut.toString(), this.artifactApiPath.toString(), Optional.empty());
+        Determinizer.determinize(this.proguardOut.toString(), this.artifactForgeApiPath.toString(), Optional.of(mixin));
     }
 
     private void proguardStandalone() throws Exception {
         runProguard(getTemporaryFile(PROGUARD_STANDALONE_CONFIG));
-        Determinizer.determinize(this.proguardOut.toString(), this.artifactStandalonePath.toString());
+        Determinizer.determinize(this.proguardOut.toString(), this.artifactStandalonePath.toString(), Optional.empty());
+        Determinizer.determinize(this.proguardOut.toString(), this.artifactForgeStandalonePath.toString(), Optional.of(mixin));
     }
 
     private void cleanup() {
@@ -283,15 +405,9 @@ public class ProguardTask extends BaritoneGradleTask {
             Files.delete(this.proguardOut);
         }
 
-        // Make paths relative to work directory; fixes spaces in path to config, @"" doesn't work
-        Path workingDirectory = getTemporaryFile("");
-        Path proguardJar = workingDirectory.relativize(getTemporaryFile(PROGUARD_JAR));
-        config = workingDirectory.relativize(config);
-        
-        // Honestly, if you still have spaces in your path at this point, you're SOL.
-
+        Path proguardJar = getTemporaryFile(PROGUARD_JAR);
         Process p = new ProcessBuilder("java", "-jar", proguardJar.toString(), "@" + config.toString())
-                .directory(workingDirectory.toFile()) // Set the working directory to the temporary folder]
+                .directory(getTemporaryFile("").toFile()) // Set the working directory to the temporary folder]
                 .start();
 
         // We can't do output inherit process I/O with gradle for some reason and have it work, so we have to do this

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

@@ -22,10 +22,7 @@ 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.*;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.jar.JarOutputStream;
@@ -39,7 +36,7 @@ import java.util.stream.Collectors;
  */
 public class Determinizer {
 
-    public static void determinize(String inputPath, String outputPath) throws IOException {
+    public static void determinize(String inputPath, String outputPath, Optional<File> toInclude) throws IOException {
         System.out.println("Running Determinizer");
         System.out.println(" Input path: " + inputPath);
         System.out.println(" Output path: " + outputPath);
@@ -66,10 +63,30 @@ public class Determinizer {
                 if (entry.getName().endsWith(".refmap.json")) {
                     JsonObject object = new JsonParser().parse(new InputStreamReader(jarFile.getInputStream(entry))).getAsJsonObject();
                     jos.write(writeSorted(object).getBytes());
+                } else if (entry.getName().equals("META-INF/MANIFEST.MF") && toInclude.isPresent()) { // only replace for forge jar
+                    ByteArrayOutputStream cancer = new ByteArrayOutputStream();
+                    copy(jarFile.getInputStream(entry), cancer);
+                    String manifest = new String(cancer.toByteArray());
+                    if (!manifest.contains("baritone.launch.BaritoneTweaker")) {
+                        throw new IllegalStateException("unable to replace");
+                    }
+                    manifest = manifest.replace("baritone.launch.BaritoneTweaker", "org.spongepowered.asm.launch.MixinTweaker");
+                    jos.write(manifest.getBytes());
                 } else {
                     copy(jarFile.getInputStream(entry), jos);
                 }
             }
+            if (toInclude.isPresent()) {
+                try (JarFile mixin = new JarFile(toInclude.get())) {
+                    for (JarEntry entry : mixin.stream().sorted(Comparator.comparing(JarEntry::getName)).collect(Collectors.toList())) {
+                        if (entry.getName().startsWith("META-INF") && !entry.getName().startsWith("META-INF/services")) {
+                            continue;
+                        }
+                        jos.putNextEntry(entry);
+                        copy(mixin.getInputStream(entry), jos);
+                    }
+                }
+            }
             jos.finish();
         }
     }

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

@@ -0,0 +1,29 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.gradle.util;
+
+/**
+ * All credits go to AsmLibGradle and its contributors.
+ *
+ * @see <a href="https://github.com/pozzed/AsmLibGradle/blob/8f917dbc3939eab7a3d9daf54d9d285fdf34f4b2/src/main/java/net/futureclient/asmlib/forgegradle/MappingType.java">Original Source</a>
+ */
+public enum MappingType {
+    SEARGE,
+    NOTCH,
+    CUSTOM // forgegradle
+}

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

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

scripts/proguard.pro

@@ -1,6 +1,5 @@
 -keepattributes Signature
 -keepattributes *Annotation*
--keepattributes InnerClasses
 
 -optimizationpasses 5
 -verbose
@@ -15,12 +14,7 @@
 
 # lwjgl is weird
 -dontwarn org.lwjgl.**
-# also lwjgl lol
--dontwarn module-info
-# we dont have forge
--dontwarn baritone.launch.BaritoneForgeModXD
 
-# please do not change the comment below
 -keep class baritone.api.** { *; } # this is the keep api
 
 # service provider needs these class names
@@ -28,7 +22,6 @@
 -keep class baritone.api.IBaritoneProvider
 
 -keep class baritone.api.utils.MyChunkPos { *; } # even in standalone we need to keep this for gson reflect
--keepname class baritone.api.utils.BlockOptionalMeta # this name is exposed to the user, so we need to keep it in all builds
 
 # Keep any class or member annotated with @KeepName so we dont have to put everything in the script
 -keep,allowobfuscation @interface baritone.KeepName
@@ -47,10 +40,58 @@
 
 #try to keep usage of schematica in separate classes
 -keep class baritone.utils.schematic.schematica.**
--keep class baritone.utils.schematic.litematica.**
 #proguard doesnt like it when it cant find our fake schematica classes
 -dontwarn baritone.utils.schematic.schematica.**
--dontwarn baritone.utils.schematic.litematica.**
+
+# copy all necessary libraries into tempLibraries to build
+
+# The correct jar will be copied from the forgegradle cache based on the mapping type being compiled with
+-libraryjars 'tempLibraries/minecraft.jar'
+
+-libraryjars 'tempLibraries/SimpleTweaker-1.2.jar'
+
+-libraryjars 'tempLibraries/authlib-1.5.25.jar'
+-libraryjars 'tempLibraries/codecjorbis-20101023.jar'
+-libraryjars 'tempLibraries/codecwav-20101023.jar'
+-libraryjars 'tempLibraries/commons-codec-1.10.jar'
+-libraryjars 'tempLibraries/commons-compress-1.8.1.jar'
+-libraryjars 'tempLibraries/commons-io-2.5.jar'
+-libraryjars 'tempLibraries/commons-lang3-3.5.jar'
+-libraryjars 'tempLibraries/commons-logging-1.1.3.jar'
+-libraryjars 'tempLibraries/fastutil-7.1.0.jar'
+-libraryjars 'tempLibraries/gson-2.8.0.jar'
+-libraryjars 'tempLibraries/guava-21.0.jar'
+-libraryjars 'tempLibraries/httpclient-4.3.3.jar'
+-libraryjars 'tempLibraries/httpcore-4.3.2.jar'
+-libraryjars 'tempLibraries/icu4j-core-mojang-51.2.jar'
+-libraryjars 'tempLibraries/jinput-2.0.5.jar'
+-libraryjars 'tempLibraries/jna-4.4.0.jar'
+-libraryjars 'tempLibraries/jopt-simple-5.0.3.jar'
+-libraryjars 'tempLibraries/jsr305-3.0.1.jar'
+-libraryjars 'tempLibraries/jutils-1.0.0.jar'
+-libraryjars 'tempLibraries/libraryjavasound-20101123.jar'
+-libraryjars 'tempLibraries/librarylwjglopenal-20100824.jar'
+-libraryjars 'tempLibraries/log4j-api-2.8.1.jar'
+-libraryjars 'tempLibraries/log4j-core-2.8.1.jar'
+
+# startsWith is used to check the library, and mac/linux differ in which version they use
+# this is FINE
+-libraryjars 'tempLibraries/lwjgl-.jar'
+-libraryjars 'tempLibraries/lwjgl_util-.jar'
+
+-libraryjars 'tempLibraries/netty-all-4.1.9.Final.jar'
+-libraryjars 'tempLibraries/oshi-core-1.1.jar'
+-libraryjars 'tempLibraries/patchy-1.2.jar'
+-libraryjars 'tempLibraries/platform-3.4.0.jar'
+-libraryjars 'tempLibraries/realms-1.10.22.jar'
+-libraryjars 'tempLibraries/soundsystem-20120107.jar'
+-libraryjars 'tempLibraries/text2speech-1.10.3.jar'
+
+-libraryjars 'tempLibraries/mixin-0.7.11-SNAPSHOT.jar'
+-libraryjars 'tempLibraries/launchwrapper-1.11.jar' # TODO why does only 1.11.jar exist?
+
+
+
 
 # Keep - Applications. Keep all application classes, along with their 'main'
 # methods.

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

@@ -19,6 +19,9 @@ package baritone.api;
 
 import baritone.api.utils.SettingsUtil;
 
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
 /**
  * Exposes the {@link IBaritoneProvider} instance and the {@link Settings} instance for API usage.
  *
@@ -32,13 +35,11 @@ public final class BaritoneAPI {
 
     static {
         settings = new Settings();
-        SettingsUtil.readAndApply(settings, SettingsUtil.SETTINGS_DEFAULT_NAME);
+        SettingsUtil.readAndApply(settings);
 
-        try {
-            provider = (IBaritoneProvider) Class.forName("baritone.BaritoneProvider").newInstance();
-        } catch (ReflectiveOperationException ex) {
-            throw new RuntimeException(ex);
-        }
+        ServiceLoader<IBaritoneProvider> baritoneLoader = ServiceLoader.load(IBaritoneProvider.class);
+        Iterator<IBaritoneProvider> instances = baritoneLoader.iterator();
+        provider = instances.next();
     }
 
     public static IBaritoneProvider getProvider() {

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

@@ -21,8 +21,7 @@ import baritone.api.cache.IWorldScanner;
 import baritone.api.command.ICommand;
 import baritone.api.command.ICommandSystem;
 import baritone.api.schematic.ISchematicSystem;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.client.entity.EntityPlayerSP;
 
 import java.util.List;
 import java.util.Objects;
@@ -48,18 +47,20 @@ public interface IBaritoneProvider {
      * returned by {@link #getPrimaryBaritone()}.
      *
      * @return All active {@link IBaritone} instances.
-     * @see #getBaritoneForPlayer(ClientPlayerEntity)
+     * @see #getBaritoneForPlayer(EntityPlayerSP)
      */
     List<IBaritone> getAllBaritones();
 
     /**
-     * Provides the {@link IBaritone} instance for a given {@link ClientPlayerEntity}.
+     * Provides the {@link IBaritone} instance for a given {@link EntityPlayerSP}. This will likely be
+     * replaced with or be overloaded in addition to {@code #getBaritoneForUser(IBaritoneUser)} when
+     * {@code bot-system} is merged into {@code master}.
      *
      * @param player The player
      * @return The {@link IBaritone} instance.
      */
-    default IBaritone getBaritoneForPlayer(ClientPlayerEntity player) {
-        for (IBaritone baritone : this.getAllBaritones()) {
+    default IBaritone getBaritoneForPlayer(EntityPlayerSP player) {
+        for (IBaritone baritone : getAllBaritones()) {
             if (Objects.equals(player, baritone.getPlayerContext().player())) {
                 return baritone;
             }
@@ -67,39 +68,6 @@ public interface IBaritoneProvider {
         return null;
     }
 
-    /**
-     * Provides the {@link IBaritone} instance for a given {@link Minecraft}.
-     *
-     * @param minecraft The minecraft
-     * @return The {@link IBaritone} instance.
-     */
-    default IBaritone getBaritoneForMinecraft(Minecraft minecraft) {
-        for (IBaritone baritone : this.getAllBaritones()) {
-            if (Objects.equals(minecraft, baritone.getPlayerContext().minecraft())) {
-                return baritone;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Creates and registers a new {@link IBaritone} instance using the specified {@link Minecraft}. The existing
-     * instance is returned if already registered.
-     *
-     * @param minecraft The minecraft
-     * @return The {@link IBaritone} instance
-     */
-    IBaritone createBaritone(Minecraft minecraft);
-
-    /**
-     * Destroys and removes the specified {@link IBaritone} instance. If the specified instance is the
-     * {@link #getPrimaryBaritone() primary baritone}, this operation has no effect and will return {@code false}.
-     *
-     * @param baritone The baritone instance to remove
-     * @return Whether the baritone instance was removed
-     */
-    boolean destroyBaritone(IBaritone baritone);
-
     /**
      * Returns the {@link IWorldScanner} instance. This is not a type returned by
      * {@link IBaritone} implementation, because it is not linked with {@link IBaritone}.

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

@@ -22,24 +22,20 @@ import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.TypeUtils;
 import baritone.api.utils.gui.BaritoneToast;
 import net.minecraft.block.Block;
-import net.minecraft.block.Blocks;
 import net.minecraft.client.Minecraft;
+import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
-import net.minecraft.util.math.vector.Vector3i;
+import net.minecraft.util.math.Vec3i;
 import net.minecraft.util.text.ITextComponent;
 
 import java.awt.*;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.List;
 import java.util.*;
-import java.util.function.BiConsumer;
 import java.util.function.Consumer;
+import java.util.function.BiConsumer;
 
 /**
  * Baritone's settings. Settings apply to all Baritone instances.
@@ -53,11 +49,6 @@ public final class Settings {
      */
     public final Setting<Boolean> allowBreak = new Setting<>(true);
 
-    /**
-     * Blocks that baritone will be allowed to break even with allowBreak set to false
-     */
-    public final Setting<List<Block>> allowBreakAnyway = new Setting<>(new ArrayList<>());
-
     /**
      * Allow Baritone to sprint
      */
@@ -73,16 +64,6 @@ public final class Settings {
      */
     public final Setting<Boolean> allowInventory = new Setting<>(false);
 
-    /**
-     * Wait this many ticks between InventoryBehavior moving inventory items
-     */
-    public final Setting<Integer> ticksBetweenInventoryMoves = new Setting<>(1);
-
-    /**
-     * Come to a halt before doing any inventory moves. Intended for anticheat such as 2b2t
-     */
-    public final Setting<Boolean> inventoryMoveOnlyIfStationary = new Setting<>(false);
-
     /**
      * Disable baritone's auto-tool at runtime, but still assume that another mod will provide auto tool functionality
      * <p>
@@ -121,13 +102,6 @@ public final class Settings {
      */
     public final Setting<Double> walkOnWaterOnePenalty = new Setting<>(3D);
 
-    /**
-     * Don't allow breaking blocks next to liquids.
-     * <p>
-     * Enable if you have mods adding custom fluid physics.
-     */
-    public final Setting<Boolean> strictLiquidCheck = new Setting<>(false);
-
     /**
      * Allow Baritone to fall arbitrary distances and place a water bucket beneath it.
      * Reliability: questionable.
@@ -137,8 +111,6 @@ public final class Settings {
     /**
      * Allow Baritone to assume it can walk on still water just like any other block.
      * This functionality is assumed to be provided by a separate library that might have imported Baritone.
-     * <p>
-     * Note: This will prevent some usage of the frostwalker enchantment, like pillaring up from water.
      */
     public final Setting<Boolean> assumeWalkOnWater = new Setting<>(false);
 
@@ -202,10 +174,10 @@ public final class Settings {
      * Blocks that Baritone is allowed to place (as throwaway, for sneak bridging, pillaring, etc.)
      */
     public final Setting<List<Item>> acceptableThrowawayItems = new Setting<>(new ArrayList<>(Arrays.asList(
-            Blocks.DIRT.asItem(),
-            Blocks.COBBLESTONE.asItem(),
-            Blocks.NETHERRACK.asItem(),
-            Blocks.STONE.asItem()
+            Item.getItemFromBlock(Blocks.DIRT),
+            Item.getItemFromBlock(Blocks.COBBLESTONE),
+            Item.getItemFromBlock(Blocks.NETHERRACK),
+            Item.getItemFromBlock(Blocks.STONE)
     )));
 
     /**
@@ -218,25 +190,16 @@ public final class Settings {
     /**
      * Blocks that Baritone is not allowed to break
      */
-    public final Setting<List<Block>> blocksToDisallowBreaking = new Setting<>(new ArrayList<>(
-            // Leave Empty by Default
-    ));
-
-    /**
-     * blocks that baritone shouldn't break, but can if it needs to.
-     */
     public final Setting<List<Block>> blocksToAvoidBreaking = new Setting<>(new ArrayList<>(Arrays.asList( // TODO can this be a HashSet or ImmutableSet?
             Blocks.CRAFTING_TABLE,
             Blocks.FURNACE,
+            Blocks.LIT_FURNACE,
             Blocks.CHEST,
-            Blocks.TRAPPED_CHEST
+            Blocks.TRAPPED_CHEST,
+            Blocks.STANDING_SIGN,
+            Blocks.WALL_SIGN
     )));
 
-    /**
-     * this multiplies the break speed, if set above 1 it's "encourage breaking" instead
-     */
-    public final Setting<Double> avoidBreakingMultiplier = new Setting<>(.1);
-
     /**
      * A list of blocks to be treated as if they're air.
      * <p>
@@ -259,8 +222,6 @@ public final class Settings {
      * A mapping of blocks to blocks treated as correct in their position
      * <p>
      * If a schematic asks for a block on this mapping, all blocks on the mapped list will be accepted at that location as well
-     * <p>
-     * Syntax same as <a href="https://baritone.leijurv.com/baritone/api/Settings.html#buildSubstitutes">buildSubstitutes</a>
      */
     public final Setting<Map<Block, List<Block>>> buildValidSubstitutes = new Setting<>(new HashMap<>());
 
@@ -268,15 +229,6 @@ public final class Settings {
      * A mapping of blocks to blocks to be built instead
      * <p>
      * If a schematic asks for a block on this mapping, Baritone will place the first placeable block in the mapped list
-     * <p>
-     * Usage Syntax:
-     * <pre>
-     *      sourceblockA->blockToSubstituteA1,blockToSubstituteA2,...blockToSubstituteAN,sourceBlockB->blockToSubstituteB1,blockToSubstituteB2,...blockToSubstituteBN,...sourceBlockX->blockToSubstituteX1,blockToSubstituteX2...blockToSubstituteXN
-     * </pre>
-     * Example:
-     * <pre>
-     *     stone->cobblestone,andesite,oak_planks->birch_planks,acacia_planks,glass
-     * </pre>
      */
     public final Setting<Map<Block, List<Block>>> buildSubstitutes = new Setting<>(new HashMap<>());
 
@@ -294,17 +246,6 @@ public final class Settings {
      */
     public final Setting<Boolean> buildIgnoreExisting = new Setting<>(false);
 
-    /**
-     * If this is true, the builder will ignore directionality of certain blocks like glazed terracotta.
-     */
-    public final Setting<Boolean> buildIgnoreDirection = new Setting<>(false);
-
-    /**
-     * A list of names of block properties the builder will ignore.
-     */
-    public final Setting<List<String>> buildIgnoreProperties = new Setting<>(new ArrayList<>(Arrays.asList(
-    )));
-
     /**
      * If this setting is true, Baritone will never break a block that is adjacent to an unsupported falling block.
      * <p>
@@ -369,11 +310,6 @@ public final class Settings {
      */
     public final Setting<Integer> rightClickSpeed = new Setting<>(4);
 
-    /**
-     * How many degrees to randomize the yaw every tick. Set to 0 to disable
-     */
-    public final Setting<Double> randomLooking113 = new Setting<>(2d);
-
     /**
      * Block reach distance
      */
@@ -432,9 +368,6 @@ public final class Settings {
      */
     public final Setting<Double> mobSpawnerAvoidanceCoefficient = new Setting<>(2.0);
 
-    /**
-     * Distance to avoid mob spawners.
-     */
     public final Setting<Integer> mobSpawnerAvoidanceRadius = new Setting<>(16);
 
     /**
@@ -444,9 +377,6 @@ public final class Settings {
      */
     public final Setting<Double> mobAvoidanceCoefficient = new Setting<>(1.5);
 
-    /**
-     * Distance to avoid mobs.
-     */
     public final Setting<Integer> mobAvoidanceRadius = new Setting<>(8);
 
     /**
@@ -597,17 +527,6 @@ public final class Settings {
      */
     public final Setting<Long> slowPathTimeoutMS = new Setting<>(40000L);
 
-
-    /**
-     * allows baritone to save bed waypoints when interacting with beds
-     */
-    public final Setting<Boolean> doBedWaypoints = new Setting<>(true);
-
-    /**
-     * allows baritone to save death waypoints
-     */
-    public final Setting<Boolean> doDeathWaypoints = new Setting<>(true);
-
     /**
      * The big one. Download all chunks in simplified 2-bit format and save them for better very-long-distance pathing.
      */
@@ -625,11 +544,11 @@ public final class Settings {
     public final Setting<Boolean> pruneRegionsFromRAM = new Setting<>(true);
 
     /**
-     * The chunk packer queue can never grow to larger than this, if it does, the oldest chunks are discarded
+     * Remember the contents of containers (chests, echests, furnaces)
      * <p>
-     * The newest chunks are kept, so that if you're moving in a straight line quickly then stop, your immediate render distance is still included
+     * Really buggy since the packet stuff is multithreaded badly thanks to brady
      */
-    public final Setting<Integer> chunkPackerQueueMaxSize = new Setting<>(2000);
+    public final Setting<Boolean> containerMemory = new Setting<>(false);
 
     /**
      * Fill in blocks behind you
@@ -732,17 +651,6 @@ public final class Settings {
      */
     public final Setting<Boolean> freeLook = new Setting<>(true);
 
-    /**
-     * Break and place blocks without having to force the client-sided rotations. Requires {@link #freeLook}.
-     */
-    public final Setting<Boolean> blockFreeLook = new Setting<>(false);
-
-    /**
-     * When true, the player will remain with its existing look direction as often as possible.
-     * Although, in some cases this can get it stuck, hence this setting to disable that behavior.
-     */
-    public final Setting<Boolean> remainWithExistingLookDirection = new Setting<>(true);
-
     /**
      * Will cause some minor behavioral differences to ensure that Baritone works on anticheats.
      * <p>
@@ -877,11 +785,6 @@ public final class Settings {
      */
     public final Setting<Integer> minYLevelWhileMining = new Setting<>(0);
 
-    /**
-     * Sets the maximum y level to mine ores at.
-     */
-    public final Setting<Integer> maxYLevelWhileMining = new Setting<>(255); // 1.17+ defaults to maximum possible world height
-
     /**
      * This will only allow baritone to mine exposed ores, can be used to stop ore obfuscators on servers that use them.
      */
@@ -966,12 +869,12 @@ public final class Settings {
     /**
      * Only build the selected part of schematics
      */
-    public final Setting<Boolean> buildOnlySelection = new Setting<>(false);
+     public final Setting<Boolean> buildOnlySelection = new Setting<>(false);
 
     /**
      * How far to move before repeating the build. 0 to disable repeating on a certain axis, 0,0,0 to disable entirely
      */
-    public final Setting<Vector3i> buildRepeat = new Setting<>(new Vector3i(0, 0, 0));
+    public final Setting<Vec3i> buildRepeat = new Setting<>(new Vec3i(0, 0, 0));
 
     /**
      * How many times to buildrepeat. -1 for infinite.
@@ -1178,15 +1081,13 @@ public final class Settings {
      * via {@link Consumer#andThen(Consumer)} or it can completely be overriden via setting
      * {@link Setting#value};
      */
-    @JavaOnly
-    public final Setting<Consumer<ITextComponent>> logger = new Setting<>(msg -> Minecraft.getInstance().ingameGUI.getChatGUI().printChatMessage(msg));
+    public final Setting<Consumer<ITextComponent>> logger = new Setting<>(Minecraft.getMinecraft().ingameGUI.getChatGUI()::printChatMessage);
 
     /**
      * The function that is called when Baritone will send a desktop notification. This function can be added to
      * via {@link Consumer#andThen(Consumer)} or it can completely be overriden via setting
      * {@link Setting#value};
      */
-    @JavaOnly
     public final Setting<BiConsumer<String, Boolean>> notifier = new Setting<>(NotificationHelper::notify);
 
     /**
@@ -1194,14 +1095,8 @@ public final class Settings {
      * via {@link Consumer#andThen(Consumer)} or it can completely be overriden via setting
      * {@link Setting#value};
      */
-    @JavaOnly
     public final Setting<BiConsumer<ITextComponent, ITextComponent>> toaster = new Setting<>(BaritoneToast::addOrUpdate);
 
-    /**
-     * Print out ALL command exceptions as a stack trace to stdout, even simple syntax errors
-     */
-    public final Setting<Boolean> verboseCommandExceptions = new Setting<>(false);
-
     /**
      * The size of the box that is rendered when the current goal is a GoalYLevel
      */
@@ -1344,7 +1239,6 @@ public final class Settings {
         public T value;
         public final T defaultValue;
         private String name;
-        private boolean javaOnly;
 
         @SuppressWarnings("unchecked")
         private Setting(T value) {
@@ -1353,7 +1247,6 @@ public final class Settings {
             }
             this.value = value;
             this.defaultValue = value;
-            this.javaOnly = false;
         }
 
         /**
@@ -1390,25 +1283,8 @@ public final class Settings {
         public final Type getType() {
             return settingTypes.get(this);
         }
-
-        /**
-         * This should always be the same as whether the setting can be parsed from or serialized to a string; in other
-         * words, the only way to modify it is by writing to {@link #value} programatically.
-         *
-         * @return {@code true} if the setting can not be set or read by the user
-         */
-        public boolean isJavaOnly() {
-            return javaOnly;
-        }
     }
 
-    /**
-     * Marks a {@link Setting} field as being {@link Setting#isJavaOnly() Java-only}
-     */
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.FIELD)
-    private @interface JavaOnly {}
-
     // here be dragons
 
     Settings() {
@@ -1424,7 +1300,6 @@ public final class Settings {
                     Setting<?> setting = (Setting<?>) field.get(this);
                     String name = field.getName();
                     setting.name = name;
-                    setting.javaOnly = field.isAnnotationPresent(JavaOnly.class);
                     name = name.toLowerCase();
                     if (tmpByName.containsKey(name)) {
                         throw new IllegalStateException("Duplicate setting name");

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

@@ -17,8 +17,6 @@
 
 package baritone.api.behavior;
 
-import baritone.api.Settings;
-import baritone.api.behavior.look.IAimProcessor;
 import baritone.api.utils.Rotation;
 
 /**
@@ -28,23 +26,14 @@ import baritone.api.utils.Rotation;
 public interface ILookBehavior extends IBehavior {
 
     /**
-     * Updates the current {@link ILookBehavior} target to target the specified rotations on the next tick. If any sort
-     * of block interaction is required, {@code blockInteract} should be {@code true}. It is not guaranteed that the
-     * rotations set by the caller will be the exact rotations expressed by the client (This is due to settings like
-     * {@link Settings#randomLooking}). If the rotations produced by this behavior are required, then the
-     * {@link #getAimProcessor() aim processor} should be used.
+     * Updates the current {@link ILookBehavior} target to target
+     * the specified rotations on the next tick. If force is {@code true},
+     * then freeLook will be overriden and angles will be set regardless.
+     * If any sort of block interaction is required, force should be {@code true},
+     * otherwise, it should be {@code false};
      *
-     * @param rotation      The target rotations
-     * @param blockInteract Whether the target rotations are needed for a block interaction
+     * @param rotation The target rotations
+     * @param force    Whether or not to "force" the rotations
      */
-    void updateTarget(Rotation rotation, boolean blockInteract);
-
-    /**
-     * The aim processor instance for this {@link ILookBehavior}, which is responsible for applying additional,
-     * deterministic transformations to the target rotation set by {@link #updateTarget}.
-     *
-     * @return The aim processor
-     * @see IAimProcessor#fork
-     */
-    IAimProcessor getAimProcessor();
+    void updateTarget(Rotation rotation, boolean force);
 }

src/api/java/baritone/api/behavior/look/IAimProcessor.java

@@ -1,45 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.behavior.look;
-
-import baritone.api.utils.Rotation;
-
-/**
- * @author Brady
- */
-public interface IAimProcessor {
-
-    /**
-     * Returns the actual rotation that will be used when the desired rotation is requested. The returned rotation
-     * always reflects what would happen in the upcoming tick. In other words, it is a pure function, and no internal
-     * state changes. If simulation of the rotation states beyond the next tick is required, then a
-     * {@link IAimProcessor#fork fork} should be created.
-     *
-     * @param desired The desired rotation to set
-     * @return The actual rotation
-     */
-    Rotation peekRotation(Rotation desired);
-
-    /**
-     * Returns a copy of this {@link IAimProcessor} which has its own internal state and is manually tickable.
-     *
-     * @return The forked processor
-     * @see ITickableAimProcessor
-     */
-    ITickableAimProcessor fork();
-}

src/api/java/baritone/api/behavior/look/ITickableAimProcessor.java

@@ -1,47 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.behavior.look;
-
-import baritone.api.utils.Rotation;
-
-/**
- * @author Brady
- */
-public interface ITickableAimProcessor extends IAimProcessor {
-
-    /**
-     * Advances the internal state of this aim processor by a single tick.
-     */
-    void tick();
-
-    /**
-     * Calls {@link #tick()} the specified number of times.
-     *
-     * @param ticks The number of calls
-     */
-    void advance(int ticks);
-
-    /**
-     * Returns the actual rotation as provided by {@link #peekRotation(Rotation)}, and then automatically advances the
-     * internal state by one {@link #tick() tick}.
-     *
-     * @param rotation The desired rotation to set
-     * @return The actual rotation
-     */
-    Rotation nextRotation(Rotation rotation);
-}

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

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

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

@@ -15,29 +15,30 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package fi.dy.masa.litematica.schematic.placement;
+package baritone.api.cache;
 
 import net.minecraft.util.math.BlockPos;
 
-import javax.annotation.Nullable;
-import java.io.File;
+import java.util.Map;
 
-public class SchematicPlacementUnloaded {
-    protected String name = "?";
-    @Nullable
-    protected File schematicFile;
-    protected BlockPos origin = BlockPos.ZERO;
+/**
+ * @author Brady
+ * @since 9/23/2018
+ */
+public interface IContainerMemory {
 
-    public String getName() {
-        return this.name;
-    }
+    /**
+     * Gets a remembered inventory by its block position.
+     *
+     * @param pos The position of the container block
+     * @return The remembered inventory
+     */
+    IRememberedInventory getInventoryByPos(BlockPos pos);
 
-    @Nullable
-    public File getSchematicFile() {
-        return this.schematicFile;
-    }
-
-    public BlockPos getOrigin() {
-        return this.origin;
-    }
-}
+    /**
+     * 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/cache/IRememberedInventory.java

@@ -15,20 +15,25 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.utils.accessor;
+package baritone.api.cache;
 
-import net.minecraft.world.chunk.Chunk;
+import net.minecraft.item.ItemStack;
 
-import java.util.concurrent.atomic.AtomicReferenceArray;
+import java.util.List;
 
-public interface IChunkArray {
-    void copyFrom(IChunkArray other);
+/**
+ * @author Brady
+ * @since 9/23/2018
+ */
+public interface IRememberedInventory {
 
-    AtomicReferenceArray<Chunk> getChunks();
+    /**
+     * @return The contents of this inventory
+     */
+    List<ItemStack> getContents();
 
-    int centerX();
-
-    int centerZ();
-
-    int viewDistance();
+    /**
+     * @return The number of slots in this inventory
+     */
+    int getSize();
 }

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

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

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

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

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

@@ -27,7 +27,7 @@ import baritone.api.command.exception.CommandInvalidTypeException;
 import baritone.api.command.exception.CommandNotEnoughArgumentsException;
 import baritone.api.command.exception.CommandTooManyArgumentsException;
 import baritone.api.utils.Helper;
-import net.minecraft.util.Direction;
+import net.minecraft.util.EnumFacing;
 
 import java.util.Deque;
 import java.util.LinkedList;
@@ -404,8 +404,8 @@ public interface IArgConsumer {
     /**
      * Gets an enum value from the enum class with the same name as the next argument's value
      * <p>
-     * For example if you getEnum as an {@link Direction}, and the next argument's value is "up", this will return
-     * {@link Direction#UP}
+     * For example if you getEnum as an {@link EnumFacing}, and the next argument's value is "up", this will return
+     * {@link EnumFacing#UP}
      *
      * @param enumClass The enum class to search
      * @return An enum constant of that class with the same name as the next argument's value
@@ -419,8 +419,8 @@ public interface IArgConsumer {
     /**
      * Gets an enum value from the enum class with the same name as the next argument's value
      * <p>
-     * For example if you getEnum as an {@link Direction}, and the next argument's value is "up", this will return
-     * {@link Direction#UP}
+     * For example if you getEnum as an {@link EnumFacing}, and the next argument's value is "up", this will return
+     * {@link EnumFacing#UP}
      *
      * @param enumClass The enum class to search
      * @param def       The default value
@@ -436,8 +436,8 @@ public interface IArgConsumer {
     /**
      * Gets an enum value from the enum class with the same name as the next argument's value
      * <p>
-     * For example if you getEnum as an {@link Direction}, and the next argument's value is "up", this will return
-     * {@link Direction#UP}
+     * For example if you getEnum as an {@link EnumFacing}, and the next argument's value is "up", this will return
+     * {@link EnumFacing#UP}
      *
      * @param enumClass The enum class to search
      * @return An enum constant of that class with the same name as the next argument's value, or {@code null} if it

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

@@ -19,7 +19,7 @@ package baritone.api.command.argument;
 
 import baritone.api.command.argparser.IArgParser;
 import baritone.api.command.exception.CommandInvalidTypeException;
-import net.minecraft.util.Direction;
+import net.minecraft.util.EnumFacing;
 
 /**
  * A {@link ICommandArgument} is an immutable object representing one command argument. It contains data on the index of
@@ -50,8 +50,8 @@ public interface ICommandArgument {
     /**
      * Gets an enum value from the enum class with the same name as this argument's value
      * <p>
-     * For example if you getEnum as an {@link Direction}, and this argument's value is "up", it will return {@link
-     * Direction#UP}
+     * For example if you getEnum as an {@link EnumFacing}, and this argument's value is "up", it will return {@link
+     * EnumFacing#UP}
      *
      * @param enumClass The enum class to search
      * @return An enum constant of that class with the same name as this argument's value

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

@@ -20,25 +20,19 @@ package baritone.api.command.datatypes;
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
 import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.registry.Registry;
 
-import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
 public enum BlockById implements IDatatypeFor<Block> {
     INSTANCE;
 
-    /**
-     * Matches (domain:)?name? where domain and name are [a-z0-9_.-]+ and [a-z0-9/_.-]+ respectively.
-     */
-    private static Pattern PATTERN = Pattern.compile("(?:[a-z0-9_.-]+:)?[a-z0-9/_.-]*");
-
     @Override
     public Block get(IDatatypeContext ctx) throws CommandException {
         ResourceLocation id = new ResourceLocation(ctx.getConsumer().getString());
         Block block;
-        if ((block = Registry.BLOCK.getOptional(id).orElse(null)) == null) {
+        if ((block = Block.REGISTRY.getObject(id)) == Blocks.AIR) {
             throw new IllegalArgumentException("no block found by that id");
         }
         return block;
@@ -46,19 +40,13 @@ public enum BlockById implements IDatatypeFor<Block> {
 
     @Override
     public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
-        String arg = ctx.getConsumer().getString();
-
-        if (!PATTERN.matcher(arg).matches()) {
-            return Stream.empty();
-        }
-
         return new TabCompleteHelper()
                 .append(
-                        Registry.BLOCK.keySet()
+                        Block.REGISTRY.getKeys()
                                 .stream()
                                 .map(Object::toString)
                 )
-                .filterPrefixNamespaced(arg)
+                .filterPrefixNamespaced(ctx.getConsumer().getString())
                 .sortAlphabetically()
                 .stream();
     }

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

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

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

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

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

@@ -18,137 +18,20 @@
 package baritone.api.command.datatypes;
 
 import baritone.api.command.exception.CommandException;
-import baritone.api.command.helpers.TabCompleteHelper;
 import baritone.api.utils.BlockOptionalMeta;
-import net.minecraft.block.Block;
-import net.minecraft.state.Property;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.registry.Registry;
 
-import java.util.Set;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 public enum ForBlockOptionalMeta implements IDatatypeFor<BlockOptionalMeta> {
     INSTANCE;
 
-    /**
-     * Matches (domain:)?name([(property=value)*])? but the input can be truncated at any position.
-     * domain and name are [a-z0-9_.-]+ and [a-z0-9/_.-]+ because that's what mc 1.13+ accepts.
-     * property and value use the same format as domain.
-     */
-    // Good luck reading this.
-    private static Pattern PATTERN = Pattern.compile("(?:[a-z0-9_.-]+:)?(?:[a-z0-9/_.-]+(?:\\[(?:(?:[a-z0-9_.-]+=[a-z0-9_.-]+,)*(?:[a-z0-9_.-]+(?:=(?:[a-z0-9_.-]+(?:\\])?)?)?)?|\\])?)?)?");
-
     @Override
     public BlockOptionalMeta get(IDatatypeContext ctx) throws CommandException {
         return new BlockOptionalMeta(ctx.getConsumer().getString());
     }
 
     @Override
-    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
-        String arg = ctx.getConsumer().peekString();
-
-        if (!PATTERN.matcher(arg).matches()) {
-            // Invalid format; we can't complete this.
-            ctx.getConsumer().getString();
-            return Stream.empty();
-        }
-
-        if (arg.endsWith("]")) {
-            // We are already done.
-            ctx.getConsumer().getString();
-            return Stream.empty();
-        }
-
-        if (!arg.contains("[")) {
-            // no properties so we are completing the block id
-            return ctx.getConsumer().tabCompleteDatatype(BlockById.INSTANCE);
-        }
-
-        ctx.getConsumer().getString();
-
-        // destructuring assignment? Please?
-        String blockId, properties;
-        {
-            String[] parts = splitLast(arg, '[');
-            blockId = parts[0];
-            properties = parts[1];
-        }
-
-        Block block = Registry.BLOCK.getOptional(new ResourceLocation(blockId)).orElse(null);
-        if (block == null) {
-            // This block doesn't exist so there's no properties to complete.
-            return Stream.empty();
-        }
-
-        String leadingProperties, lastProperty;
-        {
-            String[] parts = splitLast(properties, ',');
-            leadingProperties = parts[0];
-            lastProperty = parts[1];
-        }
-
-        if (!lastProperty.contains("=")) {
-            // The last property-value pair doesn't have a value yet so we are completing its name
-            Set<String> usedProps = Stream.of(leadingProperties.split(","))
-                    .map(pair -> pair.split("=")[0])
-                    .collect(Collectors.toSet());
-
-            String prefix = arg.substring(0, arg.length() - lastProperty.length());
-            return new TabCompleteHelper()
-                    .append(
-                            block.getStateContainer()
-                                    .getProperties()
-                                    .stream()
-                                    .map(Property::getName)
-                    )
-                    .filter(prop -> !usedProps.contains(prop))
-                    .filterPrefix(lastProperty)
-                    .sortAlphabetically()
-                    .map(prop -> prefix + prop)
-                    .stream();
-        }
-
-        String lastName, lastValue;
-        {
-            String[] parts = splitLast(lastProperty, '=');
-            lastName = parts[0];
-            lastValue = parts[1];
-        }
-
-        // We are completing the value of a property
-        String prefix = arg.substring(0, arg.length() - lastValue.length());
-
-        Property<?> property = block.getStateContainer().getProperty(lastName);
-        if (property == null) {
-            // The property does not exist so there's no values to complete
-            return Stream.empty();
-        }
-
-        return new TabCompleteHelper()
-                .append(getValues(property))
-                .filterPrefix(lastValue)
-                .sortAlphabetically()
-                .map(val -> prefix + val)
-                .stream();
-    }
-
-    /**
-     * Always returns exactly two strings.
-     * If the separator is not found the FIRST returned string is empty.
-     */
-    private static String[] splitLast(String string, char chr) {
-        int idx = string.lastIndexOf(chr);
-        if (idx == -1) {
-            return new String[]{"", string};
-        }
-        return new String[]{string.substring(0, idx), string.substring(idx + 1)};
-    }
-
-    // this shouldn't need to be a separate method?
-    private static <T extends Comparable<T>> Stream<String> getValues(Property<T> property) {
-        return property.getAllowedValues().stream().map(property::getName);
+    public Stream<String> tabComplete(IDatatypeContext ctx) {
+        return ctx.getConsumer().tabCompleteDatatype(BlockById.INSTANCE);
     }
 }

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

@@ -19,24 +19,24 @@ package baritone.api.command.datatypes;
 
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
-import net.minecraft.util.Direction;
+import net.minecraft.util.EnumFacing;
 
 import java.util.Locale;
 import java.util.stream.Stream;
 
-public enum ForDirection implements IDatatypeFor<Direction> {
+public enum ForEnumFacing implements IDatatypeFor<EnumFacing> {
     INSTANCE;
 
     @Override
-    public Direction get(IDatatypeContext ctx) throws CommandException {
-        return Direction.valueOf(ctx.getConsumer().getString().toUpperCase(Locale.US));
+    public EnumFacing get(IDatatypeContext ctx) throws CommandException {
+        return EnumFacing.valueOf(ctx.getConsumer().getString().toUpperCase(Locale.US));
     }
 
     @Override
     public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
         return new TabCompleteHelper()
-                .append(Stream.of(Direction.values())
-                        .map(Direction::getName2).map(String::toLowerCase))
+                .append(Stream.of(EnumFacing.values())
+                        .map(EnumFacing::getName).map(String::toLowerCase))
                 .filterPrefix(ctx.getConsumer().getString())
                 .stream();
     }

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

@@ -20,8 +20,7 @@ package baritone.api.command.datatypes;
 import baritone.api.IBaritone;
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.util.text.ITextComponent;
+import net.minecraft.entity.player.EntityPlayer;
 
 import java.util.List;
 import java.util.stream.Stream;
@@ -30,27 +29,27 @@ import java.util.stream.Stream;
  * An {@link IDatatype} used to resolve nearby players, those within
  * render distance of the target {@link IBaritone} instance.
  */
-public enum NearbyPlayer implements IDatatypeFor<PlayerEntity> {
+public enum NearbyPlayer implements IDatatypeFor<EntityPlayer> {
     INSTANCE;
 
     @Override
-    public PlayerEntity get(IDatatypeContext ctx) throws CommandException {
+    public EntityPlayer get(IDatatypeContext ctx) throws CommandException {
         final String username = ctx.getConsumer().getString();
         return getPlayers(ctx).stream()
-                .filter(s -> s.getName().getString().equalsIgnoreCase(username))
+                .filter(s -> s.getName().equalsIgnoreCase(username))
                 .findFirst().orElse(null);
     }
 
     @Override
     public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
         return new TabCompleteHelper()
-                .append(getPlayers(ctx).stream().map(PlayerEntity::getName).map(ITextComponent::getString))
+                .append(getPlayers(ctx).stream().map(EntityPlayer::getName))
                 .filterPrefix(ctx.getConsumer().getString())
                 .sortAlphabetically()
                 .stream();
     }
 
-    private static List<? extends PlayerEntity> getPlayers(IDatatypeContext ctx) {
-        return ctx.getBaritone().getPlayerContext().world().getPlayers();
+    private static List<EntityPlayer> getPlayers(IDatatypeContext ctx) {
+        return ctx.getBaritone().getPlayerContext().world().playerEntities;
     }
 }

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

@@ -26,8 +26,7 @@ import java.util.stream.Stream;
 
 public enum RelativeCoordinate implements IDatatypePost<Double, Double> {
     INSTANCE;
-    private static String ScalesAliasRegex = "[kKmM]";
-    private static Pattern PATTERN = Pattern.compile("^(~?)([+-]?(?:\\d+(?:\\.\\d*)?|\\.\\d+)(" + ScalesAliasRegex + "?)|)$");
+    private static Pattern PATTERN = Pattern.compile("^(~?)([+-]?(?:\\d+(?:\\.\\d*)?|\\.\\d+)([k-k]?)|)$");
 
     @Override
     public Double apply(IDatatypeContext ctx, Double origin) throws CommandException {
@@ -42,15 +41,11 @@ public enum RelativeCoordinate implements IDatatypePost<Double, Double> {
 
         boolean isRelative = !matcher.group(1).isEmpty();
 
-        double offset = matcher.group(2).isEmpty() ? 0 : Double.parseDouble(matcher.group(2).replaceAll(ScalesAliasRegex, ""));
+        double offset = matcher.group(2).isEmpty() ? 0 : Double.parseDouble(matcher.group(2).replaceAll("k", ""));
 
-        if (matcher.group(2).toLowerCase().contains("k")) {
+        if (matcher.group(2).contains("k")) {
             offset *= 1000;
         }
-        if (matcher.group(2).toLowerCase().contains("m")) {
-            offset *= 1000000;
-        }
-
 
         if (isRelative) {
             return origin + offset;

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

@@ -19,8 +19,6 @@ package baritone.api.command.datatypes;
 
 import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.exception.CommandException;
-import baritone.api.utils.Helper;
-import net.minecraft.client.Minecraft;
 
 import java.io.File;
 import java.io.IOException;
@@ -32,6 +30,8 @@ import java.util.Locale;
 import java.util.Objects;
 import java.util.stream.Stream;
 
+import static baritone.api.utils.Helper.HELPER;
+
 public enum RelativeFile implements IDatatypePost<File, File> {
     INSTANCE;
 
@@ -83,23 +83,18 @@ public enum RelativeFile implements IDatatypePost<File, File> {
         boolean useParent = !currentPathStringThing.isEmpty() && !currentPathStringThing.endsWith(File.separator);
         File currentFile = currentPath.isAbsolute() ? currentPath.toFile() : new File(base, currentPathStringThing);
         return Stream.of(Objects.requireNonNull(getCanonicalFileUnchecked(
-                        useParent
-                                ? currentFile.getParentFile()
-                                : currentFile
-                ).listFiles()))
+                useParent
+                        ? currentFile.getParentFile()
+                        : currentFile
+        ).listFiles()))
                 .map(f -> (currentPath.isAbsolute() ? f : basePath.relativize(f.toPath()).toString()) +
                         (f.isDirectory() ? File.separator : ""))
                 .filter(s -> s.toLowerCase(Locale.US).startsWith(currentPathStringThing.toLowerCase(Locale.US)))
                 .filter(s -> !s.contains(" "));
     }
 
-    @Deprecated
     public static File gameDir() {
-        return gameDir(Helper.mc);
-    }
-
-    public static File gameDir(Minecraft mc) {
-        File gameDir = mc.gameDir.getAbsoluteFile();
+        File gameDir = HELPER.mc.gameDir.getAbsoluteFile();
         if (gameDir.getName().equals(".")) {
             return gameDir.getParentFile();
         }

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

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

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

@@ -253,7 +253,7 @@ public class TabCompleteHelper {
     public TabCompleteHelper addSettings() {
         return append(
                 BaritoneAPI.getSettings().allSettings.stream()
-                        .filter(s -> !s.isJavaOnly())
+                        .filter(s -> !SettingsUtil.javaOnlySetting(s))
                         .map(Settings.Setting::getName)
                         .sorted(String.CASE_INSENSITIVE_ORDER)
         );

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

@@ -84,7 +84,7 @@ public class Registry<V> {
      * @param entry The entry to unregister.
      */
     public void unregister(V entry) {
-        if (!registered(entry)) {
+        if (registered(entry)) {
             return;
         }
         _entries.remove(entry);

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

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

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

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

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

@@ -17,10 +17,8 @@
 
 package baritone.api.event.events;
 
-import baritone.api.utils.Rotation;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.entity.EntityLivingBase;
 
 /**
  * @author Brady
@@ -33,27 +31,14 @@ public final class RotationMoveEvent {
      */
     private final Type type;
 
-    private final Rotation original;
-
     /**
      * The yaw rotation
      */
     private float yaw;
 
-    /**
-     * The pitch rotation
-     */
-    private float pitch;
-
-    public RotationMoveEvent(Type type, float yaw, float pitch) {
+    public RotationMoveEvent(Type type, float yaw) {
         this.type = type;
-        this.original = new Rotation(yaw, pitch);
         this.yaw = yaw;
-        this.pitch = pitch;
-    }
-
-    public Rotation getOriginal() {
-        return this.original;
     }
 
     /**
@@ -61,37 +46,21 @@ public final class RotationMoveEvent {
      *
      * @param yaw Yaw rotation
      */
-    public void setYaw(float yaw) {
+    public final void setYaw(float yaw) {
         this.yaw = yaw;
     }
 
     /**
      * @return The yaw rotation
      */
-    public float getYaw() {
+    public final float getYaw() {
         return this.yaw;
     }
 
-    /**
-     * Set the pitch movement rotation
-     *
-     * @param pitch Pitch rotation
-     */
-    public void setPitch(float pitch) {
-        this.pitch = pitch;
-    }
-
-    /**
-     * @return The pitch rotation
-     */
-    public float getPitch() {
-        return pitch;
-    }
-
     /**
      * @return The type of the event
      */
-    public Type getType() {
+    public final Type getType() {
         return this.type;
     }
 
@@ -100,14 +69,14 @@ public final class RotationMoveEvent {
         /**
          * Called when the player's motion is updated.
          *
-         * @see Entity#moveRelative(float, Vector3d)
+         * @see Entity#moveRelative(float, float, float, float)
          */
         MOTION_UPDATE,
 
         /**
          * Called when the player jumps.
          *
-         * @see LivingEntity
+         * @see EntityLivingBase#jump
          */
         JUMP
     }

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

@@ -22,7 +22,7 @@ import baritone.api.event.events.type.Cancellable;
 /**
  * @author LoganDark
  */
-public final class TabCompleteEvent extends Cancellable {
+public class TabCompleteEvent extends Cancellable {
 
     public final String prefix;
     public String[] completions;

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

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

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

@@ -18,13 +18,14 @@
 package baritone.api.event.listener;
 
 import baritone.api.event.events.*;
+import io.netty.util.concurrent.GenericFutureListener;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.player.ClientPlayerEntity;
-import net.minecraft.client.gui.screen.DeathScreen;
-import net.minecraft.client.world.ClientWorld;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.GuiGameOver;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.settings.GameSettings;
 import net.minecraft.entity.Entity;
-import net.minecraft.network.IPacket;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.network.Packet;
 
 /**
  * @author Brady
@@ -44,7 +45,7 @@ public interface IGameEventListener {
      * Run once per game tick from before and after the player rotation is sent to the server.
      *
      * @param event The event
-     * @see ClientPlayerEntity#tick()
+     * @see EntityPlayerSP#onUpdate()
      */
     void onPlayerUpdate(PlayerUpdateEvent event);
 
@@ -52,7 +53,7 @@ public interface IGameEventListener {
      * Runs whenever the client player sends a message to the server.
      *
      * @param event The event
-     * @see ClientPlayerEntity#sendChatMessage(String)
+     * @see EntityPlayerSP#sendChatMessage(String)
      */
     void onSendChatMessage(ChatEvent event);
 
@@ -67,11 +68,14 @@ public interface IGameEventListener {
      * Runs before and after whenever a chunk is either loaded, unloaded, or populated.
      *
      * @param event The event
+     * @see WorldClient#doPreChunk(int, int, boolean)
      */
     void onChunkEvent(ChunkEvent event);
 
     /**
-     * Runs once per world render pass.
+     * Runs once per world render pass. Two passes are made when {@link GameSettings#anaglyph} is on.
+     * <p>
+     * <b>Note:</b> {@link GameSettings#anaglyph} has been removed in Minecraft 1.13
      *
      * @param event The event
      */
@@ -81,7 +85,7 @@ public interface IGameEventListener {
      * Runs before and after whenever a new world is loaded
      *
      * @param event The event
-     * @see Minecraft#loadWorld(ClientWorld)
+     * @see Minecraft#loadWorld(WorldClient, String)
      */
     void onWorldEvent(WorldEvent event);
 
@@ -89,7 +93,8 @@ public interface IGameEventListener {
      * Runs before a outbound packet is sent
      *
      * @param event The event
-     * @see IPacket
+     * @see Packet
+     * @see GenericFutureListener
      */
     void onSendPacket(PacketEvent event);
 
@@ -97,7 +102,8 @@ public interface IGameEventListener {
      * Runs before an inbound packet is processed
      *
      * @param event The event
-     * @see IPacket
+     * @see Packet
+     * @see GenericFutureListener
      */
     void onReceivePacket(PacketEvent event);
 
@@ -106,15 +112,15 @@ public interface IGameEventListener {
      * and before and after the player jumps.
      *
      * @param event The event
-     * @see Entity#moveRelative(float, Vector3d)
+     * @see Entity#moveRelative(float, float, float, float)
      */
     void onPlayerRotationMove(RotationMoveEvent event);
 
     /**
-     * Called whenever the sprint keybind state is checked in {@link ClientPlayerEntity#livingTick}
+     * Called whenever the sprint keybind state is checked in {@link EntityPlayerSP#onLivingUpdate}
      *
      * @param event The event
-     * @see ClientPlayerEntity#livingTick()
+     * @see EntityPlayerSP#onLivingUpdate()
      */
     void onPlayerSprintState(SprintStateEvent event);
 
@@ -126,9 +132,9 @@ public interface IGameEventListener {
     void onBlockInteract(BlockInteractEvent event);
 
     /**
-     * Called when the local player dies, as indicated by the creation of the {@link DeathScreen} screen.
+     * Called when the local player dies, as indicated by the creation of the {@link GuiGameOver} screen.
      *
-     * @see DeathScreen
+     * @see GuiGameOver
      */
     void onPlayerDeath();
 

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

@@ -42,16 +42,6 @@ public class GoalAxis implements Goal {
         return flatAxisDistance * BaritoneAPI.getSettings().costHeuristic.value + GoalYLevel.calculate(BaritoneAPI.getSettings().axisHeight.value, y);
     }
 
-    @Override
-    public boolean equals(Object o) {
-        return o.getClass() == GoalAxis.class;
-    }
-
-    @Override
-    public int hashCode() {
-        return 201385781;
-    }
-
     @Override
     public String toString() {
         return "GoalAxis";

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

@@ -17,7 +17,6 @@
 
 package baritone.api.pathing.goals;
 
-import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.interfaces.IGoalRenderPos;
 import net.minecraft.util.math.BlockPos;
@@ -67,26 +66,6 @@ public class GoalBlock implements Goal, IGoalRenderPos {
         return calculate(xDiff, yDiff, zDiff);
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        GoalBlock goal = (GoalBlock) o;
-        return x == goal.x
-                && y == goal.y
-                && z == goal.z;
-    }
-
-    @Override
-    public int hashCode() {
-        return (int) BetterBlockPos.longHash(x, y, z) * 905165533;
-    }
-
     @Override
     public String toString() {
         return String.format(
@@ -108,9 +87,9 @@ public class GoalBlock implements Goal, IGoalRenderPos {
     public static double calculate(double xDiff, int yDiff, double zDiff) {
         double heuristic = 0;
 
-        // if yDiff is 1 that means that currentY-goalY==1 which means that we're 1 block above where we should be
-        // therefore going from 0,yDiff,0 to a GoalYLevel of 0 is accurate
-        heuristic += GoalYLevel.calculate(0, yDiff);
+        // if yDiff is 1 that means that pos.getY()-this.y==1 which means that we're 1 block below where we should be
+        // therefore going from 0,0,0 to a GoalYLevel of pos.getY()-this.y is accurate
+        heuristic += GoalYLevel.calculate(yDiff, 0);
 
         //use the pythagorean and manhattan mixture from GoalXZ
         heuristic += GoalXZ.calculate(xDiff, zDiff);

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

@@ -67,24 +67,6 @@ public class GoalComposite implements Goal {
         return min;
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        GoalComposite goal = (GoalComposite) o;
-        return Arrays.equals(goals, goal.goals);
-    }
-
-    @Override
-    public int hashCode() {
-        return Arrays.hashCode(goals);
-    }
-
     @Override
     public String toString() {
         return "GoalComposite" + Arrays.toString(goals);

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

@@ -17,7 +17,6 @@
 
 package baritone.api.pathing.goals;
 
-import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.interfaces.IGoalRenderPos;
 import net.minecraft.util.math.BlockPos;
@@ -61,26 +60,6 @@ public class GoalGetToBlock implements Goal, IGoalRenderPos {
         return GoalBlock.calculate(xDiff, yDiff < 0 ? yDiff + 1 : yDiff, zDiff);
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        GoalGetToBlock goal = (GoalGetToBlock) o;
-        return x == goal.x
-                && y == goal.y
-                && z == goal.z;
-    }
-
-    @Override
-    public int hashCode() {
-        return (int) BetterBlockPos.longHash(x, y, z) * -49639096;
-    }
-
     @Override
     public String toString() {
         return String.format(

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

@@ -17,8 +17,6 @@
 
 package baritone.api.pathing.goals;
 
-import java.util.Objects;
-
 /**
  * Invert any goal.
  * <p>
@@ -52,24 +50,6 @@ public class GoalInverted implements Goal {
         return Double.NEGATIVE_INFINITY;
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        GoalInverted goal = (GoalInverted) o;
-        return Objects.equals(origin, goal.origin);
-    }
-
-    @Override
-    public int hashCode() {
-        return origin.hashCode() * 495796690;
-    }
-
     @Override
     public String toString() {
         return String.format("GoalInverted{%s}", origin.toString());

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

@@ -17,11 +17,10 @@
 
 package baritone.api.pathing.goals;
 
-import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.interfaces.IGoalRenderPos;
-import it.unimi.dsi.fastutil.doubles.DoubleIterator;
 import it.unimi.dsi.fastutil.doubles.DoubleOpenHashSet;
+import it.unimi.dsi.fastutil.doubles.DoubleIterator;
 import net.minecraft.util.math.BlockPos;
 
 public class GoalNear implements Goal, IGoalRenderPos {
@@ -87,27 +86,6 @@ public class GoalNear implements Goal, IGoalRenderPos {
         return new BlockPos(x, y, z);
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        GoalNear goal = (GoalNear) o;
-        return x == goal.x
-                && y == goal.y
-                && z == goal.z
-                && rangeSq == goal.rangeSq;
-    }
-
-    @Override
-    public int hashCode() {
-        return (int) BetterBlockPos.longHash(x, y, z) + rangeSq;
-    }
-
     @Override
     public String toString() {
         return String.format(

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

@@ -18,12 +18,11 @@
 package baritone.api.pathing.goals;
 
 import baritone.api.utils.SettingsUtil;
-import it.unimi.dsi.fastutil.doubles.DoubleIterator;
 import it.unimi.dsi.fastutil.doubles.DoubleOpenHashSet;
+import it.unimi.dsi.fastutil.doubles.DoubleIterator;
 import net.minecraft.util.math.BlockPos;
 
 import java.util.Arrays;
-import java.util.Objects;
 
 /**
  * Useful for automated combat (retreating specifically)
@@ -125,29 +124,6 @@ public class GoalRunAway implements Goal {
         return maxInside;
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        GoalRunAway goal = (GoalRunAway) o;
-        return distanceSq == goal.distanceSq
-                && Arrays.equals(from, goal.from)
-                && Objects.equals(maintainY, goal.maintainY);
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = Arrays.hashCode(from);
-        hash = hash * 1196803141 + distanceSq;
-        hash = hash * -2053788840 + maintainY;
-        return hash;
-    }
-
     @Override
     public String toString() {
         if (maintainY != null) {

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

@@ -17,9 +17,8 @@
 
 package baritone.api.pathing.goals;
 
-import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.SettingsUtil;
-import net.minecraft.util.Direction;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 
 /**
@@ -33,7 +32,7 @@ public class GoalStrictDirection implements Goal {
     public final int dx;
     public final int dz;
 
-    public GoalStrictDirection(BlockPos origin, Direction direction) {
+    public GoalStrictDirection(BlockPos origin, EnumFacing direction) {
         x = origin.getX();
         y = origin.getY();
         z = origin.getZ();
@@ -70,31 +69,6 @@ public class GoalStrictDirection implements Goal {
         return Double.NEGATIVE_INFINITY;
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        GoalStrictDirection goal = (GoalStrictDirection) o;
-        return x == goal.x
-                && y == goal.y
-                && z == goal.z
-                && dx == goal.dx
-                && dz == goal.dz;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = (int) BetterBlockPos.longHash(x, y, z);
-        hash = hash * 630627507 + dx;
-        hash = hash * -283028380 + dz;
-        return hash;
-    }
-
     @Override
     public String toString() {
         return String.format(

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

@@ -17,7 +17,6 @@
 
 package baritone.api.pathing.goals;
 
-import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.interfaces.IGoalRenderPos;
 import net.minecraft.util.math.BlockPos;
@@ -73,26 +72,6 @@ public class GoalTwoBlocks implements Goal, IGoalRenderPos {
         return new BlockPos(x, y, z);
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        GoalTwoBlocks goal = (GoalTwoBlocks) o;
-        return x == goal.x
-                && y == goal.y
-                && z == goal.z;
-    }
-
-    @Override
-    public int hashCode() {
-        return (int) BetterBlockPos.longHash(x, y, z) * 516508351;
-    }
-
     @Override
     public String toString() {
         return String.format(

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

@@ -21,7 +21,7 @@ import baritone.api.BaritoneAPI;
 import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.SettingsUtil;
 import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 
 /**
  * Useful for long-range goals that don't have a specific Y level.
@@ -64,27 +64,6 @@ public class GoalXZ implements Goal {
         return calculate(xDiff, zDiff);
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        GoalXZ goal = (GoalXZ) o;
-        return x == goal.x && z == goal.z;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 1791873246;
-        hash = hash * 222601791 + x;
-        hash = hash * -1331679453 + z;
-        return hash;
-    }
-
     @Override
     public String toString() {
         return String.format(
@@ -115,7 +94,7 @@ public class GoalXZ implements Goal {
         return (diagonal + straight) * BaritoneAPI.getSettings().costHeuristic.value; // big TODO tune
     }
 
-    public static GoalXZ fromDirection(Vector3d origin, float yaw, double distance) {
+    public static GoalXZ fromDirection(Vec3d origin, float yaw, double distance) {
         float theta = (float) Math.toRadians(yaw);
         double x = origin.x - MathHelper.sin(theta) * distance;
         double z = origin.z + MathHelper.cos(theta) * distance;

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

@@ -58,24 +58,6 @@ public class GoalYLevel implements Goal, ActionCosts {
         return 0;
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        GoalYLevel goal = (GoalYLevel) o;
-        return level == goal.level;
-    }
-
-    @Override
-    public int hashCode() {
-        return level * 1271009915;
-    }
-
     @Override
     public String toString() {
         return String.format(

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

@@ -18,10 +18,10 @@
 package baritone.api.process;
 
 import baritone.api.schematic.ISchematic;
-import net.minecraft.block.BlockState;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Vector3i;
+import net.minecraft.util.math.Vec3i;
 
 import java.io.File;
 import java.util.List;
@@ -39,7 +39,7 @@ public interface IBuilderProcess extends IBaritoneProcess {
      * @param schematic The object representation of the schematic
      * @param origin    The origin position of the schematic being built
      */
-    void build(String name, ISchematic schematic, Vector3i origin);
+    void build(String name, ISchematic schematic, Vec3i origin);
 
     /**
      * Requests a build for the specified schematic, labeled as specified, with the specified origin.
@@ -49,18 +49,15 @@ public interface IBuilderProcess extends IBaritoneProcess {
      * @param origin    The origin position of the schematic being built
      * @return Whether or not the schematic was able to load from file
      */
-    boolean build(String name, File schematic, Vector3i origin);
+    boolean build(String name, File schematic, Vec3i origin);
 
-    @Deprecated
     default boolean build(String schematicFile, BlockPos origin) {
-        File file = new File(new File(Minecraft.getInstance().gameDir, "schematics"), schematicFile);
+        File file = new File(new File(Minecraft.getMinecraft().gameDir, "schematics"), schematicFile);
         return build(schematicFile, file, origin);
     }
 
     void buildOpenSchematic();
 
-    void buildOpenLitematic(int i);
-
     void pause();
 
     boolean isPaused();
@@ -74,5 +71,5 @@ public interface IBuilderProcess extends IBaritoneProcess {
      * schematics, for example, to pick a state that the builder process will be happy with, because any variation will
      * cause it to give up. This is updated every tick, but only while the builder process is active.
      */
-    List<BlockState> getApproxPlaceable();
+    List<IBlockState> getApproxPlaceable();
 }

src/api/java/baritone/api/schematic/CompositeSchematic.java

@@ -17,7 +17,7 @@
 
 package baritone.api.schematic;
 
-import net.minecraft.block.BlockState;
+import net.minecraft.block.state.IBlockState;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -47,7 +47,7 @@ public class CompositeSchematic extends AbstractSchematic {
         recalcArr();
     }
 
-    private CompositeSchematicEntry getSchematic(int x, int y, int z, BlockState currentState) {
+    private CompositeSchematicEntry getSchematic(int x, int y, int z, IBlockState currentState) {
         for (CompositeSchematicEntry entry : schematicArr) {
             if (x >= entry.x && y >= entry.y && z >= entry.z &&
                     entry.schematic.inSchematic(x - entry.x, y - entry.y, z - entry.z, currentState)) {
@@ -58,13 +58,13 @@ public class CompositeSchematic extends AbstractSchematic {
     }
 
     @Override
-    public boolean inSchematic(int x, int y, int z, BlockState currentState) {
+    public boolean inSchematic(int x, int y, int z, IBlockState currentState) {
         CompositeSchematicEntry entry = getSchematic(x, y, z, currentState);
         return entry != null && entry.schematic.inSchematic(x - entry.x, y - entry.y, z - entry.z, currentState);
     }
 
     @Override
-    public BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable) {
+    public IBlockState desiredState(int x, int y, int z, IBlockState current, List<IBlockState> approxPlaceable) {
         CompositeSchematicEntry entry = getSchematic(x, y, z, current);
         if (entry == null) {
             throw new IllegalStateException("couldn't find schematic for this position");

src/api/java/baritone/api/schematic/FillSchematic.java

@@ -18,7 +18,7 @@
 package baritone.api.schematic;
 
 import baritone.api.utils.BlockOptionalMeta;
-import net.minecraft.block.BlockState;
+import net.minecraft.block.state.IBlockState;
 
 import java.util.List;
 
@@ -31,8 +31,8 @@ public class FillSchematic extends AbstractSchematic {
         this.bom = bom;
     }
 
-    public FillSchematic(int x, int y, int z, BlockState state) {
-        this(x, y, z, new BlockOptionalMeta(state.getBlock()));
+    public FillSchematic(int x, int y, int z, IBlockState state) {
+        this(x, y, z, new BlockOptionalMeta(state.getBlock(), state.getBlock().getMetaFromState(state)));
     }
 
     public BlockOptionalMeta getBom() {
@@ -40,11 +40,11 @@ public class FillSchematic extends AbstractSchematic {
     }
 
     @Override
-    public BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable) {
+    public IBlockState desiredState(int x, int y, int z, IBlockState current, List<IBlockState> approxPlaceable) {
         if (bom.matches(current)) {
             return current;
         }
-        for (BlockState placeable : approxPlaceable) {
+        for (IBlockState placeable : approxPlaceable) {
             if (bom.matches(placeable)) {
                 return placeable;
             }

src/api/java/baritone/api/schematic/ISchematic.java

@@ -17,8 +17,8 @@
 
 package baritone.api.schematic;
 
-import net.minecraft.block.BlockState;
-import net.minecraft.util.Direction;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.EnumFacing;
 
 import java.util.List;
 
@@ -44,11 +44,11 @@ public interface ISchematic {
      * @param currentState The current state of that block in the world, or null
      * @return Whether or not the specified position is within the bounds of this schematic
      */
-    default boolean inSchematic(int x, int y, int z, BlockState currentState) {
+    default boolean inSchematic(int x, int y, int z, IBlockState currentState) {
         return x >= 0 && x < widthX() && y >= 0 && y < heightY() && z >= 0 && z < lengthZ();
     }
 
-    default int size(Direction.Axis axis) {
+    default int size(EnumFacing.Axis axis) {
         switch (axis) {
             case X:
                 return widthX();
@@ -71,7 +71,7 @@ public interface ISchematic {
      * @param approxPlaceable The list of blockstates estimated to be placeable
      * @return The desired block state at the specified position
      */
-    BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable);
+    IBlockState desiredState(int x, int y, int z, IBlockState current, List<IBlockState> approxPlaceable);
 
     /**
      * Resets possible caches to avoid wrong behavior when moving the schematic around

src/api/java/baritone/api/schematic/IStaticSchematic.java

@@ -17,7 +17,7 @@
 
 package baritone.api.schematic;
 
-import net.minecraft.block.BlockState;
+import net.minecraft.block.state.IBlockState;
 
 /**
  * A static schematic is capable of providing the desired state at a given position without
@@ -30,7 +30,7 @@ import net.minecraft.block.BlockState;
 public interface IStaticSchematic extends ISchematic {
 
     /**
-     * Gets the {@link BlockState} for a given position in this schematic. It should be guaranteed
+     * Gets the {@link IBlockState} for a given position in this schematic. It should be guaranteed
      * that the return value of this method will not change given that the parameters are the same.
      *
      * @param x The X block position
@@ -38,19 +38,19 @@ public interface IStaticSchematic extends ISchematic {
      * @param z The Z block position
      * @return The desired state at the specified position.
      */
-    BlockState getDirect(int x, int y, int z);
+    IBlockState getDirect(int x, int y, int z);
 
     /**
-     * Returns an {@link BlockState} array of size {@link #heightY()} which contains all
-     * desired block states in the specified vertical column. The index of {@link BlockState}s
+     * Returns an {@link IBlockState} array of size {@link #heightY()} which contains all
+     * desired block states in the specified vertical column. The index of {@link IBlockState}s
      * in the array are equivalent to their Y position in the schematic.
      *
      * @param x The X column position
      * @param z The Z column position
-     * @return An {@link BlockState} array
+     * @return An {@link IBlockState} array
      */
-    default BlockState[] getColumn(int x, int z) {
-        BlockState[] column = new BlockState[this.heightY()];
+    default IBlockState[] getColumn(int x, int z) {
+        IBlockState[] column = new IBlockState[this.heightY()];
         for (int i = 0; i < this.heightY(); i++) {
             column[i] = getDirect(x, i, z);
         }

src/api/java/baritone/api/schematic/MaskSchematic.java

@@ -17,8 +17,7 @@
 
 package baritone.api.schematic;
 
-import baritone.api.schematic.mask.Mask;
-import net.minecraft.block.BlockState;
+import net.minecraft.block.state.IBlockState;
 
 import java.util.List;
 
@@ -31,25 +30,15 @@ public abstract class MaskSchematic extends AbstractSchematic {
         this.schematic = schematic;
     }
 
-    protected abstract boolean partOfMask(int x, int y, int z, BlockState currentState);
+    protected abstract boolean partOfMask(int x, int y, int z, IBlockState currentState);
 
     @Override
-    public boolean inSchematic(int x, int y, int z, BlockState currentState) {
+    public boolean inSchematic(int x, int y, int z, IBlockState currentState) {
         return schematic.inSchematic(x, y, z, currentState) && partOfMask(x, y, z, currentState);
     }
 
     @Override
-    public BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable) {
+    public IBlockState desiredState(int x, int y, int z, IBlockState current, List<IBlockState> approxPlaceable) {
         return schematic.desiredState(x, y, z, current, approxPlaceable);
     }
-
-    public static MaskSchematic create(ISchematic schematic, Mask function) {
-        return new MaskSchematic(schematic) {
-
-            @Override
-            protected boolean partOfMask(int x, int y, int z, BlockState currentState) {
-                return function.partOfMask(x, y, z, currentState);
-            }
-        };
-    }
 }

src/api/java/baritone/api/schematic/ReplaceSchematic.java

@@ -18,7 +18,7 @@
 package baritone.api.schematic;
 
 import baritone.api.utils.BlockOptionalMetaLookup;
-import net.minecraft.block.BlockState;
+import net.minecraft.block.state.IBlockState;
 
 public class ReplaceSchematic extends MaskSchematic {
 
@@ -44,7 +44,7 @@ public class ReplaceSchematic extends MaskSchematic {
     }
 
     @Override
-    protected boolean partOfMask(int x, int y, int z, BlockState currentState) {
+    protected boolean partOfMask(int x, int y, int z, IBlockState currentState) {
         if (cache[x][y][z] == null) {
             cache[x][y][z] = filter.has(currentState);
         }

src/api/java/baritone/api/schematic/ShellSchematic.java

@@ -17,7 +17,7 @@
 
 package baritone.api.schematic;
 
-import net.minecraft.block.BlockState;
+import net.minecraft.block.state.IBlockState;
 
 public class ShellSchematic extends MaskSchematic {
 
@@ -26,7 +26,7 @@ public class ShellSchematic extends MaskSchematic {
     }
 
     @Override
-    protected boolean partOfMask(int x, int y, int z, BlockState currentState) {
+    protected boolean partOfMask(int x, int y, int z, IBlockState currentState) {
         return x == 0 || y == 0 || z == 0 || x == widthX() - 1 || y == heightY() - 1 || z == lengthZ() - 1;
     }
 }

src/api/java/baritone/api/schematic/SubstituteSchematic.java

@@ -17,12 +17,11 @@
 
 package baritone.api.schematic;
 
-import net.minecraft.block.AirBlock;
 import net.minecraft.block.Block;
-import net.minecraft.block.Blocks;
-import net.minecraft.block.BlockState;
-import net.minecraft.state.Property;
-
+import net.minecraft.block.BlockAir;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -32,35 +31,35 @@ public class SubstituteSchematic extends AbstractSchematic {
 
     private final ISchematic schematic;
     private final Map<Block, List<Block>> substitutions;
-    private final Map<BlockState, Map<Block, BlockState>> blockStateCache = new HashMap<>();
+    private final Map<IBlockState, Map<Block, IBlockState>> blockStateCache = new HashMap<>();
 
-    public SubstituteSchematic(ISchematic schematic, Map<Block, List<Block>> substitutions) {
+    public SubstituteSchematic(ISchematic schematic, Map<Block,List<Block>> substitutions) {
         super(schematic.widthX(), schematic.heightY(), schematic.lengthZ());
         this.schematic = schematic;
         this.substitutions = substitutions;
     }
 
     @Override
-    public boolean inSchematic(int x, int y, int z, BlockState currentState) {
+    public boolean inSchematic(int x, int y, int z, IBlockState currentState) {
         return schematic.inSchematic(x, y, z, currentState);
     }
 
     @Override
-    public BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable) {
-        BlockState desired = schematic.desiredState(x, y, z, current, approxPlaceable);
+    public IBlockState desiredState(int x, int y, int z, IBlockState current, List<IBlockState> approxPlaceable) {
+        IBlockState desired = schematic.desiredState(x, y, z, current, approxPlaceable);
         Block desiredBlock = desired.getBlock();
         if (!substitutions.containsKey(desiredBlock)) {
             return desired;
         }
         List<Block> substitutes = substitutions.get(desiredBlock);
-        if (substitutes.contains(current.getBlock()) && !(current.getBlock() instanceof AirBlock)) {// don't preserve air, it's almost always there and almost never wanted
+        if (substitutes.contains(current.getBlock()) && !(current.getBlock() instanceof BlockAir)) {// don't preserve air, it's almost always there and almost never wanted
             return withBlock(desired, current.getBlock());
         }
         for (Block substitute : substitutes) {
-            if (substitute instanceof AirBlock) {
-                return current.getBlock() instanceof AirBlock ? current : Blocks.AIR.getDefaultState(); // can always "place" air
+            if (substitute instanceof BlockAir) {
+                return current.getBlock() instanceof BlockAir ? current : Blocks.AIR.getDefaultState(); // can always "place" air
             }
-            for (BlockState placeable : approxPlaceable) {
+            for (IBlockState placeable : approxPlaceable) {
                 if (substitute.equals(placeable.getBlock())) {
                     return withBlock(desired, placeable.getBlock());
                 }
@@ -69,23 +68,22 @@ public class SubstituteSchematic extends AbstractSchematic {
         return substitutes.get(0).getDefaultState();
     }
 
-    private BlockState withBlock(BlockState state, Block block) {
+    private IBlockState withBlock(IBlockState state, Block block) {
         if (blockStateCache.containsKey(state) && blockStateCache.get(state).containsKey(block)) {
             return blockStateCache.get(state).get(block);
         }
-        Collection<Property<?>> properties = state.getBlock().getStateContainer().getProperties();
-        BlockState newState = block.getDefaultState();
-        for (Property<?> property : properties) {
+        Collection<IProperty<?>> properties = state.getPropertyKeys();
+        IBlockState newState = block.getDefaultState();
+        for (IProperty<?> property : properties) {
             try {
                 newState = copySingleProp(state, newState, property);
             } catch (IllegalArgumentException e) { //property does not exist for target block
             }
         }
-        blockStateCache.computeIfAbsent(state, s -> new HashMap<Block, BlockState>()).put(block, newState);
+        blockStateCache.computeIfAbsent(state, s -> new HashMap<Block,IBlockState>()).put(block, newState);
         return newState;
     }
-
-    private <T extends Comparable<T>> BlockState copySingleProp(BlockState fromState, BlockState toState, Property<T> prop) {
-        return toState.with(prop, fromState.get(prop));
+    private <T extends Comparable<T>> IBlockState copySingleProp(IBlockState fromState, IBlockState toState, IProperty<T> prop) {
+        return toState.withProperty(prop, fromState.getValue(prop));
     }
 }

src/api/java/baritone/api/schematic/WallsSchematic.java

@@ -17,7 +17,7 @@
 
 package baritone.api.schematic;
 
-import net.minecraft.block.BlockState;
+import net.minecraft.block.state.IBlockState;
 
 public class WallsSchematic extends MaskSchematic {
 
@@ -26,7 +26,7 @@ public class WallsSchematic extends MaskSchematic {
     }
 
     @Override
-    protected boolean partOfMask(int x, int y, int z, BlockState currentState) {
+    protected boolean partOfMask(int x, int y, int z, IBlockState currentState) {
         return x == 0 || z == 0 || x == widthX() - 1 || z == lengthZ() - 1;
     }
 }

src/api/java/baritone/api/schematic/mask/Mask.java

@@ -1,60 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.schematic.mask;
-
-import baritone.api.schematic.mask.operator.BinaryOperatorMask;
-import baritone.api.schematic.mask.operator.NotMask;
-import baritone.api.utils.BooleanBinaryOperators;
-import net.minecraft.block.BlockState;
-
-/**
- * @author Brady
- */
-public interface Mask {
-
-    /**
-     * @param x            The relative x position of the block
-     * @param y            The relative y position of the block
-     * @param z            The relative z position of the block
-     * @param currentState The current state of that block in the world, may be {@code null}
-     * @return Whether the given position is included in this mask
-     */
-    boolean partOfMask(int x, int y, int z, BlockState currentState);
-
-    int widthX();
-
-    int heightY();
-
-    int lengthZ();
-
-    default Mask not() {
-        return new NotMask(this);
-    }
-
-    default Mask union(Mask other) {
-        return new BinaryOperatorMask(this, other, BooleanBinaryOperators.OR);
-    }
-
-    default Mask intersection(Mask other) {
-        return new BinaryOperatorMask(this, other, BooleanBinaryOperators.AND);
-    }
-
-    default Mask xor(Mask other) {
-        return new BinaryOperatorMask(this, other, BooleanBinaryOperators.XOR);
-    }
-}

src/api/java/baritone/api/schematic/mask/StaticMask.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.schematic.mask;
-
-import baritone.api.schematic.mask.operator.BinaryOperatorMask;
-import baritone.api.schematic.mask.operator.NotMask;
-import baritone.api.utils.BooleanBinaryOperators;
-import net.minecraft.block.BlockState;
-
-/**
- * A mask that is context-free. In other words, it doesn't require the current block state to determine if a relative
- * position is a part of the mask.
- *
- * @author Brady
- */
-public interface StaticMask extends Mask {
-
-    /**
-     * Determines if a given relative coordinate is included in this mask, without the need for the current block state.
-     *
-     * @param x The relative x position of the block
-     * @param y The relative y position of the block
-     * @param z The relative z position of the block
-     * @return Whether the given position is included in this mask
-     */
-    boolean partOfMask(int x, int y, int z);
-
-    /**
-     * Implements the parent {@link Mask#partOfMask partOfMask function} by calling the static function
-     * provided in this functional interface without needing the {@link BlockState} argument. This {@code default}
-     * implementation should <b><u>NOT</u></b> be overriden.
-     *
-     * @param x            The relative x position of the block
-     * @param y            The relative y position of the block
-     * @param z            The relative z position of the block
-     * @param currentState The current state of that block in the world, may be {@code null}
-     * @return Whether the given position is included in this mask
-     */
-    @Override
-    default boolean partOfMask(int x, int y, int z, BlockState currentState) {
-        return this.partOfMask(x, y, z);
-    }
-
-    @Override
-    default StaticMask not() {
-        return new NotMask.Static(this);
-    }
-
-    default StaticMask union(StaticMask other) {
-        return new BinaryOperatorMask.Static(this, other, BooleanBinaryOperators.OR);
-    }
-
-    default StaticMask intersection(StaticMask other) {
-        return new BinaryOperatorMask.Static(this, other, BooleanBinaryOperators.AND);
-    }
-
-    default StaticMask xor(StaticMask other) {
-        return new BinaryOperatorMask.Static(this, other, BooleanBinaryOperators.XOR);
-    }
-
-    /**
-     * Returns a pre-computed mask using {@code this} function, with the specified size parameters.
-     */
-    default StaticMask compute() {
-        return new PreComputedMask(this);
-    }
-}

src/api/java/baritone/api/schematic/mask/operator/BinaryOperatorMask.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.api.schematic.mask.operator;
-
-import baritone.api.schematic.mask.AbstractMask;
-import baritone.api.schematic.mask.Mask;
-import baritone.api.schematic.mask.StaticMask;
-import baritone.api.utils.BooleanBinaryOperator;
-import net.minecraft.block.BlockState;
-
-/**
- * @author Brady
- */
-public final class BinaryOperatorMask extends AbstractMask {
-
-    private final Mask a;
-    private final Mask b;
-    private final BooleanBinaryOperator operator;
-
-    public BinaryOperatorMask(Mask a, Mask b, BooleanBinaryOperator operator) {
-        super(Math.max(a.widthX(), b.widthX()), Math.max(a.heightY(), b.heightY()), Math.max(a.lengthZ(), b.lengthZ()));
-        this.a = a;
-        this.b = b;
-        this.operator = operator;
-    }
-
-    @Override
-    public boolean partOfMask(int x, int y, int z, BlockState currentState) {
-        return this.operator.applyAsBoolean(
-                partOfMask(a, x, y, z, currentState),
-                partOfMask(b, x, y, z, currentState)
-        );
-    }
-
-    private static boolean partOfMask(Mask mask, int x, int y, int z, BlockState currentState) {
-        return x < mask.widthX() && y < mask.heightY() && z < mask.lengthZ() && mask.partOfMask(x, y, z, currentState);
-    }
-
-    public static final class Static extends AbstractMask implements StaticMask {
-
-        private final StaticMask a;
-        private final StaticMask b;
-        private final BooleanBinaryOperator operator;
-
-        public Static(StaticMask a, StaticMask b, BooleanBinaryOperator operator) {
-            super(Math.max(a.widthX(), b.widthX()), Math.max(a.heightY(), b.heightY()), Math.max(a.lengthZ(), b.lengthZ()));
-            this.a = a;
-            this.b = b;
-            this.operator = operator;
-        }
-
-        @Override
-        public boolean partOfMask(int x, int y, int z) {
-            return this.operator.applyAsBoolean(
-                    partOfMask(a, x, y, z),
-                    partOfMask(b, x, y, z)
-            );
-        }
-
-        private static boolean partOfMask(StaticMask mask, int x, int y, int z) {
-            return x < mask.widthX() && y < mask.heightY() && z < mask.lengthZ() && mask.partOfMask(x, y, z);
-        }
-    }
-}

src/api/java/baritone/api/schematic/mask/operator/NotMask.java

@@ -1,56 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.schematic.mask.operator;
-
-import baritone.api.schematic.mask.AbstractMask;
-import baritone.api.schematic.mask.Mask;
-import baritone.api.schematic.mask.StaticMask;
-import net.minecraft.block.BlockState;
-
-/**
- * @author Brady
- */
-public final class NotMask extends AbstractMask {
-
-    private final Mask source;
-
-    public NotMask(Mask source) {
-        super(source.widthX(), source.heightY(), source.lengthZ());
-        this.source = source;
-    }
-
-    @Override
-    public boolean partOfMask(int x, int y, int z, BlockState currentState) {
-        return !this.source.partOfMask(x, y, z, currentState);
-    }
-
-    public static final class Static extends AbstractMask implements StaticMask {
-
-        private final StaticMask source;
-
-        public Static(StaticMask source) {
-            super(source.widthX(), source.heightY(), source.lengthZ());
-            this.source = source;
-        }
-
-        @Override
-        public boolean partOfMask(int x, int y, int z) {
-            return !this.source.partOfMask(x, y, z);
-        }
-    }
-}

src/api/java/baritone/api/schematic/mask/shape/CylinderMask.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.schematic.mask.shape;
-
-import baritone.api.schematic.mask.AbstractMask;
-import baritone.api.schematic.mask.StaticMask;
-import net.minecraft.util.Direction;
-
-/**
- * @author Brady
- */
-public final class CylinderMask extends AbstractMask implements StaticMask {
-
-    private final double centerA;
-    private final double centerB;
-    private final double radiusSqA;
-    private final double radiusSqB;
-    private final boolean filled;
-    private final Direction.Axis alignment;
-
-    public CylinderMask(int widthX, int heightY, int lengthZ, boolean filled, Direction.Axis alignment) {
-        super(widthX, heightY, lengthZ);
-        this.centerA = this.getA(widthX, heightY, alignment) / 2.0;
-        this.centerB = this.getB(heightY, lengthZ, alignment) / 2.0;
-        this.radiusSqA = (this.centerA - 1) * (this.centerA - 1);
-        this.radiusSqB = (this.centerB - 1) * (this.centerB - 1);
-        this.filled = filled;
-        this.alignment = alignment;
-    }
-
-    @Override
-    public boolean partOfMask(int x, int y, int z) {
-        double da = Math.abs((this.getA(x, y, this.alignment) + 0.5) - this.centerA);
-        double db = Math.abs((this.getB(y, z, this.alignment) + 0.5) - this.centerB);
-        if (this.outside(da, db)) {
-            return false;
-        }
-        return this.filled
-                || this.outside(da + 1, db)
-                || this.outside(da, db + 1);
-    }
-
-    private boolean outside(double da, double db) {
-        return da * da / this.radiusSqA + db * db / this.radiusSqB > 1;
-    }
-
-    private static int getA(int x, int y, Direction.Axis alignment) {
-        return alignment == Direction.Axis.X ? y : x;
-    }
-
-    private static int getB(int y, int z, Direction.Axis alignment) {
-        return alignment == Direction.Axis.Z ? y : z;
-    }
-}

src/api/java/baritone/api/schematic/mask/shape/SphereMask.java

@@ -1,64 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.schematic.mask.shape;
-
-import baritone.api.schematic.mask.AbstractMask;
-import baritone.api.schematic.mask.StaticMask;
-
-/**
- * @author Brady
- */
-public final class SphereMask extends AbstractMask implements StaticMask {
-
-    private final double centerX;
-    private final double centerY;
-    private final double centerZ;
-    private final double radiusSqX;
-    private final double radiusSqY;
-    private final double radiusSqZ;
-    private final boolean filled;
-
-    public SphereMask(int widthX, int heightY, int lengthZ, boolean filled) {
-        super(widthX, heightY, lengthZ);
-        this.centerX = widthX / 2.0;
-        this.centerY = heightY / 2.0;
-        this.centerZ = lengthZ / 2.0;
-        this.radiusSqX = this.centerX * this.centerX;
-        this.radiusSqY = this.centerY * this.centerY;
-        this.radiusSqZ = this.centerZ * this.centerZ;
-        this.filled = filled;
-    }
-
-    @Override
-    public boolean partOfMask(int x, int y, int z) {
-        double dx = Math.abs((x + 0.5) - this.centerX);
-        double dy = Math.abs((y + 0.5) - this.centerY);
-        double dz = Math.abs((z + 0.5) - this.centerZ);
-        if (this.outside(dx, dy, dz)) {
-            return false;
-        }
-        return this.filled
-                || this.outside(dx + 1, dy, dz)
-                || this.outside(dx, dy + 1, dz)
-                || this.outside(dx, dy, dz + 1);
-    }
-
-    private boolean outside(double dx, double dy, double dz) {
-        return dx * dx / this.radiusSqX + dy * dy / this.radiusSqY + dz * dz / this.radiusSqZ > 1;
-    }
-}

src/api/java/baritone/api/selection/ISelection.java

@@ -18,9 +18,9 @@
 package baritone.api.selection;
 
 import baritone.api.utils.BetterBlockPos;
-import net.minecraft.util.Direction;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.AxisAlignedBB;
-import net.minecraft.util.math.vector.Vector3i;
+import net.minecraft.util.math.Vec3i;
 
 /**
  * A selection is an immutable object representing the current selection. The selection is commonly used for certain
@@ -51,7 +51,7 @@ public interface ISelection {
     /**
      * @return The size of this ISelection.
      */
-    Vector3i size();
+    Vec3i size();
 
     /**
      * @return An {@link AxisAlignedBB} encompassing all blocks in this selection.
@@ -65,7 +65,7 @@ public interface ISelection {
      * @param blocks    How many blocks to expand it.
      * @return A new selection, expanded as specified.
      */
-    ISelection expand(Direction direction, int blocks);
+    ISelection expand(EnumFacing direction, int blocks);
 
     /**
      * Returns a new {@link ISelection} contracted in the specified direction by the specified number of blocks.
@@ -77,7 +77,7 @@ public interface ISelection {
      * @param blocks    How many blocks to contract it.
      * @return A new selection, contracted as specified.
      */
-    ISelection contract(Direction direction, int blocks);
+    ISelection contract(EnumFacing direction, int blocks);
 
     /**
      * Returns a new {@link ISelection} shifted in the specified direction by the specified number of blocks. This moves
@@ -87,5 +87,5 @@ public interface ISelection {
      * @param blocks    How many blocks to shift it.
      * @return A new selection, shifted as specified.
      */
-    ISelection shift(Direction direction, int blocks);
+    ISelection shift(EnumFacing direction, int blocks);
 }

src/api/java/baritone/api/selection/ISelectionManager.java

@@ -18,7 +18,7 @@
 package baritone.api.selection;
 
 import baritone.api.utils.BetterBlockPos;
-import net.minecraft.util.Direction;
+import net.minecraft.util.EnumFacing;
 
 /**
  * The selection manager handles setting Baritone's selections. You can set the selection here, as well as retrieving
@@ -87,7 +87,7 @@ public interface ISelectionManager {
      * @param blocks    How many blocks to expand it.
      * @return The new selection, expanded as specified.
      */
-    ISelection expand(ISelection selection, Direction direction, int blocks);
+    ISelection expand(ISelection selection, EnumFacing direction, int blocks);
 
     /**
      * Replaces the specified {@link ISelection} with one contracted in the specified direction by the specified number
@@ -101,7 +101,7 @@ public interface ISelectionManager {
      * @param blocks    How many blocks to contract it.
      * @return The new selection, contracted as specified.
      */
-    ISelection contract(ISelection selection, Direction direction, int blocks);
+    ISelection contract(ISelection selection, EnumFacing direction, int blocks);
 
     /**
      * Replaces the specified {@link ISelection} with one shifted in the specified direction by the specified number of
@@ -112,5 +112,5 @@ public interface ISelectionManager {
      * @param blocks    How many blocks to shift it.
      * @return The new selection, shifted as specified.
      */
-    ISelection shift(ISelection selection, Direction direction, int blocks);
+    ISelection shift(ISelection selection, EnumFacing direction, int blocks);
 }

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

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

src/api/java/baritone/api/utils/BlockOptionalMeta.java

@@ -18,122 +18,253 @@
 package baritone.api.utils;
 
 import baritone.api.utils.accessor.IItemStack;
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import io.netty.util.concurrent.ThreadPerTaskExecutor;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
-import net.minecraft.item.Item;
+import net.minecraft.block.*;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.ItemStack;
-import net.minecraft.loot.*;
-import net.minecraft.resources.*;
-import net.minecraft.state.Property;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.Unit;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Vector3d;
 
 import javax.annotation.Nonnull;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-import java.util.concurrent.CompletableFuture;
+import javax.annotation.Nullable;
+import java.util.*;
+import java.util.function.Consumer;
+import java.util.regex.MatchResult;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 public final class BlockOptionalMeta {
-    // id or id[] or id[properties] where id and properties are any text with at least one character
-    private static final Pattern PATTERN = Pattern.compile("^(?<id>.+?)(?:\\[(?<properties>.+?)?\\])?$");
 
     private final Block block;
-    private final String propertiesDescription; // exists so toString() can return something more useful than a list of all blockstates
-    private final Set<BlockState> blockstates;
-    private final Set<Integer> stateHashes;
-    private final Set<Integer> stackHashes;
-    private static LootTableManager manager;
-    private static LootPredicateManager predicate = new LootPredicateManager();
-    private static Map<Block, List<Item>> drops = new HashMap<>();
+    private final int meta;
+    private final boolean noMeta;
+    private final Set<IBlockState> blockstates;
+    private final ImmutableSet<Integer> stateHashes;
+    private final ImmutableSet<Integer> stackHashes;
+    private static final Pattern pattern = Pattern.compile("^(.+?)(?::(\\d+))?$");
+    private static final Map<Object, Object> normalizations;
 
-    public BlockOptionalMeta(@Nonnull Block block) {
+    public BlockOptionalMeta(@Nonnull Block block, @Nullable Integer meta) {
         this.block = block;
-        this.propertiesDescription = "{}";
-        this.blockstates = getStates(block, Collections.emptyMap());
+        this.noMeta = meta == null;
+        this.meta = noMeta ? 0 : meta;
+        this.blockstates = getStates(block, meta);
         this.stateHashes = getStateHashes(blockstates);
         this.stackHashes = getStackHashes(blockstates);
     }
 
+    public BlockOptionalMeta(@Nonnull Block block) {
+        this(block, null);
+    }
+
     public BlockOptionalMeta(@Nonnull String selector) {
-        Matcher matcher = PATTERN.matcher(selector);
+        Matcher matcher = pattern.matcher(selector);
 
         if (!matcher.find()) {
             throw new IllegalArgumentException("invalid block selector");
         }
 
-        block = BlockUtils.stringToBlockRequired(matcher.group("id"));
+        MatchResult matchResult = matcher.toMatchResult();
+        noMeta = matchResult.group(2) == null;
 
-        String props = matcher.group("properties");
-        Map<Property<?>, ?> properties = props == null || props.equals("") ? Collections.emptyMap() : parseProperties(block, props);
+        ResourceLocation id = new ResourceLocation(matchResult.group(1));
 
-        propertiesDescription = props == null ? "{}" : "{" + props.replace("=", ":") + "}";
-        blockstates = getStates(block, properties);
+        if (!Block.REGISTRY.containsKey(id)) {
+            throw new IllegalArgumentException("Invalid block ID");
+        }
+
+        block = Block.REGISTRY.getObject(id);
+        meta = noMeta ? 0 : Integer.parseInt(matchResult.group(2));
+        blockstates = getStates(block, getMeta());
         stateHashes = getStateHashes(blockstates);
         stackHashes = getStackHashes(blockstates);
     }
 
-    private static <C extends Comparable<C>, P extends Property<C>> P castToIProperty(Object value) {
+    static {
+        Map<Object, Object> _normalizations = new HashMap<>();
+        Consumer<Enum> put = instance -> _normalizations.put(instance.getClass(), instance);
+        put.accept(EnumFacing.NORTH);
+        put.accept(EnumFacing.Axis.Y);
+        put.accept(BlockLog.EnumAxis.Y);
+        put.accept(BlockStairs.EnumHalf.BOTTOM);
+        put.accept(BlockStairs.EnumShape.STRAIGHT);
+        put.accept(BlockLever.EnumOrientation.DOWN_X);
+        put.accept(BlockDoublePlant.EnumBlockHalf.LOWER);
+        put.accept(BlockSlab.EnumBlockHalf.BOTTOM);
+        put.accept(BlockDoor.EnumDoorHalf.LOWER);
+        put.accept(BlockDoor.EnumHingePosition.LEFT);
+        put.accept(BlockBed.EnumPartType.HEAD);
+        put.accept(BlockRailBase.EnumRailDirection.NORTH_SOUTH);
+        put.accept(BlockTrapDoor.DoorHalf.BOTTOM);
+        _normalizations.put(BlockBanner.ROTATION, 0);
+        _normalizations.put(BlockBed.OCCUPIED, false);
+        _normalizations.put(BlockBrewingStand.HAS_BOTTLE[0], false);
+        _normalizations.put(BlockBrewingStand.HAS_BOTTLE[1], false);
+        _normalizations.put(BlockBrewingStand.HAS_BOTTLE[2], false);
+        _normalizations.put(BlockButton.POWERED, false);
+        // _normalizations.put(BlockCactus.AGE, 0);
+        // _normalizations.put(BlockCauldron.LEVEL, 0);
+        // _normalizations.put(BlockChorusFlower.AGE, 0);
+        _normalizations.put(BlockChorusPlant.NORTH, false);
+        _normalizations.put(BlockChorusPlant.EAST, false);
+        _normalizations.put(BlockChorusPlant.SOUTH, false);
+        _normalizations.put(BlockChorusPlant.WEST, false);
+        _normalizations.put(BlockChorusPlant.UP, false);
+        _normalizations.put(BlockChorusPlant.DOWN, false);
+        // _normalizations.put(BlockCocoa.AGE, 0);
+        // _normalizations.put(BlockCrops.AGE, 0);
+        _normalizations.put(BlockDirt.SNOWY, false);
+        _normalizations.put(BlockDoor.OPEN, false);
+        _normalizations.put(BlockDoor.POWERED, false);
+        // _normalizations.put(BlockFarmland.MOISTURE, 0);
+        _normalizations.put(BlockFence.NORTH, false);
+        _normalizations.put(BlockFence.EAST, false);
+        _normalizations.put(BlockFence.WEST, false);
+        _normalizations.put(BlockFence.SOUTH, false);
+        // _normalizations.put(BlockFenceGate.POWERED, false);
+        // _normalizations.put(BlockFenceGate.IN_WALL, false);
+        _normalizations.put(BlockFire.AGE, 0);
+        _normalizations.put(BlockFire.NORTH, false);
+        _normalizations.put(BlockFire.EAST, false);
+        _normalizations.put(BlockFire.SOUTH, false);
+        _normalizations.put(BlockFire.WEST, false);
+        _normalizations.put(BlockFire.UPPER, false);
+        // _normalizations.put(BlockFrostedIce.AGE, 0);
+        _normalizations.put(BlockGrass.SNOWY, false);
+        // _normalizations.put(BlockHopper.ENABLED, true);
+        // _normalizations.put(BlockLever.POWERED, false);
+        // _normalizations.put(BlockLiquid.LEVEL, 0);
+        // _normalizations.put(BlockMycelium.SNOWY, false);
+        // _normalizations.put(BlockNetherWart.AGE, false);
+        _normalizations.put(BlockLeaves.CHECK_DECAY, false);
+        // _normalizations.put(BlockLeaves.DECAYABLE, false);
+        // _normalizations.put(BlockObserver.POWERED, false);
+        _normalizations.put(BlockPane.NORTH, false);
+        _normalizations.put(BlockPane.EAST, false);
+        _normalizations.put(BlockPane.WEST, false);
+        _normalizations.put(BlockPane.SOUTH, false);
+        // _normalizations.put(BlockPistonBase.EXTENDED, false);
+        // _normalizations.put(BlockPressurePlate.POWERED, false);
+        // _normalizations.put(BlockPressurePlateWeighted.POWER, false);
+        _normalizations.put(BlockQuartz.EnumType.LINES_X, BlockQuartz.EnumType.LINES_Y);
+        _normalizations.put(BlockQuartz.EnumType.LINES_Z, BlockQuartz.EnumType.LINES_Y);
+        // _normalizations.put(BlockRailDetector.POWERED, false);
+        // _normalizations.put(BlockRailPowered.POWERED, false);
+        _normalizations.put(BlockRedstoneWire.NORTH, false);
+        _normalizations.put(BlockRedstoneWire.EAST, false);
+        _normalizations.put(BlockRedstoneWire.SOUTH, false);
+        _normalizations.put(BlockRedstoneWire.WEST, false);
+        // _normalizations.put(BlockReed.AGE, false);
+        _normalizations.put(BlockSapling.STAGE, 0);
+        _normalizations.put(BlockSkull.NODROP, false);
+        _normalizations.put(BlockStandingSign.ROTATION, 0);
+        _normalizations.put(BlockStem.AGE, 0);
+        _normalizations.put(BlockTripWire.NORTH, false);
+        _normalizations.put(BlockTripWire.EAST, false);
+        _normalizations.put(BlockTripWire.WEST, false);
+        _normalizations.put(BlockTripWire.SOUTH, false);
+        _normalizations.put(BlockVine.NORTH, false);
+        _normalizations.put(BlockVine.EAST, false);
+        _normalizations.put(BlockVine.SOUTH, false);
+        _normalizations.put(BlockVine.WEST, false);
+        _normalizations.put(BlockVine.UP, false);
+        _normalizations.put(BlockWall.UP, false);
+        _normalizations.put(BlockWall.NORTH, false);
+        _normalizations.put(BlockWall.EAST, false);
+        _normalizations.put(BlockWall.WEST, false);
+        _normalizations.put(BlockWall.SOUTH, false);
+        normalizations = Collections.unmodifiableMap(_normalizations);
+    }
+
+    public static <C extends Comparable<C>, P extends IProperty<C>> P castToIProperty(Object value) {
         //noinspection unchecked
         return (P) value;
     }
 
-    private static Map<Property<?>, ?> parseProperties(Block block, String raw) {
-        ImmutableMap.Builder<Property<?>, Object> builder = ImmutableMap.builder();
-        for (String pair : raw.split(",")) {
-            String[] parts = pair.split("=");
-            if (parts.length != 2) {
-                throw new IllegalArgumentException(String.format("\"%s\" is not a valid property-value pair", pair));
-            }
-            String rawKey = parts[0];
-            String rawValue = parts[1];
-            Property<?> key = block.getStateContainer().getProperty(rawKey);
-            Comparable<?> value = castToIProperty(key).parseValue(rawValue)
-                    .orElseThrow(() -> new IllegalArgumentException(String.format(
-                            "\"%s\" is not a valid value for %s on %s",
-                            rawValue, key, block
-                    )));
-            builder.put(key, value);
-        }
-        return builder.build();
+    public static <C extends Comparable<C>, P extends IProperty<C>> C castToIPropertyValue(P iproperty, Object value) {
+        //noinspection unchecked
+        return (C) value;
     }
 
-    private static Set<BlockState> getStates(@Nonnull Block block, @Nonnull Map<Property<?>, ?> properties) {
-        return block.getStateContainer().getValidStates().stream()
-                .filter(blockstate -> properties.entrySet().stream().allMatch(entry ->
-                        blockstate.get(entry.getKey()) == entry.getValue()
-                ))
+    /**
+     * Normalizes the specified blockstate by setting meta-affecting properties which
+     * are not being targeted by the meta parameter to their default values.
+     * <p>
+     * For example, block variant/color is the primary target for the meta value, so properties
+     * such as rotation/facing direction will be set to default values in order to nullify
+     * the effect that they have on the state's meta value.
+     *
+     * @param state The state to normalize
+     * @return The normalized block state
+     */
+    public static IBlockState normalize(IBlockState state) {
+        IBlockState newState = state;
+
+        for (IProperty<?> property : state.getProperties().keySet()) {
+            Class<?> valueClass = property.getValueClass();
+            if (normalizations.containsKey(property)) {
+                try {
+                    newState = newState.withProperty(
+                            castToIProperty(property),
+                            castToIPropertyValue(property, normalizations.get(property))
+                    );
+                } catch (IllegalArgumentException ignored) {}
+            } else if (normalizations.containsKey(state.getValue(property))) {
+                try {
+                    newState = newState.withProperty(
+                            castToIProperty(property),
+                            castToIPropertyValue(property, normalizations.get(state.getValue(property)))
+                    );
+                } catch (IllegalArgumentException ignored) {}
+            } else if (normalizations.containsKey(valueClass)) {
+                try {
+                    newState = newState.withProperty(
+                            castToIProperty(property),
+                            castToIPropertyValue(property, normalizations.get(valueClass))
+                    );
+                } catch (IllegalArgumentException ignored) {}
+            }
+        }
+
+        return newState;
+    }
+
+    /**
+     * Evaluate the target meta value for the specified state. The target meta value is
+     * most often that which is influenced by the variant/color property of the block state.
+     *
+     * @param state The state to check
+     * @return The target meta of the state
+     * @see #normalize(IBlockState)
+     */
+    public static int stateMeta(IBlockState state) {
+        return state.getBlock().getMetaFromState(normalize(state));
+    }
+
+    private static Set<IBlockState> getStates(@Nonnull Block block, @Nullable Integer meta) {
+        return block.getBlockState().getValidStates().stream()
+                .filter(blockstate -> meta == null || stateMeta(blockstate) == meta)
                 .collect(Collectors.toSet());
     }
 
-    private static ImmutableSet<Integer> getStateHashes(Set<BlockState> blockstates) {
+    private static ImmutableSet<Integer> getStateHashes(Set<IBlockState> blockstates) {
         return ImmutableSet.copyOf(
                 blockstates.stream()
-                        .map(BlockState::hashCode)
+                        .map(IBlockState::hashCode)
                         .toArray(Integer[]::new)
         );
     }
 
-    private static ImmutableSet<Integer> getStackHashes(Set<BlockState> blockstates) {
+    private static ImmutableSet<Integer> getStackHashes(Set<IBlockState> blockstates) {
         //noinspection ConstantConditions
         return ImmutableSet.copyOf(
                 blockstates.stream()
-                        .flatMap(state -> drops(state.getBlock())
-                                .stream()
-                                .map(item -> new ItemStack(item, 1))
-                        )
+                        .map(state -> new ItemStack(
+                                state.getBlock().getItemDropped(state, new Random(), 0),
+                                state.getBlock().damageDropped(state)
+                        ))
                         .map(stack -> ((IItemStack) (Object) stack).getBaritoneHash())
                         .toArray(Integer[]::new)
         );
@@ -143,11 +274,15 @@ public final class BlockOptionalMeta {
         return block;
     }
 
+    public Integer getMeta() {
+        return noMeta ? null : meta;
+    }
+
     public boolean matches(@Nonnull Block block) {
         return block == this.block;
     }
 
-    public boolean matches(@Nonnull BlockState blockstate) {
+    public boolean matches(@Nonnull IBlockState blockstate) {
         Block block = blockstate.getBlock();
         return block == this.block && stateHashes.contains(blockstate.hashCode());
     }
@@ -156,74 +291,28 @@ public final class BlockOptionalMeta {
         //noinspection ConstantConditions
         int hash = ((IItemStack) (Object) stack).getBaritoneHash();
 
-        hash -= stack.getDamage();
+        if (noMeta) {
+            hash -= stack.getItemDamage();
+        }
 
         return stackHashes.contains(hash);
     }
 
     @Override
     public String toString() {
-        return String.format("BlockOptionalMeta{block=%s,properties=%s}", block, propertiesDescription);
+        return String.format("BlockOptionalMeta{block=%s,meta=%s}", block, getMeta());
     }
 
-    public BlockState getAnyBlockState() {
+    public static IBlockState blockStateFromStack(ItemStack stack) {
+        //noinspection deprecation
+        return Block.getBlockFromItem(stack.getItem()).getStateFromMeta(stack.getMetadata());
+    }
+
+    public IBlockState getAnyBlockState() {
         if (blockstates.size() > 0) {
             return blockstates.iterator().next();
         }
 
         return null;
     }
-
-    public Set<BlockState> getAllBlockStates() {
-        return blockstates;
-    }
-
-    public Set<Integer> stackHashes() {
-        return stackHashes;
-    }
-
-    public static LootTableManager getManager() {
-        if (manager == null) {
-            ResourcePackList rpl = new ResourcePackList(ResourcePackInfo::new, new ServerPackFinder());
-            rpl.reloadPacksFromFinders();
-            IResourcePack thePack = rpl.getAllPacks().iterator().next().getResourcePack();
-            IReloadableResourceManager resourceManager = new SimpleReloadableResourceManager(ResourcePackType.SERVER_DATA);
-            manager = new LootTableManager(predicate);
-            resourceManager.addReloadListener(manager);
-            try {
-                resourceManager.reloadResourcesAndThen(new ThreadPerTaskExecutor(Thread::new), new ThreadPerTaskExecutor(Thread::new), Collections.singletonList(thePack), CompletableFuture.completedFuture(Unit.INSTANCE)).get();
-            } catch (Exception exception) {
-                throw new RuntimeException(exception);
-            }
-        }
-        return manager;
-    }
-
-    public static LootPredicateManager getPredicateManager() {
-        return predicate;
-    }
-
-    private static synchronized List<Item> drops(Block b) {
-        return drops.computeIfAbsent(b, block -> {
-            ResourceLocation lootTableLocation = block.getLootTable();
-            if (lootTableLocation == LootTables.EMPTY) {
-                return Collections.emptyList();
-            } else {
-                List<Item> items = new ArrayList<>();
-
-                // the other overload for generate doesnt work in forge because forge adds code that requires a non null world
-                getManager().getLootTableFromLocation(lootTableLocation).generate(
-                        new LootContext.Builder(null)
-                                .withRandom(new Random())
-                                .withParameter(LootParameters.field_237457_g_, Vector3d.copy(BlockPos.NULL_VECTOR))
-                                .withParameter(LootParameters.TOOL, ItemStack.EMPTY)
-                                .withNullableParameter(LootParameters.BLOCK_ENTITY, null)
-                                .withParameter(LootParameters.BLOCK_STATE, block.getDefaultState())
-                                .build(LootParameterSets.BLOCK),
-                        stack -> items.add(stack.getItem())
-                );
-                return items;
-            }
-        });
-    }
 }

src/api/java/baritone/api/utils/BlockOptionalMetaLookup.java

@@ -17,70 +17,68 @@
 
 package baritone.api.utils;
 
-import baritone.api.utils.accessor.IItemStack;
-import com.google.common.collect.ImmutableSet;
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.ItemStack;
 
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import java.util.stream.Stream;
 
 public class BlockOptionalMetaLookup {
-    private final ImmutableSet<Block> blockSet;
-    private final ImmutableSet<BlockState> blockStateSet;
-    private final ImmutableSet<Integer> stackHashes;
+
     private final BlockOptionalMeta[] boms;
 
     public BlockOptionalMetaLookup(BlockOptionalMeta... boms) {
         this.boms = boms;
-        Set<Block> blocks = new HashSet<>();
-        Set<BlockState> blockStates = new HashSet<>();
-        Set<Integer> stacks = new HashSet<>();
-        for (BlockOptionalMeta bom : boms) {
-            blocks.add(bom.getBlock());
-            blockStates.addAll(bom.getAllBlockStates());
-            stacks.addAll(bom.stackHashes());
-        }
-        this.blockSet = ImmutableSet.copyOf(blocks);
-        this.blockStateSet = ImmutableSet.copyOf(blockStates);
-        this.stackHashes = ImmutableSet.copyOf(stacks);
     }
 
     public BlockOptionalMetaLookup(Block... blocks) {
-        this(Stream.of(blocks)
+        this.boms = Stream.of(blocks)
                 .map(BlockOptionalMeta::new)
-                .toArray(BlockOptionalMeta[]::new));
-
+                .toArray(BlockOptionalMeta[]::new);
     }
 
     public BlockOptionalMetaLookup(List<Block> blocks) {
-        this(blocks.stream()
+        this.boms = blocks.stream()
                 .map(BlockOptionalMeta::new)
-                .toArray(BlockOptionalMeta[]::new));
+                .toArray(BlockOptionalMeta[]::new);
     }
 
     public BlockOptionalMetaLookup(String... blocks) {
-        this(Stream.of(blocks)
+        this.boms = Stream.of(blocks)
                 .map(BlockOptionalMeta::new)
-                .toArray(BlockOptionalMeta[]::new));
+                .toArray(BlockOptionalMeta[]::new);
     }
 
     public boolean has(Block block) {
-        return blockSet.contains(block);
+        for (BlockOptionalMeta bom : boms) {
+            if (bom.getBlock() == block) {
+                return true;
+            }
+        }
+
+        return false;
     }
 
-    public boolean has(BlockState state) {
-        return blockStateSet.contains(state);
+    public boolean has(IBlockState state) {
+        for (BlockOptionalMeta bom : boms) {
+            if (bom.matches(state)) {
+                return true;
+            }
+        }
+
+        return false;
     }
 
     public boolean has(ItemStack stack) {
-        int hash = ((IItemStack) (Object) stack).getBaritoneHash();
-        hash -= stack.getDamage();
-        return stackHashes.contains(hash);
+        for (BlockOptionalMeta bom : boms) {
+            if (bom.matches(stack)) {
+                return true;
+            }
+        }
+
+        return false;
     }
 
     public List<BlockOptionalMeta> blocks() {

src/api/java/baritone/api/utils/BlockUtils.java

@@ -19,7 +19,6 @@ package baritone.api.utils;
 
 import net.minecraft.block.Block;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.registry.Registry;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -29,7 +28,7 @@ public class BlockUtils {
     private static transient Map<String, Block> resourceCache = new HashMap<>();
 
     public static String blockToString(Block block) {
-        ResourceLocation loc = Registry.BLOCK.getKey(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?
@@ -57,7 +56,7 @@ public class BlockUtils {
         if (resourceCache.containsKey(name)) {
             return null; // cached as null
         }
-        block = Registry.BLOCK.getOptional(ResourceLocation.tryCreate(name.contains(":") ? name : "minecraft:" + name)).orElse(null);
+        block = Block.getBlockFromName(name.contains(":") ? name : "minecraft:" + name);
         Map<String, Block> copy = new HashMap<>(resourceCache); // read only copy is safe, wont throw concurrentmodification
         copy.put(name, block);
         resourceCache = copy;

src/api/java/baritone/api/utils/Helper.java

@@ -20,8 +20,7 @@ package baritone.api.utils;
 import baritone.api.BaritoneAPI;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.StringTextComponent;
-import net.minecraft.util.text.TextComponent;
+import net.minecraft.util.text.TextComponentString;
 import net.minecraft.util.text.TextFormatting;
 
 import java.util.Arrays;
@@ -43,25 +42,23 @@ public interface Helper {
     Helper HELPER = new Helper() {};
 
     /**
-     * The main game instance returned by {@link Minecraft#getInstance()}.
-     * Deprecated since {@link IPlayerContext#minecraft()} should be used instead (In the majority of cases).
+     * Instance of the game
      */
-    @Deprecated
-    Minecraft mc = Minecraft.getInstance();
+    Minecraft mc = Minecraft.getMinecraft();
 
     static ITextComponent getPrefix() {
         // Inner text component
         final Calendar now = Calendar.getInstance();
         final boolean xd = now.get(Calendar.MONTH) == Calendar.APRIL && now.get(Calendar.DAY_OF_MONTH) <= 3;
-        TextComponent baritone = new StringTextComponent(xd ? "Baritoe" : BaritoneAPI.getSettings().shortBaritonePrefix.value ? "B" : "Baritone");
-        baritone.setStyle(baritone.getStyle().setFormatting(TextFormatting.LIGHT_PURPLE));
+        ITextComponent baritone = new TextComponentString(xd ? "Baritoe" : BaritoneAPI.getSettings().shortBaritonePrefix.value ? "B" : "Baritone");
+        baritone.getStyle().setColor(TextFormatting.LIGHT_PURPLE);
 
         // Outer brackets
-        TextComponent prefix = new StringTextComponent("");
-        prefix.setStyle(baritone.getStyle().setFormatting(TextFormatting.DARK_PURPLE));
-        prefix.appendString("[");
-        prefix.append(baritone);
-        prefix.appendString("]");
+        ITextComponent prefix = new TextComponentString("");
+        prefix.getStyle().setColor(TextFormatting.DARK_PURPLE);
+        prefix.appendText("[");
+        prefix.appendSibling(baritone);
+        prefix.appendText("]");
 
         return prefix;
     }
@@ -73,7 +70,7 @@ public interface Helper {
      * @param message The message to display in the popup
      */
     default void logToast(ITextComponent title, ITextComponent message) {
-        Minecraft.getInstance().execute(() -> BaritoneAPI.getSettings().toaster.value.accept(title, message));
+        mc.addScheduledTask(() -> BaritoneAPI.getSettings().toaster.value.accept(title, message));
     }
 
     /**
@@ -83,7 +80,7 @@ public interface Helper {
      * @param message The message to display in the popup
      */
     default void logToast(String title, String message) {
-        logToast(new StringTextComponent(title), new StringTextComponent(message));
+        logToast(new TextComponentString(title), new TextComponentString(message));
     }
 
     /**
@@ -92,7 +89,7 @@ public interface Helper {
      * @param message The message to display in the popup
      */
     default void logToast(String message) {
-        logToast(Helper.getPrefix(), new StringTextComponent(message));
+        logToast(Helper.getPrefix(), new TextComponentString(message));
     }
 
     /**
@@ -134,7 +131,7 @@ public interface Helper {
      * @param error   Whether to log as an error
      */
     default void logNotificationDirect(String message, boolean error) {
-        Minecraft.getInstance().execute(() -> BaritoneAPI.getSettings().notifier.value.accept(message, error));
+        mc.addScheduledTask(() -> BaritoneAPI.getSettings().notifier.value.accept(message, error));
     }
 
     /**
@@ -160,14 +157,18 @@ public interface Helper {
      * @param components The components to send
      */
     default void logDirect(boolean logAsToast, ITextComponent... components) {
-        TextComponent component = new StringTextComponent("");
-        component.append(getPrefix());
-        component.append(new StringTextComponent(" "));
-        Arrays.asList(components).forEach(component::append);
+        ITextComponent component = new TextComponentString("");
+        if (!logAsToast) {
+            // If we are not logging as a Toast
+            // Append the prefix to the base component line
+            component.appendSibling(getPrefix());
+            component.appendSibling(new TextComponentString(" "));
+        }
+        Arrays.asList(components).forEach(component::appendSibling);
         if (logAsToast) {
             logToast(getPrefix(), component);
         } else {
-            Minecraft.getInstance().execute(() -> BaritoneAPI.getSettings().logger.value.accept(component));
+            mc.addScheduledTask(() -> BaritoneAPI.getSettings().logger.value.accept(component));
         }
     }
 
@@ -190,8 +191,8 @@ public interface Helper {
      */
     default void logDirect(String message, TextFormatting color, boolean logAsToast) {
         Stream.of(message.split("\n")).forEach(line -> {
-            TextComponent component = new StringTextComponent(line.replace("\t", "    "));
-            component.setStyle(component.getStyle().setFormatting(color));
+            ITextComponent component = new TextComponentString(line.replace("\t", "    "));
+            component.getStyle().setColor(color);
             logDirect(logAsToast, component);
         });
     }

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

@@ -18,20 +18,14 @@
 package baritone.api.utils;
 
 import baritone.api.cache.IWorldData;
-import net.minecraft.block.SlabBlock;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.player.ClientPlayerEntity;
-import net.minecraft.client.world.ClientWorld;
-import net.minecraft.entity.Entity;
+import net.minecraft.block.BlockSlab;
+import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.BlockRayTraceResult;
 import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 
 import java.util.Optional;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
 
 /**
  * @author Brady
@@ -39,30 +33,19 @@ import java.util.stream.StreamSupport;
  */
 public interface IPlayerContext {
 
-    Minecraft minecraft();
-
-    ClientPlayerEntity player();
+    EntityPlayerSP player();
 
     IPlayerController playerController();
 
     World world();
 
-    default Iterable<Entity> entities() {
-        return ((ClientWorld) world()).getAllEntities();
-    }
-
-    default Stream<Entity> entitiesStream() {
-        return StreamSupport.stream(entities().spliterator(), false);
-    }
-
-
     IWorldData worldData();
 
     RayTraceResult objectMouseOver();
 
     default BetterBlockPos playerFeet() {
         // TODO find a better way to deal with soul sand!!!!!
-        BetterBlockPos feet = new BetterBlockPos(player().getPositionVec().x, player().getPositionVec().y + 0.1251, player().getPositionVec().z);
+        BetterBlockPos feet = new BetterBlockPos(player().posX, player().posY + 0.1251, player().posZ);
 
         // sometimes when calling this from another thread or while world is null, it'll throw a NullPointerException
         // that causes the game to immediately crash
@@ -73,7 +56,7 @@ public interface IPlayerContext {
         // this does not impact performance at all since we're not null checking constantly
         // if there is an exception, the only overhead is Java generating the exception object... so we can ignore it
         try {
-            if (world().getBlockState(feet).getBlock() instanceof SlabBlock) {
+            if (world().getBlockState(feet).getBlock() instanceof BlockSlab) {
                 return feet.up();
             }
         } catch (NullPointerException ignored) {}
@@ -81,22 +64,20 @@ public interface IPlayerContext {
         return feet;
     }
 
-    default Vector3d playerFeetAsVec() {
-        return new Vector3d(player().getPositionVec().x, player().getPositionVec().y, player().getPositionVec().z);
+    default Vec3d playerFeetAsVec() {
+        return new Vec3d(player().posX, player().posY, player().posZ);
     }
 
-    default Vector3d playerHead() {
-        return new Vector3d(player().getPositionVec().x, player().getPositionVec().y + player().getEyeHeight(), player().getPositionVec().z);
+    default Vec3d playerHead() {
+        return new Vec3d(player().posX, player().posY + player().getEyeHeight(), player().posZ);
     }
 
-    BetterBlockPos viewerPos();
-
     default Rotation playerRotations() {
         return new Rotation(player().rotationYaw, player().rotationPitch);
     }
 
     static double eyeHeight(boolean ifSneaking) {
-        return ifSneaking ? 1.27 : 1.62;
+        return ifSneaking ? 1.54 : 1.62;
     }
 
     /**
@@ -106,8 +87,8 @@ public interface IPlayerContext {
      */
     default Optional<BlockPos> getSelectedBlock() {
         RayTraceResult result = objectMouseOver();
-        if (result != null && result.getType() == RayTraceResult.Type.BLOCK) {
-            return Optional.of(((BlockRayTraceResult) result).getPos());
+        if (result != null && result.typeOfHit == RayTraceResult.Type.BLOCK) {
+            return Optional.of(result.getBlockPos());
         }
         return Optional.empty();
     }

src/api/java/baritone/api/utils/IPlayerController.java

@@ -18,15 +18,15 @@
 package baritone.api.utils;
 
 import baritone.api.BaritoneAPI;
-import net.minecraft.client.entity.player.ClientPlayerEntity;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.inventory.container.ClickType;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.ClickType;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.ActionResultType;
-import net.minecraft.util.Direction;
-import net.minecraft.util.Hand;
+import net.minecraft.util.EnumActionResult;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.BlockRayTraceResult;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.GameType;
 import net.minecraft.world.World;
 
@@ -40,19 +40,19 @@ public interface IPlayerController {
 
     boolean hasBrokenBlock();
 
-    boolean onPlayerDamageBlock(BlockPos pos, Direction side);
+    boolean onPlayerDamageBlock(BlockPos pos, EnumFacing side);
 
     void resetBlockRemoving();
 
-    ItemStack windowClick(int windowId, int slotId, int mouseButton, ClickType type, PlayerEntity player);
+    ItemStack windowClick(int windowId, int slotId, int mouseButton, ClickType type, EntityPlayer player);
 
     GameType getGameType();
 
-    ActionResultType processRightClickBlock(ClientPlayerEntity player, World world, Hand hand, BlockRayTraceResult result);
+    EnumActionResult processRightClickBlock(EntityPlayerSP player, World world, BlockPos pos, EnumFacing direction, Vec3d vec, EnumHand hand);
 
-    ActionResultType processRightClick(ClientPlayerEntity player, World world, Hand hand);
+    EnumActionResult processRightClick(EntityPlayerSP player, World world, EnumHand hand);
 
-    boolean clickBlock(BlockPos loc, Direction face);
+    boolean clickBlock(BlockPos loc, EnumFacing face);
 
     void setHittingBlock(boolean hittingBlock);
 

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

@@ -18,9 +18,8 @@
 package baritone.api.utils;
 
 import net.minecraft.entity.Entity;
-import net.minecraft.util.math.RayTraceContext;
 import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 
 /**
  * @author Brady
@@ -45,22 +44,22 @@ public final class RayTraceUtils {
     }
 
     public static RayTraceResult rayTraceTowards(Entity entity, Rotation rotation, double blockReachDistance, boolean wouldSneak) {
-        Vector3d start;
+        Vec3d start;
         if (wouldSneak) {
             start = inferSneakingEyePosition(entity);
         } else {
-            start = entity.getEyePosition(1.0F); // do whatever is correct
+            start = entity.getPositionEyes(1.0F); // do whatever is correct
         }
-        Vector3d direction = RotationUtils.calcVector3dFromRotation(rotation);
-        Vector3d end = start.add(
+        Vec3d direction = RotationUtils.calcVec3dFromRotation(rotation);
+        Vec3d end = start.add(
                 direction.x * blockReachDistance,
                 direction.y * blockReachDistance,
                 direction.z * blockReachDistance
         );
-        return entity.world.rayTraceBlocks(new RayTraceContext(start, end, RayTraceContext.BlockMode.OUTLINE, RayTraceContext.FluidMode.NONE, entity));
+        return entity.world.rayTraceBlocks(start, end, false, false, true);
     }
 
-    public static Vector3d inferSneakingEyePosition(Entity entity) {
-        return new Vector3d(entity.getPosX(), entity.getPosY() + IPlayerContext.eyeHeight(true), entity.getPosZ());
+    public static Vec3d inferSneakingEyePosition(Entity entity) {
+        return new Vec3d(entity.posX, entity.posY + IPlayerContext.eyeHeight(true), entity.posZ);
     }
 }

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

@@ -26,19 +26,16 @@ public class Rotation {
     /**
      * The yaw angle of this Rotation
      */
-    private final float yaw;
+    private float yaw;
 
     /**
      * The pitch angle of this Rotation
      */
-    private final float pitch;
+    private float pitch;
 
     public Rotation(float yaw, float pitch) {
         this.yaw = yaw;
         this.pitch = pitch;
-        if (Float.isInfinite(yaw) || Float.isNaN(yaw) || Float.isInfinite(pitch) || Float.isNaN(pitch)) {
-            throw new IllegalStateException(yaw + " " + pitch);
-        }
     }
 
     /**
@@ -113,10 +110,6 @@ public class Rotation {
         );
     }
 
-    public Rotation withPitch(float pitch) {
-        return new Rotation(this.yaw, pitch);
-    }
-
     /**
      * Is really close to
      *

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

@@ -19,18 +19,11 @@ package baritone.api.utils;
 
 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
-import net.minecraft.block.AbstractFireBlock;
-import net.minecraft.block.BlockState;
-import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.block.BlockFire;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.Direction;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.BlockRayTraceResult;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.math.shapes.VoxelShape;
-import net.minecraft.util.math.shapes.VoxelShapes;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.*;
 
 import java.util.Optional;
 
@@ -53,13 +46,13 @@ public final class RotationUtils {
     /**
      * Offsets from the root block position to the center of each side.
      */
-    private static final Vector3d[] BLOCK_SIDE_MULTIPLIERS = new Vector3d[]{
-            new Vector3d(0.5, 0, 0.5), // Down
-            new Vector3d(0.5, 1, 0.5), // Up
-            new Vector3d(0.5, 0.5, 0), // North
-            new Vector3d(0.5, 0.5, 1), // South
-            new Vector3d(0, 0.5, 0.5), // West
-            new Vector3d(1, 0.5, 0.5)  // East
+    private static final Vec3d[] BLOCK_SIDE_MULTIPLIERS = new Vec3d[]{
+            new Vec3d(0.5, 0, 0.5), // Down
+            new Vec3d(0.5, 1, 0.5), // Up
+            new Vec3d(0.5, 0.5, 0), // North
+            new Vec3d(0.5, 0.5, 1), // South
+            new Vec3d(0, 0.5, 0.5), // West
+            new Vec3d(1, 0.5, 0.5)  // East
     };
 
     private RotationUtils() {}
@@ -72,7 +65,7 @@ public final class RotationUtils {
      * @return The rotation from the origin to the destination
      */
     public static Rotation calcRotationFromCoords(BlockPos orig, BlockPos dest) {
-        return calcRotationFromVec3d(new Vector3d(orig.getX(), orig.getY(), orig.getZ()), new Vector3d(dest.getX(), dest.getY(), dest.getZ()));
+        return calcRotationFromVec3d(new Vec3d(orig), new Vec3d(dest));
     }
 
     /**
@@ -101,7 +94,7 @@ public final class RotationUtils {
      * @return The rotation from the origin to the destination
      * @see #wrapAnglesToRelative(Rotation, Rotation)
      */
-    public static Rotation calcRotationFromVec3d(Vector3d orig, Vector3d dest, Rotation current) {
+    public static Rotation calcRotationFromVec3d(Vec3d orig, Vec3d dest, Rotation current) {
         return wrapAnglesToRelative(current, calcRotationFromVec3d(orig, dest));
     }
 
@@ -112,7 +105,7 @@ public final class RotationUtils {
      * @param dest The destination position
      * @return The rotation from the origin to the destination
      */
-    private static Rotation calcRotationFromVec3d(Vector3d orig, Vector3d dest) {
+    private 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]);
@@ -129,26 +122,26 @@ public final class RotationUtils {
      * @param rotation The input rotation
      * @return Look vector for the rotation
      */
-    public static Vector3d calcVector3dFromRotation(Rotation 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 Vector3d((double) (f1 * f2), (double) f3, (double) (f * f2));
+        return new Vec3d((double) (f1 * f2), (double) f3, (double) (f * f2));
     }
 
     /**
      * @param ctx Context for the viewing entity
      * @param pos The target block position
      * @return The optional rotation
-     * @see #reachable(IPlayerContext, BlockPos, double)
+     * @see #reachable(EntityPlayerSP, BlockPos, double)
      */
     public static Optional<Rotation> reachable(IPlayerContext ctx, BlockPos pos) {
-        return reachable(ctx, pos, false);
+        return reachable(ctx.player(), pos, ctx.playerController().getBlockReachDistance());
     }
 
     public static Optional<Rotation> reachable(IPlayerContext ctx, BlockPos pos, boolean wouldSneak) {
-        return reachable(ctx, pos, ctx.playerController().getBlockReachDistance(), wouldSneak);
+        return reachable(ctx.player(), pos, ctx.playerController().getBlockReachDistance(), wouldSneak);
     }
 
     /**
@@ -158,17 +151,18 @@ public final class RotationUtils {
      * side that is reachable. The return type will be {@link Optional#empty()} if the entity is
      * unable to reach any of the sides of the block.
      *
-     * @param ctx                Context for the viewing entity
+     * @param entity             The viewing entity
      * @param pos                The target block position
      * @param blockReachDistance The block reach distance of the entity
      * @return The optional rotation
      */
-    public static Optional<Rotation> reachable(IPlayerContext ctx, BlockPos pos, double blockReachDistance) {
-        return reachable(ctx, pos, blockReachDistance, false);
+    public static Optional<Rotation> reachable(EntityPlayerSP entity, BlockPos pos, double blockReachDistance) {
+        return reachable(entity, pos, blockReachDistance, false);
     }
 
-    public static Optional<Rotation> reachable(IPlayerContext ctx, BlockPos pos, double blockReachDistance, boolean wouldSneak) {
-        if (BaritoneAPI.getSettings().remainWithExistingLookDirection.value && ctx.isLookingAt(pos)) {
+    public static Optional<Rotation> reachable(EntityPlayerSP entity, BlockPos pos, double blockReachDistance, boolean wouldSneak) {
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer(entity);
+        if (baritone.getPlayerContext().isLookingAt(pos)) {
             /*
              * why add 0.0001?
              * to indicate that we actually have a desired pitch
@@ -179,33 +173,30 @@ public final class RotationUtils {
              *
              * or if you're a normal person literally all this does it ensure that we don't nudge the pitch to a normal level
              */
-            Rotation hypothetical = ctx.playerRotations().add(new Rotation(0, 0.0001F));
+            Rotation hypothetical = new Rotation(entity.rotationYaw, entity.rotationPitch + 0.0001F);
             if (wouldSneak) {
                 // the concern here is: what if we're looking at it now, but as soon as we start sneaking we no longer are
-                RayTraceResult result = RayTraceUtils.rayTraceTowards(ctx.player(), hypothetical, blockReachDistance, true);
-                if (result != null && result.getType() == RayTraceResult.Type.BLOCK && ((BlockRayTraceResult) result).getPos().equals(pos)) {
+                RayTraceResult result = RayTraceUtils.rayTraceTowards(entity, hypothetical, blockReachDistance, true);
+                if (result != null && result.typeOfHit == RayTraceResult.Type.BLOCK && result.getBlockPos().equals(pos)) {
                     return Optional.of(hypothetical); // yes, if we sneaked we would still be looking at the block
                 }
             } else {
                 return Optional.of(hypothetical);
             }
         }
-        Optional<Rotation> possibleRotation = reachableCenter(ctx, pos, blockReachDistance, wouldSneak);
+        Optional<Rotation> possibleRotation = reachableCenter(entity, pos, blockReachDistance, wouldSneak);
         //System.out.println("center: " + possibleRotation);
         if (possibleRotation.isPresent()) {
             return possibleRotation;
         }
 
-        BlockState state = ctx.world().getBlockState(pos);
-        VoxelShape shape = state.getShape(ctx.world(), pos);
-        if (shape.isEmpty()) {
-            shape = VoxelShapes.fullCube();
-        }
-        for (Vector3d sideOffset : BLOCK_SIDE_MULTIPLIERS) {
-            double xDiff = shape.getStart(Direction.Axis.X) * sideOffset.x + shape.getEnd(Direction.Axis.X) * (1 - sideOffset.x);
-            double yDiff = shape.getStart(Direction.Axis.Y) * sideOffset.y + shape.getEnd(Direction.Axis.Y) * (1 - sideOffset.y);
-            double zDiff = shape.getStart(Direction.Axis.Z) * sideOffset.z + shape.getEnd(Direction.Axis.Z) * (1 - sideOffset.z);
-            possibleRotation = reachableOffset(ctx, pos, new Vector3d(pos.getX(), pos.getY(), pos.getZ()).add(xDiff, yDiff, zDiff), blockReachDistance, wouldSneak);
+        IBlockState state = entity.world.getBlockState(pos);
+        AxisAlignedBB aabb = state.getBoundingBox(entity.world, pos);
+        for (Vec3d sideOffset : BLOCK_SIDE_MULTIPLIERS) {
+            double xDiff = aabb.minX * sideOffset.x + aabb.maxX * (1 - sideOffset.x);
+            double yDiff = aabb.minY * sideOffset.y + aabb.maxY * (1 - sideOffset.y);
+            double zDiff = aabb.minZ * sideOffset.z + aabb.maxZ * (1 - sideOffset.z);
+            possibleRotation = reachableOffset(entity, pos, new Vec3d(pos).add(xDiff, yDiff, zDiff), blockReachDistance, wouldSneak);
             if (possibleRotation.isPresent()) {
                 return possibleRotation;
             }
@@ -218,23 +209,22 @@ public final class RotationUtils {
      * the given offsetted position. The return type will be {@link Optional#empty()} if
      * the entity is unable to reach the block with the offset applied.
      *
-     * @param ctx                Context for the viewing entity
+     * @param entity             The viewing entity
      * @param pos                The target block position
      * @param offsetPos          The position of the block with the offset applied.
      * @param blockReachDistance The block reach distance of the entity
      * @return The optional rotation
      */
-    public static Optional<Rotation> reachableOffset(IPlayerContext ctx, BlockPos pos, Vector3d offsetPos, double blockReachDistance, boolean wouldSneak) {
-        Vector3d eyes = wouldSneak ? RayTraceUtils.inferSneakingEyePosition(ctx.player()) : ctx.player().getEyePosition(1.0F);
-        Rotation rotation = calcRotationFromVec3d(eyes, offsetPos, ctx.playerRotations());
-        Rotation actualRotation = BaritoneAPI.getProvider().getBaritoneForPlayer(ctx.player()).getLookBehavior().getAimProcessor().peekRotation(rotation);
-        RayTraceResult result = RayTraceUtils.rayTraceTowards(ctx.player(), actualRotation, blockReachDistance, wouldSneak);
+    public static Optional<Rotation> reachableOffset(Entity entity, BlockPos pos, Vec3d offsetPos, double blockReachDistance, boolean wouldSneak) {
+        Vec3d eyes = wouldSneak ? RayTraceUtils.inferSneakingEyePosition(entity) : entity.getPositionEyes(1.0F);
+        Rotation rotation = calcRotationFromVec3d(eyes, offsetPos, new Rotation(entity.rotationYaw, entity.rotationPitch));
+        RayTraceResult result = RayTraceUtils.rayTraceTowards(entity, rotation, blockReachDistance, wouldSneak);
         //System.out.println(result);
-        if (result != null && result.getType() == RayTraceResult.Type.BLOCK) {
-            if (((BlockRayTraceResult) result).getPos().equals(pos)) {
+        if (result != null && result.typeOfHit == RayTraceResult.Type.BLOCK) {
+            if (result.getBlockPos().equals(pos)) {
                 return Optional.of(rotation);
             }
-            if (ctx.world().getBlockState(pos).getBlock() instanceof AbstractFireBlock && ((BlockRayTraceResult) result).getPos().equals(pos.down())) {
+            if (entity.world.getBlockState(pos).getBlock() instanceof BlockFire && result.getBlockPos().equals(pos.down())) {
                 return Optional.of(rotation);
             }
         }
@@ -245,45 +235,11 @@ public final class RotationUtils {
      * Determines if the specified entity is able to reach the specified block where it is
      * looking at the direct center of it's hitbox.
      *
-     * @param ctx                Context for the viewing entity
+     * @param entity             The viewing entity
      * @param pos                The target block position
      * @param blockReachDistance The block reach distance of the entity
      * @return The optional rotation
      */
-    public static Optional<Rotation> reachableCenter(IPlayerContext ctx, BlockPos pos, double blockReachDistance, boolean wouldSneak) {
-        return reachableOffset(ctx, pos, VecUtils.calculateBlockCenter(ctx.world(), pos), blockReachDistance, wouldSneak);
-    }
-
-    @Deprecated
-    public static Optional<Rotation> reachable(ClientPlayerEntity entity, BlockPos pos, double blockReachDistance) {
-        return reachable(entity, pos, blockReachDistance, false);
-    }
-
-    @Deprecated
-    public static Optional<Rotation> reachable(ClientPlayerEntity entity, BlockPos pos, double blockReachDistance, boolean wouldSneak) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer(entity);
-        IPlayerContext ctx = baritone.getPlayerContext();
-        return reachable(ctx, pos, blockReachDistance, wouldSneak);
-    }
-
-    @Deprecated
-    public static Optional<Rotation> reachableOffset(Entity entity, BlockPos pos, Vector3d offsetPos, double blockReachDistance, boolean wouldSneak) {
-        Vector3d eyes = wouldSneak ? RayTraceUtils.inferSneakingEyePosition(entity) : entity.getEyePosition(1.0F);
-        Rotation rotation = calcRotationFromVec3d(eyes, offsetPos, new Rotation(entity.rotationYaw, entity.rotationPitch));
-        RayTraceResult result = RayTraceUtils.rayTraceTowards(entity, rotation, blockReachDistance, wouldSneak);
-        //System.out.println(result);
-        if (result != null && result.getType() == RayTraceResult.Type.BLOCK) {
-            if (((BlockRayTraceResult) result).getPos().equals(pos)) {
-                return Optional.of(rotation);
-            }
-            if (entity.world.getBlockState(pos).getBlock() instanceof AbstractFireBlock && ((BlockRayTraceResult) result).getPos().equals(pos.down())) {
-                return Optional.of(rotation);
-            }
-        }
-        return Optional.empty();
-    }
-
-    @Deprecated
     public static Optional<Rotation> reachableCenter(Entity entity, BlockPos pos, double blockReachDistance, boolean wouldSneak) {
         return reachableOffset(entity, pos, VecUtils.calculateBlockCenter(entity.world, pos), blockReachDistance, wouldSneak);
     }

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

@@ -20,12 +20,9 @@ package baritone.api.utils;
 import baritone.api.BaritoneAPI;
 import baritone.api.Settings;
 import net.minecraft.block.Block;
-import net.minecraft.client.Minecraft;
 import net.minecraft.item.Item;
-import net.minecraft.util.Direction;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.vector.Vector3i;
-import net.minecraft.util.registry.Registry;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.Vec3i;
 
 import java.awt.*;
 import java.io.BufferedReader;
@@ -47,11 +44,13 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static net.minecraft.client.Minecraft.getMinecraft;
+
 public class SettingsUtil {
 
-    public static final String SETTINGS_DEFAULT_NAME = "settings.txt";
+    private static final Path SETTINGS_PATH = getMinecraft().gameDir.toPath().resolve("baritone").resolve("settings.txt");
     private static final Pattern SETTING_PATTERN = Pattern.compile("^(?<setting>[^ ]+) +(?<value>.+)"); // key and value split by the first space
-
+    private static final String[] JAVA_ONLY_SETTINGS = {"logger", "notifier", "toaster"};
 
     private static boolean isComment(String line) {
         return line.startsWith("#") || line.startsWith("//");
@@ -69,12 +68,12 @@ public class SettingsUtil {
         }
     }
 
-    public static void readAndApply(Settings settings, String settingsName) {
+    public static void readAndApply(Settings settings) {
         try {
-            forEachLine(settingsByName(settingsName), line -> {
+            forEachLine(SETTINGS_PATH, line -> {
                 Matcher matcher = SETTING_PATTERN.matcher(line);
                 if (!matcher.matches()) {
-                    Helper.HELPER.logDirect("Invalid syntax in setting file: " + line);
+                    System.out.println("Invalid syntax in setting file: " + line);
                     return;
                 }
 
@@ -83,33 +82,29 @@ public class SettingsUtil {
                 try {
                     parseAndApply(settings, settingName, settingValue);
                 } catch (Exception ex) {
-                    Helper.HELPER.logDirect("Unable to parse line " + line);
+                    System.out.println("Unable to parse line " + line);
                     ex.printStackTrace();
                 }
             });
         } catch (NoSuchFileException ignored) {
-            Helper.HELPER.logDirect("Baritone settings file not found, resetting.");
+            System.out.println("Baritone settings file not found, resetting.");
         } catch (Exception ex) {
-            Helper.HELPER.logDirect("Exception while reading Baritone settings, some settings may be reset to default values!");
+            System.out.println("Exception while reading Baritone settings, some settings may be reset to default values!");
             ex.printStackTrace();
         }
     }
 
     public static synchronized void save(Settings settings) {
-        try (BufferedWriter out = Files.newBufferedWriter(settingsByName(SETTINGS_DEFAULT_NAME))) {
+        try (BufferedWriter out = Files.newBufferedWriter(SETTINGS_PATH)) {
             for (Settings.Setting setting : modifiedSettings(settings)) {
                 out.write(settingToString(setting) + "\n");
             }
         } catch (Exception ex) {
-            Helper.HELPER.logDirect("Exception thrown while saving Baritone settings!");
+            System.out.println("Exception thrown while saving Baritone settings!");
             ex.printStackTrace();
         }
     }
 
-    private static Path settingsByName(String name) {
-        return Minecraft.getInstance().gameDir.toPath().resolve("baritone").resolve(name);
-    }
-
     public static List<Settings.Setting> modifiedSettings(Settings settings) {
         List<Settings.Setting> modified = new ArrayList<>();
         for (Settings.Setting setting : settings.allSettings) {
@@ -117,7 +112,7 @@ public class SettingsUtil {
                 System.out.println("NULL SETTING?" + setting.getName());
                 continue;
             }
-            if (setting.isJavaOnly()) {
+            if (javaOnlySetting(setting)) {
                 continue; // NO
             }
             if (setting.value == setting.defaultValue) {
@@ -171,7 +166,7 @@ public class SettingsUtil {
     }
 
     public static String settingToString(Settings.Setting setting) throws IllegalStateException {
-        if (setting.isJavaOnly()) {
+        if (javaOnlySetting(setting)) {
             return setting.getName();
         }
 
@@ -179,14 +174,18 @@ public class SettingsUtil {
     }
 
     /**
-     * Deprecated. Use {@link Settings.Setting#isJavaOnly()} instead.
+     * This should always be the same as whether the setting can be parsed from or serialized to a string
      *
-     * @param setting The Setting
+     * @param the setting
      * @return true if the setting can not be set or read by the user
      */
-    @Deprecated
     public static boolean javaOnlySetting(Settings.Setting setting) {
-        return setting.isJavaOnly();
+        for (String name : JAVA_ONLY_SETTINGS) { // no JAVA_ONLY_SETTINGS.contains(...) because that would be case sensitive
+            if (setting.getName().equalsIgnoreCase(name)) {
+                return true;
+            }
+        }
+        return false;
     }
 
     public static void parseAndApply(Settings settings, String settingName, String settingValue) throws IllegalStateException, NumberFormatException {
@@ -233,15 +232,15 @@ public class SettingsUtil {
         FLOAT(Float.class, Float::parseFloat),
         LONG(Long.class, Long::parseLong),
         STRING(String.class, String::new),
-        DIRECTION(Direction.class, Direction::byName),
+        ENUMFACING(EnumFacing.class, EnumFacing::byName),
         COLOR(
                 Color.class,
                 str -> new Color(Integer.parseInt(str.split(",")[0]), Integer.parseInt(str.split(",")[1]), Integer.parseInt(str.split(",")[2])),
                 color -> color.getRed() + "," + color.getGreen() + "," + color.getBlue()
         ),
         VEC3I(
-                Vector3i.class,
-                str -> new Vector3i(Integer.parseInt(str.split(",")[0]), Integer.parseInt(str.split(",")[1]), Integer.parseInt(str.split(",")[2])),
+                Vec3i.class,
+                str -> new Vec3i(Integer.parseInt(str.split(",")[0]), Integer.parseInt(str.split(",")[1]), Integer.parseInt(str.split(",")[2])),
                 vec -> vec.getX() + "," + vec.getY() + "," + vec.getZ()
         ),
         BLOCK(
@@ -251,14 +250,15 @@ public class SettingsUtil {
         ),
         ITEM(
                 Item.class,
-                str -> Registry.ITEM.getOrDefault(new ResourceLocation(str.trim())), // TODO this now returns AIR on failure instead of null, is that an issue?
-                item -> Registry.ITEM.getKey(item).toString()
+                str -> Item.getByNameOrId(str.trim()),
+                item -> Item.REGISTRY.getNameForObject(item).toString()
         ),
         LIST() {
             @Override
             public Object parse(ParserContext context, String raw) {
                 Type type = ((ParameterizedType) context.getSetting().getType()).getActualTypeArguments()[0];
                 Parser parser = Parser.getParser(type);
+
                 return Stream.of(raw.split(","))
                         .map(s -> parser.parse(context, s))
                         .collect(Collectors.toList());
@@ -299,7 +299,7 @@ public class SettingsUtil {
                 Parser keyParser = Parser.getParser(keyType);
                 Parser valueParser = Parser.getParser(valueType);
 
-                return ((Map<?, ?>) value).entrySet().stream()
+                return ((Map<?,?>) value).entrySet().stream()
                         .map(o -> keyParser.toString(context, o.getKey()) + "->" + valueParser.toString(context, o.getValue()))
                         .collect(Collectors.joining(","));
             }

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

@@ -17,13 +17,12 @@
 
 package baritone.api.utils;
 
-import net.minecraft.block.AbstractFireBlock;
-import net.minecraft.block.BlockState;
+import net.minecraft.block.BlockFire;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.Direction;
+import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.shapes.VoxelShape;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 
 /**
@@ -42,22 +41,16 @@ public final class VecUtils {
      * @return The center of the block's bounding box
      * @see #getBlockPosCenter(BlockPos)
      */
-    public static Vector3d calculateBlockCenter(World world, BlockPos pos) {
-        BlockState b = world.getBlockState(pos);
-        VoxelShape shape = b.getCollisionShape(world, pos);
-        if (shape.isEmpty()) {
-            return getBlockPosCenter(pos);
-        }
-        double xDiff = (shape.getStart(Direction.Axis.X) + shape.getEnd(Direction.Axis.X)) / 2;
-        double yDiff = (shape.getStart(Direction.Axis.Y) + shape.getEnd(Direction.Axis.Y)) / 2;
-        double zDiff = (shape.getStart(Direction.Axis.Z) + shape.getEnd(Direction.Axis.Z)) / 2;
-        if (Double.isNaN(xDiff) || Double.isNaN(yDiff) || Double.isNaN(zDiff)) {
-            throw new IllegalStateException(b + " " + pos + " " + shape);
-        }
-        if (b.getBlock() instanceof AbstractFireBlock) {//look at bottom of fire when putting it out
+    public static Vec3d calculateBlockCenter(World world, BlockPos pos) {
+        IBlockState b = world.getBlockState(pos);
+        AxisAlignedBB bbox = b.getBoundingBox(world, pos);
+        double xDiff = (bbox.minX + bbox.maxX) / 2;
+        double yDiff = (bbox.minY + bbox.maxY) / 2;
+        double zDiff = (bbox.minZ + bbox.maxZ) / 2;
+        if (b.getBlock() instanceof BlockFire) {//look at bottom of fire when putting it out
             yDiff = 0;
         }
-        return new Vector3d(
+        return new Vec3d(
                 pos.getX() + xDiff,
                 pos.getY() + yDiff,
                 pos.getZ() + zDiff
@@ -74,8 +67,8 @@ public final class VecUtils {
      * @return The assumed center of the position
      * @see #calculateBlockCenter(World, BlockPos)
      */
-    public static Vector3d getBlockPosCenter(BlockPos pos) {
-        return new Vector3d(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
+    public static Vec3d getBlockPosCenter(BlockPos pos) {
+        return new Vec3d(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
     }
 
     /**
@@ -105,7 +98,7 @@ public final class VecUtils {
      * @see #getBlockPosCenter(BlockPos)
      */
     public static double entityDistanceToCenter(Entity entity, BlockPos pos) {
-        return distanceToCenter(pos, entity.getPositionVec().x, entity.getPositionVec().y, entity.getPositionVec().z);
+        return distanceToCenter(pos, entity.posX, entity.posY, entity.posZ);
     }
 
     /**
@@ -118,6 +111,6 @@ public final class VecUtils {
      * @see #getBlockPosCenter(BlockPos)
      */
     public static double entityFlatDistanceToCenter(Entity entity, BlockPos pos) {
-        return distanceToCenter(pos, entity.getPositionVec().x, pos.getY() + 0.5, entity.getPositionVec().z);
+        return distanceToCenter(pos, entity.posX, pos.getY() + 0.5, entity.posZ);
     }
 }

src/api/java/baritone/api/utils/gui/BaritoneToast.java

@@ -17,11 +17,9 @@
 
 package baritone.api.utils.gui;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
-import com.mojang.blaze3d.platform.GlStateManager;
-import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.toasts.GuiToast;
 import net.minecraft.client.gui.toasts.IToast;
-import net.minecraft.client.gui.toasts.ToastGui;
+import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.ITextComponent;
 
@@ -33,38 +31,38 @@ public class BaritoneToast implements IToast {
     private long totalShowTime;
 
     public BaritoneToast(ITextComponent titleComponent, ITextComponent subtitleComponent, long totalShowTime) {
-        this.title = titleComponent.getString();
-        this.subtitle = subtitleComponent == null ? null : subtitleComponent.getString();
+        this.title = titleComponent.getFormattedText();
+        this.subtitle = subtitleComponent == null ? null : subtitleComponent.getFormattedText();
         this.totalShowTime = totalShowTime;
     }
 
-    public Visibility func_230444_a_(MatrixStack matrixStack, ToastGui toastGui, long delta) {
+    public Visibility draw(GuiToast toastGui, long delta) {
         if (this.newDisplay) {
             this.firstDrawTime = delta;
             this.newDisplay = false;
         }
 
         toastGui.getMinecraft().getTextureManager().bindTexture(new ResourceLocation("textures/gui/toasts.png"));
-        GlStateManager.color4f(1.0F, 1.0F, 1.0F, 255.0f);
-        toastGui.blit(matrixStack, 0, 0, 0, 32, 160, 32);
+        GlStateManager.color(1.0F, 1.0F, 1.0F, 255.0f);
+        toastGui.drawTexturedModalRect(0, 0, 0, 32, 160, 32);
 
         if (this.subtitle == null) {
-            toastGui.getMinecraft().fontRenderer.drawString(matrixStack, this.title, 18, 12, -11534256);
+            toastGui.getMinecraft().fontRenderer.drawString(this.title, 18, 12, -11534256);
         } else {
-            toastGui.getMinecraft().fontRenderer.drawString(matrixStack, this.title, 18, 7, -11534256);
-            toastGui.getMinecraft().fontRenderer.drawString(matrixStack, this.subtitle, 18, 18, -16777216);
+            toastGui.getMinecraft().fontRenderer.drawString(this.title, 18, 7, -11534256);
+            toastGui.getMinecraft().fontRenderer.drawString(this.subtitle, 18, 18, -16777216);
         }
 
         return delta - this.firstDrawTime < totalShowTime ? Visibility.SHOW : Visibility.HIDE;
     }
 
     public void setDisplayedText(ITextComponent titleComponent, ITextComponent subtitleComponent) {
-        this.title = titleComponent.getString();
-        this.subtitle = subtitleComponent == null ? null : subtitleComponent.getString();
+        this.title = titleComponent.getFormattedText();
+        this.subtitle = subtitleComponent == null ? null : subtitleComponent.getFormattedText();
         this.newDisplay = true;
     }
 
-    public static void addOrUpdate(ToastGui toast, ITextComponent title, ITextComponent subtitle, long totalShowTime) {
+    public static void addOrUpdate(GuiToast toast, ITextComponent title, ITextComponent subtitle, long totalShowTime) {
         BaritoneToast baritonetoast = toast.getToast(BaritoneToast.class, new Object());
 
         if (baritonetoast == null) {
@@ -75,6 +73,6 @@ public class BaritoneToast implements IToast {
     }
 
     public static void addOrUpdate(ITextComponent title, ITextComponent subtitle) {
-        addOrUpdate(Minecraft.getInstance().getToastGui(), title, subtitle, baritone.api.BaritoneAPI.getSettings().toastTimer.value);
+        addOrUpdate(net.minecraft.client.Minecraft.getMinecraft().getToastGui(), title, subtitle, baritone.api.BaritoneAPI.getSettings().toastTimer.value);
     }
 }

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

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

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

@@ -15,35 +15,29 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.schematic.mask;
+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
  */
-public abstract class AbstractMask implements Mask {
+@Mixin(AnvilChunkLoader.class)
+public class MixinAnvilChunkLoader implements IAnvilChunkLoader {
 
-    private final int widthX;
-    private final int heightY;
-    private final int lengthZ;
-
-    public AbstractMask(int widthX, int heightY, int lengthZ) {
-        this.widthX = widthX;
-        this.heightY = heightY;
-        this.lengthZ = lengthZ;
-    }
+    @Shadow
+    @Final
+    private File chunkSaveLocation;
 
     @Override
-    public int widthX() {
-        return this.widthX;
-    }
-
-    @Override
-    public int heightY() {
-        return this.heightY;
-    }
-
-    @Override
-    public int lengthZ() {
-        return this.lengthZ;
+    public File getChunkSaveLocation() {
+        return this.chunkSaveLocation;
     }
 }

src/launch/java/baritone/launch/mixins/MixinBitArray.java

@@ -22,10 +22,15 @@ import net.minecraft.util.BitArray;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 
 @Mixin(BitArray.class)
 public abstract class MixinBitArray implements IBitArray {
 
+    @Shadow
+    @Final
+    private long[] longArray;
+
     @Shadow
     @Final
     private int bitsPerEntry;
@@ -34,13 +39,29 @@ public abstract class MixinBitArray implements IBitArray {
     @Final
     private long maxEntryValue;
 
-    @Override
-    public long getMaxEntryValue() {
-        return maxEntryValue;
-    }
+    @Shadow
+    @Final
+    private int arraySize;
 
     @Override
-    public int getBitsPerEntry() {
-        return bitsPerEntry;
+    @Unique
+    public int[] toArray() {
+        int[] out = new int[arraySize];
+
+        for (int idx = 0, kl = bitsPerEntry - 1; idx < arraySize; idx++, kl += bitsPerEntry) {
+            final int i = idx * bitsPerEntry;
+            final int j = i >> 6;
+            final int l = i & 63;
+            final int k = kl >> 6;
+            final long jl = longArray[j] >>> l;
+
+            if (j == k) {
+                out[idx] = (int) (jl & maxEntryValue);
+            } else {
+                out[idx] = (int) ((jl | longArray[k] << (64 - l)) & maxEntryValue);
+            }
+        }
+
+        return out;
     }
 }

src/launch/java/baritone/launch/mixins/MixinBlockStateContainer.java

@@ -17,29 +17,31 @@
 
 package baritone.launch.mixins;
 
-import baritone.utils.accessor.IPalettedContainer;
+import baritone.utils.accessor.IBitArray;
+import baritone.utils.accessor.IBlockStateContainer;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.util.BitArray;
-import net.minecraft.util.palette.IPalette;
-import net.minecraft.util.palette.PalettedContainer;
+import net.minecraft.world.chunk.BlockStateContainer;
+import net.minecraft.world.chunk.IBlockStatePalette;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
-@Mixin(PalettedContainer.class)
-public abstract class MixinPalettedContainer<T> implements IPalettedContainer<T> {
+@Mixin(BlockStateContainer.class)
+public abstract class MixinBlockStateContainer implements IBlockStateContainer {
 
     @Shadow
     protected BitArray storage;
 
     @Shadow
-    protected IPalette<T> palette;
+    protected IBlockStatePalette palette;
 
     @Override
-    public IPalette<T> getPalette() {
-        return palette;
+    public IBlockState getAtPalette(int index) {
+        return palette.getBlockState(index);
     }
 
     @Override
-    public BitArray getStorage() {
-        return storage;
+    public int[] storageArray() {
+        return ((IBitArray) storage).toArray();
     }
 }

src/launch/java/baritone/launch/mixins/MixinChatTabCompleter.java

@@ -0,0 +1,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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.launch.mixins;
+
+import net.minecraft.client.gui.GuiChat;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(GuiChat.ChatTabCompleter.class)
+public abstract class MixinChatTabCompleter extends MixinTabCompleter {
+
+    @Inject(
+            method = "complete",
+            at = @At("HEAD"),
+            cancellable = true
+    )
+    private void onComplete(CallbackInfo ci) {
+        if (dontComplete) {
+            ci.cancel();
+        }
+    }
+}

src/launch/java/baritone/launch/mixins/MixinChunkArray.java

@@ -1,92 +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.IChunkArray;
-import net.minecraft.util.math.ChunkPos;
-import net.minecraft.world.chunk.Chunk;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-import java.util.concurrent.atomic.AtomicReferenceArray;
-
-@Mixin(targets = "net.minecraft.client.multiplayer.ClientChunkProvider$ChunkArray")
-public abstract class MixinChunkArray implements IChunkArray {
-    @Shadow
-    private AtomicReferenceArray<Chunk> chunks;
-    @Shadow
-    private int viewDistance;
-    @Shadow
-    private int sideLength;
-    @Shadow
-    private int centerX;
-    @Shadow
-    private int centerZ;
-    @Shadow
-    private int loaded;
-
-    @Shadow
-    protected abstract boolean inView(int x, int z);
-
-    @Shadow
-    protected abstract int getIndex(int x, int z);
-
-    @Shadow
-    protected abstract void replace(int index, Chunk chunk);
-
-    @Override
-    public int centerX() {
-        return centerX;
-    }
-
-    @Override
-    public int centerZ() {
-        return centerZ;
-    }
-
-    @Override
-    public int viewDistance() {
-        return viewDistance;
-    }
-
-    @Override
-    public AtomicReferenceArray<Chunk> getChunks() {
-        return chunks;
-    }
-
-    @Override
-    public void copyFrom(IChunkArray other) {
-        centerX = other.centerX();
-        centerZ = other.centerZ();
-
-        AtomicReferenceArray<Chunk> copyingFrom = other.getChunks();
-        for (int k = 0; k < copyingFrom.length(); ++k) {
-            Chunk chunk = copyingFrom.get(k);
-            if (chunk != null) {
-                ChunkPos chunkpos = chunk.getPos();
-                if (inView(chunkpos.x, chunkpos.z)) {
-                    int index = getIndex(chunkpos.x, chunkpos.z);
-                    if (chunks.get(index) != null) {
-                        throw new IllegalStateException("Doing this would mutate the client's REAL loaded chunks?!");
-                    }
-                    replace(index, chunk);
-                }
-            }
-        }
-    }
-}

src/launch/java/baritone/launch/mixins/MixinChunkProviderClient.java

@@ -17,26 +17,23 @@
 
 package baritone.launch.mixins;
 
-import baritone.utils.accessor.IEntityRenderManager;
-import net.minecraft.client.renderer.entity.EntityRendererManager;
+import baritone.utils.accessor.IChunkProviderClient;
+import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
+import net.minecraft.client.multiplayer.ChunkProviderClient;
+import net.minecraft.world.chunk.Chunk;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 
-@Mixin(EntityRendererManager.class)
-public class MixinEntityRenderManager implements IEntityRenderManager {
+@Mixin(ChunkProviderClient.class)
+public class MixinChunkProviderClient implements IChunkProviderClient {
 
+    @Shadow
+    @Final
+    private Long2ObjectMap<Chunk> loadedChunks;
 
     @Override
-    public double renderPosX() {
-        return ((EntityRendererManager) (Object) this).info.getProjectedView().x;
-    }
-
-    @Override
-    public double renderPosY() {
-        return ((EntityRendererManager) (Object) this).info.getProjectedView().y;
-    }
-
-    @Override
-    public double renderPosZ() {
-        return ((EntityRendererManager) (Object) this).info.getProjectedView().z;
+    public Long2ObjectMap<Chunk> loadedChunks() {
+        return this.loadedChunks;
     }
 }

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

@@ -0,0 +1,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
+ * 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/MixinChunkRenderContainer.java

@@ -0,0 +1,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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.launch.mixins;
+
+import baritone.Baritone;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.ChunkRenderContainer;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.chunk.RenderChunk;
+import net.minecraft.util.math.BlockPos;
+import org.lwjgl.opengl.GL14;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import static org.lwjgl.opengl.GL11.*;
+
+@Mixin(ChunkRenderContainer.class)
+public class MixinChunkRenderContainer {
+
+    @Redirect( // avoid creating CallbackInfo at all costs; this is called 40k times per second
+            method = "preRenderChunk",
+            at = @At(
+                    value = "INVOKE",
+                    target = "net/minecraft/client/renderer/chunk/RenderChunk.getPosition()Lnet/minecraft/util/math/BlockPos;"
+            )
+    )
+    private BlockPos getPosition(RenderChunk renderChunkIn) {
+        if (Baritone.settings().renderCachedChunks.value && !Minecraft.getMinecraft().isSingleplayer() && Minecraft.getMinecraft().world.getChunk(renderChunkIn.getPosition()).isEmpty()) {
+            GlStateManager.enableAlpha();
+            GlStateManager.enableBlend();
+            GL14.glBlendColor(0, 0, 0, Baritone.settings().cachedChunksOpacity.value);
+            GlStateManager.tryBlendFuncSeparate(GL_CONSTANT_ALPHA, GL_ONE_MINUS_CONSTANT_ALPHA, GL_ONE, GL_ZERO);
+        }
+        return renderChunkIn.getPosition();
+    }
+}

src/launch/java/baritone/launch/mixins/MixinChunkRenderWorker.java

@@ -0,0 +1,57 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.launch.mixins;
+
+import baritone.Baritone;
+import baritone.api.BaritoneAPI;
+import baritone.api.utils.IPlayerContext;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.chunk.ChunkRenderWorker;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(ChunkRenderWorker.class)
+public abstract class MixinChunkRenderWorker {
+
+    @Shadow
+    protected abstract boolean isChunkExisting(BlockPos pos, World worldIn);
+
+    @Redirect(
+            method = "processTask",
+            at = @At(
+                    value = "INVOKE",
+                    target = "net/minecraft/client/renderer/chunk/ChunkRenderWorker.isChunkExisting(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/World;)Z"
+            )
+    )
+    private boolean isChunkExisting(ChunkRenderWorker worker, BlockPos pos, World world) {
+        if (Baritone.settings().renderCachedChunks.value && !Minecraft.getMinecraft().isSingleplayer()) {
+            Baritone baritone = (Baritone) BaritoneAPI.getProvider().getPrimaryBaritone();
+            IPlayerContext ctx = baritone.getPlayerContext();
+            if (ctx.player() != null && ctx.world() != null && baritone.bsi != null) {
+                return baritone.bsi.isLoaded(pos.getX(), pos.getZ()) || this.isChunkExisting(pos, world);
+            }
+        }
+
+        return this.isChunkExisting(pos, world);
+    }
+}
+

src/launch/java/baritone/launch/mixins/MixinClientChunkProvider.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.launch.mixins;
-
-import baritone.utils.accessor.IChunkArray;
-import baritone.utils.accessor.IClientChunkProvider;
-import net.minecraft.client.multiplayer.ClientChunkProvider;
-import net.minecraft.client.world.ClientWorld;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-import java.lang.reflect.Field;
-import java.util.Arrays;
-
-@Mixin(ClientChunkProvider.class)
-public class MixinClientChunkProvider implements IClientChunkProvider {
-
-    @Shadow
-    private ClientWorld world;
-
-    @Override
-    public ClientChunkProvider createThreadSafeCopy() {
-        IChunkArray arr = extractReferenceArray();
-        ClientChunkProvider result = new ClientChunkProvider(world, arr.viewDistance() - 3); // -3 because its adds 3 for no reason lmao
-        IChunkArray copyArr = ((IClientChunkProvider) result).extractReferenceArray();
-        copyArr.copyFrom(arr);
-        if (copyArr.viewDistance() != arr.viewDistance()) {
-            throw new IllegalStateException(copyArr.viewDistance() + " " + arr.viewDistance());
-        }
-        return result;
-    }
-
-    @Override
-    public IChunkArray extractReferenceArray() {
-        for (Field f : ClientChunkProvider.class.getDeclaredFields()) {
-            if (IChunkArray.class.isAssignableFrom(f.getType())) {
-                try {
-                    return (IChunkArray) f.get(this);
-                } catch (IllegalAccessException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-        }
-        throw new RuntimeException(Arrays.toString(ClientChunkProvider.class.getDeclaredFields()));
-    }
-}