deprecate 1.16.5

v1.6.5
Merge pull request #4028 from ZacSharp/1.16.5-update
2023-08-14 13:40:28 -07:00 · 2023-08-14 13:34:38 -07:00 · 2023-07-05 11:47:27 -07:00 · 2023-07-04 16:48:41 +02:00 · 2023-07-04 16:48:36 +02:00 · 2023-07-04 16:48:31 +02:00
245 changed files with 5962 additions and 3607 deletions
--- a/.github/workflows/gradle_build.yml
+++ b/.github/workflows/gradle_build.yml
@@ -14,21 +14,23 @@ jobs:

    steps:
    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Set up JDK 17
+    - name: Set up JDK 8
      uses: actions/setup-java@v3
      with:
-        java-version: '17'
+        java-version: '8'
        distribution: 'temurin'
-        cache: gradle
-
+        
    - name: Grant execute permission for gradlew
      run: chmod +x gradlew
      
    - name: Build with Gradle
-      run: ./gradlew build -Pmod_version="$(git describe --always --tags | cut -c2-)"
+      run: ./gradlew build
+      
+    - name: Build (fabric) with Gradle
+      run: ./gradlew build -Pbaritone.fabric_build
+
+    - name: Build (forge) with Gradle
+      run: ./gradlew build -Pbaritone.forge_build

    - name: Archive Artifacts
      uses: actions/upload-artifact@v3
@@ -40,4 +42,4 @@ jobs:
      uses: actions/upload-artifact@v3
      with:
        name: Mappings
-        path: mapping/
+        path: build/tmp/proguard/mapping.txt
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -12,10 +12,10 @@ jobs:

    steps:
    - uses: actions/checkout@v3
-    - name: Set up JDK 17
+    - name: Set up JDK 8
      uses: actions/setup-java@v3
      with:
-        java-version: '17'
+        java-version: '8'
        distribution: 'temurin'
        
    - name: Grant execute permission for gradlew
@@ -23,4 +23,4 @@ jobs:
      
    - name: Executing tests
      run: ./gradlew test
-
+    
--- a/.gitignore
+++ b/.gitignore
@@ -21,9 +21,6 @@ classes/
 *.iws
 /logs/

-tweaker/logs/
-common/logs/
-
 # Eclipse Files
 .classpath
 .project
@@ -35,6 +32,4 @@ baritone_Client.launch
 !/.idea/copyright/profiles_settings.xml

 .vscode/launch.json
-.architectury-transformer

-mapping
--- a/6
+++ b/6
@@ -1,11 +1,11 @@
-FROM ubuntu:focal
+FROM debian:stretch

 ENV DEBIAN_FRONTEND noninteractive

 RUN apt update -y

 RUN apt install \
-          openjdk-17-jdk \
+          openjdk-8-jdk \
          --assume-yes

 COPY . /code
@@ -13,3 +13,5 @@ COPY . /code
 WORKDIR /code

 RUN ./gradlew build
