swimming

1.19.4

.github/workflows/gradle_build.yml

@@ -14,23 +14,21 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+
     - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
         java-version: '17'
         distribution: 'temurin'
-        
+        cache: gradle
+
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
       
     - name: Build with Gradle
-      run: ./gradlew build
-
-    - name: Build (fabric) with Gradle
-      run: ./gradlew build -Pbaritone.fabric_build
-
-    - name: Build (forge) with Gradle
-      run: ./gradlew build -Pbaritone.forge_build -Ploom.platform=forge
+      run: ./gradlew build -Pmod_version="$(git describe --always --tags | cut -c2-)"
 
     - name: Archive Artifacts
       uses: actions/upload-artifact@v3
@@ -42,4 +40,4 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         name: Mappings
-        path: build/tmp/proguard/mapping.txt
+        path: mapping/

.github/workflows/run_tests.yml

@@ -23,4 +23,4 @@ jobs:
       
     - name: Executing tests
       run: ./gradlew test
-    
+

.gitignore

@@ -21,6 +21,9 @@ classes/
 *.iws
 /logs/
 
+tweaker/logs/
+common/logs/
+
 # Eclipse Files
 .classpath
 .project
@@ -32,3 +35,6 @@ baritone_Client.launch
 !/.idea/copyright/profiles_settings.xml
 
 .vscode/launch.json
+.architectury-transformer
+
+mapping

Dockerfile

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

README.md

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

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

build.gradle

@@ -15,34 +15,89 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-plugins {
-    id 'java'
-    id 'dev.architectury.loom' version '0.10.0-SNAPSHOT'
-    id 'maven-publish'
+allprojects {
+    apply plugin: 'java'
+    apply plugin: "xyz.wagyourtail.unimined"
+    apply plugin: "maven-publish"
+
+    archivesBaseName = rootProject.archives_base_name
+    def vers = 'git describe --always --tags --dirty'.execute().text.trim()
+    if (!vers.startsWith("v")) {
+        println "git doesn't appear to be installed!"
+        println "using version number: " + rootProject.mod_version
+        version = rootProject.mod_version
+    } else {
+        version = vers.substring(1)
+    }
+    group = rootProject.maven_group
+
+    sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
+
+    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()
+    }
+
+    dependencies {
+        minecraft "net.minecraft:minecraft:${rootProject.minecraft_version}"
+        // The following line declares the mojmap mappings, you may use other mappings as well
+        mappings "net.fabricmc:intermediary:${rootProject.minecraft_version}:v2"
+        mappings "net.minecraft:minecraft:${rootProject.minecraft_version}:client-mappings"
+        mappings "org.parchmentmc.data:parchment-1.19.2:2022.11.27@zip"
+
+        implementation "org.spongepowered:mixin:0.8.5"
+        implementation "org.ow2.asm:asm:9.3"
+        // The following line declares the yarn mappings you may select this one as well.
+        // mappings "net.fabricmc:yarn:1.17.1+build.32:v2"
+    }
+
+    tasks.withType(JavaCompile).configureEach {
+        it.options.encoding = "UTF-8"
+
+        def targetVersion = 17
+        if (JavaVersion.current().isJava9Compatible()) {
+            it.options.release = targetVersion
+        }
+    }
 }
 
-
-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_17
-
-compileJava {
-    options.encoding = "UTF-8" // allow emoji in comments :^)
+minecraft {
+    runs.off = true
 }
 
+archivesBaseName = archivesBaseName + "-common"
+
 sourceSets {
     api {
         compileClasspath += main.compileClasspath
+        runtimeClasspath += main.runtimeClasspath
     }
     main {
         compileClasspath += api.output
+        runtimeClasspath += api.output
     }
     test {
         compileClasspath += main.compileClasspath + main.runtimeClasspath + main.output
@@ -54,63 +109,25 @@ sourceSets {
     }
     schematica_api {
         compileClasspath += main.compileClasspath
+        runtimeClasspath += main.runtimeClasspath
     }
     main {
         compileClasspath += schematica_api.output
+        runtimeClasspath += schematica_api.output
     }
 }
 
-loom {
-    if (compileType.equals("FORGE")) {
-        forge {
-            mixinConfig 'mixins.baritone.json'
-        }
-    }
-    mixin.defaultRefmapName = "mixins.baritone.refmap.json"
-
-    runs {
-        client {
-            source = sourceSets.launch
-        }
-    }
-}
-
-
-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'
-    }
+    testImplementation 'junit:junit:4.13.2'
+}
 
-    implementation 'com.google.code.findbugs:jsr305:3.0.2'
+jar {
+    from sourceSets.main.output, sourceSets.launch.output, sourceSets.api.output
+}
 
-    testImplementation 'junit:junit:4.12'
+remapJar {
+    targetNamespace = "named"
+    fallbackTargetNamespace = "intermediary"
 }
 
 javadoc {
@@ -119,72 +136,4 @@ javadoc {
     options.encoding "UTF-8" // allow emoji in comments :^)
     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://github.com/Guardsquare/proguard/releases/download/v7.2.0-beta2/proguard-7.2.0-beta2.zip'
-    extract 'proguard-7.2.0-beta2/lib/proguard.jar'
-    compType compileType
-}
-
-task createDist(type: CreateDistTask, dependsOn: proguard)
-
-
-build.finalizedBy(createDist)
+}

buildSrc/build.gradle

@@ -16,10 +16,25 @@
  */
 
 repositories {
+    mavenLocal()
+    maven {
+        name = 'WagYourMaven'
+        url = 'https://maven.wagyourtail.xyz/releases'
+    }
+    maven {
+        name = 'ForgeMaven'
+        url = 'https://maven.minecraftforge.net/'
+    }
+    maven {
+        name = 'FabricMaven'
+        url = 'https://maven.fabricmc.net/'
+    }
     mavenCentral()
 }
 
 dependencies {
-    implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
+    implementation group: 'com.google.code.gson', name: 'gson', version: '2.9.0'
     implementation group: 'commons-io', name: 'commons-io', version: '2.6'
+
+    implementation group: 'xyz.wagyourtail.unimined', name: 'xyz.wagyourtail.unimined.gradle.plugin', version: '0.3.4'
 }

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

@@ -18,6 +18,9 @@
 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;
@@ -40,43 +43,49 @@ class BaritoneGradleTask extends DefaultTask {
             PROGUARD_API_CONFIG             = "api.pro",
             PROGUARD_STANDALONE_CONFIG      = "standalone.pro",
             PROGUARD_EXPORT_PATH            = "proguard_out.jar",
+            PROGUARD_MAPPING_DIR            = "mapping",
 
             ARTIFACT_STANDARD           = "%s-%s.jar",
             ARTIFACT_UNOPTIMIZED        = "%s-unoptimized-%s.jar",
             ARTIFACT_API                = "%s-api-%s.jar",
-            ARTIFACT_STANDALONE         = "%s-standalone-%s.jar",
-            ARTIFACT_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";
+            ARTIFACT_STANDALONE         = "%s-standalone-%s.jar";
 
     protected String artifactName, artifactVersion;
-    protected final Path
+    protected 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().getName();
-        this.artifactVersion = getProject().getVersion().toString();
+        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.artifactPath = this.getBuildFile(formatVersion(ARTIFACT_STANDARD));
 
-        if (getProject().hasProperty("baritone.forge_build")) {
-            this.artifactUnoptimizedPath = this.getBuildFile(formatVersion(ARTIFACT_FORGE_UNOPTIMIZED));
-            this.artifactApiPath         = this.getBuildFile(formatVersion(ARTIFACT_FORGE_API));
-            this.artifactStandalonePath  = this.getBuildFile(formatVersion(ARTIFACT_FORGE_STANDALONE));
-        } else if (getProject().hasProperty("baritone.fabric_build")) {
-            this.artifactUnoptimizedPath = this.getBuildFile(formatVersion(ARTIFACT_FABRIC_UNOPTIMIZED));
-            this.artifactApiPath         = this.getBuildFile(formatVersion(ARTIFACT_FABRIC_API));
-            this.artifactStandalonePath  = this.getBuildFile(formatVersion(ARTIFACT_FABRIC_STANDALONE));
-        } else {
-            this.artifactUnoptimizedPath = this.getBuildFile(formatVersion(ARTIFACT_UNOPTIMIZED));
-            this.artifactApiPath         = this.getBuildFile(formatVersion(ARTIFACT_API));
-            this.artifactStandalonePath  = this.getBuildFile(formatVersion(ARTIFACT_STANDALONE));
-        }
+        this.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);
     }
@@ -99,7 +108,11 @@ class BaritoneGradleTask extends DefaultTask {
     }
 
     protected Path getRelativeFile(String file) {
-        return Paths.get(new File(new File(getProject().getBuildDir(), "../"), file).getAbsolutePath());
+        return Paths.get(new File(getProject().getBuildDir(), file).getAbsolutePath());
+    }
+
+    protected Path getRootRelativeFile(String file) {
+        return Paths.get(new File(getProject().getRootDir(), file).getAbsolutePath());
     }
 
     protected Path getTemporaryFile(String file) {
@@ -107,6 +120,10 @@ class BaritoneGradleTask extends DefaultTask {
     }
 
     protected Path getBuildFile(String file) {
-        return getRelativeFile("build/libs/" + file);
+        return getRelativeFile("libs/" + file);
+    }
+
+    protected String addCompTypeFirst(String string) {
+        return compType == null ? string : compType + "-" + string;
     }
 }

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

