deprecate 1.17.1

2023-02-18 15:40:11 -08:00
203 changed files with 1935 additions and 8920 deletions
--- a/.github/workflows/gradle_build.yml
+++ b/.github/workflows/gradle_build.yml
@@ -13,31 +13,33 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
+    - name: Set up JDK 16
+      uses: actions/setup-java@v3
      with:
-        fetch-depth: 0
-
-    - name: Set up JDK 21
-      uses: actions/setup-java@v4
-      with:
-        java-version: '21'
+        java-version: '16'
        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 --first-parent | 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 -Ploom.platform=forge

    - name: Archive Artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
      with:
        name: Artifacts
        path: dist/
        
    - name: Archive mapping.txt
-      uses: actions/upload-artifact@v4
+      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
@@ -11,11 +11,11 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-    - uses: actions/checkout@v4
-    - name: Set up JDK 21
-      uses: actions/setup-java@v4
+    - uses: actions/checkout@v3
+    - name: Set up JDK 16
+      uses: actions/setup-java@v3
      with:
-        java-version: '21'
+        java-version: '16'
        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,12 +32,3 @@ baritone_Client.launch
 !/.idea/copyright/profiles_settings.xml

 .vscode/launch.json
-.architectury-transformer
-
-
-mapping
-
-libs/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar
-libs/java-objc-bridge-1.1.jar
-
-mapping
--- a/5
+++ b/5
@@ -5,8 +5,7 @@ ENV DEBIAN_FRONTEND noninteractive
 RUN apt update -y

 RUN apt install \
-          openjdk-17-jdk \
-	  git \
+          openjdk-16-jdk \
          --assume-yes

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

 RUN ./gradlew build