+RUN ./gradlew build -Pbaritone.forge_build
+RUN ./gradlew build -Pbaritone.fabric_build
--- a/README.md
+++ b/README.md
@@ -1,129 +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">
-  <a href="https://github.com/cabaletta/baritone/tree/master"><img src="https://img.shields.io/badge/MC-1.12.2-brightgreen.svg" alt="Minecraft"/></a>
-  <a href="https://github.com/cabaletta/baritone/tree/1.13.2"><img src="https://img.shields.io/badge/MC-1.13.2-yellow.svg" alt="Minecraft"/></a>
-  <a href="https://github.com/cabaletta/baritone/tree/1.14.4"><img src="https://img.shields.io/badge/MC-1.14.4-yellow.svg" alt="Minecraft"/></a>
-  <a href="https://github.com/cabaletta/baritone/tree/1.15.2"><img src="https://img.shields.io/badge/MC-1.15.2-yellow.svg" alt="Minecraft"/></a>
-  <a href="https://github.com/cabaletta/baritone/tree/1.16.5"><img src="https://img.shields.io/badge/MC-1.16.5-brightgreen.svg" alt="Minecraft"/></a>
-  <a href="https://github.com/cabaletta/baritone/tree/1.17.1"><img src="https://img.shields.io/badge/MC-1.17.1-brightgreen.svg" alt="Minecraft"/></a>
-  <a href="https://github.com/cabaletta/baritone/tree/1.18.2"><img src="https://img.shields.io/badge/MC-1.18.2-brightgreen.svg" alt="Minecraft"/></a>
-</p>
-
-<p align="center">
-  <a href="https://travis-ci.com/cabaletta/baritone/"><img src="https://travis-ci.com/cabaletta/baritone.svg?branch=master" alt="Build Status"/></a>
-  <a href="https://github.com/cabaletta/baritone/releases/"><img src="https://img.shields.io/github/release/cabaletta/baritone.svg" alt="Release"/></a>
-  <a href="LICENSE"><img src="https://img.shields.io/badge/license-LGPL--3.0%20with%20anime%20exception-green.svg" alt="License"/></a>
-  <a href="https://www.codacy.com/gh/cabaletta/baritone/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=cabaletta/baritone&amp;utm_campaign=Badge_Grade"><img src="https://app.codacy.com/project/badge/Grade/cadab857dab049438b6e28b3cfc5570e" alt="Codacy Badge"/></a>
-  <a href="https://github.com/cabaletta/baritone/blob/master/CODE_OF_CONDUCT.md"><img src="https://img.shields.io/badge/%E2%9D%A4-code%20of%20conduct-blue.svg?style=flat" alt="Code of Conduct"/></a>
-  <a href="https://snyk.io/test/github/cabaletta/baritone?targetFile=build.gradle"><img src="https://snyk.io/test/github/cabaletta/baritone/badge.svg?targetFile=build.gradle" alt="Known Vulnerabilities"/></a>
-  <a href="https://github.com/cabaletta/baritone/issues/"><img src="https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat" alt="Contributions welcome"/></a>
-  <a href="https://github.com/cabaletta/baritone/issues/"><img src="https://img.shields.io/github/issues/cabaletta/baritone.svg" alt="Issues"/></a>
-  <a href="https://github.com/cabaletta/baritone/issues?q=is%3Aissue+is%3Aclosed"><img src="https://img.shields.io/github/issues-closed/cabaletta/baritone.svg" alt="GitHub issues-closed"/></a>
-  <a href="https://github.com/cabaletta/baritone/pulls/"><img src="https://img.shields.io/github/issues-pr/cabaletta/baritone.svg" alt="Pull Requests"/></a>
-  <a href="https://github.com/cabaletta/baritone/graphs/contributors/"><img src="https://img.shields.io/github/contributors/cabaletta/baritone.svg" alt="GitHub contributors"/></a>
-  <a href="https://github.com/cabaletta/baritone/commit/"><img src="https://img.shields.io/github/commits-since/cabaletta/baritone/v1.0.0.svg" alt="GitHub commits"/></a>
-  <img src="https://img.shields.io/github/languages/code-size/cabaletta/baritone.svg" alt="Code size"/>
-  <img src="https://img.shields.io/github/repo-size/cabaletta/baritone.svg" alt="GitHub repo size"/>
-  <img src="https://tokei.rs/b1/github/cabaletta/baritone?category=code" alt="Lines of Code"/>
-</p>
-
-<p align="center">
-  <a href="https://impactclient.net/"><img src="https://img.shields.io/badge/Impact%20integration-v1.2.14%20/%20v1.3.8%20/%20v1.4.6%20/%20v1.5.3%20/%20v1.6.3-brightgreen.svg" alt="Impact integration"/></a>
-  <a href="https://github.com/kami-blue/client"><img src="https://img.shields.io/badge/KAMI%20Blue%20integration-v1.2.14--master-green" alt="KAMI Blue integration"/></a>
-  <a href="https://github.com/fr1kin/ForgeHax/"><img src="https://img.shields.io/badge/ForgeHax%20%22integration%22-scuffed-yellow.svg" alt="ForgeHax integration"/></a>
-  <a href="https://aristois.net/"><img src="https://img.shields.io/badge/Aristois%20add--on%20integration-v1.6.3-green.svg" alt="Aristois add-on integration"/></a>
-  <a href="https://rootnet.dev/"><img src="https://img.shields.io/badge/rootNET%20integration-v1.2.14-green.svg" alt="rootNET integration"/></a>
-  <a href="https://futureclient.net/"><img src="https://img.shields.io/badge/Future%20integration-v1.2.12%20%2F%20v1.3.6%20%2F%20v1.4.4-red" alt="Future integration"/></a>
-  <a href="https://rusherhack.org/"><img src="https://img.shields.io/badge/RusherHack%20integration-v1.2.14-green" alt="RusherHack integration"/></a>
-</p>
-
-<p align="center">
-  <a href="http://forthebadge.com/"><img src="https://forthebadge.com/images/badges/built-with-swag.svg" alt="forthebadge"/></a>
-  <a href="http://forthebadge.com/"><img src="https://forthebadge.com/images/badges/mom-made-pizza-rolls.svg" alt="forthebadge"/></a>
-</p>
-
-A Minecraft pathfinder bot.
-
-[**Baritone Discord Server**](http://discord.gg/s6fRBAUpmr)
-
-Baritone is the pathfinding system used in [Impact](https://impactclient.net/) since 4.4. There's a [showcase video](https://youtu.be/CZkLXWo4Fg4) made by @Adovin#0730 on Baritone which I recommend. [Here's](https://www.youtube.com/watch?v=StquF69-_wI) a (very old!) video I made showing off what it can do.
-
-[Tutorial playlist](https://www.youtube.com/playlist?list=PLnwnJ1qsS7CoQl9Si-RTluuzCo_4Oulpa)
-
-The easiest way to install Baritone is to install [Impact](https://impactclient.net/), which comes with Baritone. The second easiest way (for 1.12.2 only) is to 
-install the v1.2.* `api-forge` jar from [releases](https://github.com/cabaletta/baritone/releases). **For 1.12.2 Forge, just click 
-[here](https://github.com/cabaletta/baritone/releases/download/v1.2.17/baritone-api-forge-1.2.17.jar)**. Otherwise, see [Installation & setup](SETUP.md). Once Baritone is installed, look [here](USAGE.md) for instructions on how to use it.
-
-For 1.16.5, [click here](https://www.youtube.com/watch?v=_4eVJ9Qz2J8) and see description. If you need Forge or Fabric 1.16.5, look [here](https://github.com/cabaletta/baritone/releases/tag/v1.6.3) and get the `api-forge` or `api-fabric` jar. **For 1.16.5 Fabric, just click [here](https://github.com/cabaletta/baritone/releases/download/v1.6.3/baritone-api-fabric-1.6.3.jar)**.
-
-If you need Forge or Fabric 1.17.1, look [here](https://github.com/cabaletta/baritone/releases/tag/v1.7.2) and get the `api-forge` or `api-fabric` jar. **For 1.17.1 Fabric, just click [here](https://github.com/cabaletta/baritone/releases/download/v1.7.2/baritone-api-fabric-1.7.2.jar)**.
-
-If you need Forge or Fabric 1.18.2, look [here](https://github.com/cabaletta/baritone/releases/tag/v1.8.3) and get the `api-forge` or `api-fabric` jar. **For 1.18.2 Fabric, just click [here](https://github.com/cabaletta/baritone/releases/download/v1.8.3/baritone-api-fabric-1.8.3.jar)**. **For 1.18.2 Forge, just click [here](https://github.com/cabaletta/baritone/releases/download/v1.8.3/baritone-api-forge-1.8.3.jar)**.
-
-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.
-
-```java
-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.
--- a/SETUP.md
+++ b/SETUP.md
@@ -43,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 for 1.12.2-1.16.5, JDK 16 for 1.17.1, and JDK 17 for 1.18.1.
+If you have errors with a package missing please make sure you have setup your environment, and are using Oracle JDK 8 for 1.12.2-1.16.5, JDK 16+ for 1.17.1, and JDK 17+ for 1.18.1.

 To check which java you are using do 
 `java -version` in a command prompt or terminal.
 If you are using anything above OpenJDK 8 for 1.12.2-1.16.5, it might not work because the Java distributions above JDK 8 using may not have the needed javax classes.

-Open JDK download: https://openjdk.java.net/install/
+Download java: https://adoptium.net/
 #### macOS guide
 In order to get JDK 8, Try running the following command:
 `% /usr/libexec/java_home -V`
@@ -66,68 +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
-```
-
-Do this instead for Fabric jars:
-
-```
-$ gradlew build -Pbaritone.fabric_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
--- a/build.gradle
+++ b/build.gradle
@@ -15,89 +15,73 @@
 * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
 */

-allprojects {
-    apply plugin: 'java'
-    apply plugin: "xyz.wagyourtail.unimined"
-    apply plugin: "maven-publish"
-
-    archivesBaseName = rootProject.archives_base_name
-    def vers = 'git describe --always --tags --dirty'.execute().text.trim()
-    if (!vers.startsWith("v")) {
-        println "git doesn't appear to be installed!"
-        println "using version number: " + rootProject.mod_version
-        version = rootProject.mod_version
-    } else {
-        version = vers.substring(1)
-    }
-    group = rootProject.maven_group
-
-    sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
+group 'baritone'
+version '1.6.5'

+buildscript {
    repositories {
        maven {
-            name = 'spongepowered-repo'
-            url = 'https://repo.spongepowered.org/repository/maven-public/'
-        }
-        maven {
-            name = 'fabric-maven'
-            url = 'https://maven.fabricmc.net/'
+            name = 'forge'
+            url = 'http://files.minecraftforge.net/maven'
        }
        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/'
        }
-        // for the newer version of launchwrapper
        maven {
-            name = "multimc-maven"
-            url = "https://files.multimc.org/maven/"
-            metadataSources {
-                artifact()
-            }
+            url = 'https://maven.fabricmc.net/'
+        }
+        maven {
+            url = 'https://libraries.minecraft.net/'
        }
        mavenCentral()
+        jcenter()
    }

    dependencies {
-        minecraft "net.minecraft:minecraft:${rootProject.minecraft_version}"
-        // The following line declares the mojmap mappings, you may use other mappings as well
-        mappings "net.fabricmc:intermediary:${rootProject.minecraft_version}:v2"
-        mappings "net.minecraft:minecraft:${rootProject.minecraft_version}:client-mappings"
-        mappings "org.parchmentmc.data:parchment-1.19.2:2022.11.27@zip"
-
-        implementation "org.spongepowered:mixin:0.8.5"
-        implementation "org.ow2.asm:asm:9.3"
-        // The following line declares the yarn mappings you may select this one as well.
-        // mappings "net.fabricmc:yarn:1.17.1+build.32:v2"
-    }
-
-    tasks.withType(JavaCompile).configureEach {
-        it.options.encoding = "UTF-8"
-
-        def targetVersion = 17
-        if (JavaVersion.current().isJava9Compatible()) {
-            it.options.release = targetVersion
-        }
+        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'
    }
 }

-minecraft {
-    runs.off = true
+
+import baritone.gradle.fabric.CreateVolderYarn
+import baritone.gradle.task.CreateDistTask
+import baritone.gradle.task.ProguardTask
+import net.minecraftforge.gradle.userdev.tasks.RenameJarInPlace
+import org.apache.tools.ant.taskdefs.condition.Os
+
+apply plugin: 'java'
+apply plugin: 'maven'
+
+def mcpVersion = [channel: 'snapshot', version: '20201028-1.16.3']
+
+if (getProject().hasProperty("baritone.fabric_build")) {
+    CreateVolderYarn.genMappings("1.16.5", mcpVersion)
+    apply plugin: 'fabric-loom'
+} else {
+    apply plugin: 'net.minecraftforge.gradle'
+    apply plugin: 'org.spongepowered.mixin'
+}
+
+
+sourceCompatibility = targetCompatibility = '1.8'
+compileJava {
+    sourceCompatibility = targetCompatibility = '1.8'
+    options.encoding = "UTF-8" // allow emoji in comments :^)
 }

-archivesBaseName = archivesBaseName + "-common"

 sourceSets {
    api {
        compileClasspath += main.compileClasspath
-        runtimeClasspath += main.runtimeClasspath
    }
    main {
        compileClasspath += api.output
-        runtimeClasspath += api.output
    }
    test {
        compileClasspath += main.compileClasspath + main.runtimeClasspath + main.output
@@ -107,27 +91,124 @@ sourceSets {
        compileClasspath += main.compileClasspath + main.runtimeClasspath + main.output
        runtimeClasspath += main.compileClasspath + main.runtimeClasspath + main.output
    }
+
    schematica_api {
        compileClasspath += main.compileClasspath
-        runtimeClasspath += main.runtimeClasspath
    }
+
    main {
        compileClasspath += schematica_api.output
-        runtimeClasspath += schematica_api.output
+    }
+}
+
+task sourceJar(type: Jar, dependsOn: classes) {
+    classifier = 'sources'
+    from sourceSets.api.allSource
+}
+if (getProject().hasProperty("baritone.fabric_build")) {
+    minecraft.refmapName = "mixins.baritone.refmap.json"
+} else {
+    minecraft {
+        mappings mcpVersion
+
+        if (getProject().hasProperty("baritone.forge_build")) {
+            reobfMappings 'searge'
+        } else {
+            reobfMappings 'notch'
+        }
+
+        runs {
+            client {
+                workingDirectory project.file('run')
+                source sourceSets.launch
+
+                main 'baritone.launch.LaunchTesting'
+
+                environment 'assetIndex', '{asset_index}'
+                environment 'assetDirectory', downloadAssets.output
+                environment 'nativesDirectory', extractNatives.output
+
+                environment 'tweakClass', 'baritone.launch.BaritoneTweaker'
+
+                if (Os.isFamily(Os.FAMILY_MAC)) {
+                    jvmArgs "-XstartOnFirstThread"
+                }
+            }
+
+            autoTest {
+                workingDirectory project.file('autotest')
+                source sourceSets.launch
+
+                main 'baritone.launch.LaunchTesting'
+
+                environment 'assetIndex', '{asset_index}'
+                environment 'assetDirectory', downloadAssets.output
+                environment 'nativesDirectory', extractNatives.output
+
+                environment 'tweakClass', 'baritone.launch.BaritoneTweaker'
+                environment 'BARITONE_AUTO_TEST', 'true'
+
+                if (Os.isFamily(Os.FAMILY_MAC)) {
+                    jvmArgs "-XstartOnFirstThread"
+                }
+            }
+        }
+    }
+
+    mixin {
+        defaultObfuscationEnv searge
+        add sourceSets.launch, 'mixins.baritone.refmap.json'
+    }
+}
+
+repositories {
+    mavenCentral()
+
+    maven {
+        name = 'SpongePowered'
+        url = 'https://repo.spongepowered.org/repository/maven-public/'
+    }
+    maven {
+        name = 'impactdevelopment-repo'
+        url = 'https://impactdevelopment.github.io/maven/'
+    }
+    maven {
+        url = 'https://www.dogforce-games.com/maven/'
    }
 }

 dependencies {
-    testImplementation 'junit:junit:4.13.2'
-}
+    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"

-jar {
-    from sourceSets.main.output, sourceSets.launch.output, sourceSets.api.output
-}
+        // 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'
+        }

-remapJar {
-    targetNamespace = "named"
-    fallbackTargetNamespace = "intermediary"
+        implementation 'com.google.code.findbugs:jsr305:3.0.2'
+    } else {
+        minecraft 'com.github.ImpactDevelopment:Vanilla:1.16.5'
+
+        runtime launchCompile('net.minecraft:launchwrapper:1.12') {
+            exclude module: 'lwjgl'
+        }
+        runtime launchCompile('org.ow2.asm:asm-debug-all:5.2')
+        runtime launchCompile('com.github.ImpactDevelopment:SimpleTweaker:1.2')
+        runtime launchCompile('org.spongepowered:mixin:0.8.3') {
+            // Mixin includes a lot of dependencies that are too up-to-date
+            exclude module: 'launchwrapper'
+            exclude module: 'guava'
+            exclude module: 'gson'
+            exclude module: 'commons-io'
+            exclude module: 'log4j-core'
+        }
+    }
+
+    testImplementation 'junit:junit:4.12'
 }

 javadoc {
@@ -136,4 +217,145 @@ javadoc {
    options.encoding "UTF-8" // allow emoji in comments :^)
    source = sourceSets.api.allJava
    classpath += sourceSets.api.compileClasspath
-}
+}
+
+if (getProject().hasProperty("baritone.fabric_build")) {
+    // skidded from fabric-example-mod (comments and all)
+    tasks.withType(JavaCompile).configureEach {
+        // ensure that the encoding is set to UTF-8, no matter what the system default is
+        // this fixes some edge cases with special characters not displaying correctly
+        // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+        // If Javadoc is generated, this must be specified in that task too.
+        it.options.encoding = "UTF-8"
+
+        // The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
+        // JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
+        // We'll use that if it's available, but otherwise we'll use the older option.
+        def targetVersion = 8
+        if (JavaVersion.current().isJava9Compatible()) {
+            it.options.release = targetVersion
+        }
+    }
+}
+
+jar {
+    from sourceSets.launch.output, sourceSets.api.output
+
+    if (!getProject().hasProperty("baritone.forge_build")) {
+        exclude "**/BaritoneForgeModXD.class"
+        exclude "**/mods.toml"
+    }
+
+    preserveFileTimestamps = false
+    reproducibleFileOrder = true
+
+    if (getProject().hasProperty("baritone.fabric_build")) {
+        filesMatching("fabric.mod.json") {
+            expand "version": version
+        }
+    } else {
+        exclude("fabric.mod.json")
+    }
+
+
+    manifest {
+        attributes(
+                'MixinConfigs': 'mixins.baritone.json',
+                "MixinConnector": "baritone.launch.BaritoneMixinConnector",
+
+                'Implementation-Title': 'Baritone',
+                'Implementation-Version': version,
+        )
+    }
+}
+
+// skidded from ProguardTask
+File getClientJar() {
+    return project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("launch").getRuntimeClasspath().getFiles()
+            .stream()
+            .filter({ f -> f.toString().endsWith("client-extra.jar") })
+            .map({ f -> new File(f.getParentFile(), "client.jar") })
+            .findFirst()
+            .get()
+}
+
+File getClientJarFabric() {
+    return project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("launch").getRuntimeClasspath().getFiles()
+            .stream()
+            .filter({ f -> f.getName().endsWith("-v2.jar") && f.getName().startsWith("minecraft-") })
+            .map({ f -> new File(f.getParentFile().getParentFile(), f.getName().toString().replace("mapped", "intermediary")) })
+            .findFirst()
+            .get()
+}
+
+if (getProject().hasProperty("baritone.fabric_build")) {
+    task copyMcJar(type: Copy) {
+        def mcJar = { getClientJarFabric() }
+
+        from mcJar
+        into 'build/createMcIntermediaryJar/'
+        rename { 'client.jar' }
+    }
+
+    task proguard(type: ProguardTask, dependsOn: copyMcJar) {
+        url 'https://downloads.sourceforge.net/project/proguard/proguard/6.0/proguard6.0.3.zip'
+        extract 'proguard6.0.3/lib/proguard.jar'
+    }
+
+    task createDist(type: CreateDistTask, dependsOn: proguard)
+
+} else {
+    task copyMcJar(type: Copy) {
+        def mcJar = { getClientJar() }
+
+        from mcJar
+        into 'build/createMcSrgJar/'
+        rename { 'client-srg.jar' }
+    }
+
+    task createSrgMc(type: RenameJarInPlace) {
+        setInput(new File(copyMcJar.getOutputs().getFiles().getSingleFile(), "client-srg.jar"))
+        setClasspath(files({ getClientJar() }))
+
+        // fork
+        setMappingType(net.minecraftforge.gradle.common.util.MappingFile.Mapping.SEARGE)
+        setJarTask('trans alaska pipeline')
+    }
+
+    project.afterEvaluate {
+        createSrgMc.dependsOn(extractSrg, copyMcJar)
+        createSrgMc.setMappings(extractSrg.getOutput())
+    }
+
+
+    task proguard(type: ProguardTask, dependsOn: createSrgMc) { // TODO: dont need to create srg mc if doing notch build
+        url 'https://downloads.sourceforge.net/project/proguard/proguard/6.0/proguard6.0.3.zip'
+        extract 'proguard6.0.3/lib/proguard.jar'
+    }
+
+    task createDist(type: CreateDistTask, dependsOn: proguard)
+
+}
+build.finalizedBy(createDist)
+
+install {
+    def jarApiName = String.format("%s-api-%s", rootProject.name, version.toString())
+    def jarApiForgeName = String.format("%s-api-forge-%s", rootProject.name, version.toString())
+    def jarSAName = String.format("%s-standalone-%s", rootProject.name, version.toString())
+    def jarSAForgeName = String.format("%s-standalone-forge-%s", rootProject.name, version.toString())
+
+    artifacts {
+        archives file("$buildDir/libs/"+jarApiName+".jar")
+        archives file("$buildDir/libs/"+jarApiForgeName+".jar")
+        archives file("$buildDir/libs/"+jarSAName+".jar")
+        archives file("$buildDir/libs/"+jarSAForgeName+".jar")
+    }
+    repositories.mavenInstaller {
+		addFilter('api') { artifact, file -> artifact.name == "baritone-api" }
+		addFilter('api-forge') { artifact, file -> artifact.name == "baritone-api-forge" }
+		addFilter('standalone') { artifact, file -> artifact.name == "baritone-standalone" }
+		addFilter('standalone-forge') { artifact, file -> artifact.name == "baritone-standalone-forge" }
+    }
+}
+
+install.dependsOn(build)
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -16,25 +16,10 @@
 */

 repositories {
-    mavenLocal()
-    maven {
-        name = 'WagYourMaven'
-        url = 'https://maven.wagyourtail.xyz/releases'
-    }
-    maven {
-        name = 'ForgeMaven'
-        url = 'https://maven.minecraftforge.net/'
-    }
-    maven {
-        name = 'FabricMaven'
-        url = 'https://maven.fabricmc.net/'
-    }
    mavenCentral()
 }

 dependencies {
-    implementation group: 'com.google.code.gson', name: 'gson', version: '2.9.0'
-    implementation group: 'commons-io', name: 'commons-io', version: '2.6'
-
-    implementation group: 'xyz.wagyourtail.unimined', name: 'xyz.wagyourtail.unimined.gradle.plugin', version: '0.3.4'
+    compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
+    compile group: 'commons-io', name: 'commons-io', version: '2.6'
 }
--- a/buildSrc/src/main/java/baritone/gradle/fabric/CreateVolderYarn.java
+++ b/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<>();
+    }
+}
--- a/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java
+++ b/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java
@@ -18,9 +18,6 @@
 package baritone.gradle.task;

 import org.gradle.api.DefaultTask;
-import org.gradle.api.tasks.Input;
-import org.gradle.api.tasks.Optional;
-import org.gradle.api.tasks.TaskAction;

 import java.io.File;
 import java.io.IOException;
@@ -43,56 +40,50 @@ class BaritoneGradleTask extends DefaultTask {
            PROGUARD_API_CONFIG             = "api.pro",
            PROGUARD_STANDALONE_CONFIG      = "standalone.pro",
            PROGUARD_EXPORT_PATH            = "proguard_out.jar",
-            PROGUARD_MAPPING_DIR            = "mapping",

            ARTIFACT_STANDARD           = "%s-%s.jar",
            ARTIFACT_UNOPTIMIZED        = "%s-unoptimized-%s.jar",
            ARTIFACT_API                = "%s-api-%s.jar",
-            ARTIFACT_STANDALONE         = "%s-standalone-%s.jar";
+            ARTIFACT_STANDALONE         = "%s-standalone-%s.jar",
+            ARTIFACT_FORGE_UNOPTIMIZED  = "%s-unoptimized-forge-%s.jar",
+            ARTIFACT_FORGE_API          = "%s-api-forge-%s.jar",
+            ARTIFACT_FORGE_STANDALONE   = "%s-standalone-forge-%s.jar",
+            ARTIFACT_FABRIC_UNOPTIMIZED = "%s-unoptimized-fabric-%s.jar",
+            ARTIFACT_FABRIC_API         = "%s-api-fabric-%s.jar",
+            ARTIFACT_FABRIC_STANDALONE  = "%s-standalone-fabric-%s.jar";

    protected String artifactName, artifactVersion;
-    protected Path
+    protected final Path
        artifactPath,
        artifactUnoptimizedPath, artifactApiPath, artifactStandalonePath, // these are different for forge builds
        proguardOut;

-
-    @Input
-    @Optional
-    protected String compType = null;
-
-    public String getCompType() {
-        return compType;
-    }
-
-    public void setCompType(String compType) {
-        this.compType = compType;
-    }
-
-
    public BaritoneGradleTask() {
-        this.artifactName = getProject().getRootProject().getProperties().get("archives_base_name").toString();
-    }
-
-    public void doFirst() {
-        if (compType != null) {
-            this.artifactVersion = compType + "-" + getProject().getVersion();
-        } else {
-            this.artifactVersion = getProject().getVersion().toString();
-        }
+        this.artifactName = getProject().getName();
+        this.artifactVersion = getProject().getVersion().toString();

        this.artifactPath = this.getBuildFile(formatVersion(ARTIFACT_STANDARD));

-        this.artifactUnoptimizedPath = this.getBuildFile(formatVersion(ARTIFACT_UNOPTIMIZED));
-        this.artifactApiPath         = this.getBuildFile(formatVersion(ARTIFACT_API));
-        this.artifactStandalonePath  = this.getBuildFile(formatVersion(ARTIFACT_STANDALONE));
+        if (getProject().hasProperty("baritone.forge_build")) {
+            this.artifactUnoptimizedPath = this.getBuildFile(formatVersion(ARTIFACT_FORGE_UNOPTIMIZED));
+            this.artifactApiPath         = this.getBuildFile(formatVersion(ARTIFACT_FORGE_API));
+            this.artifactStandalonePath  = this.getBuildFile(formatVersion(ARTIFACT_FORGE_STANDALONE));
+        } else if (getProject().hasProperty("baritone.fabric_build")) {
+            this.artifactUnoptimizedPath = this.getBuildFile(formatVersion(ARTIFACT_FABRIC_UNOPTIMIZED));
+            this.artifactApiPath         = this.getBuildFile(formatVersion(ARTIFACT_FABRIC_API));
+            this.artifactStandalonePath  = this.getBuildFile(formatVersion(ARTIFACT_FABRIC_STANDALONE));
+        } else {
+            this.artifactUnoptimizedPath = this.getBuildFile(formatVersion(ARTIFACT_UNOPTIMIZED));
+            this.artifactApiPath         = this.getBuildFile(formatVersion(ARTIFACT_API));
+            this.artifactStandalonePath  = this.getBuildFile(formatVersion(ARTIFACT_STANDALONE));
+        }

        this.proguardOut = this.getTemporaryFile(PROGUARD_EXPORT_PATH);
    }

    protected void verifyArtifacts() throws IllegalStateException {
        if (!Files.exists(this.artifactPath)) {
-            throw new IllegalStateException("Artifact not found! Run build first! Missing file: " + this.artifactPath);
+            throw new IllegalStateException("Artifact not found! Run build first!");
        }
    }

@@ -108,11 +99,7 @@ class BaritoneGradleTask extends DefaultTask {
    }

    protected Path getRelativeFile(String file) {
-        return Paths.get(new File(getProject().getBuildDir(), file).getAbsolutePath());
-    }
-
-    protected Path getRootRelativeFile(String file) {
-        return Paths.get(new File(getProject().getRootDir(), file).getAbsolutePath());
+        return Paths.get(new File(file).getAbsolutePath());
    }

    protected Path getTemporaryFile(String file) {
@@ -120,10 +107,6 @@ class BaritoneGradleTask extends DefaultTask {
    }

    protected Path getBuildFile(String file) {
-        return getRelativeFile("libs/" + file);
-    }
-
-    protected String addCompTypeFirst(String string) {
-        return compType == null ? string : compType + "-" + string;
+        return getRelativeFile("build/libs/" + file);
    }
 }
--- a/buildSrc/src/main/java/baritone/gradle/task/CreateDistTask.java
+++ b/buildSrc/src/main/java/baritone/gradle/task/CreateDistTask.java
@@ -19,11 +19,9 @@ 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.OpenOption;
 import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
 import java.security.MessageDigest;
 import java.util.Arrays;
 import java.util.List;
@@ -41,16 +39,15 @@ public class CreateDistTask extends BaritoneGradleTask {

    @TaskAction
    protected void exec() throws Exception {
-        super.doFirst();
        super.verifyArtifacts();

        // Define the distribution file paths
-        Path api = getRootRelativeFile("dist/" + getFileName(artifactApiPath));
-        Path standalone = getRootRelativeFile("dist/" + getFileName(artifactStandalonePath));
-        Path unoptimized = getRootRelativeFile("dist/" + getFileName(artifactUnoptimizedPath));
+        Path api = getRelativeFile("dist/" + getFileName(artifactApiPath));
+        Path standalone = getRelativeFile("dist/" + getFileName(artifactStandalonePath));
+        Path unoptimized = getRelativeFile("dist/" + getFileName(artifactUnoptimizedPath));

        // NIO will not automatically create directories
-        Path dir = getRootRelativeFile("dist/");
+        Path dir = getRelativeFile("dist/");
        if (!Files.exists(dir)) {
            Files.createDirectory(dir);
        }
@@ -62,42 +59,44 @@ public class CreateDistTask extends BaritoneGradleTask {
        Files.copy(this.artifactUnoptimizedPath, unoptimized, REPLACE_EXISTING);

        // Calculate all checksums and format them like "shasum"
-        List<String> shasum = Files.list(getRootRelativeFile("dist/"))
-                .filter(e -> e.getFileName().toString().endsWith(".jar"))
+        List<String> shasum = getAllDistJars().stream()
+                .filter(Files::exists)
                .map(path -> sha1(path) + "  " + path.getFileName().toString())
                .collect(Collectors.toList());

        shasum.forEach(System.out::println);

        // Write the checksums to a file
-        Files.write(getRootRelativeFile("dist/checksums.txt"), shasum);
+        Files.write(getRelativeFile("dist/checksums.txt"), shasum);
    }

    private static String getFileName(Path p) {
        return p.getFileName().toString();
    }

+    private List<Path> getAllDistJars() {
+        return Arrays.asList(
+                getRelativeFile("dist/" + formatVersion(ARTIFACT_API)),
+                getRelativeFile("dist/" + formatVersion(ARTIFACT_FABRIC_API)),
+                getRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_API)),
+                getRelativeFile("dist/" + formatVersion(ARTIFACT_STANDALONE)),
+                getRelativeFile("dist/" + formatVersion(ARTIFACT_FABRIC_STANDALONE)),
+                getRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_STANDALONE)),
+                getRelativeFile("dist/" + formatVersion(ARTIFACT_UNOPTIMIZED)),
+                getRelativeFile("dist/" + formatVersion(ARTIFACT_FABRIC_UNOPTIMIZED)),
+                getRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_UNOPTIMIZED))
+        );
+    }
+
    private static synchronized String sha1(Path path) {
        try {
            if (SHA1_DIGEST == null) {
                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);
-    }
 }
--- a/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java
+++ b/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java
@@ -22,16 +22,23 @@ 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 xyz.wagyourtail.unimined.api.Constants;
-import xyz.wagyourtail.unimined.api.minecraft.EnvType;
-import xyz.wagyourtail.unimined.api.minecraft.MinecraftProvider;
+import org.gradle.internal.jvm.inspection.DefaultJvmVersionDetector;
+import org.gradle.process.internal.DefaultExecActionFactory;

 import java.io.*;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -52,20 +59,11 @@ public class ProguardTask extends BaritoneGradleTask {
    @Input
    private String url;

-    public String getUrl() {
-        return url;
-    }
-
    @Input
    private String extract;

-    public String getExtract() {
-        return extract;
-    }
-
    @TaskAction
    protected void exec() throws Exception {
-        super.doFirst();
        super.verifyArtifacts();

        // "Haha brady why don't you make separate tasks"
@@ -78,16 +76,6 @@ public class ProguardTask extends BaritoneGradleTask {
        cleanup();
    }

-    MinecraftProvider<?, ?> provider = this.getProject().getExtensions().getByType(MinecraftProvider.class);
-
-    private File getMcJar() {
-        return provider.getMinecraftWithMapping(EnvType.COMBINED, provider.getMcPatcher().getProdNamespace(), provider.getMcPatcher().getProdFallbackNamespace()).toFile();
-    }
-
-    private boolean isMcJar(File f) {
-        return this.getProject().getConfigurations().getByName(Constants.MINECRAFT_COMBINED_PROVIDER).getFiles().contains(f);
-    }
-
    private void processArtifact() throws Exception {
        if (Files.exists(this.artifactUnoptimizedPath)) {
            Files.delete(this.artifactUnoptimizedPath);
@@ -196,82 +184,82 @@ 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;
    }

    private void generateConfigs() throws Exception {
-        Files.copy(getRootRelativeFile(PROGUARD_CONFIG_TEMPLATE), getTemporaryFile(PROGUARD_CONFIG_DEST), REPLACE_EXISTING);
+        Files.copy(getRelativeFile(PROGUARD_CONFIG_TEMPLATE), getTemporaryFile(PROGUARD_CONFIG_DEST), REPLACE_EXISTING);

        // Setup the template that will be used to derive the API and Standalone configs
        List<String> template = Files.readAllLines(getTemporaryFile(PROGUARD_CONFIG_DEST));
        template.add(0, "-injars '" + this.artifactPath.toString() + "'");
        template.add(1, "-outjars '" + this.getTemporaryFile(PROGUARD_EXPORT_PATH) + "'");

-        template.add(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)");
-        template.add(4, "-libraryjars  <java.home>/jmods/jdk.unsupported.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;
-            File mcJar;
-            try {
-                mcJar = getMcJar();
-            } catch (Exception e) {
-                throw new RuntimeException("Failed to find Minecraft jar", e);
-            }
-
            {
                // 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) ? mcJar : 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 + "'");
            });
        }

-        Files.createDirectories(this.getRootRelativeFile(PROGUARD_MAPPING_DIR));
-
-        List<String> api = new ArrayList<>(template);
-        api.add(2, "-printmapping " + new File(this.getRootRelativeFile(PROGUARD_MAPPING_DIR).toFile(), "mappings-" + addCompTypeFirst("api.txt")));
-
        // API config doesn't require any changes from the changes that we made to the template
-        Files.write(getTemporaryFile(compType+PROGUARD_API_CONFIG), api);
+        Files.write(getTemporaryFile(PROGUARD_API_CONFIG), template);

        // For the Standalone config, don't keep the API package
        List<String> standalone = new ArrayList<>(template);
        standalone.removeIf(s -> s.contains("# this is the keep api"));
-        standalone.add(2, "-printmapping " + new File(this.getRootRelativeFile(PROGUARD_MAPPING_DIR).toFile(), "mappings-" + addCompTypeFirst("standalone.txt")));
-        Files.write(getTemporaryFile(compType+PROGUARD_STANDALONE_CONFIG), standalone);
+        Files.write(getTemporaryFile(PROGUARD_STANDALONE_CONFIG), standalone);
+    }
+
+    private File getSrgMcJar() {
+        return getProject().getTasks().findByName("copyMcJar").getOutputs().getFiles().getSingleFile();
    }

    private Stream<File> acquireDependencies() {
-        return getProject().getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("main").getCompileClasspath().getFiles()
+        return getProject().getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("launch").getRuntimeClasspath().getFiles()
            .stream()
            .filter(File::isFile);
    }

    private void proguardApi() throws Exception {
-        runProguard(getTemporaryFile(compType+PROGUARD_API_CONFIG));
+        runProguard(getTemporaryFile(PROGUARD_API_CONFIG));
        Determinizer.determinize(this.proguardOut.toString(), this.artifactApiPath.toString());
    }

    private void proguardStandalone() throws Exception {
-        runProguard(getTemporaryFile(compType+PROGUARD_STANDALONE_CONFIG));
+        runProguard(getTemporaryFile(PROGUARD_STANDALONE_CONFIG));
        Determinizer.determinize(this.proguardOut.toString(), this.artifactStandalonePath.toString());
    }

@@ -288,6 +276,7 @@ public class ProguardTask extends BaritoneGradleTask {
    public void setExtract(String extract) {
        this.extract = extract;
    }
+
    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)) {
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -1,103 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-import baritone.gradle.task.CreateDistTask
-import baritone.gradle.task.ProguardTask
-
-plugins {
-    id "com.github.johnrengelman.shadow" version "7.0.0"
-}
-
-archivesBaseName = archivesBaseName + "-fabric"
-
-minecraft {
-    fabric()
-}
-
-configurations {
-    common
-    shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
-    compileClasspath.extendsFrom common
-    runtimeClasspath.extendsFrom common
-}
-
-dependencies {
-    fabric "net.fabricmc:fabric-loader:${project.fabric_version}"
-
-    // because of multiple sourcesets `common project(":")` doesn't work
-    for (sourceSet in rootProject.sourceSets) {
-        if (sourceSet == rootProject.sourceSets.test) continue
-        if (sourceSet == rootProject.sourceSets.schematica_api) continue
-        common sourceSet.output
-        shadowCommon sourceSet.output
-    }
-}
-
-processResources {
-    inputs.property "version", project.version
-
-    filesMatching("fabric.mod.json") {
-        expand "version": project.version
-    }
-}
-
-shadowJar {
-    configurations = [project.configurations.shadowCommon]
-    classifier "dev-shadow"
-}
-
-remapJar {
-    inputFile.set shadowJar.archiveFile
-    dependsOn shadowJar
-    classifier null
-}
-
-jar {
-    classifier "dev"
-}
-
-components.java {
-    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-        skip()
-    }
-}
-
-task proguard(type: ProguardTask) {
-    url 'https://github.com/Guardsquare/proguard/releases/download/v7.2.1/proguard-7.2.1.zip'
-    extract 'proguard-7.2.1/lib/proguard.jar'
-    compType "fabric"
-}
-
-task createDist(type: CreateDistTask, dependsOn: proguard) {
-    compType "fabric"
-}
-
-build.finalizedBy(createDist)
-
-publishing {
-    publications {
-        mavenFabric(MavenPublication) {
-            artifactId = rootProject.archives_base_name + "-" + project.name
-            from components.java
-        }
-    }
-
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-    repositories {
-        // Add repositories to publish to here.
-    }
-}
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -1,122 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-import baritone.gradle.task.CreateDistTask
-import baritone.gradle.task.ProguardTask
-
-plugins {
-    id "com.github.johnrengelman.shadow" version "7.0.0"
-}
-
-archivesBaseName = archivesBaseName + "-forge"
-
-minecraft {
-    forge {
-        devFallbackNamespace = "intermediary"
-        mixinConfig = ["mixins.baritone.json"]
-    }
-}
-
-//loom {
-//    forge {
-//        mixinConfig 'mixins.baritone.json'
-//    }
-//}
-
-configurations {
-    common
-    shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
-    compileClasspath.extendsFrom common
-    runtimeClasspath.extendsFrom common
-}
-
-dependencies {
-    forge "net.minecraftforge:forge:${rootProject.forge_version}"
-
-    // because of multiple sourcesets `common project(":")` doesn't work
-    for (sourceSet in rootProject.sourceSets) {
-        if (sourceSet == rootProject.sourceSets.test) continue
-        if (sourceSet == rootProject.sourceSets.schematica_api) continue
-        common sourceSet.output
-        shadowCommon sourceSet.output
-    }
-}
-
-processResources {
-    inputs.property "version", project.version
-
-    filesMatching("META-INF/mods.toml") {
-        expand "version": project.version
-    }
-}
-
-shadowJar {
-    configurations = [project.configurations.shadowCommon]
-    classifier "dev-shadow"
-}
-
-remapJar {
-    inputFile.set shadowJar.archiveFile
-    dependsOn shadowJar
-    classifier null
-}
-
-jar {
-    classifier "dev"
-
-    manifest {
-        attributes(
-                'MixinConfigs': 'mixins.baritone.json',
-                "MixinConnector": "baritone.launch.BaritoneMixinConnector",
-
-                'Implementation-Title': 'Baritone',
-                'Implementation-Version': version,
-        )
-    }
-}
-
-components.java {
-    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-        skip()
-    }
-}
-
-task proguard(type: ProguardTask) {
-    url 'https://github.com/Guardsquare/proguard/releases/download/v7.2.1/proguard-7.2.1.zip'
-    extract 'proguard-7.2.1/lib/proguard.jar'
-    compType "forge"
-}
-
-task createDist(type: CreateDistTask, dependsOn: proguard) {
-    compType "forge"
-}
-
-build.finalizedBy(createDist)
-
-publishing {
-    publications {
-        mavenFabric(MavenPublication) {
-            artifactId = rootProject.archives_base_name + "-" + project.name
-            from components.java
-        }
-    }
-
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-    repositories {
-        // Add repositories to publish to here.
-    }
-}
--- a/forge/gradle.properties
+++ b/forge/gradle.properties
@@ -1,18 +0,0 @@
-#
-# This file is part of Baritone.
-#
-# Baritone is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Baritone is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
-#
-
-loom.platform=forge
--- a/forge/src/main/resources/pack.mcmeta
+++ b/forge/src/main/resources/pack.mcmeta
@@ -1,6 +0,0 @@
-{
-    "pack": {
-        "description": "null",
-        "pack_format": 8
-    }
-}
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,9 +0,0 @@
-org.gradle.jvmargs=-Xmx4G
-
-mod_version=1.9.2
-maven_group=baritone
-archives_base_name=baritone
-
-minecraft_version=1.19.4
-forge_version=1.19.3-44.0.1
-fabric_version=0.14.11
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
--- a/53
+++ b/53
@@ -1,21 +1,5 @@
 #!/usr/bin/env sh

-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -44,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`

 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS=""

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -82,7 +66,6 @@ esac

 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

-
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -126,11 +109,10 @@ if $darwin; then
    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi

-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
    JAVACMD=`cygpath --unix "$JAVACMD"`

    # We build the pattern for arguments to be converted via cygpath
@@ -156,19 +138,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
        else
            eval `echo args$i`="\"$arg\""
        fi
-        i=`expr $i + 1`
+        i=$((i+1))
    done
    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
    esac
 fi

@@ -177,9 +159,14 @@ save () {
    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
    echo " "
 }
-APP_ARGS=`save "$@"`
+APP_ARGS=$(save "$@")

 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
 exec "$JAVACMD" "$@"
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,19 +1,3 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@@ -29,18 +13,15 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS=

@rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if "%ERRORLEVEL%" == "0" goto init

 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +35,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe

-if exist "%JAVA_EXE%" goto execute
+if exist "%JAVA_EXE%" goto init

 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,14 +45,28 @@ echo location of your Java installation.

 goto fail

+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
 :execute
@rem Setup the command line

 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

-
@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

 :end
@rem End local scope for the variables with windows NT shell
--- a/jitpack.yml
+++ b/jitpack.yml
@@ -1,4 +0,0 @@
-before_install:
-  - curl -s "https://get.sdkman.io" | bash
-  - sdk install java 17.0.5-tem
-  - sdk use java 17.0.5-tem
--- a/scripts/proguard.pro
+++ b/scripts/proguard.pro
@@ -339,4 +339,6 @@
    public int length();
    public java.lang.String substring(int);
    public java.lang.String substring(int,int);
-}
+}
+
+-printmapping mapping.txt
--- a/settings.gradle
+++ b/settings.gradle
@@ -15,37 +15,5 @@
 * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
 */

-pluginManagement {
-    repositories {
-        mavenLocal()
-        maven {
-            name = 'WagYourMaven'
-            url = 'https://maven.wagyourtail.xyz/snapshots'
-        }
-        maven {
-            name = 'ForgeMaven'
-            url = 'https://maven.minecraftforge.net/'
-        }
-        maven {
-            name = 'FabricMaven'
-            url = 'https://maven.fabricmc.net/'
-        }
-        mavenCentral()
-        gradlePluginPortal() {
-            content {
-                excludeGroup "org.apache.logging.log4j"
-            }
-        }
-    }
-}
-
 rootProject.name = 'baritone'

-include("tweaker")
-if (System.getProperty("Baritone.enabled_platforms") == null) {
-//    System.setProperty("Baritone.enabled_platforms", "fabric,forge")
-    System.setProperty("Baritone.enabled_platforms", "fabric")
-}
-for (platform in System.getProperty("Baritone.enabled_platforms").split(",")) {
-       include(platform)
-}
--- a/src/api/java/baritone/api/BaritoneAPI.java
+++ b/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();
--- a/src/api/java/baritone/api/IBaritoneProvider.java
+++ b/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}.
--- a/src/api/java/baritone/api/Settings.java
+++ b/src/api/java/baritone/api/Settings.java
@@ -21,18 +21,23 @@ 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.Component;
-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.*;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;

@@ -68,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>
@@ -609,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
     */
@@ -710,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>
@@ -841,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.
     */
@@ -934,7 +971,7 @@ public final class Settings {
    /**
     * 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.
@@ -1063,7 +1100,7 @@ public final class Settings {
    /**
     * What Y level to go to for legit strip mining
     */
-    public final Setting<Integer> legitMineYLevel = new Setting<>(-59);
+    public final Setting<Integer> legitMineYLevel = new Setting<>(11);

    /**
     * Magically see ores that are separated diagonally from existing ores. Basically like mining around the ores that it finds
@@ -1141,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<>(msg -> Minecraft.getInstance().gui.getChat().addMessage(msg));
+    @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);

    /**
@@ -1155,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
@@ -1304,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) {
@@ -1312,6 +1353,7 @@ public final class Settings {
            }
            this.value = value;
            this.defaultValue = value;
+            this.javaOnly = false;
        }

        /**
@@ -1348,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() {
@@ -1365,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");
--- a/src/api/java/baritone/api/behavior/ILookBehavior.java
+++ b/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();
 }
--- a/src/api/java/baritone/api/behavior/look/IAimProcessor.java
+++ b/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();
+}
--- a/src/api/java/baritone/api/behavior/look/ITickableAimProcessor.java
+++ b/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);
+}
--- a/src/api/java/baritone/api/cache/IBlockTypeAccess.java
+++ b/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
--- a/src/api/java/baritone/api/cache/ICachedWorld.java
+++ b/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
--- a/src/api/java/baritone/api/cache/IWorldProvider.java
+++ b/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);
+        }
+    }
 }
--- a/src/api/java/baritone/api/cache/IWorldScanner.java
+++ b/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
--- a/src/api/java/baritone/api/command/argument/IArgConsumer.java
+++ b/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:
--- a/src/api/java/baritone/api/command/argument/ICommandArgument.java
+++ b/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
--- a/src/api/java/baritone/api/command/datatypes/BlockById.java
+++ b/src/api/java/baritone/api/command/datatypes/BlockById.java
@@ -19,20 +19,26 @@ package baritone.api.command.datatypes;

 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.block.Block;
+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;

 public enum BlockById implements IDatatypeFor<Block> {
    INSTANCE;

+    /**
+     * Matches (domain:)?name? where domain and name are [a-z0-9_.-]+ and [a-z0-9/_.-]+ respectively.
+     */
+    private static Pattern PATTERN = Pattern.compile("(?:[a-z0-9_.-]+:)?[a-z0-9/_.-]*");
+
    @Override
    public Block get(IDatatypeContext ctx) throws CommandException {
        ResourceLocation id = new ResourceLocation(ctx.getConsumer().getString());
        Block block;
-        if ((block = BuiltInRegistries.BLOCK.getOptional(id).orElse(null)) == null) {
+        if ((block = Registry.BLOCK.getOptional(id).orElse(null)) == null) {
            throw new IllegalArgumentException("no block found by that id");
        }
        return block;
@@ -40,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(
-                        BuiltInRegistries.BLOCK.keySet()
+                        Registry.BLOCK.keySet()
                                .stream()
                                .map(Object::toString)
                )
-                .filterPrefixNamespaced(ctx.getConsumer().getString())
+                .filterPrefixNamespaced(arg)
                .sortAlphabetically()
                .stream();
    }
--- a/src/api/java/baritone/api/command/datatypes/EntityClassById.java
+++ b/src/api/java/baritone/api/command/datatypes/EntityClassById.java
@@ -19,9 +19,9 @@ package baritone.api.command.datatypes;

 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.entity.EntityType;
+import net.minecraft.entity.EntityType;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.registry.Registry;

 import java.util.stream.Stream;

@@ -32,7 +32,7 @@ public enum EntityClassById implements IDatatypeFor<EntityType> {
    public EntityType get(IDatatypeContext ctx) throws CommandException {
        ResourceLocation id = new ResourceLocation(ctx.getConsumer().getString());
        EntityType entity;
-        if ((entity = BuiltInRegistries.ENTITY_TYPE.getOptional(id).orElse(null)) == null) {
+        if ((entity = Registry.ENTITY_TYPE.getOptional(id).orElse(null)) == null) {
            throw new IllegalArgumentException("no entity found by that id");
        }
        return entity;
@@ -41,7 +41,7 @@ public enum EntityClassById implements IDatatypeFor<EntityType> {
    @Override
    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
        return new TabCompleteHelper()
-                .append(BuiltInRegistries.ENTITY_TYPE.stream().map(Object::toString))
+                .append(Registry.ENTITY_TYPE.stream().map(Object::toString))
                .filterPrefixNamespaced(ctx.getConsumer().getString())
                .sortAlphabetically()
                .stream();
--- a/src/api/java/baritone/api/command/datatypes/ForAxis.java
+++ b/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();
+    }
+}
--- a/src/api/java/baritone/api/command/datatypes/ForBlockOptionalMeta.java
+++ b/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);
    }
 }
--- a/src/api/java/baritone/api/command/datatypes/ForDirection.java
+++ b/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();
    }
--- a/src/api/java/baritone/api/command/datatypes/NearbyPlayer.java
+++ b/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();
    }
 }
--- a/src/api/java/baritone/api/command/datatypes/RelativeFile.java
+++ b/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;

@@ -93,8 +93,13 @@ public enum RelativeFile implements IDatatypePost<File, File> {
                .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();
        }
--- a/src/api/java/baritone/api/command/datatypes/RelativeGoalBlock.java
+++ b/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))
        );
    }