@@ -21,7 +21,9 @@ 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;
@@ -39,15 +41,16 @@ public class CreateDistTask extends BaritoneGradleTask {
 
     @TaskAction
     protected void exec() throws Exception {
+        super.doFirst();
         super.verifyArtifacts();
 
         // Define the distribution file paths
-        Path api = getRelativeFile("dist/" + getFileName(artifactApiPath));
-        Path standalone = getRelativeFile("dist/" + getFileName(artifactStandalonePath));
-        Path unoptimized = getRelativeFile("dist/" + getFileName(artifactUnoptimizedPath));
+        Path api = getRootRelativeFile("dist/" + getFileName(artifactApiPath));
+        Path standalone = getRootRelativeFile("dist/" + getFileName(artifactStandalonePath));
+        Path unoptimized = getRootRelativeFile("dist/" + getFileName(artifactUnoptimizedPath));
 
         // NIO will not automatically create directories
-        Path dir = getRelativeFile("dist/");
+        Path dir = getRootRelativeFile("dist/");
         if (!Files.exists(dir)) {
             Files.createDirectory(dir);
         }
@@ -59,35 +62,21 @@ public class CreateDistTask extends BaritoneGradleTask {
         Files.copy(this.artifactUnoptimizedPath, unoptimized, REPLACE_EXISTING);
 
         // Calculate all checksums and format them like "shasum"
-        List<String> shasum = getAllDistJars().stream()
-                .filter(Files::exists)
+        List<String> shasum = Files.list(getRootRelativeFile("dist/"))
+                .filter(e -> e.getFileName().toString().endsWith(".jar"))
                 .map(path -> sha1(path) + "  " + path.getFileName().toString())
                 .collect(Collectors.toList());
 
         shasum.forEach(System.out::println);
 
         // Write the checksums to a file
-        Files.write(getRelativeFile("dist/checksums.txt"), shasum);
+        Files.write(getRootRelativeFile("dist/checksums.txt"), shasum);
     }
 
     private static String getFileName(Path p) {
         return p.getFileName().toString();
     }
 
-    private List<Path> getAllDistJars() {
-        return Arrays.asList(
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_API)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_FABRIC_API)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_API)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_STANDALONE)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_FABRIC_STANDALONE)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_STANDALONE)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_UNOPTIMIZED)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_FABRIC_UNOPTIMIZED)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_UNOPTIMIZED))
-        );
-    }
-
     private static synchronized String sha1(Path path) {
         try {
             if (SHA1_DIGEST == null) {

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

@@ -26,8 +26,12 @@ 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 xyz.wagyourtail.unimined.api.Constants;
+import xyz.wagyourtail.unimined.api.minecraft.EnvType;
+import xyz.wagyourtail.unimined.api.minecraft.MinecraftProvider;
 
 import java.io.*;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -59,22 +63,11 @@ public class ProguardTask extends BaritoneGradleTask {
         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();
@@ -85,30 +78,14 @@ public class ProguardTask extends BaritoneGradleTask {
         cleanup();
     }
 
-    private boolean isMcJar(File f) {
-        return f.getName().startsWith(compType.equals("FORGE") ? "forge-" : "minecraft-") && f.getName().contains("minecraft-mapped");
+    MinecraftProvider<?, ?> provider = this.getProject().getExtensions().getByType(MinecraftProvider.class);
+
+    private File getMcJar() {
+        return provider.getMinecraftWithMapping(EnvType.COMBINED, provider.getMcPatcher().getProdNamespace(), provider.getMcPatcher().getProdFallbackNamespace()).toFile();
     }
 
-    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 boolean isMcJar(File f) {
+        return this.getProject().getConfigurations().getByName(Constants.MINECRAFT_COMBINED_PROVIDER).getFiles().contains(f);
     }
 
     private void processArtifact() throws Exception {
@@ -233,7 +210,7 @@ public class ProguardTask extends BaritoneGradleTask {
     }
 
     private void generateConfigs() throws Exception {
-        Files.copy(getRelativeFile(PROGUARD_CONFIG_TEMPLATE), getTemporaryFile(PROGUARD_CONFIG_DEST), REPLACE_EXISTING);
+        Files.copy(getRootRelativeFile(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));
@@ -242,9 +219,17 @@ 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()
@@ -252,39 +237,41 @@ public class ProguardTask extends BaritoneGradleTask {
                     .filter(f -> !f.toString().endsWith("-recomp.jar") && !f.getName().startsWith("nashorn") && !f.getName().startsWith("coremods"));
 
                 libraries = dependencies
-                    .map(f -> isMcJar(f) ? copyMcTargetJar : f);
+                    .map(f -> isMcJar(f) ? mcJar : 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(PROGUARD_API_CONFIG), template);
+        Files.write(getTemporaryFile(compType+PROGUARD_API_CONFIG), api);
 
         // For the Standalone config, don't keep the API package
         List<String> standalone = new ArrayList<>(template);
         standalone.removeIf(s -> s.contains("# this is the keep api"));
-        Files.write(getTemporaryFile(PROGUARD_STANDALONE_CONFIG), standalone);
-    }
-
-    private File getSrgMcJar() {
-        return getProject().getTasks().findByName("copyMcJar").getOutputs().getFiles().getSingleFile();
+        standalone.add(2, "-printmapping " + new File(this.getRootRelativeFile(PROGUARD_MAPPING_DIR).toFile(), "mappings-" + addCompTypeFirst("standalone.txt")));
+        Files.write(getTemporaryFile(compType+PROGUARD_STANDALONE_CONFIG), standalone);
     }
 
     private Stream<File> acquireDependencies() {
-        return getProject().getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("launch").getRuntimeClasspath().getFiles()
+        return getProject().getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("main").getCompileClasspath().getFiles()
             .stream()
             .filter(File::isFile);
     }
 
     private void proguardApi() throws Exception {
-        runProguard(getTemporaryFile(PROGUARD_API_CONFIG));
+        runProguard(getTemporaryFile(compType+PROGUARD_API_CONFIG));
         Determinizer.determinize(this.proguardOut.toString(), this.artifactApiPath.toString());
     }
 
     private void proguardStandalone() throws Exception {
-        runProguard(getTemporaryFile(PROGUARD_STANDALONE_CONFIG));
+        runProguard(getTemporaryFile(compType+PROGUARD_STANDALONE_CONFIG));
         Determinizer.determinize(this.proguardOut.toString(), this.artifactStandalonePath.toString());
     }
 
@@ -301,11 +288,6 @@ public class ProguardTask extends BaritoneGradleTask {
     public void setExtract(String extract) {
         this.extract = extract;
     }
-
-    public void setCompType(String compType) {
-        this.compType = compType;
-    }
-
     private void runProguard(Path config) throws Exception {
         // Delete the existing proguard output file. Proguard probably handles this already, but why not do it ourselves
         if (Files.exists(this.proguardOut)) {

fabric/build.gradle

@@ -0,0 +1,103 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import baritone.gradle.task.CreateDistTask
+import baritone.gradle.task.ProguardTask
+
+plugins {
+    id "com.github.johnrengelman.shadow" version "7.0.0"
+}
+
+archivesBaseName = archivesBaseName + "-fabric"
+
+minecraft {
+    fabric()
+}
+
+configurations {
+    common
+    shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
+    compileClasspath.extendsFrom common
+    runtimeClasspath.extendsFrom common
+}
+
+dependencies {
+    fabric "net.fabricmc:fabric-loader:${project.fabric_version}"
+
+    // because of multiple sourcesets `common project(":")` doesn't work
+    for (sourceSet in rootProject.sourceSets) {
+        if (sourceSet == rootProject.sourceSets.test) continue
+        if (sourceSet == rootProject.sourceSets.schematica_api) continue
+        common sourceSet.output
+        shadowCommon sourceSet.output
+    }
+}
+
+processResources {
+    inputs.property "version", project.version
+
+    filesMatching("fabric.mod.json") {
+        expand "version": project.version
+    }
+}
+
+shadowJar {
+    configurations = [project.configurations.shadowCommon]
+    classifier "dev-shadow"
+}
+
+remapJar {
+    inputFile.set shadowJar.archiveFile
+    dependsOn shadowJar
+    classifier null
+}
+
+jar {
+    classifier "dev"
+}
+
+components.java {
+    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
+        skip()
+    }
+}
+
+task proguard(type: ProguardTask) {
+    url 'https://github.com/Guardsquare/proguard/releases/download/v7.2.1/proguard-7.2.1.zip'
+    extract 'proguard-7.2.1/lib/proguard.jar'
+    compType "fabric"
+}
+
+task createDist(type: CreateDistTask, dependsOn: proguard) {
+    compType "fabric"
+}
+
+build.finalizedBy(createDist)
+
+publishing {
+    publications {
+        mavenFabric(MavenPublication) {
+            artifactId = rootProject.archives_base_name + "-" + project.name
+            from components.java
+        }
+    }
+
+    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+    repositories {
+        // Add repositories to publish to here.
+    }
+}

fabric/src/main/resources/fabric.mod.json

@@ -21,11 +21,11 @@
   "entrypoints": {
   },
   "mixins": [
-    "mixins.baritone.json"
+      "mixins.baritone.json"
   ],
 
   "depends": {
     "fabricloader": ">=0.11.0",
-    "minecraft": "1.18.x"
+    "minecraft": "1.19.4"
   }
-}
+}

forge/build.gradle

@@ -0,0 +1,122 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import baritone.gradle.task.CreateDistTask
+import baritone.gradle.task.ProguardTask
+
+plugins {
+    id "com.github.johnrengelman.shadow" version "7.0.0"
+}
+
+archivesBaseName = archivesBaseName + "-forge"
+
+minecraft {
+    forge {
+        devFallbackNamespace = "intermediary"
+        mixinConfig = ["mixins.baritone.json"]
+    }
+}
+
+//loom {
+//    forge {
+//        mixinConfig 'mixins.baritone.json'
+//    }
+//}
+
+configurations {
+    common
+    shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
+    compileClasspath.extendsFrom common
+    runtimeClasspath.extendsFrom common
+}
+
+dependencies {
+    forge "net.minecraftforge:forge:${rootProject.forge_version}"
+
+    // because of multiple sourcesets `common project(":")` doesn't work
+    for (sourceSet in rootProject.sourceSets) {
+        if (sourceSet == rootProject.sourceSets.test) continue
+        if (sourceSet == rootProject.sourceSets.schematica_api) continue
+        common sourceSet.output
+        shadowCommon sourceSet.output
+    }
+}
+
+processResources {
+    inputs.property "version", project.version
+
+    filesMatching("META-INF/mods.toml") {
+        expand "version": project.version
+    }
+}
+
+shadowJar {
+    configurations = [project.configurations.shadowCommon]
+    classifier "dev-shadow"
+}
+
+remapJar {
+    inputFile.set shadowJar.archiveFile
+    dependsOn shadowJar
+    classifier null
+}
+
+jar {
+    classifier "dev"
+
+    manifest {
+        attributes(
+                'MixinConfigs': 'mixins.baritone.json',
+                "MixinConnector": "baritone.launch.BaritoneMixinConnector",
+
+                'Implementation-Title': 'Baritone',
+                'Implementation-Version': version,
+        )
+    }
+}
+
+components.java {
+    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
+        skip()
+    }
+}
+
+task proguard(type: ProguardTask) {
+    url 'https://github.com/Guardsquare/proguard/releases/download/v7.2.1/proguard-7.2.1.zip'
+    extract 'proguard-7.2.1/lib/proguard.jar'
+    compType "forge"
+}
+
+task createDist(type: CreateDistTask, dependsOn: proguard) {
+    compType "forge"
+}
+
+build.finalizedBy(createDist)
+
+publishing {
+    publications {
+        mavenFabric(MavenPublication) {
+            artifactId = rootProject.archives_base_name + "-" + project.name
+            from components.java
+        }
+    }
+
+    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+    repositories {
+        // Add repositories to publish to here.
+    }
+}

forge/gradle.properties

@@ -0,0 +1,18 @@
+#
+# 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

forge/src/main/java/baritone/launch/BaritoneForgeModXD.java

@@ -15,13 +15,8 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils;
+package baritone.launch;import net.minecraftforge.fml.common.Mod;
 
-/**
- * @author Brady
- */
-@FunctionalInterface
-public interface BooleanBinaryOperator {
-
-    boolean applyAsBoolean(boolean a, boolean b);
+@Mod("baritoe")
+public class BaritoneForgeModXD {
 }

forge/src/main/resources/META-INF/mods.toml

@@ -15,7 +15,7 @@ issueTrackerURL="https://github.com/cabaletta/baritone/issues" #optional
 # 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="${file.jarVersion}" #mandatory
+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
@@ -31,3 +31,10 @@ description='''
 A Minecraft pathfinder bot.
 '''
 
+[[dependencies.baritoe]]
+modId="minecraft"
+mandatory=true
+# This version range declares a minimum of the current minecraft version up to but not including the next major version
+versionRange="[1.19.4]"
+ordering="NONE"
+side="BOTH"

forge/src/main/resources/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+    "pack": {
+        "description": "null",
+        "pack_format": 8
+    }
+}

gradle.properties

@@ -1,13 +1,9 @@
-org.gradle.jvmargs=-Xmx2048M
+org.gradle.jvmargs=-Xmx4G
 
-mod_version=1.8.6
+mod_version=1.9.3
 maven_group=baritone
 archives_base_name=baritone
 
-minecraft_version=1.18.2
-forge_version=1.18.2-40.0.0
-fabric_version=0.13.1
-
-# # un comment for forge debugging default (as opposed to fabric)
-# baritone.forge_build=true
-# loom.platform=forge
+minecraft_version=1.19.4
+forge_version=1.19.4-45.0.43
+fabric_version=0.14.11

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

jitpack.yml

@@ -0,0 +1,4 @@
+before_install:
+  - curl -s "https://get.sdkman.io" | bash
+  - sdk install java 17.0.5-tem
+  - sdk use java 17.0.5-tem

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,6 +339,4 @@
     public int length();
     public java.lang.String substring(int);
     public java.lang.String substring(int,int);
-}
-
--printmapping mapping.txt
+}

settings.gradle

@@ -17,26 +17,34 @@
 
 pluginManagement {
     repositories {
-        maven { url "https://maven.architectury.dev/" }
+        mavenLocal()
         maven {
+            name = 'WagYourMaven'
+            url = 'https://maven.wagyourtail.xyz/snapshots'
+        }
+        maven {
+            name = 'ForgeMaven'
+            url = 'https://maven.minecraftforge.net/'
+        }
+        maven {
+            name = 'FabricMaven'
             url = 'https://maven.fabricmc.net/'
         }
-        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()
+        gradlePluginPortal() {
+            content {
+                excludeGroup "org.apache.logging.log4j"
+            }
+        }
     }
 }
 
 rootProject.name = 'baritone'
+
+include("tweaker")
+if (System.getProperty("Baritone.enabled_platforms") == null) {
+    System.setProperty("Baritone.enabled_platforms", "fabric,forge")
+}
+for (platform in System.getProperty("Baritone.enabled_platforms").split(",")) {
+       include(platform)
+}

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

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

@@ -21,11 +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.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.
@@ -53,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;
             }
@@ -67,39 +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;
-    }
-
-    /**
-     * Creates and registers a new {@link IBaritone} instance using the specified {@link Minecraft}. The existing
-     * instance is returned if already registered.
-     *
-     * @param minecraft The minecraft
-     * @return The {@link IBaritone} instance
-     */
-    IBaritone createBaritone(Minecraft minecraft);
-
-    /**
-     * Destroys and removes the specified {@link IBaritone} instance. If the specified instance is the
-     * {@link #getPrimaryBaritone() primary baritone}, this operation has no effect and will return {@code false}.
-     *
-     * @param baritone The baritone instance to remove
-     * @return Whether the baritone instance was removed
-     */
-    boolean destroyBaritone(IBaritone baritone);
-
     /**
      * Returns the {@link IWorldScanner} instance. This is not a type returned by
      * {@link IBaritone} implementation, because it is not linked with {@link IBaritone}.

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

@@ -23,22 +23,17 @@ import baritone.api.utils.TypeUtils;
 import baritone.api.utils.gui.BaritoneToast;
 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 java.awt.*;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-import java.util.*;
 import java.util.List;
+import java.util.*;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
@@ -74,16 +69,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>
@@ -625,13 +610,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
      */
@@ -733,17 +711,6 @@ public final class Settings {
      */
     public final Setting<Boolean> freeLook = new Setting<>(true);
 
-    /**
-     * Break and place blocks without having to force the client-sided rotations. Requires {@link #freeLook}.
-     */
-    public final Setting<Boolean> blockFreeLook = new Setting<>(false);
-
-    /**
-     * When true, the player will remain with its existing look direction as often as possible.
-     * Although, in some cases this can get it stuck, hence this setting to disable that behavior.
-     */
-    public final Setting<Boolean> remainWithExistingLookDirection = new Setting<>(true);
-
     /**
      * Will cause some minor behavioral differences to ensure that Baritone works on anticheats.
      * <p>
@@ -764,6 +731,11 @@ public final class Settings {
      */
     public final Setting<Boolean> sprintInWater = new Setting<>(true);
 
+    /**
+     * Attempt to enter the underwater swimming state
+     */
+    public final Setting<Boolean> swimInWater = new Setting<>(true);
+
     /**
      * When GetToBlockProcess or MineProcess fails to calculate a path, instead of just giving up, mark the closest instance
      * of that block as "unreachable" and go towards the next closest. GetToBlock expands this search to the whole "vein"; MineProcess does not.
@@ -879,11 +851,6 @@ public final class Settings {
      */
     public final Setting<Integer> minYLevelWhileMining = new Setting<>(0);
 
-    /**
-     * Sets the maximum y level to mine ores at.
-     */
-    public final Setting<Integer> maxYLevelWhileMining = new Setting<>(2031);
-
     /**
      * This will only allow baritone to mine exposed ores, can be used to stop ore obfuscators on servers that use them.
      */
@@ -1180,7 +1147,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<Consumer<Component>> logger = new Setting<>(msg -> Minecraft.getInstance().gui.getChat().addMessage(msg));
 
     /**
@@ -1188,7 +1154,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<String, Boolean>> notifier = new Setting<>(NotificationHelper::notify);
 
     /**
@@ -1196,7 +1161,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);
 
     /**
@@ -1346,7 +1310,6 @@ public final class Settings {
         public T value;
         public final T defaultValue;
         private String name;
-        private boolean javaOnly;
 
         @SuppressWarnings("unchecked")
         private Setting(T value) {
@@ -1355,7 +1318,6 @@ public final class Settings {
             }
             this.value = value;
             this.defaultValue = value;
-            this.javaOnly = false;
         }
 
         /**
@@ -1392,25 +1354,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() {
@@ -1426,7 +1371,6 @@ public final class Settings {
                     Setting<?> setting = (Setting<?>) field.get(this);
                     String name = field.getName();
                     setting.name = name;
-                    setting.javaOnly = field.isAnnotationPresent(JavaOnly.class);
                     name = name.toLowerCase();
                     if (tmpByName.containsKey(name)) {
                         throw new IllegalStateException("Duplicate setting name");

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

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

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

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

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

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

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

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

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

@@ -19,26 +19,20 @@ package baritone.api.command.datatypes;
 
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 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 = new ResourceLocation(ctx.getConsumer().getString());
         Block block;
-        if ((block = Registry.BLOCK.getOptional(id).orElse(null)) == null) {
+        if ((block = BuiltInRegistries.BLOCK.getOptional(id).orElse(null)) == null) {
             throw new IllegalArgumentException("no block found by that id");
         }
         return block;
@@ -46,19 +40,13 @@ public enum BlockById implements IDatatypeFor<Block> {
 
     @Override
     public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
-        String arg = ctx.getConsumer().getString();
-
-        if (!PATTERN.matcher(arg).matches()) {
-            return Stream.empty();
-        }
-
         return new TabCompleteHelper()
                 .append(
-                        Registry.BLOCK.keySet()
+                        BuiltInRegistries.BLOCK.keySet()
                                 .stream()
                                 .map(Object::toString)
                 )
-                .filterPrefixNamespaced(arg)
+                .filterPrefixNamespaced(ctx.getConsumer().getString())
                 .sortAlphabetically()
                 .stream();
     }

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

@@ -19,11 +19,12 @@ package baritone.api.command.datatypes;
 
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
-import java.util.stream.Stream;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.EntityType;
 
+import java.util.stream.Stream;
+
 public enum EntityClassById implements IDatatypeFor<EntityType> {
     INSTANCE;
 
@@ -31,7 +32,7 @@ public enum EntityClassById implements IDatatypeFor<EntityType> {
     public EntityType get(IDatatypeContext ctx) throws CommandException {
         ResourceLocation id = new ResourceLocation(ctx.getConsumer().getString());
         EntityType entity;
-        if ((entity = Registry.ENTITY_TYPE.getOptional(id).orElse(null)) == null) {
+        if ((entity = BuiltInRegistries.ENTITY_TYPE.getOptional(id).orElse(null)) == null) {
             throw new IllegalArgumentException("no entity found by that id");
         }
         return entity;
@@ -40,7 +41,7 @@ public enum EntityClassById implements IDatatypeFor<EntityType> {
     @Override
     public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
         return new TabCompleteHelper()
-                .append(Registry.ENTITY_TYPE.stream().map(Object::toString))
+                .append(BuiltInRegistries.ENTITY_TYPE.stream().map(Object::toString))
                 .filterPrefixNamespaced(ctx.getConsumer().getString())
                 .sortAlphabetically()
                 .stream();

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

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

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.Registry;
-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 = Registry.BLOCK.getOptional(new ResourceLocation(blockId)).orElse(null);
-        if (block == null) {
-            // This block doesn't exist so there's no properties to complete.
-            return Stream.empty();
-        }
-
-        String leadingProperties, lastProperty;
-        {
-            String[] parts = splitLast(properties, ',');
-            leadingProperties = parts[0];
-            lastProperty = parts[1];
-        }
-
-        if (!lastProperty.contains("=")) {
-            // The last property-value pair doesn't have a value yet so we are completing its name
-            Set<String> usedProps = Stream.of(leadingProperties.split(","))
-                    .map(pair -> pair.split("=")[0])
-                    .collect(Collectors.toSet());
-
-            String prefix = arg.substring(0, arg.length() - lastProperty.length());
-            return new TabCompleteHelper()
-                    .append(
-                            block.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);
     }
 }

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();
         }

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

@@ -21,15 +21,16 @@ import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.exception.CommandInvalidTypeException;
 import baritone.api.utils.Helper;
+
+import 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.TextComponent;
+import net.minecraft.network.chat.MutableComponent;
 
 public class Paginator<E> implements Helper {
 
@@ -74,7 +75,7 @@ public class Paginator<E> implements Helper {
         }
         boolean hasPrevPage = commandPrefix != null && validPage(page - 1);
         boolean hasNextPage = commandPrefix != null && validPage(page + 1);
-        BaseComponent prevPageComponent = new TextComponent("<<");
+        MutableComponent prevPageComponent = Component.literal("<<");
         if (hasPrevPage) {
             prevPageComponent.setStyle(prevPageComponent.getStyle()
                     .withClickEvent(new ClickEvent(
@@ -83,26 +84,23 @@ public class Paginator<E> implements Helper {
                     ))
                     .withHoverEvent(new HoverEvent(
                             HoverEvent.Action.SHOW_TEXT,
-                            new TextComponent("Click to view previous page")
+                            Component.literal("Click to view previous page")
                     )));
         } else {
             prevPageComponent.setStyle(prevPageComponent.getStyle().withColor(ChatFormatting.DARK_GRAY));
         }
-        BaseComponent nextPageComponent = new TextComponent(">>");
+        MutableComponent nextPageComponent = Component.literal(">>");
         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,
-                            new TextComponent("Click to view next page")
+                            Component.literal("Click to view next page")
                     )));
         } else {
             nextPageComponent.setStyle(nextPageComponent.getStyle().withColor(ChatFormatting.DARK_GRAY));
         }
-        BaseComponent pagerComponent = new TextComponent("");
+        MutableComponent pagerComponent = Component.literal("");
         pagerComponent.setStyle(pagerComponent.getStyle().withColor(ChatFormatting.GRAY));
         pagerComponent.append(prevPageComponent);
         pagerComponent.append(" | ");

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

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

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 com.mojang.math.Matrix4f;
+import org.joml.Matrix4f;
 
 /**
  * @author Brady

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;
     }
 

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

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

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

@@ -17,7 +17,6 @@
 
 package baritone.api.pathing.goals;
 
-import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.interfaces.IGoalRenderPos;
 import net.minecraft.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(

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

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

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

@@ -17,7 +17,6 @@
 
 package baritone.api.pathing.goals;
 
-import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.interfaces.IGoalRenderPos;
 import net.minecraft.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(

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

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

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

@@ -17,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(

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) {

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(

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(

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(

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

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

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

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

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

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;
-    }
-}

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

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];
-    }
-}

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

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

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

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;
-    }
-}

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

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

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

@@ -18,23 +18,31 @@
 package baritone.api.utils;
 
 import baritone.api.utils.accessor.IItemStack;
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import io.netty.util.concurrent.ThreadPerTaskExecutor;
+import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
-import net.minecraft.resources.*;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.packs.PackResources;
-import net.minecraft.server.packs.PackType;
-import net.minecraft.server.packs.repository.PackRepository;
+import net.minecraft.server.level.progress.ChunkProgressListener;
+import net.minecraft.server.packs.*;
 import net.minecraft.server.packs.repository.ServerPacksSource;
+import net.minecraft.server.packs.resources.MultiPackResourceManager;
 import net.minecraft.server.packs.resources.ReloadableResourceManager;
+import net.minecraft.util.RandomSource;
 import net.minecraft.util.Unit;
-import net.minecraft.world.level.block.state.properties.Property;
+import net.minecraft.world.flag.FeatureFlagSet;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.CustomSpawner;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.dimension.LevelStem;
+import net.minecraft.world.level.storage.LevelStorageSource;
+import net.minecraft.world.level.storage.ServerLevelData;
 import net.minecraft.world.level.storage.loot.BuiltInLootTables;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.LootTables;
@@ -42,89 +50,53 @@ 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 java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
+import java.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 Set<Integer> stateHashes;
-    private final Set<Integer> stackHashes;
-    private static LootTables manager;
+    private final ImmutableSet<Integer> stateHashes;
+    private final ImmutableSet<Integer> stackHashes;
+    private static final Pattern pattern = Pattern.compile("^(.+?)(?::(\\d+))?$");
+    private static LootTables lootTables;
     private static PredicateManager predicate = new PredicateManager();
     private 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) {
@@ -172,7 +144,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() {
@@ -183,29 +155,37 @@ public final class BlockOptionalMeta {
         return null;
     }
 
-    public Set<BlockState> getAllBlockStates() {
-        return blockstates;
-    }
+    private static Method getVanillaServerPack;
 
-    public Set<Integer> stackHashes() {
-        return stackHashes;
+    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 LootTables getManager() {
-        if (manager == null) {
-            PackRepository rpl = new PackRepository(PackType.SERVER_DATA, new ServerPacksSource());
-            rpl.reload();
-            PackResources thePack = rpl.getAvailablePacks().iterator().next().open();
+        if (lootTables == null) {
+            MultiPackResourceManager resources = new MultiPackResourceManager(PackType.SERVER_DATA, List.of(getVanillaServerPack()));
             ReloadableResourceManager resourceManager = new ReloadableResourceManager(PackType.SERVER_DATA);
-            manager = new LootTables(predicate);
-            resourceManager.registerReloadListener(manager);
+            lootTables = new LootTables(predicate);
+            resourceManager.registerReloadListener(lootTables);
             try {
-                resourceManager.createReload(new ThreadPerTaskExecutor(Thread::new), new ThreadPerTaskExecutor(Thread::new), CompletableFuture.completedFuture(Unit.INSTANCE), Collections.singletonList(thePack)).done().get();
+                resourceManager.createReload(new ThreadPerTaskExecutor(Thread::new), new ThreadPerTaskExecutor(Thread::new), CompletableFuture.completedFuture(Unit.INSTANCE), resources.listPacks().toList()).done().get();
             } catch (Exception exception) {
                 throw new RuntimeException(exception);
             }
+
         }
-        return manager;
+        return lootTables;
     }
 
     public static PredicateManager getPredicateManager() {
@@ -219,20 +199,55 @@ public final class BlockOptionalMeta {
                 return Collections.emptyList();
             } else {
                 List<Item> items = new ArrayList<>();
-
-                // the other overload for generate doesnt work in forge because forge adds code that requires a non null world
-                getManager().get(lootTableLocation).getRandomItems(
-                        new LootContext.Builder((ServerLevel) null)
-                                .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),
+                try {
+                    getManager().get(lootTableLocation).getRandomItems(
+                        new LootContext.Builder(ServerLevelStub.fastCreate())
+                            .withRandom(RandomSource.create())
+                            .withParameter(LootContextParams.ORIGIN, Vec3.atLowerCornerOf(BlockPos.ZERO))
+                            .withParameter(LootContextParams.TOOL, ItemStack.EMPTY)
+                            .withOptionalParameter(LootContextParams.BLOCK_ENTITY, null)
+                            .withParameter(LootContextParams.BLOCK_STATE, block.defaultBlockState())
+                            .create(LootContextParamSets.BLOCK),
                         stack -> items.add(stack.getItem())
-                );
+                    );
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
                 return items;
             }
         });
     }
+
+    private static class ServerLevelStub extends ServerLevel {
+        private static Minecraft client = Minecraft.getInstance();
+        private static Unsafe unsafe = getUnsafe();
+        public ServerLevelStub(MinecraftServer $$0, Executor $$1, LevelStorageSource.LevelStorageAccess $$2, ServerLevelData $$3, ResourceKey<Level> $$4, LevelStem $$5, ChunkProgressListener $$6, boolean $$7, long $$8, List<CustomSpawner> $$9, boolean $$10) {
+            super($$0, $$1, $$2, $$3, $$4, $$5, $$6, $$7, $$8, $$9, $$10);
+        }
+
+        @Override
+        public FeatureFlagSet enabledFeatures() {
+            assert client.level != null;
+            return client.level.enabledFeatures();
+        }
+
+        public static ServerLevelStub fastCreate() {
+            try {
+                return (ServerLevelStub) unsafe.allocateInstance(ServerLevelStub.class);
+            } catch (InstantiationException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        public static Unsafe getUnsafe() {
+            try {
+                Field theUnsafe = Unsafe.class.getDeclaredField("theUnsafe");
+                theUnsafe.setAccessible(true);
+                return (Unsafe) theUnsafe.get(null);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+    }
 }

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() {

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

@@ -20,6 +20,7 @@ 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;
 
@@ -28,7 +29,7 @@ public class BlockUtils {
     private static transient Map<String, Block> resourceCache = new HashMap<>();
 
     public static String blockToString(Block block) {
-        ResourceLocation loc = Registry.BLOCK.getKey(block);
+        ResourceLocation loc = BuiltInRegistries.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?
@@ -56,7 +57,7 @@ public class BlockUtils {
         if (resourceCache.containsKey(name)) {
             return null; // cached as null
         }
-        block = Registry.BLOCK.getOptional(ResourceLocation.tryParse(name.contains(":") ? name : "minecraft:" + name)).orElse(null);
+        block = BuiltInRegistries.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;

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

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

@@ -21,9 +21,10 @@ import baritone.api.BaritoneAPI;
 import baritone.api.utils.gui.BaritoneToast;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
-import net.minecraft.network.chat.BaseComponent;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.MutableComponent;
+
+import java.awt.*;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.stream.Stream;
@@ -43,21 +44,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();
 
     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;
-        BaseComponent baritone = new TextComponent(xd ? "Baritoe" : BaritoneAPI.getSettings().shortBaritonePrefix.value ? "B" : "Baritone");
+        MutableComponent baritone = Component.literal(xd ? "Baritoe" : BaritoneAPI.getSettings().shortBaritonePrefix.value ? "B" : "Baritone");
         baritone.setStyle(baritone.getStyle().withColor(ChatFormatting.LIGHT_PURPLE));
 
         // Outer brackets
-        BaseComponent prefix = new TextComponent("");
+        MutableComponent prefix = Component.literal("");
         prefix.setStyle(baritone.getStyle().withColor(ChatFormatting.DARK_PURPLE));
         prefix.append("[");
         prefix.append(baritone);
@@ -73,7 +72,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));
     }
 
     /**
@@ -83,7 +82,7 @@ public interface Helper {
      * @param message The message to display in the popup
      */
     default void logToast(String title, String message) {
-        logToast(new TextComponent(title), new TextComponent(message));
+        logToast(Component.literal(title), Component.literal(message));
     }
 
     /**
@@ -92,7 +91,7 @@ public interface Helper {
      * @param message The message to display in the popup
      */
     default void logToast(String message) {
-        logToast(Helper.getPrefix(), new TextComponent(message));
+        logToast(Helper.getPrefix(), Component.literal(message));
     }
 
     /**
@@ -134,7 +133,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));
     }
 
     /**
@@ -160,14 +159,14 @@ public interface Helper {
      * @param components The components to send
      */
     default void logDirect(boolean logAsToast, Component... components) {
-        BaseComponent component = new TextComponent("");
+        MutableComponent component = Component.literal("");
         component.append(getPrefix());
-        component.append(new TextComponent(" "));
+        component.append(Component.literal(" "));
         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));
         }
     }
 