+RUN ./gradlew build -Pbaritone.forge_build -Ploom.platform=forge
+RUN ./gradlew build -Pbaritone.fabric_build
--- a/README.md
+++ b/README.md
@@ -1,142 +1,2 @@
-# 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="#Baritone"><img src="https://img.shields.io/badge/MC-1.12.2-brightgreen.svg" alt="Minecraft"/></a>
-  <a href="#Baritone"><img src="https://img.shields.io/badge/MC-1.13.2-yellow.svg" alt="Minecraft"/></a>
-  <a href="#Baritone"><img src="https://img.shields.io/badge/MC-1.14.4-yellow.svg" alt="Minecraft"/></a>
-  <a href="#Baritone"><img src="https://img.shields.io/badge/MC-1.15.2-yellow.svg" alt="Minecraft"/></a>
-  <a href="#Baritone"><img src="https://img.shields.io/badge/MC-1.16.5-yellow.svg" alt="Minecraft"/></a>
-  <a href="#Baritone"><img src="https://img.shields.io/badge/MC-1.17.1-yellow.svg" alt="Minecraft"/></a>
-  <a href="#Baritone"><img src="https://img.shields.io/badge/MC-1.18.2-yellow.svg" alt="Minecraft"/></a>
-  <a href="#Baritone"><img src="https://img.shields.io/badge/MC-1.19.2-brightgreen.svg" alt="Minecraft"/></a>
-  <a href="#Baritone"><img src="https://img.shields.io/badge/MC-1.19.4-brightgreen.svg" alt="Minecraft"/></a>
-  <a href="#Baritone"><img src="https://img.shields.io/badge/MC-1.20.1-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&style=flat" alt="Lines of Code"/>
-  <img src="https://img.shields.io/badge/Badges-36-blue.svg" alt="yes"/>
-</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/lambda-client/lambda"><img src="https://img.shields.io/badge/Lambda%20integration-v1.2.17-brightgreen.svg" alt="Lambda 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://web.archive.org/web/20230604002050/https://forthebadge.com/images/badges/built-with-swag.svg" alt="forthebadge"/></a>
-  <a href="http://forthebadge.com/"><img src="https://web.archive.org/web/20230604002050/https://forthebadge.com/images/badges/mom-made-pizza-rolls.svg" alt="forthebadge"/></a>
-</p>
-
-A Minecraft pathfinder bot.
-
-Baritone is the pathfinding system used in [Impact](https://impactclient.net/) since 4.4. [Here's](https://www.youtube.com/watch?v=StquF69-_wI) a (very old!) video I made showing off what it can do.
-
-[**Baritone Discord Server**](http://discord.gg/s6fRBAUpmr)
-
-**Quick download links:**
-
-| Forge                                                                                                         | Fabric                                                                                                        |
-|---------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------|
-| [1.12.2 Forge](https://github.com/cabaletta/baritone/releases/download/v1.2.19/baritone-api-forge-1.2.19.jar) |                                                                                                               |
-| [1.16.5 Forge](https://github.com/cabaletta/baritone/releases/download/v1.6.5/baritone-api-forge-1.6.5.jar)   | [1.16.5 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.6.5/baritone-api-fabric-1.6.5.jar) |
-| [1.17.1 Forge](https://github.com/cabaletta/baritone/releases/download/v1.7.3/baritone-api-forge-1.7.3.jar)   | [1.17.1 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.7.3/baritone-api-fabric-1.7.3.jar) |
-| [1.18.2 Forge](https://github.com/cabaletta/baritone/releases/download/v1.8.6/baritone-api-forge-1.8.6.jar)   | [1.18.2 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.8.6/baritone-api-fabric-1.8.6.jar) |
-| [1.19.2 Forge](https://github.com/cabaletta/baritone/releases/download/v1.9.4/baritone-api-forge-1.9.4.jar)   | [1.19.2 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.9.4/baritone-api-fabric-1.9.4.jar) |
-| [1.19.3 Forge](https://github.com/cabaletta/baritone/releases/download/v1.9.1/baritone-api-forge-1.9.1.jar)   | [1.19.3 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.9.1/baritone-api-fabric-1.9.1.jar) |
-| [1.19.4 Forge](https://github.com/cabaletta/baritone/releases/download/v1.9.3/baritone-api-forge-1.9.3.jar)   | [1.19.4 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.9.3/baritone-api-fabric-1.9.3.jar) |
-| [1.20.1 Forge](https://github.com/cabaletta/baritone/releases/download/v1.10.1/baritone-api-forge-1.10.1.jar)   | [1.20.1 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.10.1/baritone-api-fabric-1.10.1.jar) |
-| [1.20.3 Forge](https://github.com/cabaletta/baritone/releases/download/v1.10.2/baritone-api-forge-1.10.2.jar)   | [1.20.3 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.10.2/baritone-api-fabric-1.10.2.jar) |
-| [1.20.4 Forge](https://github.com/cabaletta/baritone/releases/download/v1.10.2/baritone-api-forge-1.10.2.jar)   | [1.20.4 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.10.2/baritone-api-fabric-1.10.2.jar) |
-
-**Message for 2b2t players looking for 1.19/1.20 Baritone** If you like, please try the beta for Baritone Elytra for 2b2t, find it in #announcements of [the Baritone discord](http://discord.gg/s6fRBAUpmr). It supports 1.19.4 and 1.20.1, Forge or Fabric. If you have to see it to believe it, watch [this YouTube video](https://youtu.be/NnSlQi-68eQ).
-
-**How to immediately get started:** Type `#goto 1000 500` in chat to go to x=1000 z=500. Type `#mine diamond_ore` to mine diamond ore. Type `#stop` to stop. For more, read [the usage page](USAGE.md) and/or watch this [tutorial playlist](https://www.youtube.com/playlist?list=PLnwnJ1qsS7CoQl9Si-RTluuzCo_4Oulpa). Also try `#elytra` for Elytra flying in the Nether using fireworks.
-
-For other versions of Minecraft or more complicated situations or for development, see [Installation & setup](SETUP.md). Also consider just installing [Impact](https://impactclient.net/), which comes with Baritone and is easier to install than wrangling with version JSONs and zips. For 1.16.5, [click here](https://www.youtube.com/watch?v=_4eVJ9Qz2J8) and see description. Once Baritone is installed, look [here](USAGE.md) for instructions on how to use it. There's a [showcase video](https://youtu.be/CZkLXWo4Fg4) made by @Adovin#6313 on Baritone which I recommend.
-
-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.

-Download java: https://adoptium.net/
+Open JDK download: https://openjdk.java.net/install/
 #### macOS guide
 In order to get JDK 8, Try running the following command:
 `% /usr/libexec/java_home -V`
@@ -66,13 +66,68 @@ In order to get JDK 8 running in the **current terminal window** you will have t

 To add OpenJDK 8 to your PATH add the export line to the end of your `.zshrc / .bashrc` if you want it to apply to each new terminal. If you're using bash change the .bachrc and if you're using zsh change the .zshrc

-### Building Baritone
+Setting up the Environment:

-These tasks depend on the minecraft version, but are (for the most part) standard for building mods.
+```
+$ gradlew setupDecompWorkspace
+$ gradlew --refresh-dependencies
+```

-for more details, see [the build ci action](/.github/workflows/gradle_build.yml)
+Building Baritone: 
+
+```
+$ gradlew build
+```
+
+For minecraft 1.15.2+, run the following instead to include the Forge jars:
+
+```
+$ gradlew build -Pbaritone.forge_build
+```
+
+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)

 ## IntelliJ
 - Open the project in IntelliJ as a Gradle project
+  
+  ![Image](https://i.imgur.com/jw7Q6vY.png)
+
+- Run the Gradle tasks `setupDecompWorkspace` then `genIntellijRuns`
+  
+  ![Image](https://i.imgur.com/QEfVvWP.png)
+
 - Refresh the Gradle project (or, to be safe, just restart IntelliJ)
- depending on the minecraft version, you may need to run `setupDecompWorkspace` or `genIntellijRuns` in order to get everything working
+  
+  ![Image](https://i.imgur.com/3V7EdWr.png)
+
+- Select the "Minecraft Client" launch config
+  
+  ![Image](https://i.imgur.com/1qz2QGV.png)
+
+- Click on ``Edit Configurations...`` from the same dropdown and select the "Minecraft Client" config
+  
+  ![Image](https://i.imgur.com/s4ly0ZF.png)
+
+- In `Edit Configurations...` you need to select `baritone_launch` for `Use classpath of module:`.
+  
+  ![Image](https://i.imgur.com/hrLhG9u.png)
+
+## IntelliJ
+
+- Navigate to the gradle tasks on the right tab as follows
+
+  ![Image](https://i.imgur.com/PE6r9iN.png)
+
+- Double click on **build** to run it
--- a/build.gradle
+++ b/build.gradle
@@ -15,116 +15,34 @@
 * 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 = ""
-    try {
-        vers = 'git describe --always --tags --first-parent --dirty'.execute().text.trim()
-    } catch (Exception e) {
-        println "Version detection failed: " + e
-    }
-    if (!vers.startsWith("v")) {
-        println "using version number: " + rootProject.mod_version
-        version = rootProject.mod_version
-    } else {
-        version = vers.substring(1)
-        println "Detected version " + version
-    }
-    group = rootProject.maven_group
-
-    sourceCompatibility = targetCompatibility = JavaVersion.toVersion(project.java_version)
-    
-    java {
-        toolchain {
-            languageVersion.set(JavaLanguageVersion.of(sourceCompatibility.majorVersion.toInteger()))
-        }
-    }
-
-    repositories {
-        maven {
-            name = 'spongepowered-repo'
-            url = 'https://repo.spongepowered.org/repository/maven-public/'
-        }
-        maven {
-            name = 'fabric-maven'
-            url = 'https://maven.fabricmc.net/'
-        }
-        maven {
-            name = 'impactdevelopment-repo'
-            url = 'https://impactdevelopment.github.io/maven/'
-        }
-        maven {
-            name = "ldtteam"
-            url = "https://maven.parchmentmc.net/"
-        }
-        // for the newer version of launchwrapper
-        maven {
-            name = "multimc-maven"
-            url = "https://files.multimc.org/maven/"
-            metadataSources {
-                artifact()
-            }
-        }
-        mavenCentral()
-        maven {
-            name = 'babbaj-repo'
-            url = 'https://babbaj.github.io/maven/'
-        }
-    }
-
-    dependencies {
-        compileOnly "org.spongepowered:mixin:0.8"
-        compileOnly "org.ow2.asm:asm:9.7"
-        // The following line declares the yarn mappings you may select this one as well.
-        // mappings "net.fabricmc:yarn:1.17.1+build.32:v2"
-        //launchImplementation('dev.babbaj:nether-pathfinder:1.3.0')
-        implementation "dev.babbaj:nether-pathfinder:${project.nether_pathfinder_version}"
-
-        implementation 'com.google.code.findbugs:jsr305:3.0.2'
-    }
-
-    unimined.minecraft(sourceSets.main, true) {
-        version rootProject.minecraft_version
-
-        mappings {
-            intermediary()
-            mojmap()
-            parchment("1.20.6", "2024.05.01")
-
-            devFallbackNamespace "official"
-        }
-    }
-
-    tasks.withType(JavaCompile).configureEach {
-        it.options.encoding = "UTF-8"
-
-        def targetVersion = project.java_version.toInteger()
-        if (JavaVersion.current().isJava9Compatible()) {
-            it.options.release = targetVersion
-        }
-    }
+plugins {
+    id 'java'
+    id 'dev.architectury.loom' version '0.10.0-SNAPSHOT'
+    id 'maven-publish'
 }

-unimined.minecraft {
-    runs.off = true
-    defaultRemapJar = false
-}

-archivesBaseName = archivesBaseName + "-common"
+archivesBaseName  = project.archives_base_name
+version = project.mod_version
+group = project.maven_group
+
+import baritone.gradle.task.CreateDistTask
+import baritone.gradle.task.ProguardTask
+
+def compileType = project.hasProperty("baritone.fabric_build") ? "FABRIC" : project.hasProperty("baritone.forge_build") ? "FORGE" : "OFFICIAL"
+
+sourceCompatibility = targetCompatibility = JavaVersion.VERSION_16
+
+compileJava {
+    options.encoding = "UTF-8" // allow emoji in comments :^)
+}

 sourceSets {
    api {
        compileClasspath += main.compileClasspath
-        runtimeClasspath += main.runtimeClasspath
    }
    main {
        compileClasspath += api.output
-        runtimeClasspath += api.output
    }
    test {
        compileClasspath += main.compileClasspath + main.runtimeClasspath + main.output
@@ -136,20 +54,63 @@ sourceSets {
    }
    schematica_api {
        compileClasspath += main.compileClasspath
-        runtimeClasspath += main.runtimeClasspath
    }
    main {
        compileClasspath += schematica_api.output
-        runtimeClasspath += schematica_api.output
    }
 }

-dependencies {
-    testImplementation 'junit:junit:4.13.2'
+loom {
+    if (compileType.equals("FORGE")) {
+        forge {
+            mixinConfig 'mixins.baritone.json'
+        }
+    }
+    mixin.defaultRefmapName = "mixins.baritone.refmap.json"
+
+    runs {
+        client {
+            source = sourceSets.launch
+        }
+    }
 }

-jar {
-    from sourceSets.main.output, sourceSets.launch.output, sourceSets.api.output
+
+repositories {
+    maven {
+        name = 'impactdevelopment-repo'
+        url = 'https://impactdevelopment.github.io/maven/'
+    }
+    maven {
+        name = "ldtteam"
+        url = "https://maven.parchmentmc.net/"
+    }
+    mavenCentral()
+}
+
+dependencies {
+    if (compileType.equals("FORGE")) {
+        forge "net.minecraftforge:forge:${project.forge_version}"
+    }
+    mappings loom.layered() {
+        officialMojangMappings()
+        //technically optional, but really helpful in dev:
+        parchment("org.parchmentmc.data:parchment-1.17.1:2021.10.24@zip" as String)
+    }
+    minecraft "com.mojang:minecraft:${project.minecraft_version}"
+    if (!compileType.equals("FORGE")) {
+        modImplementation "net.fabricmc:fabric-loader:${project.fabric_version}"
+    }
+    // this makes it compile with the forge tweak stuff
+    implementation 'com.github.ImpactDevelopment:SimpleTweaker:1.2'
+    implementation('net.minecraft:launchwrapper:1.12') {
+        exclude module: 'lwjgl'
+        exclude module: 'asm-debug-all'
+    }
+
+    implementation 'com.google.code.findbugs:jsr305:3.0.2'
+
+    testImplementation 'junit:junit:4.12'
 }

 javadoc {
@@ -159,3 +120,71 @@ javadoc {
    source = sourceSets.api.allJava
    classpath += sourceSets.api.compileClasspath
 }
+
+// skidded from fabric-example-mod (comments and all)
+tasks.withType(JavaCompile).configureEach {
+    // ensure that the encoding is set to UTF-8, no matter what the system default is
+    // this fixes some edge cases with special characters not displaying correctly
+    // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+    // If Javadoc is generated, this must be specified in that task too.
+    it.options.encoding = "UTF-8"
+
+    // The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
+    // JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
+    // We'll use that if it's available, but otherwise we'll use the older option.
+    def targetVersion = 16
+    if (JavaVersion.current().isJava9Compatible()) {
+        it.options.release = targetVersion
+    }
+}
+
+
+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,
+        )
+    }
+}
+
+if (compileType.equals("OFFICIAL")) {
+    remapJar {
+        toM.set "official"
+    }
+}
+
+
+
+task proguard(type: ProguardTask) {
+    url 'https://downloads.sourceforge.net/project/proguard/v7.1.0-beta5/proguard-7.1.0-beta5.zip'
+    extract 'proguard-7.1.0-beta5/lib/proguard.jar'
+    compType compileType
+}
+
+task createDist(type: CreateDistTask, dependsOn: proguard)
+
+
+build.finalizedBy(createDist)
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -16,29 +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/'
-    }
-    maven {
-        name = 'NeoForgedMaven'
-        url = 'https://maven.neoforged.net/'
-    }
    mavenCentral()
 }

 dependencies {
-    implementation group: 'com.google.code.gson', name: 'gson', version: '2.9.0'
-    implementation group: 'commons-io', name: 'commons-io', version: '2.7'
-
-    implementation group: 'xyz.wagyourtail.unimined', name: 'xyz.wagyourtail.unimined.gradle.plugin', version: '1.2.9'
+    implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
+    implementation group: 'commons-io', name: 'commons-io', version: '2.6'
 }
--- 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;
@@ -36,56 +33,50 @@ import java.nio.file.Paths;
 class BaritoneGradleTask extends DefaultTask {

    protected static final String
-            PROGUARD_ZIP                    = "proguard-%s.zip",
-            PROGUARD_JAR                    = "proguard-%s.jar",
+            PROGUARD_ZIP                    = "proguard.zip",
+            PROGUARD_JAR                    = "proguard.jar",
            PROGUARD_CONFIG_TEMPLATE        = "scripts/proguard.pro",
            PROGUARD_CONFIG_DEST            = "template.pro",
            PROGUARD_API_CONFIG             = "api.pro",
            PROGUARD_STANDALONE_CONFIG      = "standalone.pro",
            PROGUARD_EXPORT_PATH            = "proguard_out.jar",
-            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);
    }
@@ -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(new File(getProject().getBuildDir(), "../"), 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
@@ -21,9 +21,7 @@ import org.gradle.api.tasks.TaskAction;

 import java.nio.charset.StandardCharsets;
 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,21 +59,35 @@ 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) {
--- a/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java
+++ b/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java
@@ -18,31 +18,27 @@
 package baritone.gradle.task;

 import baritone.gradle.util.Determinizer;
+import org.apache.commons.io.IOUtils;
 import org.gradle.api.plugins.JavaPluginConvention;
 import org.gradle.api.tasks.Input;
-import org.gradle.api.tasks.SourceSetContainer;
 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.jvm.Jvm;
-import org.gradle.jvm.toolchain.JavaLanguageVersion;
-import org.gradle.jvm.toolchain.JavaLauncher;
-import org.gradle.jvm.toolchain.JavaToolchainService;
-import xyz.wagyourtail.unimined.api.UniminedExtension;
-import xyz.wagyourtail.unimined.api.minecraft.MinecraftConfig;

 import java.io.*;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;

+import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
+
 /**
 * @author Brady
 * @since 10/11/2018
@@ -50,40 +46,69 @@ import java.util.zip.ZipFile;
 public class ProguardTask extends BaritoneGradleTask {

    @Input
-    private String proguardVersion;
+    private String url;

-    public String getProguardVersion() {
-        return proguardVersion;
+    public String getUrl() {
+        return url;
    }

-    private List<String> requiredLibraries;
+    @Input
+    private String extract;
+
+    public String getExtract() {
+        return extract;
+    }
+
+    @Input
+    private String compType;
+
+    public String getCompType() {
+        return compType;
+    }
+
+    private final File copyMcTargetDir = new File("./build/createMcIntermediaryJar").getAbsoluteFile();
+    private final File copyMcTargetJar = new File(copyMcTargetDir, "client.jar");

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

+        copyMcJar();
+
        // "Haha brady why don't you make separate tasks"
+        processArtifact();
        downloadProguard();
        extractProguard();
        generateConfigs();
-        processArtifact();
        proguardApi();
        proguardStandalone();
        cleanup();
    }

-    UniminedExtension ext = getProject().getExtensions().getByType(UniminedExtension.class);
-    SourceSetContainer sourceSets = getProject().getExtensions().getByType(SourceSetContainer.class);
-
-    private File getMcJar() {
-        MinecraftConfig mcc = ext.getMinecrafts().get(sourceSets.getByName("main"));
-        return mcc.getMinecraft(mcc.getMcPatcher().getProdNamespace(), mcc.getMcPatcher().getProdNamespace()).toFile();
+    private boolean isMcJar(File f) {
+        return f.getName().startsWith(compType.equals("FORGE") ? "forge-" : "minecraft-") && f.getName().contains("minecraft-mapped");
    }

-    private boolean isMcJar(File f) {
-        MinecraftConfig mcc = ext.getMinecrafts().get(sourceSets.getByName("main"));
-        return mcc.isMinecraftJar(f.toPath());
+    private void copyMcJar() throws IOException {
+        File mcClientJar = this.getProject().getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("launch").getRuntimeClasspath().getFiles()
+            .stream()
+            .filter(this::isMcJar)
+            .map(f -> {
+                switch (compType) {
+                    case "OFFICIAL":
+                        return new File(f.getParentFile().getParentFile(), "minecraft-merged.jar");
+                    case "FABRIC":
+                        return new File(f.getParentFile(), "minecraft-intermediary.jar");
+                    case "FORGE":
+                        return new File(f.getParentFile(), "minecraft-srg.jar");
+                }
+                return null;
+                })
+            .findFirst()
+            .get();
+        if (!mcClientJar.exists()) throw new IOException("Failed to find minecraft! " + mcClientJar.getAbsolutePath());
+        if (!copyMcTargetDir.exists() && !copyMcTargetDir.mkdirs()) throw new IOException("Failed to create target for copyMcJar");
+        Files.copy(mcClientJar.toPath(), copyMcTargetJar.toPath(), REPLACE_EXISTING);
    }

    private void processArtifact() throws Exception {
@@ -91,41 +116,124 @@ public class ProguardTask extends BaritoneGradleTask {
            Files.delete(this.artifactUnoptimizedPath);
        }

-        Determinizer.determinize(this.artifactPath.toString(), this.artifactUnoptimizedPath.toString(), List.of(), false);
+        Determinizer.determinize(this.artifactPath.toString(), this.artifactUnoptimizedPath.toString());
    }

    private void downloadProguard() throws Exception {
-        Path proguardZip = getTemporaryFile(String.format(PROGUARD_ZIP, proguardVersion));
+        Path proguardZip = getTemporaryFile(PROGUARD_ZIP);
        if (!Files.exists(proguardZip)) {
-            write(new URL(String.format("https://github.com/Guardsquare/proguard/releases/download/v%s/proguard-%s.zip", proguardVersion, proguardVersion)).openStream(), proguardZip);
+            write(new URL(this.url).openStream(), proguardZip);
        }
    }

    private void extractProguard() throws Exception {
-        Path proguardJar = getTemporaryFile(String.format(PROGUARD_JAR, proguardVersion));
+        Path proguardJar = getTemporaryFile(PROGUARD_JAR);
        if (!Files.exists(proguardJar)) {
-            ZipFile zipFile = new ZipFile(getTemporaryFile(String.format(PROGUARD_ZIP, proguardVersion)).toFile());
-            ZipEntry zipJarEntry = zipFile.getEntry(String.format("proguard-%s/lib/proguard.jar", proguardVersion));
+            ZipFile zipFile = new ZipFile(getTemporaryFile(PROGUARD_ZIP).toFile());
+            ZipEntry zipJarEntry = zipFile.getEntry(this.extract);
            write(zipFile.getInputStream(zipJarEntry), proguardJar);
            zipFile.close();
        }
    }

-    private JavaLauncher getJavaLauncherForProguard() {
-        var toolchains = getProject().getExtensions().getByType(JavaToolchainService.class);
-        var toolchain = toolchains.launcherFor((spec) -> {
-            spec.getLanguageVersion().set(JavaLanguageVersion.of(getProject().findProperty("java_version").toString()));
-        }).getOrNull();
-
-        if (toolchain == null) {
-            throw new IllegalStateException("Java toolchain not found");
+    private String getJavaBinPathForProguard() throws Exception {
+        String path;
+        try {
+            path = findJavaPathByGradleConfig();
+            if (path != null) return path;
+        }
+        catch (Exception ex) {
+            System.err.println("Unable to find java by javaCompile options");
+            ex.printStackTrace();
        }

-        return toolchain;
+        try {
+            path = findJavaByJavaHome();
+            if (path != null) return path;
+        }
+        catch(Exception ex) {
+            System.err.println("Unable to find java by JAVA_HOME");
+            ex.printStackTrace();
+        }
+
+
+        path = findJavaByGradleCurrentRuntime();
+        if (path != null) return path;
+        
+        throw new Exception("Unable to find java to determine ProGuard libraryjars. Please specify forkOptions.executable in javaCompile," +
+                " JAVA_HOME environment variable, or make sure to run Gradle with the correct JDK (a v1.8 only)");
+    }
+
+    private String findJavaByGradleCurrentRuntime() {
+        String path = Jvm.current().getJavaExecutable().getAbsolutePath();
+
+        if (this.validateJavaVersion(path)) {
+            System.out.println("Using Gradle's runtime Java for ProGuard");
+            return path;
+        }
+        return null;
+    }
+
+    private String findJavaByJavaHome() {
+        final String javaHomeEnv = System.getenv("JAVA_HOME");
+        if (javaHomeEnv != null) {
+
+            String path = Jvm.forHome(new File(javaHomeEnv)).getJavaExecutable().getAbsolutePath();
+            if (this.validateJavaVersion(path)) {
+                System.out.println("Detected Java path by JAVA_HOME");
+                return path;
+            }
+        }
+        return null;
+    }
+
+    private String findJavaPathByGradleConfig() {
+        final TaskCollection<JavaCompile> javaCompiles = super.getProject().getTasks().withType(JavaCompile.class);
+
+        final JavaCompile compileTask = javaCompiles.iterator().next();
+        final ForkOptions forkOptions = compileTask.getOptions().getForkOptions();
+
+        if (forkOptions != null) {
+            String javacPath = forkOptions.getExecutable();
+            if (javacPath != null) {
+                File javacFile = new File(javacPath);
+                if (javacFile.exists()) {
+                    File[] maybeJava = javacFile.getParentFile().listFiles(new FilenameFilter() {
+                        @Override
+                        public boolean accept(File dir, String name) {
+                            return name.equals("java");
+                        }
+                    });
+
+                    if (maybeJava != null && maybeJava.length > 0) {
+                        String path = maybeJava[0].getAbsolutePath();
+                        if (this.validateJavaVersion(path)) {
+                            System.out.println("Detected Java path by forkOptions");
+                            return path;
+                        }
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    private boolean validateJavaVersion(String java) {
+        //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");
+        return true;
    }

    private void generateConfigs() throws Exception {
-        Files.copy(getRootRelativeFile(PROGUARD_CONFIG_TEMPLATE), getTemporaryFile(PROGUARD_CONFIG_DEST), StandardCopyOption.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));
@@ -134,79 +242,50 @@ public class ProguardTask extends BaritoneGradleTask {

        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)");

        {
            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, and nashorn
+                    .filter(f -> !f.toString().endsWith("-recomp.jar") && !f.getName().startsWith("nashorn") && !f.getName().startsWith("coremods"));

                libraries = dependencies
-                        .map(f -> isMcJar(f) ? mcJar : f);
+                    .map(f -> isMcJar(f) ? copyMcTargetJar : f);
            }
            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()
-                .stream()
-                .filter(File::isFile);
+        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));
-        Determinizer.determinize(this.proguardOut.toString(), this.artifactApiPath.toString(), List.of(), false);
+        runProguard(getTemporaryFile(PROGUARD_API_CONFIG));
+        Determinizer.determinize(this.proguardOut.toString(), this.artifactApiPath.toString());
    }

    private void proguardStandalone() throws Exception {
-        runProguard(getTemporaryFile(compType + PROGUARD_STANDALONE_CONFIG));
-        Determinizer.determinize(this.proguardOut.toString(), this.artifactStandalonePath.toString(), List.of(), false);
-    }
-
-    private static final class Pair<A, B> {
-        public final A a;
-        public final B b;
-
-        private Pair(final A a, final B b) {
-            this.a = a;
-            this.b = b;
-        }
-
-        @Override
-        public String toString() {
-            return "Pair{" +
-                    "a=" + this.a +
-                    ", " +
-                    "b=" + this.b +
-                    '}';
-        }
+        runProguard(getTemporaryFile(PROGUARD_STANDALONE_CONFIG));
+        Determinizer.determinize(this.proguardOut.toString(), this.artifactStandalonePath.toString());
    }

    private void cleanup() {
@@ -215,8 +294,16 @@ public class ProguardTask extends BaritoneGradleTask {
        } catch (IOException ignored) {}
    }

-    public void setProguardVersion(String url) {
-        this.proguardVersion = url;
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public void setExtract(String extract) {
+        this.extract = extract;
+    }
+
+    public void setCompType(String compType) {
+        this.compType = compType;
    }

    private void runProguard(Path config) throws Exception {
@@ -225,15 +312,38 @@ public class ProguardTask extends BaritoneGradleTask {
            Files.delete(this.proguardOut);
        }

+        // Make paths relative to work directory; fixes spaces in path to config, @"" doesn't work
        Path workingDirectory = getTemporaryFile("");
+        Path proguardJar = workingDirectory.relativize(getTemporaryFile(PROGUARD_JAR));
+        config = workingDirectory.relativize(config);
+        
+        // Honestly, if you still have spaces in your path at this point, you're SOL.

-        getProject().javaexec(spec -> {
-            spec.workingDir(workingDirectory.toFile());
-            spec.args("@" + workingDirectory.relativize(config));
-            spec.classpath(getTemporaryFile(String.format(PROGUARD_JAR, proguardVersion)));
+        Process p = new ProcessBuilder("java", "-jar", proguardJar.toString(), "@" + config.toString())
+                .directory(workingDirectory.toFile()) // Set the working directory to the temporary folder]
+                .start();

-            spec.executable(getJavaLauncherForProguard().getExecutablePath().getAsFile());
-        }).assertNormalExitValue().rethrowFailure();
+        // We can't do output inherit process I/O with gradle for some reason and have it work, so we have to do this
+        this.printOutputLog(p.getInputStream(), System.out);
+        this.printOutputLog(p.getErrorStream(), System.err);
+
+        // Halt the current thread until the process is complete, if the exit code isn't 0, throw an exception
+        int exitCode = p.waitFor();
+        if (exitCode != 0) {
+            throw new IllegalStateException("Proguard exited with code " + exitCode);
+        }
    }

+    private void printOutputLog(InputStream stream, PrintStream outerr) {
+        new Thread(() -> {
+            try (BufferedReader reader = new BufferedReader(new InputStreamReader(stream))) {
+                String line;
+                while ((line = reader.readLine()) != null) {
+                    outerr.println(line);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }).start();
+    }
 }
--- a/buildSrc/src/main/java/baritone/gradle/util/Determinizer.java
+++ b/buildSrc/src/main/java/baritone/gradle/util/Determinizer.java
@@ -39,11 +39,10 @@ import java.util.stream.Collectors;
 */
 public class Determinizer {

-    public static void determinize(String inputPath, String outputPath, List<File> toInclude, boolean doForgeReplacementOfMetaInf) throws IOException {
+    public static void determinize(String inputPath, String outputPath) throws IOException {
        System.out.println("Running Determinizer");
        System.out.println(" Input path: " + inputPath);
        System.out.println(" Output path: " + outputPath);
-        System.out.println(" Shade: " + toInclude);

        try (
                JarFile jarFile = new JarFile(new File(inputPath));
@@ -65,35 +64,14 @@ public class Determinizer {
                clone.setTime(42069);
                jos.putNextEntry(clone);
                if (entry.getName().endsWith(".refmap.json")) {
-                    JsonElement json = new JsonParser().parse(new InputStreamReader(jarFile.getInputStream(entry)));
-                    jos.write(writeSorted(json).getBytes());
-                } else if (entry.getName().equals("META-INF/MANIFEST.MF") && doForgeReplacementOfMetaInf) { // only replace for forge jar
-                    ByteArrayOutputStream cancer = new ByteArrayOutputStream();
-                    copy(jarFile.getInputStream(entry), cancer);
-                    String manifest = new String(cancer.toByteArray());
-                    if (!manifest.contains("baritone.launch.tweaker.BaritoneTweaker")) {
-                        throw new IllegalStateException("unable to replace");
-                    }
-                    manifest = manifest.replace("baritone.launch.tweaker.BaritoneTweaker", "org.spongepowered.asm.launch.MixinTweaker");
-                    jos.write(manifest.getBytes());
+                    JsonObject object = new JsonParser().parse(new InputStreamReader(jarFile.getInputStream(entry))).getAsJsonObject();
+                    jos.write(writeSorted(object).getBytes());
                } else {
                    copy(jarFile.getInputStream(entry), jos);
                }
            }
-            for (File file : toInclude) {
-                try (JarFile mixin = new JarFile(file)) {
-                    for (JarEntry entry : mixin.stream().sorted(Comparator.comparing(JarEntry::getName)).collect(Collectors.toList())) {
-                        if (entry.getName().startsWith("META-INF") && !entry.getName().startsWith("META-INF/services")) {
-                            continue;
-                        }
-                        jos.putNextEntry(entry);
-                        copy(mixin.getInputStream(entry), jos);
-                    }
-                }
-            }
            jos.finish();
        }
-        System.out.println("Done with determinizer");
    }

    private static void copy(InputStream is, OutputStream os) throws IOException {
@@ -104,7 +82,7 @@ public class Determinizer {
        }
    }

-    private static String writeSorted(JsonElement in) throws IOException {
+    private static String writeSorted(JsonObject in) throws IOException {
        StringWriter writer = new StringWriter();
        JsonWriter jw = new JsonWriter(writer);
        ORDERED_JSON_WRITER.write(jw, in);
--- 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 "8.0.0"
-}
-
-archivesBaseName = archivesBaseName + "-fabric"
-
-unimined.minecraft {
-    fabric {
-        loader project.fabric_version
-    }
-}
-
-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 {
-    // 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
-    }
-    include "dev.babbaj:nether-pathfinder:${project.nether_pathfinder_version}"
-}
-
-processResources {
-    inputs.property "version", project.version
-
-    filesMatching("fabric.mod.json") {
-        expand "version": project.version
-    }
-}
-
-shadowJar {
-    configurations = [project.configurations.shadowCommon]
-    archiveClassifier.set "dev-shadow"
-}
-
-remapJar {
-    inputFile.set shadowJar.archiveFile
-    dependsOn shadowJar
-    archiveClassifier.set null
-}
-
-jar {
-    archiveClassifier.set "dev"
-}
-
-components.java {
-    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-        skip()
-    }
-}
-
-task proguard(type: ProguardTask) {
-    proguardVersion "7.4.2"
-    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,120 +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 "8.0.0"
-}
-
-archivesBaseName = archivesBaseName + "-forge"
-
-unimined.minecraft {
-    minecraftForge {
-        loader project.forge_version
-        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 {
-    // 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
-    }
-    shadowCommon "dev.babbaj:nether-pathfinder:${project.nether_pathfinder_version}"
-}
-
-processResources {
-    inputs.property "version", project.version
-
-    filesMatching("META-INF/mods.toml") {
-        expand "version": project.version
-    }
-}
-
-shadowJar {
-    configurations = [project.configurations.shadowCommon]
-    archiveClassifier.set "dev-shadow"
-}
-
-remapJar {
-    inputFile.set shadowJar.archiveFile
-    dependsOn shadowJar
-    archiveClassifier.set null
-}
-
-jar {
-    archiveClassifier.set "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) {
-    proguardVersion "7.4.2"
-    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/java/baritone/launch/BaritoneForgeModXD.java
+++ b/forge/src/main/java/baritone/launch/BaritoneForgeModXD.java
@@ -1,22 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.launch;import net.minecraftforge.fml.common.Mod;
-
-@Mod("baritoe")
-public class BaritoneForgeModXD {
-}
--- 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,19 +1,13 @@
-org.gradle.jvmargs=-Xmx4G
+org.gradle.jvmargs=-Xmx2048M

-available_loaders=fabric,forge,neoforge,tweaker
-
-mod_version=1.11.0
+mod_version=1.7.3
 maven_group=baritone
 archives_base_name=baritone

-java_version=21
+minecraft_version=1.17.1
+forge_version=1.17.1-37.0.69
+fabric_version=0.11.6

-minecraft_version=1.21
-
-forge_version=51.0.16
-
-neoforge_version=20-beta
-
-fabric_version=0.15.11
-
-nether_pathfinder_version=1.4.1
+# # un comment for forge debugging default (as opposed to fabric)
+# baritone.forge_build=true
+# loom.platform=forge
--- 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,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/55
+++ b/55
@@ -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"
@@ -72,7 +56,7 @@ case "`uname`" in
  Darwin* )
    darwin=true
    ;;
-  MSYS* | MINGW* )
+  MINGW* )
    msys=true
    ;;
  NONSTOP* )
@@ -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/neoforge/build.gradle
+++ b/neoforge/build.gradle
@@ -1,130 +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 "8.0.0"
-}
-
-archivesBaseName = archivesBaseName + "-neoforge"
-
-unimined.minecraft {
-
-    neoForged {
-        loader project.neoforge_version
-        mixinConfig ["mixins.baritone.json"]
-    }
-
-    minecraftRemapper.config {
-        // neoforge adds 1 conflict, where 2 interfaces have a method with the same name on yarn/mojmap,
-        // but the method has different names in the intermediary mappings.
-        // this is a conflict because they have a class that extends both interfaces.
-        // this shouldn't be a problem as long as named mappings don't make the name of those 2 methods different.
-        ignoreConflicts(true)
-    }
-
-}
-
-//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 {
-    // 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
-    }
-    shadowCommon "dev.babbaj:nether-pathfinder:${project.nether_pathfinder_version}"
-}
-
-processResources {
-    inputs.property "version", project.version
-
-    filesMatching("META-INF/neoforge.mods.toml") {
-        expand "version": project.version
-    }
-}
-
-shadowJar {
-    configurations = [project.configurations.shadowCommon]
-    archiveClassifier.set "dev-shadow"
-}
-
-remapJar {
-    inputFile.set shadowJar.archiveFile
-    dependsOn shadowJar
-    archiveClassifier.set null
-}
-
-jar {
-    archiveClassifier.set "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) {
-    proguardVersion "7.4.2"
-    compType "neoforge"
-}
-
-task createDist(type: CreateDistTask, dependsOn: proguard) {
-    compType "neoforge"
-}
-
-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/neoforge/gradle.properties
+++ b/neoforge/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/neoforge/src/main/java/baritone/launch/BaritoneForgeModXD.java
+++ b/neoforge/src/main/java/baritone/launch/BaritoneForgeModXD.java
@@ -1,25 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.launch;
-
-import net.neoforged.api.distmarker.Dist;
-import net.neoforged.fml.common.Mod;
-
-@Mod(value = "baritoe", dist = Dist.CLIENT)
-public class BaritoneForgeModXD {
-}
--- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml
+++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -1,40 +0,0 @@
-# This is an example neoforge.mods.toml file. It contains the data relating to the loading mods.
-# There are several mandatory fields (#mandatory), and many more that are optional (#optional).
-# The overall format is standard TOML format, v0.5.0.
-# Note that there are a couple of TOML lists in this file.
-# Find more information on toml format here:  https://github.com/toml-lang/toml
-# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
-modLoader="javafml" #mandatory
-# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
-loaderVersion="[1,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
-license="https://raw.githubusercontent.com/cabaletta/baritone/1.16.2/LICENSE"
-# A URL to refer people to when problems occur with this mod
-issueTrackerURL="https://github.com/cabaletta/baritone/issues" #optional
-# A list of mods - how many allowed here is determined by the individual mod loader
-[[mods]] #mandatory
-# The modid of the mod
-modId="baritoe" #mandatory
-# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it
-version="${version}" #mandatory
- # A display name for the mod
-displayName="Baritone" #mandatory
-# A URL for the "homepage" for this mod, displayed in the mod UI
-displayURL="https://github.com/cabaletta/baritone" #optional
-# A file name (in the root of the mod JAR) containing a logo for display
-#logoFile="examplemod.png" #optional
-# A text field displayed in the mod UI
-credits="Hat Gamers" #optional
-# A text field displayed in the mod UI
-authors="leijurv, Brady" #optional
-# The description text for the mod (multi line!) (#mandatory)
-description='''
-A Minecraft pathfinder bot.
-'''
-
-[[dependencies.baritoe]]
-modId="minecraft"
-type="required"
-# This version range declares a minimum of the current minecraft version up to but not including the next major version
-versionRange="[1.21]"
-ordering="NONE"
-side="BOTH"
--- a/neoforge/src/main/resources/pack.mcmeta
+++ b/neoforge/src/main/resources/pack.mcmeta
@@ -1,6 +0,0 @@
-{
-    "pack": {
-        "description": "null",
-        "pack_format": 8
-    }
-}
--- a/scripts/proguard.pro
+++ b/scripts/proguard.pro
@@ -19,8 +19,6 @@
 -dontwarn module-info
 # we dont have forge
 -dontwarn baritone.launch.BaritoneForgeModXD
-# progard doesn't like signature polymorphism
-dontwarn java.lang.invoke.MethodHandle

 # please do not change the comment below
 -keep class baritone.api.** { *; } # this is the keep api
@@ -341,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
@@ -17,31 +17,26 @@

 pluginManagement {
    repositories {
-        mavenLocal()
+        maven { url "https://maven.architectury.dev/" }
        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"
-            }
+        maven {
+            name = 'forge'
+            url = 'https://files.minecraftforge.net/maven'
        }
+        maven {
+            name = 'impactdevelopment-repo'
+            url = 'https://impactdevelopment.github.io/maven/'
+        }
+        maven {
+            url = 'https://www.dogforce-games.com/maven/'
+        }
+        maven {
+            url = 'https://libraries.minecraft.net/'
+        }
+        mavenCentral()
    }
 }

 rootProject.name = 'baritone'
-
-include("tweaker")
-for (platform in available_loaders.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.SETTINGS_DEFAULT_NAME);
+        SettingsUtil.readAndApply(settings);

        try {
            provider = (IBaritoneProvider) Class.forName("baritone.BaritoneProvider").newInstance();
--- a/src/api/java/baritone/api/IBaritone.java
+++ b/src/api/java/baritone/api/IBaritone.java
@@ -88,12 +88,6 @@ public interface IBaritone {
     */
    IGetToBlockProcess getGetToBlockProcess();

-    /**
-     * @return The {@link IElytraProcess} instance
-     * @see IElytraProcess
-     */
-    IElytraProcess getElytraProcess();
-
    /**
     * @return The {@link IWorldProvider} instance
     * @see IWorldProvider
--- a/src/api/java/baritone/api/IBaritoneProvider.java
+++ b/src/api/java/baritone/api/IBaritoneProvider.java
@@ -21,12 +21,9 @@ 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.multiplayer.ClientPacketListener;
-import net.minecraft.client.player.LocalPlayer;
-
 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.
@@ -54,13 +51,15 @@ public interface IBaritoneProvider {
    List<IBaritone> getAllBaritones();

    /**
-     * Provides the {@link IBaritone} instance for a given {@link LocalPlayer}.
+     * 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}.
     *
     * @param player The player
     * @return The {@link IBaritone} instance.
     */
    default IBaritone getBaritoneForPlayer(LocalPlayer player) {
-        for (IBaritone baritone : this.getAllBaritones()) {
+        for (IBaritone baritone : getAllBaritones()) {
            if (Objects.equals(player, baritone.getPlayerContext().player())) {
                return baritone;
            }
@@ -68,55 +67,6 @@ public interface IBaritoneProvider {
        return null;
    }

-    /**
-     * Provides the {@link IBaritone} instance for a given {@link Minecraft}.
-     *
-     * @param minecraft The minecraft
-     * @return The {@link IBaritone} instance.
-     */
-    default IBaritone getBaritoneForMinecraft(Minecraft minecraft) {
-        for (IBaritone baritone : this.getAllBaritones()) {
-            if (Objects.equals(minecraft, baritone.getPlayerContext().minecraft())) {
-                return baritone;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Provides the {@link IBaritone} instance for the player with the specified connection.
-     *
-     * @param connection The connection
-     * @return The {@link IBaritone} instance.
-     */
-    default IBaritone getBaritoneForConnection(ClientPacketListener connection) {
-        for (IBaritone baritone : this.getAllBaritones()) {
-            final LocalPlayer player = baritone.getPlayerContext().player();
-            if (player != null && player.connection == connection) {
-                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
@@ -17,32 +17,24 @@

 package baritone.api;

-import baritone.api.utils.Helper;
 import baritone.api.utils.NotificationHelper;
 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.TypeUtils;
 import baritone.api.utils.gui.BaritoneToast;
-import net.minecraft.client.GuiMessageTag;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.Vec3i;
+import net.minecraft.network.chat.BaseComponent;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TextComponent;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.awt.*;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-import java.util.List;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
+import java.util.List;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;

@@ -52,7 +44,6 @@ import java.util.function.Consumer;
 * @author leijurv
 */
 public final class Settings {
-    private static final Logger LOGGER = LoggerFactory.getLogger("Baritone");

    /**
     * Allow Baritone to break blocks
@@ -79,16 +70,6 @@ public final class Settings {
     */
    public final Setting<Boolean> allowInventory = new Setting<>(false);

-    /**
-     * Wait this many ticks between InventoryBehavior moving inventory items
-     */
-    public final Setting<Integer> ticksBetweenInventoryMoves = new Setting<>(1);
-
-    /**
-     * Come to a halt before doing any inventory moves. Intended for anticheat such as 2b2t
-     */
-    public final Setting<Boolean> inventoryMoveOnlyIfStationary = new Setting<>(false);
-
    /**
     * Disable baritone's auto-tool at runtime, but still assume that another mod will provide auto tool functionality
     * <p>
@@ -385,12 +366,6 @@ public final class Settings {
     */
    public final Setting<Float> blockReachDistance = new Setting<>(4.5f);

-    /**
-     * How many ticks between breaking a block and starting to break the next block. Default in game is 6 ticks.
-     * Values under 1 will be clamped. The delay only applies to non-instant (1-tick) breaks.
-     */
-    public final Setting<Integer> blockBreakSpeed = new Setting<>(6);
-
    /**
     * How many degrees to randomize the pitch and yaw every tick. Set to 0 to disable
     */
@@ -636,13 +611,6 @@ 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
     */
@@ -744,37 +712,6 @@ public final class Settings {
     */
    public final Setting<Boolean> freeLook = new Setting<>(true);

-    /**
-     * Break and place blocks without having to force the client-sided rotations. Requires {@link #freeLook}.
-     */
-    public final Setting<Boolean> blockFreeLook = new Setting<>(false);
-
-    /**
-     * Automatically elytra fly without having to force the client-sided rotations.
-     */
-    public final Setting<Boolean> elytraFreeLook = new Setting<>(true);
-
-    /**
-     * Forces the client-sided yaw rotation to an average of the last {@link #smoothLookTicks} of server-sided rotations.
-     */
-    public final Setting<Boolean> smoothLook = new Setting<>(false);
-
-    /**
-     * Same as {@link #smoothLook} but for elytra flying.
-     */
-    public final Setting<Boolean> elytraSmoothLook = new Setting<>(false);
-
-    /**
-     * The number of ticks to average across for {@link #smoothLook};
-     */
-    public final Setting<Integer> smoothLookTicks = new Setting<>(5);
-
-    /**
-     * 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>
@@ -837,11 +774,6 @@ public final class Settings {
     */
    public final Setting<Boolean> shortBaritonePrefix = new Setting<>(false);

-    /**
-     * Use a modern message tag instead of a prefix when logging to chat
-     */
-    public final Setting<Boolean> useMessageTag = new Setting<>(false);
-
    /**
     * Echo commands to chat when they are run
     */
@@ -909,24 +841,12 @@ public final class Settings {
     */
    public final Setting<Integer> maxCachedWorldScanCount = new Setting<>(10);

-    /**
-     * Mine will not scan for or remember more than this many target locations.
-     * Note that the number of locations retrieved from cache is additionaly
-     * limited by {@link #maxCachedWorldScanCount}.
-     */
-    public final Setting<Integer> mineMaxOreLocationsCount = new Setting<>(64);
-
    /**
     * 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<>(2031);
-
    /**
     * This will only allow baritone to mine exposed ores, can be used to stop ore obfuscators on servers that use them.
     */
@@ -973,11 +893,6 @@ public final class Settings {
     */
    public final Setting<Boolean> replantNetherWart = new Setting<>(false);

-    /**
-     * Farming will scan for at most this many blocks.
-     */
-    public final Setting<Integer> farmMaxScanSize = new Setting<>(256);
-
    /**
     * When the cache scan gives less blocks than the maximum threshold (but still above zero), scan the main world too.
     * <p>
@@ -1069,11 +984,6 @@ public final class Settings {
     */
    public final Setting<Double> breakCorrectBlockPenaltyMultiplier = new Setting<>(10d);

-    /**
-     * Multiply the cost of placing a block that's incorrect in the builder's schematic by this coefficient
-     */
-    public final Setting<Double> placeIncorrectBlockPenaltyMultiplier = new Setting<>(2d);
-
    /**
     * When this setting is true, build a schematic with the highest X coordinate being the origin, instead of the lowest
     */
@@ -1155,7 +1065,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
@@ -1233,22 +1143,13 @@ public final class Settings {
     * via {@link Consumer#andThen(Consumer)} or it can completely be overriden via setting
     * {@link Setting#value};
     */
-    @JavaOnly
-    public final Setting<Consumer<Component>> logger = new Setting<>((msg) -> {
-        try {
-            final GuiMessageTag tag = useMessageTag.value ? Helper.MESSAGE_TAG : null;
-            Minecraft.getInstance().gui.getChat().addMessage(msg, null, tag);
-        } catch (Throwable t) {
-            LOGGER.warn("Failed to log message to chat: " + msg.getString(), t);
-        }
-    });
+    public final Setting<Consumer<Component>> logger = new Setting<>(msg -> Minecraft.getInstance().gui.getChat().addMessage(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);

    /**
@@ -1256,7 +1157,6 @@ public final class Settings {
     * via {@link Consumer#andThen(Consumer)} or it can completely be overriden via setting
     * {@link Setting#value};
     */
-    @JavaOnly
    public final Setting<BiConsumer<Component, Component>> toaster = new Setting<>(BaritoneToast::addOrUpdate);

    /**
@@ -1389,120 +1289,6 @@ public final class Settings {
     */
    public final Setting<Boolean> notificationOnMineFail = new Setting<>(true);

-    /**
-     * The number of ticks of elytra movement to simulate while firework boost is not active. Higher values are
-     * computationally more expensive.
-     */
-    public final Setting<Integer> elytraSimulationTicks = new Setting<>(20);
-
-    /**
-     * The maximum allowed deviation in pitch from a direct line-of-sight to the flight target. Higher values are
-     * computationally more expensive.
-     */
-    public final Setting<Integer> elytraPitchRange = new Setting<>(25);
-
-    /**
-     * The minimum speed that the player can drop to (in blocks/tick) before a firework is automatically deployed.
-     */
-    public final Setting<Double> elytraFireworkSpeed = new Setting<>(1.2);
-
-    /**
-     * The delay after the player's position is set-back by the server that a firework may be automatically deployed.
-     * Value is in ticks.
-     */
-    public final Setting<Integer> elytraFireworkSetbackUseDelay = new Setting<>(15);
-
-    /**
-     * The minimum padding value that is added to the player's hitbox when considering which point to fly to on the
-     * path. High values can result in points not being considered which are otherwise safe to fly to. Low values can
-     * result in flight paths which are extremely tight, and there's the possibility of crashing due to getting too low
-     * to the ground.
-     */
-    public final Setting<Double> elytraMinimumAvoidance = new Setting<>(0.2);
-
-    /**
-     * If enabled, avoids using fireworks when descending along the flight path.
-     */
-    public final Setting<Boolean> elytraConserveFireworks = new Setting<>(false);
-
-    /**
-     * Renders the raytraces that are performed by the elytra fly calculation.
-     */
-    public final Setting<Boolean> elytraRenderRaytraces = new Setting<>(false);
-
-    /**
-     * Renders the raytraces that are used in the hitbox part of the elytra fly calculation.
-     * Requires {@link #elytraRenderRaytraces}.
-     */
-    public final Setting<Boolean> elytraRenderHitboxRaytraces = new Setting<>(false);
-
-    /**
-     * Renders the best elytra flight path that was simulated each tick.
-     */
-    public final Setting<Boolean> elytraRenderSimulation = new Setting<>(true);
-
-    /**
-     * Automatically path to and jump off of ledges to initiate elytra flight when grounded.
-     */
-    public final Setting<Boolean> elytraAutoJump = new Setting<>(false);
-
-    /**
-     * The seed used to generate chunks for long distance elytra path-finding in the nether.
-     * Defaults to 2b2t's nether seed.
-     */
-    public final Setting<Long> elytraNetherSeed = new Setting<>(146008555100680L);
-
-    /**
-     * Whether nether-pathfinder should generate terrain based on {@link #elytraNetherSeed}.
-     * If false all chunks that haven't been loaded are assumed to be air.
-     */
-    public final Setting<Boolean> elytraPredictTerrain = new Setting<>(false);
-
-    /**
-     * Automatically swap the current elytra with a new one when the durability gets too low
-     */
-    public final Setting<Boolean> elytraAutoSwap = new Setting<>(true);
-
-    /**
-     * The minimum durability an elytra can have before being swapped
-     */
-    public final Setting<Integer> elytraMinimumDurability = new Setting<>(5);
-
-    /**
-     * The minimum fireworks before landing early for safety
-     */
-    public final Setting<Integer> elytraMinFireworksBeforeLanding = new Setting<>(5);
-
-    /**
-     * Automatically land when elytra is almost out of durability, or almost out of fireworks
-     */
-    public final Setting<Boolean> elytraAllowEmergencyLand = new Setting<>(true);
-
-    /**
-     * Time between culling far away chunks from the nether pathfinder chunk cache
-     */
-    public final Setting<Long> elytraTimeBetweenCacheCullSecs = new Setting<>(TimeUnit.MINUTES.toSeconds(3));
-
-    /**
-     * Maximum distance chunks can be before being culled from the nether pathfinder chunk cache
-     */
-    public final Setting<Integer> elytraCacheCullDistance = new Setting<>(5000);
-
-    /**
-     * Should elytra consider nether brick a valid landing block
-     */
-    public final Setting<Boolean> elytraAllowLandOnNetherFortress = new Setting<>(false);
-
-    /**
-     * Has the user read and understood the elytra terms and conditions
-     */
-    public final Setting<Boolean> elytraTermsAccepted = new Setting<>(false);
-
-    /**
-     * Verbose chat logging in elytra mode
-     */
-    public final Setting<Boolean> elytraChatSpam = new Setting<>(false);
-
    /**
     * A map of lowercase setting field names to their respective setting
     */
@@ -1520,7 +1306,6 @@ public final class Settings {
        public T value;
        public final T defaultValue;
        private String name;
-        private boolean javaOnly;

        @SuppressWarnings("unchecked")
        private Setting(T value) {
@@ -1529,7 +1314,6 @@ public final class Settings {
            }
            this.value = value;
            this.defaultValue = value;
-            this.javaOnly = false;
        }

        /**
@@ -1566,25 +1350,8 @@ public final class Settings {
        public final Type getType() {
            return settingTypes.get(this);
        }
-
-        /**
-         * This should always be the same as whether the setting can be parsed from or serialized to a string; in other
-         * words, the only way to modify it is by writing to {@link #value} programatically.
-         *
-         * @return {@code true} if the setting can not be set or read by the user
-         */
-        public boolean isJavaOnly() {
-            return javaOnly;
-        }
    }

-    /**
-     * Marks a {@link Setting} field as being {@link Setting#isJavaOnly() Java-only}
-     */
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.FIELD)
-    private @interface JavaOnly {}
-
    // here be dragons

    Settings() {
@@ -1600,7 +1367,6 @@ public final class Settings {
                    Setting<?> setting = (Setting<?>) field.get(this);
                    String name = field.getName();
                    setting.name = name;
-                    setting.javaOnly = field.isAnnotationPresent(JavaOnly.class);
                    name = name.toLowerCase();
                    if (tmpByName.containsKey(name)) {
                        throw new IllegalStateException("Duplicate setting name");
--- a/src/api/java/baritone/api/behavior/ILookBehavior.java
+++ b/src/api/java/baritone/api/behavior/ILookBehavior.java
@@ -17,8 +17,6 @@

 package baritone.api.behavior;

-import baritone.api.Settings;
-import baritone.api.behavior.look.IAimProcessor;
 import baritone.api.utils.Rotation;

 /**
@@ -28,23 +26,14 @@ import baritone.api.utils.Rotation;
 public interface ILookBehavior extends IBehavior {

    /**
-     * Updates the current {@link ILookBehavior} target to target the specified rotations on the next tick. If any sort
-     * of block interaction is required, {@code blockInteract} should be {@code true}. It is not guaranteed that the
-     * rotations set by the caller will be the exact rotations expressed by the client (This is due to settings like
-     * {@link Settings#randomLooking}). If the rotations produced by this behavior are required, then the
-     * {@link #getAimProcessor() aim processor} should be used.
+     * Updates the current {@link ILookBehavior} target to target
+     * the specified rotations on the next tick. If force is {@code true},
+     * then freeLook will be overriden and angles will be set regardless.
+     * If any sort of block interaction is required, force should be {@code true},
+     * otherwise, it should be {@code false};
     *
-     * @param rotation      The target rotations
-     * @param blockInteract Whether the target rotations are needed for a block interaction
+     * @param rotation The target rotations
+     * @param force    Whether or not to "force" the rotations
     */
-    void updateTarget(Rotation rotation, boolean blockInteract);
-
-    /**
-     * The aim processor instance for this {@link ILookBehavior}, which is responsible for applying additional,
-     * deterministic transformations to the target rotation set by {@link #updateTarget}.
-     *
-     * @return The aim processor
-     * @see IAimProcessor#fork
-     */
-    IAimProcessor getAimProcessor();
+    void updateTarget(Rotation rotation, boolean force);
 }
--- a/src/api/java/baritone/api/behavior/look/IAimProcessor.java
+++ b/src/api/java/baritone/api/behavior/look/IAimProcessor.java
@@ -1,45 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.behavior.look;
-
-import baritone.api.utils.Rotation;
-
-/**
- * @author Brady
- */
-public interface IAimProcessor {
-
-    /**
-     * Returns the actual rotation that will be used when the desired rotation is requested. The returned rotation
-     * always reflects what would happen in the upcoming tick. In other words, it is a pure function, and no internal
-     * state changes. If simulation of the rotation states beyond the next tick is required, then a
-     * {@link IAimProcessor#fork fork} should be created.
-     *
-     * @param desired The desired rotation to set
-     * @return The actual rotation
-     */
-    Rotation peekRotation(Rotation desired);
-
-    /**
-     * Returns a copy of this {@link IAimProcessor} which has its own internal state and is manually tickable.
-     *
-     * @return The forked processor
-     * @see ITickableAimProcessor
-     */
-    ITickableAimProcessor fork();
-}
--- a/src/api/java/baritone/api/behavior/look/ITickableAimProcessor.java
+++ b/src/api/java/baritone/api/behavior/look/ITickableAimProcessor.java
@@ -1,47 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.behavior.look;
-
-import baritone.api.utils.Rotation;
-
-/**
- * @author Brady
- */
-public interface ITickableAimProcessor extends IAimProcessor {
-
-    /**
-     * Advances the internal state of this aim processor by a single tick.
-     */
-    void tick();
-
-    /**
-     * Calls {@link #tick()} the specified number of times.
-     *
-     * @param ticks The number of calls
-     */
-    void advance(int ticks);
-
-    /**
-     * Returns the actual rotation as provided by {@link #peekRotation(Rotation)}, and then automatically advances the
-     * internal state by one {@link #tick() tick}.
-     *
-     * @param rotation The desired rotation to set
-     * @return The actual rotation
-     */
-    Rotation nextRotation(Rotation rotation);
-}
--- a/src/api/java/baritone/api/cache/IWorldProvider.java
+++ b/src/api/java/baritone/api/cache/IWorldProvider.java
@@ -17,8 +17,6 @@

 package baritone.api.cache;

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

 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
-import net.minecraft.core.registries.BuiltInRegistries;
+import java.util.stream.Stream;
+import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Block;

-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 = ResourceLocation.parse(ctx.getConsumer().getString());
+        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;
@@ -46,19 +39,13 @@ public enum BlockById implements IDatatypeFor<Block> {

    @Override
    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
-        String arg = ctx.getConsumer().getString();
-
-        if (!PATTERN.matcher(arg).matches()) {
-            return Stream.empty();
-        }
-
        return new TabCompleteHelper()
                .append(
-                        BuiltInRegistries.BLOCK.keySet()
+                        Registry.BLOCK.keySet()
                                .stream()
                                .map(Object::toString)
                )
-                .filterPrefixNamespaced(arg)
+                .filterPrefixNamespaced(ctx.getConsumer().getString())
                .sortAlphabetically()
                .stream();
    }
--- a/src/api/java/baritone/api/command/datatypes/EntityClassById.java
+++ b/src/api/java/baritone/api/command/datatypes/EntityClassById.java
@@ -19,20 +19,19 @@ package baritone.api.command.datatypes;

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

-import java.util.stream.Stream;
-
 public enum EntityClassById implements IDatatypeFor<EntityType> {
    INSTANCE;

    @Override
    public EntityType get(IDatatypeContext ctx) throws CommandException {
-        ResourceLocation id = ResourceLocation.parse(ctx.getConsumer().getString());
+        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 +40,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
@@ -1,43 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.command.datatypes;
-
-import baritone.api.command.exception.CommandException;
-import baritone.api.command.helpers.TabCompleteHelper;
-import net.minecraft.core.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::getName).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,137 +18,20 @@
 package baritone.api.command.datatypes;

 import baritone.api.command.exception.CommandException;
-import baritone.api.command.helpers.TabCompleteHelper;
 import baritone.api.utils.BlockOptionalMeta;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.properties.Property;

-import java.util.Set;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;

 public enum ForBlockOptionalMeta implements IDatatypeFor<BlockOptionalMeta> {
    INSTANCE;

-    /**
-     * Matches (domain:)?name([(property=value)*])? but the input can be truncated at any position.
-     * domain and name are [a-z0-9_.-]+ and [a-z0-9/_.-]+ because that's what mc 1.13+ accepts.
-     * property and value use the same format as domain.
-     */
-    // Good luck reading this.
-    private static Pattern PATTERN = Pattern.compile("(?:[a-z0-9_.-]+:)?(?:[a-z0-9/_.-]+(?:\\[(?:(?:[a-z0-9_.-]+=[a-z0-9_.-]+,)*(?:[a-z0-9_.-]+(?:=(?:[a-z0-9_.-]+(?:\\])?)?)?)?|\\])?)?)?");
-
    @Override
    public BlockOptionalMeta get(IDatatypeContext ctx) throws CommandException {
        return new BlockOptionalMeta(ctx.getConsumer().getString());
    }

    @Override
-    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
-        String arg = ctx.getConsumer().peekString();
-
-        if (!PATTERN.matcher(arg).matches()) {
-            // Invalid format; we can't complete this.
-            ctx.getConsumer().getString();
-            return Stream.empty();
-        }
-
-        if (arg.endsWith("]")) {
-            // We are already done.
-            ctx.getConsumer().getString();
-            return Stream.empty();
-        }
-
-        if (!arg.contains("[")) {
-            // no properties so we are completing the block id
-            return ctx.getConsumer().tabCompleteDatatype(BlockById.INSTANCE);
-        }
-
-        ctx.getConsumer().getString();
-
-        // destructuring assignment? Please?
-        String blockId, properties;
-        {
-            String[] parts = splitLast(arg, '[');
-            blockId = parts[0];
-            properties = parts[1];
-        }
-
-        Block block = BuiltInRegistries.BLOCK.getOptional(ResourceLocation.parse(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.getStateDefinition()
-                                    .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.getStateDefinition().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.getPossibleValues().stream().map(property::getName);
+    public Stream<String> tabComplete(IDatatypeContext ctx) {
+        return ctx.getConsumer().tabCompleteDatatype(BlockById.INSTANCE);
    }
 }
--- a/src/api/java/baritone/api/command/datatypes/RelativeFile.java
+++ b/src/api/java/baritone/api/command/datatypes/RelativeFile.java
@@ -19,8 +19,6 @@ package baritone.api.command.datatypes;

 import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.exception.CommandException;
-import baritone.api.utils.Helper;
-import net.minecraft.client.Minecraft;

 import java.io.File;
 import java.io.IOException;
@@ -32,6 +30,8 @@ import java.util.Locale;
 import java.util.Objects;
 import java.util.stream.Stream;

+import static baritone.api.utils.Helper.HELPER;
+
 public enum RelativeFile implements IDatatypePost<File, File> {
    INSTANCE;

@@ -93,13 +93,8 @@ public enum RelativeFile implements IDatatypePost<File, File> {
                .filter(s -> !s.contains(" "));
    }

-    @Deprecated
    public static File gameDir() {
-        return gameDir(Helper.mc);
-    }
-
-    public static File gameDir(Minecraft mc) {
-        File gameDir = mc.gameDirectory.getAbsoluteFile();
+        File gameDir = HELPER.mc.gameDirectory.getAbsoluteFile();
        if (gameDir.getName().equals(".")) {
            return gameDir.getParentFile();
        }
--- a/src/api/java/baritone/api/command/exception/CommandUnhandledException.java
+++ b/src/api/java/baritone/api/command/exception/CommandUnhandledException.java
@@ -19,8 +19,8 @@ package baritone.api.command.exception;

 import baritone.api.command.ICommand;
 import baritone.api.command.argument.ICommandArgument;
-
 import java.util.List;
+import net.minecraft.ChatFormatting;

 import static baritone.api.utils.Helper.HELPER;

@@ -36,6 +36,10 @@ public class CommandUnhandledException extends RuntimeException implements IComm

    @Override
    public void handle(ICommand command, List<ICommandArgument> args) {
-        HELPER.logUnhandledException(this);
+        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);
+
+        this.printStackTrace();
    }
 }
--- a/src/api/java/baritone/api/command/helpers/Paginator.java
+++ b/src/api/java/baritone/api/command/helpers/Paginator.java
@@ -21,16 +21,15 @@ import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.exception.CommandInvalidTypeException;
 import baritone.api.utils.Helper;
-
-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.BaseComponent;
 import net.minecraft.network.chat.ClickEvent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.HoverEvent;
-import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.network.chat.TextComponent;

 public class Paginator<E> implements Helper {

@@ -75,7 +74,7 @@ public class Paginator<E> implements Helper {
        }
        boolean hasPrevPage = commandPrefix != null && validPage(page - 1);
        boolean hasNextPage = commandPrefix != null && validPage(page + 1);
-        MutableComponent prevPageComponent = Component.literal("<<");
+        BaseComponent prevPageComponent = new TextComponent("<<");
        if (hasPrevPage) {
            prevPageComponent.setStyle(prevPageComponent.getStyle()
                    .withClickEvent(new ClickEvent(
@@ -84,23 +83,26 @@ public class Paginator<E> implements Helper {
                    ))
                    .withHoverEvent(new HoverEvent(
                            HoverEvent.Action.SHOW_TEXT,
-                            Component.literal("Click to view previous page")
+                            new TextComponent("Click to view previous page")
                    )));
        } else {
            prevPageComponent.setStyle(prevPageComponent.getStyle().withColor(ChatFormatting.DARK_GRAY));
        }
-        MutableComponent nextPageComponent = Component.literal(">>");
+        BaseComponent nextPageComponent = new TextComponent(">>");
        if (hasNextPage) {
            nextPageComponent.setStyle(nextPageComponent.getStyle()
-                    .withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, String.format("%s %d", commandPrefix, page + 1)))
+                    .withClickEvent(new ClickEvent(
+                            ClickEvent.Action.RUN_COMMAND,
+                            String.format("%s %d", commandPrefix, page + 1)
+                    ))
                    .withHoverEvent(new HoverEvent(
                            HoverEvent.Action.SHOW_TEXT,
-                            Component.literal("Click to view next page")
+                            new TextComponent("Click to view next page")
                    )));
        } else {
            nextPageComponent.setStyle(nextPageComponent.getStyle().withColor(ChatFormatting.DARK_GRAY));
        }
-        MutableComponent pagerComponent = Component.literal("");
+        BaseComponent pagerComponent = new TextComponent("");
        pagerComponent.setStyle(pagerComponent.getStyle().withColor(ChatFormatting.GRAY));
        pagerComponent.append(prevPageComponent);
        pagerComponent.append(" | ");
--- a/src/api/java/baritone/api/command/helpers/TabCompleteHelper.java
+++ b/src/api/java/baritone/api/command/helpers/TabCompleteHelper.java
@@ -212,7 +212,7 @@ public class TabCompleteHelper {
     * @return This {@link TabCompleteHelper}
     */
    public TabCompleteHelper filterPrefixNamespaced(String prefix) {
-        return filterPrefix(ResourceLocation.parse(prefix).toString());
+        return filterPrefix(new ResourceLocation(prefix).toString());
    }

    /**
@@ -252,7 +252,7 @@ public class TabCompleteHelper {
    public TabCompleteHelper addSettings() {
        return append(
                BaritoneAPI.getSettings().allSettings.stream()
-                        .filter(s -> !s.isJavaOnly())
+                        .filter(s -> !SettingsUtil.javaOnlySetting(s))
                        .map(Settings.Setting::getName)
                        .sorted(String.CASE_INSENSITIVE_ORDER)
        );
--- a/src/api/java/baritone/api/event/events/BlockChangeEvent.java
+++ b/src/api/java/baritone/api/event/events/BlockChangeEvent.java
@@ -1,47 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.event.events;
-
-import baritone.api.utils.Pair;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.block.state.BlockState;
-
-import java.util.List;
-
-/**
- * @author Brady
- */
-public final class BlockChangeEvent {
-
-    private final ChunkPos chunk;
-    private final List<Pair<BlockPos, BlockState>> blocks;
-
-    public BlockChangeEvent(ChunkPos pos, List<Pair<BlockPos, BlockState>> blocks) {
-        this.chunk = pos;
-        this.blocks = blocks;
-    }
-
-    public ChunkPos getChunkPos() {
-        return this.chunk;
-    }
-
-    public List<Pair<BlockPos, BlockState>> getBlocks() {
-        return this.blocks;
-    }
-}
--- a/src/api/java/baritone/api/event/events/ChunkEvent.java
+++ b/src/api/java/baritone/api/event/events/ChunkEvent.java
@@ -57,38 +57,31 @@ public final class ChunkEvent {
    /**
     * @return The state of the event
     */
-    public EventState getState() {
+    public final EventState getState() {
        return this.state;
    }

    /**
     * @return The type of chunk event that occurred;
     */
-    public Type getType() {
+    public final Type getType() {
        return this.type;
    }

    /**
     * @return The Chunk X position.
     */
-    public int getX() {
+    public final int getX() {
        return this.x;
    }

    /**
     * @return The Chunk Z position.
     */
-    public int getZ() {
+    public final int getZ() {
        return this.z;
    }

-    /**
-     * @return {@code true} if the event was fired after a chunk population
-     */
-    public boolean isPostPopulate() {
-        return this.state == EventState.POST && this.type.isPopulate();
-    }
-
    public enum Type {

        /**
@@ -113,10 +106,6 @@ public final class ChunkEvent {
         * <p>
         * And it's a partial chunk
         */
-        POPULATE_PARTIAL;
-
-        public final boolean isPopulate() {
-            return this == POPULATE_FULL || this == POPULATE_PARTIAL;
-        }
+        POPULATE_PARTIAL
    }
 }
--- a/src/api/java/baritone/api/event/events/RenderEvent.java
+++ b/src/api/java/baritone/api/event/events/RenderEvent.java
@@ -18,7 +18,7 @@
 package baritone.api.event.events;

 import com.mojang.blaze3d.vertex.PoseStack;
-import org.joml.Matrix4f;
+import com.mojang.math.Matrix4f;

 /**
 * @author Brady
--- a/src/api/java/baritone/api/event/events/RotationMoveEvent.java
+++ b/src/api/java/baritone/api/event/events/RotationMoveEvent.java
@@ -17,7 +17,6 @@

 package baritone.api.event.events;

-import baritone.api.utils.Rotation;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.phys.Vec3;
@@ -33,27 +32,14 @@ public final class RotationMoveEvent {
     */
    private final Type type;

-    private final Rotation original;
-
    /**
     * The yaw rotation
     */
    private float yaw;

-    /**
-     * The pitch rotation
-     */
-    private float pitch;
-
-    public RotationMoveEvent(Type type, float yaw, float pitch) {
+    public RotationMoveEvent(Type type, float yaw) {
        this.type = type;
-        this.original = new Rotation(yaw, pitch);
        this.yaw = yaw;
-        this.pitch = pitch;
-    }
-
-    public Rotation getOriginal() {
-        return this.original;
    }

    /**
@@ -61,37 +47,21 @@ public final class RotationMoveEvent {
     *
     * @param yaw Yaw rotation
     */
-    public void setYaw(float yaw) {
+    public final void setYaw(float yaw) {
        this.yaw = yaw;
    }

    /**
     * @return The yaw rotation
     */
-    public float getYaw() {
+    public final float getYaw() {
        return this.yaw;
    }

-    /**
-     * Set the pitch movement rotation
-     *
-     * @param pitch Pitch rotation
-     */
-    public void setPitch(float pitch) {
-        this.pitch = pitch;
-    }
-
-    /**
-     * @return The pitch rotation
-     */
-    public float getPitch() {
-        return pitch;
-    }
-
    /**
     * @return The type of the event
     */
-    public Type getType() {
+    public final Type getType() {
        return this.type;
    }

--- a/src/api/java/baritone/api/event/events/TickEvent.java
+++ b/src/api/java/baritone/api/event/events/TickEvent.java
@@ -18,18 +18,9 @@
 package baritone.api.event.events;

 import baritone.api.event.events.type.EventState;
-import net.minecraft.client.Minecraft;

 import java.util.function.BiFunction;

-/**
- * Called on and after each game tick of the primary {@link Minecraft} instance and dispatched to all Baritone
- * instances.
- * <p>
- * When {@link #state} is {@link EventState#PRE}, the event is being called just prior to when the current in-game
- * screen is ticked. When {@link #state} is {@link EventState#POST}, the event is being called at the very end
- * of the {@link Minecraft#runTick()} method.
- */
 public final class TickEvent {

    private static int overallTickCount;
--- a/src/api/java/baritone/api/event/listener/AbstractGameEventListener.java
+++ b/src/api/java/baritone/api/event/listener/AbstractGameEventListener.java
@@ -33,9 +33,6 @@ public interface AbstractGameEventListener extends IGameEventListener {
    @Override
    default void onTick(TickEvent event) {}

-    @Override
-    default void onPostTick(TickEvent event) {}
-
    @Override
    default void onPlayerUpdate(PlayerUpdateEvent event) {}

@@ -48,9 +45,6 @@ public interface AbstractGameEventListener extends IGameEventListener {
    @Override
    default void onChunkEvent(ChunkEvent event) {}

-    @Override
-    default void onBlockChange(BlockChangeEvent event) {}
-
    @Override
    default void onRenderPass(RenderEvent event) {}

--- a/src/api/java/baritone/api/event/listener/IGameEventListener.java
+++ b/src/api/java/baritone/api/event/listener/IGameEventListener.java
@@ -40,14 +40,6 @@ public interface IGameEventListener {
     */
    void onTick(TickEvent event);

-    /**
-     * Run once per game tick after the tick is completed
-     *
-     * @param event The event
-     * @see Minecraft#runTick()
-     */
-    void onPostTick(TickEvent event);
-
    /**
     * Run once per game tick from before and after the player rotation is sent to the server.
     *
@@ -78,13 +70,6 @@ public interface IGameEventListener {
     */
    void onChunkEvent(ChunkEvent event);

-    /**
-     * Runs after a single or multi block change packet is received and processed.
-     *
-     * @param event The event
-     */
-    void onBlockChange(BlockChangeEvent event);
-
    /**
     * Runs once per world render pass.
     *
--- a/src/api/java/baritone/api/pathing/goals/GoalAxis.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalAxis.java
@@ -42,16 +42,6 @@ public class GoalAxis implements Goal {
        return flatAxisDistance * BaritoneAPI.getSettings().costHeuristic.value + GoalYLevel.calculate(BaritoneAPI.getSettings().axisHeight.value, y);
    }

-    @Override
-    public boolean equals(Object o) {
-        return o.getClass() == GoalAxis.class;
-    }
-
-    @Override
-    public int hashCode() {
-        return 201385781;
-    }
-
    @Override
    public String toString() {
        return "GoalAxis";
--- a/src/api/java/baritone/api/pathing/goals/GoalBlock.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalBlock.java
@@ -17,7 +17,6 @@

 package baritone.api.pathing.goals;

-import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.interfaces.IGoalRenderPos;
 import net.minecraft.core.BlockPos;
@@ -67,26 +66,6 @@ public class GoalBlock implements Goal, IGoalRenderPos {
        return calculate(xDiff, yDiff, zDiff);
    }

-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        GoalBlock goal = (GoalBlock) o;
-        return x == goal.x
-                && y == goal.y
-                && z == goal.z;
-    }
-
-    @Override
-    public int hashCode() {
-        return (int) BetterBlockPos.longHash(x, y, z) * 905165533;
-    }
-
    @Override
    public String toString() {
        return String.format(
--- a/src/api/java/baritone/api/pathing/goals/GoalComposite.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalComposite.java
@@ -67,24 +67,6 @@ public class GoalComposite implements Goal {
        return min;
    }

-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        GoalComposite goal = (GoalComposite) o;
-        return Arrays.equals(goals, goal.goals);
-    }
-
-    @Override
-    public int hashCode() {
-        return Arrays.hashCode(goals);
-    }
-
    @Override
    public String toString() {
        return "GoalComposite" + Arrays.toString(goals);
--- a/src/api/java/baritone/api/pathing/goals/GoalGetToBlock.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalGetToBlock.java
@@ -17,7 +17,6 @@

 package baritone.api.pathing.goals;

-import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.interfaces.IGoalRenderPos;
 import net.minecraft.core.BlockPos;
@@ -61,26 +60,6 @@ public class GoalGetToBlock implements Goal, IGoalRenderPos {
        return GoalBlock.calculate(xDiff, yDiff < 0 ? yDiff + 1 : yDiff, zDiff);
    }

-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        GoalGetToBlock goal = (GoalGetToBlock) o;
-        return x == goal.x
-                && y == goal.y
-                && z == goal.z;
-    }
-
-    @Override
-    public int hashCode() {
-        return (int) BetterBlockPos.longHash(x, y, z) * -49639096;
-    }
-
    @Override
    public String toString() {
        return String.format(
--- a/src/api/java/baritone/api/pathing/goals/GoalInverted.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalInverted.java
@@ -17,8 +17,6 @@

 package baritone.api.pathing.goals;

-import java.util.Objects;
-
 /**
 * Invert any goal.
 * <p>
@@ -52,24 +50,6 @@ public class GoalInverted implements Goal {
        return Double.NEGATIVE_INFINITY;
    }

-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        GoalInverted goal = (GoalInverted) o;
-        return Objects.equals(origin, goal.origin);
-    }
-
-    @Override
-    public int hashCode() {
-        return origin.hashCode() * 495796690;
-    }
-
    @Override
    public String toString() {
        return String.format("GoalInverted{%s}", origin.toString());
--- a/src/api/java/baritone/api/pathing/goals/GoalNear.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalNear.java
@@ -17,7 +17,6 @@

 package baritone.api.pathing.goals;

-import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.interfaces.IGoalRenderPos;
 import it.unimi.dsi.fastutil.doubles.DoubleIterator;
@@ -87,27 +86,6 @@ public class GoalNear implements Goal, IGoalRenderPos {
        return new BlockPos(x, y, z);
    }

-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        GoalNear goal = (GoalNear) o;
-        return x == goal.x
-                && y == goal.y
-                && z == goal.z
-                && rangeSq == goal.rangeSq;
-    }
-
-    @Override
-    public int hashCode() {
-        return (int) BetterBlockPos.longHash(x, y, z) + rangeSq;
-    }
-
    @Override
    public String toString() {
        return String.format(
--- a/src/api/java/baritone/api/pathing/goals/GoalRunAway.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalRunAway.java
@@ -23,7 +23,6 @@ import it.unimi.dsi.fastutil.doubles.DoubleOpenHashSet;
 import net.minecraft.core.BlockPos;

 import java.util.Arrays;
-import java.util.Objects;

 /**
 * Useful for automated combat (retreating specifically)
@@ -125,29 +124,6 @@ public class GoalRunAway implements Goal {
        return maxInside;
    }

-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        GoalRunAway goal = (GoalRunAway) o;
-        return distanceSq == goal.distanceSq
-                && Arrays.equals(from, goal.from)
-                && Objects.equals(maintainY, goal.maintainY);
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = Arrays.hashCode(from);
-        hash = hash * 1196803141 + distanceSq;
-        hash = hash * -2053788840 + maintainY;
-        return hash;
-    }
-
    @Override
    public String toString() {
        if (maintainY != null) {
--- a/src/api/java/baritone/api/pathing/goals/GoalStrictDirection.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalStrictDirection.java
@@ -17,7 +17,6 @@

 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;
@@ -70,31 +69,6 @@ public class GoalStrictDirection implements Goal {
        return Double.NEGATIVE_INFINITY;
    }

-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        GoalStrictDirection goal = (GoalStrictDirection) o;
-        return x == goal.x
-                && y == goal.y
-                && z == goal.z
-                && dx == goal.dx
-                && dz == goal.dz;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = (int) BetterBlockPos.longHash(x, y, z);
-        hash = hash * 630627507 + dx;
-        hash = hash * -283028380 + dz;
-        return hash;
-    }
-
    @Override
    public String toString() {
        return String.format(
--- a/src/api/java/baritone/api/pathing/goals/GoalTwoBlocks.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalTwoBlocks.java
@@ -17,7 +17,6 @@

 package baritone.api.pathing.goals;

-import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.interfaces.IGoalRenderPos;
 import net.minecraft.core.BlockPos;
@@ -73,26 +72,6 @@ public class GoalTwoBlocks implements Goal, IGoalRenderPos {
        return new BlockPos(x, y, z);
    }

-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        GoalTwoBlocks goal = (GoalTwoBlocks) o;
-        return x == goal.x
-                && y == goal.y
-                && z == goal.z;
-    }
-
-    @Override
-    public int hashCode() {
-        return (int) BetterBlockPos.longHash(x, y, z) * 516508351;
-    }
-
    @Override
    public String toString() {
        return String.format(
--- a/src/api/java/baritone/api/pathing/goals/GoalXZ.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalXZ.java
@@ -64,27 +64,6 @@ public class GoalXZ implements Goal {
        return calculate(xDiff, zDiff);
    }

-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        GoalXZ goal = (GoalXZ) o;
-        return x == goal.x && z == goal.z;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 1791873246;
-        hash = hash * 222601791 + x;
-        hash = hash * -1331679453 + z;
-        return hash;
-    }
-
    @Override
    public String toString() {
        return String.format(
--- a/src/api/java/baritone/api/pathing/goals/GoalYLevel.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalYLevel.java
@@ -58,24 +58,6 @@ public class GoalYLevel implements Goal, ActionCosts {
        return 0;
    }

-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        GoalYLevel goal = (GoalYLevel) o;
-        return level == goal.level;
-    }
-
-    @Override
-    public int hashCode() {
-        return level * 1271009915;
-    }
-
    @Override
    public String toString() {
        return String.format(
--- a/src/api/java/baritone/api/process/IBuilderProcess.java
+++ b/src/api/java/baritone/api/process/IBuilderProcess.java
@@ -50,7 +50,6 @@ public interface IBuilderProcess extends IBaritoneProcess {
     */
    boolean build(String name, File schematic, Vec3i origin);

-    @Deprecated
    default boolean build(String schematicFile, BlockPos origin) {
        File file = new File(new File(Minecraft.getInstance().gameDirectory, "schematics"), schematicFile);
        return build(schematicFile, file, origin);
--- a/src/api/java/baritone/api/process/ICustomGoalProcess.java
+++ b/src/api/java/baritone/api/process/ICustomGoalProcess.java
@@ -38,11 +38,6 @@ public interface ICustomGoalProcess extends IBaritoneProcess {
     */
    Goal getGoal();

-    /**
-     * @return The most recent set goal, which doesn't invalidate upon {@link #onLostControl()}
-     */
-    Goal mostRecentGoal();
-
    /**
     * Sets the goal and begins the path execution.
     *
--- a/src/api/java/baritone/api/process/IElytraProcess.java
+++ b/src/api/java/baritone/api/process/IElytraProcess.java
@@ -1,50 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.process;
-
-import baritone.api.pathing.goals.Goal;
-import net.minecraft.core.BlockPos;
-
-public interface IElytraProcess extends IBaritoneProcess {
-
-    void repackChunks();
-
-    /**
-     * @return Where it is currently flying to, null if not active
-     */
-    BlockPos currentDestination();
-
-    void pathTo(BlockPos destination);
-
-    void pathTo(Goal destination);
-
-    /**
-     * Resets the state of the process but will maintain the same destination and will try to keep flying
-     */
-    void resetState();
-
-    /**
-     * @return {@code true} if the native library loaded and elytra is actually usable
-     */
-    boolean isLoaded();
-
-    /*
-     * FOR INTERNAL USE ONLY. MAY BE REMOVED AT ANY TIME.
-     */
-    boolean isSafeToCancel();
-}
--- a/src/api/java/baritone/api/process/PathingCommandType.java
+++ b/src/api/java/baritone/api/process/PathingCommandType.java
@@ -56,10 +56,5 @@ public enum PathingCommandType {
    /**
     * Go and ask the next process what to do
     */
-    DEFER,
-
-    /**
-     * Sets the goal and calculates a path, but pauses instead of immediately starting the path.
-     */
-    SET_GOAL_AND_PAUSE
+    DEFER
 }
--- a/src/api/java/baritone/api/schematic/MaskSchematic.java
+++ b/src/api/java/baritone/api/schematic/MaskSchematic.java
@@ -17,10 +17,8 @@

 package baritone.api.schematic;

-import baritone.api.schematic.mask.Mask;
-import net.minecraft.world.level.block.state.BlockState;
-
 import java.util.List;
+import net.minecraft.world.level.block.state.BlockState;

 public abstract class MaskSchematic extends AbstractSchematic {

@@ -42,14 +40,4 @@ 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/mask/AbstractMask.java
+++ b/src/api/java/baritone/api/schematic/mask/AbstractMask.java
@@ -1,49 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.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
@@ -1,60 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.schematic.mask;
-
-import baritone.api.schematic.mask.operator.BinaryOperatorMask;
-import baritone.api.schematic.mask.operator.NotMask;
-import baritone.api.utils.BooleanBinaryOperators;
-import net.minecraft.world.level.block.state.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
@@ -1,44 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.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
@@ -1,82 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.schematic.mask;
-
-import baritone.api.schematic.mask.operator.BinaryOperatorMask;
-import baritone.api.schematic.mask.operator.NotMask;
-import baritone.api.utils.BooleanBinaryOperators;
-import net.minecraft.world.level.block.state.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
@@ -1,79 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.schematic.mask.operator;
-
-import baritone.api.schematic.mask.AbstractMask;
-import baritone.api.schematic.mask.Mask;
-import baritone.api.schematic.mask.StaticMask;
-import baritone.api.utils.BooleanBinaryOperator;
-import net.minecraft.world.level.block.state.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
@@ -1,56 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.schematic.mask.operator;
-
-import baritone.api.schematic.mask.AbstractMask;
-import baritone.api.schematic.mask.Mask;
-import baritone.api.schematic.mask.StaticMask;
-import net.minecraft.world.level.block.state.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
@@ -1,69 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.schematic.mask.shape;
-
-import baritone.api.schematic.mask.AbstractMask;
-import baritone.api.schematic.mask.StaticMask;
-import net.minecraft.core.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
@@ -1,64 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.schematic.mask.shape;
-
-import baritone.api.schematic.mask.AbstractMask;
-import baritone.api.schematic.mask.StaticMask;
-
-/**
- * @author Brady
- */
-public final class SphereMask extends AbstractMask implements StaticMask {
-
-    private final double centerX;
-    private final double centerY;
-    private final double centerZ;
-    private final double radiusSqX;
-    private final double radiusSqY;
-    private final double radiusSqZ;
-    private final boolean filled;
-
-    public SphereMask(int widthX, int heightY, int lengthZ, boolean filled) {
-        super(widthX, heightY, lengthZ);
-        this.centerX = widthX / 2.0;
-        this.centerY = heightY / 2.0;
-        this.centerZ = lengthZ / 2.0;
-        this.radiusSqX = this.centerX * this.centerX;
-        this.radiusSqY = this.centerY * this.centerY;
-        this.radiusSqZ = this.centerZ * this.centerZ;
-        this.filled = filled;
-    }
-
-    @Override
-    public boolean partOfMask(int x, int y, int z) {
-        double dx = Math.abs((x + 0.5) - this.centerX);
-        double dy = Math.abs((y + 0.5) - this.centerY);
-        double dz = Math.abs((z + 0.5) - this.centerZ);
-        if (this.outside(dx, dy, dz)) {
-            return false;
-        }
-        return this.filled
-                || this.outside(dx + 1, dy, dz)
-                || this.outside(dx, dy + 1, dz)
-                || this.outside(dx, dy, dz + 1);
-    }
-
-    private boolean outside(double dx, double dy, double dz) {
-        return dx * dx / this.radiusSqX + dy * dy / this.radiusSqY + dz * dz / this.radiusSqZ > 1;
-    }
-}
--- a/src/api/java/baritone/api/utils/BetterBlockPos.java
+++ b/src/api/java/baritone/api/utils/BetterBlockPos.java
@@ -34,15 +34,6 @@ import net.minecraft.util.Mth;
 */
 public final class BetterBlockPos extends BlockPos {

-    private static final int NUM_X_BITS = 26;
-    private static final int NUM_Z_BITS = NUM_X_BITS;
-    private static final int NUM_Y_BITS = 64 - NUM_X_BITS - NUM_Z_BITS;
-    private static final int Y_SHIFT = NUM_Z_BITS;
-    private static final int X_SHIFT = Y_SHIFT + NUM_Y_BITS;
-    private static final long X_MASK = (1L << NUM_X_BITS) - 1L;
-    private static final long Y_MASK = (1L << NUM_Y_BITS) - 1L;
-    private static final long Z_MASK = (1L << NUM_Z_BITS) - 1L;
-
    public static final BetterBlockPos ORIGIN = new BetterBlockPos(0, 0, 0);

    public final int x;
@@ -210,20 +201,6 @@ public final class BetterBlockPos extends BlockPos {
        return amt == 0 ? this : new BetterBlockPos(x - amt, y, z);
    }

-    public double distanceSq(final BetterBlockPos to) {
-        double dx = (double) this.x - to.x;
-        double dy = (double) this.y - to.y;
-        double dz = (double) this.z - to.z;
-        return dx * dx + dy * dy + dz * dz;
-    }
-
-    public double distanceTo(final BetterBlockPos to) {
-        double dx = (double) this.x - to.x;
-        double dy = (double) this.y - to.y;
-        double dz = (double) this.z - to.z;
-        return Math.sqrt(dx * dx + dy * dy + dz * dz);
-    }
-
    @Override
    @Nonnull
    public String toString() {
@@ -234,15 +211,4 @@ public final class BetterBlockPos extends BlockPos {
                SettingsUtil.maybeCensor(z)
        );
    }
-
-    public static long serializeToLong(final int x, final int y, final int z) {
-        return ((long) x & X_MASK) << X_SHIFT | ((long) y & Y_MASK) << Y_SHIFT | ((long) z & Z_MASK);
-    }
-
-    public static BetterBlockPos deserializeFromLong(final long serialized) {
-        final int x = (int) (serialized << 64 - X_SHIFT - NUM_X_BITS >> 64 - NUM_X_BITS);
-        final int y = (int) (serialized << 64 - Y_SHIFT - NUM_Y_BITS >> 64 - NUM_Y_BITS);
-        final int z = (int) (serialized << 64 - NUM_Z_BITS >> 64 - NUM_Z_BITS);
-        return new BetterBlockPos(x, y, z);
-    }
 }
--- a/src/api/java/baritone/api/utils/BlockOptionalMeta.java
+++ b/src/api/java/baritone/api/utils/BlockOptionalMeta.java
@@ -18,132 +18,72 @@
 package baritone.api.utils;

 import baritone.api.utils.accessor.IItemStack;
-import baritone.api.utils.accessor.ILootTable;
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import net.minecraft.Util;
-import net.minecraft.client.Minecraft;
-import net.minecraft.commands.Commands;
-import net.minecraft.core.LayeredRegistryAccess;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.resources.RegistryDataLoader;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.RegistryLayer;
-import net.minecraft.server.ReloadableServerRegistries;
-import net.minecraft.server.ReloadableServerResources;
+import io.netty.util.concurrent.ThreadPerTaskExecutor;
+import net.minecraft.core.BlockPos;
+import net.minecraft.resources.*;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.progress.ChunkProgressListener;
+import net.minecraft.server.packs.PackResources;
 import net.minecraft.server.packs.PackType;
-import net.minecraft.server.packs.VanillaPackResources;
+import net.minecraft.server.packs.repository.Pack;
 import net.minecraft.server.packs.repository.PackRepository;
 import net.minecraft.server.packs.repository.ServerPacksSource;
-import net.minecraft.server.packs.resources.CloseableResourceManager;
-import net.minecraft.server.packs.resources.MultiPackResourceManager;
-import net.minecraft.server.packs.resources.ResourceManager;
-import net.minecraft.world.RandomSequences;
-import net.minecraft.world.flag.FeatureFlagSet;
+import net.minecraft.server.packs.resources.ReloadableResourceManager;
+import net.minecraft.server.packs.resources.SimpleReloadableResourceManager;
+import net.minecraft.util.Unit;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
-import net.minecraft.world.level.CustomSpawner;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.WorldDataConfiguration;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.state.properties.Property;
-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.LootParams;
-import net.minecraft.world.level.storage.loot.LootTable;
+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 javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.util.*;
 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 manager;
+    private static PredicateManager predicate = new PredicateManager();
    private static Map<Block, List<Item>> drops = new HashMap<>();

    public BlockOptionalMeta(@Nonnull Block block) {
        this.block = block;
-        this.propertiesDescription = "{}";
-        this.blockstates = getStates(block, Collections.emptyMap());
+        this.blockstates = getStates(block);
        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");
        }

-        block = BlockUtils.stringToBlockRequired(matcher.group("id"));
+        MatchResult matchResult = matcher.toMatchResult();

-        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);
+        block = BlockUtils.stringToBlockRequired(matchResult.group(1));
+        blockstates = getStates(block);
        stateHashes = getStateHashes(blockstates);
        stackHashes = getStackHashes(blockstates);
    }

-    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.getStateDefinition().getProperty(rawKey);
-            Comparable<?> value = castToIProperty(key).getValue(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.getStateDefinition().getPossibleStates().stream()
-                .filter(blockstate -> properties.entrySet().stream().allMatch(entry ->
-                        blockstate.getValue(entry.getKey()) == entry.getValue()
-                ))
-                .collect(Collectors.toSet());
+    private static Set<BlockState> getStates(@Nonnull Block block) {
+        return new HashSet<>(block.getStateDefinition().getPossibleStates());
    }

    private static ImmutableSet<Integer> getStateHashes(Set<BlockState> blockstates) {
@@ -191,7 +131,7 @@ public final class BlockOptionalMeta {

    @Override
    public String toString() {
-        return String.format("BlockOptionalMeta{block=%s,properties=%s}", block, propertiesDescription);
+        return String.format("BlockOptionalMeta{block=%s}", block);
    }

    public BlockState getAnyBlockState() {
@@ -202,144 +142,48 @@ public final class BlockOptionalMeta {
        return null;
    }

-    public Set<BlockState> getAllBlockStates() {
-        return blockstates;
+    public static LootTables getManager() {
+        if (manager == null) {
+            PackRepository rpl = new PackRepository(PackType.SERVER_DATA, new ServerPacksSource());
+            rpl.reload();
+            PackResources thePack = rpl.getAvailablePacks().iterator().next().open();
+            ReloadableResourceManager resourceManager = new SimpleReloadableResourceManager(PackType.SERVER_DATA);
+            manager = new LootTables(predicate);
+            resourceManager.registerReloadListener(manager);
+            try {
+                resourceManager.reload(new ThreadPerTaskExecutor(Thread::new), new ThreadPerTaskExecutor(Thread::new), Collections.singletonList(thePack), CompletableFuture.completedFuture(Unit.INSTANCE)).get();
+            } catch (Exception exception) {
+                throw new RuntimeException(exception);
+            }
+        }
+        return manager;
    }

-    public Set<Integer> stackHashes() {
-        return stackHashes;
-    }
-
-    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 static PredicateManager getPredicateManager() {
+        return predicate;
    }

    private static synchronized List<Item> drops(Block b) {
        return drops.computeIfAbsent(b, block -> {
-            ResourceLocation lootTableLocation = block.getLootTable().location();
-            if (lootTableLocation.equals(BuiltInLootTables.EMPTY.location())) {
+            ResourceLocation lootTableLocation = block.getLootTable();
+            if (lootTableLocation == BuiltInLootTables.EMPTY) {
                return Collections.emptyList();
            } else {
                List<Item> items = new ArrayList<>();
-                try {
-                    ServerLevel lv2 = ServerLevelStub.fastCreate();

-                    LootParams.Builder lv5 = new LootParams.Builder(lv2)
-                        .withParameter(LootContextParams.ORIGIN, Vec3.ZERO)
-                        .withParameter(LootContextParams.BLOCK_STATE, b.defaultBlockState())
-                        .withParameter(LootContextParams.TOOL, new ItemStack(Items.NETHERITE_PICKAXE, 1));
-                    getDrops(block, lv5).stream().map(ItemStack::getItem).forEach(items::add);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
+                // the other overload for generate doesnt work in forge because forge adds code that requires a non null world
+                getManager().get(lootTableLocation).getRandomItems(
+                        new LootContext.Builder((ServerLevel) null)
+                                .withRandom(new Random())
+                                .withParameter(LootContextParams.ORIGIN, Vec3.atLowerCornerOf(BlockPos.ZERO))
+                                .withParameter(LootContextParams.TOOL, ItemStack.EMPTY)
+                                .withOptionalParameter(LootContextParams.BLOCK_ENTITY, null)
+                                .withParameter(LootContextParams.BLOCK_STATE, block.defaultBlockState())
+                                .create(LootContextParamSets.BLOCK),
+                        stack -> items.add(stack.getItem())
+                );
                return items;
            }
        });
    }
-
-    private static List<ItemStack> getDrops(Block state, LootParams.Builder params) {
-        ResourceKey<LootTable> lv = state.getLootTable();
-        if (lv == BuiltInLootTables.EMPTY) {
-            return Collections.emptyList();
-        } else {
-            LootParams lv2 = params.withParameter(LootContextParams.BLOCK_STATE, state.defaultBlockState()).create(LootContextParamSets.BLOCK);
-            ServerLevelStub lv3 = (ServerLevelStub) lv2.getLevel();
-            LootTable lv4 = lv3.holder().getLootTable(lv);
-            return((ILootTable) lv4).invokeGetRandomItems(new LootContext.Builder(lv2).withOptionalRandomSeed(1).create(null));
-        }
-    }
-
-    public static class ServerLevelStub extends ServerLevel {
-        private static Minecraft client = Minecraft.getInstance();
-        private static Unsafe unsafe = getUnsafe();
-        private static CompletableFuture<RegistryAccess> registryAccess = load();
-
-        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, @Nullable RandomSequences $$11) {
-            super($$0, $$1, $$2, $$3, $$4, $$5, $$6, $$7, $$8, $$9, $$10, $$11);
-        }
-
-        @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);
-            }
-        }
-
-        @Override
-        public RegistryAccess registryAccess() {
-            return registryAccess.join();
-        }
-
-        public ReloadableServerRegistries.Holder holder() {
-            return new ReloadableServerRegistries.Holder(registryAccess().freeze());
-        }
-
-        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);
-            }
-        }
-
-        public static CompletableFuture<RegistryAccess> load() {
-            PackRepository packRepository = Minecraft.getInstance().getResourcePackRepository();
-            CloseableResourceManager closeableResourceManager = new MultiPackResourceManager(PackType.SERVER_DATA, packRepository.openAllSelected());
-            LayeredRegistryAccess<RegistryLayer> layeredRegistryAccess = loadAndReplaceLayer(
-                closeableResourceManager, RegistryLayer.createRegistryAccess(), RegistryLayer.WORLDGEN, RegistryDataLoader.WORLDGEN_REGISTRIES
-            );
-            return ReloadableServerResources.loadResources(
-                closeableResourceManager,
-                layeredRegistryAccess,
-                WorldDataConfiguration.DEFAULT.enabledFeatures(),
-                Commands.CommandSelection.INTEGRATED,
-                2,
-                Runnable::run,
-                Minecraft.getInstance()
-            ).thenApply(reloadableServerResources -> reloadableServerResources.fullRegistries().get());
-        }
-
-        private static LayeredRegistryAccess<RegistryLayer> loadAndReplaceLayer(
-            ResourceManager resourceManager,
-            LayeredRegistryAccess<RegistryLayer> registryAccess,
-            RegistryLayer registryLayer,
-            List<RegistryDataLoader.RegistryData<?>> registryData
-        ) {
-            RegistryAccess.Frozen frozen = loadLayer(resourceManager, registryAccess, registryLayer, registryData);
-            return registryAccess.replaceFrom(registryLayer, frozen);
-        }
-
-        private static RegistryAccess.Frozen loadLayer(
-            ResourceManager resourceManager,
-            LayeredRegistryAccess<RegistryLayer> registryAccess,
-            RegistryLayer registryLayer,
-            List<RegistryDataLoader.RegistryData<?>> registryData
-        ) {
-            RegistryAccess.Frozen frozen = registryAccess.getAccessForLoading(registryLayer);
-            return RegistryDataLoader.load(resourceManager, frozen, registryData);
-        }
-
-    }
 }
--- a/src/api/java/baritone/api/utils/BlockOptionalMetaLookup.java
+++ b/src/api/java/baritone/api/utils/BlockOptionalMetaLookup.java
@@ -17,70 +17,67 @@

 package baritone.api.utils;

-import baritone.api.utils.accessor.IItemStack;
-import com.google.common.collect.ImmutableSet;
+import java.util.Arrays;
+import java.util.List;
+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;

-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Stream;
-
 public class BlockOptionalMetaLookup {
-    private final ImmutableSet<Block> blockSet;
-    private final ImmutableSet<BlockState> blockStateSet;
-    private final ImmutableSet<Integer> stackHashes;
+
    private final BlockOptionalMeta[] boms;

    public BlockOptionalMetaLookup(BlockOptionalMeta... boms) {
        this.boms = boms;
-        Set<Block> blocks = new HashSet<>();
-        Set<BlockState> blockStates = new HashSet<>();
-        Set<Integer> stacks = new HashSet<>();
-        for (BlockOptionalMeta bom : boms) {
-            blocks.add(bom.getBlock());
-            blockStates.addAll(bom.getAllBlockStates());
-            stacks.addAll(bom.stackHashes());
-        }
-        this.blockSet = ImmutableSet.copyOf(blocks);
-        this.blockStateSet = ImmutableSet.copyOf(blockStates);
-        this.stackHashes = ImmutableSet.copyOf(stacks);
    }

    public BlockOptionalMetaLookup(Block... blocks) {
-        this(Stream.of(blocks)
+        this.boms = Stream.of(blocks)
                .map(BlockOptionalMeta::new)
-                .toArray(BlockOptionalMeta[]::new));
-
+                .toArray(BlockOptionalMeta[]::new);
    }

    public BlockOptionalMetaLookup(List<Block> blocks) {
-        this(blocks.stream()
+        this.boms = blocks.stream()
                .map(BlockOptionalMeta::new)
-                .toArray(BlockOptionalMeta[]::new));
+                .toArray(BlockOptionalMeta[]::new);
    }

    public BlockOptionalMetaLookup(String... blocks) {
-        this(Stream.of(blocks)
+        this.boms = Stream.of(blocks)
                .map(BlockOptionalMeta::new)
-                .toArray(BlockOptionalMeta[]::new));
+                .toArray(BlockOptionalMeta[]::new);
    }

    public boolean has(Block block) {
-        return blockSet.contains(block);
+        for (BlockOptionalMeta bom : boms) {
+            if (bom.getBlock() == block) {
+                return true;
+            }
+        }
+
+        return false;
    }

    public boolean has(BlockState state) {
-        return blockStateSet.contains(state);
+        for (BlockOptionalMeta bom : boms) {
+            if (bom.matches(state)) {
+                return true;
+            }
+        }
+
+        return false;
    }

    public boolean has(ItemStack stack) {
-        int hash = ((IItemStack) (Object) stack).getBaritoneHash();
-        hash -= stack.getDamageValue();
-        return stackHashes.contains(hash);
+        for (BlockOptionalMeta bom : boms) {
+            if (bom.matches(stack)) {
+                return true;
+            }
+        }
+
+        return false;
    }

    public List<BlockOptionalMeta> blocks() {
--- a/src/api/java/baritone/api/utils/BlockUtils.java
+++ b/src/api/java/baritone/api/utils/BlockUtils.java
@@ -20,7 +20,6 @@ package baritone.api.utils;
 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;

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

 import baritone.api.BaritoneAPI;
-import baritone.api.Settings;
+import baritone.api.utils.gui.BaritoneToast;
 import net.minecraft.ChatFormatting;
-import net.minecraft.client.GuiMessageTag;
 import net.minecraft.client.Minecraft;
+import net.minecraft.network.chat.BaseComponent;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.MutableComponent;
-
+import net.minecraft.network.chat.TextComponent;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.stream.Stream;
@@ -44,26 +43,19 @@ public interface Helper {
    Helper HELPER = new Helper() {};

    /**
-     * The main game instance returned by {@link Minecraft#getInstance()}.
-     * Deprecated since {@link IPlayerContext#minecraft()} should be used instead (In the majority of cases).
+     * Instance of the game
     */
-    @Deprecated
    Minecraft mc = Minecraft.getInstance();

-    /**
-     * The tag to assign to chat messages when {@link Settings#useMessageTag} is {@code true}.
-     */
-    GuiMessageTag MESSAGE_TAG = new GuiMessageTag(0xFF55FF, null, Component.literal("Baritone message."), "Baritone");
-
    static Component getPrefix() {
        // Inner text component
        final Calendar now = Calendar.getInstance();
        final boolean xd = now.get(Calendar.MONTH) == Calendar.APRIL && now.get(Calendar.DAY_OF_MONTH) <= 3;
-        MutableComponent baritone = Component.literal(xd ? "Baritoe" : BaritoneAPI.getSettings().shortBaritonePrefix.value ? "B" : "Baritone");
+        BaseComponent baritone = new TextComponent(xd ? "Baritoe" : BaritoneAPI.getSettings().shortBaritonePrefix.value ? "B" : "Baritone");
        baritone.setStyle(baritone.getStyle().withColor(ChatFormatting.LIGHT_PURPLE));

        // Outer brackets
-        MutableComponent prefix = Component.literal("");
+        BaseComponent prefix = new TextComponent("");
        prefix.setStyle(baritone.getStyle().withColor(ChatFormatting.DARK_PURPLE));
        prefix.append("[");
        prefix.append(baritone);
@@ -79,7 +71,7 @@ public interface Helper {
     * @param message The message to display in the popup
     */
    default void logToast(Component title, Component message) {
-        Minecraft.getInstance().execute(() -> BaritoneAPI.getSettings().toaster.value.accept(title, message));
+        mc.execute(() -> BaritoneAPI.getSettings().toaster.value.accept(title, message));
    }

    /**
@@ -89,7 +81,7 @@ public interface Helper {
     * @param message The message to display in the popup
     */
    default void logToast(String title, String message) {
-        logToast(Component.literal(title), Component.literal(message));
+        logToast(new TextComponent(title), new TextComponent(message));
    }

    /**
@@ -98,7 +90,7 @@ public interface Helper {
     * @param message The message to display in the popup
     */
    default void logToast(String message) {
-        logToast(Helper.getPrefix(), Component.literal(message));
+        logToast(Helper.getPrefix(), new TextComponent(message));
    }

    /**
@@ -140,7 +132,7 @@ public interface Helper {
     * @param error   Whether to log as an error
     */
    default void logNotificationDirect(String message, boolean error) {
-        Minecraft.getInstance().execute(() -> BaritoneAPI.getSettings().notifier.value.accept(message, error));
+        mc.execute(() -> BaritoneAPI.getSettings().notifier.value.accept(message, error));
    }

    /**
@@ -166,16 +158,14 @@ public interface Helper {
     * @param components The components to send
     */
    default void logDirect(boolean logAsToast, Component... components) {
-        MutableComponent component = Component.literal("");
-        if (!logAsToast && !BaritoneAPI.getSettings().useMessageTag.value) {
-            component.append(getPrefix());
-            component.append(Component.literal(" "));
-        }
+        BaseComponent component = new TextComponent("");
+        component.append(getPrefix());
+        component.append(new TextComponent(" "));
        Arrays.asList(components).forEach(component::append);
        if (logAsToast) {
            logToast(getPrefix(), component);
        } else {
-            Minecraft.getInstance().execute(() -> BaritoneAPI.getSettings().logger.value.accept(component));
+            mc.execute(() -> BaritoneAPI.getSettings().logger.value.accept(component));
        }
    }

@@ -198,7 +188,7 @@ public interface Helper {
     */
    default void logDirect(String message, ChatFormatting color, boolean logAsToast) {
        Stream.of(message.split("\n")).forEach(line -> {
-            MutableComponent component = Component.literal(line.replace("\t", "    "));
+            BaseComponent component = new TextComponent(line.replace("\t", "    "));
            component.setStyle(component.getStyle().withColor(color));
            logDirect(logAsToast, component);
        });
@@ -235,11 +225,4 @@ public interface Helper {
    default void logDirect(String message) {
        logDirect(message, BaritoneAPI.getSettings().logAsToast.value);
    }
-
-    default void logUnhandledException(final Throwable exception) {
-        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);
-        exception.printStackTrace();
-    }
 }
--- a/src/api/java/baritone/api/utils/IPlayerContext.java
+++ b/src/api/java/baritone/api/utils/IPlayerContext.java
@@ -18,7 +18,9 @@
 package baritone.api.utils;

 import baritone.api.cache.IWorldData;
-import net.minecraft.client.Minecraft;
+import java.util.Optional;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.core.BlockPos;
@@ -29,18 +31,12 @@ import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.phys.Vec3;

-import java.util.Optional;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
 /**
 * @author Brady
 * @since 11/12/2018
 */
 public interface IPlayerContext {

-    Minecraft minecraft();
-
    LocalPlayer player();

    IPlayerController playerController();
@@ -89,12 +85,6 @@ public interface IPlayerContext {
        return new Vec3(player().position().x, player().position().y + player().getEyeHeight(), player().position().z);
    }

-    default Vec3 playerMotion() {
-        return player().getDeltaMovement();
-    }
-
-    BetterBlockPos viewerPos();
-
    default Rotation playerRotations() {
        return new Rotation(player().getYRot(), player().getXRot());
    }
--- a/src/api/java/baritone/api/utils/Pair.java
+++ b/src/api/java/baritone/api/utils/Pair.java
@@ -1,59 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.utils;
-
-import java.util.Objects;
-
-/**
- * @author Brady
- */
-public final class Pair<A, B> {
-
-    private final A a;
-    private final B b;
-
-    public Pair(A a, B b) {
-        this.a = a;
-        this.b = b;
-    }
-
-    public A first() {
-        return this.a;
-    }
-
-    public B second() {
-        return this.b;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || o.getClass() != Pair.class) {
-            return false;
-        }
-        Pair<?, ?> pair = (Pair<?, ?>) o;
-        return Objects.equals(this.a, pair.a) && Objects.equals(this.b, pair.b);
-    }
-
-    @Override
-    public int hashCode() {
-        return 31 * Objects.hashCode(this.a) + Objects.hashCode(this.b);
-    }
-}
--- a/src/api/java/baritone/api/utils/RayTraceUtils.java
+++ b/src/api/java/baritone/api/utils/RayTraceUtils.java
@@ -51,14 +51,13 @@ public final class RayTraceUtils {
        } else {
            start = entity.getEyePosition(1.0F); // do whatever is correct
        }
-        
-        Vec3 direction = RotationUtils.calcLookDirectionFromRotation(rotation);
+        Vec3 direction = RotationUtils.calcVector3dFromRotation(rotation);
        Vec3 end = start.add(
                direction.x * blockReachDistance,
                direction.y * blockReachDistance,
                direction.z * blockReachDistance
        );
-        return entity.level().clip(new ClipContext(start, end, ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, entity));
+        return entity.level.clip(new ClipContext(start, end, ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, entity));
    }

    public static Vec3 inferSneakingEyePosition(Entity entity) {
--- a/src/api/java/baritone/api/utils/Rotation.java
+++ b/src/api/java/baritone/api/utils/Rotation.java
@@ -26,12 +26,12 @@ public class Rotation {
    /**
     * The yaw angle of this Rotation
     */
-    private final float yaw;
+    private float yaw;

    /**
     * The pitch angle of this Rotation
     */
-    private final float pitch;
+    private float pitch;

    public Rotation(float yaw, float pitch) {
        this.yaw = yaw;
@@ -113,10 +113,6 @@ public class Rotation {
        );
    }

-    public Rotation withPitch(float pitch) {
-        return new Rotation(this.yaw, pitch);
-    }
-
    /**
     * Is really close to
     *
--- a/src/api/java/baritone/api/utils/RotationUtils.java
+++ b/src/api/java/baritone/api/utils/RotationUtils.java
@@ -19,6 +19,7 @@ package baritone.api.utils;

 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
+import java.util.Optional;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -32,8 +33,6 @@ import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;

-import java.util.Optional;
-
 /**
 * @author Brady
 * @since 9/25/2018
@@ -44,13 +43,11 @@ public final class RotationUtils {
     * Constant that a degree value is multiplied by to get the equivalent radian value
     */
    public static final double DEG_TO_RAD = Math.PI / 180.0;
-    public static final float DEG_TO_RAD_F = (float) DEG_TO_RAD;

    /**
     * Constant that a radian value is multiplied by to get the equivalent degree value
     */
    public static final double RAD_TO_DEG = 180.0 / Math.PI;
-    public static final float RAD_TO_DEG_F = (float) RAD_TO_DEG;

    /**
     * Offsets from the root block position to the center of each side.
@@ -131,31 +128,26 @@ public final class RotationUtils {
     * @param rotation The input rotation
     * @return Look vector for the rotation
     */
-    public static Vec3 calcLookDirectionFromRotation(Rotation rotation) {
-        float flatZ = Mth.cos((-rotation.getYaw() * DEG_TO_RAD_F) - (float) Math.PI);
-        float flatX = Mth.sin((-rotation.getYaw() * DEG_TO_RAD_F) - (float) Math.PI);
-        float pitchBase = -Mth.cos(-rotation.getPitch() * DEG_TO_RAD_F);
-        float pitchHeight = Mth.sin(-rotation.getPitch() * DEG_TO_RAD_F);
-        return new Vec3(flatX * pitchBase, pitchHeight, flatZ * pitchBase);
-    }
-
-    @Deprecated
-    public static Vec3 calcVec3dFromRotation(Rotation rotation) {
-        return calcLookDirectionFromRotation(rotation);
+    public static Vec3 calcVector3dFromRotation(Rotation rotation) {
+        float f = Mth.cos(-rotation.getYaw() * (float) DEG_TO_RAD - (float) Math.PI);
+        float f1 = Mth.sin(-rotation.getYaw() * (float) DEG_TO_RAD - (float) Math.PI);
+        float f2 = -Mth.cos(-rotation.getPitch() * (float) DEG_TO_RAD);
+        float f3 = Mth.sin(-rotation.getPitch() * (float) DEG_TO_RAD);
+        return new Vec3((double) (f1 * f2), (double) f3, (double) (f * f2));
    }

    /**
     * @param ctx Context for the viewing entity
     * @param pos The target block position
     * @return The optional rotation
-     * @see #reachable(IPlayerContext, BlockPos, double)
+     * @see #reachable(LocalPlayer, BlockPos, double)
     */
    public static Optional<Rotation> reachable(IPlayerContext ctx, BlockPos pos) {
-        return reachable(ctx, pos, false);
+        return reachable(ctx.player(), pos, ctx.playerController().getBlockReachDistance());
    }

    public static Optional<Rotation> reachable(IPlayerContext ctx, BlockPos pos, boolean wouldSneak) {
-        return reachable(ctx, pos, ctx.playerController().getBlockReachDistance(), wouldSneak);
+        return reachable(ctx.player(), pos, ctx.playerController().getBlockReachDistance(), wouldSneak);
    }

    /**
@@ -165,17 +157,18 @@ public final class RotationUtils {
     * side that is reachable. The return type will be {@link Optional#empty()} if the entity is
     * unable to reach any of the sides of the block.
     *
-     * @param ctx                Context for the viewing entity
+     * @param entity             The viewing entity
     * @param pos                The target block position
     * @param blockReachDistance The block reach distance of the entity
     * @return The optional rotation
     */
-    public static Optional<Rotation> reachable(IPlayerContext ctx, BlockPos pos, double blockReachDistance) {
-        return reachable(ctx, pos, blockReachDistance, false);
+    public static Optional<Rotation> reachable(LocalPlayer entity, BlockPos pos, double blockReachDistance) {
+        return reachable(entity, pos, blockReachDistance, false);
    }

-    public static Optional<Rotation> reachable(IPlayerContext ctx, BlockPos pos, double blockReachDistance, boolean wouldSneak) {
-        if (BaritoneAPI.getSettings().remainWithExistingLookDirection.value && ctx.isLookingAt(pos)) {
+    public static Optional<Rotation> reachable(LocalPlayer entity, BlockPos pos, double blockReachDistance, boolean wouldSneak) {
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer(entity);
+        if (baritone.getPlayerContext().isLookingAt(pos)) {
            /*
             * why add 0.0001?
             * to indicate that we actually have a desired pitch
@@ -186,10 +179,10 @@ public final class RotationUtils {
             *
             * or if you're a normal person literally all this does it ensure that we don't nudge the pitch to a normal level
             */
-            Rotation hypothetical = ctx.playerRotations().add(new Rotation(0, 0.0001F));
+            Rotation hypothetical = new Rotation(entity.getYRot(), entity.getXRot() + 0.0001F);
            if (wouldSneak) {
                // the concern here is: what if we're looking at it now, but as soon as we start sneaking we no longer are
-                HitResult result = RayTraceUtils.rayTraceTowards(ctx.player(), hypothetical, blockReachDistance, true);
+                HitResult result = RayTraceUtils.rayTraceTowards(entity, hypothetical, blockReachDistance, true);
                if (result != null && result.getType() == HitResult.Type.BLOCK && ((BlockHitResult) result).getBlockPos().equals(pos)) {
                    return Optional.of(hypothetical); // yes, if we sneaked we would still be looking at the block
                }
@@ -197,14 +190,14 @@ public final class RotationUtils {
                return Optional.of(hypothetical);
            }
        }
-        Optional<Rotation> possibleRotation = reachableCenter(ctx, pos, blockReachDistance, wouldSneak);
+        Optional<Rotation> possibleRotation = reachableCenter(entity, pos, blockReachDistance, wouldSneak);
        //System.out.println("center: " + possibleRotation);
        if (possibleRotation.isPresent()) {
            return possibleRotation;
        }

-        BlockState state = ctx.world().getBlockState(pos);
-        VoxelShape shape = state.getShape(ctx.world(), pos);
+        BlockState state = entity.level.getBlockState(pos);
+        VoxelShape shape = state.getShape(entity.level, pos);
        if (shape.isEmpty()) {
            shape = Shapes.block();
        }
@@ -212,7 +205,7 @@ public final class RotationUtils {
            double xDiff = shape.min(Direction.Axis.X) * sideOffset.x + shape.max(Direction.Axis.X) * (1 - sideOffset.x);
            double yDiff = shape.min(Direction.Axis.Y) * sideOffset.y + shape.max(Direction.Axis.Y) * (1 - sideOffset.y);
            double zDiff = shape.min(Direction.Axis.Z) * sideOffset.z + shape.max(Direction.Axis.Z) * (1 - sideOffset.z);
-            possibleRotation = reachableOffset(ctx, pos, new Vec3(pos.getX(), pos.getY(), pos.getZ()).add(xDiff, yDiff, zDiff), blockReachDistance, wouldSneak);
+            possibleRotation = reachableOffset(entity, pos, new Vec3(pos.getX(), pos.getY(), pos.getZ()).add(xDiff, yDiff, zDiff), blockReachDistance, wouldSneak);
            if (possibleRotation.isPresent()) {
                return possibleRotation;
            }
@@ -225,23 +218,22 @@ public final class RotationUtils {
     * the given offsetted position. The return type will be {@link Optional#empty()} if
     * the entity is unable to reach the block with the offset applied.
     *
-     * @param ctx                Context for the viewing entity
+     * @param entity             The viewing entity
     * @param pos                The target block position
     * @param offsetPos          The position of the block with the offset applied.
     * @param blockReachDistance The block reach distance of the entity
     * @return The optional rotation
     */
-    public static Optional<Rotation> reachableOffset(IPlayerContext ctx, BlockPos pos, Vec3 offsetPos, double blockReachDistance, boolean wouldSneak) {
-        Vec3 eyes = wouldSneak ? RayTraceUtils.inferSneakingEyePosition(ctx.player()) : ctx.player().getEyePosition(1.0F);
-        Rotation rotation = calcRotationFromVec3d(eyes, offsetPos, ctx.playerRotations());
-        Rotation actualRotation = BaritoneAPI.getProvider().getBaritoneForPlayer(ctx.player()).getLookBehavior().getAimProcessor().peekRotation(rotation);
-        HitResult result = RayTraceUtils.rayTraceTowards(ctx.player(), actualRotation, blockReachDistance, wouldSneak);
+    public static Optional<Rotation> reachableOffset(Entity entity, BlockPos pos, Vec3 offsetPos, double blockReachDistance, boolean wouldSneak) {
+        Vec3 eyes = wouldSneak ? RayTraceUtils.inferSneakingEyePosition(entity) : entity.getEyePosition(1.0F);
+        Rotation rotation = calcRotationFromVec3d(eyes, offsetPos, new Rotation(entity.getYRot(), entity.getXRot()));
+        HitResult result = RayTraceUtils.rayTraceTowards(entity, rotation, blockReachDistance, wouldSneak);
        //System.out.println(result);
        if (result != null && result.getType() == HitResult.Type.BLOCK) {
            if (((BlockHitResult) result).getBlockPos().equals(pos)) {
                return Optional.of(rotation);
            }
-            if (ctx.world().getBlockState(pos).getBlock() instanceof BaseFireBlock && ((BlockHitResult) result).getBlockPos().equals(pos.below())) {
+            if (entity.level.getBlockState(pos).getBlock() instanceof BaseFireBlock && ((BlockHitResult) result).getBlockPos().equals(pos.below())) {
                return Optional.of(rotation);
            }
        }
@@ -252,46 +244,12 @@ public final class RotationUtils {
     * Determines if the specified entity is able to reach the specified block where it is
     * looking at the direct center of it's hitbox.
     *
-     * @param ctx                Context for the viewing entity
+     * @param entity             The viewing entity
     * @param pos                The target block position
     * @param blockReachDistance The block reach distance of the entity
     * @return The optional rotation
     */
-    public static Optional<Rotation> reachableCenter(IPlayerContext ctx, BlockPos pos, double blockReachDistance, boolean wouldSneak) {
-        return reachableOffset(ctx, pos, VecUtils.calculateBlockCenter(ctx.world(), pos), blockReachDistance, wouldSneak);
-    }
-
-    @Deprecated
-    public static Optional<Rotation> reachable(LocalPlayer entity, BlockPos pos, double blockReachDistance) {
-        return reachable(entity, pos, blockReachDistance, false);
-    }
-
-    @Deprecated
-    public static Optional<Rotation> reachable(LocalPlayer entity, BlockPos pos, double blockReachDistance, boolean wouldSneak) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer(entity);
-        IPlayerContext ctx = baritone.getPlayerContext();
-        return reachable(ctx, pos, blockReachDistance, wouldSneak);
-    }
-
-    @Deprecated
-    public static Optional<Rotation> reachableOffset(Entity entity, BlockPos pos, Vec3 offsetPos, double blockReachDistance, boolean wouldSneak) {
-        Vec3 eyes = wouldSneak ? RayTraceUtils.inferSneakingEyePosition(entity) : entity.getEyePosition(1.0F);
-        Rotation rotation = calcRotationFromVec3d(eyes, offsetPos, new Rotation(entity.getYRot(), entity.getXRot()));
-        HitResult result = RayTraceUtils.rayTraceTowards(entity, rotation, blockReachDistance, wouldSneak);
-        //System.out.println(result);
-        if (result != null && result.getType() == HitResult.Type.BLOCK) {
-            if (((BlockHitResult) result).getBlockPos().equals(pos)) {
-                return Optional.of(rotation);
-            }
-            if (entity.level().getBlockState(pos).getBlock() instanceof BaseFireBlock && ((BlockHitResult) result).getBlockPos().equals(pos.below())) {
-                return Optional.of(rotation);
-            }
-        }
-        return Optional.empty();
-    }
-
-    @Deprecated
    public static Optional<Rotation> reachableCenter(Entity entity, BlockPos pos, double blockReachDistance, boolean wouldSneak) {
-        return reachableOffset(entity, pos, VecUtils.calculateBlockCenter(entity.level(), pos), blockReachDistance, wouldSneak);
+        return reachableOffset(entity, pos, VecUtils.calculateBlockCenter(entity.level, pos), blockReachDistance, wouldSneak);
    }
 }
--- a/src/api/java/baritone/api/utils/SettingsUtil.java
+++ b/src/api/java/baritone/api/utils/SettingsUtil.java
@@ -23,7 +23,6 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.core.Direction;
 import net.minecraft.core.Registry;
 import net.minecraft.core.Vec3i;
-import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
@@ -47,10 +46,12 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

+
 public class SettingsUtil {

-    public static final String SETTINGS_DEFAULT_NAME = "settings.txt";
+    private static final Path SETTINGS_PATH = Minecraft.getInstance().gameDirectory.toPath().resolve("baritone").resolve("settings.txt");
    private static final Pattern SETTING_PATTERN = Pattern.compile("^(?<setting>[^ ]+) +(?<value>.+)"); // key and value split by the first space
+    private static final String[] JAVA_ONLY_SETTINGS = {"logger", "notifier", "toaster"};


    private static boolean isComment(String line) {
@@ -69,12 +70,12 @@ public class SettingsUtil {
        }
    }

-    public static void readAndApply(Settings settings, String settingsName) {
+    public static void readAndApply(Settings settings) {
        try {
-            forEachLine(settingsByName(settingsName), line -> {
+            forEachLine(SETTINGS_PATH, line -> {
                Matcher matcher = SETTING_PATTERN.matcher(line);
                if (!matcher.matches()) {
-                    Helper.HELPER.logDirect("Invalid syntax in setting file: " + line);
+                    System.out.println("Invalid syntax in setting file: " + line);
                    return;
                }

@@ -83,33 +84,29 @@ public class SettingsUtil {
                try {
                    parseAndApply(settings, settingName, settingValue);
                } catch (Exception ex) {
-                    Helper.HELPER.logDirect("Unable to parse line " + line);
+                    System.out.println("Unable to parse line " + line);
                    ex.printStackTrace();
                }
            });
        } catch (NoSuchFileException ignored) {
-            Helper.HELPER.logDirect("Baritone settings file not found, resetting.");
+            System.out.println("Baritone settings file not found, resetting.");
        } catch (Exception ex) {
-            Helper.HELPER.logDirect("Exception while reading Baritone settings, some settings may be reset to default values!");
+            System.out.println("Exception while reading Baritone settings, some settings may be reset to default values!");
            ex.printStackTrace();
        }
    }

    public static synchronized void save(Settings settings) {
-        try (BufferedWriter out = Files.newBufferedWriter(settingsByName(SETTINGS_DEFAULT_NAME))) {
+        try (BufferedWriter out = Files.newBufferedWriter(SETTINGS_PATH)) {
            for (Settings.Setting setting : modifiedSettings(settings)) {
                out.write(settingToString(setting) + "\n");
            }
        } catch (Exception ex) {
-            Helper.HELPER.logDirect("Exception thrown while saving Baritone settings!");
+            System.out.println("Exception thrown while saving Baritone settings!");
            ex.printStackTrace();
        }
    }

-    private static Path settingsByName(String name) {
-        return Minecraft.getInstance().gameDirectory.toPath().resolve("baritone").resolve(name);
-    }
-
    public static List<Settings.Setting> modifiedSettings(Settings settings) {
        List<Settings.Setting> modified = new ArrayList<>();
        for (Settings.Setting setting : settings.allSettings) {
@@ -117,7 +114,7 @@ public class SettingsUtil {
                System.out.println("NULL SETTING?" + setting.getName());
                continue;
            }
-            if (setting.isJavaOnly()) {
+            if (javaOnlySetting(setting)) {
                continue; // NO
            }
            if (setting.value == setting.defaultValue) {
@@ -149,7 +146,7 @@ public class SettingsUtil {
            throw new IllegalStateException("Missing " + setting.getValueClass() + " " + setting.getName());
        }

-        return io.toString(setting.getType(), value);
+        return io.toString(new ParserContext(setting), value);
    }

    public static String settingValueToString(Settings.Setting setting) throws IllegalArgumentException {
@@ -171,7 +168,7 @@ public class SettingsUtil {
    }

    public static String settingToString(Settings.Setting setting) throws IllegalStateException {
-        if (setting.isJavaOnly()) {
+        if (javaOnlySetting(setting)) {
            return setting.getName();
        }

@@ -179,14 +176,18 @@ public class SettingsUtil {
    }

    /**
-     * Deprecated. Use {@link Settings.Setting#isJavaOnly()} instead.
+     * This should always be the same as whether the setting can be parsed from or serialized to a string
     *
     * @param setting The Setting
     * @return true if the setting can not be set or read by the user
     */
-    @Deprecated
    public static boolean javaOnlySetting(Settings.Setting setting) {
-        return setting.isJavaOnly();
+        for (String name : JAVA_ONLY_SETTINGS) { // no JAVA_ONLY_SETTINGS.contains(...) because that would be case sensitive
+            if (setting.getName().equalsIgnoreCase(name)) {
+                return true;
+            }
+        }
+        return false;
    }

    public static void parseAndApply(Settings settings, String settingName, String settingValue) throws IllegalStateException, NumberFormatException {
@@ -196,7 +197,7 @@ public class SettingsUtil {
        }
        Class intendedType = setting.getValueClass();
        ISettingParser ioMethod = Parser.getParser(setting.getType());
-        Object parsed = ioMethod.parse(setting.getType(), settingValue);
+        Object parsed = ioMethod.parse(new ParserContext(setting), settingValue);
        if (!intendedType.isInstance(parsed)) {
            throw new IllegalStateException(ioMethod + " parser returned incorrect type, expected " + intendedType + " got " + parsed + " which is " + parsed.getClass());
        }
@@ -205,13 +206,26 @@ public class SettingsUtil {

    private interface ISettingParser<T> {

-        T parse(Type type, String raw);
+        T parse(ParserContext context, String raw);

-        String toString(Type type, T value);
+        String toString(ParserContext context, T value);

        boolean accepts(Type type);
    }

+    private static class ParserContext {
+
+        private final Settings.Setting<?> setting;
+
+        private ParserContext(Settings.Setting<?> setting) {
+            this.setting = setting;
+        }
+
+        private Settings.Setting<?> getSetting() {
+            return this.setting;
+        }
+    }
+
    private enum Parser implements ISettingParser {

        DOUBLE(Double.class, Double::parseDouble),
@@ -238,26 +252,26 @@ public class SettingsUtil {
        ),
        ITEM(
                Item.class,
-                str -> BuiltInRegistries.ITEM.get(ResourceLocation.parse(str.trim())), // TODO this now returns AIR on failure instead of null, is that an issue?
-                item -> BuiltInRegistries.ITEM.getKey(item).toString()
+                str -> Registry.ITEM.get(new ResourceLocation(str.trim())), // TODO this now returns AIR on failure instead of null, is that an issue?
+                item -> Registry.ITEM.getKey(item).toString()
        ),
        LIST() {
            @Override
-            public Object parse(Type type, String raw) {
-                Type elementType = ((ParameterizedType) type).getActualTypeArguments()[0];
-                Parser parser = Parser.getParser(elementType);
+            public Object parse(ParserContext context, String raw) {
+                Type type = ((ParameterizedType) context.getSetting().getType()).getActualTypeArguments()[0];
+                Parser parser = Parser.getParser(type);
                return Stream.of(raw.split(","))
-                        .map(s -> parser.parse(elementType, s))
+                        .map(s -> parser.parse(context, s))
                        .collect(Collectors.toList());
            }

            @Override
-            public String toString(Type type, Object value) {
-                Type elementType = ((ParameterizedType) type).getActualTypeArguments()[0];
-                Parser parser = Parser.getParser(elementType);
+            public String toString(ParserContext context, Object value) {
+                Type type = ((ParameterizedType) context.getSetting().getType()).getActualTypeArguments()[0];
+                Parser parser = Parser.getParser(type);

                return ((List<?>) value).stream()
-                        .map(o -> parser.toString(elementType, o))
+                        .map(o -> parser.toString(context, o))
                        .collect(Collectors.joining(","));
            }

@@ -268,26 +282,26 @@ public class SettingsUtil {
        },
        MAPPING() {
            @Override
-            public Object parse(Type type, String raw) {
-                Type keyType = ((ParameterizedType) type).getActualTypeArguments()[0];
-                Type valueType = ((ParameterizedType) type).getActualTypeArguments()[1];
+            public Object parse(ParserContext context, String raw) {
+                Type keyType = ((ParameterizedType) context.getSetting().getType()).getActualTypeArguments()[0];
+                Type valueType = ((ParameterizedType) context.getSetting().getType()).getActualTypeArguments()[1];
                Parser keyParser = Parser.getParser(keyType);
                Parser valueParser = Parser.getParser(valueType);

                return Stream.of(raw.split(",(?=[^,]*->)"))
                        .map(s -> s.split("->"))
-                        .collect(Collectors.toMap(s -> keyParser.parse(keyType, s[0]), s -> valueParser.parse(valueType, s[1])));
+                        .collect(Collectors.toMap(s -> keyParser.parse(context, s[0]), s -> valueParser.parse(context, s[1])));
            }

            @Override
-            public String toString(Type type, Object value) {
-                Type keyType = ((ParameterizedType) type).getActualTypeArguments()[0];
-                Type valueType = ((ParameterizedType) type).getActualTypeArguments()[1];
+            public String toString(ParserContext context, Object value) {
+                Type keyType = ((ParameterizedType) context.getSetting().getType()).getActualTypeArguments()[0];
+                Type valueType = ((ParameterizedType) context.getSetting().getType()).getActualTypeArguments()[1];
                Parser keyParser = Parser.getParser(keyType);
                Parser valueParser = Parser.getParser(valueType);

                return ((Map<?, ?>) value).entrySet().stream()
-                        .map(o -> keyParser.toString(keyType, o.getKey()) + "->" + valueParser.toString(valueType, o.getValue()))
+                        .map(o -> keyParser.toString(context, o.getKey()) + "->" + valueParser.toString(context, o.getValue()))
                        .collect(Collectors.joining(","));
            }

@@ -318,14 +332,14 @@ public class SettingsUtil {
        }

        @Override
-        public Object parse(Type type, String raw) {
+        public Object parse(ParserContext context, String raw) {
            Object parsed = this.parser.apply(raw);
            Objects.requireNonNull(parsed);
            return parsed;
        }

        @Override
-        public String toString(Type type, Object value) {
+        public String toString(ParserContext context, Object value) {
            return this.toString.apply(value);
        }

--- a/src/api/java/baritone/api/utils/accessor/ILootTable.java
+++ b/src/api/java/baritone/api/utils/accessor/ILootTable.java
@@ -1,28 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.utils.accessor;
-
-import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.storage.loot.LootContext;
-
-public interface ILootTable {
-
-    ObjectArrayList<ItemStack> invokeGetRandomItems(LootContext context);
-
-}
--- a/src/api/java/baritone/api/utils/gui/BaritoneToast.java
+++ b/src/api/java/baritone/api/utils/gui/BaritoneToast.java
@@ -20,7 +20,6 @@ package baritone.api.utils.gui;
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.toasts.Toast;
 import net.minecraft.client.gui.components.toasts.ToastComponent;
 import net.minecraft.network.chat.Component;
@@ -39,7 +38,7 @@ public class BaritoneToast implements Toast {
        this.totalShowTime = totalShowTime;
    }

-    public Visibility render(GuiGraphics gui, ToastComponent toastGui, long delta) {
+    public Visibility render(PoseStack matrixStack, ToastComponent toastGui, long delta) {
        if (this.newDisplay) {
            this.firstDrawTime = delta;
            this.newDisplay = false;
@@ -47,13 +46,15 @@ public class BaritoneToast implements Toast {


        //TODO: check
-        gui.blit(ResourceLocation.parse("textures/gui/toasts.png"), 0, 0, 0, 32, 160, 32);
+        toastGui.getMinecraft().getTextureManager().bindForSetup(new ResourceLocation("textures/gui/toasts.png"));
+        //GlStateManager._color4f(1.0F, 1.0F, 1.0F, 255.0F);
+        toastGui.blit(matrixStack, 0, 0, 0, 32, 160, 32);

        if (this.subtitle == null) {
-            gui.drawString(toastGui.getMinecraft().font, this.title, 18, 12, -11534256);
+            toastGui.getMinecraft().font.draw(matrixStack, this.title, 18, 12, -11534256);
        } else {
-            gui.drawString(toastGui.getMinecraft().font, this.title, 18, 7, -11534256);
-            gui.drawString(toastGui.getMinecraft().font, this.subtitle, 18, 18, -16777216);
+            toastGui.getMinecraft().font.draw(matrixStack, this.title, 18, 7, -11534256);
+            toastGui.getMinecraft().font.draw(matrixStack, this.subtitle, 18, 18, -16777216);
        }

        return delta - this.firstDrawTime < totalShowTime ? Visibility.SHOW : Visibility.HIDE;
--- a/tweaker/src/main/java/baritone/launch/tweaker/BaritoneTweaker.java
+++ b/tweaker/src/main/java/baritone/launch/tweaker/BaritoneTweaker.java
@@ -15,7 +15,7 @@
 * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
 */

-package baritone.launch.tweaker;
+package baritone.launch;

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

 import baritone.utils.accessor.IChunkArray;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

@@ -28,28 +27,24 @@ import net.minecraft.world.level.chunk.LevelChunk;

@Mixin(targets = "net.minecraft.client.multiplayer.ClientChunkCache$Storage")
 public abstract class MixinChunkArray implements IChunkArray {
-    @Final
    @Shadow
-    AtomicReferenceArray<LevelChunk> chunks;
-    @Final
+    private AtomicReferenceArray<LevelChunk> chunks;
    @Shadow
-    int chunkRadius;
-
-    @Final
+    private int chunkRadius;
    @Shadow
    private int viewRange;
    @Shadow
-    int viewCenterX;
+    private int viewCenterX;
    @Shadow
-    int viewCenterZ;
+    private int viewCenterZ;
    @Shadow
-    int chunkCount;
+    private int chunkCount;

    @Shadow
-    abstract boolean inRange(int x, int z);
+    protected abstract boolean inRange(int x, int z);

    @Shadow
-    abstract int getIndex(int x, int z);
+    protected abstract int getIndex(int x, int z);

    @Shadow
    protected abstract void replace(int index, LevelChunk chunk);
--- a/src/launch/java/baritone/launch/mixins/MixinClientPlayNetHandler.java
+++ b/src/launch/java/baritone/launch/mixins/MixinClientPlayNetHandler.java
@@ -20,36 +20,24 @@ package baritone.launch.mixins;
 import baritone.Baritone;
 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
-import baritone.api.event.events.BlockChangeEvent;
-import baritone.api.event.events.ChatEvent;
 import baritone.api.event.events.ChunkEvent;
 import baritone.api.event.events.type.EventState;
-import baritone.api.utils.Pair;
 import baritone.cache.CachedChunk;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.ClientCommonPacketListenerImpl;
 import net.minecraft.client.multiplayer.ClientPacketListener;
-import net.minecraft.client.multiplayer.CommonListenerCookie;
 import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.core.BlockPos;
-import net.minecraft.network.Connection;
 import net.minecraft.network.protocol.game.*;
 import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.block.state.BlockState;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

-import java.util.ArrayList;
-import java.util.List;
-
 /**
 * @author Brady
 * @since 8/3/2018
 */
@Mixin(ClientPacketListener.class)
-public abstract class MixinClientPlayNetHandler extends ClientCommonPacketListenerImpl {
+public class MixinClientPlayNetHandler {

    // unused lol
    /*@Inject(
@@ -75,32 +63,11 @@ public abstract class MixinClientPlayNetHandler extends ClientCommonPacketListen
        }
    }*/

-    protected MixinClientPlayNetHandler(final Minecraft arg, final Connection arg2, final CommonListenerCookie arg3) {
-        super(arg, arg2, arg3);
-    }
-
    @Inject(
-            method = "sendChat(Ljava/lang/String;)V",
-            at = @At("HEAD"),
-            cancellable = true
-    )
-    private void sendChatMessage(String string, CallbackInfo ci) {
-        ChatEvent event = new ChatEvent(string);
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer(this.minecraft.player);
-        if (baritone == null) {
-            return;
-        }
-        baritone.getGameEventHandler().onSendChatMessage(event);
-        if (event.isCancelled()) {
-            ci.cancel();
-        }
-    }
-
-    @Inject(
-            method = "handleLevelChunkWithLight",
+            method = "handleLevelChunk",
            at = @At("RETURN")
    )
-    private void postHandleChunkData(ClientboundLevelChunkWithLightPacket packetIn, CallbackInfo ci) {
+    private void postHandleChunkData(ClientboundLevelChunkPacket packetIn, CallbackInfo ci) {
        for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
            LocalPlayer player = ibaritone.getPlayerContext().player();
            if (player != null && player.connection == (ClientPacketListener) (Object) this) {
@@ -125,7 +92,7 @@ public abstract class MixinClientPlayNetHandler extends ClientCommonPacketListen
            LocalPlayer player = ibaritone.getPlayerContext().player();
            if (player != null && player.connection == (ClientPacketListener) (Object) this) {
                ibaritone.getGameEventHandler().onChunkEvent(
-                        new ChunkEvent(EventState.PRE, ChunkEvent.Type.UNLOAD, packet.pos().x, packet.pos().z)
+                        new ChunkEvent(EventState.PRE, ChunkEvent.Type.UNLOAD, packet.getX(), packet.getZ())
                );
            }
        }
@@ -140,7 +107,7 @@ public abstract class MixinClientPlayNetHandler extends ClientCommonPacketListen
            LocalPlayer player = ibaritone.getPlayerContext().player();
            if (player != null && player.connection == (ClientPacketListener) (Object) this) {
                ibaritone.getGameEventHandler().onChunkEvent(
-                        new ChunkEvent(EventState.POST, ChunkEvent.Type.UNLOAD, packet.pos().x, packet.pos().z)
+                        new ChunkEvent(EventState.POST, ChunkEvent.Type.UNLOAD, packet.getX(), packet.getZ())
                );
            }
        }
@@ -177,22 +144,31 @@ public abstract class MixinClientPlayNetHandler extends ClientCommonPacketListen
            at = @At("RETURN")
    )
    private void postHandleMultiBlockChange(ClientboundSectionBlocksUpdatePacket packetIn, CallbackInfo ci) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForConnection((ClientPacketListener) (Object) this);
-        if (baritone == null) {
+        if (!Baritone.settings().repackOnAnyBlockChange.value) {
            return;
        }
-
-        List<Pair<BlockPos, BlockState>> changes = new ArrayList<>();
-        packetIn.runUpdates((mutPos, state) -> {
-            changes.add(new Pair<>(mutPos.immutable(), state));
+        ChunkPos[] chunkPos = new ChunkPos[1];
+        packetIn.runUpdates((pos, state) -> {
+            if (CachedChunk.BLOCKS_TO_KEEP_TRACK_OF.contains(state.getBlock())) {
+                chunkPos[0] = new ChunkPos(pos);
+            }
        });
-        if (changes.isEmpty()) {
+        if (chunkPos[0] == null) {
            return;
        }
-        baritone.getGameEventHandler().onBlockChange(new BlockChangeEvent(
-                new ChunkPos(changes.get(0).first()),
-                changes
-        ));
+        for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
+            LocalPlayer player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (ClientPacketListener) (Object) this) {
+                ibaritone.getGameEventHandler().onChunkEvent(
+                        new ChunkEvent(
+                                EventState.POST,
+                                ChunkEvent.Type.POPULATE_FULL,
+                                chunkPos[0].x,
+                                chunkPos[0].z
+                        )
+                );
+            }
+        }
    }

    @Inject(
@@ -210,71 +186,4 @@ public abstract class MixinClientPlayNetHandler extends ClientCommonPacketListen
            }
        }
    }
-
-    /*
-    @Inject(
-            method = "handleChunkData",
-            at = @At(
-                    value = "INVOKE",
-                    target = "net/minecraft/world/chunk/Chunk.read(Lnet/minecraft/network/PacketBuffer;IZ)V"
-            )
-    )
-    private void preRead(SPacketChunkData packetIn, CallbackInfo ci) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForConnection((NetHandlerPlayClient) (Object) this);
-        if (baritone == null) {
-            return;
-        }
-        baritone.getGameEventHandler().onChunkEvent(
-                new ChunkEvent(
-                        EventState.PRE,
-                        packetIn.isFullChunk() ? ChunkEvent.Type.POPULATE_FULL : ChunkEvent.Type.POPULATE_PARTIAL,
-                        packetIn.getChunkX(),
-                        packetIn.getChunkZ()
-                )
-        );
-    }
-
-    @Inject(
-            method = "handleChunkData",
-            at = @At("RETURN")
-    )
-    private void postHandleChunkData(SPacketChunkData packetIn, CallbackInfo ci) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForConnection((NetHandlerPlayClient) (Object) this);
-        if (baritone == null) {
-            return;
-        }
-        baritone.getGameEventHandler().onChunkEvent(
-                new ChunkEvent(
-                        EventState.POST,
-                        packetIn.isFullChunk() ? ChunkEvent.Type.POPULATE_FULL : ChunkEvent.Type.POPULATE_PARTIAL,
-                        packetIn.getChunkX(),
-                        packetIn.getChunkZ()
-                )
-        );
-    }
-
-    @Inject(
-            method = "handleBlockChange",
-            at = @At("RETURN")
-    )
-    private void postHandleBlockChange(SPacketBlockChange packetIn, CallbackInfo ci) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForConnection((NetHandlerPlayClient) (Object) this);
-        if (baritone == null) {
-            return;
-        }
-
-        final ChunkPos pos = new ChunkPos(packetIn.getBlockPosition().getX() >> 4, packetIn.getBlockPosition().getZ() >> 4);
-        final Pair<BlockPos, IBlockState> changed = new Pair<>(packetIn.getBlockPosition(), packetIn.getBlockState());
-        baritone.getGameEventHandler().onBlockChange(new BlockChangeEvent(pos, Collections.singletonList(changed)));
-    }
-
-    @Inject(
-            method = "handleMultiBlockChange",
-            at = @At("RETURN")
-    )
-    private void postHandleMultiBlockChange(SPacketMultiBlockChange packetIn, CallbackInfo ci) {
-
-    }
-
-     */
 }
--- a/src/launch/java/baritone/launch/mixins/MixinClientPlayerEntity.java
+++ b/src/launch/java/baritone/launch/mixins/MixinClientPlayerEntity.java
@@ -19,6 +19,7 @@ package baritone.launch.mixins;

 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
+import baritone.api.event.events.ChatEvent;
 import baritone.api.event.events.PlayerUpdateEvent;
 import baritone.api.event.events.SprintStateEvent;
 import baritone.api.event.events.type.EventState;
@@ -27,35 +28,32 @@ import net.minecraft.client.KeyMapping;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.world.entity.player.Abilities;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Group;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
-
 /**
 * @author Brady
 * @since 8/1/2018
 */
@Mixin(LocalPlayer.class)
 public class MixinClientPlayerEntity {
-    @Unique
-    private static final MethodHandle MAY_FLY = baritone$resolveMayFly();

-    @Unique
-    private static MethodHandle baritone$resolveMayFly() {
-        try {
-            var lookup = MethodHandles.publicLookup();
-            return lookup.findVirtual(LocalPlayer.class, "mayFly", MethodType.methodType(boolean.class));
-        } catch (NoSuchMethodException e) {
-            return null;
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
+    @Inject(
+            method = "chat",
+            at = @At("HEAD"),
+            cancellable = true
+    )
+    private void sendChatMessage(String msg, CallbackInfo ci) {
+        ChatEvent event = new ChatEvent(msg);
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this);
+        if (baritone == null) {
+            return;
+        }
+        baritone.getGameEventHandler().onSendChatMessage(event);
+        if (event.isCancelled()) {
+            ci.cancel();
        }
    }

@@ -63,8 +61,9 @@ public class MixinClientPlayerEntity {
            method = "tick",
            at = @At(
                    value = "INVOKE",
-                    target = "net/minecraft/client/player/AbstractClientPlayer.tick()V",
-                    shift = At.Shift.AFTER
+                    target = "net/minecraft/client/player/LocalPlayer.isPassenger()Z",
+                    shift = At.Shift.BY,
+                    by = -3
            )
    )
    private void onPreUpdate(CallbackInfo ci) {
@@ -74,6 +73,22 @@ public class MixinClientPlayerEntity {
        }
    }

+    @Inject(
+            method = "tick",
+            at = @At(
+                    value = "INVOKE",
+                    target = "net/minecraft/client/player/LocalPlayer.sendPosition()V",
+                    shift = At.Shift.BY,
+                    by = 2
+            )
+    )
+    private void onPostUpdate(CallbackInfo ci) {
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this);
+        if (baritone != null) {
+            baritone.getGameEventHandler().onPlayerUpdate(new PlayerUpdateEvent(EventState.POST));
+        }
+    }
+
    @Redirect(
            method = "aiStep",
            at = @At(
@@ -81,7 +96,6 @@ public class MixinClientPlayerEntity {
                    target = "net/minecraft/world/entity/player/Abilities.mayfly:Z"
            )
    )
-    @Group(name = "mayFly", min = 1, max = 1)
    private boolean isAllowFlying(Abilities capabilities) {
        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this);
        if (baritone == null) {
@@ -90,22 +104,6 @@ public class MixinClientPlayerEntity {
        return !baritone.getPathingBehavior().isPathing() && capabilities.mayfly;
    }

-    @Redirect(
-        method = "aiStep",
-        at = @At(
-            value = "INVOKE",
-            target = "Lnet/minecraft/client/player/LocalPlayer;mayFly()Z"
-        )
-    )
-    @Group(name = "mayFly", min = 1, max = 1)
-    private boolean onMayFlyNeoforge(LocalPlayer instance) throws Throwable {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this);
-        if (baritone == null) {
-            return (boolean) MAY_FLY.invokeExact(instance);
-        }
-        return !baritone.getPathingBehavior().isPathing() && (boolean) MAY_FLY.invokeExact(instance);
-    }
-
    @Redirect(
            method = "aiStep",
            at = @At(
@@ -142,19 +140,4 @@ public class MixinClientPlayerEntity {
            ((LookBehavior) baritone.getLookBehavior()).pig();
        }
    }
-
-    @Redirect(
-            method = "aiStep",
-            at = @At(
-                    value = "INVOKE",
-                    target = "Lnet/minecraft/client/player/LocalPlayer;tryToStartFallFlying()Z"
-            )
-    )
-    private boolean tryToStartFallFlying(final LocalPlayer instance) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer(instance);
-        if (baritone != null && baritone.getPathingBehavior().isPathing()) {
-            return false;
-        }
-        return instance.tryToStartFallFlying();
-    }
 }
--- a/src/launch/java/baritone/launch/mixins/MixinCommandSuggestionHelper.java
+++ b/src/launch/java/baritone/launch/mixins/MixinCommandSuggestionHelper.java
@@ -19,12 +19,9 @@ package baritone.launch.mixins;

 import baritone.api.BaritoneAPI;
 import baritone.api.event.events.TabCompleteEvent;
-import com.mojang.brigadier.ParseResults;
 import com.mojang.brigadier.context.StringRange;
 import com.mojang.brigadier.suggestion.Suggestion;
 import com.mojang.brigadier.suggestion.Suggestions;
-import net.minecraft.client.gui.components.CommandSuggestions;
-import net.minecraft.client.gui.components.EditBox;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -36,6 +33,8 @@ import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import net.minecraft.client.gui.components.CommandSuggestions;
+import net.minecraft.client.gui.components.EditBox;

 /**
 * @author Brady
@@ -52,18 +51,9 @@ public class MixinCommandSuggestionHelper {
    @Final
    private List<String> commandUsage;

-    @Shadow
-    private ParseResults currentParse;
-
    @Shadow
    private CompletableFuture<Suggestions> pendingSuggestions;

-    @Shadow
-    private CommandSuggestions.SuggestionsList suggestions;
-
-    @Shadow
-    boolean keepSuggestions;
-
    @Inject(
            method = "updateCommandInfo",
            at = @At("HEAD"),
@@ -84,32 +74,27 @@ public class MixinCommandSuggestionHelper {
        if (event.completions != null) {
            ci.cancel();

-            this.currentParse = null; // stop coloring
-
-            if (this.keepSuggestions) { // Supress suggestions update when cycling suggestions.
-                return;
-            }
-
-            this.input.setSuggestion(null); // clear old suggestions
-            this.suggestions = null;
            // TODO: Support populating the command usage
            this.commandUsage.clear();

            if (event.completions.length == 0) {
                this.pendingSuggestions = Suggestions.empty();
            } else {
-                StringRange range = StringRange.between(prefix.lastIndexOf(" ") + 1, prefix.length()); // if there is no space this starts at 0
+                int offset = this.input.getValue().endsWith(" ")
+                        ? this.input.getCursorPosition()
+                        : this.input.getValue().lastIndexOf(" ") + 1; // If there is no space this is still 0 haha yes

                List<Suggestion> suggestionList = Stream.of(event.completions)
-                        .map(s -> new Suggestion(range, s))
+                        .map(s -> new Suggestion(StringRange.between(offset, offset + s.length()), s))
                        .collect(Collectors.toList());

-                Suggestions suggestions = new Suggestions(range, suggestionList);
+                Suggestions suggestions = new Suggestions(
+                        StringRange.between(offset, offset + suggestionList.stream().mapToInt(s -> s.getText().length()).max().orElse(0)),
+                        suggestionList);

                this.pendingSuggestions = new CompletableFuture<>();
                this.pendingSuggestions.complete(suggestions);
            }
-            ((CommandSuggestions) (Object) this).showSuggestions(true); // actually populate the suggestions list from the suggestions future
        }
    }
 }
--- a/src/launch/java/baritone/launch/mixins/MixinEntity.java
+++ b/src/launch/java/baritone/launch/mixins/MixinEntity.java
@@ -23,7 +23,6 @@ import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.world.entity.Entity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -34,25 +33,21 @@ public class MixinEntity {
    @Shadow
    private float yRot;

-    @Shadow
-    private float xRot;
-
-    @Unique
-    private RotationMoveEvent motionUpdateRotationEvent;
+    float yawRestore;

    @Inject(
            method = "moveRelative",
            at = @At("HEAD")
    )
    private void moveRelativeHead(CallbackInfo info) {
+        this.yawRestore = this.yRot;
        // noinspection ConstantConditions
        if (!LocalPlayer.class.isInstance(this) || BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this) == null) {
            return;
        }
-        this.motionUpdateRotationEvent = new RotationMoveEvent(RotationMoveEvent.Type.MOTION_UPDATE, this.yRot, this.xRot);
+        RotationMoveEvent motionUpdateRotationEvent = new RotationMoveEvent(RotationMoveEvent.Type.MOTION_UPDATE, this.yRot);
        BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this).getGameEventHandler().onPlayerRotationMove(motionUpdateRotationEvent);
-        this.yRot = this.motionUpdateRotationEvent.getYaw();
-        this.xRot = this.motionUpdateRotationEvent.getPitch();
+        this.yRot = motionUpdateRotationEvent.getYaw();
    }

    @Inject(
@@ -60,10 +55,6 @@ public class MixinEntity {
            at = @At("RETURN")
    )
    private void moveRelativeReturn(CallbackInfo info) {
-        if (this.motionUpdateRotationEvent != null) {
-            this.yRot = this.motionUpdateRotationEvent.getOriginal().getYaw();
-            this.xRot = this.motionUpdateRotationEvent.getOriginal().getPitch();
-            this.motionUpdateRotationEvent = null;
-        }
+        this.yRot = this.yawRestore;
    }
 }
--- a/src/launch/java/baritone/launch/mixins/MixinFireworkRocketEntity.java
+++ b/src/launch/java/baritone/launch/mixins/MixinFireworkRocketEntity.java
@@ -1,60 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.launch.mixins;
-
-import baritone.utils.accessor.IFireworkRocketEntity;
-import net.minecraft.network.syncher.EntityDataAccessor;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.projectile.FireworkRocketEntity;
-import net.minecraft.world.level.Level;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-import java.util.OptionalInt;
-
-@Mixin(FireworkRocketEntity.class)
-public abstract class MixinFireworkRocketEntity extends Entity implements IFireworkRocketEntity {
-
-    @Shadow
-    @Final
-    private static EntityDataAccessor<OptionalInt> DATA_ATTACHED_TO_TARGET;
-
-    @Shadow
-    private LivingEntity attachedToEntity;
-
-    @Shadow
-    public abstract boolean isAttachedToEntity();
-
-    private MixinFireworkRocketEntity(Level level) {
-        super(EntityType.FIREWORK_ROCKET, level);
-    }
-
-    @Override
-    public LivingEntity getBoostedEntity() {
-        if (this.isAttachedToEntity() && this.attachedToEntity == null) { // isAttachedToEntity checks if the optional is present
-            final Entity entity = this.level().getEntity(this.entityData.get(DATA_ATTACHED_TO_TARGET).getAsInt());
-            if (entity instanceof LivingEntity) {
-                this.attachedToEntity = (LivingEntity) entity;
-            }
-        }
-        return this.attachedToEntity;
-    }
-}
--- a/Show More
+++ b/Show More