--- a/src/api/java/baritone/api/command/datatypes/RelativeGoalXZ.java
+++ b/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))
        );
    }

--- a/src/api/java/baritone/api/command/datatypes/RelativeGoalYLevel.java
+++ b/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))
        );
    }

--- a/src/api/java/baritone/api/command/exception/CommandUnhandledException.java
+++ b/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();
    }
--- a/src/api/java/baritone/api/command/exception/ICommandException.java
+++ b/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);
    }
 }
--- a/src/api/java/baritone/api/command/helpers/Paginator.java
+++ b/src/api/java/baritone/api/command/helpers/Paginator.java
@@ -21,16 +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.awt.*;
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.Function;
-import net.minecraft.ChatFormatting;
-import net.minecraft.network.chat.ClickEvent;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.HoverEvent;
-import net.minecraft.network.chat.MutableComponent;

 public class Paginator<E> implements Helper {

@@ -64,56 +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);
-        MutableComponent prevPageComponent = Component.literal("<<");
+        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,
-                            Component.literal("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));
        }
-        MutableComponent nextPageComponent = Component.literal(">>");
+        TextComponent nextPageComponent = new StringTextComponent(">>");
        if (hasNextPage) {
            nextPageComponent.setStyle(nextPageComponent.getStyle()
-                    .withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, String.format("%s %d", commandPrefix, page + 1)))
-                    .withHoverEvent(new HoverEvent(
+                    .setClickEvent(new ClickEvent(
+                            ClickEvent.Action.RUN_COMMAND,
+                            String.format("%s %d", commandPrefix, page + 1)
+                    ))
+                    .setHoverEvent(new HoverEvent(
                            HoverEvent.Action.SHOW_TEXT,
-                            Component.literal("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));
        }
-        MutableComponent pagerComponent = Component.literal("");
-        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()) {
@@ -136,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);
    }
 }
--- a/src/api/java/baritone/api/command/helpers/TabCompleteHelper.java
+++ b/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)
        );