@@ -190,7 +189,7 @@ public interface Helper {
      */
     default void logDirect(String message, ChatFormatting color, boolean logAsToast) {
         Stream.of(message.split("\n")).forEach(line -> {
-            BaseComponent component = new TextComponent(line.replace("\t", "    "));
+            MutableComponent component = Component.literal(line.replace("\t", "    "));
             component.setStyle(component.getStyle().withColor(color));
             logDirect(logAsToast, component);
         });

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,8 +85,6 @@ public interface IPlayerContext {
         return new Vec3(player().position().x, player().position().y + player().getEyeHeight(), player().position().z);
     }
 
-    BetterBlockPos viewerPos();
-
     default Rotation playerRotations() {
         return new Rotation(player().getYRot(), player().getXRot());
     }

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
      *

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

@@ -140,14 +140,14 @@ public final class RotationUtils {
      * @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);
     }
 
     /**
@@ -157,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
@@ -178,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
                 }
@@ -189,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();
         }
@@ -204,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;
             }
@@ -217,55 +218,12 @@ 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);
-        //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())) {
-                return Optional.of(rotation);
-            }
-        }
-        return Optional.empty();
-    }
-
-    /**
-     * Determines if the specified entity is able to reach the specified block where it is
-     * looking at the direct center of it's hitbox.
-     *
-     * @param ctx                Context for 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()));
@@ -282,7 +240,15 @@ public final class RotationUtils {
         return Optional.empty();
     }
 
-    @Deprecated
+    /**
+     * Determines if the specified entity is able to reach the specified block where it is
+     * looking at the direct center of it's hitbox.
+     *
+     * @param entity             The viewing entity
+     * @param pos                The target block position
+     * @param blockReachDistance The block reach distance of the entity
+     * @return The optional rotation
+     */
     public static Optional<Rotation> reachableCenter(Entity entity, BlockPos pos, double blockReachDistance, boolean wouldSneak) {
         return reachableOffset(entity, pos, VecUtils.calculateBlockCenter(entity.level, pos), blockReachDistance, wouldSneak);
     }

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

@@ -23,6 +23,7 @@ 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;
@@ -46,10 +47,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) {
@@ -68,12 +71,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;
                 }
 
