deprecate 1.16.5

Merge master into 1.16.5

.github/workflows/gradle_build.yml

@@ -13,33 +13,33 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 16
-      uses: actions/setup-java@v2
+    - uses: actions/checkout@v3
+    - name: Set up JDK 8
+      uses: actions/setup-java@v3
       with:
-        java-version: '16'
-        distribution: 'adopt'
+        java-version: '8'
+        distribution: 'temurin'
         
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
       
     - name: Build with Gradle
       run: ./gradlew build
-
+      
     - name: Build (fabric) with Gradle
       run: ./gradlew build -Pbaritone.fabric_build
 
     - name: Build (forge) with Gradle
-      run: ./gradlew build -Pbaritone.forge_build -Ploom.platform=forge
-      
+      run: ./gradlew build -Pbaritone.forge_build
+
     - name: Archive Artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: Artifacts
         path: dist/
         
     - name: Archive mapping.txt
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       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@v2
-    - name: Set up JDK 16
-      uses: actions/setup-java@v2
+    - uses: actions/checkout@v3
+    - name: Set up JDK 8
+      uses: actions/setup-java@v3
       with:
-        java-version: '16'
-        distribution: 'adopt'
+        java-version: '8'
+        distribution: 'temurin'
         
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew

.gitignore

@@ -32,3 +32,4 @@ baritone_Client.launch
 !/.idea/copyright/profiles_settings.xml
 
 .vscode/launch.json
+

Dockerfile

@@ -1,11 +1,11 @@
-FROM ubuntu:focal
+FROM debian:stretch
 
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt update -y
 
 RUN apt install \
-          openjdk-16-jdk \
+          openjdk-8-jdk \
           --assume-yes
 
 COPY . /code
@@ -13,5 +13,5 @@ COPY . /code
 WORKDIR /code
 
 RUN ./gradlew build
-RUN ./gradlew build -Pbaritone.forge_build -Ploom.platform=forge
+RUN ./gradlew build -Pbaritone.forge_build
 RUN ./gradlew build -Pbaritone.fabric_build

README.md