--- a/src/api/java/baritone/api/event/events/BlockInteractEvent.java
+++ b/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}.
--- a/src/api/java/baritone/api/event/events/PacketEvent.java
+++ b/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;
    }
 }
--- a/src/api/java/baritone/api/event/events/RenderEvent.java
+++ b/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 org.joml.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;
    }

--- a/src/api/java/baritone/api/event/events/RotationMoveEvent.java
+++ b/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,

--- a/src/api/java/baritone/api/event/events/WorldEvent.java
+++ b/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;
    }

--- a/src/api/java/baritone/api/event/listener/IGameEventListener.java
+++ b/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);

--- a/src/api/java/baritone/api/pathing/goals/Goal.java
+++ b/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.
--- a/src/api/java/baritone/api/pathing/goals/GoalAxis.java
+++ b/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";
--- a/src/api/java/baritone/api/pathing/goals/GoalBlock.java
+++ b/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(
--- a/src/api/java/baritone/api/pathing/goals/GoalComposite.java
+++ b/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);
--- a/src/api/java/baritone/api/pathing/goals/GoalGetToBlock.java
+++ b/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(
--- a/src/api/java/baritone/api/pathing/goals/GoalInverted.java
+++ b/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());
--- a/src/api/java/baritone/api/pathing/goals/GoalNear.java
+++ b/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.DoubleIterator;
 import it.unimi.dsi.fastutil.doubles.DoubleOpenHashSet;