@@ -82,33 +85,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) {
@@ -116,7 +115,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) {
@@ -170,7 +169,7 @@ public class SettingsUtil {
     }
 
     public static String settingToString(Settings.Setting setting) throws IllegalStateException {
-        if (setting.isJavaOnly()) {
+        if (javaOnlySetting(setting)) {
             return setting.getName();
         }
 
@@ -178,14 +177,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 {
@@ -250,8 +253,8 @@ public class SettingsUtil {
         ),
         ITEM(
                 Item.class,
-                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()
+                str -> BuiltInRegistries.ITEM.get(new ResourceLocation(str.trim())), // TODO this now returns AIR on failure instead of null, is that an issue?
+                item -> BuiltInRegistries.ITEM.getKey(item).toString()
         ),
         LIST() {
             @Override

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

@@ -18,6 +18,7 @@
 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;
 
@@ -27,24 +28,28 @@ import net.minecraft.world.level.chunk.LevelChunk;
 
 @Mixin(targets = "net.minecraft.client.multiplayer.ClientChunkCache$Storage")
 public abstract class MixinChunkArray implements IChunkArray {
+    @Final
     @Shadow
-    private AtomicReferenceArray<LevelChunk> chunks;
+    AtomicReferenceArray<LevelChunk> chunks;
+    @Final
     @Shadow
-    private int chunkRadius;
+    int chunkRadius;
+
+    @Final
     @Shadow
     private int viewRange;
     @Shadow
-    private int viewCenterX;
+    int viewCenterX;
     @Shadow
-    private int viewCenterZ;
+    int viewCenterZ;
     @Shadow
-    private int chunkCount;
+    int chunkCount;
 
     @Shadow
-    protected abstract boolean inRange(int x, int z);
+    abstract boolean inRange(int x, int z);
 
     @Shadow
-    protected abstract int getIndex(int x, int z);
+    abstract int getIndex(int x, int z);
 
     @Shadow
     protected abstract void replace(int index, LevelChunk chunk);

src/launch/java/baritone/launch/mixins/MixinClientPlayNetHandler.java

@@ -20,14 +20,19 @@ package baritone.launch.mixins;
 import baritone.Baritone;
 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
+import baritone.api.event.events.ChatEvent;
 import baritone.api.event.events.ChunkEvent;
 import baritone.api.event.events.type.EventState;
 import baritone.cache.CachedChunk;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientPacketListener;
 import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.*;
 import net.minecraft.world.level.ChunkPos;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -63,6 +68,25 @@ public class MixinClientPlayNetHandler {
         }
     }*/
 
+    @Shadow @Final private Minecraft minecraft;
+
+    @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",
             at = @At("RETURN")

src/launch/java/baritone/launch/mixins/MixinClientPlayerEntity.java

@@ -26,6 +26,7 @@ import baritone.api.event.events.type.EventState;
 import baritone.behavior.LookBehavior;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Abilities;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -41,19 +42,18 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public class MixinClientPlayerEntity {
 
     @Inject(
-            method = "chat",
-            at = @At("HEAD"),
-            cancellable = true
+            method = "tick",
+            at = @At(
+                    value = "INVOKE",
+                    target = "net/minecraft/client/player/LocalPlayer.isPassenger()Z",
+                    shift = At.Shift.BY,
+                    by = -3
+            )
     )
-    private void sendChatMessage(String msg, CallbackInfo ci) {
-        ChatEvent event = new ChatEvent(msg);
+    private void onPreUpdate(CallbackInfo ci) {
         IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this);
-        if (baritone == null) {
-            return;
-        }
-        baritone.getGameEventHandler().onSendChatMessage(event);
-        if (event.isCancelled()) {
-            ci.cancel();
+        if (baritone != null) {
+            baritone.getGameEventHandler().onPlayerUpdate(new PlayerUpdateEvent(EventState.PRE));
         }
     }
 
@@ -61,14 +61,15 @@ 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.sendPosition()V",
+                    shift = At.Shift.BY,
+                    by = 2
             )
     )
-    private void onPreUpdate(CallbackInfo ci) {
+    private void onPostUpdate(CallbackInfo ci) {
         IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this);
         if (baritone != null) {
-            baritone.getGameEventHandler().onPlayerUpdate(new PlayerUpdateEvent(EventState.PRE));
+            baritone.getGameEventHandler().onPlayerUpdate(new PlayerUpdateEvent(EventState.POST));
         }
     }
 

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
         }
     }
 }

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;
     }
 }

src/launch/java/baritone/launch/mixins/MixinItemStack.java

@@ -39,7 +39,7 @@ public abstract class MixinItemStack implements IItemStack {
     private int baritoneHash;
 
     @Shadow
-    protected abstract int getDamageValue();
+    public abstract int getDamageValue();
 
     private void recalculateHash() {
         baritoneHash = item == null ? -1 : item.hashCode() + getDamageValue();

src/launch/java/baritone/launch/mixins/MixinLivingEntity.java

@@ -25,16 +25,12 @@ import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.phys.Vec3;
 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.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import java.util.Optional;
-
 import static org.objectweb.asm.Opcodes.GETFIELD;
 
 /**
@@ -47,12 +43,8 @@ public abstract class MixinLivingEntity extends Entity {
     /**
      * Event called to override the movement direction when jumping
      */
-    @Unique
     private RotationMoveEvent jumpRotationEvent;
 
-    @Unique
-    private RotationMoveEvent elytraRotationEvent;
-
     public MixinLivingEntity(EntityType<?> entityTypeIn, Level worldIn) {
         super(entityTypeIn, worldIn);
     }
@@ -62,10 +54,14 @@ public abstract class MixinLivingEntity extends Entity {
             at = @At("HEAD")
     )
     private void preMoveRelative(CallbackInfo ci) {
-        this.getBaritone().ifPresent(baritone -> {
-            this.jumpRotationEvent = new RotationMoveEvent(RotationMoveEvent.Type.JUMP, this.getYRot(), this.getXRot());
-            baritone.getGameEventHandler().onPlayerRotationMove(this.jumpRotationEvent);
-        });
+        // noinspection ConstantConditions
+        if (LocalPlayer.class.isInstance(this)) {
+            IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this);
+            if (baritone != null) {
+                this.jumpRotationEvent = new RotationMoveEvent(RotationMoveEvent.Type.JUMP, this.getYRot());
+                baritone.getGameEventHandler().onPlayerRotationMove(this.jumpRotationEvent);
+            }
+        }
     }
 
     @Redirect(
@@ -82,45 +78,5 @@ public abstract class MixinLivingEntity extends Entity {
         return self.getYRot();
     }
 
-    @Inject(
-            method = "travel",
-            at = @At(
-                    value = "INVOKE",
-                    target = "net/minecraft/world/entity/LivingEntity.getLookAngle()Lnet/minecraft/world/phys/Vec3;"
-            )
-    )
-    private void onPreElytraMove(Vec3 direction, CallbackInfo ci) {
-        this.getBaritone().ifPresent(baritone -> {
-            this.elytraRotationEvent = new RotationMoveEvent(RotationMoveEvent.Type.MOTION_UPDATE, this.getYRot(), this.getXRot());
-            baritone.getGameEventHandler().onPlayerRotationMove(this.elytraRotationEvent);
-            this.setYRot(this.elytraRotationEvent.getYaw());
-            this.setXRot(this.elytraRotationEvent.getPitch());
-        });
-    }
 
-    @Inject(
-            method = "travel",
-            at = @At(
-                    value = "INVOKE",
-                    target = "net/minecraft/world/entity/Entity.move(Lnet/minecraft/world/entity/MoverType;Lnet/minecraft/world/phys/Vec3;)V",
-                    shift = At.Shift.AFTER
-            )
-    )
-    private void onPostElytraMove(float strafe, float vertical, float forward, CallbackInfo ci) {
-        if (this.elytraRotationEvent != null) {
-            this.setYRot(this.elytraRotationEvent.getOriginal().getYaw());
-            this.setXRot(this.elytraRotationEvent.getOriginal().getPitch());
-            this.elytraRotationEvent = null;
-        }
-    }
-
-    @Unique
-    private Optional<IBaritone> getBaritone() {
-        // noinspection ConstantConditions
-        if (LocalPlayer.class.isInstance(this)) {
-            return Optional.ofNullable(BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this));
-        } else {
-            return Optional.empty();
-        }
-    }
 }

src/launch/java/baritone/launch/mixins/MixinMinecraft.java

@@ -19,7 +19,6 @@ package baritone.launch.mixins;
 
 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
-import baritone.api.event.events.PlayerUpdateEvent;
 import baritone.api.event.events.TickEvent;
 import baritone.api.event.events.WorldEvent;
 import baritone.api.event.events.type.EventState;
@@ -80,21 +79,7 @@ public class MixinMinecraft {
 
             baritone.getGameEventHandler().onTick(tickProvider.apply(EventState.PRE, type));
         }
-    }
 