@@ -1,127 +1 @@
-# 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"/>
-  <img src="https://img.shields.io/badge/MC-1.17.1-brightgreen.svg" alt="Minecraft"/>
-  <img src="https://img.shields.io/badge/MC-1.18.1-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)**.
-
-If you need Forge or Fabric 1.17.1, look [here](https://github.com/cabaletta/baritone/releases/tag/v1.7.1) and get the `api-forge` or `api-fabric` jar. **For 1.17.1 Fabric, just click [here](https://github.com/cabaletta/baritone/releases/download/v1.7.1/baritone-api-fabric-1.7.1.jar)**.
-
-If you need Forge or Fabric 1.18.1, look [here](https://github.com/cabaletta/baritone/releases/tag/v1.8.1) and get the `api-forge` or `api-fabric` jar. **For 1.18.1 Fabric, just click [here](https://github.com/cabaletta/baritone/releases/download/v1.8.1/baritone-api-fabric-1.8.1.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 onwards. Baritone focuses on reliability and particularly performance (it's over [30x faster](https://github.com/cabaletta/baritone/pull/180#issuecomment-423822928) than MineBot at calculating paths).
-
-Have committed at least once a day from Aug 1, 2018, to Aug 1, 2019.
-
-1Leijurv3DWTrGAfmmiTphjhXLvQiHg7K2
-
-# Getting Started
-
-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.
+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.

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.2 or 1.16.4 or 1.16.5 (LOL)
+v1.2.* is for 1.12.2, v1.3.* is for 1.13.2, v1.4.* is for 1.14.4, v1.5.* is for 1.15.2, v1.6.* is for 1.16.5, v1.7.* is for 1.17.1, v1.8.* is for 1.18.1
 
 Any official release will be GPG signed by leijurv (44A3EA646EADAC6A). Please verify that the hash of the file you download is in `checksums.txt` and that `checksums_signed.asc` is a valid signature by that public keys of `checksums.txt`. 
 
@@ -22,15 +22,16 @@ 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 release can simply be added as a Forge mod.**
+**The Forge and Fabric releases can simply be added as a Forge/Fabric mods.**
 
 If another one of your Forge mods has a Baritone integration, you want `baritone-api-forge-VERSION.jar`. Otherwise, you want `baritone-standalone-forge-VERSION.jar`
 
 - **API**: Only the non-api packages are obfuscated. This should be used in environments where other mods would like to use Baritone's features.
-- **Forge API**: Same as API, but packaged for Forge. This should be used where another mod has a Baritone integration.
+- **Forge/Fabric API**: Same as API, but packaged for Forge/Fabric. This should be used where another mod has a Baritone integration.
 - **Standalone**: Everything is obfuscated. This should be used in environments where there are no other mods present that would like to use Baritone's features.
-- **Forge 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.
+- **Forge/Fabric Standalone**: Same as Standalone, but packaged for Forge/Fabric. This should be used when Baritone is your only Forge/Fabric mod, or none of your other Forge/Fabric mods integrate with Baritone.
 - **Unoptimized**: Nothing is obfuscated. This shouldn't be used ever in production.
+- **Forge/Fabric Unoptimized**: Same as Unoptimized, but packaged for Forge/Fabric.
 
 ## Build it yourself
 - Clone or download Baritone
@@ -42,13 +43,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.
+If you have errors with a package missing please make sure you have setup your environment, and are using Oracle JDK 8 for 1.12.2-1.16.5, JDK 16+ for 1.17.1, and JDK 17+ for 1.18.1.
 
 To check which java you are using do 
 `java -version` in a command prompt or terminal.
-If you are using anything above OpenJDK 8, 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 for 1.12.2-1.16.5, it might not work because the Java distributions above JDK 8 using may not have the needed javax classes.
 
-Open JDK 8 download: https://openjdk.java.net/install/
+Download java: https://adoptium.net/
 #### macOS guide
 In order to get JDK 8, Try running the following command:
 `% /usr/libexec/java_home -V`
@@ -65,62 +66,13 @@ 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
 
-Setting up the Environment:
+### Building Baritone
 
-```
-$ gradlew setupDecompWorkspace
-$ gradlew --refresh-dependencies
-```
+These tasks depend on the minecraft version, but are (for the most part) standard for building mods.
 
-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)
+for more details, see [the build ci action](/.github/workflows/gradle_build.yml)
 
 ## IntelliJ
 - Open the project in IntelliJ as a Gradle project
-  
-  ![Image](https://i.imgur.com/jw7Q6vY.png)
-
-- Run the Gradle tasks `setupDecompWorkspace` then `genIntellijRuns`
-  
-  ![Image](https://i.imgur.com/QEfVvWP.png)
-
 - Refresh the Gradle project (or, to be safe, just restart IntelliJ)
-  
-  ![Image](https://i.imgur.com/3V7EdWr.png)
-
-- Select the "Minecraft Client" launch config
-  
-  ![Image](https://i.imgur.com/1qz2QGV.png)
-
-- Click on ``Edit Configurations...`` from the same dropdown and select the "Minecraft Client" config
-  
-  ![Image](https://i.imgur.com/s4ly0ZF.png)
-
-- In `Edit Configurations...` you need to select `baritone_launch` for `Use classpath of module:`.
-  
-  ![Image](https://i.imgur.com/hrLhG9u.png)
-
-## 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
+- depending on the minecraft version, you may need to run `setupDecompWorkspace` or `genIntellijRuns` in order to get everything working

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`.
 
-Some common examples:
+Commands in Baritone:
 - `thisway 1000` then `path` to go in the direction you're facing for a thousand blocks
 - `goal x y z` or `goal x z` or `goal y`, then `path` to set a goal to a certain coordinate then path to it
 - `goto x y z` or `goto x z` or `goto y` to go to a certain coordinate (in a single step, starts going immediately)
 - `goal` to set the goal to your player's feet
 - `goal clear` to clear the goal
-- `cancel` or `stop` to stop everything
+- `cancel` or `stop` to stop everything, `forcecancel` is also an option
 - `goto portal` or `goto ender_chest` or `goto block_type` to go to a block. (in Impact, `.goto` is an alias for `.b goto` for the most part)
 - `mine diamond_ore iron_ore` to mine diamond ore or iron ore (turn on the setting `legitMine` to only mine ores that it can actually see. It will explore randomly around y=11 until it finds them.) An amount of blocks can also be specified, for example, `mine 64 diamond_ore`.
 - `click` to click your destination on the screen. Right click path to on top of the block, left click to path into it (either at foot level or eye level), and left click and drag to select an area (`#help sel` to see what you can do with that selection).
@@ -51,11 +51,19 @@ Some common examples:
 - `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

@@ -15,28 +15,67 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-plugins {
-    id 'java'
-    id 'dev.architectury.loom' version '0.10.0-SNAPSHOT'
-    id 'maven-publish'
+group 'baritone'
+version '1.6.5'
+
+buildscript {
+    repositories {
+        maven {
+            name = 'forge'
+            url = 'http://files.minecraftforge.net/maven'
+        }
+        maven {
+            name = 'impactdevelopment-repo'
+            url = 'https://impactdevelopment.github.io/maven/'
+        }
+        maven {
+            url = 'https://www.dogforce-games.com/maven/'
+        }
+        maven {
+            url = 'https://maven.fabricmc.net/'
+        }
+        maven {
+            url = 'https://libraries.minecraft.net/'
+        }
+        mavenCentral()
+        jcenter()
+    }
+
+    dependencies {
+        classpath group: 'com.github.ImpactDevelopment', name: 'ForgeGradle', version: '3.0.115'
+        classpath group: 'com.github.ImpactDevelopment', name: 'MixinGradle', version: '0.6.2'
+        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.7-SNAPSHOT'
+    }
 }
 
 
-archivesBaseName  = project.archives_base_name
-version = project.mod_version
-group = project.maven_group
-
+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
 
-def compileType = project.hasProperty("baritone.fabric_build") ? "FABRIC" : project.hasProperty("baritone.forge_build") ? "FORGE" : "OFFICIAL"
+apply plugin: 'java'
+apply plugin: 'maven'
 
-sourceCompatibility = targetCompatibility = JavaVersion.VERSION_16
+def mcpVersion = [channel: 'snapshot', version: '20201028-1.16.3']
 
+if (getProject().hasProperty("baritone.fabric_build")) {
+    CreateVolderYarn.genMappings("1.16.5", mcpVersion)
+    apply plugin: 'fabric-loom'
+} else {
+    apply plugin: 'net.minecraftforge.gradle'
+    apply plugin: 'org.spongepowered.mixin'
+}
+
+
+sourceCompatibility = targetCompatibility = '1.8'
 compileJava {
+    sourceCompatibility = targetCompatibility = '1.8'
     options.encoding = "UTF-8" // allow emoji in comments :^)
 }
 
+
 sourceSets {
     api {
         compileClasspath += main.compileClasspath
@@ -52,63 +91,122 @@ sourceSets {
         compileClasspath += main.compileClasspath + main.runtimeClasspath + main.output
         runtimeClasspath += main.compileClasspath + main.runtimeClasspath + main.output
     }
+
     schematica_api {
         compileClasspath += main.compileClasspath
     }
+
     main {
         compileClasspath += schematica_api.output
     }
 }
 
-loom {
-    if (compileType.equals("FORGE")) {
-        forge {
-            mixinConfig 'mixins.baritone.json'
+task sourceJar(type: Jar, dependsOn: classes) {
+    classifier = 'sources'
+    from sourceSets.api.allSource
+}
+if (getProject().hasProperty("baritone.fabric_build")) {
+    minecraft.refmapName = "mixins.baritone.refmap.json"
+} else {
+    minecraft {
+        mappings mcpVersion
+
+        if (getProject().hasProperty("baritone.forge_build")) {
+            reobfMappings 'searge'
+        } else {
+            reobfMappings 'notch'
+        }
+
+        runs {
+            client {
+                workingDirectory project.file('run')
+                source sourceSets.launch
+
+                main 'baritone.launch.LaunchTesting'
+
+                environment 'assetIndex', '{asset_index}'
+                environment 'assetDirectory', downloadAssets.output
+                environment 'nativesDirectory', extractNatives.output
+
+                environment 'tweakClass', 'baritone.launch.BaritoneTweaker'
+
+                if (Os.isFamily(Os.FAMILY_MAC)) {
+                    jvmArgs "-XstartOnFirstThread"
+                }
+            }
+
+            autoTest {
+                workingDirectory project.file('autotest')
+                source sourceSets.launch
+
+                main 'baritone.launch.LaunchTesting'
+
+                environment 'assetIndex', '{asset_index}'
+                environment 'assetDirectory', downloadAssets.output
+                environment 'nativesDirectory', extractNatives.output
+
+                environment 'tweakClass', 'baritone.launch.BaritoneTweaker'
+                environment 'BARITONE_AUTO_TEST', 'true'
+
+                if (Os.isFamily(Os.FAMILY_MAC)) {
+                    jvmArgs "-XstartOnFirstThread"
+                }
+            }
         }
     }
-    mixin.defaultRefmapName = "mixins.baritone.refmap.json"
 
-    runs {
-        client {
-            source = sourceSets.launch
-        }
+    mixin {
+        defaultObfuscationEnv searge
+        add sourceSets.launch, 'mixins.baritone.refmap.json'
     }
 }
 
-
 repositories {
+    mavenCentral()
+
+    maven {
+        name = 'SpongePowered'
+        url = 'https://repo.spongepowered.org/repository/maven-public/'
+    }
     maven {
         name = 'impactdevelopment-repo'
         url = 'https://impactdevelopment.github.io/maven/'
     }
     maven {
-        name = "ldtteam"
-        url = "https://maven.parchmentmc.net/"
+        url = 'https://www.dogforce-games.com/maven/'
     }
-    mavenCentral()
 }
 
 dependencies {
-    if (compileType.equals("FORGE")) {
-        forge "net.minecraftforge:forge:${project.forge_version}"
-    }
-    mappings loom.layered() {
-        officialMojangMappings()
-        //technically optional, but really helpful in dev:
-        parchment("org.parchmentmc.data:parchment-1.17.1:2021.10.24@zip" as String)
-    }
-    minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    if (!compileType.equals("FORGE")) {
-        modImplementation "net.fabricmc:fabric-loader:${project.fabric_version}"
-    }
-    // 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'
-        exclude module: 'asm-debug-all'
-    }
+    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"
 
-    implementation 'com.google.code.findbugs:jsr305:3.0.2'
+        // this makes it compile with the forge tweak stuff
+        implementation 'com.github.ImpactDevelopment:SimpleTweaker:1.2'
+        implementation('net.minecraft:launchwrapper:1.12') {
+            exclude module: 'lwjgl'
+        }
+
+        implementation 'com.google.code.findbugs:jsr305:3.0.2'
+    } else {
+        minecraft 'com.github.ImpactDevelopment:Vanilla:1.16.5'
+
+        runtime launchCompile('net.minecraft:launchwrapper:1.12') {
+            exclude module: 'lwjgl'
+        }
+        runtime launchCompile('org.ow2.asm:asm-debug-all:5.2')
+        runtime launchCompile('com.github.ImpactDevelopment:SimpleTweaker:1.2')
+        runtime launchCompile('org.spongepowered:mixin:0.8.3') {
+            // Mixin includes a lot of dependencies that are too up-to-date
+            exclude module: 'launchwrapper'
+            exclude module: 'guava'
+            exclude module: 'gson'
+            exclude module: 'commons-io'
+            exclude module: 'log4j-core'
+        }
+    }
 
     testImplementation 'junit:junit:4.12'
 }
@@ -121,24 +219,25 @@ javadoc {
     classpath += sourceSets.api.compileClasspath
 }
 
-// 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"
+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 = 16
-    if (JavaVersion.current().isJava9Compatible()) {
-        it.options.release = targetVersion
+        // 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
 
@@ -170,21 +269,93 @@ jar {
     }
 }
 
-if (compileType.equals("OFFICIAL")) {
-    remapJar {
-        toM.set "official"
+// skidded from ProguardTask
+File getClientJar() {
+    return project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("launch").getRuntimeClasspath().getFiles()
+            .stream()
+            .filter({ f -> f.toString().endsWith("client-extra.jar") })
+            .map({ f -> new File(f.getParentFile(), "client.jar") })
+            .findFirst()
+            .get()
+}
+
+File getClientJarFabric() {
+    return project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("launch").getRuntimeClasspath().getFiles()
+            .stream()
+            .filter({ f -> f.getName().endsWith("-v2.jar") && f.getName().startsWith("minecraft-") })
+            .map({ f -> new File(f.getParentFile().getParentFile(), f.getName().toString().replace("mapped", "intermediary")) })
+            .findFirst()
+            .get()
+}
+
+if (getProject().hasProperty("baritone.fabric_build")) {
+    task copyMcJar(type: Copy) {
+        def mcJar = { getClientJarFabric() }
+
+        from mcJar
+        into 'build/createMcIntermediaryJar/'
+        rename { 'client.jar' }
+    }
+
+    task proguard(type: ProguardTask, dependsOn: copyMcJar) {
+        url 'https://downloads.sourceforge.net/project/proguard/proguard/6.0/proguard6.0.3.zip'
+        extract 'proguard6.0.3/lib/proguard.jar'
+    }
+
+    task createDist(type: CreateDistTask, dependsOn: proguard)
+
+} else {
+    task copyMcJar(type: Copy) {
+        def mcJar = { getClientJar() }
+
+        from mcJar
+        into 'build/createMcSrgJar/'
+        rename { 'client-srg.jar' }
+    }
+
+    task createSrgMc(type: RenameJarInPlace) {
+        setInput(new File(copyMcJar.getOutputs().getFiles().getSingleFile(), "client-srg.jar"))
+        setClasspath(files({ getClientJar() }))
+
+        // fork
+        setMappingType(net.minecraftforge.gradle.common.util.MappingFile.Mapping.SEARGE)
+        setJarTask('trans alaska pipeline')
+    }
+
+    project.afterEvaluate {
+        createSrgMc.dependsOn(extractSrg, copyMcJar)
+        createSrgMc.setMappings(extractSrg.getOutput())
+    }
+
+
+    task proguard(type: ProguardTask, dependsOn: createSrgMc) { // TODO: dont need to create srg mc if doing notch build
+        url 'https://downloads.sourceforge.net/project/proguard/proguard/6.0/proguard6.0.3.zip'
+        extract 'proguard6.0.3/lib/proguard.jar'
+    }
+
+    task createDist(type: CreateDistTask, dependsOn: proguard)
+
+}
+build.finalizedBy(createDist)
+
+install {
+    def jarApiName = String.format("%s-api-%s", rootProject.name, version.toString())
+    def jarApiForgeName = String.format("%s-api-forge-%s", rootProject.name, version.toString())
+    def jarSAName = String.format("%s-standalone-%s", rootProject.name, version.toString())
+    def jarSAForgeName = String.format("%s-standalone-forge-%s", rootProject.name, version.toString())
+
+    artifacts {
+        archives file("$buildDir/libs/"+jarApiName+".jar")
+        archives file("$buildDir/libs/"+jarApiForgeName+".jar")
+        archives file("$buildDir/libs/"+jarSAName+".jar")
+        archives file("$buildDir/libs/"+jarSAForgeName+".jar")
+    }
+    repositories.mavenInstaller {
+		addFilter('api') { artifact, file -> artifact.name == "baritone-api" }
+		addFilter('api-forge') { artifact, file -> artifact.name == "baritone-api-forge" }
+		addFilter('standalone') { artifact, file -> artifact.name == "baritone-standalone" }
+		addFilter('standalone-forge') { artifact, file -> artifact.name == "baritone-standalone-forge" }
     }
 }
 
-
-
-task proguard(type: ProguardTask) {
-    url 'https://downloads.sourceforge.net/project/proguard/v7.1.0-beta5/proguard-7.1.0-beta5.zip'
-    extract 'proguard-7.1.0-beta5/lib/proguard.jar'
-    compType compileType
-}
-
-task createDist(type: CreateDistTask, dependsOn: proguard)
-
-
-build.finalizedBy(createDist)
+install.dependsOn(build)

buildSrc/build.gradle

@@ -20,6 +20,6 @@ repositories {
 }
 
 dependencies {
-    implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
-    implementation group: 'commons-io', name: 'commons-io', version: '2.6'
+    compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
+    compile group: 'commons-io', name: 'commons-io', version: '2.6'
 }

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

@@ -0,0 +1,259 @@
+/*
+ * 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

@@ -99,7 +99,7 @@ class BaritoneGradleTask extends DefaultTask {
     }
 
     protected Path getRelativeFile(String file) {
-        return Paths.get(new File(new File(getProject().getBuildDir(), "../"), file).getAbsolutePath());
+        return Paths.get(new File(file).getAbsolutePath());
     }
 
     protected Path getTemporaryFile(String file) {

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

@@ -19,7 +19,7 @@ package baritone.gradle.task;
 
 import org.gradle.api.tasks.TaskAction;
 
-import java.nio.charset.StandardCharsets;
+import javax.xml.bind.DatatypeConverter;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.security.MessageDigest;
@@ -93,22 +93,10 @@ public class CreateDistTask extends BaritoneGradleTask {
             if (SHA1_DIGEST == null) {
                 SHA1_DIGEST = MessageDigest.getInstance("SHA-1");
             }
-            return bytesToHex(SHA1_DIGEST.digest(Files.readAllBytes(path))).toLowerCase();
+            return DatatypeConverter.printHexBinary(SHA1_DIGEST.digest(Files.readAllBytes(path))).toLowerCase();
         } catch (Exception e) {
             // haha no thanks
             throw new IllegalStateException(e);
         }
     }
-
-    private static final byte[] HEX_ARRAY = "0123456789ABCDEF".getBytes(StandardCharsets.US_ASCII);
-
-    public static String bytesToHex(byte[] bytes) {
-        byte[] hexChars = new byte[bytes.length * 2];
-        for (int j = 0; j < bytes.length; j++) {
-            int v = bytes[j] & 0xFF;
-            hexChars[j * 2] = HEX_ARRAY[v >>> 4];
-            hexChars[j * 2 + 1] = HEX_ARRAY[v & 0x0F];
-        }
-        return new String(hexChars, StandardCharsets.UTF_8);
-    }
 }

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

@@ -22,10 +22,21 @@ import org.apache.commons.io.IOUtils;
 import org.gradle.api.plugins.JavaPluginConvention;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.TaskAction;
+import org.gradle.api.JavaVersion;
+import org.gradle.api.NamedDomainObjectContainer;
+import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.artifacts.Dependency;
+import org.gradle.api.internal.file.IdentityFileResolver;
+import org.gradle.api.internal.plugins.DefaultConvention;
+import org.gradle.api.tasks.Input;
+import org.gradle.api.tasks.TaskAction;
 import org.gradle.api.tasks.TaskCollection;
 import org.gradle.api.tasks.compile.ForkOptions;
 import org.gradle.api.tasks.compile.JavaCompile;
+import org.gradle.internal.Pair;
 import org.gradle.internal.jvm.Jvm;
+import org.gradle.internal.jvm.inspection.DefaultJvmVersionDetector;
+import org.gradle.process.internal.DefaultExecActionFactory;
 
 import java.io.*;
 import java.net.URL;
@@ -48,33 +59,13 @@ public class ProguardTask extends BaritoneGradleTask {
     @Input
     private String url;
 
-    public String getUrl() {
-        return url;
-    }
-
     @Input
     private String extract;
 
-    public String getExtract() {
-        return extract;
-    }
-
-    @Input
-    private String compType;
-
-    public String getCompType() {
-        return compType;
-    }
-
-    private final File copyMcTargetDir = new File("./build/createMcIntermediaryJar").getAbsoluteFile();
-    private final File copyMcTargetJar = new File(copyMcTargetDir, "client.jar");
-
     @TaskAction
     protected void exec() throws Exception {
         super.verifyArtifacts();
 
-        copyMcJar();
-
         // "Haha brady why don't you make separate tasks"
         processArtifact();
         downloadProguard();
@@ -85,32 +76,6 @@ public class ProguardTask extends BaritoneGradleTask {
         cleanup();
     }
 
-    private boolean isMcJar(File f) {
-        return f.getName().startsWith(compType.equals("FORGE") ? "forge-" : "minecraft-") && f.getName().contains("minecraft-mapped");
-    }
-
-    private void copyMcJar() throws IOException {
-        File mcClientJar = this.getProject().getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("launch").getRuntimeClasspath().getFiles()
-            .stream()
-            .filter(this::isMcJar)
-            .map(f -> {
-                switch (compType) {
-                    case "OFFICIAL":
-                        return new File(f.getParentFile().getParentFile(), "minecraft-merged.jar");
-                    case "FABRIC":
-                        return new File(f.getParentFile(), "minecraft-intermediary.jar");
-                    case "FORGE":
-                        return new File(f.getParentFile(), "minecraft-srg.jar");
-                }
-                return null;
-                })
-            .findFirst()
-            .get();
-        if (!mcClientJar.exists()) throw new IOException("Failed to find minecraft! " + mcClientJar.getAbsolutePath());
-        if (!copyMcTargetDir.exists() && !copyMcTargetDir.mkdirs()) throw new IOException("Failed to create target for copyMcJar");
-        Files.copy(mcClientJar.toPath(), copyMcTargetJar.toPath(), REPLACE_EXISTING);
-    }
-
     private void processArtifact() throws Exception {
         if (Files.exists(this.artifactUnoptimizedPath)) {
             Files.delete(this.artifactUnoptimizedPath);
@@ -219,16 +184,15 @@ public class ProguardTask extends BaritoneGradleTask {
     }
 
     private boolean validateJavaVersion(String java) {
-        //TODO: fix for j16
-//        final JavaVersion javaVersion = new DefaultJvmVersionDetector(new DefaultExecActionFactory(new IdentityFileResolver())).getJavaVersion(java);
-//
-//        if (!javaVersion.getMajorVersion().equals("8")) {
-//            System.out.println("Failed to validate Java version " + javaVersion.toString() + " [" + java + "] for ProGuard libraryjars");
-//            // throw new RuntimeException("Java version incorrect: " + javaVersion.getMajorVersion() + " for " + java);
-//            return false;
-//        }
-//
-//        System.out.println("Validated Java version " + javaVersion.toString() + " [" + java + "] for ProGuard libraryjars");
+        final JavaVersion javaVersion = new DefaultJvmVersionDetector(new DefaultExecActionFactory(new IdentityFileResolver())).getJavaVersion(java);
+
+        if (!javaVersion.getMajorVersion().equals("8")) {
+            System.out.println("Failed to validate Java version " + javaVersion.toString() + " [" + java + "] for ProGuard libraryjars");
+            // throw new RuntimeException("Java version incorrect: " + javaVersion.getMajorVersion() + " for " + java);
+            return false;
+        }
+
+        System.out.println("Validated Java version " + javaVersion.toString() + " [" + java + "] for ProGuard libraryjars");
         return true;
     }
 
@@ -237,22 +201,33 @@ 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) + "'");
 
-        template.add(2, "-libraryjars  <java.home>/jmods/java.base.jmod(!**.jar;!module-info.class)");
-        template.add(3, "-libraryjars  <java.home>/jmods/java.desktop.jmod(!**.jar;!module-info.class)");
+        // 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, and nashorn
-                    .filter(f -> !f.toString().endsWith("-recomp.jar") && !f.getName().startsWith("nashorn") && !f.getName().startsWith("coremods"));
+                    // 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);
 
-                libraries = dependencies
-                    .map(f -> isMcJar(f) ? copyMcTargetJar : 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 + "'");
@@ -302,19 +277,21 @@ public class ProguardTask extends BaritoneGradleTask {
         this.extract = extract;
     }
 
-    public void setCompType(String compType) {
-        this.compType = compType;
-    }
-
     private void runProguard(Path config) throws Exception {
         // Delete the existing proguard output file. Proguard probably handles this already, but why not do it ourselves
         if (Files.exists(this.proguardOut)) {
             Files.delete(this.proguardOut);
         }
 
-        Path proguardJar = getTemporaryFile(PROGUARD_JAR);
+        // 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.
+
         Process p = new ProcessBuilder("java", "-jar", proguardJar.toString(), "@" + config.toString())
-                .directory(getTemporaryFile("").toFile()) // Set the working directory to the temporary folder]
+                .directory(workingDirectory.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

gradle.properties

@@ -1,13 +0,0 @@
-org.gradle.jvmargs=-Xmx2048M
-
-mod_version=1.7.2
-maven_group=baritone
-archives_base_name=baritone
-
-minecraft_version=1.17.1
-forge_version=1.17.1-37.0.69
-fabric_version=0.11.6
-
-# # un comment for forge debugging default (as opposed to fabric)
-# baritone.forge_build=true
-# loom.platform=forge

gradle/wrapper/gradle-wrapper.properties

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

scripts/proguard.pro

@@ -1,5 +1,6 @@
 -keepattributes Signature
 -keepattributes *Annotation*
+-keepattributes InnerClasses
 
 -optimizationpasses 5
 -verbose
@@ -27,6 +28,7 @@
 -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
@@ -45,9 +47,10 @@
 
 #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.**
 
 # Keep - Applications. Keep all application classes, along with their 'main'
 # methods.

settings.gradle

@@ -15,26 +15,5 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-pluginManagement {
-    repositories {
-        maven { url "https://maven.architectury.dev/" }
-        maven {
-            url = 'https://maven.fabricmc.net/'
-        }
-        maven {
-            name = 'forge'
-            url = 'https://files.minecraftforge.net/maven'
-        }
-        maven {
-            name = 'impactdevelopment-repo'
-            url = 'https://impactdevelopment.github.io/maven/'
-        }
-        maven {
-            url = 'https://www.dogforce-games.com/maven/'
-        }
-        maven {
-            url = 'https://libraries.minecraft.net/'
-        }
-        mavenCentral()
-    }
-}
+rootProject.name = 'baritone'
+

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

@@ -32,7 +32,7 @@ public final class BaritoneAPI {
 
     static {
         settings = new Settings();
-        SettingsUtil.readAndApply(settings);
+        SettingsUtil.readAndApply(settings, SettingsUtil.SETTINGS_DEFAULT_NAME);
 
         try {
             provider = (IBaritoneProvider) Class.forName("baritone.BaritoneProvider").newInstance();

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

@@ -21,9 +21,11 @@ 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 java.util.List;
 import java.util.Objects;
-import net.minecraft.client.player.LocalPlayer;
 
 /**
  * Provides the present {@link IBaritone} instances, as well as non-baritone instance related APIs.
@@ -46,20 +48,18 @@ public interface IBaritoneProvider {
      * returned by {@link #getPrimaryBaritone()}.
      *
      * @return All active {@link IBaritone} instances.
-     * @see #getBaritoneForPlayer(LocalPlayer)
+     * @see #getBaritoneForPlayer(ClientPlayerEntity)
      */
     List<IBaritone> getAllBaritones();
 
     /**
-     * Provides the {@link IBaritone} instance for a given {@link LocalPlayer}. This will likely be
-     * replaced with or be overloaded in addition to {@code #getBaritoneForUser(IBaritoneUser)} when
-     * {@code bot-system} is merged into {@code master}.
+     * Provides the {@link IBaritone} instance for a given {@link ClientPlayerEntity}.
      *
      * @param player The player
      * @return The {@link IBaritone} instance.
      */
-    default IBaritone getBaritoneForPlayer(LocalPlayer player) {
-        for (IBaritone baritone : getAllBaritones()) {
+    default IBaritone getBaritoneForPlayer(ClientPlayerEntity player) {
+        for (IBaritone baritone : this.getAllBaritones()) {
             if (Objects.equals(player, baritone.getPlayerContext().player())) {
                 return baritone;
             }
@@ -67,6 +67,39 @@ 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

@@ -21,22 +21,25 @@ import baritone.api.utils.NotificationHelper;
 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.TypeUtils;
 import baritone.api.utils.gui.BaritoneToast;
+import net.minecraft.block.Block;
+import net.minecraft.block.Blocks;
 import net.minecraft.client.Minecraft;
-import net.minecraft.core.Vec3i;
-import net.minecraft.network.chat.BaseComponent;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TextComponent;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.util.math.vector.Vector3i;
+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.*;
 import java.util.List;
-import java.util.function.Consumer;
+import java.util.*;
 import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 
 /**
  * Baritone's settings. Settings apply to all Baritone instances.
@@ -50,6 +53,11 @@ 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
      */
@@ -65,6 +73,16 @@ 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>
@@ -103,6 +121,13 @@ 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.
@@ -112,6 +137,8 @@ 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);
 
@@ -192,7 +219,7 @@ 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
+            // Leave Empty by Default
     ));
 
     /**
@@ -232,6 +259,8 @@ 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<>());
 
@@ -239,6 +268,15 @@ 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<>());
 
@@ -261,6 +299,12 @@ public final class Settings {
      */
     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>
@@ -388,6 +432,9 @@ 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);
 
     /**
@@ -397,6 +444,9 @@ public final class Settings {
      */
     public final Setting<Double> mobAvoidanceCoefficient = new Setting<>(1.5);
 
+    /**
+     * Distance to avoid mobs.
+     */
     public final Setting<Integer> mobAvoidanceRadius = new Setting<>(8);
 
     /**
@@ -547,6 +597,17 @@ 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.
      */
@@ -563,6 +624,13 @@ 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
+     * <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
+     */
+    public final Setting<Integer> chunkPackerQueueMaxSize = new Setting<>(2000);
+
     /**
      * Fill in blocks behind you
      */
@@ -664,6 +732,17 @@ 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>
@@ -795,10 +874,14 @@ public final class Settings {
 
     /**
      * Sets the minimum y level whilst mining - set to 0 to turn off.
-     * if world has negative y values, subtract the min world height to get the value to put here
      */
     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.
      */
@@ -883,12 +966,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<Vec3i> buildRepeat = new Setting<>(new Vec3i(0, 0, 0));
+    public final Setting<Vector3i> buildRepeat = new Setting<>(new Vector3i(0, 0, 0));
 
     /**
      * How many times to buildrepeat. -1 for infinite.
@@ -1095,13 +1178,15 @@ public final class Settings {
      * via {@link Consumer#andThen(Consumer)} or it can completely be overriden via setting
      * {@link Setting#value};
      */
-    public final Setting<Consumer<Component>> logger = new Setting<>(Minecraft.getInstance().gui.getChat()::addMessage);
+    @JavaOnly
+    public final Setting<Consumer<ITextComponent>> logger = new Setting<>(msg -> Minecraft.getInstance().ingameGUI.getChatGUI().printChatMessage(msg));
 
     /**
      * The function that is called when Baritone will send a desktop notification. This function can be added to
      * via {@link Consumer#andThen(Consumer)} or it can completely be overriden via setting
      * {@link Setting#value};
      */
+    @JavaOnly
     public final Setting<BiConsumer<String, Boolean>> notifier = new Setting<>(NotificationHelper::notify);
 
     /**
@@ -1109,7 +1194,8 @@ public final class Settings {
      * via {@link Consumer#andThen(Consumer)} or it can completely be overriden via setting
      * {@link Setting#value};
      */
-    public final Setting<BiConsumer<Component, Component>> toaster = new Setting<>(BaritoneToast::addOrUpdate);
+    @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
@@ -1258,6 +1344,7 @@ public final class Settings {
         public T value;
         public final T defaultValue;
         private String name;
+        private boolean javaOnly;
 
         @SuppressWarnings("unchecked")
         private Setting(T value) {
@@ -1266,6 +1353,7 @@ public final class Settings {
             }
             this.value = value;
             this.defaultValue = value;
+            this.javaOnly = false;
         }
 
         /**
@@ -1302,8 +1390,25 @@ 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() {
@@ -1319,6 +1424,7 @@ 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,6 +17,8 @@
 
 package baritone.api.behavior;
 
+import baritone.api.Settings;
+import baritone.api.behavior.look.IAimProcessor;
 import baritone.api.utils.Rotation;
 
 /**
@@ -26,14 +28,23 @@ 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 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};
+     * 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.
      *
-     * @param rotation The target rotations
-     * @param force    Whether or not to "force" the rotations
+     * @param rotation      The target rotations
+     * @param blockInteract Whether the target rotations are needed for a block interaction
      */
-    void updateTarget(Rotation rotation, boolean force);
+    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();
 }

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

@@ -0,0 +1,45 @@
+/*
+ * 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

@@ -0,0 +1,47 @@
+/*
+ * 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,8 +17,8 @@
 
 package baritone.api.cache;
 
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.block.BlockState;
+import net.minecraft.util.math.BlockPos;
 
 /**
  * @author Brady

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

@@ -17,9 +17,10 @@
 
 package baritone.api.cache;
 
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.chunk.Chunk;
+
 import java.util.ArrayList;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.chunk.LevelChunk;
 
 /**
  * @author Brady
@@ -43,7 +44,7 @@ public interface ICachedWorld {
      *
      * @param chunk The chunk to pack and store
      */
-    void queueForPacking(LevelChunk chunk);
+    void queueForPacking(Chunk chunk);
 
     /**
      * Returns whether or not the block at the specified X and Z coordinates

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

@@ -17,6 +17,8 @@
 
 package baritone.api.cache;
 
+import java.util.function.Consumer;
+
 /**
  * @author Brady
  * @since 9/24/2018
@@ -29,4 +31,11 @@ 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/cache/IWorldScanner.java

@@ -19,10 +19,11 @@ package baritone.api.cache;
 
 import baritone.api.utils.BlockOptionalMetaLookup;
 import baritone.api.utils.IPlayerContext;
+import net.minecraft.block.Block;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.ChunkPos;
+
 import java.util.List;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.block.Block;
 
 /**
  * @author Brady

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

@@ -27,10 +27,11 @@ import baritone.api.command.exception.CommandInvalidTypeException;
 import baritone.api.command.exception.CommandNotEnoughArgumentsException;
 import baritone.api.command.exception.CommandTooManyArgumentsException;
 import baritone.api.utils.Helper;
+import net.minecraft.util.Direction;
+
 import java.util.Deque;
 import java.util.LinkedList;
 import java.util.stream.Stream;
-import net.minecraft.core.Direction;
 
 /**
  * The {@link IArgConsumer} is how {@link ICommand}s read the arguments passed to them. This class has many benefits:

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.core.Direction;
+import net.minecraft.util.Direction;
 
 /**
  * A {@link ICommandArgument} is an immutable object representing one command argument. It contains data on the index of

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

@@ -19,14 +19,21 @@ package baritone.api.command.datatypes;
 
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
+import net.minecraft.block.Block;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.registry.Registry;
+
+import java.util.regex.Pattern;
 import java.util.stream.Stream;
-import net.minecraft.core.Registry;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.block.Block;
 
 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());
@@ -39,13 +46,19 @@ 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()
                                 .stream()
                                 .map(Object::toString)
                 )
-                .filterPrefixNamespaced(ctx.getConsumer().getString())
+                .filterPrefixNamespaced(arg)
                 .sortAlphabetically()
                 .stream();
     }

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

@@ -19,10 +19,11 @@ package baritone.api.command.datatypes;
 
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
+import net.minecraft.entity.EntityType;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.registry.Registry;
+
 import java.util.stream.Stream;
-import net.minecraft.core.Registry;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.entity.EntityType;
 
 public enum EntityClassById implements IDatatypeFor<EntityType> {
     INSTANCE;

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

@@ -0,0 +1,43 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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,20 +18,137 @@
 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) {
-        return ctx.getConsumer().tabCompleteDatatype(BlockById.INSTANCE);
+    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);
     }
 }

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

@@ -19,9 +19,10 @@ 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;
-import net.minecraft.core.Direction;
 
 public enum ForDirection implements IDatatypeFor<Direction> {
     INSTANCE;
@@ -35,7 +36,7 @@ public enum ForDirection implements IDatatypeFor<Direction> {
     public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
         return new TabCompleteHelper()
                 .append(Stream.of(Direction.values())
-                        .map(Direction::getName).map(String::toLowerCase))
+                        .map(Direction::getName2).map(String::toLowerCase))
                 .filterPrefix(ctx.getConsumer().getString())
                 .stream();
     }

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

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

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

@@ -26,7 +26,8 @@ import java.util.stream.Stream;
 
 public enum RelativeCoordinate implements IDatatypePost<Double, Double> {
     INSTANCE;
-    private static Pattern PATTERN = Pattern.compile("^(~?)([+-]?(?:\\d+(?:\\.\\d*)?|\\.\\d+)([k-k]?)|)$");
+    private static String ScalesAliasRegex = "[kKmM]";
+    private static Pattern PATTERN = Pattern.compile("^(~?)([+-]?(?:\\d+(?:\\.\\d*)?|\\.\\d+)(" + ScalesAliasRegex + "?)|)$");
 
     @Override
     public Double apply(IDatatypeContext ctx, Double origin) throws CommandException {
@@ -41,11 +42,15 @@ 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("k", ""));
+        double offset = matcher.group(2).isEmpty() ? 0 : Double.parseDouble(matcher.group(2).replaceAll(ScalesAliasRegex, ""));
 
-        if (matcher.group(2).contains("k")) {
+        if (matcher.group(2).toLowerCase().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,6 +19,8 @@ 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;
@@ -30,8 +32,6 @@ 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,18 +83,23 @@ 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() {
-        File gameDir = HELPER.mc.gameDirectory.getAbsoluteFile();
+        return gameDir(Helper.mc);
+    }
+
+    public static File gameDir(Minecraft mc) {
+        File gameDir = mc.gameDir.getAbsoluteFile();
         if (gameDir.getName().equals(".")) {
             return gameDir.getParentFile();
         }

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

@@ -21,8 +21,9 @@ import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.exception.CommandException;
 import baritone.api.pathing.goals.GoalBlock;
 import baritone.api.utils.BetterBlockPos;
+import net.minecraft.util.math.MathHelper;
+
 import java.util.stream.Stream;
-import net.minecraft.util.Mth;
 
 public enum RelativeGoalBlock implements IDatatypePost<GoalBlock, BetterBlockPos> {
     INSTANCE;
@@ -35,9 +36,9 @@ public enum RelativeGoalBlock implements IDatatypePost<GoalBlock, BetterBlockPos
 
         final IArgConsumer consumer = ctx.getConsumer();
         return new GoalBlock(
-                Mth.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.x)),
-                Mth.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.y)),
-                Mth.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.z))
+                MathHelper.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.x)),
+                MathHelper.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.y)),
+                MathHelper.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.z))
         );
     }
 

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

@@ -21,8 +21,9 @@ import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.exception.CommandException;
 import baritone.api.pathing.goals.GoalXZ;
 import baritone.api.utils.BetterBlockPos;
+import net.minecraft.util.math.MathHelper;
+
 import java.util.stream.Stream;
-import net.minecraft.util.Mth;
 
 public enum RelativeGoalXZ implements IDatatypePost<GoalXZ, BetterBlockPos> {
     INSTANCE;
@@ -35,8 +36,8 @@ public enum RelativeGoalXZ implements IDatatypePost<GoalXZ, BetterBlockPos> {
 
         final IArgConsumer consumer = ctx.getConsumer();
         return new GoalXZ(
-                Mth.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.x)),
-                Mth.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.z))
+                MathHelper.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.x)),
+                MathHelper.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.z))
         );
     }
 

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

@@ -21,8 +21,9 @@ import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.exception.CommandException;
 import baritone.api.pathing.goals.GoalYLevel;
 import baritone.api.utils.BetterBlockPos;
+import net.minecraft.util.math.MathHelper;
+
 import java.util.stream.Stream;
-import net.minecraft.util.Mth;
 
 public enum RelativeGoalYLevel implements IDatatypePost<GoalYLevel, BetterBlockPos> {
     INSTANCE;
@@ -34,7 +35,7 @@ public enum RelativeGoalYLevel implements IDatatypePost<GoalYLevel, BetterBlockP
         }
 
         return new GoalYLevel(
-                Mth.floor(ctx.getConsumer().getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.y))
+                MathHelper.floor(ctx.getConsumer().getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.y))
         );
     }
 

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

@@ -19,8 +19,9 @@ package baritone.api.command.exception;
 
 import baritone.api.command.ICommand;
 import baritone.api.command.argument.ICommandArgument;
+import net.minecraft.util.text.TextFormatting;
+
 import java.util.List;
-import net.minecraft.ChatFormatting;
 
 import static baritone.api.utils.Helper.HELPER;
 
@@ -38,7 +39,7 @@ public class CommandUnhandledException extends RuntimeException implements IComm
     public void handle(ICommand command, List<ICommandArgument> args) {
         HELPER.logDirect("An unhandled exception occurred. " +
                         "The error is in your game's log, please report this at https://github.com/cabaletta/baritone/issues",
-                ChatFormatting.RED);
+                TextFormatting.RED);
 
         this.printStackTrace();
     }

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

@@ -19,8 +19,9 @@ package baritone.api.command.exception;
 
 import baritone.api.command.ICommand;
 import baritone.api.command.argument.ICommandArgument;
+import net.minecraft.util.text.TextFormatting;
+
 import java.util.List;
-import net.minecraft.ChatFormatting;
 
 import static baritone.api.utils.Helper.HELPER;
 
@@ -49,6 +50,6 @@ public interface ICommandException {
      * @param args    The arguments the command was called with.
      */
     default void handle(ICommand command, List<ICommandArgument> args) {
-        HELPER.logDirect(this.getMessage(), ChatFormatting.RED);
+        HELPER.logDirect(this.getMessage(), TextFormatting.RED);
     }
 }

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

@@ -21,15 +21,16 @@ import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.exception.CommandInvalidTypeException;
 import baritone.api.utils.Helper;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.StringTextComponent;
+import net.minecraft.util.text.TextComponent;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraft.util.text.event.ClickEvent;
+import net.minecraft.util.text.event.HoverEvent;
+
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.Function;
-import net.minecraft.ChatFormatting;
-import net.minecraft.network.chat.BaseComponent;
-import net.minecraft.network.chat.ClickEvent;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.HoverEvent;
-import net.minecraft.network.chat.TextComponent;
 
 public class Paginator<E> implements Helper {
 
@@ -63,59 +64,59 @@ public class Paginator<E> implements Helper {
         return this;
     }
 
-    public void display(Function<E, Component> transform, String commandPrefix) {
+    public void display(Function<E, ITextComponent> transform, String commandPrefix) {
         int offset = (page - 1) * pageSize;
         for (int i = offset; i < offset + pageSize; i++) {
             if (i < entries.size()) {
                 logDirect(transform.apply(entries.get(i)));
             } else {
-                logDirect("--", ChatFormatting.DARK_GRAY);
+                logDirect("--", TextFormatting.DARK_GRAY);
             }
         }
         boolean hasPrevPage = commandPrefix != null && validPage(page - 1);
         boolean hasNextPage = commandPrefix != null && validPage(page + 1);
-        BaseComponent prevPageComponent = new TextComponent("<<");
+        TextComponent prevPageComponent = new StringTextComponent("<<");
         if (hasPrevPage) {
             prevPageComponent.setStyle(prevPageComponent.getStyle()
-                    .withClickEvent(new ClickEvent(
+                    .setClickEvent(new ClickEvent(
                             ClickEvent.Action.RUN_COMMAND,
                             String.format("%s %d", commandPrefix, page - 1)
                     ))
-                    .withHoverEvent(new HoverEvent(
+                    .setHoverEvent(new HoverEvent(
                             HoverEvent.Action.SHOW_TEXT,
-                            new TextComponent("Click to view previous page")
+                            new StringTextComponent("Click to view previous page")
                     )));
         } else {
-            prevPageComponent.setStyle(prevPageComponent.getStyle().withColor(ChatFormatting.DARK_GRAY));
+            prevPageComponent.setStyle(prevPageComponent.getStyle().setFormatting(TextFormatting.DARK_GRAY));
         }
-        BaseComponent nextPageComponent = new TextComponent(">>");
+        TextComponent nextPageComponent = new StringTextComponent(">>");
         if (hasNextPage) {
             nextPageComponent.setStyle(nextPageComponent.getStyle()
-                    .withClickEvent(new ClickEvent(
+                    .setClickEvent(new ClickEvent(
                             ClickEvent.Action.RUN_COMMAND,
                             String.format("%s %d", commandPrefix, page + 1)
                     ))
-                    .withHoverEvent(new HoverEvent(
+                    .setHoverEvent(new HoverEvent(
                             HoverEvent.Action.SHOW_TEXT,
-                            new TextComponent("Click to view next page")
+                            new StringTextComponent("Click to view next page")
                     )));
         } else {
-            nextPageComponent.setStyle(nextPageComponent.getStyle().withColor(ChatFormatting.DARK_GRAY));
+            nextPageComponent.setStyle(nextPageComponent.getStyle().setFormatting(TextFormatting.DARK_GRAY));
         }
-        BaseComponent pagerComponent = new TextComponent("");
-        pagerComponent.setStyle(pagerComponent.getStyle().withColor(ChatFormatting.GRAY));
+        TextComponent pagerComponent = new StringTextComponent("");
+        pagerComponent.setStyle(pagerComponent.getStyle().setFormatting(TextFormatting.GRAY));
         pagerComponent.append(prevPageComponent);
-        pagerComponent.append(" | ");
+        pagerComponent.appendString(" | ");
         pagerComponent.append(nextPageComponent);
-        pagerComponent.append(String.format(" %d/%d", page, getMaxPage()));
+        pagerComponent.appendString(String.format(" %d/%d", page, getMaxPage()));
         logDirect(pagerComponent);
     }
 
-    public void display(Function<E, Component> transform) {
+    public void display(Function<E, ITextComponent> transform) {
         display(transform, null);
     }
 
-    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Runnable pre, Function<T, Component> transform, String commandPrefix) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Runnable pre, Function<T, ITextComponent> transform, String commandPrefix) throws CommandException {
         int page = 1;
         consumer.requireMax(1);
         if (consumer.hasAny()) {
@@ -138,47 +139,47 @@ public class Paginator<E> implements Helper {
         pagi.display(transform, commandPrefix);
     }
 
-    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Runnable pre, Function<T, Component> transform, String commandPrefix) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Runnable pre, Function<T, ITextComponent> transform, String commandPrefix) throws CommandException {
         paginate(consumer, new Paginator<>(elems), pre, transform, commandPrefix);
     }
 
-    public static <T> void paginate(IArgConsumer consumer, T[] elems, Runnable pre, Function<T, Component> transform, String commandPrefix) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, T[] elems, Runnable pre, Function<T, ITextComponent> transform, String commandPrefix) throws CommandException {
         paginate(consumer, Arrays.asList(elems), pre, transform, commandPrefix);
     }
 
-    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Function<T, Component> transform, String commandPrefix) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Function<T, ITextComponent> transform, String commandPrefix) throws CommandException {
         paginate(consumer, pagi, null, transform, commandPrefix);
     }
 
-    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Function<T, Component> transform, String commandPrefix) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Function<T, ITextComponent> transform, String commandPrefix) throws CommandException {
         paginate(consumer, new Paginator<>(elems), null, transform, commandPrefix);
     }
 
-    public static <T> void paginate(IArgConsumer consumer, T[] elems, Function<T, Component> transform, String commandPrefix) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, T[] elems, Function<T, ITextComponent> transform, String commandPrefix) throws CommandException {
         paginate(consumer, Arrays.asList(elems), null, transform, commandPrefix);
     }
 
-    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Runnable pre, Function<T, Component> transform) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Runnable pre, Function<T, ITextComponent> transform) throws CommandException {
         paginate(consumer, pagi, pre, transform, null);
     }
 
-    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Runnable pre, Function<T, Component> transform) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Runnable pre, Function<T, ITextComponent> transform) throws CommandException {
         paginate(consumer, new Paginator<>(elems), pre, transform, null);
     }
 
-    public static <T> void paginate(IArgConsumer consumer, T[] elems, Runnable pre, Function<T, Component> transform) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, T[] elems, Runnable pre, Function<T, ITextComponent> transform) throws CommandException {
         paginate(consumer, Arrays.asList(elems), pre, transform, null);
     }
 
-    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Function<T, Component> transform) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Function<T, ITextComponent> transform) throws CommandException {
         paginate(consumer, pagi, null, transform, null);
     }
 
-    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Function<T, Component> transform) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Function<T, ITextComponent> transform) throws CommandException {
         paginate(consumer, new Paginator<>(elems), null, transform, null);
     }
 
-    public static <T> void paginate(IArgConsumer consumer, T[] elems, Function<T, Component> transform) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, T[] elems, Function<T, ITextComponent> transform) throws CommandException {
         paginate(consumer, Arrays.asList(elems), null, transform, null);
     }
 }

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

@@ -23,13 +23,14 @@ import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.manager.ICommandManager;
 import baritone.api.event.events.TabCompleteEvent;
 import baritone.api.utils.SettingsUtil;
+import net.minecraft.util.ResourceLocation;
+
 import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
-import net.minecraft.resources.ResourceLocation;
 
 /**
  * The {@link TabCompleteHelper} is a <b>single-use</b> object that helps you handle tab completion. It includes helper
@@ -252,7 +253,7 @@ public class TabCompleteHelper {
     public TabCompleteHelper addSettings() {
         return append(
                 BaritoneAPI.getSettings().allSettings.stream()
-                        .filter(s -> !SettingsUtil.javaOnlySetting(s))
+                        .filter(s -> !s.isJavaOnly())
                         .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/BlockInteractEvent.java

@@ -17,7 +17,7 @@
 
 package baritone.api.event.events;
 
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;
 
 /**
  * Called when the local player interacts with a block, can be either {@link Type#START_BREAK} or {@link Type#USE}.

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.Connection;
-import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.IPacket;
+import net.minecraft.network.NetworkManager;
 
 /**
  * @author Brady
@@ -27,19 +27,19 @@ import net.minecraft.network.protocol.Packet;
  */
 public final class PacketEvent {
 
-    private final Connection networkManager;
+    private final NetworkManager networkManager;
 
     private final EventState state;
 
-    private final Packet<?> packet;
+    private final IPacket<?> packet;
 
-    public PacketEvent(Connection networkManager, EventState state, Packet<?> packet) {
+    public PacketEvent(NetworkManager networkManager, EventState state, IPacket<?> packet) {
         this.networkManager = networkManager;
         this.state = state;
         this.packet = packet;
     }
 
-    public final Connection getNetworkManager() {
+    public final NetworkManager getNetworkManager() {
         return this.networkManager;
     }
 
@@ -47,12 +47,12 @@ public final class PacketEvent {
         return this.state;
     }
 
-    public final Packet<?> getPacket() {
+    public final IPacket<?> getPacket() {
         return this.packet;
     }
 
     @SuppressWarnings("unchecked")
-    public final <T extends Packet<?>> T cast() {
+    public final <T extends IPacket<?>> T cast() {
         return (T) this.packet;
     }
 }

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

@@ -17,8 +17,8 @@
 
 package baritone.api.event.events;
 
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.math.Matrix4f;
+import com.mojang.blaze3d.matrix.MatrixStack;
+import net.minecraft.util.math.vector.Matrix4f;
 
 /**
  * @author Brady
@@ -32,9 +32,9 @@ public final class RenderEvent {
     private final float partialTicks;
 
     private final Matrix4f projectionMatrix;
-    private final PoseStack modelViewStack;
+    private final MatrixStack modelViewStack;
 
-    public RenderEvent(float partialTicks, PoseStack modelViewStack, Matrix4f projectionMatrix) {
+    public RenderEvent(float partialTicks, MatrixStack modelViewStack, Matrix4f projectionMatrix) {
         this.partialTicks = partialTicks;
         this.modelViewStack = modelViewStack;
         this.projectionMatrix = projectionMatrix;
@@ -47,7 +47,7 @@ public final class RenderEvent {
         return this.partialTicks;
     }
 
-    public PoseStack getModelViewStack() {
+    public MatrixStack getModelViewStack() {
         return this.modelViewStack;
     }
 

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

@@ -17,9 +17,10 @@
 
 package baritone.api.event.events;
 
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.phys.Vec3;
+import baritone.api.utils.Rotation;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.util.math.vector.Vector3d;
 
 /**
  * @author Brady
@@ -32,14 +33,27 @@ public final class RotationMoveEvent {
      */
     private final Type type;
 
+    private final Rotation original;
+
     /**
      * The yaw rotation
      */
     private float yaw;
 
-    public RotationMoveEvent(Type type, float yaw) {
+    /**
+     * The pitch rotation
+     */
+    private float pitch;
+
+    public RotationMoveEvent(Type type, float yaw, float pitch) {
         this.type = type;
+        this.original = new Rotation(yaw, pitch);
         this.yaw = yaw;
+        this.pitch = pitch;
+    }
+
+    public Rotation getOriginal() {
+        return this.original;
     }
 
     /**
@@ -47,21 +61,37 @@ public final class RotationMoveEvent {
      *
      * @param yaw Yaw rotation
      */
-    public final void setYaw(float yaw) {
+    public void setYaw(float yaw) {
         this.yaw = yaw;
     }
 
     /**
      * @return The yaw rotation
      */
-    public final float getYaw() {
+    public 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 final Type getType() {
+    public Type getType() {
         return this.type;
     }
 
@@ -70,7 +100,7 @@ public final class RotationMoveEvent {
         /**
          * Called when the player's motion is updated.
          *
-         * @see Entity#moveRelative(float, Vec3)
+         * @see Entity#moveRelative(float, Vector3d)
          */
         MOTION_UPDATE,
 

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

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

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

@@ -19,12 +19,12 @@ package baritone.api.event.listener;
 
 import baritone.api.event.events.*;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.DeathScreen;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.client.gui.screen.DeathScreen;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.entity.Entity;
+import net.minecraft.network.IPacket;
+import net.minecraft.util.math.vector.Vector3d;
 
 /**
  * @author Brady
@@ -36,7 +36,7 @@ public interface IGameEventListener {
      * Run once per game tick before screen input is handled.
      *
      * @param event The event
-     * @see Minecraft#tick()
+     * @see Minecraft#runTick()
      */
     void onTick(TickEvent event);
 
@@ -44,7 +44,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 LocalPlayer#tick()
+     * @see ClientPlayerEntity#tick()
      */
     void onPlayerUpdate(PlayerUpdateEvent event);
 
@@ -52,7 +52,7 @@ public interface IGameEventListener {
      * Runs whenever the client player sends a message to the server.
      *
      * @param event The event
-     * @see LocalPlayer#chat(String)
+     * @see ClientPlayerEntity#sendChatMessage(String)
      */
     void onSendChatMessage(ChatEvent event);
 
@@ -81,7 +81,7 @@ public interface IGameEventListener {
      * Runs before and after whenever a new world is loaded
      *
      * @param event The event
-     * @see Minecraft#setLevel(ClientLevel)
+     * @see Minecraft#loadWorld(ClientWorld)
      */
     void onWorldEvent(WorldEvent event);
 
@@ -89,7 +89,7 @@ public interface IGameEventListener {
      * Runs before a outbound packet is sent
      *
      * @param event The event
-     * @see Packet
+     * @see IPacket
      */
     void onSendPacket(PacketEvent event);
 
@@ -97,7 +97,7 @@ public interface IGameEventListener {
      * Runs before an inbound packet is processed
      *
      * @param event The event
-     * @see Packet
+     * @see IPacket
      */
     void onReceivePacket(PacketEvent event);
 
@@ -106,15 +106,15 @@ public interface IGameEventListener {
      * and before and after the player jumps.
      *
      * @param event The event
-     * @see Entity#moveRelative(float, Vec3)
+     * @see Entity#moveRelative(float, Vector3d)
      */
     void onPlayerRotationMove(RotationMoveEvent event);
 
     /**
-     * Called whenever the sprint keybind state is checked in {@link LocalPlayer#aiStep}
+     * Called whenever the sprint keybind state is checked in {@link ClientPlayerEntity#livingTick}
      *
      * @param event The event
-     * @see LocalPlayer#aiStep()
+     * @see ClientPlayerEntity#livingTick()
      */
     void onPlayerSprintState(SprintStateEvent event);
 

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

@@ -17,7 +17,7 @@
 
 package baritone.api.pathing.goals;
 
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;
 
 /**
  * An abstract Goal for pathing, can be anything from a specific block to just a Y coordinate.

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

@@ -42,6 +42,16 @@ 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,9 +17,10 @@
 
 package baritone.api.pathing.goals;
 
+import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.interfaces.IGoalRenderPos;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;
 
 /**
  * A specific BlockPos goal
@@ -66,6 +67,26 @@ 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(

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

@@ -67,6 +67,24 @@ 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,9 +17,10 @@
 
 package baritone.api.pathing.goals;
 
+import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.interfaces.IGoalRenderPos;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;
 
 
 /**
@@ -60,6 +61,26 @@ 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,6 +17,8 @@
 
 package baritone.api.pathing.goals;
 
+import java.util.Objects;
+
 /**
  * Invert any goal.
  * <p>
@@ -50,6 +52,24 @@ 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,12 @@
 
 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.DoubleOpenHashSet;
 import it.unimi.dsi.fastutil.doubles.DoubleIterator;
-import net.minecraft.core.BlockPos;
+import it.unimi.dsi.fastutil.doubles.DoubleOpenHashSet;
+import net.minecraft.util.math.BlockPos;
 
 public class GoalNear implements Goal, IGoalRenderPos {
 
@@ -86,6 +87,27 @@ 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,10 +18,12 @@
 package baritone.api.pathing.goals;
 
 import baritone.api.utils.SettingsUtil;
-import it.unimi.dsi.fastutil.doubles.DoubleOpenHashSet;
 import it.unimi.dsi.fastutil.doubles.DoubleIterator;
+import it.unimi.dsi.fastutil.doubles.DoubleOpenHashSet;
+import net.minecraft.util.math.BlockPos;
+
 import java.util.Arrays;
-import net.minecraft.core.BlockPos;
+import java.util.Objects;
 
 /**
  * Useful for automated combat (retreating specifically)
@@ -123,6 +125,29 @@ 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,10 @@
 
 package baritone.api.pathing.goals;
 
+import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.SettingsUtil;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
+import net.minecraft.util.Direction;
+import net.minecraft.util.math.BlockPos;
 
 /**
  * Dig a tunnel in a certain direction, but if you have to deviate from the path, go back to where you started
@@ -36,8 +37,8 @@ public class GoalStrictDirection implements Goal {
         x = origin.getX();
         y = origin.getY();
         z = origin.getZ();
-        dx = direction.getStepX();
-        dz = direction.getStepZ();
+        dx = direction.getXOffset();
+        dz = direction.getZOffset();
         if (dx == 0 && dz == 0) {
             throw new IllegalArgumentException(direction + "");
         }
@@ -69,6 +70,31 @@ 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,9 +17,10 @@
 
 package baritone.api.pathing.goals;
 
+import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.interfaces.IGoalRenderPos;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;
 
 /**
  * Useful if the goal is just to mine a block. This goal will be satisfied if the specified
@@ -72,6 +73,26 @@ 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

@@ -20,8 +20,8 @@ package baritone.api.pathing.goals;
 import baritone.api.BaritoneAPI;
 import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.SettingsUtil;
-import net.minecraft.util.Mth;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.vector.Vector3d;
 
 /**
  * Useful for long-range goals that don't have a specific Y level.
@@ -64,6 +64,27 @@ 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(
@@ -94,11 +115,11 @@ public class GoalXZ implements Goal {
         return (diagonal + straight) * BaritoneAPI.getSettings().costHeuristic.value; // big TODO tune
     }
 
-    public static GoalXZ fromDirection(Vec3 origin, float yaw, double distance) {
+    public static GoalXZ fromDirection(Vector3d origin, float yaw, double distance) {
         float theta = (float) Math.toRadians(yaw);
-        double x = origin.x - Mth.sin(theta) * distance;
-        double z = origin.z + Mth.cos(theta) * distance;
-        return new GoalXZ(Mth.floor(x), Mth.floor(z));
+        double x = origin.x - MathHelper.sin(theta) * distance;
+        double z = origin.z + MathHelper.cos(theta) * distance;
+        return new GoalXZ(MathHelper.floor(x), MathHelper.floor(z));
     }
 
     public int getX() {

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

@@ -58,6 +58,24 @@ 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/pathing/movement/IMovement.java

@@ -18,7 +18,7 @@
 package baritone.api.pathing.movement;
 
 import baritone.api.utils.BetterBlockPos;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;
 
 /**
  * @author Brady

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

@@ -18,10 +18,11 @@
 package baritone.api.process;
 
 import baritone.api.schematic.ISchematic;
+import net.minecraft.block.BlockState;
 import net.minecraft.client.Minecraft;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Vec3i;
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.vector.Vector3i;
+
 import java.io.File;
 import java.util.List;
 
@@ -38,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, Vec3i origin);
+    void build(String name, ISchematic schematic, Vector3i origin);
 
     /**
      * Requests a build for the specified schematic, labeled as specified, with the specified origin.
@@ -48,15 +49,18 @@ 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, Vec3i origin);
+    boolean build(String name, File schematic, Vector3i origin);
 
+    @Deprecated
     default boolean build(String schematicFile, BlockPos origin) {
-        File file = new File(new File(Minecraft.getInstance().gameDirectory, "schematics"), schematicFile);
+        File file = new File(new File(Minecraft.getInstance().gameDir, "schematics"), schematicFile);
         return build(schematicFile, file, origin);
     }
 
     void buildOpenSchematic();
 
+    void buildOpenLitematic(int i);
+
     void pause();
 
     boolean isPaused();

src/api/java/baritone/api/process/IFarmProcess.java

@@ -17,7 +17,7 @@
 
 package baritone.api.process;
 
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;
 
 public interface IFarmProcess extends IBaritoneProcess {
 

src/api/java/baritone/api/process/IFollowProcess.java

@@ -17,9 +17,10 @@
 
 package baritone.api.process;
 
+import net.minecraft.entity.Entity;
+
 import java.util.List;
 import java.util.function.Predicate;
-import net.minecraft.world.entity.Entity;
 
 /**
  * @author Brady

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

@@ -18,7 +18,7 @@
 package baritone.api.process;
 
 import baritone.api.utils.BlockOptionalMeta;
-import net.minecraft.world.level.block.Block;
+import net.minecraft.block.Block;
 
 /**
  * but it rescans the world every once in a while so it doesn't get fooled by its cache

src/api/java/baritone/api/process/IMineProcess.java

@@ -19,8 +19,9 @@ package baritone.api.process;
 
 import baritone.api.utils.BlockOptionalMeta;
 import baritone.api.utils.BlockOptionalMetaLookup;
+import net.minecraft.block.Block;
+
 import java.util.stream.Stream;
-import net.minecraft.world.level.block.Block;
 
 /**
  * @author Brady

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

@@ -17,9 +17,10 @@
 
 package baritone.api.schematic;
 
+import net.minecraft.block.BlockState;
+
 import java.util.ArrayList;
 import java.util.List;
-import net.minecraft.world.level.block.state.BlockState;
 
 public class CompositeSchematic extends AbstractSchematic {
 

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

@@ -18,9 +18,9 @@
 package baritone.api.schematic;
 
 import baritone.api.utils.BlockOptionalMeta;
+import net.minecraft.block.BlockState;
+
 import java.util.List;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.state.BlockState;
 
 public class FillSchematic extends AbstractSchematic {
 

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

@@ -17,9 +17,10 @@
 
 package baritone.api.schematic;
 
+import net.minecraft.block.BlockState;
+import net.minecraft.util.Direction;
+
 import java.util.List;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.block.state.BlockState;
 
 /**
  * Basic representation of a schematic. Provides the dimensions and the desired state for a given position relative to

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

@@ -17,7 +17,7 @@
 
 package baritone.api.schematic;
 
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.block.BlockState;
 
 /**
  * A static schematic is capable of providing the desired state at a given position without

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

@@ -17,8 +17,10 @@
 
 package baritone.api.schematic;
 
+import baritone.api.schematic.mask.Mask;
+import net.minecraft.block.BlockState;
+
 import java.util.List;
-import net.minecraft.world.level.block.state.BlockState;
 
 public abstract class MaskSchematic extends AbstractSchematic {
 
@@ -40,4 +42,14 @@ public abstract class MaskSchematic extends AbstractSchematic {
     public BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> 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.world.level.block.state.BlockState;
+import net.minecraft.block.BlockState;
 
 public class ReplaceSchematic extends MaskSchematic {
 

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

@@ -17,7 +17,7 @@
 
 package baritone.api.schematic;
 
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.block.BlockState;
 
 public class ShellSchematic extends MaskSchematic {
 

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

@@ -17,11 +17,11 @@
 
 package baritone.api.schematic;
 
-import net.minecraft.world.level.block.AirBlock;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.state.properties.Property;
+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 java.util.Collection;
 import java.util.HashMap;
@@ -34,7 +34,7 @@ public class SubstituteSchematic extends AbstractSchematic {
     private final Map<Block, List<Block>> substitutions;
     private final Map<BlockState, Map<Block, BlockState>> 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;
@@ -58,7 +58,7 @@ public class SubstituteSchematic extends AbstractSchematic {
         }
         for (Block substitute : substitutes) {
             if (substitute instanceof AirBlock) {
-                return current.getBlock() instanceof AirBlock ? current : Blocks.AIR.defaultBlockState(); // can always "place" air
+                return current.getBlock() instanceof AirBlock ? current : Blocks.AIR.getDefaultState(); // can always "place" air
             }
             for (BlockState placeable : approxPlaceable) {
                 if (substitute.equals(placeable.getBlock())) {
@@ -66,25 +66,26 @@ public class SubstituteSchematic extends AbstractSchematic {
                 }
             }
         }
-        return substitutes.get(0).defaultBlockState();
+        return substitutes.get(0).getDefaultState();
     }
 
     private BlockState withBlock(BlockState state, Block block) {
         if (blockStateCache.containsKey(state) && blockStateCache.get(state).containsKey(block)) {
             return blockStateCache.get(state).get(block);
         }
-        Collection<Property<?>> properties = state.getProperties();
-        BlockState newState = block.defaultBlockState();
+        Collection<Property<?>> properties = state.getBlock().getStateContainer().getProperties();
+        BlockState newState = block.getDefaultState();
         for (Property<?> 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, BlockState>()).put(block, newState);
         return newState;
     }
+
     private <T extends Comparable<T>> BlockState copySingleProp(BlockState fromState, BlockState toState, Property<T> prop) {
-        return toState.setValue(prop, fromState.getValue(prop));
+        return toState.with(prop, fromState.get(prop));
     }
 }

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

@@ -17,7 +17,7 @@
 
 package baritone.api.schematic;
 
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.block.BlockState;
 
 public class WallsSchematic extends MaskSchematic {
 

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

@@ -0,0 +1,49 @@
+/*
+ * 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;
+
+/**
+ * @author Brady
+ */
+public abstract class AbstractMask implements Mask {
+
+    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;
+    }
+
+    @Override
+    public int widthX() {
+        return this.widthX;
+    }
+
+    @Override
+    public int heightY() {
+        return this.heightY;
+    }
+
+    @Override
+    public int lengthZ() {
+        return this.lengthZ;
+    }
+}

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

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

@@ -0,0 +1,44 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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;
+
+/**
+ * @author Brady
+ */
+final class PreComputedMask extends AbstractMask implements StaticMask {
+
+    private final boolean[][][] mask;
+
+    public PreComputedMask(StaticMask mask) {
+        super(mask.widthX(), mask.heightY(), mask.lengthZ());
+
+        this.mask = new boolean[this.heightY()][this.lengthZ()][this.widthX()];
+        for (int y = 0; y < this.heightY(); y++) {
+            for (int z = 0; z < this.lengthZ(); z++) {
+                for (int x = 0; x < this.widthX(); x++) {
+                    this.mask[y][z][x] = mask.partOfMask(x, y, z);
+                }
+            }
+        }
+    }
+
+    @Override
+    public boolean partOfMask(int x, int y, int z) {
+        return this.mask[y][z][x];
+    }
+}

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

@@ -0,0 +1,82 @@
+/*
+ * 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

@@ -0,0 +1,79 @@
+/*
+ * 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

@@ -0,0 +1,56 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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

@@ -0,0 +1,69 @@
+/*
+ * 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

@@ -0,0 +1,64 @@
+/*
+ * 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.core.Direction;
-import net.minecraft.core.Vec3i;
-import net.minecraft.world.phys.AABB;
+import net.minecraft.util.Direction;
+import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.vector.Vector3i;
 
 /**
  * A selection is an immutable object representing the current selection. The selection is commonly used for certain
@@ -51,12 +51,12 @@ public interface ISelection {
     /**
      * @return The size of this ISelection.
      */
-    Vec3i size();
+    Vector3i size();
 
     /**
-     * @return An {@link AABB} encompassing all blocks in this selection.
+     * @return An {@link AxisAlignedBB} encompassing all blocks in this selection.
      */
-    AABB aabb();
+    AxisAlignedBB aabb();
 
     /**
      * Returns a new {@link ISelection} expanded in the specified direction by the specified number of 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.core.Direction;
+import net.minecraft.util.Direction;
 
 /**
  * The selection manager handles setting Baritone's selections. You can set the selection here, as well as retrieving

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

@@ -17,11 +17,12 @@
 
 package baritone.api.utils;
 
+import net.minecraft.util.Direction;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.vector.Vector3i;
+
 import javax.annotation.Nonnull;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.core.Vec3i;
-import net.minecraft.util.Mth;
 
 /**
  * A better BlockPos that has fewer hash collisions (and slightly more performant offsets)
@@ -48,7 +49,7 @@ public final class BetterBlockPos extends BlockPos {
     }
 
     public BetterBlockPos(double x, double y, double z) {
-        this(Mth.floor(x), Mth.floor(y), Mth.floor(z));
+        this(MathHelper.floor(x), MathHelper.floor(y), MathHelper.floor(z));
     }
 
     public BetterBlockPos(BlockPos pos) {
@@ -115,7 +116,7 @@ public final class BetterBlockPos extends BlockPos {
     }
 
     @Override
-    public BetterBlockPos above() {
+    public BetterBlockPos up() {
         // this is unimaginably faster than blockpos.up
         // that literally calls
         // this.up(1)
@@ -129,35 +130,35 @@ public final class BetterBlockPos extends BlockPos {
     }
 
     @Override
-    public BetterBlockPos above(int amt) {
+    public BetterBlockPos up(int amt) {
         // see comment in up()
         return amt == 0 ? this : new BetterBlockPos(x, y + amt, z);
     }
 
     @Override
-    public BetterBlockPos below() {
+    public BetterBlockPos down() {
         // see comment in up()
         return new BetterBlockPos(x, y - 1, z);
     }
 
     @Override
-    public BetterBlockPos below(int amt) {
+    public BetterBlockPos down(int amt) {
         // see comment in up()
         return amt == 0 ? this : new BetterBlockPos(x, y - amt, z);
     }
 
     @Override
-    public BetterBlockPos relative(Direction dir) {
-        Vec3i vec = dir.getNormal();
+    public BetterBlockPos offset(Direction dir) {
+        Vector3i vec = dir.getDirectionVec();
         return new BetterBlockPos(x + vec.getX(), y + vec.getY(), z + vec.getZ());
     }
 
     @Override
-    public BetterBlockPos relative(Direction dir, int dist) {
+    public BetterBlockPos offset(Direction dir, int dist) {
         if (dist == 0) {
             return this;
         }
-        Vec3i vec = dir.getNormal();
+        Vector3i vec = dir.getDirectionVec();
         return new BetterBlockPos(x + vec.getX() * dist, y + vec.getY() * dist, z + vec.getZ() * dist);
     }
 

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

@@ -18,72 +18,104 @@
 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.core.BlockPos;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.loot.*;
 import net.minecraft.resources.*;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.packs.PackResources;
-import net.minecraft.server.packs.PackType;
-import net.minecraft.server.packs.repository.Pack;
-import net.minecraft.server.packs.repository.PackRepository;
-import net.minecraft.server.packs.repository.ServerPacksSource;
-import net.minecraft.server.packs.resources.ReloadableResourceManager;
-import net.minecraft.server.packs.resources.SimpleReloadableResourceManager;
+import net.minecraft.state.Property;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.Unit;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.storage.loot.BuiltInLootTables;
-import net.minecraft.world.level.storage.loot.LootContext;
-import net.minecraft.world.level.storage.loot.LootTables;
-import net.minecraft.world.level.storage.loot.PredicateManager;
-import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
-import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.vector.Vector3d;
+
 import javax.annotation.Nonnull;
-import java.util.*;
+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 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 ImmutableSet<Integer> stateHashes;
-    private final ImmutableSet<Integer> stackHashes;
-    private static final Pattern pattern = Pattern.compile("^(.+?)(?::(\\d+))?$");
-    private static LootTables manager;
-    private static PredicateManager predicate = new PredicateManager();
+    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<>();
 
     public BlockOptionalMeta(@Nonnull Block block) {
         this.block = block;
-        this.blockstates = getStates(block);
+        this.propertiesDescription = "{}";
+        this.blockstates = getStates(block, Collections.emptyMap());
         this.stateHashes = getStateHashes(blockstates);
         this.stackHashes = getStackHashes(blockstates);
     }
 
     public BlockOptionalMeta(@Nonnull String selector) {
-        Matcher matcher = pattern.matcher(selector);
+        Matcher matcher = PATTERN.matcher(selector);
 
         if (!matcher.find()) {
             throw new IllegalArgumentException("invalid block selector");
         }
 
-        MatchResult matchResult = matcher.toMatchResult();
+        block = BlockUtils.stringToBlockRequired(matcher.group("id"));
 
-        block = BlockUtils.stringToBlockRequired(matchResult.group(1));
-        blockstates = getStates(block);
+        String props = matcher.group("properties");
+        Map<Property<?>, ?> properties = props == null || props.equals("") ? Collections.emptyMap() : parseProperties(block, props);
+
+        propertiesDescription = props == null ? "{}" : "{" + props.replace("=", ":") + "}";
+        blockstates = getStates(block, properties);
         stateHashes = getStateHashes(blockstates);
         stackHashes = getStackHashes(blockstates);
     }
 
-    private static Set<BlockState> getStates(@Nonnull Block block) {
-        return new HashSet<>(block.getStateDefinition().getPossibleStates());
+    private static <C extends Comparable<C>, P extends Property<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();
+    }
+
+    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()
+                ))
+                .collect(Collectors.toSet());
     }
 
     private static ImmutableSet<Integer> getStateHashes(Set<BlockState> blockstates) {
@@ -124,14 +156,14 @@ public final class BlockOptionalMeta {
         //noinspection ConstantConditions
         int hash = ((IItemStack) (Object) stack).getBaritoneHash();
 
-        hash -= stack.getDamageValue();
+        hash -= stack.getDamage();
 
         return stackHashes.contains(hash);
     }
 
     @Override
     public String toString() {
-        return String.format("BlockOptionalMeta{block=%s}", block);
+        return String.format("BlockOptionalMeta{block=%s,properties=%s}", block, propertiesDescription);
     }
 
     public BlockState getAnyBlockState() {
@@ -142,16 +174,24 @@ public final class BlockOptionalMeta {
         return null;
     }
 
-    public static LootTables getManager() {
+    public Set<BlockState> getAllBlockStates() {
+        return blockstates;
+    }
+
+    public Set<Integer> stackHashes() {
+        return stackHashes;
+    }
+
+    public static LootTableManager getManager() {
         if (manager == null) {
-            PackRepository rpl = new PackRepository(PackType.SERVER_DATA, new ServerPacksSource());
-            rpl.reload();
-            PackResources thePack = rpl.getAvailablePacks().iterator().next().open();
-            ReloadableResourceManager resourceManager = new SimpleReloadableResourceManager(PackType.SERVER_DATA);
-            manager = new LootTables(predicate);
-            resourceManager.registerReloadListener(manager);
+            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.reload(new ThreadPerTaskExecutor(Thread::new), new ThreadPerTaskExecutor(Thread::new), Collections.singletonList(thePack), CompletableFuture.completedFuture(Unit.INSTANCE)).get();
+                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);
             }
@@ -159,27 +199,27 @@ public final class BlockOptionalMeta {
         return manager;
     }
 
-    public static PredicateManager getPredicateManager() {
+    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 == BuiltInLootTables.EMPTY) {
+            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().get(lootTableLocation).getRandomItems(
-                        new LootContext.Builder((ServerLevel) null)
+                getManager().getLootTableFromLocation(lootTableLocation).generate(
+                        new LootContext.Builder(null)
                                 .withRandom(new Random())
-                                .withParameter(LootContextParams.ORIGIN, Vec3.atLowerCornerOf(BlockPos.ZERO))
-                                .withParameter(LootContextParams.TOOL, ItemStack.EMPTY)
-                                .withOptionalParameter(LootContextParams.BLOCK_ENTITY, null)
-                                .withParameter(LootContextParams.BLOCK_STATE, block.defaultBlockState())
-                                .create(LootContextParamSets.BLOCK),
+                                .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,67 +17,70 @@
 
 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.item.ItemStack;
+
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Stream;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
 
 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.boms = Stream.of(blocks)
+        this(Stream.of(blocks)
                 .map(BlockOptionalMeta::new)
-                .toArray(BlockOptionalMeta[]::new);
+                .toArray(BlockOptionalMeta[]::new));
+
     }
 
     public BlockOptionalMetaLookup(List<Block> blocks) {
-        this.boms = blocks.stream()
+        this(blocks.stream()
                 .map(BlockOptionalMeta::new)
-                .toArray(BlockOptionalMeta[]::new);
+                .toArray(BlockOptionalMeta[]::new));
     }
 
     public BlockOptionalMetaLookup(String... blocks) {
-        this.boms = Stream.of(blocks)
+        this(Stream.of(blocks)
                 .map(BlockOptionalMeta::new)
-                .toArray(BlockOptionalMeta[]::new);
+                .toArray(BlockOptionalMeta[]::new));
     }
 
     public boolean has(Block block) {
-        for (BlockOptionalMeta bom : boms) {
-            if (bom.getBlock() == block) {
-                return true;
-            }
-        }
-
-        return false;
+        return blockSet.contains(block);
     }
 
     public boolean has(BlockState state) {
-        for (BlockOptionalMeta bom : boms) {
-            if (bom.matches(state)) {
-                return true;
-            }
-        }
-
-        return false;
+        return blockStateSet.contains(state);
     }
 
     public boolean has(ItemStack stack) {
-        for (BlockOptionalMeta bom : boms) {
-            if (bom.matches(stack)) {
-                return true;
-            }
-        }
-
-        return false;
+        int hash = ((IItemStack) (Object) stack).getBaritoneHash();
+        hash -= stack.getDamage();
+        return stackHashes.contains(hash);
     }
 
     public List<BlockOptionalMeta> blocks() {

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

@@ -17,11 +17,12 @@
 
 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;
-import net.minecraft.core.Registry;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.block.Block;
 
 public class BlockUtils {
 
@@ -56,7 +57,7 @@ public class BlockUtils {
         if (resourceCache.containsKey(name)) {
             return null; // cached as null
         }
-        block = Registry.BLOCK.getOptional(ResourceLocation.tryParse(name.contains(":") ? name : "minecraft:" + name)).orElse(null);
+        block = Registry.BLOCK.getOptional(ResourceLocation.tryCreate(name.contains(":") ? name : "minecraft:" + name)).orElse(null);
         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/BooleanBinaryOperator.java

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

src/api/java/baritone/api/utils/BooleanBinaryOperators.java

@@ -0,0 +1,38 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.api.utils;
+
+/**
+ * @author Brady
+ */
+public enum BooleanBinaryOperators implements BooleanBinaryOperator {
+    OR((a, b) -> a || b),
+    AND((a, b) -> a && b),
+    XOR((a, b) -> a ^ b);
+
+    private final BooleanBinaryOperator op;
+
+    BooleanBinaryOperators(BooleanBinaryOperator op) {
+        this.op = op;
+    }
+
+    @Override
+    public boolean applyAsBoolean(boolean a, boolean b) {
+        return this.op.applyAsBoolean(a, b);
+    }
+}

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

@@ -18,12 +18,12 @@
 package baritone.api.utils;
 
 import baritone.api.BaritoneAPI;
-import baritone.api.utils.gui.BaritoneToast;
-import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
-import net.minecraft.network.chat.BaseComponent;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TextComponent;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.StringTextComponent;
+import net.minecraft.util.text.TextComponent;
+import net.minecraft.util.text.TextFormatting;
+
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.stream.Stream;
@@ -43,23 +43,25 @@ public interface Helper {
     Helper HELPER = new Helper() {};
 
     /**
-     * Instance of the game
+     * The main game instance returned by {@link Minecraft#getInstance()}.
+     * Deprecated since {@link IPlayerContext#minecraft()} should be used instead (In the majority of cases).
      */
+    @Deprecated
     Minecraft mc = Minecraft.getInstance();
 
-    static Component getPrefix() {
+    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;
-        BaseComponent baritone = new TextComponent(xd ? "Baritoe" : BaritoneAPI.getSettings().shortBaritonePrefix.value ? "B" : "Baritone");
-        baritone.setStyle(baritone.getStyle().withColor(ChatFormatting.LIGHT_PURPLE));
+        TextComponent baritone = new StringTextComponent(xd ? "Baritoe" : BaritoneAPI.getSettings().shortBaritonePrefix.value ? "B" : "Baritone");
+        baritone.setStyle(baritone.getStyle().setFormatting(TextFormatting.LIGHT_PURPLE));
 
         // Outer brackets
-        BaseComponent prefix = new TextComponent("");
-        prefix.setStyle(baritone.getStyle().withColor(ChatFormatting.DARK_PURPLE));
-        prefix.append("[");
+        TextComponent prefix = new StringTextComponent("");
+        prefix.setStyle(baritone.getStyle().setFormatting(TextFormatting.DARK_PURPLE));
+        prefix.appendString("[");
         prefix.append(baritone);
-        prefix.append("]");
+        prefix.appendString("]");
 
         return prefix;
     }
@@ -70,8 +72,8 @@ public interface Helper {
      * @param title   The title to display in the popup
      * @param message The message to display in the popup
      */
-    default void logToast(Component title, Component message) {
-        mc.execute(() -> BaritoneAPI.getSettings().toaster.value.accept(title, message));
+    default void logToast(ITextComponent title, ITextComponent message) {
+        Minecraft.getInstance().execute(() -> BaritoneAPI.getSettings().toaster.value.accept(title, message));
     }
 
     /**
@@ -81,7 +83,7 @@ public interface Helper {
      * @param message The message to display in the popup
      */
     default void logToast(String title, String message) {
-        logToast(new TextComponent(title), new TextComponent(message));
+        logToast(new StringTextComponent(title), new StringTextComponent(message));
     }
 
     /**
@@ -90,7 +92,7 @@ public interface Helper {
      * @param message The message to display in the popup
      */
     default void logToast(String message) {
-        logToast(Helper.getPrefix(), new TextComponent(message));
+        logToast(Helper.getPrefix(), new StringTextComponent(message));
     }
 
     /**
@@ -132,7 +134,7 @@ public interface Helper {
      * @param error   Whether to log as an error
      */
     default void logNotificationDirect(String message, boolean error) {
-        mc.execute(() -> BaritoneAPI.getSettings().notifier.value.accept(message, error));
+        Minecraft.getInstance().execute(() -> BaritoneAPI.getSettings().notifier.value.accept(message, error));
     }
 
     /**
@@ -157,15 +159,15 @@ public interface Helper {
      * @param logAsToast Whether to log as a toast notification
      * @param components The components to send
      */
-    default void logDirect(boolean logAsToast, Component... components) {
-        BaseComponent component = new TextComponent("");
+    default void logDirect(boolean logAsToast, ITextComponent... components) {
+        TextComponent component = new StringTextComponent("");
         component.append(getPrefix());
-        component.append(new TextComponent(" "));
+        component.append(new StringTextComponent(" "));
         Arrays.asList(components).forEach(component::append);
         if (logAsToast) {
             logToast(getPrefix(), component);
         } else {
-            mc.execute(() -> BaritoneAPI.getSettings().logger.value.accept(component));
+            Minecraft.getInstance().execute(() -> BaritoneAPI.getSettings().logger.value.accept(component));
         }
     }
 
@@ -174,7 +176,7 @@ public interface Helper {
      *
      * @param components The components to send
      */
-    default void logDirect(Component... components) {
+    default void logDirect(ITextComponent... components) {
         logDirect(BaritoneAPI.getSettings().logAsToast.value, components);
     }
 
@@ -186,10 +188,10 @@ public interface Helper {
      * @param color      The color to print that message in
      * @param logAsToast Whether to log as a toast notification
      */
-    default void logDirect(String message, ChatFormatting color, boolean logAsToast) {
+    default void logDirect(String message, TextFormatting color, boolean logAsToast) {
         Stream.of(message.split("\n")).forEach(line -> {
-            BaseComponent component = new TextComponent(line.replace("\t", "    "));
-            component.setStyle(component.getStyle().withColor(color));
+            TextComponent component = new StringTextComponent(line.replace("\t", "    "));
+            component.setStyle(component.getStyle().setFormatting(color));
             logDirect(logAsToast, component);
         });
     }
@@ -201,7 +203,7 @@ public interface Helper {
      * @param message The message to display in chat
      * @param color   The color to print that message in
      */
-    default void logDirect(String message, ChatFormatting color) {
+    default void logDirect(String message, TextFormatting color) {
         logDirect(message, color, BaritoneAPI.getSettings().logAsToast.value);
     }
 
@@ -213,7 +215,7 @@ public interface Helper {
      * @param logAsToast Whether to log as a toast notification
      */
     default void logDirect(String message, boolean logAsToast) {
-        logDirect(message, ChatFormatting.GRAY, logAsToast);
+        logDirect(message, TextFormatting.GRAY, logAsToast);
     }
 
     /**

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

@@ -18,18 +18,20 @@
 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.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.world.World;
+
 import java.util.Optional;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.SlabBlock;
-import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.phys.HitResult;
-import net.minecraft.world.phys.Vec3;
 
 /**
  * @author Brady
@@ -37,14 +39,16 @@ import net.minecraft.world.phys.Vec3;
  */
 public interface IPlayerContext {
 
-    LocalPlayer player();
+    Minecraft minecraft();
+
+    ClientPlayerEntity player();
 
     IPlayerController playerController();
 
-    Level world();
+    World world();
 
     default Iterable<Entity> entities() {
-        return ((ClientLevel) world()).entitiesForRendering();
+        return ((ClientWorld) world()).getAllEntities();
     }
 
     default Stream<Entity> entitiesStream() {
@@ -54,11 +58,11 @@ public interface IPlayerContext {
 
     IWorldData worldData();
 
-    HitResult objectMouseOver();
+    RayTraceResult objectMouseOver();
 
     default BetterBlockPos playerFeet() {
         // TODO find a better way to deal with soul sand!!!!!
-        BetterBlockPos feet = new BetterBlockPos(player().position().x, player().position().y + 0.1251, player().position().z);
+        BetterBlockPos feet = new BetterBlockPos(player().getPositionVec().x, player().getPositionVec().y + 0.1251, player().getPositionVec().z);
 
         // sometimes when calling this from another thread or while world is null, it'll throw a NullPointerException
         // that causes the game to immediately crash
@@ -70,23 +74,25 @@ public interface IPlayerContext {
         // 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) {
-                return feet.above();
+                return feet.up();
             }
         } catch (NullPointerException ignored) {}
 
         return feet;
     }
 
-    default Vec3 playerFeetAsVec() {
-        return new Vec3(player().position().x, player().position().y, player().position().z);
+    default Vector3d playerFeetAsVec() {
+        return new Vector3d(player().getPositionVec().x, player().getPositionVec().y, player().getPositionVec().z);
     }
 
-    default Vec3 playerHead() {
-        return new Vec3(player().position().x, player().position().y + player().getEyeHeight(), player().position().z);
+    default Vector3d playerHead() {
+        return new Vector3d(player().getPositionVec().x, player().getPositionVec().y + player().getEyeHeight(), player().getPositionVec().z);
     }
 
+    BetterBlockPos viewerPos();
+
     default Rotation playerRotations() {
-        return new Rotation(player().getYRot(), player().getXRot());
+        return new Rotation(player().rotationYaw, player().rotationPitch);
     }
 
     static double eyeHeight(boolean ifSneaking) {
@@ -99,9 +105,9 @@ public interface IPlayerContext {
      * @return The position of the highlighted block
      */
     default Optional<BlockPos> getSelectedBlock() {
-        HitResult result = objectMouseOver();
-        if (result != null && result.getType() == HitResult.Type.BLOCK) {
-            return Optional.of(((BlockHitResult) result).getBlockPos());
+        RayTraceResult result = objectMouseOver();
+        if (result != null && result.getType() == RayTraceResult.Type.BLOCK) {
+            return Optional.of(((BlockRayTraceResult) result).getPos());
         }
         return Optional.empty();
     }

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

@@ -18,16 +18,17 @@
 package baritone.api.utils;
 
 import baritone.api.BaritoneAPI;
-import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.InteractionResult;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.inventory.ClickType;
-import net.minecraft.world.level.GameType;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.inventory.container.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.math.BlockPos;
+import net.minecraft.util.math.BlockRayTraceResult;
+import net.minecraft.world.GameType;
+import net.minecraft.world.World;
 
 /**
  * @author Brady
@@ -43,13 +44,13 @@ public interface IPlayerController {
 
     void resetBlockRemoving();
 
-    void windowClick(int windowId, int slotId, int mouseButton, ClickType type, Player player);
+    ItemStack windowClick(int windowId, int slotId, int mouseButton, ClickType type, PlayerEntity player);
 
     GameType getGameType();
 
-    InteractionResult processRightClickBlock(LocalPlayer player, Level world, InteractionHand hand, BlockHitResult result);
+    ActionResultType processRightClickBlock(ClientPlayerEntity player, World world, Hand hand, BlockRayTraceResult result);
 
-    InteractionResult processRightClick(LocalPlayer player, Level world, InteractionHand hand);
+    ActionResultType processRightClick(ClientPlayerEntity player, World world, Hand hand);
 
     boolean clickBlock(BlockPos loc, Direction face);
 

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

@@ -17,10 +17,10 @@
 
 package baritone.api.utils;
 
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.ClipContext;
-import net.minecraft.world.phys.HitResult;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.math.RayTraceContext;
+import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.vector.Vector3d;
 
 /**
  * @author Brady
@@ -40,27 +40,27 @@ public final class RayTraceUtils {
      * @param blockReachDistance The block reach distance of the entity
      * @return The calculated raytrace result
      */
-    public static HitResult rayTraceTowards(Entity entity, Rotation rotation, double blockReachDistance) {
+    public static RayTraceResult rayTraceTowards(Entity entity, Rotation rotation, double blockReachDistance) {
         return rayTraceTowards(entity, rotation, blockReachDistance, false);
     }
 
-    public static HitResult rayTraceTowards(Entity entity, Rotation rotation, double blockReachDistance, boolean wouldSneak) {
-        Vec3 start;
+    public static RayTraceResult rayTraceTowards(Entity entity, Rotation rotation, double blockReachDistance, boolean wouldSneak) {
+        Vector3d start;
         if (wouldSneak) {
             start = inferSneakingEyePosition(entity);
         } else {
             start = entity.getEyePosition(1.0F); // do whatever is correct
         }
-        Vec3 direction = RotationUtils.calcVector3dFromRotation(rotation);
-        Vec3 end = start.add(
+        Vector3d direction = RotationUtils.calcVector3dFromRotation(rotation);
+        Vector3d end = start.add(
                 direction.x * blockReachDistance,
                 direction.y * blockReachDistance,
                 direction.z * blockReachDistance
         );
-        return entity.level.clip(new ClipContext(start, end, ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, entity));
+        return entity.world.rayTraceBlocks(new RayTraceContext(start, end, RayTraceContext.BlockMode.OUTLINE, RayTraceContext.FluidMode.NONE, entity));
     }
 
-    public static Vec3 inferSneakingEyePosition(Entity entity) {
-        return new Vec3(entity.getX(), entity.getY() + IPlayerContext.eyeHeight(true), entity.getZ());
+    public static Vector3d inferSneakingEyePosition(Entity entity) {
+        return new Vector3d(entity.getPosX(), entity.getPosY() + IPlayerContext.eyeHeight(true), entity.getPosZ());
     }
 }

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

@@ -26,12 +26,12 @@ public class Rotation {
     /**
      * The yaw angle of this Rotation
      */
-    private float yaw;
+    private final float yaw;
 
     /**
      * The pitch angle of this Rotation
      */
-    private float pitch;
+    private final float pitch;
 
     public Rotation(float yaw, float pitch) {
         this.yaw = yaw;
@@ -113,6 +113,10 @@ public class Rotation {
         );
     }
 
+    public Rotation withPitch(float pitch) {
+        return new Rotation(this.yaw, pitch);
+    }
+
     /**
      * Is really close to
      *