-import net.minecraft.core.BlockPos;
+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(
--- a/src/api/java/baritone/api/pathing/goals/GoalRunAway.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalRunAway.java
@@ -20,9 +20,10 @@ package baritone.api.pathing.goals;
 import baritone.api.utils.SettingsUtil;
 import it.unimi.dsi.fastutil.doubles.DoubleIterator;
 import it.unimi.dsi.fastutil.doubles.DoubleOpenHashSet;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;

 import java.util.Arrays;
+import java.util.Objects;

 /**
 * Useful for automated combat (retreating specifically)
@@ -124,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) {
--- a/src/api/java/baritone/api/pathing/goals/GoalStrictDirection.java
+++ b/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(
--- a/src/api/java/baritone/api/pathing/goals/GoalTwoBlocks.java
+++ b/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(
--- a/src/api/java/baritone/api/pathing/goals/GoalXZ.java
+++ b/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() {
--- a/src/api/java/baritone/api/pathing/goals/GoalYLevel.java
+++ b/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(
--- a/src/api/java/baritone/api/pathing/movement/ActionCosts.java
+++ b/src/api/java/baritone/api/pathing/movement/ActionCosts.java
@@ -65,8 +65,8 @@ public interface ActionCosts {


    static double[] generateFallNBlocksCost() {
-        double[] costs = new double[4097];
-        for (int i = 0; i < 4097; i++) {
+        double[] costs = new double[257];
+        for (int i = 0; i < 257; i++) {
            costs[i] = distanceToTicks(i);
        }
        return costs;
--- a/src/api/java/baritone/api/pathing/movement/IMovement.java
+++ b/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
--- a/src/api/java/baritone/api/process/IBuilderProcess.java
+++ b/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,10 +49,11 @@ 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);
    }

--- a/src/api/java/baritone/api/process/IFarmProcess.java
+++ b/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 {

--- a/src/api/java/baritone/api/process/IFollowProcess.java
+++ b/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
--- a/src/api/java/baritone/api/process/IGetToBlockProcess.java
+++ b/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
--- a/src/api/java/baritone/api/process/IMineProcess.java
+++ b/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
--- a/src/api/java/baritone/api/schematic/CompositeSchematic.java
+++ b/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 {

--- a/src/api/java/baritone/api/schematic/FillSchematic.java
+++ b/src/api/java/baritone/api/schematic/FillSchematic.java
@@ -18,8 +18,7 @@
 package baritone.api.schematic;

 import baritone.api.utils.BlockOptionalMeta;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.block.BlockState;

 import java.util.List;

--- a/src/api/java/baritone/api/schematic/ISchematic.java
+++ b/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
--- a/src/api/java/baritone/api/schematic/IStaticSchematic.java
+++ b/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
--- a/src/api/java/baritone/api/schematic/MaskSchematic.java
+++ b/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);
+            }
+        };
+    }
 }
--- a/src/api/java/baritone/api/schematic/ReplaceSchematic.java
+++ b/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 {

--- a/src/api/java/baritone/api/schematic/ShellSchematic.java
+++ b/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 {

--- a/src/api/java/baritone/api/schematic/SubstituteSchematic.java
+++ b/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;
@@ -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,15 +66,15 @@ 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);
@@ -86,6 +86,6 @@ public class SubstituteSchematic extends AbstractSchematic {
    }

    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));
    }
 }
--- a/src/api/java/baritone/api/schematic/WallsSchematic.java
+++ b/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 {

--- a/src/api/java/baritone/api/schematic/mask/AbstractMask.java
+++ b/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;
+    }
+}
--- a/src/api/java/baritone/api/schematic/mask/Mask.java
+++ b/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);
+    }
+}
--- a/src/api/java/baritone/api/schematic/mask/PreComputedMask.java
+++ b/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];
+    }
+}
--- a/src/api/java/baritone/api/schematic/mask/StaticMask.java
+++ b/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);
+    }
+}
--- a/src/api/java/baritone/api/schematic/mask/operator/BinaryOperatorMask.java
+++ b/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);
+        }
+    }
+}
--- a/src/api/java/baritone/api/schematic/mask/operator/NotMask.java
+++ b/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);
+        }
+    }
+}
--- a/src/api/java/baritone/api/schematic/mask/shape/CylinderMask.java
+++ b/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;
+    }
+}
--- a/src/api/java/baritone/api/schematic/mask/shape/SphereMask.java
+++ b/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;
+    }
+}
--- a/src/api/java/baritone/api/selection/ISelection.java
+++ b/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.
--- a/src/api/java/baritone/api/selection/ISelectionManager.java
+++ b/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
--- a/src/api/java/baritone/api/utils/BetterBlockPos.java
+++ b/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);
    }

--- a/src/api/java/baritone/api/utils/BlockOptionalMeta.java
+++ b/src/api/java/baritone/api/utils/BlockOptionalMeta.java
@@ -18,85 +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.client.Minecraft;
-import net.minecraft.core.BlockPos;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.progress.ChunkProgressListener;
-import net.minecraft.server.packs.*;
-import net.minecraft.server.packs.repository.ServerPacksSource;
-import net.minecraft.server.packs.resources.MultiPackResourceManager;
-import net.minecraft.server.packs.resources.ReloadableResourceManager;
-import net.minecraft.util.RandomSource;
+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.state.Property;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.Unit;
-import net.minecraft.world.flag.FeatureFlagSet;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.CustomSpawner;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.dimension.LevelStem;
-import net.minecraft.world.level.storage.LevelStorageSource;
-import net.minecraft.world.level.storage.ServerLevelData;
-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 sun.misc.Unsafe;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.vector.Vector3d;

 import javax.annotation.Nonnull;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-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.concurrent.Executor;
-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 lootTables;
-    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) {
@@ -137,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() {
@@ -155,99 +174,56 @@ public final class BlockOptionalMeta {
        return null;
    }

-    private static Method getVanillaServerPack;
-
-    private static VanillaPackResources getVanillaServerPack() {
-        if (getVanillaServerPack == null) {
-            getVanillaServerPack = Arrays.stream(ServerPacksSource.class.getDeclaredMethods()).filter(field -> field.getReturnType() == VanillaPackResources.class).findFirst().orElseThrow();
-            getVanillaServerPack.setAccessible(true);
-        }
-
-        try {
-            return (VanillaPackResources) getVanillaServerPack.invoke(null);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return null;
+    public Set<BlockState> getAllBlockStates() {
+        return blockstates;
    }

-    public static LootTables getManager() {
-        if (lootTables == null) {
-            MultiPackResourceManager resources = new MultiPackResourceManager(PackType.SERVER_DATA, List.of(getVanillaServerPack()));
-            ReloadableResourceManager resourceManager = new ReloadableResourceManager(PackType.SERVER_DATA);
-            lootTables = new LootTables(predicate);
-            resourceManager.registerReloadListener(lootTables);
+    public Set<Integer> stackHashes() {
+        return stackHashes;
+    }
+
+    public static LootTableManager getManager() {
+        if (manager == null) {
+            ResourcePackList rpl = new ResourcePackList(ResourcePackInfo::new, new ServerPackFinder());
+            rpl.reloadPacksFromFinders();
+            IResourcePack thePack = rpl.getAllPacks().iterator().next().getResourcePack();
+            IReloadableResourceManager resourceManager = new SimpleReloadableResourceManager(ResourcePackType.SERVER_DATA);
+            manager = new LootTableManager(predicate);
+            resourceManager.addReloadListener(manager);
            try {
-                resourceManager.createReload(new ThreadPerTaskExecutor(Thread::new), new ThreadPerTaskExecutor(Thread::new), CompletableFuture.completedFuture(Unit.INSTANCE), resources.listPacks().toList()).done().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);
            }
-
        }
-        return lootTables;
+        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<>();
-                try {
-                    getManager().get(lootTableLocation).getRandomItems(
-                        new LootContext.Builder(ServerLevelStub.fastCreate())
-                            .withRandom(RandomSource.create())
-                            .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),
+
+                // the other overload for generate doesnt work in forge because forge adds code that requires a non null world
+                getManager().getLootTableFromLocation(lootTableLocation).generate(
+                        new LootContext.Builder(null)
+                                .withRandom(new Random())
+                                .withParameter(LootParameters.field_237457_g_, Vector3d.copy(BlockPos.NULL_VECTOR))
+                                .withParameter(LootParameters.TOOL, ItemStack.EMPTY)
+                                .withNullableParameter(LootParameters.BLOCK_ENTITY, null)
+                                .withParameter(LootParameters.BLOCK_STATE, block.getDefaultState())
+                                .build(LootParameterSets.BLOCK),
                        stack -> items.add(stack.getItem())
-                    );
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
+                );
                return items;
            }
        });
    }
-
-    private static class ServerLevelStub extends ServerLevel {
-        private static Minecraft client = Minecraft.getInstance();
-        private static Unsafe unsafe = getUnsafe();
-        public ServerLevelStub(MinecraftServer $$0, Executor $$1, LevelStorageSource.LevelStorageAccess $$2, ServerLevelData $$3, ResourceKey<Level> $$4, LevelStem $$5, ChunkProgressListener $$6, boolean $$7, long $$8, List<CustomSpawner> $$9, boolean $$10) {
-            super($$0, $$1, $$2, $$3, $$4, $$5, $$6, $$7, $$8, $$9, $$10);
-        }
-
-        @Override
-        public FeatureFlagSet enabledFeatures() {
-            assert client.level != null;
-            return client.level.enabledFeatures();
-        }
-
-        public static ServerLevelStub fastCreate() {
-            try {
-                return (ServerLevelStub) unsafe.allocateInstance(ServerLevelStub.class);
-            } catch (InstantiationException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        public static Unsafe getUnsafe() {
-            try {
-                Field theUnsafe = Unsafe.class.getDeclaredField("theUnsafe");
-                theUnsafe.setAccessible(true);
-                return (Unsafe) theUnsafe.get(null);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-    }
 }
--- a/src/api/java/baritone/api/utils/BlockOptionalMetaLookup.java
+++ b/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() {
--- a/src/api/java/baritone/api/utils/BlockUtils.java
+++ b/src/api/java/baritone/api/utils/BlockUtils.java
@@ -17,19 +17,19 @@

 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.core.registries.BuiltInRegistries;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.block.Block;

 public class BlockUtils {

    private static transient Map<String, Block> resourceCache = new HashMap<>();

    public static String blockToString(Block block) {
-        ResourceLocation loc = BuiltInRegistries.BLOCK.getKey(block);
+        ResourceLocation loc = Registry.BLOCK.getKey(block);
        String name = loc.getPath(); // normally, only write the part after the minecraft:
        if (!loc.getNamespace().equals("minecraft")) {
            // Baritone is running on top of forge with mods installed, perhaps?
@@ -57,7 +57,7 @@ public class BlockUtils {
        if (resourceCache.containsKey(name)) {
            return null; // cached as null
        }
-        block = BuiltInRegistries.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;
--- a/forge/src/main/java/baritone/launch/BaritoneForgeModXD.java
+++ b/forge/src/main/java/baritone/launch/BaritoneForgeModXD.java
@@ -15,8 +15,13 @@
 * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
 */

-package baritone.launch;import net.minecraftforge.fml.common.Mod;
+package baritone.api.utils;

-@Mod("baritoe")
-public class BaritoneForgeModXD {
+/**
+ * @author Brady
+ */
+@FunctionalInterface
+public interface BooleanBinaryOperator {
+
+    boolean applyAsBoolean(boolean a, boolean b);
 }
--- a/src/api/java/baritone/api/utils/BooleanBinaryOperators.java
+++ 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);
+    }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Leijurv	dbfb44d049	deprecate 1.16.5	2023-08-14 13:40:28 -07:00
Leijurv	9df406de6b	v1.6.5	2023-08-14 13:34:38 -07:00
leijurv	8ceb89d021	Merge pull request #4028 from ZacSharp/1.16.5-update Merge master into 1.16.5	2023-07-05 11:47:27 -07:00
ZacSharp	8e58dd9e64	Merge branch '1.15.2' into 1.16.5	2023-07-04 16:48:41 +02:00
ZacSharp	45abbb7fa1	Merge branch '1.14.4' into 1.15.2	2023-07-04 16:48:36 +02:00
ZacSharp	1d983d5fdc	Merge branch '1.13.2' into 1.14.4	2023-07-04 16:48:31 +02:00
ZacSharp	be54b8ee5b	Merge branch 'master' into 1.13.2	2023-07-04 16:47:58 +02:00
Brady	6654476da4	Make `blockFreeLook` depend on `freeLook`	2023-07-02 19:59:26 -05:00
Leijurv	8211ae4af5	memory leaks are joever	2023-06-29 21:59:31 -07:00
Brady	15f4253b3d	Clamp pitch to normal range	2023-06-24 21:48:44 -07:00
leijurv	24b0bd2edf	Merge pull request #4019 from ZacSharp/pr/misc/rotation/fixMouseStuck Fix getting stuck due to impossible rotations	2023-06-23 21:59:34 -07:00
ZacSharp	e3a1ac85cc	Fix waiting for impossible rotations	2023-06-23 04:22:35 +02:00
leijurv	1ea071de09	Merge pull request #4015 from cabaletta/pr/deterministicLookTarget API for rotations produced by LookBehavior	2023-06-22 19:21:02 -07:00
Brady	c9a18caf49	Register `LookBehavior` first Since there's no event priority system, this is necessary to ensure anything else listening to the PRE `TickEvent` can accurately simulate rotations.	2023-06-22 20:38:00 -05:00
Brady	bfae100cb9	Create `ITickableAimProcessor`	2023-06-22 20:35:22 -05:00
leijurv	0dd38ca65a	Merge pull request #4012 from ZacSharp/pr/commands/usableTabCompletion Fix tab completion with brigadier	2023-06-21 18:54:20 -07:00
leijurv	b0ebbf4dfb	Merge pull request #4007 from ZacSharp/pr/schematics/mask/fixBinaryOperatorMaskOOB Don't call `partOfMask` out of bounds in `BinaryOperatorMask`	2023-06-21 18:53:58 -07:00
leijurv	9d12a4ba3d	Merge pull request #4008 from ZacSharp/pr/pathing/goals/implHashCode Implement `hashCode` for goals	2023-06-21 18:53:36 -07:00
leijurv	6dc953631b	Merge pull request #4006 from ZacSharp/pr/blockOptionalMeta/tabCompleteProperties Tab completion improvements	2023-06-21 18:53:06 -07:00
Brady	0682e63707	Apply processor to RotationMoveEvent	2023-06-21 17:39:04 -05:00
Brady	7e426bd2e8	AimProcessor API	2023-06-21 17:35:47 -05:00
Brady	367ce5fa17	cherry pick Allow freeLook when using elytra	2023-06-21 14:55:40 -05:00
ZacSharp	41d730fb04	Forgot to include target pos	2023-06-20 03:20:44 +02:00
ZacSharp	30278a1c52	Implement `hashCode` for goals	2023-06-20 02:44:29 +02:00
ZacSharp	d87d1ab9b5	Don't call `partOfMask` out of bounds	2023-06-20 02:00:08 +02:00
ZacSharp	31c9072970	Forgot to git add	2023-06-20 01:36:09 +02:00
ZacSharp	f7a20a3acf	Don't swallow random exceptions, don't bother with CommandExceptions	2023-06-20 01:32:18 +02:00
ZacSharp	b111fd2f3e	Don't construct malformed `ResourceLocation`s Later mc versions throw an exception when you construct a malformed `ResourceLocation`.	2023-06-20 00:02:56 +02:00
ZacSharp	84777c2437	Don't complete more than what's supported	2023-06-20 00:01:33 +02:00
ZacSharp	13742df877	Complete the last argument, not the first one	2023-06-20 00:00:52 +02:00
ZacSharp	f55f7f19b4	Tab complete the datatype which will be parsed	2023-06-19 23:50:42 +02:00
ZacSharp	e43200865c	Move this to the right place	2023-06-19 23:48:07 +02:00
ZacSharp	1de2d55965	Tab complete block properties	2023-06-19 23:05:46 +02:00
Leijurv	6c8f2698d6	cherry pick remainWithExistingLookDirection from fork	2023-06-18 19:31:51 -07:00
leijurv	411c43d90e	Merge pull request #3992 from ZacSharp/pr/blockOptionalMeta/useStackHashesInBlockOptionalMetaLookup Actually use stack hashes	2023-06-18 17:25:53 -07:00
leijurv	bac5fd7438	Merge pull request #3999 from ZacSharp/pr/setting/tabCompleteSetingsLoadPath Tab complete the file argument for `#settings load`	2023-06-18 17:25:27 -07:00
Brady Hahn	4df31a3fbb	Merge pull request #4000 from ZacSharp/pr/selection/fixHorizontalCylinders Fix `CylinderMask` with horizontal alignment	2023-06-18 19:02:07 -05:00
ZacSharp	5fd915ab8a	Tab complete the file argument for `#settings load`	2023-06-18 22:27:57 +02:00
ZacSharp	6aeb73b5bd	Fix `CylinderMask` with horizontal alignment	2023-06-18 19:18:46 +02:00
leijurv	a665605a5a	Merge pull request #3991 from ZacSharp/pr/guiclick/fixSelectionPreview Fix `GuiClick` not rendering the outline of the selection being made	2023-06-16 20:29:25 -07:00
ZacSharp	e00e0032b4	Actually use stack hashes	2023-06-17 01:40:19 +02:00
ZacSharp	f1bf1e8663	Use IRenderer setup methods	2023-06-17 00:36:35 +02:00
ZacSharp	ef4cdfd646	Fix render bug caused by color bug fix	2023-06-16 19:22:37 +02:00
leijurv	c86643874d	Merge pull request #3936 from ZacSharp/pr/builder/fixPlaceableComparison Fix considering states unplaceable regardless of buildIgnoreProperties	2023-06-15 19:36:25 -07:00
Brady	26a2945696	remove comment	2023-06-14 19:13:07 -05:00
leijurv	04b09fbfbd	Merge pull request #3985 from cabaletta/pr/deprecateHelperMc Deprecate `Helper.mc`	2023-06-14 16:20:38 -07:00
Brady	f14caa3778	Fix cringe shift by injector	2023-06-14 17:32:47 -05:00
Brady	ea9245ad26	missed that 😩	2023-06-14 14:23:24 -05:00
Brady	8534e1ba55	💚 appease codacy	2023-06-14 14:04:34 -05:00
Brady	ae66004b80	Custom registration of `Baritone` instances from `Minecraft`	2023-06-14 13:52:27 -05:00
Brady	5b39c0dd96	Remove `getMinecraft()` from `BlockStateInterface`	2023-06-14 12:18:50 -05:00
Brady	2db2d8be59	Steal `BaritoneList` from `bot-system`	2023-06-14 02:00:10 -05:00
Brady	75d47bb110	Fix all usages of `Helper.mc`	2023-06-14 01:53:29 -05:00
leijurv	3662b3fdf1	nope	2023-06-13 21:33:12 -07:00
leijurv	b03d31e990	will github let me do this	2023-06-13 21:32:57 -07:00
leijurv	54f0a3c14c	marginally better	2023-06-13 21:32:21 -07:00
leijurv	6a80b0d4ff	forgot github markdown is stupid	2023-06-13 21:31:49 -07:00
leijurv	5e724c1e3a	making these clickable was a mistake	2023-06-13 21:31:10 -07:00
leijurv	88e604426c	1.20.1	2023-06-13 21:30:31 -07:00
Brady	dd7b492b0c	registerBehavior is called explicitly now	2023-06-13 23:21:20 -05:00
Brady	c7f4e366e2	Remove `mc` references from `WorldProvider` Also refactored a bit, should be a lot easier to merge upwards to new game versions	2023-06-13 23:07:26 -05:00
Brady	382f82b0e0	Move `Minecraft` to `IPlayerContext`	2023-06-13 21:17:42 -05:00
Brady	ab3d9e9c47	I LOVE `final`	2023-06-13 21:13:34 -05:00
Brady	714ebb2c2d	Deprecate `Helper.mc` and begin to replace usages	2023-06-13 18:24:31 -05:00
leijurv	1b254a4811	Merge pull request #3979 from cabaletta/pr/feature/blockFreeLook Allow free looking when breaking and placing blocks	2023-06-13 10:32:18 -07:00
Brady	76fe0d14d3	Simplify some player context references	2023-06-12 21:13:10 -05:00
Brady	2022d33d03	Fix incorrect references to player and world	2023-06-12 21:12:49 -05:00
Brady	c8b8deb3d6	Ensure angle delta is producible with mouse movement	2023-06-12 21:04:30 -05:00
Brady	4885d49d20	Reorganize code	2023-06-12 20:00:03 -05:00
Brady	13fc58933d	Don't bother returning `serverRotations` if no free look	2023-06-12 19:03:03 -05:00
Brady	c217a34f13	🐛 fix batch render color bug by backporting 1.17+ render code	2023-06-12 17:06:11 -05:00
leijurv	15182cb151	Merge pull request #3984 from cabaletta/pr/bugfix/censorCoordinatesRecalc Fix `censorCoordinates` recalc bug	2023-06-12 14:57:02 -07:00
Brady	8a65a1cfc5	🐛 fix incorrect comparison operator	2023-06-12 16:52:20 -05:00
Brady	5bdd5b0c0d	👌 appease leijurv	2023-06-12 16:50:02 -05:00
Brady	7da802a238	Fix `censorCoordinates` recalc bug Adds `equals` and `toString` implementations where needed Replaces `toString` equality check with actual `equals` check in `forceRevalidate`	2023-06-12 16:21:05 -05:00
leijurv	e334aae608	Merge pull request #3974 from cabaletta/pr/sel-shape-masks Add sphere and cylinder build commands to sel	2023-06-12 12:57:01 -07:00
leijurv	c48a9d98b4	Merge pull request #3982 from cabaletta/pr/batchRender Batch Rendering	2023-06-12 12:56:05 -07:00
Brady	ed34ae73c0	Fix `Mode.NONE` target invalidation	2023-06-12 13:46:10 -05:00
Brady	c8a0ae9e10	Do `nudgeToLevel` and `randomLooking` when using freeLook	2023-06-12 13:44:08 -05:00
Brady	67a085c95f	Batch together GL_LINES draw calls	2023-06-12 13:16:37 -05:00
Brady	1d5ee079b4	Read `serverRotation` from packet and invalidate on world load	2023-06-12 12:11:50 -05:00
Brady	bb36ebfc0c	Use `IPlayerContext` for all `RotationUtils` methods Deprecates all old overloads	2023-06-11 20:09:37 -05:00
Brady	a7d15d1e32	Consistent naming and comments for clarification	2023-06-11 18:43:48 -05:00
Brady	4317dca024	Determine target mode (client/server) in `updateTarget`	2023-06-11 18:35:34 -05:00
Brady	77ca36c794	Use `playerRotations` in `reachableOffset`	2023-06-11 15:49:04 -05:00
Brady	a09e63d6aa	appease codacy	2023-06-11 13:14:52 -05:00
Brady	fbe28e397e	Make setting disabled by default	2023-06-11 12:38:13 -05:00
Brady	364ae87ef8	Add `blockFreeLook` setting	2023-06-11 12:36:53 -05:00
Brady	ffd00080f2	Mask binary operators	2023-06-11 11:27:51 -05:00
Brady	94d757104b	Clean ups	2023-06-11 11:24:31 -05:00
Brady	9729e63d98	Create and utilize new `Mask` type Added factory method to `MaskSchematic` for creation using a `Mask` Sort-of mocks the schematic structure, without the block states ofc	2023-06-09 17:25:29 -05:00
Brady	f232bbdb15	Clean up formatting	2023-06-08 16:36:32 -05:00
Brady	26574b4a9b	Add optional axis parameter for `#sel cyl`	2023-06-08 16:32:33 -05:00
Brady	a1b1ef88cf	Use a Supplier to mimic a switch expression	2023-06-08 15:46:32 -05:00
Brady	b6c52cd8e1	Cache mask in a `boolean[][][]`	2023-06-08 11:52:13 -05:00
Brady	34abbfb5da	appease codacy	2023-06-07 17:38:26 -05:00
Brady	0d14bde583	Working sphere/cylinder build commands for `#sel`	2023-06-07 16:31:52 -05:00
leijurv	4b0a8eb166	Merge pull request #3966 from cabaletta/pr/setting-metadata Setting Field Metadata	2023-06-04 16:59:14 -07:00
Brady	80ec9023ce	Replace `JAVA_ONLY_SETTINGS` array with `@JavaOnly` annotation	2023-06-04 12:31:34 -05:00
leijurv	5dd10b6e81	Merge pull request #3946 from ZacSharp/pr/farm/addCocoa Make cocoa farmable	2023-05-23 17:31:06 -07:00
leijurv	415fa048ba	Merge pull request #3924 from ZacSharp/pr/blockOptionalMetaProperties Extend BlockOptionalMeta parsing to parse block properties	2023-05-23 15:57:10 -07:00
leijurv	a1661e94b5	Merge pull request #3923 from ZacSharp/pr/mine/maxYLevelWhileMining ✨ Add maxYLevelWhileMining setting	2023-05-23 15:56:11 -07:00
ZacSharp	c45a714b77	Fix considering states unplaceable even if buildIgnoreProperties allows it	2023-05-08 03:51:38 +02:00
ZacSharp	271c2ff636	Extend BlockOptionalMeta parsing to parse block properties	2023-04-24 23:49:23 +02:00
ZacSharp	e4cd35ac33	✨ Add maxYLevelWhileMining setting	2023-04-24 23:11:55 +02:00
ZacSharp	e8a4a9fdac	Make cocoa farmable	2023-04-24 16:23:38 +02:00
leijurv	5f2eadbfa6	download links for 1.19.2	2023-04-11 20:36:29 -07:00
leijurv	35ab687d5e	1.9.3 download links	2023-04-11 16:00:22 -07:00
leijurv	3ff2bd4f17	Merge pull request #3908 from wagyourtail/patch-3 Update Setup.md	2023-04-11 14:47:59 -07:00
Wagyourtail	f334b3b765	update setup.md	2023-04-10 18:40:48 -07:00
leijurv	ff1732011e	vid is outdated and doesn't get to the point fast enough, so let's move it lower down	2023-03-20 22:07:51 -07:00
leijurv	c5721fb7e3	Merge pull request #3878 from wagyourtail/1.12/fix-wp-c make wp c not throw npe on invalid tag name	2023-03-14 18:40:41 -07:00
leijurv	3200d976d7	1.19.4	2023-03-14 18:35:15 -07:00
Wagyourtail	6698505dd8	make wp c not throw npe on invalid tag name	2023-03-13 15:31:18 -07:00
Leijurv	790a4f6769	command to load settings from a specific file	2023-03-01 00:25:49 -08:00
leijurv	c9d7a5bea6	kami blue to lambda	2023-02-28 23:56:34 -08:00
Leijurv	f1ead19b6e	option to only move inventory when stationary	2023-02-28 23:44:33 -08:00
ZacSharp	9efc512253	Make tab completion usable Now behaves almost identical to vanilla tab completion	2023-02-19 19:27:39 +01:00
Leijurv	174bdd2307	overhaul readme	2023-02-18 16:42:05 -08:00
Leijurv	1e7e504650	v1.6.4	2023-02-18 15:37:37 -08:00
Leijurv	814c17522a	changed it back to the old way by manually renaming the release files	2023-02-18 15:20:50 -08:00
Leijurv	b622adf300	ugh why was this changed since 1.18	2023-02-18 15:13:15 -08:00
Leijurv	c1b58f8a01	link 1.19	2023-02-18 15:12:17 -08:00
leijurv	c1a9621dfa	Merge pull request #3768 from wagyourtail/1.12/fasterworldscanner replace the world scanner with a 500x faster one	2023-01-28 10:18:59 -08:00
Wagyourtail	6de266a106	remove extra method call	2023-01-28 01:39:58 -07:00
Wagyourtail	334d9c119b	remove the allocation of an intlist per section	2023-01-28 00:44:54 -07:00
leijurv	1a2c30b4e3	Merge pull request #3803 from Entropy5/master Litematica x BuildOnlySelection support	2023-01-27 23:34:35 -08:00
Entropy5	413cc1469f	zac suggestion (number 2), test ongoing	2023-01-27 14:23:08 +01:00
Wagyourtail	7404414e7a	less impure	2023-01-20 23:43:00 -07:00
Entropy5	49b1f3528b	Merge remote-tracking branch 'origin/master'	2023-01-17 06:33:09 +01:00
Entropy5	26cceede15	litematica support for buildonlyselection, mostly rycbars	2023-01-17 06:33:01 +01:00
Wagyourtail	b71c9e776a	oops didn't mean to commit that	2022-12-28 01:09:46 -07:00
Wagyourtail	746faf6df6	faster section reorder	2022-12-28 01:05:17 -07:00
Wagyourtail	a367031fe2	Revert "sacrifice a bit of speed for better block ordering" This reverts commit `e55db05f20`.	2022-12-28 00:03:58 -07:00
Wagyourtail	853dadd906	Merge remote-tracking branch 'origin/master' into 1.12/fasterworldscanner	2022-12-27 23:58:13 -07:00
Wagyourtail	e55db05f20	sacrifice a bit of speed for better block ordering	2022-12-27 23:30:35 -07:00
Wagyourtail	98a748afb3	fix stream limit. immutable's in BOML	2022-12-27 22:42:38 -07:00
William Gray	c04eb066cb	Update src/main/java/baritone/cache/FasterWorldScanner.java Co-authored-by: ZacSharp <68165024+ZacSharp@users.noreply.github.com>	2022-12-28 01:06:10 +00:00
Wagyourtail	6260c6d3d7	apply suggestions	2022-12-24 12:11:26 -07:00
Wagyourtail	ce1fb49252	spiral always pick closest chunk first now	2022-12-24 11:52:48 -07:00
Wagyourtail	ecdec87e7a	fix using wrong functions in scan	2022-12-24 11:43:54 -07:00
Wagyourtail	96f432d2d5	add comment	2022-12-23 17:26:46 -07:00
Wagyourtail	0ae59755e3	make limit not happen if it shouldn't	2022-12-23 17:25:23 -07:00
Wagyourtail	12b596e536	fix spiral	2022-12-23 17:10:37 -07:00
Wagyourtail	0b6088cd2d	fix getting the block from the pallete, and change the chunk scan order to spiral out	2022-12-23 16:58:10 -07:00
Wagyourtail	1736f2ffc7	replace the world scanner with a 500x faster one	2022-12-23 16:34:49 -07:00