-    @Inject(
-            method = "tick",
-            at = @At(
-                    value = "INVOKE",
-                    target = "net/minecraft/client/multiplayer/ClientLevel.tickEntities()V",
-                    shift = At.Shift.AFTER
-            )
-    )
-    private void postUpdateEntities(CallbackInfo ci) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer(this.player);
-        if (baritone != null) {
-            baritone.getGameEventHandler().onPlayerUpdate(new PlayerUpdateEvent(EventState.POST));
-        }
     }
 
     @Inject(

src/launch/java/baritone/launch/mixins/MixinNetworkManager.java

@@ -26,6 +26,7 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GenericFutureListener;
 import net.minecraft.network.Connection;
+import net.minecraft.network.PacketSendListener;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.PacketFlow;
 import org.spongepowered.asm.mixin.Final;
@@ -53,14 +54,14 @@ public class MixinNetworkManager {
             method = "sendPacket",
             at = @At("HEAD")
     )
-    private void preDispatchPacket(Packet<?> inPacket, final GenericFutureListener<? extends Future<? super Void>> futureListeners, CallbackInfo ci) {
+    private void preDispatchPacket(Packet<?> packet, PacketSendListener packetSendListener, CallbackInfo ci) {
         if (this.receiving != PacketFlow.CLIENTBOUND) {
             return;
         }
 
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
             if (ibaritone.getPlayerContext().player() != null && ibaritone.getPlayerContext().player().connection.getConnection() == (Connection) (Object) this) {
-                ibaritone.getGameEventHandler().onSendPacket(new PacketEvent((Connection) (Object) this, EventState.PRE, inPacket));
+                ibaritone.getGameEventHandler().onSendPacket(new PacketEvent((Connection) (Object) this, EventState.PRE, packet));
             }
         }
     }
@@ -69,14 +70,14 @@ public class MixinNetworkManager {
             method = "sendPacket",
             at = @At("RETURN")
     )
-    private void postDispatchPacket(Packet<?> inPacket, final GenericFutureListener<? extends Future<? super Void>> futureListeners, CallbackInfo ci) {
+    private void postDispatchPacket(Packet<?> packet, PacketSendListener packetSendListener, CallbackInfo ci) {
         if (this.receiving != PacketFlow.CLIENTBOUND) {
             return;
         }
 
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
             if (ibaritone.getPlayerContext().player() != null && ibaritone.getPlayerContext().player().connection.getConnection() == (Connection) (Object) this) {
-                ibaritone.getGameEventHandler().onSendPacket(new PacketEvent((Connection) (Object) this, EventState.POST, inPacket));
+                ibaritone.getGameEventHandler().onSendPacket(new PacketEvent((Connection) (Object) this, EventState.POST, packet));
             }
         }
     }

src/launch/java/baritone/launch/mixins/MixinPalettedContainer.java

@@ -1,107 +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.IPalettedContainer;
-import net.minecraft.util.BitStorage;
-import net.minecraft.world.level.chunk.Palette;
-import net.minecraft.world.level.chunk.PalettedContainer;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-
-@Mixin(PalettedContainer.class)
-public abstract class MixinPalettedContainer<T> implements IPalettedContainer<T> {
-
-    private static final MethodHandle DATA_GETTER;
-
-    // Mixin has no way of referring to the data field and we can't use inheritance
-    // tricks to determine its name, so we use this ugly workaround instead.
-    // Classloading is a bit brittle here and chances are if you mess up you will get
-    // an IllegalClassLoadError instead of the intended exception because generating
-    // the error message attempts to classload a mixin class.
-    // When I tested this a lot of exceptions was discarded silently.
-    // Mumphrey, please add the shadow classes you promised 5 years ago.
-    static {
-        Field dataField = null;
-        for (Field field : PalettedContainer.class.getDeclaredFields()) {
-            Class<?> fieldType = field.getType();
-            if (IData.class.isAssignableFrom(fieldType)) {
-                if ((field.getModifiers() & (Modifier.STATIC | Modifier.FINAL)) != 0 || field.isSynthetic()) {
-                    continue;
-                }
-                if (dataField != null) {
-                    throw new IllegalStateException("PalettedContainer has more than one Data field.");
-                }
-                dataField = field;
-            }
-        }
-        if (dataField == null) {
-            throw new IllegalStateException("PalettedContainer has no Data field.");
-        }
-        MethodHandle rawGetter;
-        try {
-            rawGetter = MethodHandles.lookup().unreflectGetter(dataField);
-        } catch (IllegalAccessException impossible) {
-            // we literally are the owning class, wtf?
-            throw new IllegalStateException("PalettedContainer may not access its own field?!", impossible);
-        }
-        MethodType getterType = MethodType.methodType(IData.class, PalettedContainer.class);
-        DATA_GETTER = MethodHandles.explicitCastArguments(rawGetter, getterType);
-    }
-
-    @Override
-    public Palette<T> getPalette() {
-        return data().getPalette();
-    }
-
-    @Override
-    public BitStorage getStorage() {
-        return data().getStorage();
-    }
-
-    @Unique
-    private IData<T> data() {
-        try {
-            return (IData<T>) DATA_GETTER.invoke((PalettedContainer<T>) (Object) this);
-        } catch (Throwable t) {
-            throw sneaky(t, RuntimeException.class);
-        }
-    }
-
-    @Unique
-    private static <T extends Throwable> T sneaky(Throwable t, Class<T> as) throws T {
-        throw (T) t;
-    }
-
-    @Mixin(targets = "net.minecraft.world.level.chunk.PalettedContainer.Data")
-    private static interface IData<T> {
-
-        @Accessor
-        Palette<T> getPalette();
-
-        @Accessor
-        BitStorage getStorage();
-    }
-}

src/launch/java/baritone/launch/mixins/MixinScreen.java

@@ -17,12 +17,20 @@
 
 package baritone.launch.mixins;
 
+import baritone.api.BaritoneAPI;
+import baritone.api.IBaritone;
+import baritone.api.event.events.ChatEvent;
 import baritone.utils.accessor.IGuiScreen;
+import net.minecraft.network.chat.ClickEvent;
+import net.minecraft.network.chat.Style;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
 
 import java.net.URI;
 import net.minecraft.client.gui.screens.Screen;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(Screen.class)
 public abstract class MixinScreen implements IGuiScreen {
@@ -30,4 +38,20 @@ public abstract class MixinScreen implements IGuiScreen {
     @Override
     @Invoker("openLink")
     public abstract void openLinkInvoker(URI url);
+
+
+    //TODO: switch to enum extention with mixin 9.0 or whenever Mumfrey gets around to it
+    @Inject(at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;error(Ljava/lang/String;Ljava/lang/Object;)V", remap = false, ordinal = 1), method = "handleComponentClicked", cancellable = true)
+    public void handleCustomClickEvent(Style style, CallbackInfoReturnable<Boolean> cir) {
+        ClickEvent clickEvent = style.getClickEvent();
+        if (clickEvent == null) {
+            return;
+        }
+        IBaritone baritone = BaritoneAPI.getProvider().getPrimaryBaritone();
+        if (baritone != null) {
+            baritone.getGameEventHandler().onSendChatMessage(new ChatEvent(clickEvent.getValue()));
+        }
+        cir.setReturnValue(true);
+        cir.cancel();
+    }
 }

src/launch/java/baritone/launch/mixins/MixinWorldRenderer.java

@@ -21,11 +21,11 @@ import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
 import baritone.api.event.events.RenderEvent;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.math.Matrix4f;
 import net.minecraft.client.Camera;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.LevelRenderer;
 import net.minecraft.client.renderer.LightTexture;
+import org.joml.Matrix4f;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

src/launch/resources/mixins.baritone.json

@@ -1,11 +1,11 @@
 {
   "required": true,
   "package": "baritone.launch.mixins",
-  "refmap": "mixins.baritone.refmap.json",
   "compatibilityLevel": "JAVA_17",
   "verbose": false,
   "injectors": {
-    "maxShiftBy": 2
+    "maxShiftBy": 2,
+    "defaultRequire": 1
   },
   "client": [
     "MixinChunkArray",
@@ -20,8 +20,6 @@
     "MixinLootContext",
     "MixinMinecraft",
     "MixinNetworkManager",
-    "MixinPalettedContainer",
-    "MixinPalettedContainer$IData",
     "MixinPlayerController",
     "MixinScreen",
     "MixinWorldRenderer"

src/launch/resources/pack.mcmeta

@@ -1,6 +0,0 @@
-{
-    "pack": {
-        "description": "baritoe",
-        "pack_format": 5
-    }
-}

src/main/java/baritone/Baritone.java

@@ -20,9 +20,8 @@ package baritone;
 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
 import baritone.api.Settings;
-import baritone.api.behavior.IBehavior;
 import baritone.api.event.listener.IEventBus;
-import baritone.api.process.IBaritoneProcess;
+import baritone.api.utils.Helper;
 import baritone.api.utils.IPlayerContext;
 import baritone.behavior.*;
 import baritone.cache.WorldProvider;
@@ -34,17 +33,16 @@ import baritone.utils.BlockStateInterface;
 import baritone.utils.GuiClick;
 import baritone.utils.InputOverrideHandler;
 import baritone.utils.PathingControlManager;
-import baritone.utils.player.BaritonePlayerContext;
+import baritone.utils.player.PrimaryPlayerContext;
 import net.minecraft.client.Minecraft;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.concurrent.Executor;
 import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
 
 /**
  * @author Brady
@@ -52,101 +50,87 @@ import java.util.function.Function;
  */
 public class Baritone implements IBaritone {
 
-    private static final ThreadPoolExecutor threadPool;
+    private static ThreadPoolExecutor threadPool;
+    private static File dir;
 
     static {
         threadPool = new ThreadPoolExecutor(4, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS, new SynchronousQueue<>());
+
+        dir = new File(Minecraft.getInstance().gameDirectory, "baritone");
+        if (!Files.exists(dir.toPath())) {
+            try {
+                Files.createDirectories(dir.toPath());
+            } catch (IOException ignored) {}
+        }
     }
 
-    private final Minecraft mc;
-    private final Path directory;
+    private GameEventHandler gameEventHandler;
 
-    private final GameEventHandler gameEventHandler;
+    private PathingBehavior pathingBehavior;
+    private LookBehavior lookBehavior;
+    private InventoryBehavior inventoryBehavior;
+    private WaypointBehavior waypointBehavior;
+    private InputOverrideHandler inputOverrideHandler;
 
-    private final PathingBehavior pathingBehavior;
-    private final LookBehavior lookBehavior;
-    private final InventoryBehavior inventoryBehavior;
-    private final InputOverrideHandler inputOverrideHandler;
+    private FollowProcess followProcess;
+    private MineProcess mineProcess;
+    private GetToBlockProcess getToBlockProcess;
+    private CustomGoalProcess customGoalProcess;
+    private BuilderProcess builderProcess;
+    private ExploreProcess exploreProcess;
+    private BackfillProcess backfillProcess;
+    private FarmProcess farmProcess;
 
-    private final FollowProcess followProcess;
-    private final MineProcess mineProcess;
-    private final GetToBlockProcess getToBlockProcess;
-    private final CustomGoalProcess customGoalProcess;
-    private final BuilderProcess builderProcess;
-    private final ExploreProcess exploreProcess;
-    private final FarmProcess farmProcess;
-    private final InventoryPauserProcess inventoryPauserProcess;
+    private PathingControlManager pathingControlManager;
+    private SelectionManager selectionManager;
+    private CommandManager commandManager;
 
-    private final PathingControlManager pathingControlManager;
-    private final SelectionManager selectionManager;
-    private final CommandManager commandManager;
-
-    private final IPlayerContext playerContext;
-    private final WorldProvider worldProvider;
+    private IPlayerContext playerContext;
+    private WorldProvider worldProvider;
 
     public BlockStateInterface bsi;
 
-    Baritone(Minecraft mc) {
-        this.mc = mc;
+    Baritone() {
         this.gameEventHandler = new GameEventHandler(this);
 
-        this.directory = mc.gameDirectory.toPath().resolve("baritone");
-        if (!Files.exists(this.directory)) {
-            try {
-                Files.createDirectories(this.directory);
-            } catch (IOException ignored) {}
-        }
-
         // Define this before behaviors try and get it, or else it will be null and the builds will fail!
-        this.playerContext = new BaritonePlayerContext(this, mc);
+        this.playerContext = PrimaryPlayerContext.INSTANCE;
 
         {
-            this.lookBehavior         = this.registerBehavior(LookBehavior::new);
-            this.pathingBehavior      = this.registerBehavior(PathingBehavior::new);
-            this.inventoryBehavior    = this.registerBehavior(InventoryBehavior::new);
-            this.inputOverrideHandler = this.registerBehavior(InputOverrideHandler::new);
-            this.registerBehavior(WaypointBehavior::new);
+            // the Behavior constructor calls baritone.registerBehavior(this) so this populates the behaviors arraylist
+            pathingBehavior = new PathingBehavior(this);
+            lookBehavior = new LookBehavior(this);
+            inventoryBehavior = new InventoryBehavior(this);
+            inputOverrideHandler = new InputOverrideHandler(this);
+            waypointBehavior = new WaypointBehavior(this);
         }
 
         this.pathingControlManager = new PathingControlManager(this);
         {
-            this.followProcess           = this.registerProcess(FollowProcess::new);
-            this.mineProcess             = this.registerProcess(MineProcess::new);
-            this.customGoalProcess       = this.registerProcess(CustomGoalProcess::new); // very high iq
-            this.getToBlockProcess       = this.registerProcess(GetToBlockProcess::new);
-            this.builderProcess          = this.registerProcess(BuilderProcess::new);
-            this.exploreProcess          = this.registerProcess(ExploreProcess::new);
-            this.farmProcess             = this.registerProcess(FarmProcess::new);
-            this.inventoryPauserProcess  = this.registerProcess(InventoryPauserProcess::new);
-            this.registerProcess(BackfillProcess::new);
+            this.pathingControlManager.registerProcess(followProcess = new FollowProcess(this));
+            this.pathingControlManager.registerProcess(mineProcess = new MineProcess(this));
+            this.pathingControlManager.registerProcess(customGoalProcess = new CustomGoalProcess(this)); // very high iq
+            this.pathingControlManager.registerProcess(getToBlockProcess = new GetToBlockProcess(this));
+            this.pathingControlManager.registerProcess(builderProcess = new BuilderProcess(this));
+            this.pathingControlManager.registerProcess(exploreProcess = new ExploreProcess(this));
+            this.pathingControlManager.registerProcess(backfillProcess = new BackfillProcess(this));
+            this.pathingControlManager.registerProcess(farmProcess = new FarmProcess(this));
         }
 
-        this.worldProvider = new WorldProvider(this);
+        this.worldProvider = new WorldProvider();
         this.selectionManager = new SelectionManager(this);
         this.commandManager = new CommandManager(this);
     }
 
-    public void registerBehavior(IBehavior behavior) {
-        this.gameEventHandler.registerEventListener(behavior);
-    }
-
-    public <T extends IBehavior> T registerBehavior(Function<Baritone, T> constructor) {
-        final T behavior = constructor.apply(this);
-        this.registerBehavior(behavior);
-        return behavior;
-    }
-
-    public <T extends IBaritoneProcess> T registerProcess(Function<Baritone, T> constructor) {
-        final T behavior = constructor.apply(this);
-        this.pathingControlManager.registerProcess(behavior);
-        return behavior;
-    }
-
     @Override
     public PathingControlManager getPathingControlManager() {
         return this.pathingControlManager;
     }
 
+    public void registerBehavior(Behavior behavior) {
+        this.gameEventHandler.registerEventListener(behavior);
+    }
+
     @Override
     public InputOverrideHandler getInputOverrideHandler() {
         return this.inputOverrideHandler;
@@ -186,7 +170,6 @@ public class Baritone implements IBaritone {
         return this.lookBehavior;
     }
 
-    @Override
     public ExploreProcess getExploreProcess() {
         return this.exploreProcess;
     }
@@ -196,15 +179,10 @@ public class Baritone implements IBaritone {
         return this.mineProcess;
     }
 
-    @Override
     public FarmProcess getFarmProcess() {
         return this.farmProcess;
     }
 
-    public InventoryPauserProcess getInventoryPauserProcess() {
-        return this.inventoryPauserProcess;
-    }
-
     @Override
     public PathingBehavior getPathingBehavior() {
         return this.pathingBehavior;
@@ -235,19 +213,19 @@ public class Baritone implements IBaritone {
         new Thread(() -> {
             try {
                 Thread.sleep(100);
-                mc.execute(() -> mc.setScreen(new GuiClick()));
+                Helper.mc.execute(() -> Helper.mc.setScreen(new GuiClick()));
             } catch (Exception ignored) {}
         }).start();
     }
 
-    public Path getDirectory() {
-        return this.directory;
-    }
-
     public static Settings settings() {
         return BaritoneAPI.getSettings();
     }
 
+    public static File getDir() {
+        return dir;
+    }
+
     public static Executor getExecutor() {
         return threadPool;
     }

src/main/java/baritone/BaritoneProvider.java

@@ -22,15 +22,13 @@ import baritone.api.IBaritoneProvider;
 import baritone.api.cache.IWorldScanner;
 import baritone.api.command.ICommandSystem;
 import baritone.api.schematic.ISchematicSystem;
-import baritone.cache.FasterWorldScanner;
+import baritone.cache.WorldScanner;
 import baritone.command.CommandSystem;
 import baritone.command.ExampleBaritoneControl;
 import baritone.utils.schematic.SchematicSystem;
-import net.minecraft.client.Minecraft;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * @author Brady
@@ -38,45 +36,30 @@ import java.util.concurrent.CopyOnWriteArrayList;
  */
 public final class BaritoneProvider implements IBaritoneProvider {
 
+    private final Baritone primary;
     private final List<IBaritone> all;
-    private final List<IBaritone> allView;
 
-    public BaritoneProvider() {
-        this.all = new CopyOnWriteArrayList<>();
-        this.allView = Collections.unmodifiableList(this.all);
+    {
+        this.primary = new Baritone();
+        this.all = Collections.singletonList(this.primary);
 
         // Setup chat control, just for the primary instance
-        final Baritone primary = (Baritone) this.createBaritone(Minecraft.getInstance());
-        primary.registerBehavior(ExampleBaritoneControl::new);
+        new ExampleBaritoneControl(this.primary);
     }
 
     @Override
     public IBaritone getPrimaryBaritone() {
-        return this.all.get(0);
+        return primary;
     }
 
     @Override
     public List<IBaritone> getAllBaritones() {
-        return this.allView;
-    }
-
-    @Override
-    public synchronized IBaritone createBaritone(Minecraft minecraft) {
-        IBaritone baritone = this.getBaritoneForMinecraft(minecraft);
-        if (baritone == null) {
-            this.all.add(baritone = new Baritone(minecraft));
-        }
-        return baritone;
-    }
-
-    @Override
-    public synchronized boolean destroyBaritone(IBaritone baritone) {
-        return baritone != this.getPrimaryBaritone() && this.all.remove(baritone);
+        return all;
     }
 
     @Override
     public IWorldScanner getWorldScanner() {
-        return FasterWorldScanner.INSTANCE;
+        return WorldScanner.INSTANCE;
     }
 
     @Override

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

@@ -35,5 +35,6 @@ public class Behavior implements IBehavior {
     protected Behavior(Baritone baritone) {
         this.baritone = baritone;
         this.ctx = baritone.getPlayerContext();
+        baritone.registerBehavior(this);
     }
 }

src/main/java/baritone/behavior/InventoryBehavior.java

@@ -19,7 +19,6 @@ package baritone.behavior;
 
 import baritone.Baritone;
 import baritone.api.event.events.TickEvent;
-import baritone.api.utils.Helper;
 import baritone.utils.ToolSet;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.core.Direction;
@@ -43,10 +42,7 @@ import java.util.OptionalInt;
 import java.util.Random;
 import java.util.function.Predicate;
 
-public final class InventoryBehavior extends Behavior implements Helper {
-
-    int ticksSinceLastInventoryMove;
-    int[] lastTickRequestedMove; // not everything asks every tick, so remember the request while coming to a halt
+public final class InventoryBehavior extends Behavior {
 
     public InventoryBehavior(Baritone baritone) {
         super(baritone);
@@ -64,28 +60,20 @@ public final class InventoryBehavior extends Behavior implements Helper {
             // we have a crafting table or a chest or something open
             return;
         }
-        ticksSinceLastInventoryMove++;
         if (firstValidThrowaway() >= 9) { // aka there are none on the hotbar, but there are some in main inventory
-            requestSwapWithHotBar(firstValidThrowaway(), 8);
+            swapWithHotBar(firstValidThrowaway(), 8);
         }
         int pick = bestToolAgainst(Blocks.STONE, PickaxeItem.class);
         if (pick >= 9) {
-            requestSwapWithHotBar(pick, 0);
-        }
-        if (lastTickRequestedMove != null) {
-            logDebug("Remembering to move " + lastTickRequestedMove[0] + " " + lastTickRequestedMove[1] + " from a previous tick");
-            requestSwapWithHotBar(lastTickRequestedMove[0], lastTickRequestedMove[1]);
+            swapWithHotBar(pick, 0);
         }
     }
 
-    public boolean attemptToPutOnHotbar(int inMainInvy, Predicate<Integer> disallowedHotbar) {
+    public void attemptToPutOnHotbar(int inMainInvy, Predicate<Integer> disallowedHotbar) {
         OptionalInt destination = getTempHotbarSlot(disallowedHotbar);
         if (destination.isPresent()) {
-            if (!requestSwapWithHotBar(inMainInvy, destination.getAsInt())) {
-                return false;
-            }
+            swapWithHotBar(inMainInvy, destination.getAsInt());
         }
-        return true;
     }
 
     public OptionalInt getTempHotbarSlot(Predicate<Integer> disallowedHotbar) {
@@ -109,20 +97,8 @@ public final class InventoryBehavior extends Behavior implements Helper {
         return OptionalInt.of(candidates.get(new Random().nextInt(candidates.size())));
     }
 
-    private boolean requestSwapWithHotBar(int inInventory, int inHotbar) {
-        lastTickRequestedMove = new int[]{inInventory, inHotbar};
-        if (ticksSinceLastInventoryMove < Baritone.settings().ticksBetweenInventoryMoves.value) {
-            logDebug("Inventory move requested but delaying " + ticksSinceLastInventoryMove + " " + Baritone.settings().ticksBetweenInventoryMoves.value);
-            return false;
-        }
-        if (Baritone.settings().inventoryMoveOnlyIfStationary.value && !baritone.getInventoryPauserProcess().stationaryForInventoryMove()) {
-            logDebug("Inventory move requested but delaying until stationary");
-            return false;
-        }
+    private void swapWithHotBar(int inInventory, int inHotbar) {
         ctx.playerController().windowClick(ctx.player().inventoryMenu.containerId, inInventory < 9 ? inInventory + 36 : inInventory, inHotbar, ClickType.SWAP, ctx.player());
-        ticksSinceLastInventoryMove = 0;
-        lastTickRequestedMove = null;
-        return true;
     }
 
     private int firstValidThrowaway() { // TODO offhand idk
@@ -224,8 +200,8 @@ public final class InventoryBehavior extends Behavior implements Helper {
         if (allowInventory) {
             for (int i = 9; i < 36; i++) {
                 if (desired.test(inv.get(i))) {
+                    swapWithHotBar(i, 7);
                     if (select) {
-                        requestSwapWithHotBar(i, 7);
                         p.getInventory().selected = 7;
                     }
                     return true;

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

@@ -20,57 +20,44 @@ package baritone.behavior;
 import baritone.Baritone;
 import baritone.api.Settings;
 import baritone.api.behavior.ILookBehavior;
-import baritone.api.behavior.look.IAimProcessor;
-import baritone.api.behavior.look.ITickableAimProcessor;
-import baritone.api.event.events.*;
-import baritone.api.utils.IPlayerContext;
+import baritone.api.event.events.PlayerUpdateEvent;
+import baritone.api.event.events.RotationMoveEvent;
 import baritone.api.utils.Rotation;
-import baritone.behavior.look.ForkableRandom;
-import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
-
-import java.util.Optional;
 
 public final class LookBehavior extends Behavior implements ILookBehavior {
 
     /**
-     * The current look target, may be {@code null}.
+     * Target's values are as follows:
      */
-    private Target target;
+    private Rotation target;
 
     /**
-     * The rotation known to the server. Returned by {@link #getEffectiveRotation()} for use in {@link IPlayerContext}.
+     * Whether or not rotations are currently being forced
      */
-    private Rotation serverRotation;
+    private boolean force;
 
     /**
-     * The last player rotation. Used to restore the player's angle when using free look.
+     * The last player yaw angle. Used when free looking
      *
      * @see Settings#freeLook
      */
-    private Rotation prevRotation;
-
-    private final AimProcessor processor;
+    private float lastYaw;
 
     public LookBehavior(Baritone baritone) {
         super(baritone);
-        this.processor = new AimProcessor(baritone.getPlayerContext());
     }
 
     @Override
-    public void updateTarget(Rotation rotation, boolean blockInteract) {
-        this.target = new Target(rotation, blockInteract);
-    }
-
-    @Override
-    public IAimProcessor getAimProcessor() {
-        return this.processor;
-    }
-
-    @Override
-    public void onTick(TickEvent event) {
-        if (event.getType() == TickEvent.Type.IN) {
-            this.processor.tick();
+    public void updateTarget(Rotation target, boolean force) {
+        this.target = target;
+        if (!force) {
+            double rand = Math.random() - 0.5;
+            if (Math.abs(rand) < 0.1) {
+                rand *= 4;
+            }
+            this.target = new Rotation(this.target.getYaw() + (float) (rand * Baritone.settings().randomLooking113.value), this.target.getPitch());
         }
+        this.force = force || !Baritone.settings().freeLook.value;
     }
 
     @Override
@@ -78,30 +65,35 @@ public final class LookBehavior extends Behavior implements ILookBehavior {
         if (this.target == null) {
             return;
         }
+
+        // Whether or not we're going to silently set our angles
+        boolean silent = Baritone.settings().antiCheatCompatibility.value && !this.force;
+
         switch (event.getState()) {
             case PRE: {
-                if (this.target.mode == Target.Mode.NONE) {
-                    // Just return for PRE, we still want to set target to null on POST
-                    return;
+                if (this.force) {
+                    ctx.player().setYRot(this.target.getYaw());
+                    float oldPitch = ctx.player().getXRot();
+                    float desiredPitch = this.target.getPitch();
+                    ctx.player().setXRot(desiredPitch);
+                    ctx.player().setYRot((float) (ctx.player().getYRot() + (Math.random() - 0.5) * Baritone.settings().randomLooking.value));
+                    ctx.player().setXRot((float) (ctx.player().getXRot() +  (Math.random() - 0.5) * Baritone.settings().randomLooking.value));
+                    if (desiredPitch == oldPitch && !Baritone.settings().freeLook.value) {
+                        nudgeToLevel();
+                    }
+                    this.target = null;
                 }
-                if (this.target.mode == Target.Mode.SERVER) {
-                    this.prevRotation = new Rotation(ctx.player().getYRot(), ctx.player().getXRot());
+                if (silent) {
+                    this.lastYaw = ctx.player().getYRot();
+                    ctx.player().setYRot(this.target.getYaw());
                 }
-
-                final Rotation actual = this.processor.peekRotation(this.target.rotation);
-                ctx.player().setYRot(actual.getYaw());
-                ctx.player().setXRot(actual.getPitch());
                 break;
             }
             case POST: {
-                // Reset the player's rotations back to their original values
-                if (this.prevRotation != null) {
-                    ctx.player().setYRot(this.prevRotation.getYaw());
-                    ctx.player().setXRot(this.prevRotation.getPitch());
-                    this.prevRotation = null;
+                if (silent) {
+                    ctx.player().setYRot(this.lastYaw);
+                    this.target = null;
                 }
-                // The target is done being used for this game tick, so it can be invalidated
-                this.target = null;
                 break;
             }
             default:
@@ -109,223 +101,34 @@ public final class LookBehavior extends Behavior implements ILookBehavior {
         }
     }
 
-    @Override
-    public void onSendPacket(PacketEvent event) {
-        if (!(event.getPacket() instanceof ServerboundMovePlayerPacket)) {
-            return;
-        }
-
-        final ServerboundMovePlayerPacket packet = (ServerboundMovePlayerPacket) event.getPacket();
-        if (packet instanceof ServerboundMovePlayerPacket.Rot || packet instanceof ServerboundMovePlayerPacket.PosRot) {
-            this.serverRotation = new Rotation(packet.getYRot(0.0f), packet.getXRot(0.0f));
-        }
-    }
-
-    @Override
-    public void onWorldEvent(WorldEvent event) {
-        this.serverRotation = null;
-        this.target = null;
-    }
-
     public void pig() {
         if (this.target != null) {
-            final Rotation actual = this.processor.peekRotation(this.target.rotation);
-            ctx.player().setYRot(actual.getYaw());
+            ctx.player().setYRot(this.target.getYaw());
         }
     }
 
-    public Optional<Rotation> getEffectiveRotation() {
-        if (Baritone.settings().freeLook.value) {
-            return Optional.ofNullable(this.serverRotation);
-        }
-        // If freeLook isn't on, just defer to the player's actual rotations
-        return Optional.empty();
-    }
-
     @Override
     public void onPlayerRotationMove(RotationMoveEvent event) {
         if (this.target != null) {
-            final Rotation actual = this.processor.peekRotation(this.target.rotation);
-            event.setYaw(actual.getYaw());
-            event.setPitch(actual.getPitch());
+
+            event.setYaw(this.target.getYaw());
+
+            // If we have antiCheatCompatibility on, we're going to use the target value later in onPlayerUpdate()
+            // Also the type has to be MOTION_UPDATE because that is called after JUMP
+            if (!Baritone.settings().antiCheatCompatibility.value && event.getType() == RotationMoveEvent.Type.MOTION_UPDATE && !this.force) {
+                this.target = null;
+            }
         }
     }
 
-    private static final class AimProcessor extends AbstractAimProcessor {
-
-        public AimProcessor(final IPlayerContext ctx) {
-            super(ctx);
-        }
-
-        @Override
-        protected Rotation getPrevRotation() {
-            // Implementation will use LookBehavior.serverRotation
-            return ctx.playerRotations();
-        }
-    }
-
-    private static abstract class AbstractAimProcessor implements ITickableAimProcessor {
-
-        protected final IPlayerContext ctx;
-        private final ForkableRandom rand;
-        private double randomYawOffset;
-        private double randomPitchOffset;
-
-        public AbstractAimProcessor(IPlayerContext ctx) {
-            this.ctx = ctx;
-            this.rand = new ForkableRandom();
-        }
-
-        private AbstractAimProcessor(final AbstractAimProcessor source) {
-            this.ctx = source.ctx;
-            this.rand = source.rand.fork();
-            this.randomYawOffset = source.randomYawOffset;
-            this.randomPitchOffset = source.randomPitchOffset;
-        }
-
-        @Override
-        public final Rotation peekRotation(final Rotation rotation) {
-            final Rotation prev = this.getPrevRotation();
-
-            float desiredYaw = rotation.getYaw();
-            float desiredPitch = rotation.getPitch();
-
-            // In other words, the target doesn't care about the pitch, so it used playerRotations().getPitch()
-            // and it's safe to adjust it to a normal level
-            if (desiredPitch == prev.getPitch()) {
-                desiredPitch = nudgeToLevel(desiredPitch);
-            }
-
-            desiredYaw += this.randomYawOffset;
-            desiredPitch += this.randomPitchOffset;
-
-            return new Rotation(
-                    this.calculateMouseMove(prev.getYaw(), desiredYaw),
-                    this.calculateMouseMove(prev.getPitch(), desiredPitch)
-            ).clamp();
-        }
-
-        @Override
-        public final void tick() {
-            // randomLooking
-            this.randomYawOffset = (this.rand.nextDouble() - 0.5) * Baritone.settings().randomLooking.value;
-            this.randomPitchOffset = (this.rand.nextDouble() - 0.5) * Baritone.settings().randomLooking.value;
-
-            // randomLooking113
-            double random = this.rand.nextDouble() - 0.5;
-            if (Math.abs(random) < 0.1) {
-                random *= 4;
-            }
-            this.randomYawOffset += random * Baritone.settings().randomLooking113.value;
-        }
-
-        @Override
-        public final void advance(int ticks) {
-            for (int i = 0; i < ticks; i++) {
-                this.tick();
-            }
-        }
-
-        @Override
-        public Rotation nextRotation(final Rotation rotation) {
-            final Rotation actual = this.peekRotation(rotation);
-            this.tick();
-            return actual;
-        }
-
-        @Override
-        public final ITickableAimProcessor fork() {
-            return new AbstractAimProcessor(this) {
-
-                private Rotation prev = AbstractAimProcessor.this.getPrevRotation();
-
-                @Override
-                public Rotation nextRotation(final Rotation rotation) {
-                    return (this.prev = super.nextRotation(rotation));
-                }
-
-                @Override
-                protected Rotation getPrevRotation() {
-                    return this.prev;
-                }
-            };
-        }
-
-        protected abstract Rotation getPrevRotation();
-
-        /**
-         * Nudges the player's pitch to a regular level. (Between {@code -20} and {@code 10}, increments are by {@code 1})
-         */
-        private float nudgeToLevel(float pitch) {
-            if (pitch < -20) {
-                return pitch + 1;
-            } else if (pitch > 10) {
-                return pitch - 1;
-            }
-            return pitch;
-        }
-
-        private float calculateMouseMove(float current, float target) {
-            final float delta = target - current;
-            final double deltaPx = angleToMouse(delta); // yes, even the mouse movements use double
-            return current + mouseToAngle(deltaPx);
-        }
-
-        private double angleToMouse(float angleDelta) {
-            final float minAngleChange = mouseToAngle(1);
-            return Math.round(angleDelta / minAngleChange);
-        }
-
-        private float mouseToAngle(double mouseDelta) {
-            // casting float literals to double gets us the precise values used by mc
-            final double f = ctx.minecraft().options.sensitivity * (double) 0.6f + (double) 0.2f;
-            return (float) (mouseDelta * f * f * f * 8.0d) * 0.15f; // yes, one double and one float scaling factor
-        }
-    }
-
-    private static class Target {
-
-        public final Rotation rotation;
-        public final Mode mode;
-
-        public Target(Rotation rotation, boolean blockInteract) {
-            this.rotation = rotation;
-            this.mode = Mode.resolve(blockInteract);
-        }
-
-        enum Mode {
-            /**
-             * Rotation will be set client-side and is visual to the player
-             */
-            CLIENT,
-
-            /**
-             * Rotation will be set server-side and is silent to the player
-             */
-            SERVER,
-
-            /**
-             * Rotation will remain unaffected on both the client and server
-             */
-            NONE;
-
-            static Mode resolve(boolean blockInteract) {
-                final Settings settings = Baritone.settings();
-                final boolean antiCheat = settings.antiCheatCompatibility.value;
-                final boolean blockFreeLook = settings.blockFreeLook.value;
-                final boolean freeLook = settings.freeLook.value;
-
-                if (!freeLook) return CLIENT;
-                if (!blockFreeLook && blockInteract) return CLIENT;
-
-                // Regardless of if antiCheatCompatibility is enabled, if a blockInteract is requested then the player
-                // rotation needs to be set somehow, otherwise Baritone will halt since objectMouseOver() will just be
-                // whatever the player is mousing over visually. Let's just settle for setting it silently.
-                if (antiCheat || blockInteract) return SERVER;
-
-                // Pathing regularly without antiCheatCompatibility, don't set the player rotation
-                return NONE;
-            }
+    /**
+     * Nudges the player's pitch to a regular level. (Between {@code -20} and {@code 10}, increments are by {@code 1})
+     */
+    private void nudgeToLevel() {
+        if (ctx.player().getXRot() < -20) {
+            ctx.player().setXRot(ctx.player().getXRot() + 1);
+        } else if (ctx.player().getXRot() > 10) {
+            ctx.player().setXRot(ctx.player().getXRot() - 1);
         }
     }
 }

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

@@ -238,11 +238,11 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
         if (current != null) {
             switch (event.getState()) {
                 case PRE:
-                    lastAutoJump = ctx.minecraft().options.autoJump;
-                    ctx.minecraft().options.autoJump = false;
+                    lastAutoJump = mc.options.autoJump().get();
+                    mc.options.autoJump().set(false);
                     break;
                 case POST:
-                    ctx.minecraft().options.autoJump = lastAutoJump;
+                    mc.options.autoJump().set(lastAutoJump);
                     break;
                 default:
                     break;

src/main/java/baritone/behavior/WaypointBehavior.java

@@ -25,10 +25,10 @@ import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.Helper;
 import baritone.utils.BlockStateInterface;
 import net.minecraft.ChatFormatting;
-import net.minecraft.network.chat.BaseComponent;
 import net.minecraft.network.chat.ClickEvent;
+import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.HoverEvent;
-import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.world.level.block.BedBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.BedPart;
@@ -70,12 +70,12 @@ public class WaypointBehavior extends Behavior {
             return;
         Waypoint deathWaypoint = new Waypoint("death", Waypoint.Tag.DEATH, ctx.playerFeet());
         baritone.getWorldProvider().getCurrentWorld().getWaypoints().addWaypoint(deathWaypoint);
-        BaseComponent component = new TextComponent("Death position saved.");
+        MutableComponent component = Component.literal("Death position saved.");
         component.setStyle(component.getStyle()
                 .withColor(ChatFormatting.WHITE)
                 .withHoverEvent(new HoverEvent(
                         HoverEvent.Action.SHOW_TEXT,
-                        new TextComponent("Click to goto death")
+                        Component.literal("Click to goto death")
                 ))
                 .withClickEvent(new ClickEvent(
                         ClickEvent.Action.RUN_COMMAND,

src/main/java/baritone/behavior/look/ForkableRandom.java

@@ -1,85 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.behavior.look;
-
-import java.util.Arrays;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.LongSupplier;
-
-/**
- * Implementation of Xoroshiro256++
- * <p>
- * Extended to produce random double-precision floating point numbers, and allow copies to be spawned via {@link #fork},
- * which share the same internal state as the source object.
- *
- * @author Brady
- */
-public final class ForkableRandom {
-
-    private static final double DOUBLE_UNIT = 0x1.0p-53;
-
-    private final long[] s;
-
-    public ForkableRandom() {
-        this(System.nanoTime() ^ System.currentTimeMillis());
-    }
-
-    public ForkableRandom(long seedIn) {
-        final AtomicLong seed = new AtomicLong(seedIn);
-        final LongSupplier splitmix64 = () -> {
-            long z = seed.addAndGet(0x9e3779b97f4a7c15L);
-            z = (z ^ (z >>> 30)) * 0xbf58476d1ce4e5b9L;
-            z = (z ^ (z >>> 27)) * 0x94d049bb133111ebL;
-            return z ^ (z >>> 31);
-        };
-        this.s = new long[] {
-                splitmix64.getAsLong(),
-                splitmix64.getAsLong(),
-                splitmix64.getAsLong(),
-                splitmix64.getAsLong()
-        };
-    }
-
-    private ForkableRandom(long[] s) {
-        this.s = s;
-    }
-
-    public double nextDouble() {
-        return (this.next() >>> 11) * DOUBLE_UNIT;
-    }
-
-    public long next() {
-        final long result = rotl(this.s[0] + this.s[3], 23) + this.s[0];
-        final long t = this.s[1] << 17;
-        this.s[2] ^= this.s[0];
-        this.s[3] ^= this.s[1];
-        this.s[1] ^= this.s[2];
-        this.s[0] ^= this.s[3];
-        this.s[2] ^= t;
-        this.s[3] = rotl(this.s[3], 45);
-        return result;
-    }
-
-    public ForkableRandom fork() {
-        return new ForkableRandom(Arrays.copyOf(this.s, 4));
-    }
-
-    private static long rotl(long x, int k) {
-        return (x << k) | (x >>> (64 - k));
-    }
-}

src/main/java/baritone/cache/CachedChunk.java

@@ -21,17 +21,16 @@ import baritone.api.utils.BlockUtils;
 import baritone.utils.pathing.PathingBlockType;
 import com.google.common.collect.ImmutableSet;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.List;
+import java.util.Map;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.dimension.DimensionType;
 
-import java.util.ArrayList;
-import java.util.BitSet;
-import java.util.List;
-import java.util.Map;
-
 /**
  * @author Brady
  * @since 8/3/2018

src/main/java/baritone/cache/CachedRegion.java

@@ -20,10 +20,6 @@ package baritone.cache;
 import baritone.Baritone;
 import baritone.api.cache.ICachedRegion;
 import baritone.api.utils.BlockUtils;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.dimension.DimensionType;
-
 import java.io.*;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -31,6 +27,9 @@ import java.nio.file.Paths;
 import java.util.*;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.dimension.DimensionType;
 
 /**
  * @author Brady
@@ -44,7 +43,7 @@ public final class CachedRegion implements ICachedRegion {
     /**
      * Magic value to detect invalid cache files, or incompatible cache files saved in an old version of Baritone
      */
-    private static final int CACHED_REGION_MAGIC = 456022910;
+    private static final int CACHED_REGION_MAGIC = 456022911;
 
     /**
      * All of the chunks in this region: A 32x32 array of them.
@@ -167,7 +166,7 @@ public final class CachedRegion implements ICachedRegion {
                                 out.writeShort(entry.getValue().size());
                                 for (BlockPos pos : entry.getValue()) {
                                     out.writeByte((byte) (pos.getZ() << 4 | pos.getX()));
-                                    out.writeByte((byte) (pos.getY()));
+                                    out.writeInt(pos.getY()-dimension.minY());
                                 }
                             }
                         }
@@ -271,8 +270,8 @@ public final class CachedRegion implements ICachedRegion {
                                     byte xz = in.readByte();
                                     int X = xz & 0x0f;
                                     int Z = (xz >>> 4) & 0x0f;
-                                    int Y = in.readByte() & 0xff;
-                                    locs.add(new BlockPos(X, Y, Z));
+                                    int Y = in.readInt();
+                                    locs.add(new BlockPos(X, Y+dimension.minY(), Z));
                                 }
                             }
                         }

src/main/java/baritone/cache/CachedWorld.java

@@ -25,13 +25,6 @@ import baritone.api.cache.IWorldData;
 import baritone.api.utils.Helper;
 import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
 import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
-import net.minecraft.core.BlockPos;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.chunk.LevelChunk;
-import net.minecraft.world.level.dimension.DimensionType;
-
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -40,6 +33,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.LinkedBlockingQueue;
+import net.minecraft.core.BlockPos;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.chunk.LevelChunk;
+import net.minecraft.world.level.dimension.DimensionType;
 
 /**
  * @author Brady
@@ -310,9 +309,6 @@ public final class CachedWorld implements ICachedWorld, Helper {
                 try {
                     ChunkPos pos = toPackQueue.take();
                     LevelChunk chunk = toPackMap.remove(pos);
-                    if (toPackQueue.size() > Baritone.settings().chunkPackerQueueMaxSize.value) {
-                        continue;
-                    }
                     CachedChunk cached = ChunkPacker.pack(chunk);
                     CachedWorld.this.updateCachedChunk(cached);
                     //System.out.println("Processed chunk at " + chunk.x + "," + chunk.z);

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

@@ -31,9 +31,9 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.chunk.LevelChunkSection;
 import net.minecraft.world.level.chunk.PalettedContainer;
+import net.minecraft.world.level.dimension.BuiltinDimensionTypes;
 import net.minecraft.world.level.dimension.DimensionType;
 import net.minecraft.world.phys.Vec3;
-
 import java.util.*;
 
 import static baritone.utils.BlockStateInterface.getFromChunk;
@@ -83,7 +83,7 @@ public final class ChunkPacker {
                             Block block = state.getBlock();
                             if (CachedChunk.BLOCKS_TO_KEEP_TRACK_OF.contains(block)) {
                                 String name = BlockUtils.blockToString(block);
-                                specialBlocks.computeIfAbsent(name, b -> new ArrayList<>()).add(new BlockPos(x, y, z));
+                                specialBlocks.computeIfAbsent(name, b -> new ArrayList<>()).add(new BlockPos(x, y+chunk.getMinBuildHeight(), z));
                             }
                         }
                     }
@@ -172,7 +172,7 @@ public final class ChunkPacker {
                 if (dimension.ultraWarm()) {
                     return Blocks.NETHERRACK.defaultBlockState();
                 }
-                if (dimension.createDragonFight()) {
+                if (dimension.effectsLocation().equals(BuiltinDimensionTypes.END_EFFECTS)) {
                     return Blocks.END_STONE.defaultBlockState();
                 }
             default:

src/main/java/baritone/cache/FasterWorldScanner.java

@@ -1,262 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.cache;
-
-import baritone.api.cache.ICachedWorld;
-import baritone.api.cache.IWorldScanner;
-import baritone.api.utils.BetterBlockPos;
-import baritone.api.utils.BlockOptionalMetaLookup;
-import baritone.api.utils.IPlayerContext;
-import baritone.utils.accessor.IPalettedContainer;
-import io.netty.buffer.Unpooled;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.IdMapper;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.util.BitStorage;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.chunk.GlobalPalette;
-import net.minecraft.world.level.chunk.ChunkSource;
-import net.minecraft.world.level.chunk.LevelChunk;
-import net.minecraft.world.level.chunk.LevelChunkSection;
-import net.minecraft.world.level.chunk.Palette;
-import net.minecraft.world.level.chunk.PalettedContainer;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-public enum FasterWorldScanner implements IWorldScanner {
-    INSTANCE;
-    @Override
-    public List<BlockPos> scanChunkRadius(IPlayerContext ctx, BlockOptionalMetaLookup filter, int max, int yLevelThreshold, int maxSearchRadius) {
-        assert ctx.world() != null;
-        if (maxSearchRadius < 0) {
-            throw new IllegalArgumentException("chunkRange must be >= 0");
-        }
-        return scanChunksInternal(ctx, filter, getChunkRange(ctx.playerFeet().x >> 4, ctx.playerFeet().z >> 4, maxSearchRadius), max);
-    }
-
-    @Override
-    public List<BlockPos> scanChunk(IPlayerContext ctx, BlockOptionalMetaLookup filter, ChunkPos pos, int max, int yLevelThreshold) {
-        Stream<BlockPos> stream = scanChunkInternal(ctx, filter, pos);
-        if (max >= 0) {
-            stream = stream.limit(max);
-        }
-        return stream.collect(Collectors.toList());
-    }
-
-    @Override
-    public int repack(IPlayerContext ctx) {
-        return this.repack(ctx, 40);
-    }
-
-    @Override
-    public int repack(IPlayerContext ctx, int range) {
-        ChunkSource chunkProvider = ctx.world().getChunkSource();
-        ICachedWorld cachedWorld = ctx.worldData().getCachedWorld();
-
-        BetterBlockPos playerPos = ctx.playerFeet();
-
-        int playerChunkX = playerPos.getX() >> 4;
-        int playerChunkZ = playerPos.getZ() >> 4;
-
-        int minX = playerChunkX - range;
-        int minZ = playerChunkZ - range;
-        int maxX = playerChunkX + range;
-        int maxZ = playerChunkZ + range;
-
-        int queued = 0;
-        for (int x = minX; x <= maxX; x++) {
-            for (int z = minZ; z <= maxZ; z++) {
-                LevelChunk chunk = chunkProvider.getChunk(x, z, false);
-
-                if (chunk != null && !chunk.isEmpty()) {
-                    queued++;
-                    cachedWorld.queueForPacking(chunk);
-                }
-            }
-        }
-
-        return queued;
-    }
-
-    // ordered in a way that the closest blocks are generally first
-    public static List<ChunkPos> getChunkRange(int centerX, int centerZ, int chunkRadius) {
-        List<ChunkPos> chunks = new ArrayList<>();
-        // spiral out
-        chunks.add(new ChunkPos(centerX, centerZ));
-        for (int i = 1; i < chunkRadius; i++) {
-            for (int j = 0; j <= i; j++) {
-                chunks.add(new ChunkPos(centerX - j, centerZ - i));
-                if (j != 0) {
-                    chunks.add(new ChunkPos(centerX + j, centerZ - i));
-                    chunks.add(new ChunkPos(centerX - j, centerZ + i));
-                }
-                chunks.add(new ChunkPos(centerX + j, centerZ + i));
-                if (j != i) {
-                    chunks.add(new ChunkPos(centerX - i, centerZ - j));
-                    chunks.add(new ChunkPos(centerX + i, centerZ - j));
-                    if (j != 0) {
-                        chunks.add(new ChunkPos(centerX - i, centerZ + j));
-                        chunks.add(new ChunkPos(centerX + i, centerZ + j));
-                    }
-                }
-            }
-        }
-        return chunks;
-    }
-
-    private List<BlockPos> scanChunksInternal(IPlayerContext ctx, BlockOptionalMetaLookup lookup, List<ChunkPos> chunkPositions, int maxBlocks) {
-        assert ctx.world() != null;
-        try {
-            // p -> scanChunkInternal(ctx, lookup, p)
-            Stream<BlockPos> posStream = chunkPositions.parallelStream().flatMap(p -> scanChunkInternal(ctx, lookup, p));
-            if (maxBlocks >= 0) {
-                // WARNING: this can be expensive if maxBlocks is large...
-                // see limit's javadoc
-                posStream = posStream.limit(maxBlocks);
-            }
-            return posStream.collect(Collectors.toList());
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw e;
-        }
-    }
-
-    private Stream<BlockPos> scanChunkInternal(IPlayerContext ctx, BlockOptionalMetaLookup lookup, ChunkPos pos) {
-        ChunkSource chunkProvider = ctx.world().getChunkSource();
-        // if chunk is not loaded, return empty stream
-        if (!chunkProvider.hasChunk(pos.x, pos.z)) {
-            return Stream.empty();
-        }
-
-        long chunkX = (long) pos.x << 4;
-        long chunkZ = (long) pos.z << 4;
-
-        int playerSectionY = (ctx.playerFeet().y - ctx.world().getMinBuildHeight()) >> 4;
-
-        return collectChunkSections(lookup, chunkProvider.getChunk(pos.x, pos.z, false), chunkX, chunkZ, playerSectionY).stream();
-    }
-
-
-
-    private List<BlockPos> collectChunkSections(BlockOptionalMetaLookup lookup, LevelChunk chunk, long chunkX, long chunkZ, int playerSection) {
-        // iterate over sections relative to player
-        List<BlockPos> blocks = new ArrayList<>();
-        LevelChunkSection[] sections = chunk.getSections();
-        int l = sections.length;
-        int i = playerSection - 1;
-        int j = playerSection;
-        for (; i >= 0 || j < l; ++j, --i) {
-            if (j < l) {
-                visitSection(lookup, sections[j], blocks, chunkX, chunkZ);
-            }
-            if (i >= 0) {
-                visitSection(lookup, sections[i], blocks, chunkX, chunkZ);
-            }
-        }
-        return blocks;
-    }
-
-    private void visitSection(BlockOptionalMetaLookup lookup, LevelChunkSection section, List<BlockPos> blocks, long chunkX, long chunkZ) {
-        if (section == null || section.hasOnlyAir()) {
-            return;
-        }
-
-        PalettedContainer<BlockState> sectionContainer = section.getStates();
-        //this won't work if the PaletteStorage is of the type EmptyPaletteStorage
-        if (((IPalettedContainer<BlockState>) sectionContainer).getStorage() == null) {
-            return;
-        }
-
-        boolean[] isInFilter = getIncludedFilterIndices(lookup, ((IPalettedContainer<BlockState>) sectionContainer).getPalette());
-        if (isInFilter.length == 0) {
-            return;
-        }
-
-        BitStorage array = ((IPalettedContainer<BlockState>) section.getStates()).getStorage();
-        long[] longArray = array.getRaw();
-        int arraySize = array.getSize();
-        int bitsPerEntry = array.getBits();
-        long maxEntryValue = (1L << bitsPerEntry) - 1L;
-
-
-        int yOffset = section.bottomBlockY();
-
-        for (int i = 0, idx = 0; i < longArray.length && idx < arraySize; ++i) {
-            long l = longArray[i];
-            for (int offset = 0; offset <= (64 - bitsPerEntry) && idx < arraySize; offset += bitsPerEntry, ++idx) {
-                int value = (int) ((l >> offset) & maxEntryValue);
-                if (isInFilter[value]) {
-                    //noinspection DuplicateExpressions
-                    blocks.add(new BlockPos(
-                        chunkX + ((idx & 255) & 15),
-                        yOffset + (idx >> 8),
-                        chunkZ + ((idx & 255) >> 4)
-                    ));
-                }
-            }
-        }
-    }
-
-    private boolean[] getIncludedFilterIndices(BlockOptionalMetaLookup lookup, Palette<BlockState> palette) {
-        boolean commonBlockFound = false;
-        IdMapper<BlockState> paletteMap = getPalette(palette);
-        int size = paletteMap.size();
-
-        boolean[] isInFilter = new boolean[size];
-
-        for (int i = 0; i < size; i++) {
-            BlockState state = paletteMap.byId(i);
-            if (lookup.has(state)) {
-                isInFilter[i] = true;
-                commonBlockFound = true;
-            } else {
-                isInFilter[i] = false;
-            }
-        }
-
-        if (!commonBlockFound) {
-            return new boolean[0];
-        }
-        return isInFilter;
-    }
-
-    /**
-     * cheats to get the actual map of id -> blockstate from the various palette implementations
-     */
-    private static IdMapper<BlockState> getPalette(Palette<BlockState> palette) {
-        if (palette instanceof GlobalPalette) {
-            return Block.BLOCK_STATE_REGISTRY;
-        } else {
-            FriendlyByteBuf buf = new FriendlyByteBuf(Unpooled.buffer());
-            palette.write(buf);
-            int size = buf.readVarInt();
-            IdMapper<BlockState> states = new IdMapper<>();
-            for (int i = 0; i < size; i++) {
-                BlockState state = Block.BLOCK_STATE_REGISTRY.byId(buf.readVarInt());
-                assert state != null;
-                states.addMapping(state, i);
-            }
-            return states;
-        }
-    }
-}

src/main/java/baritone/cache/WorldProvider.java

@@ -19,84 +19,104 @@ package baritone.cache;
 
 import baritone.Baritone;
 import baritone.api.cache.IWorldProvider;
-import baritone.api.utils.IPlayerContext;
-import net.minecraft.client.multiplayer.ServerData;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.Tuple;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.dimension.DimensionType;
-import net.minecraft.world.level.storage.LevelResource;
+import baritone.api.utils.Helper;
 import org.apache.commons.lang3.SystemUtils;
 
+import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Optional;
+import java.util.function.Consumer;
+import net.minecraft.client.server.IntegratedServer;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.world.level.storage.LevelResource;
 
 /**
  * @author Brady
  * @since 8/4/2018
  */
-public class WorldProvider implements IWorldProvider {
+public class WorldProvider implements IWorldProvider, Helper {
 
-    private static final Map<Path, WorldData> worldCache = new HashMap<>();
+    private static final Map<Path, WorldData> worldCache = new HashMap<>(); // this is how the bots have the same cached world
 
-    private final Baritone baritone;
-    private final IPlayerContext ctx;
     private WorldData currentWorld;
-
-    /**
-     * This lets us detect a broken load/unload hook.
-     * @see #detectAndHandleBrokenLoading()
-     */
-    private Level mcWorld;
-
-    public WorldProvider(Baritone baritone) {
-        this.baritone = baritone;
-        this.ctx = baritone.getPlayerContext();
-    }
+    private Level mcWorld; // this let's us detect a broken load/unload hook
 
     @Override
     public final WorldData getCurrentWorld() {
-        this.detectAndHandleBrokenLoading();
+        detectAndHandleBrokenLoading();
         return this.currentWorld;
     }
 
     /**
      * Called when a new world is initialized to discover the
      *
-     * @param world The new world
+     * @param world The world's Registry Data
      */
-    public final void initWorld(Level world) {
-        this.getSaveDirectories(world).ifPresent(dirs -> {
-            final Path worldDir = dirs.getA();
-            final Path readmeDir = dirs.getB();
+    public final void initWorld(ResourceKey<Level> worldKey, DimensionType world) {
+        Path directory;
+        Path readme;
 
-            try {
-                // lol wtf is this baritone folder in my minecraft save?
-                // good thing we have a readme
-                Files.createDirectories(readmeDir);
-                Files.write(
-                        readmeDir.resolve("readme.txt"),
-                        "https://github.com/cabaletta/baritone\n".getBytes(StandardCharsets.US_ASCII)
-                );
-            } catch (IOException ignored) {}
+        IntegratedServer integratedServer = mc.getSingleplayerServer();
 
-            // We will actually store the world data in a subfolder: "DIM<id>"
-            final Path worldDataDir = this.getWorldDataDirectory(worldDir, world);
-            try {
-                Files.createDirectories(worldDataDir);
-            } catch (IOException ignored) {}
+        // If there is an integrated server running (Aka Singleplayer) then do magic to find the world save file
+        if (mc.hasSingleplayerServer()) {
+            directory = DimensionType.getStorageFolder(worldKey, integratedServer.getWorldPath(LevelResource.ROOT));
 
-            System.out.println("Baritone world data dir: " + worldDataDir);
-            synchronized (worldCache) {
-                this.currentWorld = worldCache.computeIfAbsent(worldDataDir, d -> new WorldData(d, world.dimensionType()));
+            // Gets the "depth" of this directory relative the the game's run directory, 2 is the location of the world
+            if (directory.relativize(mc.gameDirectory.toPath()).getNameCount() != 2) {
+                // subdirectory of the main save directory for this world
+                directory = directory.getParent();
             }
-            this.mcWorld = ctx.world();
-        });
+
+            directory = directory.resolve("baritone");
+            readme = directory;
+        } else { // Otherwise, the server must be remote...
+            String folderName;
+            if (mc.getCurrentServer() != null) {
+                folderName = mc.isConnectedToRealms() ? "realms" : mc.getCurrentServer().ip;
+            } else {
+                //replaymod causes null currentServer and false singleplayer.
+                System.out.println("World seems to be a replay. Not loading Baritone cache.");
+                currentWorld = null;
+                mcWorld = mc.level;
+                return;
+            }
+            if (SystemUtils.IS_OS_WINDOWS) {
+                folderName = folderName.replace(":", "_");
+            }
+            directory = Baritone.getDir().toPath().resolve(folderName);
+            readme = Baritone.getDir().toPath();
+        }
+
+        // lol wtf is this baritone folder in my minecraft save?
+        try (FileOutputStream out = new FileOutputStream(readme.resolve("readme.txt").toFile())) {
+            // good thing we have a readme
+            out.write("https://github.com/cabaletta/baritone\n".getBytes());
+        } catch (IOException ignored) {}
+
+        // We will actually store the world data in a subfolder: "DIM<id>"
+        Path dir = getDimDir(worldKey, world.logicalHeight(), directory);
+        if (!Files.exists(dir)) {
+            try {
+                Files.createDirectories(dir);
+            } catch (IOException ignored) {}
+        }
+
+        System.out.println("Baritone world data dir: " + dir);
+        synchronized (worldCache) {
+            this.currentWorld = worldCache.computeIfAbsent(dir, d -> new WorldData(d, world));
+        }
+        this.mcWorld = mc.level;
+    }
+
+    public final Path getDimDir(ResourceKey<Level> level, int height, Path directory) {
+        return directory.resolve(level.location().getNamespace()).resolve(level.location().getPath() + "_" + height);
     }
 
     public final void closeWorld() {
@@ -109,73 +129,26 @@ public class WorldProvider implements IWorldProvider {
         world.onClose();
     }
 
-    private Path getWorldDataDirectory(Path parent, Level world) {
-        ResourceLocation dimId = world.dimension().location();
-        int height = world.dimensionType().logicalHeight();
-        return parent.resolve(dimId.getNamespace()).resolve(dimId.getPath() + "_" + height);
-    }
-
-    /**
-     * @param world The world
-     * @return An {@link Optional} containing the world's baritone dir and readme dir, or {@link Optional#empty()} if
-     *         the world isn't valid for caching.
-     */
-    private Optional<Tuple<Path, Path>> getSaveDirectories(Level world) {
-        Path worldDir;
-        Path readmeDir;
-
-        // If there is an integrated server running (Aka Singleplayer) then do magic to find the world save file
-        if (ctx.minecraft().hasSingleplayerServer()) {
-            worldDir = ctx.minecraft().getSingleplayerServer().getWorldPath(LevelResource.ROOT);
-
-            // Gets the "depth" of this directory relative to the game's run directory, 2 is the location of the world
-            if (worldDir.relativize(ctx.minecraft().gameDirectory.toPath()).getNameCount() != 2) {
-                // subdirectory of the main save directory for this world
-                worldDir = worldDir.getParent();
-            }
-
-            worldDir = worldDir.resolve("baritone");
-            readmeDir = worldDir;
-        } else { // Otherwise, the server must be remote...
-            String folderName;
-            final ServerData serverData = ctx.minecraft().getCurrentServer();
-            if (serverData != null) {
-                folderName = ctx.minecraft().isConnectedToRealms() ? "realms" : serverData.ip;
-            } else {
-                //replaymod causes null currentServer and false singleplayer.
-                System.out.println("World seems to be a replay. Not loading Baritone cache.");
-                currentWorld = null;
-                mcWorld = ctx.world();
-                return Optional.empty();
-            }
-            if (SystemUtils.IS_OS_WINDOWS) {
-                folderName = folderName.replace(":", "_");
-            }
-            // TODO: This should probably be in "baritone/servers"
-            worldDir = baritone.getDirectory().resolve(folderName);
-            // Just write the readme to the baritone directory instead of each server save in it
-            readmeDir = baritone.getDirectory();
+    public final void ifWorldLoaded(Consumer<WorldData> currentWorldConsumer) {
+        detectAndHandleBrokenLoading();
+        if (this.currentWorld != null) {
+            currentWorldConsumer.accept(this.currentWorld);
         }
-
-        return Optional.of(new Tuple<>(worldDir, readmeDir));
     }
 
-    /**
-     * Why does this exist instead of fixing the event? Some mods break the event. Lol.
-     */
-    private void detectAndHandleBrokenLoading() {
-        if (this.mcWorld != ctx.world()) {
+    private final void detectAndHandleBrokenLoading() {
+        if (this.mcWorld != mc.level) {
             if (this.currentWorld != null) {
                 System.out.println("mc.world unloaded unnoticed! Unloading Baritone cache now.");
                 closeWorld();
             }
-            if (ctx.world() != null) {
+            if (mc.level != null) {
                 System.out.println("mc.world loaded unnoticed! Loading Baritone cache now.");
-                initWorld(ctx.world());
+                initWorld(mc.level.dimension(), mc.level.dimensionType());
             }
-        } else if (this.currentWorld == null && ctx.world() != null && (ctx.minecraft().hasSingleplayerServer() || ctx.minecraft().getCurrentServer() != null)) {
+        } else if (currentWorld == null && mc.level != null && (mc.hasSingleplayerServer() || mc.getCurrentServer() != null)) {
             System.out.println("Retrying to load Baritone cache");
-            initWorld(ctx.world());
+            initWorld(mc.level.dimension(), mc.level.dimensionType());
         }
     }
 }

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

@@ -22,6 +22,8 @@ import baritone.api.cache.IWorldScanner;
 import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.BlockOptionalMetaLookup;
 import baritone.api.utils.IPlayerContext;
+import java.util.*;
+import java.util.stream.IntStream;
 import net.minecraft.client.multiplayer.ClientChunkCache;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.ChunkPos;
@@ -31,9 +33,6 @@ import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.chunk.LevelChunkSection;
 import net.minecraft.world.level.chunk.PalettedContainer;
 
-import java.util.*;
-import java.util.stream.IntStream;
-
 public enum WorldScanner implements IWorldScanner {
 
     INSTANCE;

src/main/java/baritone/command/ExampleBaritoneControl.java

@@ -17,8 +17,8 @@
 
 package baritone.command;
 
-import baritone.Baritone;
 import baritone.api.BaritoneAPI;
+import baritone.api.IBaritone;
 import baritone.api.Settings;
 import baritone.api.command.argument.ICommandArgument;
 import baritone.api.command.exception.CommandNotEnoughArgumentsException;
@@ -27,18 +27,16 @@ import baritone.api.command.helpers.TabCompleteHelper;
 import baritone.api.command.manager.ICommandManager;
 import baritone.api.event.events.ChatEvent;
 import baritone.api.event.events.TabCompleteEvent;
+import baritone.api.event.listener.AbstractGameEventListener;
 import baritone.api.utils.Helper;
 import baritone.api.utils.SettingsUtil;
-import baritone.behavior.Behavior;
 import baritone.command.argument.ArgConsumer;
 import baritone.command.argument.CommandArguments;
 import baritone.command.manager.CommandManager;
 import baritone.utils.accessor.IGuiScreen;
 import net.minecraft.ChatFormatting;
-import net.minecraft.network.chat.BaseComponent;
-import net.minecraft.network.chat.ClickEvent;
-import net.minecraft.network.chat.HoverEvent;
-import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.*;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.util.Tuple;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -48,14 +46,14 @@ import java.util.stream.Stream;
 
 import static baritone.api.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX;
 
-public class ExampleBaritoneControl extends Behavior implements Helper {
+public class ExampleBaritoneControl implements Helper, AbstractGameEventListener {
 
     private static final Settings settings = BaritoneAPI.getSettings();
     private final ICommandManager manager;
 
-    public ExampleBaritoneControl(Baritone baritone) {
-        super(baritone);
+    public ExampleBaritoneControl(IBaritone baritone) {
         this.manager = baritone.getCommandManager();
+        baritone.getGameEventHandler().registerEventListener(this);
     }
 
     @Override
@@ -78,12 +76,12 @@ public class ExampleBaritoneControl extends Behavior implements Helper {
         if (settings.echoCommands.value) {
             String msg = command + rest;
             String toDisplay = settings.censorRanCommands.value ? command + " ..." : msg;
-            BaseComponent component = new TextComponent(String.format("> %s", toDisplay));
+            MutableComponent component = Component.literal(String.format("> %s", toDisplay));
             component.setStyle(component.getStyle()
                     .withColor(ChatFormatting.WHITE)
                     .withHoverEvent(new HoverEvent(
                             HoverEvent.Action.SHOW_TEXT,
-                            new TextComponent("Click to rerun command")
+                            Component.literal("Click to rerun command")
                     ))
                     .withClickEvent(new ClickEvent(
                             ClickEvent.Action.RUN_COMMAND,
@@ -99,7 +97,7 @@ public class ExampleBaritoneControl extends Behavior implements Helper {
             return false;
         } else if (msg.trim().equalsIgnoreCase("orderpizza")) {
             try {
-                ((IGuiScreen) ctx.minecraft().screen).openLinkInvoker(new URI("https://www.dominos.com/en/pages/order/"));
+                ((IGuiScreen) mc.screen).openLinkInvoker(new URI("https://www.dominos.com/en/pages/order/"));
             } catch (NullPointerException | URISyntaxException ignored) {}
             return false;
         }
@@ -123,7 +121,7 @@ public class ExampleBaritoneControl extends Behavior implements Helper {
             }
         } else if (argc.hasExactlyOne()) {
             for (Settings.Setting setting : settings.allSettings) {
-                if (setting.isJavaOnly()) {
+                if (SettingsUtil.javaOnlySetting(setting)) {
                     continue;
                 }
                 if (setting.getName().equalsIgnoreCase(pair.getA())) {
@@ -176,7 +174,7 @@ public class ExampleBaritoneControl extends Behavior implements Helper {
                             .stream();
                 }
                 Settings.Setting setting = settings.byLowerName.get(argc.getString().toLowerCase(Locale.US));
-                if (setting != null && !setting.isJavaOnly()) {
+                if (setting != null && !SettingsUtil.javaOnlySetting(setting)) {
                     if (setting.getValueClass() == Boolean.class) {
                         TabCompleteHelper helper = new TabCompleteHelper();
                         if ((Boolean) setting.value) {