surely this is ok

move cull code
hack fix babij trolle
2023-07-16 19:14:44 -05:00 · 2023-07-16 18:58:13 -05:00 · 2023-07-16 18:55:14 -05:00 · 2023-07-16 18:54:58 -05:00
268 changed files with 6170 additions and 7186 deletions
--- a/.github/workflows/gradle_build.yml
+++ b/.github/workflows/gradle_build.yml
@@ -13,31 +13,27 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
+    - name: Set up JDK 8
+      uses: actions/setup-java@v3
      with:
-        fetch-depth: 0
-
-    - name: Set up JDK 21
-      uses: actions/setup-java@v4
-      with:
-        java-version: '21'
+        java-version: '8'
        distribution: 'temurin'
-        cache: gradle
-
+        
    - name: Grant execute permission for gradlew
      run: chmod +x gradlew
      
    - name: Build with Gradle
-      run: ./gradlew build -Pmod_version="$(git describe --always --tags --first-parent | cut -c2-)"
-
+      run: ./gradlew build
+      
    - name: Archive Artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
      with:
        name: Artifacts
        path: dist/
        
    - name: Archive mapping.txt
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
      with:
        name: Mappings
-        path: mapping/
+        path: build/tmp/proguard/mapping.txt
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -11,11 +11,11 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-    - uses: actions/checkout@v4
-    - name: Set up JDK 21
-      uses: actions/setup-java@v4
+    - uses: actions/checkout@v3
+    - name: Set up JDK 8
+      uses: actions/setup-java@v3
      with:
-        java-version: '21'
+        java-version: '8'
        distribution: 'temurin'
        
    - name: Grant execute permission for gradlew
@@ -23,4 +23,4 @@ jobs:
      
    - name: Executing tests
      run: ./gradlew test
-
+    
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
 run/
 autotest/
 dist/
-volderyarn/

 # Gradle
 build/
@@ -12,8 +11,6 @@ build/
 classes/
 *.class

-/out
-
 # IntelliJ Files
 .idea/
 *.iml
@@ -21,9 +18,6 @@ classes/
 *.iws
 /logs/

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

 .vscode/launch.json
-.architectury-transformer
-
-
-mapping

 libs/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar
 libs/java-objc-bridge-1.1.jar
-
-mapping
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,14 +0,0 @@
-image: java:8
-
-before_script:
-  - which java
-  - which javac
-
-build:
-  script:
-    - ./gradlew build
-    - ./gradlew build -Pbaritone.forge_build
-  artifacts:
-    paths:
-      - dist/*
-    expire_in: 1 week
--- a/5
+++ b/5
@@ -1,12 +1,11 @@
-FROM ubuntu:focal
+FROM debian:stretch

 ENV DEBIAN_FRONTEND noninteractive

 RUN apt update -y

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

 COPY . /code
--- a/README.md
+++ b/README.md
@@ -8,9 +8,9 @@
  <a href="#Baritone"><img src="https://img.shields.io/badge/MC-1.13.2-yellow.svg" alt="Minecraft"/></a>
  <a href="#Baritone"><img src="https://img.shields.io/badge/MC-1.14.4-yellow.svg" alt="Minecraft"/></a>
  <a href="#Baritone"><img src="https://img.shields.io/badge/MC-1.15.2-yellow.svg" alt="Minecraft"/></a>
-  <a href="#Baritone"><img src="https://img.shields.io/badge/MC-1.16.5-yellow.svg" alt="Minecraft"/></a>
+  <a href="#Baritone"><img src="https://img.shields.io/badge/MC-1.16.5-brightgreen.svg" alt="Minecraft"/></a>
  <a href="#Baritone"><img src="https://img.shields.io/badge/MC-1.17.1-yellow.svg" alt="Minecraft"/></a>
-  <a href="#Baritone"><img src="https://img.shields.io/badge/MC-1.18.2-yellow.svg" alt="Minecraft"/></a>
+  <a href="#Baritone"><img src="https://img.shields.io/badge/MC-1.18.2-brightgreen.svg" alt="Minecraft"/></a>
  <a href="#Baritone"><img src="https://img.shields.io/badge/MC-1.19.2-brightgreen.svg" alt="Minecraft"/></a>
  <a href="#Baritone"><img src="https://img.shields.io/badge/MC-1.19.4-brightgreen.svg" alt="Minecraft"/></a>
  <a href="#Baritone"><img src="https://img.shields.io/badge/MC-1.20.1-brightgreen.svg" alt="Minecraft"/></a>
@@ -31,8 +31,7 @@
  <a href="https://github.com/cabaletta/baritone/commit/"><img src="https://img.shields.io/github/commits-since/cabaletta/baritone/v1.0.0.svg" alt="GitHub commits"/></a>
  <img src="https://img.shields.io/github/languages/code-size/cabaletta/baritone.svg" alt="Code size"/>
  <img src="https://img.shields.io/github/repo-size/cabaletta/baritone.svg" alt="GitHub repo size"/>
-  <img src="https://tokei.rs/b1/github/cabaletta/baritone?category=code&style=flat" alt="Lines of Code"/>
-  <img src="https://img.shields.io/badge/Badges-36-blue.svg" alt="yes"/>
+  <img src="https://tokei.rs/b1/github/cabaletta/baritone?category=code" alt="Lines of Code"/>
 </p>

 <p align="center">
@@ -46,8 +45,8 @@
 </p>

 <p align="center">
-  <a href="http://forthebadge.com/"><img src="https://web.archive.org/web/20230604002050/https://forthebadge.com/images/badges/built-with-swag.svg" alt="forthebadge"/></a>
-  <a href="http://forthebadge.com/"><img src="https://web.archive.org/web/20230604002050/https://forthebadge.com/images/badges/mom-made-pizza-rolls.svg" alt="forthebadge"/></a>
+  <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.
@@ -60,20 +59,16 @@ Baritone is the pathfinding system used in [Impact](https://impactclient.net/) s

 | Forge                                                                                                         | Fabric                                                                                                        |
 |---------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------|
-| [1.12.2 Forge](https://github.com/cabaletta/baritone/releases/download/v1.2.19/baritone-api-forge-1.2.19.jar) |                                                                                                               |
-| [1.16.5 Forge](https://github.com/cabaletta/baritone/releases/download/v1.6.5/baritone-api-forge-1.6.5.jar)   | [1.16.5 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.6.5/baritone-api-fabric-1.6.5.jar) |
+| [1.12.2 Forge](https://github.com/cabaletta/baritone/releases/download/v1.2.17/baritone-api-forge-1.2.17.jar) |                                                                                                               |
+| [1.16.5 Forge](https://github.com/cabaletta/baritone/releases/download/v1.6.4/baritone-api-forge-1.6.4.jar)   | [1.16.5 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.6.4/baritone-api-fabric-1.6.4.jar) |
 | [1.17.1 Forge](https://github.com/cabaletta/baritone/releases/download/v1.7.3/baritone-api-forge-1.7.3.jar)   | [1.17.1 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.7.3/baritone-api-fabric-1.7.3.jar) |
-| [1.18.2 Forge](https://github.com/cabaletta/baritone/releases/download/v1.8.6/baritone-api-forge-1.8.6.jar)   | [1.18.2 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.8.6/baritone-api-fabric-1.8.6.jar) |
+| [1.18.2 Forge](https://github.com/cabaletta/baritone/releases/download/v1.8.4/baritone-api-forge-1.8.4.jar)   | [1.18.2 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.8.4/baritone-api-fabric-1.8.4.jar) |
 | [1.19.2 Forge](https://github.com/cabaletta/baritone/releases/download/v1.9.4/baritone-api-forge-1.9.4.jar)   | [1.19.2 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.9.4/baritone-api-fabric-1.9.4.jar) |
 | [1.19.3 Forge](https://github.com/cabaletta/baritone/releases/download/v1.9.1/baritone-api-forge-1.9.1.jar)   | [1.19.3 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.9.1/baritone-api-fabric-1.9.1.jar) |
 | [1.19.4 Forge](https://github.com/cabaletta/baritone/releases/download/v1.9.3/baritone-api-forge-1.9.3.jar)   | [1.19.4 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.9.3/baritone-api-fabric-1.9.3.jar) |
 | [1.20.1 Forge](https://github.com/cabaletta/baritone/releases/download/v1.10.1/baritone-api-forge-1.10.1.jar)   | [1.20.1 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.10.1/baritone-api-fabric-1.10.1.jar) |
-| [1.20.3 Forge](https://github.com/cabaletta/baritone/releases/download/v1.10.2/baritone-api-forge-1.10.2.jar)   | [1.20.3 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.10.2/baritone-api-fabric-1.10.2.jar) |
-| [1.20.4 Forge](https://github.com/cabaletta/baritone/releases/download/v1.10.2/baritone-api-forge-1.10.2.jar)   | [1.20.4 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.10.2/baritone-api-fabric-1.10.2.jar) |

-**Message for 2b2t players looking for 1.19/1.20 Baritone** If you like, please try the beta for Baritone Elytra for 2b2t, find it in #announcements of [the Baritone discord](http://discord.gg/s6fRBAUpmr). It supports 1.19.4 and 1.20.1, Forge or Fabric. If you have to see it to believe it, watch [this YouTube video](https://youtu.be/NnSlQi-68eQ).
-
-**How to immediately get started:** Type `#goto 1000 500` in chat to go to x=1000 z=500. Type `#mine diamond_ore` to mine diamond ore. Type `#stop` to stop. For more, read [the usage page](USAGE.md) and/or watch this [tutorial playlist](https://www.youtube.com/playlist?list=PLnwnJ1qsS7CoQl9Si-RTluuzCo_4Oulpa). Also try `#elytra` for Elytra flying in the Nether using fireworks.
+**How to immediately get started:** Type `#goto 1000 500` in chat to go to x=1000 z=500. Type `#mine diamond_ore` to mine diamond ore. Type `#stop` to stop. For more, read [the usage page](USAGE.md) and/or watch this [tutorial playlist](https://www.youtube.com/playlist?list=PLnwnJ1qsS7CoQl9Si-RTluuzCo_4Oulpa)

 For other versions of Minecraft or more complicated situations or for development, see [Installation & setup](SETUP.md). Also consider just installing [Impact](https://impactclient.net/), which comes with Baritone and is easier to install than wrangling with version JSONs and zips. For 1.16.5, [click here](https://www.youtube.com/watch?v=_4eVJ9Qz2J8) and see description. Once Baritone is installed, look [here](USAGE.md) for instructions on how to use it. There's a [showcase video](https://youtu.be/CZkLXWo4Fg4) made by @Adovin#6313 on Baritone which I recommend.

--- a/build.gradle
+++ b/build.gradle
@@ -15,116 +15,50 @@
 * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
 */

-allprojects {
-    apply plugin: 'java'
-    apply plugin: "xyz.wagyourtail.unimined"
-    apply plugin: "maven-publish"
-
-    archivesBaseName = rootProject.archives_base_name
-
-    def vers = ""
-    try {
-        vers = 'git describe --always --tags --first-parent --dirty'.execute().text.trim()
-    } catch (Exception e) {
-        println "Version detection failed: " + e
-    }
-    if (!vers.startsWith("v")) {
-        println "using version number: " + rootProject.mod_version
-        version = rootProject.mod_version
-    } else {
-        version = vers.substring(1)
-        println "Detected version " + version
-    }
-    group = rootProject.maven_group
-
-    sourceCompatibility = targetCompatibility = JavaVersion.toVersion(project.java_version)
-    
-    java {
-        toolchain {
-            languageVersion.set(JavaLanguageVersion.of(sourceCompatibility.majorVersion.toInteger()))
-        }
-    }
+group 'baritone'
+version '1.2.17'

+buildscript {
    repositories {
        maven {
-            name = 'spongepowered-repo'
+            name = 'forge'
+            url = 'https://files.minecraftforge.net/maven'
+        }
+        maven {
+            name = 'SpongePowered'
            url = 'https://repo.spongepowered.org/repository/maven-public/'
        }
-        maven {
-            name = 'fabric-maven'
-            url = 'https://maven.fabricmc.net/'
-        }
-        maven {
-            name = 'impactdevelopment-repo'
-            url = 'https://impactdevelopment.github.io/maven/'
-        }
-        maven {
-            name = "ldtteam"
-            url = "https://maven.parchmentmc.net/"
-        }
-        // for the newer version of launchwrapper
-        maven {
-            name = "multimc-maven"
-            url = "https://files.multimc.org/maven/"
-            metadataSources {
-                artifact()
-            }
-        }
-        mavenCentral()
-        maven {
-            name = 'babbaj-repo'
-            url = 'https://babbaj.github.io/maven/'
-        }
+        jcenter()
    }

    dependencies {
-        compileOnly "org.spongepowered:mixin:0.8"
-        compileOnly "org.ow2.asm:asm:9.7"
-        // The following line declares the yarn mappings you may select this one as well.
-        // mappings "net.fabricmc:yarn:1.17.1+build.32:v2"
-        //launchImplementation('dev.babbaj:nether-pathfinder:1.3.0')
-        implementation "dev.babbaj:nether-pathfinder:${project.nether_pathfinder_version}"
-
-        implementation 'com.google.code.findbugs:jsr305:3.0.2'
-    }
-
-    unimined.minecraft(sourceSets.main, true) {
-        version rootProject.minecraft_version
-
-        mappings {
-            intermediary()
-            mojmap()
-            parchment("1.20.6", "2024.05.01")
-
-            devFallbackNamespace "official"
-        }
-    }
-
-    tasks.withType(JavaCompile).configureEach {
-        it.options.encoding = "UTF-8"
-
-        def targetVersion = project.java_version.toInteger()
-        if (JavaVersion.current().isJava9Compatible()) {
-            it.options.release = targetVersion
-        }
+        classpath 'net.minecraftforge.gradle:ForgeGradle:4.+' // TODO: 5.+. `doHackyStuff` relies on 4.x internals.
+        classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
    }
 }

-unimined.minecraft {
-    runs.off = true
-    defaultRemapJar = false
-}
+import baritone.gradle.task.CreateDistTask
+import baritone.gradle.task.ProguardTask

-archivesBaseName = archivesBaseName + "-common"
+apply plugin: 'java'
+apply plugin: 'maven-publish'
+apply plugin: 'net.minecraftforge.gradle'
+apply from: 'hacks.gradle'
+ext.doHackyStuff(Class.forName('net.minecraftforge.gradle.mcp.task.GenerateSRG')) // TODO: fg 5.0 - `ext.doHackyStuff(Class.forName('net.minecraftforge.gradle.mcp.tasks.GenerateSRG'))`
+apply plugin: 'org.spongepowered.mixin'
+
+sourceCompatibility = targetCompatibility = '1.8'
+compileJava {
+    sourceCompatibility = targetCompatibility = '1.8'
+    options.encoding = "UTF-8" // allow emoji in comments :^)
+}

 sourceSets {
    api {
        compileClasspath += main.compileClasspath
-        runtimeClasspath += main.runtimeClasspath
    }
    main {
        compileClasspath += api.output
-        runtimeClasspath += api.output
    }
    test {
        compileClasspath += main.compileClasspath + main.runtimeClasspath + main.output
@@ -134,22 +68,120 @@ sourceSets {
        compileClasspath += main.compileClasspath + main.runtimeClasspath + main.output
        runtimeClasspath += main.compileClasspath + main.runtimeClasspath + main.output
    }
+
    schematica_api {
        compileClasspath += main.compileClasspath
-        runtimeClasspath += main.runtimeClasspath
    }
+
    main {
        compileClasspath += schematica_api.output
-        runtimeClasspath += schematica_api.output
+    }
+}
+
+minecraft {
+    mappings channel: 'stable', version: '39-1.12'
+    runs {
+        def nativesOutput = extractNatives.output // TODO: fg 5.0 - `def nativesOutput = extractNatives.output.get()`
+        println("[Baritoe] Detected natives: ${nativesOutput}")
+        client {
+            workingDirectory project.file('run')
+            source sourceSets.launch
+
+            main 'net.minecraft.launchwrapper.Launch'
+
+            args '--gameDir', '.'
+            args '--version', '1.12.2'
+            args '--assetsDir', downloadAssets.output
+            args '--assetIndex', '{asset_index}'
+            args '--accessToken', 'INVALID'
+
+            args '--tweakClass', 'baritone.launch.BaritoneTweaker'
+            jvmArgs "-Dorg.lwjgl.librarypath=${nativesOutput}"
+        }
+    }
+}
+
+repositories {
+    mavenCentral()
+
+    maven {
+        name = 'spongepowered-repo'
+        url = 'https://repo.spongepowered.org/repository/maven-public/'
+    }
+
+    maven {
+        name = 'impactdevelopment-repo'
+        url = 'https://impactdevelopment.github.io/maven/'
+    }
+
+    maven {
+        name = 'babbaj-repo'
+        url = 'https://babbaj.github.io/maven/'
+    }
+}
+
+// fix forge gradle 4+ bug with 1.12.2
+afterEvaluate {
+    configurations.minecraft {
+        exclude group: 'net.minecraftforge', module: 'mergetool'
+    }
+}
+
+// lwjgl2 hack for running game on arm64 mac os
+afterEvaluate {
+    def os = org.gradle.internal.os.OperatingSystem.current()
+    if (os.isMacOsX()) {
+        def arch = System.getProperty("os.arch").toLowerCase()
+        println("Detected Mac OS X running on ${arch}")
+        if (arch == "aarch64") {
+            println("Configurating aarch64 dependencies.")
+
+            configurations.minecraft {
+                exclude group: 'ca.weblite', module: 'java-objc-bridge'
+            }
+
+            dependencies {
+                // https://github.com/MinecraftMachina/lwjgl/releases/download/2.9.4-20150209-mmachina.2/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar
+                minecraft files("libs/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar")
+                // TODO: use prism launcher maven
+                // https://github.com/MinecraftMachina/Java-Objective-C-Bridge/releases/download/1.1.0-mmachina.1/java-objc-bridge-1.1.jar
+                minecraft files("libs/java-objc-bridge-1.1.jar") // TODO: use prism launcher maven
+                minecraft(group: 'net.java.dev.jna', name: 'jna') {
+                    version {
+                        strictly '5.12.1'
+                    }
+                }
+            }
+        }
    }
 }

 dependencies {
-    testImplementation 'junit:junit:4.13.2'
+    minecraft group: 'net.minecraft', name: 'joined', version: '1.12.2'
+    implementation(group: 'net.minecraft', name: 'launchwrapper', version: '1.12') {
+        transitive = false
+    }
+
+    def asmVersion = '9.5'
+    implementation group: 'org.ow2.asm', name: 'asm', version: asmVersion
+    implementation group: 'org.ow2.asm', name: 'asm-tree', version: asmVersion
+    implementation group: 'org.ow2.asm', name: 'asm-commons', version: asmVersion
+    implementation group: 'org.ow2.asm', name: 'asm-analysis', version: asmVersion
+    implementation group: 'org.ow2.asm', name: 'asm-util', version: asmVersion
+
+    launchImplementation('com.github.ImpactDevelopment:SimpleTweaker:1.2')
+    launchImplementation('org.spongepowered:mixin:0.7.11-SNAPSHOT') {
+        // Mixin includes a lot of dependencies that are too up-to-date
+        transitive = false
+    }
+    launchAnnotationProcessor 'org.spongepowered:mixin:0.8.4-SNAPSHOT:processor'
+    launchImplementation('dev.babbaj:nether-pathfinder:0.34')
+    implementation 'dev.babbaj:nether-pathfinder:0.34'
+    testImplementation 'junit:junit:4.12'
 }

-jar {
-    from sourceSets.main.output, sourceSets.launch.output, sourceSets.api.output
+mixin {
+    add sourceSets.launch, 'mixins.baritone.refmap.json'
 }

 javadoc {
@@ -159,3 +191,33 @@ javadoc {
    source = sourceSets.api.allJava
    classpath += sourceSets.api.compileClasspath
 }
+
+jar {
+    from sourceSets.launch.output, sourceSets.api.output
+
+    if (!getProject().hasProperty("baritone.forge_build")) {
+        exclude "**/BaritoneForgeModXD.class"
+        exclude "**/mods.toml"
+    }
+
+    preserveFileTimestamps = false
+    reproducibleFileOrder = true
+
+    manifest {
+        attributes(
+                'MixinConfigs': 'mixins.baritone.json',
+                'TweakClass': 'baritone.launch.BaritoneTweaker',
+                'Implementation-Title': 'Baritone',
+                'Implementation-Version': version
+        )
+    }
+}
+
+task proguard(type: ProguardTask) {
+    url 'https://downloads.sourceforge.net/project/proguard/proguard/6.0/proguard6.0.3.zip'
+    extract 'proguard6.0.3/lib/proguard.jar'
+}
+
+task createDist(type: CreateDistTask, dependsOn: proguard)
+
+build.finalizedBy(createDist)
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -16,29 +16,10 @@
 */

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

 dependencies {
-    implementation group: 'com.google.code.gson', name: 'gson', version: '2.9.0'
-    implementation group: 'commons-io', name: 'commons-io', version: '2.7'
-
-    implementation group: 'xyz.wagyourtail.unimined', name: 'xyz.wagyourtail.unimined.gradle.plugin', version: '1.2.9'
+    implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
+    implementation group: 'commons-io', name: 'commons-io', version: '2.6'
 }
--- a/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java
+++ b/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java
@@ -18,12 +18,8 @@
 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;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -36,67 +32,45 @@ import java.nio.file.Paths;
 class BaritoneGradleTask extends DefaultTask {

    protected static final String
-            PROGUARD_ZIP                    = "proguard-%s.zip",
-            PROGUARD_JAR                    = "proguard-%s.jar",
-            PROGUARD_CONFIG_TEMPLATE        = "scripts/proguard.pro",
-            PROGUARD_CONFIG_DEST            = "template.pro",
-            PROGUARD_API_CONFIG             = "api.pro",
-            PROGUARD_STANDALONE_CONFIG      = "standalone.pro",
-            PROGUARD_EXPORT_PATH            = "proguard_out.jar",
-            PROGUARD_MAPPING_DIR            = "mapping",
+            PROGUARD_ZIP = "proguard.zip",
+            PROGUARD_JAR = "proguard.jar",
+            PROGUARD_CONFIG_TEMPLATE = "scripts/proguard.pro",
+            PROGUARD_CONFIG_DEST = "template.pro",
+            PROGUARD_API_CONFIG = "api.pro",
+            PROGUARD_STANDALONE_CONFIG = "standalone.pro",
+            PROGUARD_EXPORT_PATH = "proguard_out.jar",

-            ARTIFACT_STANDARD           = "%s-%s.jar",
-            ARTIFACT_UNOPTIMIZED        = "%s-unoptimized-%s.jar",
-            ARTIFACT_API                = "%s-api-%s.jar",
-            ARTIFACT_STANDALONE         = "%s-standalone-%s.jar";
+    TEMP_LIBRARY_DIR = "tempLibraries/",
+
+    ARTIFACT_STANDARD = "%s-%s.jar",
+            ARTIFACT_UNOPTIMIZED = "%s-unoptimized-%s.jar",
+            ARTIFACT_API = "%s-api-%s.jar",
+            ARTIFACT_STANDALONE = "%s-standalone-%s.jar",
+            ARTIFACT_FORGE_API = "%s-api-forge-%s.jar",
+            ARTIFACT_FORGE_STANDALONE = "%s-standalone-forge-%s.jar";

    protected String artifactName, artifactVersion;
-    protected Path
-        artifactPath,
-        artifactUnoptimizedPath, artifactApiPath, artifactStandalonePath, // these are different for forge builds
-        proguardOut;
-
-
-    @Input
-    @Optional
-    protected String compType = null;
-
-    public String getCompType() {
-        return compType;
-    }
-
-    public void setCompType(String compType) {
-        this.compType = compType;
-    }
-
-
-    public BaritoneGradleTask() {
-        this.artifactName = getProject().getRootProject().getProperties().get("archives_base_name").toString();
-    }
-
-    public void doFirst() {
-        if (compType != null) {
-            this.artifactVersion = compType + "-" + getProject().getVersion();
-        } else {
-            this.artifactVersion = getProject().getVersion().toString();
-        }
-
-        this.artifactPath = this.getBuildFile(formatVersion(ARTIFACT_STANDARD));
-
-        this.artifactUnoptimizedPath = this.getBuildFile(formatVersion(ARTIFACT_UNOPTIMIZED));
-        this.artifactApiPath         = this.getBuildFile(formatVersion(ARTIFACT_API));
-        this.artifactStandalonePath  = this.getBuildFile(formatVersion(ARTIFACT_STANDALONE));
-
-        this.proguardOut = this.getTemporaryFile(PROGUARD_EXPORT_PATH);
-    }
+    protected Path artifactPath, artifactUnoptimizedPath, artifactApiPath, artifactStandalonePath, artifactForgeApiPath, artifactForgeStandalonePath, proguardOut;

    protected void verifyArtifacts() throws IllegalStateException {
+        this.artifactName = getProject().getName();
+        this.artifactVersion = getProject().getVersion().toString();
+
+        this.artifactPath = this.getBuildFile(formatVersion(ARTIFACT_STANDARD));
+        this.artifactUnoptimizedPath = this.getBuildFile(formatVersion(ARTIFACT_UNOPTIMIZED));
+        this.artifactApiPath = this.getBuildFile(formatVersion(ARTIFACT_API));
+        this.artifactStandalonePath = this.getBuildFile(formatVersion(ARTIFACT_STANDALONE));
+        this.artifactForgeApiPath = this.getBuildFile(formatVersion(ARTIFACT_FORGE_API));
+        this.artifactForgeStandalonePath = this.getBuildFile(formatVersion(ARTIFACT_FORGE_STANDALONE));
+
+        this.proguardOut = this.getTemporaryFile(PROGUARD_EXPORT_PATH);
+
        if (!Files.exists(this.artifactPath)) {
-            throw new IllegalStateException("Artifact not found! Run build first! Missing file: " + this.artifactPath);
+            throw new IllegalStateException("Artifact not found! Run build first! " + this.artifactPath);
        }
    }

-    protected void write(InputStream stream, Path file) throws IOException {
+    protected void write(InputStream stream, Path file) throws Exception {
        if (Files.exists(file)) {
            Files.delete(file);
        }
@@ -108,11 +82,7 @@ class BaritoneGradleTask extends DefaultTask {
    }

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

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

    protected Path getBuildFile(String file) {
-        return getRelativeFile("libs/" + file);
-    }
-
-    protected String addCompTypeFirst(String string) {
-        return compType == null ? string : compType + "-" + string;
+        return getRelativeFile("build/libs/" + file);
    }
 }
--- a/buildSrc/src/main/java/baritone/gradle/task/CreateDistTask.java
+++ b/buildSrc/src/main/java/baritone/gradle/task/CreateDistTask.java
@@ -19,15 +19,13 @@ package baritone.gradle.task;

 import org.gradle.api.tasks.TaskAction;

-import java.nio.charset.StandardCharsets;
+import javax.xml.bind.DatatypeConverter;
 import java.nio.file.Files;
-import java.nio.file.OpenOption;
 import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
 import java.security.MessageDigest;
-import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;

 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;

@@ -41,40 +39,37 @@ public class CreateDistTask extends BaritoneGradleTask {

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

        // Define the distribution file paths
-        Path api = getRootRelativeFile("dist/" + getFileName(artifactApiPath));
-        Path standalone = getRootRelativeFile("dist/" + getFileName(artifactStandalonePath));
-        Path unoptimized = getRootRelativeFile("dist/" + getFileName(artifactUnoptimizedPath));
+        Path api             = getRelativeFile("dist/" + formatVersion(ARTIFACT_API));
+        Path standalone      = getRelativeFile("dist/" + formatVersion(ARTIFACT_STANDALONE));
+        Path unoptimized     = getRelativeFile("dist/" + formatVersion(ARTIFACT_UNOPTIMIZED));
+        Path forgeApi        = getRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_API));
+        Path forgeStandalone = getRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_STANDALONE));

        // NIO will not automatically create directories
-        Path dir = getRootRelativeFile("dist/");
+        Path dir = getRelativeFile("dist/");
        if (!Files.exists(dir)) {
            Files.createDirectory(dir);
        }

        // Copy build jars to dist/
-        // TODO: dont copy files that dont exist
-        Files.copy(this.artifactApiPath, api, REPLACE_EXISTING);
-        Files.copy(this.artifactStandalonePath, standalone, REPLACE_EXISTING);
-        Files.copy(this.artifactUnoptimizedPath, unoptimized, REPLACE_EXISTING);
+        Files.copy(this.artifactApiPath,             api,             REPLACE_EXISTING);
+        Files.copy(this.artifactStandalonePath,      standalone,      REPLACE_EXISTING);
+        Files.copy(this.artifactUnoptimizedPath,     unoptimized,     REPLACE_EXISTING);
+        Files.copy(this.artifactForgeApiPath,        forgeApi,        REPLACE_EXISTING);
+        Files.copy(this.artifactForgeStandalonePath, forgeStandalone, REPLACE_EXISTING);

        // Calculate all checksums and format them like "shasum"
-        List<String> shasum = Files.list(getRootRelativeFile("dist/"))
-                .filter(e -> e.getFileName().toString().endsWith(".jar"))
+        List<String> shasum = Stream.of(api, forgeApi, standalone, forgeStandalone, unoptimized)
                .map(path -> sha1(path) + "  " + path.getFileName().toString())
                .collect(Collectors.toList());

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

        // Write the checksums to a file
-        Files.write(getRootRelativeFile("dist/checksums.txt"), shasum);
-    }
-
-    private static String getFileName(Path p) {
-        return p.getFileName().toString();
+        Files.write(getRelativeFile("dist/checksums.txt"), shasum);
    }

    private static synchronized String sha1(Path path) {
@@ -82,22 +77,10 @@ public class CreateDistTask extends BaritoneGradleTask {
            if (SHA1_DIGEST == null) {
                SHA1_DIGEST = MessageDigest.getInstance("SHA-1");
            }
-            return bytesToHex(SHA1_DIGEST.digest(Files.readAllBytes(path))).toLowerCase();
+            return DatatypeConverter.printHexBinary(SHA1_DIGEST.digest(Files.readAllBytes(path))).toLowerCase();
        } catch (Exception e) {
            // haha no thanks
            throw new IllegalStateException(e);
        }
    }
-
-    private static final byte[] HEX_ARRAY = "0123456789ABCDEF".getBytes(StandardCharsets.US_ASCII);
-
-    public static String bytesToHex(byte[] bytes) {
-        byte[] hexChars = new byte[bytes.length * 2];
-        for (int j = 0; j < bytes.length; j++) {
-            int v = bytes[j] & 0xFF;
-            hexChars[j * 2] = HEX_ARRAY[v >>> 4];
-            hexChars[j * 2 + 1] = HEX_ARRAY[v & 0x0F];
-        }
-        return new String(hexChars, StandardCharsets.UTF_8);
-    }
 }
--- a/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java
+++ b/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java
@@ -18,28 +18,30 @@
 package baritone.gradle.task;

 import baritone.gradle.util.Determinizer;
-import org.gradle.api.plugins.JavaPluginConvention;
+import org.apache.commons.io.IOUtils;
+import org.gradle.api.Project;
+import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.tasks.Input;
-import org.gradle.api.tasks.SourceSetContainer;
 import org.gradle.api.tasks.TaskAction;
 import org.gradle.api.tasks.TaskCollection;
 import org.gradle.api.tasks.compile.ForkOptions;
 import org.gradle.api.tasks.compile.JavaCompile;
 import org.gradle.internal.jvm.Jvm;
-import org.gradle.jvm.toolchain.JavaLanguageVersion;
-import org.gradle.jvm.toolchain.JavaLauncher;
-import org.gradle.jvm.toolchain.JavaToolchainService;
-import xyz.wagyourtail.unimined.api.UniminedExtension;
-import xyz.wagyourtail.unimined.api.minecraft.MinecraftConfig;
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.util.Objects;

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

@@ -49,145 +51,155 @@ import java.util.zip.ZipFile;
 */
 public class ProguardTask extends BaritoneGradleTask {

-    @Input
-    private String proguardVersion;
+    private static final Pattern TEMP_LIBRARY_PATTERN = Pattern.compile("-libraryjars 'tempLibraries\\/([a-zA-Z0-9/_\\-\\.]+)\\.jar'");

-    public String getProguardVersion() {
-        return proguardVersion;
-    }
+    @Input
+    private String url;
+
+    @Input
+    private String extract;

    private List<String> requiredLibraries;

+    private File mixin;
+    private File pathfinder;
+
    @TaskAction
    protected void exec() throws Exception {
-        super.doFirst();
        super.verifyArtifacts();

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

-    UniminedExtension ext = getProject().getExtensions().getByType(UniminedExtension.class);
-    SourceSetContainer sourceSets = getProject().getExtensions().getByType(SourceSetContainer.class);
-
-    private File getMcJar() {
-        MinecraftConfig mcc = ext.getMinecrafts().get(sourceSets.getByName("main"));
-        return mcc.getMinecraft(mcc.getMcPatcher().getProdNamespace(), mcc.getMcPatcher().getProdNamespace()).toFile();
-    }
-
-    private boolean isMcJar(File f) {
-        MinecraftConfig mcc = ext.getMinecrafts().get(sourceSets.getByName("main"));
-        return mcc.isMinecraftJar(f.toPath());
-    }
-
    private void processArtifact() throws Exception {
        if (Files.exists(this.artifactUnoptimizedPath)) {
            Files.delete(this.artifactUnoptimizedPath);
        }

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

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

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

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

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

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

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

-        template.add(2, "-libraryjars  <java.home>/jmods/java.base.jmod(!**.jar;!module-info.class)");
-        template.add(3, "-libraryjars  <java.home>/jmods/java.desktop.jmod(!**.jar;!module-info.class)");
-        template.add(4, "-libraryjars  <java.home>/jmods/jdk.unsupported.jmod(!**.jar;!module-info.class)");
-
-        {
-            final Stream<File> libraries;
-            File mcJar;
-            try {
-                mcJar = getMcJar();
-            } catch (Exception e) {
-                throw new RuntimeException("Failed to find Minecraft jar", e);
-            }
-
-            {
-                // Discover all of the libraries that we will need to acquire from gradle
-                final Stream<File> dependencies = acquireDependencies()
-                        // remove MCP mapped jar, and nashorn
-                        .filter(f -> !f.toString().endsWith("-recomp.jar") && !f.getName().startsWith("nashorn") && !f.getName().startsWith("coremods"));
-
-                libraries = dependencies
-                        .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")));
+        // Acquire the RT jar using "java -verbose". This doesn't work on Java 9+
+        Process p = new ProcessBuilder(this.getJavaBinPathForProguard(), "-verbose").start();
+        String out = IOUtils.toString(p.getInputStream(), "UTF-8").split("\n")[0].split("Opened ")[1].replace("]", "");
+        template.add(2, "-libraryjars '" + out + "'");

        // API config doesn't require any changes from the changes that we made to the template
-        Files.write(getTemporaryFile(compType + PROGUARD_API_CONFIG), api);
+        Files.write(getTemporaryFile(PROGUARD_API_CONFIG), template);

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

-    private Stream<File> acquireDependencies() {
-        return getProject().getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("main").getCompileClasspath().getFiles()
-                .stream()
-                .filter(File::isFile);
-    }
-
-    private void proguardApi() throws Exception {
-        runProguard(getTemporaryFile(compType + PROGUARD_API_CONFIG));
-        Determinizer.determinize(this.proguardOut.toString(), this.artifactApiPath.toString(), List.of(), false);
-    }
-
-    private void proguardStandalone() throws Exception {
-        runProguard(getTemporaryFile(compType + PROGUARD_STANDALONE_CONFIG));
-        Determinizer.determinize(this.proguardOut.toString(), this.artifactStandalonePath.toString(), List.of(), false);
+        // Discover all of the libraries that we will need to acquire from gradle
+        this.requiredLibraries = new ArrayList<>();
+        template.forEach(line -> {
+            if (!line.startsWith("#")) {
+                Matcher m = TEMP_LIBRARY_PATTERN.matcher(line);
+                if (m.find()) {
+                    this.requiredLibraries.add(m.group(1));
+                }
+            }
+        });
    }

    private static final class Pair<A, B> {
@@ -209,14 +221,137 @@ public class ProguardTask extends BaritoneGradleTask {
        }
    }

+    private void acquireDependencies() throws Exception {
+        // Create a map of all of the dependencies that we are able to access in this project
+        // Likely a better way to do this, I just pair the dependency with the first valid configuration
+        Map<String, Pair<Configuration, Dependency>> dependencyLookupMap = new HashMap<>();
+        Map<String, File> files = new HashMap<>();
+        getProject().getConfigurations().stream().filter(Configuration::isCanBeResolved).forEach(config -> {
+            for (File file : config.getFiles()) {
+                files.put(file.getName(), file);
+            }
+            config.getAllDependencies().forEach(dependency ->
+                    dependencyLookupMap.putIfAbsent(dependency.getName() + "-" + dependency.getVersion(), new Pair<>(config, dependency)));
+        });
+
+        // Create the directory if it doesn't already exist
+        Path tempLibraries = getTemporaryFile(TEMP_LIBRARY_DIR);
+        if (!Files.exists(tempLibraries)) {
+            Files.createDirectory(tempLibraries);
+        }
+
+        // Iterate the required libraries to copy them to tempLibraries
+        for (String lib : this.requiredLibraries) {
+            // copy from the forgegradle cache
+            if (lib.equals("minecraft")) {
+                Path cachedJar = getMinecraftJar();
+                Path inTempDir = getTemporaryFile("tempLibraries/minecraft.jar");
+                // TODO: maybe try not to copy every time
+                Files.copy(cachedJar, inTempDir, StandardCopyOption.REPLACE_EXISTING);
+
+                continue;
+            }
+
+            // Find a configuration/dependency pair that matches the desired library
+            Pair<Configuration, Dependency> pair = null;
+            for (Map.Entry<String, Pair<Configuration, Dependency>> entry : dependencyLookupMap.entrySet()) {
+                if (entry.getKey().startsWith(lib)) {
+                    pair = entry.getValue();
+                }
+            }
+            // Find the library jar file, and copy it to tempLibraries
+            if (pair == null) {
+                File libFile = files.get(lib + ".jar");
+                if (libFile == null) {
+                    libFile = files.values().stream().filter(file -> file.getName().startsWith(lib)).findFirst().orElse(null);
+                    if (libFile == null) {
+                        throw new IllegalStateException(lib);
+                    }
+                }
+                copyTempLib(lib, libFile);
+            } else {
+                for (File file : pair.a.files(pair.b)) {
+                    if (file.getName().startsWith(lib)) {
+                        copyTempLib(lib, file);
+                    }
+                }
+            }
+        }
+        if (mixin == null) {
+            throw new IllegalStateException("Unable to find mixin jar");
+        }
+        if (pathfinder == null) {
+            throw new IllegalStateException("Unable to find pathfinder jar");
+        }
+    }
+
+    private void copyTempLib(String lib, File libFile) throws IOException {
+        if (lib.contains("mixin")) {
+            mixin = libFile;
+        }
+        if (lib.contains("nether-pathfinder")) {
+            pathfinder = libFile;
+        }
+        Files.copy(libFile.toPath(), getTemporaryFile("tempLibraries/" + lib + ".jar"), StandardCopyOption.REPLACE_EXISTING);
+    }
+
+    // a bunch of epic stuff to get the path to the cached jar
+    private Path getMinecraftJar() throws Exception {
+        return getObfuscatedMinecraftJar(getProject(), false); // always notch jar for now.
+    }
+
+    private static Path getObfuscatedMinecraftJar(final Project project, final boolean srg) throws Exception {
+        final Object extension = Objects.requireNonNull(project.getExtensions().findByName("minecraft"), "Unable to find Minecraft extension.");
+
+        final Class<?> mcpRepoClass = mcpRepoClass(extension.getClass().getClassLoader());
+        final Field mcpRepoInstanceField = mcpRepoClass.getDeclaredField("INSTANCE");
+        mcpRepoInstanceField.setAccessible(true);
+        final Method findMethod = mcpRepoClass.getDeclaredMethod(srg ? "findSrg" : "findRaw", String.class, String.class);
+        findMethod.setAccessible(true);
+
+        final Object mcpRepo = mcpRepoInstanceField.get(null);
+        final String mcpVersion = (String) Objects.requireNonNull(project.getExtensions().getExtraProperties().get("MCP_VERSION"), "Extra property \"MCP_VERSION\" not found");
+        return ((File) findMethod.invoke(mcpRepo, "joined", mcpVersion)).toPath();
+    }
+
+    private static Class<?> mcpRepoClass(final ClassLoader loader) throws Exception {
+        final Method forName0 = Class.class.getDeclaredMethod("forName0", String.class, boolean.class, ClassLoader.class, Class.class);
+        forName0.setAccessible(true);
+        return (Class<?>) forName0.invoke(null, "net.minecraftforge.gradle.mcp.MCPRepo", true, loader, null);
+    }
+
+    private void proguardApi() throws Exception {
+        runProguard(getTemporaryFile(PROGUARD_API_CONFIG));
+        Determinizer.determinize(this.proguardOut.toString(), this.artifactApiPath.toString(), Arrays.asList(pathfinder), false);
+        Determinizer.determinize(this.proguardOut.toString(), this.artifactForgeApiPath.toString(), Arrays.asList(pathfinder, mixin), true);
+    }
+
+    private void proguardStandalone() throws Exception {
+        runProguard(getTemporaryFile(PROGUARD_STANDALONE_CONFIG));
+        Determinizer.determinize(this.proguardOut.toString(), this.artifactStandalonePath.toString(), Arrays.asList(pathfinder), false);
+        Determinizer.determinize(this.proguardOut.toString(), this.artifactForgeStandalonePath.toString(), Arrays.asList(pathfinder, mixin), true);
+    }
+
    private void cleanup() {
        try {
            Files.delete(this.proguardOut);
        } catch (IOException ignored) {}
    }

-    public void setProguardVersion(String url) {
-        this.proguardVersion = url;
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setExtract(String extract) {
+        this.extract = extract;
+    }
+
+    public String getExtract() {
+        return extract;
    }

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

+        // Make paths relative to work directory; fixes spaces in path to config, @"" doesn't work
        Path workingDirectory = getTemporaryFile("");
+        Path proguardJar = workingDirectory.relativize(getTemporaryFile(PROGUARD_JAR));
+        config = workingDirectory.relativize(config);

-        getProject().javaexec(spec -> {
-            spec.workingDir(workingDirectory.toFile());
-            spec.args("@" + workingDirectory.relativize(config));
-            spec.classpath(getTemporaryFile(String.format(PROGUARD_JAR, proguardVersion)));
+        // Honestly, if you still have spaces in your path at this point, you're SOL.

-            spec.executable(getJavaLauncherForProguard().getExecutablePath().getAsFile());
-        }).assertNormalExitValue().rethrowFailure();
+        Process p = new ProcessBuilder("java", "-jar", proguardJar.toString(), "@" + config.toString())
+                .directory(workingDirectory.toFile()) // Set the working directory to the temporary folder]
+                .start();
+
+        // We can't do output inherit process I/O with gradle for some reason and have it work, so we have to do this
+        this.printOutputLog(p.getInputStream(), System.out);
+        this.printOutputLog(p.getErrorStream(), System.err);
+
+        // Halt the current thread until the process is complete, if the exit code isn't 0, throw an exception
+        int exitCode = p.waitFor();
+        if (exitCode != 0) {
+            Thread.sleep(1000);
+            throw new IllegalStateException("Proguard exited with code " + exitCode);
+        }
    }

+    private void printOutputLog(InputStream stream, PrintStream outerr) {
+        new Thread(() -> {
+            try (BufferedReader reader = new BufferedReader(new InputStreamReader(stream))) {
+                String line;
+                while ((line = reader.readLine()) != null) {
+                    outerr.println(line);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }).start();
+    }
 }
--- a/buildSrc/src/main/java/baritone/gradle/util/Determinizer.java
+++ b/buildSrc/src/main/java/baritone/gradle/util/Determinizer.java
@@ -64,17 +64,17 @@ public class Determinizer {
                JarEntry clone = new JarEntry(entry.getName());
                clone.setTime(42069);
                jos.putNextEntry(clone);
-                if (entry.getName().endsWith(".refmap.json")) {
+                if (entry.getName().endsWith(".json")) {
                    JsonElement json = new JsonParser().parse(new InputStreamReader(jarFile.getInputStream(entry)));
                    jos.write(writeSorted(json).getBytes());
                } else if (entry.getName().equals("META-INF/MANIFEST.MF") && doForgeReplacementOfMetaInf) { // only replace for forge jar
                    ByteArrayOutputStream cancer = new ByteArrayOutputStream();
                    copy(jarFile.getInputStream(entry), cancer);
                    String manifest = new String(cancer.toByteArray());
-                    if (!manifest.contains("baritone.launch.tweaker.BaritoneTweaker")) {
+                    if (!manifest.contains("baritone.launch.BaritoneTweaker")) {
                        throw new IllegalStateException("unable to replace");
                    }
-                    manifest = manifest.replace("baritone.launch.tweaker.BaritoneTweaker", "org.spongepowered.asm.launch.MixinTweaker");
+                    manifest = manifest.replace("baritone.launch.BaritoneTweaker", "org.spongepowered.asm.launch.MixinTweaker");
                    jos.write(manifest.getBytes());
                } else {
                    copy(jarFile.getInputStream(entry), jos);
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -1,103 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-import baritone.gradle.task.CreateDistTask
-import baritone.gradle.task.ProguardTask
-
-plugins {
-    id "com.github.johnrengelman.shadow" version "8.0.0"
-}
-
-archivesBaseName = archivesBaseName + "-fabric"
-
-unimined.minecraft {
-    fabric {
-        loader project.fabric_version
-    }
-}
-
-configurations {
-    common
-    shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
-    compileClasspath.extendsFrom common
-    runtimeClasspath.extendsFrom common
-}
-
-dependencies {
-    // because of multiple sourcesets `common project(":")` doesn't work
-    for (sourceSet in rootProject.sourceSets) {
-        if (sourceSet == rootProject.sourceSets.test) continue
-        if (sourceSet == rootProject.sourceSets.schematica_api) continue
-        common sourceSet.output
-        shadowCommon sourceSet.output
-    }
-    include "dev.babbaj:nether-pathfinder:${project.nether_pathfinder_version}"
-}
-
-processResources {
-    inputs.property "version", project.version
-
-    filesMatching("fabric.mod.json") {
-        expand "version": project.version
-    }
-}
-
-shadowJar {
-    configurations = [project.configurations.shadowCommon]
-    archiveClassifier.set "dev-shadow"
-}
-
-remapJar {
-    inputFile.set shadowJar.archiveFile
-    dependsOn shadowJar
-    archiveClassifier.set null
-}
-
-jar {
-    archiveClassifier.set "dev"
-}
-
-components.java {
-    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-        skip()
-    }
-}
-
-task proguard(type: ProguardTask) {
-    proguardVersion "7.4.2"
-    compType "fabric"
-}
-
-task createDist(type: CreateDistTask, dependsOn: proguard) {
-    compType "fabric"
-}
-
-build.finalizedBy(createDist)
-
-publishing {
-    publications {
-        mavenFabric(MavenPublication) {
-            artifactId = rootProject.archives_base_name + "-" + project.name
-            from components.java
-        }
-    }
-
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-    repositories {
-        // Add repositories to publish to here.
-    }
-}
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -1,30 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "baritone",
-  "version": "${version}",
-
-  "name": "Baritone",
-  "description": "Google Maps for Blockgame",
-  "authors": [
-    "leijurv", "Brady"
-  ],
-  "contact": {
-    "homepage": "https://github.com/cabaletta/baritone",
-    "sources": "https://github.com/cabaletta/baritone"
-  },
-
-  "license": "LGPL-3.0",
-  "icon": "assets/baritone/icon.png",
-
-  "environment": "*",
-  "entrypoints": {
-  },
-  "mixins": [
-      "mixins.baritone.json"
-  ],
-
-  "depends": {
-    "fabricloader": ">=0.14.22",
-    "minecraft": "1.21"
-  }
-}
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -1,120 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-import baritone.gradle.task.CreateDistTask
-import baritone.gradle.task.ProguardTask
-
-plugins {
-    id "com.github.johnrengelman.shadow" version "8.0.0"
-}
-
-archivesBaseName = archivesBaseName + "-forge"
-
-unimined.minecraft {
-    minecraftForge {
-        loader project.forge_version
-        mixinConfig ["mixins.baritone.json"]
-    }
-}
-
-//loom {
-//    forge {
-//        mixinConfig 'mixins.baritone.json'
-//    }
-//}
-
-configurations {
-    common
-    shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
-    compileClasspath.extendsFrom common
-    runtimeClasspath.extendsFrom common
-}
-
-dependencies {
-    // because of multiple sourcesets `common project(":")` doesn't work
-    for (sourceSet in rootProject.sourceSets) {
-        if (sourceSet == rootProject.sourceSets.test) continue
-        if (sourceSet == rootProject.sourceSets.schematica_api) continue
-        common sourceSet.output
-        shadowCommon sourceSet.output
-    }
-    shadowCommon "dev.babbaj:nether-pathfinder:${project.nether_pathfinder_version}"
-}
-
-processResources {
-    inputs.property "version", project.version
-
-    filesMatching("META-INF/mods.toml") {
-        expand "version": project.version
-    }
-}
-
-shadowJar {
-    configurations = [project.configurations.shadowCommon]
-    archiveClassifier.set "dev-shadow"
-}
-
-remapJar {
-    inputFile.set shadowJar.archiveFile
-    dependsOn shadowJar
-    archiveClassifier.set null
-}
-
-jar {
-    archiveClassifier.set "dev"
-
-    manifest {
-        attributes(
-                'MixinConfigs': 'mixins.baritone.json',
-                "MixinConnector": "baritone.launch.BaritoneMixinConnector",
-
-                'Implementation-Title': 'Baritone',
-                'Implementation-Version': version,
-        )
-    }
-}
-
-components.java {
-    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-        skip()
-    }
-}
-
-task proguard(type: ProguardTask) {
-    proguardVersion "7.4.2"
-    compType "forge"
-}
-
-task createDist(type: CreateDistTask, dependsOn: proguard) {
-    compType "forge"
-}
-
-build.finalizedBy(createDist)
-
-publishing {
-    publications {
-        mavenFabric(MavenPublication) {
-            artifactId = rootProject.archives_base_name + "-" + project.name
-            from components.java
-        }
-    }
-
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-    repositories {
-        // Add repositories to publish to here.
-    }
-}
--- a/forge/gradle.properties
+++ b/forge/gradle.properties
@@ -1,18 +0,0 @@
-#
-# This file is part of Baritone.
-#
-# Baritone is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Baritone is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
-#
-
-loom.platform=forge
--- a/forge/src/main/resources/META-INF/mods.toml
+++ b/forge/src/main/resources/META-INF/mods.toml
@@ -1,40 +0,0 @@
-# This is an example mods.toml file. It contains the data relating to the loading mods.
-# There are several mandatory fields (#mandatory), and many more that are optional (#optional).
-# The overall format is standard TOML format, v0.5.0.
-# Note that there are a couple of TOML lists in this file.
-# Find more information on toml format here:  https://github.com/toml-lang/toml
-# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
-modLoader="javafml" #mandatory
-# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
-loaderVersion="[48,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
-license="https://raw.githubusercontent.com/cabaletta/baritone/1.16.2/LICENSE"
-# A URL to refer people to when problems occur with this mod
-issueTrackerURL="https://github.com/cabaletta/baritone/issues" #optional
-# A list of mods - how many allowed here is determined by the individual mod loader
-[[mods]] #mandatory
-# The modid of the mod
-modId="baritoe" #mandatory
-# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it
-version="${version}" #mandatory
- # A display name for the mod
-displayName="Baritone" #mandatory
-# A URL for the "homepage" for this mod, displayed in the mod UI
-displayURL="https://github.com/cabaletta/baritone" #optional
-# A file name (in the root of the mod JAR) containing a logo for display
-#logoFile="examplemod.png" #optional
-# A text field displayed in the mod UI
-credits="Hat Gamers" #optional
-# A text field displayed in the mod UI
-authors="leijurv, Brady" #optional
-# The description text for the mod (multi line!) (#mandatory)
-description='''
-A Minecraft pathfinder bot.
-'''
-
-[[dependencies.baritoe]]
-modId="minecraft"
-mandatory=true
-# This version range declares a minimum of the current minecraft version up to but not including the next major version
-versionRange="[1.21]"
-ordering="NONE"
-side="BOTH"
--- a/forge/src/main/resources/pack.mcmeta
+++ b/forge/src/main/resources/pack.mcmeta
@@ -1,6 +0,0 @@
-{
-    "pack": {
-        "description": "null",
-        "pack_format": 8
-    }
-}
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,19 +0,0 @@
-org.gradle.jvmargs=-Xmx4G
-
-available_loaders=fabric,forge,neoforge,tweaker
-
-mod_version=1.11.0
-maven_group=baritone
-archives_base_name=baritone
-
-java_version=21
-
-minecraft_version=1.21
-
-forge_version=51.0.16
-
-neoforge_version=20-beta
-
-fabric_version=0.15.11
-
-nether_pathfinder_version=1.4.1
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/hacks.gradle
+++ b/hacks.gradle
@@ -0,0 +1,161 @@
+/*
+ * 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/>.
+ */
+
+ext.doHackyStuff = { final Class<?> clazz ->
+    def withExtension = { final File file, final String extension ->
+        def i = file.getName().lastIndexOf('.')
+        def name = file.getName().substring(0, i)
+        return new File(file.getParent(), "$name.$extension")
+    }
+
+    // https://github.com/MinecraftForge/ForgeGradle/blob/6639464b29b0923187eee0a609e546ba9f1b998b/src/patcher/java/net/minecraftforge/gradle/patcher/PatcherPlugin.java#L545
+    // https://github.com/MinecraftForge/ForgeGradle/blob/6639464b29b0923187eee0a609e546ba9f1b998b/src/userdev/java/net/minecraftforge/gradle/userdev/UserDevPlugin.java#L149
+    // create createMcp2Obf task
+    this.tasks.register('createMcpToObf', clazz)
+            .configure { task ->
+                task.setNotch(true)
+                task.setReverse(true)
+            }
+    afterEvaluate {
+        def createMcp2Obf = this.tasks.getByName('createMcpToObf')
+        def createMcp2Srg = this.tasks.getByName('createMcpToSrg')
+
+        // configure createMcp2Obf task
+        if (createMcp2Obf.getSrg() == null) {
+            createMcp2Obf.setSrg(createMcp2Srg.getSrg())
+            createMcp2Obf.setMappings(createMcp2Srg.getMappings())
+            createMcp2Obf.dependsOn(createMcp2Srg)
+        }
+
+        def createSrgCopyTask = { final Task tsrgTask ->
+            def srgCopyTask = this.tasks.register("${tsrgTask.name}Srg", tsrgTask.getClass())
+            tsrgTask.getDependsOn().forEach({ dep ->
+                srgCopyTask.get().dependsOn(dep)
+            })
+            // https://github.com/MinecraftForge/ForgeGradle/blob/6639464b29b0923187eee0a609e546ba9f1b998b/src/mcp/java/net/minecraftforge/gradle/mcp/task/GenerateSRG.java#L39
+            srgCopyTask.configure { task ->
+                task.setSrg(tsrgTask.getSrg())
+                task.setMappings(tsrgTask.getMappings())
+                // https://github.com/MinecraftForge/SrgUtils/blob/bb2ca35bb8d349a122ef512dedd24f54f7cd0bdf/src/main/java/net/minecraftforge/srgutils/IMappingFile.java#L44
+                task.setFormat('SRG')
+                task.setNotch(tsrgTask.getNotch())
+                task.setReverse(tsrgTask.getReverse())
+                task.setOutput(withExtension(tsrgTask.getOutput(), 'srg'))
+            }
+            return srgCopyTask
+        }
+        def createMcp2ObfSrgCopyTask = createSrgCopyTask(createMcp2Obf)
+        createMcp2Obf.dependsOn(createMcp2ObfSrgCopyTask)
+        def createMcp2SrgSrgCopyTask = createSrgCopyTask(createMcp2Srg)
+        createMcp2Srg.dependsOn(createMcp2SrgSrgCopyTask)
+
+        this.sourceSets.forEach({ set ->
+            def compileTask = this.project.tasks[set.compileJavaTaskName]
+            if (!(compileTask instanceof JavaCompile)) {
+                println("[Baritoe] Non-java compile task for ${set} of type ${compileTask}")
+                return
+            }
+            compileTask.dependsOn(createMcp2Obf)
+            compileTask.doFirst {
+                // inject legacy notch srg file
+                def createMcp2ObfSrgCopy = createMcp2ObfSrgCopyTask.get()
+                def reobfNotchSrgFileArgument = "-AreobfNotchSrgFile=${createMcp2ObfSrgCopy.output.canonicalPath}"
+                compileTask.options.compilerArgs += reobfNotchSrgFileArgument
+                println("[Baritoe] Injecting compiler argument: ${reobfNotchSrgFileArgument}")
+
+                // inject legacy notch srg out file
+                def outTSrgFileArgument = '-AoutTsrgFile='
+                def compilerArgsIterator = compileTask.options.compilerArgs.listIterator()
+                while (compilerArgsIterator.hasNext()) {
+                    def compilerArg = compilerArgsIterator.next()
+                    if (compilerArg.startsWith(outTSrgFileArgument)) {
+                        def argumentFileValue = new File(compilerArg.substring(outTSrgFileArgument.length(), compilerArg.length()))
+                        def outNotchSrgFile = withExtension(argumentFileValue, 'notch.srg')
+                        def outNotchSrgFileArgument = "-AoutNotchSrgFile=${outNotchSrgFile.canonicalPath}"
+                        println("[Baritoe] Injecting compiler argument: ${outNotchSrgFileArgument}")
+                        compilerArgsIterator.add(outNotchSrgFileArgument)
+                    }
+                }
+            }
+        })
+
+        // register reobf jars
+        def reobfExtension = this.project.getExtensions().getByName('reobf')
+        if (!reobfExtension) {
+            throw new IllegalStateException("Could not find \"reobf\" extension")
+        }
+        def reobfNotchJar = reobfExtension.create(jar.getName())
+        reobfNotchJar.dependsOn(createMcp2Obf)
+        reobfNotchJar.setMappings(createMcp2Obf.getOutput())
+
+        // even more horrible hack :) for outNotchSrgFile injection
+        reobfNotchJar.doFirst {
+            // https://github.com/MinecraftForge/ForgeGradle/blob/6639464b29b0923187eee0a609e546ba9f1b998b/src/userdev/java/net/minecraftforge/gradle/userdev/tasks/RenameJar.java#L96
+            def extraMappings = reobfNotchJar.getExtraMappings()
+            println("[Baritoe] Extra mappings: ${extraMappings}")
+            def copy = new ArrayList<>()
+            extraMappings.forEach { extraMapping ->
+                copy.add(withExtension(extraMapping, 'notch.srg'))
+            }
+            println("[Baritoe] New extra mappings: ${copy}")
+            reobfNotchJar.setExtraMappings(copy)
+        }
+    }
+}
+
+// TODO: In-complete fg 5.0 port. Currently doesn't handle mixin notch srg mapping hack.
+//ext.doHackyStuff = { final Class<?> clazz ->
+//    afterEvaluate {
+//        def createMcp2Srg = this.tasks.getByName('createMcpToSrg')
+//        def createMcpToObf = this.tasks.register('createMcpToObf', clazz)
+//        createMcpToObf.configure { task ->
+//            task.setNotch(true)
+//            task.setReverse(true)
+//            task.getSrg().set(createMcp2Srg.getSrg().get())
+//            task.getMappings().set(createMcp2Srg.getMappings().get())
+//            task.dependsOn(createMcp2Srg)
+//        }
+//        reobf {
+//            jar {
+//                dependsOn(createMcpToObf)
+//                getMappings().set(createMcpToObf.get().getOutput().get())
+//            }
+//        }
+//        this.sourceSets.forEach({ set ->
+//            def compileTask = this.project.tasks[set.compileJavaTaskName]
+//            if (!(compileTask instanceof JavaCompile)) {
+//                println("[Baritoe] Non-java compile task for ${set} of type ${compileTask}")
+//                return
+//            }
+//            compileTask.dependsOn(createMcpToObf)
+//            compileTask.doFirst {
+//                def reobfTSrgFile = '-AreobfTsrgFile='
+//                def compilerArgsIterator = compileTask.options.compilerArgs.listIterator()
+//                while (compilerArgsIterator.hasNext()) {
+//                    def compilerArg = compilerArgsIterator.next()
+//                    if (compilerArg.startsWith(reobfTSrgFile)) {
+//                        compilerArgsIterator.remove()
+//                        def toInject = "-AreobfTsrgFile=${createMcpToObf.get().output.get().asFile.canonicalPath}"
+//                        compilerArgsIterator.add(toInject)
+//                        println("[Baritoe] Injecting compiler argument: ${toInject}")
+//                    }
+//                }
+//                println("[Baritoe] Compiler arguments: ${compileTask.options.compilerArgs}")
+//            }
+//        })
+//    }
+//}
--- a/jitpack.yml
+++ b/jitpack.yml
@@ -1,4 +0,0 @@
-before_install:
-  - curl -s "https://get.sdkman.io" | bash
-  - sdk install java 17.0.5-tem
-  - sdk use java 17.0.5-tem
--- a/neoforge/build.gradle
+++ b/neoforge/build.gradle
@@ -1,130 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-import baritone.gradle.task.CreateDistTask
-import baritone.gradle.task.ProguardTask
-
-plugins {
-    id "com.github.johnrengelman.shadow" version "8.0.0"
-}
-
-archivesBaseName = archivesBaseName + "-neoforge"
-
-unimined.minecraft {
-
-    neoForged {
-        loader project.neoforge_version
-        mixinConfig ["mixins.baritone.json"]
-    }
-
-    minecraftRemapper.config {
-        // neoforge adds 1 conflict, where 2 interfaces have a method with the same name on yarn/mojmap,
-        // but the method has different names in the intermediary mappings.
-        // this is a conflict because they have a class that extends both interfaces.
-        // this shouldn't be a problem as long as named mappings don't make the name of those 2 methods different.
-        ignoreConflicts(true)
-    }
-
-}
-
-//loom {
-//    forge {
-//        mixinConfig 'mixins.baritone.json'
-//    }
-//}
-
-configurations {
-    common
-    shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
-    compileClasspath.extendsFrom common
-    runtimeClasspath.extendsFrom common
-}
-
-dependencies {
-    // because of multiple sourcesets `common project(":")` doesn't work
-    for (sourceSet in rootProject.sourceSets) {
-        if (sourceSet == rootProject.sourceSets.test) continue
-        if (sourceSet == rootProject.sourceSets.schematica_api) continue
-        common sourceSet.output
-        shadowCommon sourceSet.output
-    }
-    shadowCommon "dev.babbaj:nether-pathfinder:${project.nether_pathfinder_version}"
-}
-
-processResources {
-    inputs.property "version", project.version
-
-    filesMatching("META-INF/neoforge.mods.toml") {
-        expand "version": project.version
-    }
-}
-
-shadowJar {
-    configurations = [project.configurations.shadowCommon]
-    archiveClassifier.set "dev-shadow"
-}
-
-remapJar {
-    inputFile.set shadowJar.archiveFile
-    dependsOn shadowJar
-    archiveClassifier.set null
-}
-
-jar {
-    archiveClassifier.set "dev"
-
-    manifest {
-        attributes(
-                'MixinConfigs': 'mixins.baritone.json',
-                "MixinConnector": "baritone.launch.BaritoneMixinConnector",
-
-                'Implementation-Title': 'Baritone',
-                'Implementation-Version': version,
-        )
-    }
-}
-
-components.java {
-    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-        skip()
-    }
-}
-
-task proguard(type: ProguardTask) {
-    proguardVersion "7.4.2"
-    compType "neoforge"
-}
-
-task createDist(type: CreateDistTask, dependsOn: proguard) {
-    compType "neoforge"
-}
-
-build.finalizedBy(createDist)
-
-publishing {
-    publications {
-        mavenFabric(MavenPublication) {
-            artifactId = rootProject.archives_base_name + "-" + project.name
-            from components.java
-        }
-    }
-
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-    repositories {
-        // Add repositories to publish to here.
-    }
-}
--- a/neoforge/gradle.properties
+++ b/neoforge/gradle.properties
@@ -1,18 +0,0 @@
-#
-# This file is part of Baritone.
-#
-# Baritone is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Baritone is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
-#
-
-loom.platform=forge
--- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml
+++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -1,40 +0,0 @@
-# This is an example neoforge.mods.toml file. It contains the data relating to the loading mods.
-# There are several mandatory fields (#mandatory), and many more that are optional (#optional).
-# The overall format is standard TOML format, v0.5.0.
-# Note that there are a couple of TOML lists in this file.
-# Find more information on toml format here:  https://github.com/toml-lang/toml
-# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
-modLoader="javafml" #mandatory
-# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
-loaderVersion="[1,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
-license="https://raw.githubusercontent.com/cabaletta/baritone/1.16.2/LICENSE"
-# A URL to refer people to when problems occur with this mod
-issueTrackerURL="https://github.com/cabaletta/baritone/issues" #optional
-# A list of mods - how many allowed here is determined by the individual mod loader
-[[mods]] #mandatory
-# The modid of the mod
-modId="baritoe" #mandatory
-# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it
-version="${version}" #mandatory
- # A display name for the mod
-displayName="Baritone" #mandatory
-# A URL for the "homepage" for this mod, displayed in the mod UI
-displayURL="https://github.com/cabaletta/baritone" #optional
-# A file name (in the root of the mod JAR) containing a logo for display
-#logoFile="examplemod.png" #optional
-# A text field displayed in the mod UI
-credits="Hat Gamers" #optional
-# A text field displayed in the mod UI
-authors="leijurv, Brady" #optional
-# The description text for the mod (multi line!) (#mandatory)
-description='''
-A Minecraft pathfinder bot.
-'''
-
-[[dependencies.baritoe]]
-modId="minecraft"
-type="required"
-# This version range declares a minimum of the current minecraft version up to but not including the next major version
-versionRange="[1.21]"
-ordering="NONE"
-side="BOTH"
--- a/neoforge/src/main/resources/pack.mcmeta
+++ b/neoforge/src/main/resources/pack.mcmeta
@@ -1,6 +0,0 @@
-{
-    "pack": {
-        "description": "null",
-        "pack_format": 8
-    }
-}
--- a/scripts/proguard.pro
+++ b/scripts/proguard.pro
@@ -15,14 +15,7 @@

 # lwjgl is weird
 -dontwarn org.lwjgl.**
-# also lwjgl lol
-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

 # service provider needs these class names
@@ -54,6 +47,56 @@
 -dontwarn baritone.utils.schematic.schematica.**
 -dontwarn baritone.utils.schematic.litematica.**

+# copy all necessary libraries into tempLibraries to build
+
+# The correct jar will be copied from the forgegradle cache based on the mapping type being compiled with
+-libraryjars 'tempLibraries/minecraft.jar'
+
+-libraryjars 'tempLibraries/SimpleTweaker-1.2.jar'
+
+-libraryjars 'tempLibraries/authlib-1.5.25.jar'
+-libraryjars 'tempLibraries/codecjorbis-20101023.jar'
+-libraryjars 'tempLibraries/codecwav-20101023.jar'
+-libraryjars 'tempLibraries/commons-codec-1.10.jar'
+-libraryjars 'tempLibraries/commons-compress-1.8.1.jar'
+-libraryjars 'tempLibraries/commons-io-2.5.jar'
+-libraryjars 'tempLibraries/commons-lang3-3.5.jar'
+-libraryjars 'tempLibraries/commons-logging-1.1.3.jar'
+-libraryjars 'tempLibraries/fastutil-7.1.0.jar'
+-libraryjars 'tempLibraries/gson-2.8.0.jar'
+-libraryjars 'tempLibraries/guava-21.0.jar'
+-libraryjars 'tempLibraries/httpclient-4.3.3.jar'
+-libraryjars 'tempLibraries/httpcore-4.3.2.jar'
+-libraryjars 'tempLibraries/icu4j-core-mojang-51.2.jar'
+-libraryjars 'tempLibraries/jinput-2.0.5.jar'
+-libraryjars 'tempLibraries/jna-4.4.0.jar'
+-libraryjars 'tempLibraries/jopt-simple-5.0.3.jar'
+-libraryjars 'tempLibraries/jsr305-3.0.1.jar'
+-libraryjars 'tempLibraries/jutils-1.0.0.jar'
+-libraryjars 'tempLibraries/libraryjavasound-20101123.jar'
+-libraryjars 'tempLibraries/librarylwjglopenal-20100824.jar'
+-libraryjars 'tempLibraries/log4j-api-2.8.1.jar'
+-libraryjars 'tempLibraries/log4j-core-2.8.1.jar'
+
+# startsWith is used to check the library, and mac/linux differ in which version they use
+# this is FINE
+-libraryjars 'tempLibraries/lwjgl-.jar'
+-libraryjars 'tempLibraries/lwjgl_util-.jar'
+
+-libraryjars 'tempLibraries/netty-all-4.1.9.Final.jar'
+-libraryjars 'tempLibraries/oshi-core-1.1.jar'
+-libraryjars 'tempLibraries/patchy-1.3.9.jar'
+-libraryjars 'tempLibraries/platform-3.4.0.jar'
+-libraryjars 'tempLibraries/realms-1.10.22.jar'
+-libraryjars 'tempLibraries/soundsystem-20120107.jar'
+-libraryjars 'tempLibraries/text2speech-1.10.3.jar'
+
+-libraryjars 'tempLibraries/mixin-0.7.11-SNAPSHOT.jar'
+-libraryjars 'tempLibraries/launchwrapper-1.12.jar'
+
+-libraryjars 'tempLibraries/nether-pathfinder-.jar'
+
+
 # Keep - Applications. Keep all application classes, along with their 'main'
 # methods.
 -keepclasseswithmembers public class * {
@@ -341,4 +384,6 @@
    public int length();
    public java.lang.String substring(int);
    public java.lang.String substring(int,int);
-}
+}
+
+-printmapping mapping.txt
--- a/settings.gradle
+++ b/settings.gradle
@@ -15,33 +15,5 @@
 * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
 */

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

-include("tweaker")
-for (platform in available_loaders.split(",")) {
-       include(platform)
-}
--- a/src/api/java/baritone/api/BaritoneAPI.java
+++ b/src/api/java/baritone/api/BaritoneAPI.java
@@ -19,6 +19,9 @@ package baritone.api;

 import baritone.api.utils.SettingsUtil;

+import java.util.Iterator;
+import java.util.ServiceLoader;
+
 /**
 * Exposes the {@link IBaritoneProvider} instance and the {@link Settings} instance for API usage.
 *
@@ -34,11 +37,9 @@ public final class BaritoneAPI {
        settings = new Settings();
        SettingsUtil.readAndApply(settings, SettingsUtil.SETTINGS_DEFAULT_NAME);

-        try {
-            provider = (IBaritoneProvider) Class.forName("baritone.BaritoneProvider").newInstance();
-        } catch (ReflectiveOperationException ex) {
-            throw new RuntimeException(ex);
-        }
+        ServiceLoader<IBaritoneProvider> baritoneLoader = ServiceLoader.load(IBaritoneProvider.class);
+        Iterator<IBaritoneProvider> instances = baritoneLoader.iterator();
+        provider = instances.next();
    }

    public static IBaritoneProvider getProvider() {
--- a/src/api/java/baritone/api/IBaritone.java
+++ b/src/api/java/baritone/api/IBaritone.java
@@ -17,6 +17,7 @@

 package baritone.api;

+import baritone.api.behavior.IElytraBehavior;
 import baritone.api.behavior.ILookBehavior;
 import baritone.api.behavior.IPathingBehavior;
 import baritone.api.cache.IWorldProvider;
@@ -40,6 +41,12 @@ public interface IBaritone {
     */
    IPathingBehavior getPathingBehavior();

+    /**
+     * @return The {@link IElytraBehavior} instance
+     * @see IElytraBehavior
+     */
+    IElytraBehavior getElytraBehavior();
+
    /**
     * @return The {@link ILookBehavior} instance
     * @see ILookBehavior
@@ -88,12 +95,6 @@ public interface IBaritone {
     */
    IGetToBlockProcess getGetToBlockProcess();

-    /**
-     * @return The {@link IElytraProcess} instance
-     * @see IElytraProcess
-     */
-    IElytraProcess getElytraProcess();
-
    /**
     * @return The {@link IWorldProvider} instance
     * @see IWorldProvider
--- a/src/api/java/baritone/api/IBaritoneProvider.java
+++ b/src/api/java/baritone/api/IBaritoneProvider.java
@@ -22,8 +22,8 @@ import baritone.api.command.ICommand;
 import baritone.api.command.ICommandSystem;
 import baritone.api.schematic.ISchematicSystem;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.ClientPacketListener;
-import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.network.NetHandlerPlayClient;

 import java.util.List;
 import java.util.Objects;
@@ -49,17 +49,17 @@ public interface IBaritoneProvider {
     * returned by {@link #getPrimaryBaritone()}.
     *
     * @return All active {@link IBaritone} instances.
-     * @see #getBaritoneForPlayer(LocalPlayer)
+     * @see #getBaritoneForPlayer(EntityPlayerSP)
     */
    List<IBaritone> getAllBaritones();

    /**
-     * Provides the {@link IBaritone} instance for a given {@link LocalPlayer}.
+     * Provides the {@link IBaritone} instance for a given {@link EntityPlayerSP}.
     *
     * @param player The player
     * @return The {@link IBaritone} instance.
     */
-    default IBaritone getBaritoneForPlayer(LocalPlayer player) {
+    default IBaritone getBaritoneForPlayer(EntityPlayerSP player) {
        for (IBaritone baritone : this.getAllBaritones()) {
            if (Objects.equals(player, baritone.getPlayerContext().player())) {
                return baritone;
@@ -89,9 +89,9 @@ public interface IBaritoneProvider {
     * @param connection The connection
     * @return The {@link IBaritone} instance.
     */
-    default IBaritone getBaritoneForConnection(ClientPacketListener connection) {
+    default IBaritone getBaritoneForConnection(NetHandlerPlayClient connection) {
        for (IBaritone baritone : this.getAllBaritones()) {
-            final LocalPlayer player = baritone.getPlayerContext().player();
+            final EntityPlayerSP player = baritone.getPlayerContext().player();
            if (player != null && player.connection == connection) {
                return baritone;
            }
--- a/src/api/java/baritone/api/Settings.java
+++ b/src/api/java/baritone/api/Settings.java
@@ -17,20 +17,16 @@

 package baritone.api;

-import baritone.api.utils.Helper;
 import baritone.api.utils.NotificationHelper;
 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.TypeUtils;
 import baritone.api.utils.gui.BaritoneToast;
-import net.minecraft.client.GuiMessageTag;
+import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
-import net.minecraft.core.Vec3i;
-import net.minecraft.network.chat.Component;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.util.math.Vec3i;
+import net.minecraft.util.text.ITextComponent;

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

    /**
     * Allow Baritone to break blocks
@@ -208,10 +203,10 @@ public final class Settings {
     * Blocks that Baritone is allowed to place (as throwaway, for sneak bridging, pillaring, etc.)
     */
    public final Setting<List<Item>> acceptableThrowawayItems = new Setting<>(new ArrayList<>(Arrays.asList(
-            Blocks.DIRT.asItem(),
-            Blocks.COBBLESTONE.asItem(),
-            Blocks.NETHERRACK.asItem(),
-            Blocks.STONE.asItem()
+            Item.getItemFromBlock(Blocks.DIRT),
+            Item.getItemFromBlock(Blocks.COBBLESTONE),
+            Item.getItemFromBlock(Blocks.NETHERRACK),
+            Item.getItemFromBlock(Blocks.STONE)
    )));

    /**
@@ -234,8 +229,11 @@ public final class Settings {
    public final Setting<List<Block>> blocksToAvoidBreaking = new Setting<>(new ArrayList<>(Arrays.asList( // TODO can this be a HashSet or ImmutableSet?
            Blocks.CRAFTING_TABLE,
            Blocks.FURNACE,
+            Blocks.LIT_FURNACE,
            Blocks.CHEST,
-            Blocks.TRAPPED_CHEST
+            Blocks.TRAPPED_CHEST,
+            Blocks.STANDING_SIGN,
+            Blocks.WALL_SIGN
    )));

    /**
@@ -375,22 +373,11 @@ public final class Settings {
     */
    public final Setting<Integer> rightClickSpeed = new Setting<>(4);

-    /**
-     * How many degrees to randomize the yaw every tick. Set to 0 to disable
-     */
-    public final Setting<Double> randomLooking113 = new Setting<>(2d);
-
    /**
     * Block reach distance
     */
    public final Setting<Float> blockReachDistance = new Setting<>(4.5f);

-    /**
-     * How many ticks between breaking a block and starting to break the next block. Default in game is 6 ticks.
-     * Values under 1 will be clamped. The delay only applies to non-instant (1-tick) breaks.
-     */
-    public final Setting<Integer> blockBreakSpeed = new Setting<>(6);
-
    /**
     * How many degrees to randomize the pitch and yaw every tick. Set to 0 to disable
     */
@@ -750,25 +737,16 @@ public final class Settings {
    public final Setting<Boolean> blockFreeLook = new Setting<>(false);

    /**
-     * Automatically elytra fly without having to force the client-sided rotations.
+     * Automatically elytra fly without having to force the client-sided rotations. Requires {@link #freeLook}.
     */
-    public final Setting<Boolean> elytraFreeLook = new Setting<>(true);
+    public final Setting<Boolean> elytraFreeLook = new Setting<>(false);

    /**
-     * Forces the client-sided yaw rotation to an average of the last {@link #smoothLookTicks} of server-sided rotations.
+     * Forces the client-sided rotations to an average of the last 10 ticks of server-sided rotations.
+     * Requires {@link #freeLook}.
     */
    public final Setting<Boolean> smoothLook = new Setting<>(false);

-    /**
-     * Same as {@link #smoothLook} but for elytra flying.
-     */
-    public final Setting<Boolean> elytraSmoothLook = new Setting<>(false);
-
-    /**
-     * The number of ticks to average across for {@link #smoothLook};
-     */
-    public final Setting<Integer> smoothLookTicks = new Setting<>(5);
-
    /**
     * When true, the player will remain with its existing look direction as often as possible.
     * Although, in some cases this can get it stuck, hence this setting to disable that behavior.
@@ -837,11 +815,6 @@ public final class Settings {
     */
    public final Setting<Boolean> shortBaritonePrefix = new Setting<>(false);

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

-    /**
-     * Mine will not scan for or remember more than this many target locations.
-     * Note that the number of locations retrieved from cache is additionaly
-     * limited by {@link #maxCachedWorldScanCount}.
-     */
-    public final Setting<Integer> mineMaxOreLocationsCount = new Setting<>(64);
-
    /**
     * Sets the minimum y level whilst mining - set to 0 to turn off.
-     * if world has negative y values, subtract the min world height to get the value to put here
     */
    public final Setting<Integer> minYLevelWhileMining = new Setting<>(0);

    /**
     * Sets the maximum y level to mine ores at.
     */
-    public final Setting<Integer> maxYLevelWhileMining = new Setting<>(2031);
+    public final Setting<Integer> maxYLevelWhileMining = new Setting<>(255); // 1.17+ defaults to maximum possible world height

    /**
     * This will only allow baritone to mine exposed ores, can be used to stop ore obfuscators on servers that use them.
@@ -973,11 +938,6 @@ public final class Settings {
     */
    public final Setting<Boolean> replantNetherWart = new Setting<>(false);

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

-    /**
-     * Multiply the cost of placing a block that's incorrect in the builder's schematic by this coefficient
-     */
-    public final Setting<Double> placeIncorrectBlockPenaltyMultiplier = new Setting<>(2d);
-
    /**
     * When this setting is true, build a schematic with the highest X coordinate being the origin, instead of the lowest
     */
@@ -1155,7 +1110,7 @@ public final class Settings {
    /**
     * What Y level to go to for legit strip mining
     */
-    public final Setting<Integer> legitMineYLevel = new Setting<>(-59);
+    public final Setting<Integer> legitMineYLevel = new Setting<>(11);

    /**
     * Magically see ores that are separated diagonally from existing ores. Basically like mining around the ores that it finds
@@ -1234,14 +1189,7 @@ public final class Settings {
     * {@link Setting#value};
     */
    @JavaOnly
-    public final Setting<Consumer<Component>> logger = new Setting<>((msg) -> {
-        try {
-            final GuiMessageTag tag = useMessageTag.value ? Helper.MESSAGE_TAG : null;
-            Minecraft.getInstance().gui.getChat().addMessage(msg, null, tag);
-        } catch (Throwable t) {
-            LOGGER.warn("Failed to log message to chat: " + msg.getString(), t);
-        }
-    });
+    public final Setting<Consumer<ITextComponent>> logger = new Setting<>(msg -> Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(msg));

    /**
     * The function that is called when Baritone will send a desktop notification. This function can be added to
@@ -1257,12 +1205,7 @@ public final class Settings {
     * {@link Setting#value};
     */
    @JavaOnly
-    public final Setting<BiConsumer<Component, Component>> toaster = new Setting<>(BaritoneToast::addOrUpdate);
-
-    /**
-     * Print out ALL command exceptions as a stack trace to stdout, even simple syntax errors
-     */
-    public final Setting<Boolean> verboseCommandExceptions = new Setting<>(false);
+    public final Setting<BiConsumer<ITextComponent, ITextComponent>> toaster = new Setting<>(BaritoneToast::addOrUpdate);

    /**
     * The size of the box that is rendered when the current goal is a GoalYLevel
@@ -1404,7 +1347,7 @@ public final class Settings {
    /**
     * The minimum speed that the player can drop to (in blocks/tick) before a firework is automatically deployed.
     */
-    public final Setting<Double> elytraFireworkSpeed = new Setting<>(1.2);
+    public final Setting<Double> elytraFireworkSpeed = new Setting<>(0.6);

    /**
     * The delay after the player's position is set-back by the server that a firework may be automatically deployed.
@@ -1423,23 +1366,23 @@ public final class Settings {
    /**
     * If enabled, avoids using fireworks when descending along the flight path.
     */
-    public final Setting<Boolean> elytraConserveFireworks = new Setting<>(false);
+    public final Setting<Boolean> conserveFireworks = new Setting<>(true);

    /**
     * Renders the raytraces that are performed by the elytra fly calculation.
     */
-    public final Setting<Boolean> elytraRenderRaytraces = new Setting<>(false);
+    public final Setting<Boolean> renderRaytraces = new Setting<>(false);

    /**
     * Renders the raytraces that are used in the hitbox part of the elytra fly calculation.
-     * Requires {@link #elytraRenderRaytraces}.
+     * Requires {@link #renderRaytraces}.
     */
-    public final Setting<Boolean> elytraRenderHitboxRaytraces = new Setting<>(false);
+    public final Setting<Boolean> renderHitboxRaytraces = new Setting<>(false);

    /**
     * Renders the best elytra flight path that was simulated each tick.
     */
-    public final Setting<Boolean> elytraRenderSimulation = new Setting<>(true);
+    public final Setting<Boolean> renderElytraSimulation = new Setting<>(false);

    /**
     * Automatically path to and jump off of ledges to initiate elytra flight when grounded.
@@ -1452,12 +1395,6 @@ public final class Settings {
     */
    public final Setting<Long> elytraNetherSeed = new Setting<>(146008555100680L);

-    /**
-     * Whether nether-pathfinder should generate terrain based on {@link #elytraNetherSeed}.
-     * If false all chunks that haven't been loaded are assumed to be air.
-     */
-    public final Setting<Boolean> elytraPredictTerrain = new Setting<>(false);
-
    /**
     * Automatically swap the current elytra with a new one when the durability gets too low
     */
@@ -1468,16 +1405,6 @@ public final class Settings {
     */
    public final Setting<Integer> elytraMinimumDurability = new Setting<>(5);

-    /**
-     * The minimum fireworks before landing early for safety
-     */
-    public final Setting<Integer> elytraMinFireworksBeforeLanding = new Setting<>(5);
-
-    /**
-     * Automatically land when elytra is almost out of durability, or almost out of fireworks
-     */
-    public final Setting<Boolean> elytraAllowEmergencyLand = new Setting<>(true);
-
    /**
     * Time between culling far away chunks from the nether pathfinder chunk cache
     */
@@ -1488,21 +1415,6 @@ public final class Settings {
     */
    public final Setting<Integer> elytraCacheCullDistance = new Setting<>(5000);

-    /**
-     * Should elytra consider nether brick a valid landing block
-     */
-    public final Setting<Boolean> elytraAllowLandOnNetherFortress = new Setting<>(false);
-
-    /**
-     * Has the user read and understood the elytra terms and conditions
-     */
-    public final Setting<Boolean> elytraTermsAccepted = new Setting<>(false);
-
-    /**
-     * Verbose chat logging in elytra mode
-     */
-    public final Setting<Boolean> elytraChatSpam = new Setting<>(false);
-
    /**
     * A map of lowercase setting field names to their respective setting
     */
--- a/src/api/java/baritone/api/behavior/IBehavior.java
+++ b/src/api/java/baritone/api/behavior/IBehavior.java
@@ -27,4 +27,10 @@ import baritone.api.event.listener.IGameEventListener;
 * @see IGameEventListener
 * @since 9/23/2018
 */
-public interface IBehavior extends AbstractGameEventListener {}
+public interface IBehavior extends AbstractGameEventListener {
+
+    /**
+     * Called after Baritone's initialization is complete
+     */
+    default void onLoad() {}
+}
--- a/src/api/java/baritone/api/behavior/IElytraBehavior.java
+++ b/src/api/java/baritone/api/behavior/IElytraBehavior.java
@@ -15,28 +15,32 @@
 * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
 */

-package baritone.api.process;
+package baritone.api.behavior;

-import baritone.api.pathing.goals.Goal;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;

-public interface IElytraProcess extends IBaritoneProcess {
+import java.util.concurrent.CompletableFuture;
+
+public interface IElytraBehavior extends IBehavior {
+
+    /**
+     * Marks the nether pathfinder context to be reset when it is safe to do so. Because this operation is not
+     * immediate, a {@link CompletableFuture} is returned that will complete after the context has been reset.
+     *
+     * @return A {@link CompletableFuture} that is completed when the context is reset
+     */
+    CompletableFuture<Void> resetContext();

    void repackChunks();

-    /**
-     * @return Where it is currently flying to, null if not active
-     */
-    BlockPos currentDestination();
-
    void pathTo(BlockPos destination);

-    void pathTo(Goal destination);
+    void cancel();

    /**
-     * Resets the state of the process but will maintain the same destination and will try to keep flying
+     * Returns {@code true} if the current {@link IElytraBehavior} is actively pathing.
     */
-    void resetState();
+    boolean isActive();

    /**
     * @return {@code true} if the native library loaded and elytra is actually usable
--- a/src/api/java/baritone/api/cache/IBlockTypeAccess.java
+++ b/src/api/java/baritone/api/cache/IBlockTypeAccess.java
@@ -17,8 +17,8 @@

 package baritone.api.cache;

-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.math.BlockPos;

 /**
 * @author Brady
@@ -26,9 +26,9 @@ import net.minecraft.world.level.block.state.BlockState;
 */
 public interface IBlockTypeAccess {

-    BlockState getBlock(int x, int y, int z);
+    IBlockState getBlock(int x, int y, int z);

-    default BlockState getBlock(BlockPos pos) {
+    default IBlockState getBlock(BlockPos pos) {
        return getBlock(pos.getX(), pos.getY(), pos.getZ());
    }
 }
--- a/src/api/java/baritone/api/cache/ICachedWorld.java
+++ b/src/api/java/baritone/api/cache/ICachedWorld.java
@@ -17,9 +17,10 @@

 package baritone.api.cache;

+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.chunk.Chunk;
+
 import java.util.ArrayList;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.chunk.LevelChunk;

 /**
 * @author Brady
@@ -43,7 +44,7 @@ public interface ICachedWorld {
     *
     * @param chunk The chunk to pack and store
     */
-    void queueForPacking(LevelChunk chunk);
+    void queueForPacking(Chunk chunk);

    /**
     * Returns whether or not the block at the specified X and Z coordinates
--- a/src/api/java/baritone/api/cache/IWorldScanner.java
+++ b/src/api/java/baritone/api/cache/IWorldScanner.java
@@ -19,10 +19,11 @@ package baritone.api.cache;

 import baritone.api.utils.BlockOptionalMetaLookup;
 import baritone.api.utils.IPlayerContext;
+import net.minecraft.block.Block;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.ChunkPos;
+
 import java.util.List;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.block.Block;

 /**
 * @author Brady
--- a/src/api/java/baritone/api/command/argument/IArgConsumer.java
+++ b/src/api/java/baritone/api/command/argument/IArgConsumer.java
@@ -27,10 +27,11 @@ import baritone.api.command.exception.CommandInvalidTypeException;
 import baritone.api.command.exception.CommandNotEnoughArgumentsException;
 import baritone.api.command.exception.CommandTooManyArgumentsException;
 import baritone.api.utils.Helper;
+import net.minecraft.util.EnumFacing;
+
 import java.util.Deque;
 import java.util.LinkedList;
 import java.util.stream.Stream;
-import net.minecraft.core.Direction;

 /**
 * The {@link IArgConsumer} is how {@link ICommand}s read the arguments passed to them. This class has many benefits:
@@ -403,8 +404,8 @@ public interface IArgConsumer {
    /**
     * Gets an enum value from the enum class with the same name as the next argument's value
     * <p>
-     * For example if you getEnum as an {@link Direction}, and the next argument's value is "up", this will return
-     * {@link Direction#UP}
+     * For example if you getEnum as an {@link EnumFacing}, and the next argument's value is "up", this will return
+     * {@link EnumFacing#UP}
     *
     * @param enumClass The enum class to search
     * @return An enum constant of that class with the same name as the next argument's value
@@ -418,8 +419,8 @@ public interface IArgConsumer {
    /**
     * Gets an enum value from the enum class with the same name as the next argument's value
     * <p>
-     * For example if you getEnum as an {@link Direction}, and the next argument's value is "up", this will return
-     * {@link Direction#UP}
+     * For example if you getEnum as an {@link EnumFacing}, and the next argument's value is "up", this will return
+     * {@link EnumFacing#UP}
     *
     * @param enumClass The enum class to search
     * @param def       The default value
@@ -435,8 +436,8 @@ public interface IArgConsumer {
    /**
     * Gets an enum value from the enum class with the same name as the next argument's value
     * <p>
-     * For example if you getEnum as an {@link Direction}, and the next argument's value is "up", this will return
-     * {@link Direction#UP}
+     * For example if you getEnum as an {@link EnumFacing}, and the next argument's value is "up", this will return
+     * {@link EnumFacing#UP}
     *
     * @param enumClass The enum class to search
     * @return An enum constant of that class with the same name as the next argument's value, or {@code null} if it
--- a/src/api/java/baritone/api/command/argument/ICommandArgument.java
+++ b/src/api/java/baritone/api/command/argument/ICommandArgument.java
@@ -19,7 +19,7 @@ package baritone.api.command.argument;

 import baritone.api.command.argparser.IArgParser;
 import baritone.api.command.exception.CommandInvalidTypeException;
-import net.minecraft.core.Direction;
+import net.minecraft.util.EnumFacing;

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

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

 import java.util.regex.Pattern;
 import java.util.stream.Stream;
@@ -36,9 +36,9 @@ public enum BlockById implements IDatatypeFor<Block> {

    @Override
    public Block get(IDatatypeContext ctx) throws CommandException {
-        ResourceLocation id = ResourceLocation.parse(ctx.getConsumer().getString());
+        ResourceLocation id = new ResourceLocation(ctx.getConsumer().getString());
        Block block;
-        if ((block = BuiltInRegistries.BLOCK.getOptional(id).orElse(null)) == null) {
+        if ((block = Block.REGISTRY.getObject(id)) == Blocks.AIR) {
            throw new IllegalArgumentException("no block found by that id");
        }
        return block;
@@ -54,7 +54,7 @@ public enum BlockById implements IDatatypeFor<Block> {

        return new TabCompleteHelper()
                .append(
-                        BuiltInRegistries.BLOCK.keySet()
+                        Block.REGISTRY.getKeys()
                                .stream()
                                .map(Object::toString)
                )
--- a/src/api/java/baritone/api/command/datatypes/EntityClassById.java
+++ b/src/api/java/baritone/api/command/datatypes/EntityClassById.java
@@ -19,20 +19,32 @@ package baritone.api.command.datatypes;

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

 import java.util.stream.Stream;

-public enum EntityClassById implements IDatatypeFor<EntityType> {
+public enum EntityClassById implements IDatatypeFor<Class<? extends Entity>> {
    INSTANCE;

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

 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
-import net.minecraft.core.Direction;
+import net.minecraft.util.EnumFacing;

 import java.util.Locale;
 import java.util.stream.Stream;

-public enum ForAxis implements IDatatypeFor<Direction.Axis> {
+public enum ForAxis implements IDatatypeFor<EnumFacing.Axis> {
    INSTANCE;

    @Override
-    public Direction.Axis get(IDatatypeContext ctx) throws CommandException {
-        return Direction.Axis.valueOf(ctx.getConsumer().getString().toUpperCase(Locale.US));
+    public EnumFacing.Axis get(IDatatypeContext ctx) throws CommandException {
+        return EnumFacing.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))
+                .append(Stream.of(EnumFacing.Axis.values())
+                        .map(EnumFacing.Axis::getName).map(String::toLowerCase))
                .filterPrefix(ctx.getConsumer().getString())
                .stream();
    }
--- a/src/api/java/baritone/api/command/datatypes/ForBlockOptionalMeta.java
+++ b/src/api/java/baritone/api/command/datatypes/ForBlockOptionalMeta.java
@@ -20,10 +20,9 @@ package baritone.api.command.datatypes;
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
 import baritone.api.utils.BlockOptionalMeta;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.properties.Property;
+import net.minecraft.block.Block;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.util.ResourceLocation;

 import java.util.Set;
 import java.util.regex.Pattern;
@@ -77,7 +76,7 @@ public enum ForBlockOptionalMeta implements IDatatypeFor<BlockOptionalMeta> {
            properties = parts[1];
        }

-        Block block = BuiltInRegistries.BLOCK.getOptional(ResourceLocation.parse(blockId)).orElse(null);
+        Block block = Block.REGISTRY.getObject(new ResourceLocation(blockId));
        if (block == null) {
            // This block doesn't exist so there's no properties to complete.
            return Stream.empty();
@@ -99,10 +98,10 @@ public enum ForBlockOptionalMeta implements IDatatypeFor<BlockOptionalMeta> {
            String prefix = arg.substring(0, arg.length() - lastProperty.length());
            return new TabCompleteHelper()
                    .append(
-                            block.getStateDefinition()
+                            block.getBlockState()
                                    .getProperties()
                                    .stream()
-                                    .map(Property::getName)
+                                    .map(IProperty::getName)
                    )
                    .filter(prop -> !usedProps.contains(prop))
                    .filterPrefix(lastProperty)
@@ -121,7 +120,7 @@ public enum ForBlockOptionalMeta implements IDatatypeFor<BlockOptionalMeta> {
        // We are completing the value of a property
        String prefix = arg.substring(0, arg.length() - lastValue.length());

-        Property<?> property = block.getStateDefinition().getProperty(lastName);
+        IProperty<?> property = block.getBlockState().getProperty(lastName);
        if (property == null) {
            // The property does not exist so there's no values to complete
            return Stream.empty();
@@ -148,7 +147,7 @@ public enum ForBlockOptionalMeta implements IDatatypeFor<BlockOptionalMeta> {
    }

    // 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);
+    private static <T extends Comparable<T>> Stream<String> getValues(IProperty<T> property) {
+        return property.getAllowedValues().stream().map(property::getName);
    }
 }
--- a/src/api/java/baritone/api/command/datatypes/ForEnumFacing.java
+++ b/src/api/java/baritone/api/command/datatypes/ForEnumFacing.java
@@ -19,23 +19,24 @@ package baritone.api.command.datatypes;

 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
+import net.minecraft.util.EnumFacing;
+
 import java.util.Locale;
 import java.util.stream.Stream;
-import net.minecraft.core.Direction;

-public enum ForDirection implements IDatatypeFor<Direction> {
+public enum ForEnumFacing implements IDatatypeFor<EnumFacing> {
    INSTANCE;

    @Override
-    public Direction get(IDatatypeContext ctx) throws CommandException {
-        return Direction.valueOf(ctx.getConsumer().getString().toUpperCase(Locale.US));
+    public EnumFacing get(IDatatypeContext ctx) throws CommandException {
+        return EnumFacing.valueOf(ctx.getConsumer().getString().toUpperCase(Locale.US));
    }

    @Override
    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
        return new TabCompleteHelper()
-                .append(Stream.of(Direction.values())
-                        .map(Direction::getName).map(String::toLowerCase))
+                .append(Stream.of(EnumFacing.values())
+                        .map(EnumFacing::getName).map(String::toLowerCase))
                .filterPrefix(ctx.getConsumer().getString())
                .stream();
    }
--- a/src/api/java/baritone/api/command/datatypes/NearbyPlayer.java
+++ b/src/api/java/baritone/api/command/datatypes/NearbyPlayer.java
@@ -20,36 +20,36 @@ package baritone.api.command.datatypes;
 import baritone.api.IBaritone;
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
+import net.minecraft.entity.player.EntityPlayer;
+
 import java.util.List;
 import java.util.stream.Stream;
-import net.minecraft.network.chat.Component;
-import net.minecraft.world.entity.player.Player;

 /**
 * An {@link IDatatype} used to resolve nearby players, those within
 * render distance of the target {@link IBaritone} instance.
 */
-public enum NearbyPlayer implements IDatatypeFor<Player> {
+public enum NearbyPlayer implements IDatatypeFor<EntityPlayer> {
    INSTANCE;

    @Override
-    public Player get(IDatatypeContext ctx) throws CommandException {
+    public EntityPlayer get(IDatatypeContext ctx) throws CommandException {
        final String username = ctx.getConsumer().getString();
        return getPlayers(ctx).stream()
-                .filter(s -> s.getName().getString().equalsIgnoreCase(username))
+                .filter(s -> s.getName().equalsIgnoreCase(username))
                .findFirst().orElse(null);
    }

    @Override
    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
        return new TabCompleteHelper()
-                .append(getPlayers(ctx).stream().map(Player::getName).map(Component::getString))
+                .append(getPlayers(ctx).stream().map(EntityPlayer::getName))
                .filterPrefix(ctx.getConsumer().getString())
                .sortAlphabetically()
                .stream();
    }

-    private static List<? extends Player> getPlayers(IDatatypeContext ctx) {
-        return ctx.getBaritone().getPlayerContext().world().players();
+    private static List<EntityPlayer> getPlayers(IDatatypeContext ctx) {
+        return ctx.getBaritone().getPlayerContext().world().playerEntities;
    }
 }
--- a/src/api/java/baritone/api/command/datatypes/RelativeFile.java
+++ b/src/api/java/baritone/api/command/datatypes/RelativeFile.java
@@ -32,6 +32,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;

@@ -99,7 +101,7 @@ public enum RelativeFile implements IDatatypePost<File, File> {
    }

    public static File gameDir(Minecraft mc) {
-        File gameDir = mc.gameDirectory.getAbsoluteFile();
+        File gameDir = mc.gameDir.getAbsoluteFile();
        if (gameDir.getName().equals(".")) {
            return gameDir.getParentFile();
        }
--- a/src/api/java/baritone/api/command/datatypes/RelativeGoalBlock.java
+++ b/src/api/java/baritone/api/command/datatypes/RelativeGoalBlock.java
@@ -21,8 +21,9 @@ import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.exception.CommandException;
 import baritone.api.pathing.goals.GoalBlock;
 import baritone.api.utils.BetterBlockPos;
+import net.minecraft.util.math.MathHelper;
+
 import java.util.stream.Stream;
-import net.minecraft.util.Mth;

 public enum RelativeGoalBlock implements IDatatypePost<GoalBlock, BetterBlockPos> {
    INSTANCE;
@@ -35,9 +36,9 @@ public enum RelativeGoalBlock implements IDatatypePost<GoalBlock, BetterBlockPos

        final IArgConsumer consumer = ctx.getConsumer();
        return new GoalBlock(
-                Mth.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.x)),
-                Mth.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.y)),
-                Mth.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.z))
+                MathHelper.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.x)),
+                MathHelper.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.y)),
+                MathHelper.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.z))
        );
    }

--- a/src/api/java/baritone/api/command/datatypes/RelativeGoalXZ.java
+++ b/src/api/java/baritone/api/command/datatypes/RelativeGoalXZ.java
@@ -21,8 +21,9 @@ import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.exception.CommandException;
 import baritone.api.pathing.goals.GoalXZ;
 import baritone.api.utils.BetterBlockPos;
+import net.minecraft.util.math.MathHelper;
+
 import java.util.stream.Stream;
-import net.minecraft.util.Mth;

 public enum RelativeGoalXZ implements IDatatypePost<GoalXZ, BetterBlockPos> {
    INSTANCE;
@@ -35,8 +36,8 @@ public enum RelativeGoalXZ implements IDatatypePost<GoalXZ, BetterBlockPos> {

        final IArgConsumer consumer = ctx.getConsumer();
        return new GoalXZ(
-                Mth.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.x)),
-                Mth.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.z))
+                MathHelper.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.x)),
+                MathHelper.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.z))
        );
    }

--- a/src/api/java/baritone/api/command/datatypes/RelativeGoalYLevel.java
+++ b/src/api/java/baritone/api/command/datatypes/RelativeGoalYLevel.java
@@ -21,8 +21,9 @@ import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.exception.CommandException;
 import baritone.api.pathing.goals.GoalYLevel;
 import baritone.api.utils.BetterBlockPos;
+import net.minecraft.util.math.MathHelper;
+
 import java.util.stream.Stream;
-import net.minecraft.util.Mth;

 public enum RelativeGoalYLevel implements IDatatypePost<GoalYLevel, BetterBlockPos> {
    INSTANCE;
@@ -34,7 +35,7 @@ public enum RelativeGoalYLevel implements IDatatypePost<GoalYLevel, BetterBlockP
        }

        return new GoalYLevel(
-                Mth.floor(ctx.getConsumer().getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.y))
+                MathHelper.floor(ctx.getConsumer().getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.y))
        );
    }

--- a/src/api/java/baritone/api/command/exception/ICommandException.java
+++ b/src/api/java/baritone/api/command/exception/ICommandException.java
@@ -19,8 +19,9 @@ package baritone.api.command.exception;

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

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

@@ -49,6 +50,6 @@ public interface ICommandException {
     * @param args    The arguments the command was called with.
     */
    default void handle(ICommand command, List<ICommandArgument> args) {
-        HELPER.logDirect(this.getMessage(), ChatFormatting.RED);
+        HELPER.logDirect(this.getMessage(), TextFormatting.RED);
    }
 }
--- a/src/api/java/baritone/api/command/helpers/Paginator.java
+++ b/src/api/java/baritone/api/command/helpers/Paginator.java
@@ -21,16 +21,15 @@ import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.exception.CommandInvalidTypeException;
 import baritone.api.utils.Helper;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.TextComponentString;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraft.util.text.event.ClickEvent;
+import net.minecraft.util.text.event.HoverEvent;

-import java.awt.*;
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.Function;
-import net.minecraft.ChatFormatting;
-import net.minecraft.network.chat.ClickEvent;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.HoverEvent;
-import net.minecraft.network.chat.MutableComponent;

 public class Paginator<E> implements Helper {

@@ -64,56 +63,59 @@ public class Paginator<E> implements Helper {
        return this;
    }

-    public void display(Function<E, Component> transform, String commandPrefix) {
+    public void display(Function<E, ITextComponent> transform, String commandPrefix) {
        int offset = (page - 1) * pageSize;
        for (int i = offset; i < offset + pageSize; i++) {
            if (i < entries.size()) {
                logDirect(transform.apply(entries.get(i)));
            } else {
-                logDirect("--", ChatFormatting.DARK_GRAY);
+                logDirect("--", TextFormatting.DARK_GRAY);
            }
        }
        boolean hasPrevPage = commandPrefix != null && validPage(page - 1);
        boolean hasNextPage = commandPrefix != null && validPage(page + 1);
-        MutableComponent prevPageComponent = Component.literal("<<");
+        ITextComponent prevPageComponent = new TextComponentString("<<");
        if (hasPrevPage) {
-            prevPageComponent.setStyle(prevPageComponent.getStyle()
-                    .withClickEvent(new ClickEvent(
+            prevPageComponent.getStyle()
+                    .setClickEvent(new ClickEvent(
                            ClickEvent.Action.RUN_COMMAND,
                            String.format("%s %d", commandPrefix, page - 1)
                    ))
-                    .withHoverEvent(new HoverEvent(
+                    .setHoverEvent(new HoverEvent(
                            HoverEvent.Action.SHOW_TEXT,
-                            Component.literal("Click to view previous page")
-                    )));
+                            new TextComponentString("Click to view previous page")
+                    ));
        } else {
-            prevPageComponent.setStyle(prevPageComponent.getStyle().withColor(ChatFormatting.DARK_GRAY));
+            prevPageComponent.getStyle().setColor(TextFormatting.DARK_GRAY);
        }
-        MutableComponent nextPageComponent = Component.literal(">>");
+        ITextComponent nextPageComponent = new TextComponentString(">>");
        if (hasNextPage) {
-            nextPageComponent.setStyle(nextPageComponent.getStyle()
-                    .withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, String.format("%s %d", commandPrefix, page + 1)))
-                    .withHoverEvent(new HoverEvent(
+            nextPageComponent.getStyle()
+                    .setClickEvent(new ClickEvent(
+                            ClickEvent.Action.RUN_COMMAND,
+                            String.format("%s %d", commandPrefix, page + 1)
+                    ))
+                    .setHoverEvent(new HoverEvent(
                            HoverEvent.Action.SHOW_TEXT,
-                            Component.literal("Click to view next page")
-                    )));
+                            new TextComponentString("Click to view next page")
+                    ));
        } else {
-            nextPageComponent.setStyle(nextPageComponent.getStyle().withColor(ChatFormatting.DARK_GRAY));
+            nextPageComponent.getStyle().setColor(TextFormatting.DARK_GRAY);
        }
-        MutableComponent pagerComponent = Component.literal("");
-        pagerComponent.setStyle(pagerComponent.getStyle().withColor(ChatFormatting.GRAY));
-        pagerComponent.append(prevPageComponent);
-        pagerComponent.append(" | ");
-        pagerComponent.append(nextPageComponent);
-        pagerComponent.append(String.format(" %d/%d", page, getMaxPage()));
+        ITextComponent pagerComponent = new TextComponentString("");
+        pagerComponent.getStyle().setColor(TextFormatting.GRAY);
+        pagerComponent.appendSibling(prevPageComponent);
+        pagerComponent.appendText(" | ");
+        pagerComponent.appendSibling(nextPageComponent);
+        pagerComponent.appendText(String.format(" %d/%d", page, getMaxPage()));
        logDirect(pagerComponent);
    }

-    public void display(Function<E, Component> transform) {
+    public void display(Function<E, ITextComponent> transform) {
        display(transform, null);
    }

-    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Runnable pre, Function<T, Component> transform, String commandPrefix) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Runnable pre, Function<T, ITextComponent> transform, String commandPrefix) throws CommandException {
        int page = 1;
        consumer.requireMax(1);
        if (consumer.hasAny()) {
@@ -136,47 +138,47 @@ public class Paginator<E> implements Helper {
        pagi.display(transform, commandPrefix);
    }

-    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Runnable pre, Function<T, Component> transform, String commandPrefix) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Runnable pre, Function<T, ITextComponent> transform, String commandPrefix) throws CommandException {
        paginate(consumer, new Paginator<>(elems), pre, transform, commandPrefix);
    }

-    public static <T> void paginate(IArgConsumer consumer, T[] elems, Runnable pre, Function<T, Component> transform, String commandPrefix) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, T[] elems, Runnable pre, Function<T, ITextComponent> transform, String commandPrefix) throws CommandException {
        paginate(consumer, Arrays.asList(elems), pre, transform, commandPrefix);
    }

-    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Function<T, Component> transform, String commandPrefix) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Function<T, ITextComponent> transform, String commandPrefix) throws CommandException {
        paginate(consumer, pagi, null, transform, commandPrefix);
    }

-    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Function<T, Component> transform, String commandPrefix) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Function<T, ITextComponent> transform, String commandPrefix) throws CommandException {
        paginate(consumer, new Paginator<>(elems), null, transform, commandPrefix);
    }

-    public static <T> void paginate(IArgConsumer consumer, T[] elems, Function<T, Component> transform, String commandPrefix) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, T[] elems, Function<T, ITextComponent> transform, String commandPrefix) throws CommandException {
        paginate(consumer, Arrays.asList(elems), null, transform, commandPrefix);
    }

-    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Runnable pre, Function<T, Component> transform) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Runnable pre, Function<T, ITextComponent> transform) throws CommandException {
        paginate(consumer, pagi, pre, transform, null);
    }

-    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Runnable pre, Function<T, Component> transform) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Runnable pre, Function<T, ITextComponent> transform) throws CommandException {
        paginate(consumer, new Paginator<>(elems), pre, transform, null);
    }

-    public static <T> void paginate(IArgConsumer consumer, T[] elems, Runnable pre, Function<T, Component> transform) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, T[] elems, Runnable pre, Function<T, ITextComponent> transform) throws CommandException {
        paginate(consumer, Arrays.asList(elems), pre, transform, null);
    }

-    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Function<T, Component> transform) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Function<T, ITextComponent> transform) throws CommandException {
        paginate(consumer, pagi, null, transform, null);
    }

-    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Function<T, Component> transform) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Function<T, ITextComponent> transform) throws CommandException {
        paginate(consumer, new Paginator<>(elems), null, transform, null);
    }

-    public static <T> void paginate(IArgConsumer consumer, T[] elems, Function<T, Component> transform) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, T[] elems, Function<T, ITextComponent> transform) throws CommandException {
        paginate(consumer, Arrays.asList(elems), null, transform, null);
    }
 }
--- a/src/api/java/baritone/api/command/helpers/TabCompleteHelper.java
+++ b/src/api/java/baritone/api/command/helpers/TabCompleteHelper.java
@@ -23,13 +23,14 @@ import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.manager.ICommandManager;
 import baritone.api.event.events.TabCompleteEvent;
 import baritone.api.utils.SettingsUtil;
+import net.minecraft.util.ResourceLocation;
+
 import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
-import net.minecraft.resources.ResourceLocation;

 /**
 * The {@link TabCompleteHelper} is a <b>single-use</b> object that helps you handle tab completion. It includes helper
@@ -212,7 +213,7 @@ public class TabCompleteHelper {
     * @return This {@link TabCompleteHelper}
     */
    public TabCompleteHelper filterPrefixNamespaced(String prefix) {
-        return filterPrefix(ResourceLocation.parse(prefix).toString());
+        return filterPrefix(new ResourceLocation(prefix).toString());
    }

    /**
--- a/src/api/java/baritone/api/event/events/BlockChangeEvent.java
+++ b/src/api/java/baritone/api/event/events/BlockChangeEvent.java
@@ -18,11 +18,13 @@
 package baritone.api.event.events;

 import baritone.api.utils.Pair;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.ChunkPos;

+import java.util.Collections;
 import java.util.List;
+import java.util.Set;

 /**
 * @author Brady
@@ -30,9 +32,9 @@ import java.util.List;
 public final class BlockChangeEvent {

    private final ChunkPos chunk;
-    private final List<Pair<BlockPos, BlockState>> blocks;
+    private final List<Pair<BlockPos, IBlockState>> blocks;

-    public BlockChangeEvent(ChunkPos pos, List<Pair<BlockPos, BlockState>> blocks) {
+    public BlockChangeEvent(ChunkPos pos, List<Pair<BlockPos, IBlockState>> blocks) {
        this.chunk = pos;
        this.blocks = blocks;
    }
@@ -41,7 +43,7 @@ public final class BlockChangeEvent {
        return this.chunk;
    }

-    public List<Pair<BlockPos, BlockState>> getBlocks() {
+    public List<Pair<BlockPos, IBlockState>> getBlocks() {
        return this.blocks;
    }
 }
--- a/src/api/java/baritone/api/event/events/BlockInteractEvent.java
+++ b/src/api/java/baritone/api/event/events/BlockInteractEvent.java
@@ -17,7 +17,7 @@

 package baritone.api.event.events;

-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;

 /**
 * Called when the local player interacts with a block, can be either {@link Type#START_BREAK} or {@link Type#USE}.
--- a/src/api/java/baritone/api/event/events/PacketEvent.java
+++ b/src/api/java/baritone/api/event/events/PacketEvent.java
@@ -18,8 +18,8 @@
 package baritone.api.event.events;

 import baritone.api.event.events.type.EventState;
-import net.minecraft.network.Connection;
-import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.network.Packet;

 /**
 * @author Brady
@@ -27,19 +27,19 @@ import net.minecraft.network.protocol.Packet;
 */
 public final class PacketEvent {

-    private final Connection networkManager;
+    private final NetworkManager networkManager;

    private final EventState state;

    private final Packet<?> packet;

-    public PacketEvent(Connection networkManager, EventState state, Packet<?> packet) {
+    public PacketEvent(NetworkManager networkManager, EventState state, Packet<?> packet) {
        this.networkManager = networkManager;
        this.state = state;
        this.packet = packet;
    }

-    public final Connection getNetworkManager() {
+    public final NetworkManager getNetworkManager() {
        return this.networkManager;
    }

--- a/src/api/java/baritone/api/event/events/RenderEvent.java
+++ b/src/api/java/baritone/api/event/events/RenderEvent.java
@@ -17,9 +17,6 @@

 package baritone.api.event.events;

-import com.mojang.blaze3d.vertex.PoseStack;
-import org.joml.Matrix4f;
-
 /**
 * @author Brady
 * @since 8/5/2018
@@ -31,13 +28,8 @@ public final class RenderEvent {
     */
    private final float partialTicks;

-    private final Matrix4f projectionMatrix;
-    private final PoseStack modelViewStack;
-
-    public RenderEvent(float partialTicks, PoseStack modelViewStack, Matrix4f projectionMatrix) {
+    public RenderEvent(float partialTicks) {
        this.partialTicks = partialTicks;
-        this.modelViewStack = modelViewStack;
-        this.projectionMatrix = projectionMatrix;
    }

    /**
@@ -46,12 +38,4 @@ public final class RenderEvent {
    public final float getPartialTicks() {
        return this.partialTicks;
    }
-
-    public PoseStack getModelViewStack() {
-        return this.modelViewStack;
-    }
-
-    public Matrix4f getProjectionMatrix() {
-        return this.projectionMatrix;
-    }
 }
--- a/src/api/java/baritone/api/event/events/RotationMoveEvent.java
+++ b/src/api/java/baritone/api/event/events/RotationMoveEvent.java
@@ -18,9 +18,8 @@
 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;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;

 /**
 * @author Brady
@@ -100,14 +99,14 @@ public final class RotationMoveEvent {
        /**
         * Called when the player's motion is updated.
         *
-         * @see Entity#moveRelative(float, Vec3)
+         * @see Entity#moveRelative(float, float, float, float)
         */
        MOTION_UPDATE,

        /**
         * Called when the player jumps.
         *
-         * @see LivingEntity
+         * @see EntityLivingBase#jump
         */
        JUMP
    }
--- a/src/api/java/baritone/api/event/events/TabCompleteEvent.java
+++ b/src/api/java/baritone/api/event/events/TabCompleteEvent.java
@@ -22,7 +22,7 @@ import baritone.api.event.events.type.Cancellable;
 /**
 * @author LoganDark
 */
-public final class TabCompleteEvent extends Cancellable {
+public class TabCompleteEvent extends Cancellable {

    public final String prefix;
    public String[] completions;
--- a/src/api/java/baritone/api/event/events/WorldEvent.java
+++ b/src/api/java/baritone/api/event/events/WorldEvent.java
@@ -18,7 +18,7 @@
 package baritone.api.event.events;

 import baritone.api.event.events.type.EventState;
-import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.client.multiplayer.WorldClient;

 /**
 * @author Brady
@@ -29,14 +29,14 @@ public final class WorldEvent {
    /**
     * The new world that is being loaded. {@code null} if being unloaded.
     */
-    private final ClientLevel world;
+    private final WorldClient world;

    /**
     * The state of the event
     */
    private final EventState state;

-    public WorldEvent(ClientLevel world, EventState state) {
+    public WorldEvent(WorldClient world, EventState state) {
        this.world = world;
        this.state = state;
    }
@@ -44,7 +44,7 @@ public final class WorldEvent {
    /**
     * @return The new world that is being loaded. {@code null} if being unloaded.
     */
-    public final ClientLevel getWorld() {
+    public final WorldClient getWorld() {
        return this.world;
    }

--- a/src/api/java/baritone/api/event/listener/IGameEventListener.java
+++ b/src/api/java/baritone/api/event/listener/IGameEventListener.java
@@ -18,13 +18,14 @@
 package baritone.api.event.listener;

 import baritone.api.event.events.*;
+import io.netty.util.concurrent.GenericFutureListener;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.DeathScreen;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.GuiGameOver;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.entity.Entity;
+import net.minecraft.network.Packet;

 /**
 * @author Brady
@@ -36,7 +37,7 @@ public interface IGameEventListener {
     * Run once per game tick before screen input is handled.
     *
     * @param event The event
-     * @see Minecraft#tick()
+     * @see Minecraft#runTick()
     */
    void onTick(TickEvent event);

@@ -52,7 +53,7 @@ public interface IGameEventListener {
     * Run once per game tick from before and after the player rotation is sent to the server.
     *
     * @param event The event
-     * @see LocalPlayer#tick()
+     * @see EntityPlayerSP#onUpdate()
     */
    void onPlayerUpdate(PlayerUpdateEvent event);

@@ -60,7 +61,7 @@ public interface IGameEventListener {
     * Runs whenever the client player sends a message to the server.
     *
     * @param event The event
-     * @see LocalPlayer#chat(String)
+     * @see EntityPlayerSP#sendChatMessage(String)
     */
    void onSendChatMessage(ChatEvent event);

@@ -75,6 +76,7 @@ public interface IGameEventListener {
     * Runs before and after whenever a chunk is either loaded, unloaded, or populated.
     *
     * @param event The event
+     * @see WorldClient#doPreChunk(int, int, boolean)
     */
    void onChunkEvent(ChunkEvent event);

@@ -86,7 +88,9 @@ public interface IGameEventListener {
    void onBlockChange(BlockChangeEvent event);

    /**
-     * Runs once per world render pass.
+     * Runs once per world render pass. Two passes are made when {@link GameSettings#anaglyph} is on.
+     * <p>
+     * <b>Note:</b> {@link GameSettings#anaglyph} has been removed in Minecraft 1.13
     *
     * @param event The event
     */
@@ -96,7 +100,7 @@ public interface IGameEventListener {
     * Runs before and after whenever a new world is loaded
     *
     * @param event The event
-     * @see Minecraft#setLevel(ClientLevel)
+     * @see Minecraft#loadWorld(WorldClient, String)
     */
    void onWorldEvent(WorldEvent event);

@@ -105,6 +109,7 @@ public interface IGameEventListener {
     *
     * @param event The event
     * @see Packet
+     * @see GenericFutureListener
     */
    void onSendPacket(PacketEvent event);

@@ -113,6 +118,7 @@ public interface IGameEventListener {
     *
     * @param event The event
     * @see Packet
+     * @see GenericFutureListener
     */
    void onReceivePacket(PacketEvent event);

@@ -121,15 +127,15 @@ public interface IGameEventListener {
     * and before and after the player jumps.
     *
     * @param event The event
-     * @see Entity#moveRelative(float, Vec3)
+     * @see Entity#moveRelative(float, float, float, float)
     */
    void onPlayerRotationMove(RotationMoveEvent event);

    /**
-     * Called whenever the sprint keybind state is checked in {@link LocalPlayer#aiStep}
+     * Called whenever the sprint keybind state is checked in {@link EntityPlayerSP#onLivingUpdate}
     *
     * @param event The event
-     * @see LocalPlayer#aiStep()
+     * @see EntityPlayerSP#onLivingUpdate()
     */
    void onPlayerSprintState(SprintStateEvent event);

@@ -141,9 +147,9 @@ public interface IGameEventListener {
    void onBlockInteract(BlockInteractEvent event);

    /**
-     * Called when the local player dies, as indicated by the creation of the {@link DeathScreen} screen.
+     * Called when the local player dies, as indicated by the creation of the {@link GuiGameOver} screen.
     *
-     * @see DeathScreen
+     * @see GuiGameOver
     */
    void onPlayerDeath();

--- a/src/api/java/baritone/api/pathing/goals/Goal.java
+++ b/src/api/java/baritone/api/pathing/goals/Goal.java
@@ -17,7 +17,7 @@

 package baritone.api.pathing.goals;

-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;

 /**
 * An abstract Goal for pathing, can be anything from a specific block to just a Y coordinate.
--- a/src/api/java/baritone/api/pathing/goals/GoalBlock.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalBlock.java
@@ -20,7 +20,7 @@ package baritone.api.pathing.goals;
 import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.interfaces.IGoalRenderPos;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;

 /**
 * A specific BlockPos goal
--- a/src/api/java/baritone/api/pathing/goals/GoalGetToBlock.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalGetToBlock.java
@@ -20,7 +20,7 @@ package baritone.api.pathing.goals;
 import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.interfaces.IGoalRenderPos;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;


 /**
--- a/src/api/java/baritone/api/pathing/goals/GoalNear.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalNear.java
@@ -22,7 +22,7 @@ import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.interfaces.IGoalRenderPos;
 import it.unimi.dsi.fastutil.doubles.DoubleIterator;
 import it.unimi.dsi.fastutil.doubles.DoubleOpenHashSet;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;

 public class GoalNear implements Goal, IGoalRenderPos {

--- a/src/api/java/baritone/api/pathing/goals/GoalRunAway.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalRunAway.java
@@ -20,7 +20,7 @@ package baritone.api.pathing.goals;
 import baritone.api.utils.SettingsUtil;
 import it.unimi.dsi.fastutil.doubles.DoubleIterator;
 import it.unimi.dsi.fastutil.doubles.DoubleOpenHashSet;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;

 import java.util.Arrays;
 import java.util.Objects;
--- a/src/api/java/baritone/api/pathing/goals/GoalStrictDirection.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalStrictDirection.java
@@ -19,8 +19,8 @@ package baritone.api.pathing.goals;

 import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.SettingsUtil;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;

 /**
 * Dig a tunnel in a certain direction, but if you have to deviate from the path, go back to where you started
@@ -33,12 +33,12 @@ public class GoalStrictDirection implements Goal {
    public final int dx;
    public final int dz;

-    public GoalStrictDirection(BlockPos origin, Direction direction) {
+    public GoalStrictDirection(BlockPos origin, EnumFacing direction) {
        x = origin.getX();
        y = origin.getY();
        z = origin.getZ();
-        dx = direction.getStepX();
-        dz = direction.getStepZ();
+        dx = direction.getXOffset();
+        dz = direction.getZOffset();
        if (dx == 0 && dz == 0) {
            throw new IllegalArgumentException(direction + "");
        }
--- a/src/api/java/baritone/api/pathing/goals/GoalTwoBlocks.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalTwoBlocks.java
@@ -20,7 +20,7 @@ package baritone.api.pathing.goals;
 import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.interfaces.IGoalRenderPos;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;

 /**
 * Useful if the goal is just to mine a block. This goal will be satisfied if the specified
--- a/src/api/java/baritone/api/pathing/goals/GoalXZ.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalXZ.java
@@ -20,8 +20,8 @@ package baritone.api.pathing.goals;
 import baritone.api.BaritoneAPI;
 import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.SettingsUtil;
-import net.minecraft.util.Mth;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.Vec3d;

 /**
 * Useful for long-range goals that don't have a specific Y level.
@@ -115,11 +115,11 @@ public class GoalXZ implements Goal {
        return (diagonal + straight) * BaritoneAPI.getSettings().costHeuristic.value; // big TODO tune
    }

-    public static GoalXZ fromDirection(Vec3 origin, float yaw, double distance) {
+    public static GoalXZ fromDirection(Vec3d origin, float yaw, double distance) {
        float theta = (float) Math.toRadians(yaw);
-        double x = origin.x - Mth.sin(theta) * distance;
-        double z = origin.z + Mth.cos(theta) * distance;
-        return new GoalXZ(Mth.floor(x), Mth.floor(z));
+        double x = origin.x - MathHelper.sin(theta) * distance;
+        double z = origin.z + MathHelper.cos(theta) * distance;
+        return new GoalXZ(MathHelper.floor(x), MathHelper.floor(z));
    }

    public int getX() {
--- a/src/api/java/baritone/api/pathing/movement/ActionCosts.java
+++ b/src/api/java/baritone/api/pathing/movement/ActionCosts.java
@@ -65,8 +65,8 @@ public interface ActionCosts {


    static double[] generateFallNBlocksCost() {
-        double[] costs = new double[4097];
-        for (int i = 0; i < 4097; i++) {
+        double[] costs = new double[257];
+        for (int i = 0; i < 257; i++) {
            costs[i] = distanceToTicks(i);
        }
        return costs;
--- a/src/api/java/baritone/api/pathing/movement/IMovement.java
+++ b/src/api/java/baritone/api/pathing/movement/IMovement.java
@@ -18,7 +18,7 @@
 package baritone.api.pathing.movement;

 import baritone.api.utils.BetterBlockPos;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;

 /**
 * @author Brady
--- a/src/api/java/baritone/api/process/IBuilderProcess.java
+++ b/src/api/java/baritone/api/process/IBuilderProcess.java
@@ -18,10 +18,11 @@
 package baritone.api.process;

 import baritone.api.schematic.ISchematic;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Vec3i;
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3i;
+
 import java.io.File;
 import java.util.List;

@@ -52,7 +53,7 @@ public interface IBuilderProcess extends IBaritoneProcess {

    @Deprecated
    default boolean build(String schematicFile, BlockPos origin) {
-        File file = new File(new File(Minecraft.getInstance().gameDirectory, "schematics"), schematicFile);
+        File file = new File(new File(Minecraft.getMinecraft().gameDir, "schematics"), schematicFile);
        return build(schematicFile, file, origin);
    }

@@ -73,5 +74,5 @@ public interface IBuilderProcess extends IBaritoneProcess {
     * schematics, for example, to pick a state that the builder process will be happy with, because any variation will
     * cause it to give up. This is updated every tick, but only while the builder process is active.
     */
-    List<BlockState> getApproxPlaceable();
+    List<IBlockState> getApproxPlaceable();
 }
--- a/src/api/java/baritone/api/process/IFarmProcess.java
+++ b/src/api/java/baritone/api/process/IFarmProcess.java
@@ -17,7 +17,7 @@

 package baritone.api.process;

-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;

 public interface IFarmProcess extends IBaritoneProcess {

--- a/src/api/java/baritone/api/process/IFollowProcess.java
+++ b/src/api/java/baritone/api/process/IFollowProcess.java
@@ -17,9 +17,10 @@

 package baritone.api.process;

+import net.minecraft.entity.Entity;
+
 import java.util.List;
 import java.util.function.Predicate;
-import net.minecraft.world.entity.Entity;

 /**
 * @author Brady
--- a/src/api/java/baritone/api/process/IGetToBlockProcess.java
+++ b/src/api/java/baritone/api/process/IGetToBlockProcess.java
@@ -18,7 +18,7 @@
 package baritone.api.process;

 import baritone.api.utils.BlockOptionalMeta;
-import net.minecraft.world.level.block.Block;
+import net.minecraft.block.Block;

 /**
 * but it rescans the world every once in a while so it doesn't get fooled by its cache
--- a/src/api/java/baritone/api/process/IMineProcess.java
+++ b/src/api/java/baritone/api/process/IMineProcess.java
@@ -19,8 +19,9 @@ package baritone.api.process;

 import baritone.api.utils.BlockOptionalMeta;
 import baritone.api.utils.BlockOptionalMetaLookup;
+import net.minecraft.block.Block;
+
 import java.util.stream.Stream;
-import net.minecraft.world.level.block.Block;

 /**
 * @author Brady
--- a/src/api/java/baritone/api/schematic/CompositeSchematic.java
+++ b/src/api/java/baritone/api/schematic/CompositeSchematic.java
@@ -17,9 +17,10 @@

 package baritone.api.schematic;

+import net.minecraft.block.state.IBlockState;
+
 import java.util.ArrayList;
 import java.util.List;
-import net.minecraft.world.level.block.state.BlockState;

 public class CompositeSchematic extends AbstractSchematic {

@@ -46,7 +47,7 @@ public class CompositeSchematic extends AbstractSchematic {
        recalcArr();
    }

-    private CompositeSchematicEntry getSchematic(int x, int y, int z, BlockState currentState) {
+    private CompositeSchematicEntry getSchematic(int x, int y, int z, IBlockState currentState) {
        for (CompositeSchematicEntry entry : schematicArr) {
            if (x >= entry.x && y >= entry.y && z >= entry.z &&
                    entry.schematic.inSchematic(x - entry.x, y - entry.y, z - entry.z, currentState)) {
@@ -57,13 +58,13 @@ public class CompositeSchematic extends AbstractSchematic {
    }

    @Override
-    public boolean inSchematic(int x, int y, int z, BlockState currentState) {
+    public boolean inSchematic(int x, int y, int z, IBlockState currentState) {
        CompositeSchematicEntry entry = getSchematic(x, y, z, currentState);
        return entry != null && entry.schematic.inSchematic(x - entry.x, y - entry.y, z - entry.z, currentState);
    }

    @Override
-    public BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable) {
+    public IBlockState desiredState(int x, int y, int z, IBlockState current, List<IBlockState> approxPlaceable) {
        CompositeSchematicEntry entry = getSchematic(x, y, z, current);
        if (entry == null) {
            throw new IllegalStateException("couldn't find schematic for this position");
--- a/src/api/java/baritone/api/schematic/FillSchematic.java
+++ b/src/api/java/baritone/api/schematic/FillSchematic.java
@@ -18,8 +18,7 @@
 package baritone.api.schematic;

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

 import java.util.List;

@@ -32,8 +31,8 @@ public class FillSchematic extends AbstractSchematic {
        this.bom = bom;
    }

-    public FillSchematic(int x, int y, int z, BlockState state) {
-        this(x, y, z, new BlockOptionalMeta(state.getBlock()));
+    public FillSchematic(int x, int y, int z, IBlockState state) {
+        this(x, y, z, new BlockOptionalMeta(state.getBlock(), state.getBlock().getMetaFromState(state)));
    }

    public BlockOptionalMeta getBom() {
@@ -41,11 +40,11 @@ public class FillSchematic extends AbstractSchematic {
    }

    @Override
-    public BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable) {
+    public IBlockState desiredState(int x, int y, int z, IBlockState current, List<IBlockState> approxPlaceable) {
        if (bom.matches(current)) {
            return current;
        }
-        for (BlockState placeable : approxPlaceable) {
+        for (IBlockState placeable : approxPlaceable) {
            if (bom.matches(placeable)) {
                return placeable;
            }
--- a/src/api/java/baritone/api/schematic/ISchematic.java
+++ b/src/api/java/baritone/api/schematic/ISchematic.java
@@ -17,9 +17,10 @@

 package baritone.api.schematic;

+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.EnumFacing;
+
 import java.util.List;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.block.state.BlockState;

 /**
 * Basic representation of a schematic. Provides the dimensions and the desired state for a given position relative to
@@ -43,11 +44,11 @@ public interface ISchematic {
     * @param currentState The current state of that block in the world, or null
     * @return Whether or not the specified position is within the bounds of this schematic
     */
-    default boolean inSchematic(int x, int y, int z, BlockState currentState) {
+    default boolean inSchematic(int x, int y, int z, IBlockState currentState) {
        return x >= 0 && x < widthX() && y >= 0 && y < heightY() && z >= 0 && z < lengthZ();
    }

-    default int size(Direction.Axis axis) {
+    default int size(EnumFacing.Axis axis) {
        switch (axis) {
            case X:
                return widthX();
@@ -70,7 +71,7 @@ public interface ISchematic {
     * @param approxPlaceable The list of blockstates estimated to be placeable
     * @return The desired block state at the specified position
     */
-    BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable);
+    IBlockState desiredState(int x, int y, int z, IBlockState current, List<IBlockState> approxPlaceable);

    /**
     * Resets possible caches to avoid wrong behavior when moving the schematic around
--- a/src/api/java/baritone/api/schematic/IStaticSchematic.java
+++ b/src/api/java/baritone/api/schematic/IStaticSchematic.java
@@ -17,7 +17,7 @@

 package baritone.api.schematic;

-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;

 /**
 * A static schematic is capable of providing the desired state at a given position without
@@ -30,7 +30,7 @@ import net.minecraft.world.level.block.state.BlockState;
 public interface IStaticSchematic extends ISchematic {

    /**
-     * Gets the {@link BlockState} for a given position in this schematic. It should be guaranteed
+     * Gets the {@link IBlockState} for a given position in this schematic. It should be guaranteed
     * that the return value of this method will not change given that the parameters are the same.
     *
     * @param x The X block position
@@ -38,19 +38,19 @@ public interface IStaticSchematic extends ISchematic {
     * @param z The Z block position
     * @return The desired state at the specified position.
     */
-    BlockState getDirect(int x, int y, int z);
+    IBlockState getDirect(int x, int y, int z);

    /**
-     * Returns an {@link BlockState} array of size {@link #heightY()} which contains all
-     * desired block states in the specified vertical column. The index of {@link BlockState}s
+     * Returns an {@link IBlockState} array of size {@link #heightY()} which contains all
+     * desired block states in the specified vertical column. The index of {@link IBlockState}s
     * in the array are equivalent to their Y position in the schematic.
     *
     * @param x The X column position
     * @param z The Z column position
-     * @return An {@link BlockState} array
+     * @return An {@link IBlockState} array
     */
-    default BlockState[] getColumn(int x, int z) {
-        BlockState[] column = new BlockState[this.heightY()];
+    default IBlockState[] getColumn(int x, int z) {
+        IBlockState[] column = new IBlockState[this.heightY()];
        for (int i = 0; i < this.heightY(); i++) {
            column[i] = getDirect(x, i, z);
        }
--- a/src/api/java/baritone/api/schematic/MaskSchematic.java
+++ b/src/api/java/baritone/api/schematic/MaskSchematic.java
@@ -18,7 +18,7 @@
 package baritone.api.schematic;

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

 import java.util.List;

@@ -31,15 +31,15 @@ public abstract class MaskSchematic extends AbstractSchematic {
        this.schematic = schematic;
    }

-    protected abstract boolean partOfMask(int x, int y, int z, BlockState currentState);
+    protected abstract boolean partOfMask(int x, int y, int z, IBlockState currentState);

    @Override
-    public boolean inSchematic(int x, int y, int z, BlockState currentState) {
+    public boolean inSchematic(int x, int y, int z, IBlockState currentState) {
        return schematic.inSchematic(x, y, z, currentState) && partOfMask(x, y, z, currentState);
    }

    @Override
-    public BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable) {
+    public IBlockState desiredState(int x, int y, int z, IBlockState current, List<IBlockState> approxPlaceable) {
        return schematic.desiredState(x, y, z, current, approxPlaceable);
    }

@@ -47,7 +47,7 @@ public abstract class MaskSchematic extends AbstractSchematic {
        return new MaskSchematic(schematic) {

            @Override
-            protected boolean partOfMask(int x, int y, int z, BlockState currentState) {
+            protected boolean partOfMask(int x, int y, int z, IBlockState currentState) {
                return function.partOfMask(x, y, z, currentState);
            }
        };
--- a/src/api/java/baritone/api/schematic/ReplaceSchematic.java
+++ b/src/api/java/baritone/api/schematic/ReplaceSchematic.java
@@ -18,7 +18,7 @@
 package baritone.api.schematic;

 import baritone.api.utils.BlockOptionalMetaLookup;
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;

 public class ReplaceSchematic extends MaskSchematic {

@@ -44,7 +44,7 @@ public class ReplaceSchematic extends MaskSchematic {
    }

    @Override
-    protected boolean partOfMask(int x, int y, int z, BlockState currentState) {
+    protected boolean partOfMask(int x, int y, int z, IBlockState currentState) {
        if (cache[x][y][z] == null) {
            cache[x][y][z] = filter.has(currentState);
        }
--- a/src/api/java/baritone/api/schematic/ShellSchematic.java
+++ b/src/api/java/baritone/api/schematic/ShellSchematic.java
@@ -17,7 +17,7 @@

 package baritone.api.schematic;

-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;

 public class ShellSchematic extends MaskSchematic {

@@ -26,7 +26,7 @@ public class ShellSchematic extends MaskSchematic {
    }

    @Override
-    protected boolean partOfMask(int x, int y, int z, BlockState currentState) {
+    protected boolean partOfMask(int x, int y, int z, IBlockState currentState) {
        return x == 0 || y == 0 || z == 0 || x == widthX() - 1 || y == heightY() - 1 || z == lengthZ() - 1;
    }
 }
--- a/src/api/java/baritone/api/schematic/SubstituteSchematic.java
+++ b/src/api/java/baritone/api/schematic/SubstituteSchematic.java
@@ -17,11 +17,11 @@

 package baritone.api.schematic;

-import net.minecraft.world.level.block.AirBlock;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.state.properties.Property;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockAir;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;

 import java.util.Collection;
 import java.util.HashMap;
@@ -32,7 +32,7 @@ public class SubstituteSchematic extends AbstractSchematic {

    private final ISchematic schematic;
    private final Map<Block, List<Block>> substitutions;
-    private final Map<BlockState, Map<Block, BlockState>> blockStateCache = new HashMap<>();
+    private final Map<IBlockState, Map<Block, IBlockState>> blockStateCache = new HashMap<>();

    public SubstituteSchematic(ISchematic schematic, Map<Block, List<Block>> substitutions) {
        super(schematic.widthX(), schematic.heightY(), schematic.lengthZ());
@@ -41,51 +41,51 @@ public class SubstituteSchematic extends AbstractSchematic {
    }

    @Override
-    public boolean inSchematic(int x, int y, int z, BlockState currentState) {
+    public boolean inSchematic(int x, int y, int z, IBlockState currentState) {
        return schematic.inSchematic(x, y, z, currentState);
    }

    @Override
-    public BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable) {
-        BlockState desired = schematic.desiredState(x, y, z, current, approxPlaceable);
+    public IBlockState desiredState(int x, int y, int z, IBlockState current, List<IBlockState> approxPlaceable) {
+        IBlockState desired = schematic.desiredState(x, y, z, current, approxPlaceable);
        Block desiredBlock = desired.getBlock();
        if (!substitutions.containsKey(desiredBlock)) {
            return desired;
        }
        List<Block> substitutes = substitutions.get(desiredBlock);
-        if (substitutes.contains(current.getBlock()) && !(current.getBlock() instanceof AirBlock)) {// don't preserve air, it's almost always there and almost never wanted
+        if (substitutes.contains(current.getBlock()) && !(current.getBlock() instanceof BlockAir)) {// don't preserve air, it's almost always there and almost never wanted
            return withBlock(desired, current.getBlock());
        }
        for (Block substitute : substitutes) {
-            if (substitute instanceof AirBlock) {
-                return current.getBlock() instanceof AirBlock ? current : Blocks.AIR.defaultBlockState(); // can always "place" air
+            if (substitute instanceof BlockAir) {
+                return current.getBlock() instanceof BlockAir ? current : Blocks.AIR.getDefaultState(); // can always "place" air
            }
-            for (BlockState placeable : approxPlaceable) {
+            for (IBlockState placeable : approxPlaceable) {
                if (substitute.equals(placeable.getBlock())) {
                    return withBlock(desired, placeable.getBlock());
                }
            }
        }
-        return substitutes.get(0).defaultBlockState();
+        return substitutes.get(0).getDefaultState();
    }

-    private BlockState withBlock(BlockState state, Block block) {
+    private IBlockState withBlock(IBlockState state, Block block) {
        if (blockStateCache.containsKey(state) && blockStateCache.get(state).containsKey(block)) {
            return blockStateCache.get(state).get(block);
        }
-        Collection<Property<?>> properties = state.getProperties();
-        BlockState newState = block.defaultBlockState();
-        for (Property<?> property : properties) {
+        Collection<IProperty<?>> properties = state.getPropertyKeys();
+        IBlockState newState = block.getDefaultState();
+        for (IProperty<?> property : properties) {
            try {
                newState = copySingleProp(state, newState, property);
            } catch (IllegalArgumentException e) { //property does not exist for target block
            }
        }
-        blockStateCache.computeIfAbsent(state, s -> new HashMap<Block, BlockState>()).put(block, newState);
+        blockStateCache.computeIfAbsent(state, s -> new HashMap<Block, IBlockState>()).put(block, newState);
        return newState;
    }

-    private <T extends Comparable<T>> BlockState copySingleProp(BlockState fromState, BlockState toState, Property<T> prop) {
-        return toState.setValue(prop, fromState.getValue(prop));
+    private <T extends Comparable<T>> IBlockState copySingleProp(IBlockState fromState, IBlockState toState, IProperty<T> prop) {
+        return toState.withProperty(prop, fromState.getValue(prop));
    }
 }
--- a/src/api/java/baritone/api/schematic/WallsSchematic.java
+++ b/src/api/java/baritone/api/schematic/WallsSchematic.java
@@ -17,7 +17,7 @@

 package baritone.api.schematic;

-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;

 public class WallsSchematic extends MaskSchematic {

@@ -26,7 +26,7 @@ public class WallsSchematic extends MaskSchematic {
    }

    @Override
-    protected boolean partOfMask(int x, int y, int z, BlockState currentState) {
+    protected boolean partOfMask(int x, int y, int z, IBlockState currentState) {
        return x == 0 || z == 0 || x == widthX() - 1 || z == lengthZ() - 1;
    }
 }
--- a/src/api/java/baritone/api/schematic/mask/Mask.java
+++ b/src/api/java/baritone/api/schematic/mask/Mask.java
@@ -20,7 +20,7 @@ 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;
+import net.minecraft.block.state.IBlockState;

 /**
 * @author Brady
@@ -34,7 +34,7 @@ public interface Mask {
     * @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);
+    boolean partOfMask(int x, int y, int z, IBlockState currentState);

    int widthX();

--- a/src/api/java/baritone/api/schematic/mask/StaticMask.java
+++ b/src/api/java/baritone/api/schematic/mask/StaticMask.java
@@ -20,7 +20,7 @@ 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;
+import net.minecraft.block.state.IBlockState;

 /**
 * A mask that is context-free. In other words, it doesn't require the current block state to determine if a relative
@@ -42,7 +42,7 @@ public interface StaticMask extends Mask {

    /**
     * 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}
+     * provided in this functional interface without needing the {@link IBlockState} argument. This {@code default}
     * implementation should <b><u>NOT</u></b> be overriden.
     *
     * @param x            The relative x position of the block
@@ -52,7 +52,7 @@ public interface StaticMask extends Mask {
     * @return Whether the given position is included in this mask
     */
    @Override
-    default boolean partOfMask(int x, int y, int z, BlockState currentState) {
+    default boolean partOfMask(int x, int y, int z, IBlockState currentState) {
        return this.partOfMask(x, y, z);
    }

--- a/src/api/java/baritone/api/schematic/mask/operator/BinaryOperatorMask.java
+++ b/src/api/java/baritone/api/schematic/mask/operator/BinaryOperatorMask.java
@@ -21,7 +21,7 @@ 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;
+import net.minecraft.block.state.IBlockState;

 /**
 * @author Brady
@@ -40,14 +40,14 @@ public final class BinaryOperatorMask extends AbstractMask {
    }

    @Override
-    public boolean partOfMask(int x, int y, int z, BlockState currentState) {
+    public boolean partOfMask(int x, int y, int z, IBlockState 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) {
+    private static boolean partOfMask(Mask mask, int x, int y, int z, IBlockState currentState) {
        return x < mask.widthX() && y < mask.heightY() && z < mask.lengthZ() && mask.partOfMask(x, y, z, currentState);
    }

--- a/src/api/java/baritone/api/schematic/mask/operator/NotMask.java
+++ b/src/api/java/baritone/api/schematic/mask/operator/NotMask.java
@@ -20,7 +20,7 @@ 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;
+import net.minecraft.block.state.IBlockState;

 /**
 * @author Brady
@@ -35,7 +35,7 @@ public final class NotMask extends AbstractMask {
    }

    @Override
-    public boolean partOfMask(int x, int y, int z, BlockState currentState) {
+    public boolean partOfMask(int x, int y, int z, IBlockState currentState) {
        return !this.source.partOfMask(x, y, z, currentState);
    }

--- a/src/api/java/baritone/api/schematic/mask/shape/CylinderMask.java
+++ b/src/api/java/baritone/api/schematic/mask/shape/CylinderMask.java
@@ -19,7 +19,7 @@ package baritone.api.schematic.mask.shape;

 import baritone.api.schematic.mask.AbstractMask;
 import baritone.api.schematic.mask.StaticMask;
-import net.minecraft.core.Direction;
+import net.minecraft.util.EnumFacing;

 /**
 * @author Brady
@@ -31,9 +31,9 @@ public final class CylinderMask extends AbstractMask implements StaticMask {
    private final double radiusSqA;
    private final double radiusSqB;
    private final boolean filled;
-    private final Direction.Axis alignment;
+    private final EnumFacing.Axis alignment;

-    public CylinderMask(int widthX, int heightY, int lengthZ, boolean filled, Direction.Axis alignment) {
+    public CylinderMask(int widthX, int heightY, int lengthZ, boolean filled, EnumFacing.Axis alignment) {
        super(widthX, heightY, lengthZ);
        this.centerA = this.getA(widthX, heightY, alignment) / 2.0;
        this.centerB = this.getB(heightY, lengthZ, alignment) / 2.0;
@@ -59,11 +59,11 @@ public final class CylinderMask extends AbstractMask implements StaticMask {
        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 getA(int x, int y, EnumFacing.Axis alignment) {
+        return alignment == EnumFacing.Axis.X ? y : x;
    }

-    private static int getB(int y, int z, Direction.Axis alignment) {
-        return alignment == Direction.Axis.Z ? y : z;
+    private static int getB(int y, int z, EnumFacing.Axis alignment) {
+        return alignment == EnumFacing.Axis.Z ? y : z;
    }
 }
--- a/src/api/java/baritone/api/selection/ISelection.java
+++ b/src/api/java/baritone/api/selection/ISelection.java
@@ -18,9 +18,9 @@
 package baritone.api.selection;

 import baritone.api.utils.BetterBlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.core.Vec3i;
-import net.minecraft.world.phys.AABB;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.Vec3i;

 /**
 * A selection is an immutable object representing the current selection. The selection is commonly used for certain
@@ -54,9 +54,9 @@ public interface ISelection {
    Vec3i size();

    /**
-     * @return An {@link AABB} encompassing all blocks in this selection.
+     * @return An {@link AxisAlignedBB} encompassing all blocks in this selection.
     */
-    AABB aabb();
+    AxisAlignedBB aabb();

    /**
     * Returns a new {@link ISelection} expanded in the specified direction by the specified number of blocks.
@@ -65,7 +65,7 @@ public interface ISelection {
     * @param blocks    How many blocks to expand it.
     * @return A new selection, expanded as specified.
     */
-    ISelection expand(Direction direction, int blocks);
+    ISelection expand(EnumFacing direction, int blocks);

    /**
     * Returns a new {@link ISelection} contracted in the specified direction by the specified number of blocks.
@@ -77,7 +77,7 @@ public interface ISelection {
     * @param blocks    How many blocks to contract it.
     * @return A new selection, contracted as specified.
     */
-    ISelection contract(Direction direction, int blocks);
+    ISelection contract(EnumFacing direction, int blocks);

    /**
     * Returns a new {@link ISelection} shifted in the specified direction by the specified number of blocks. This moves
@@ -87,5 +87,5 @@ public interface ISelection {
     * @param blocks    How many blocks to shift it.
     * @return A new selection, shifted as specified.
     */
-    ISelection shift(Direction direction, int blocks);
+    ISelection shift(EnumFacing direction, int blocks);
 }
--- a/src/api/java/baritone/api/selection/ISelectionManager.java
+++ b/src/api/java/baritone/api/selection/ISelectionManager.java
@@ -18,7 +18,7 @@
 package baritone.api.selection;

 import baritone.api.utils.BetterBlockPos;
-import net.minecraft.core.Direction;
+import net.minecraft.util.EnumFacing;

 /**
 * The selection manager handles setting Baritone's selections. You can set the selection here, as well as retrieving
@@ -87,7 +87,7 @@ public interface ISelectionManager {
     * @param blocks    How many blocks to expand it.
     * @return The new selection, expanded as specified.
     */
-    ISelection expand(ISelection selection, Direction direction, int blocks);
+    ISelection expand(ISelection selection, EnumFacing direction, int blocks);

    /**
     * Replaces the specified {@link ISelection} with one contracted in the specified direction by the specified number
@@ -101,7 +101,7 @@ public interface ISelectionManager {
     * @param blocks    How many blocks to contract it.
     * @return The new selection, contracted as specified.
     */
-    ISelection contract(ISelection selection, Direction direction, int blocks);
+    ISelection contract(ISelection selection, EnumFacing direction, int blocks);

    /**
     * Replaces the specified {@link ISelection} with one shifted in the specified direction by the specified number of
@@ -112,5 +112,5 @@ public interface ISelectionManager {
     * @param blocks    How many blocks to shift it.
     * @return The new selection, shifted as specified.
     */
-    ISelection shift(ISelection selection, Direction direction, int blocks);
+    ISelection shift(ISelection selection, EnumFacing direction, int blocks);
 }
--- a/src/api/java/baritone/api/utils/BetterBlockPos.java
+++ b/src/api/java/baritone/api/utils/BetterBlockPos.java
@@ -17,11 +17,12 @@

 package baritone.api.utils;

+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.Vec3i;
+
 import javax.annotation.Nonnull;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.core.Vec3i;
-import net.minecraft.util.Mth;

 /**
 * A better BlockPos that has fewer hash collisions (and slightly more performant offsets)
@@ -57,7 +58,7 @@ public final class BetterBlockPos extends BlockPos {
    }

    public BetterBlockPos(double x, double y, double z) {
-        this(Mth.floor(x), Mth.floor(y), Mth.floor(z));
+        this(MathHelper.floor(x), MathHelper.floor(y), MathHelper.floor(z));
    }

    public BetterBlockPos(BlockPos pos) {
@@ -124,49 +125,49 @@ public final class BetterBlockPos extends BlockPos {
    }

    @Override
-    public BetterBlockPos above() {
+    public BetterBlockPos up() {
        // this is unimaginably faster than blockpos.up
        // that literally calls
        // this.up(1)
-        // which calls this.offset(Direction.UP, 1)
+        // which calls this.offset(EnumFacing.UP, 1)
        // which does return n == 0 ? this : new BlockPos(this.getX() + facing.getXOffset() * n, this.getY() + facing.getYOffset() * n, this.getZ() + facing.getZOffset() * n);

-        // how many function calls is that? up(), up(int), offset(Direction, int), new BlockPos, getX, getXOffset, getY, getYOffset, getZ, getZOffset
+        // how many function calls is that? up(), up(int), offset(EnumFacing, int), new BlockPos, getX, getXOffset, getY, getYOffset, getZ, getZOffset
        // that's ten.
        // this is one function call.
        return new BetterBlockPos(x, y + 1, z);
    }

    @Override
-    public BetterBlockPos above(int amt) {
+    public BetterBlockPos up(int amt) {
        // see comment in up()
        return amt == 0 ? this : new BetterBlockPos(x, y + amt, z);
    }

    @Override
-    public BetterBlockPos below() {
+    public BetterBlockPos down() {
        // see comment in up()
        return new BetterBlockPos(x, y - 1, z);
    }

    @Override
-    public BetterBlockPos below(int amt) {
+    public BetterBlockPos down(int amt) {
        // see comment in up()
        return amt == 0 ? this : new BetterBlockPos(x, y - amt, z);
    }

    @Override
-    public BetterBlockPos relative(Direction dir) {
-        Vec3i vec = dir.getNormal();
+    public BetterBlockPos offset(EnumFacing dir) {
+        Vec3i vec = dir.getDirectionVec();
        return new BetterBlockPos(x + vec.getX(), y + vec.getY(), z + vec.getZ());
    }

    @Override
-    public BetterBlockPos relative(Direction dir, int dist) {
+    public BetterBlockPos offset(EnumFacing dir, int dist) {
        if (dist == 0) {
            return this;
        }
-        Vec3i vec = dir.getNormal();
+        Vec3i vec = dir.getDirectionVec();
        return new BetterBlockPos(x + vec.getX() * dist, y + vec.getY() * dist, z + vec.getZ() * dist);
    }

--- a/src/api/java/baritone/api/utils/BlockOptionalMeta.java
+++ b/src/api/java/baritone/api/utils/BlockOptionalMeta.java
@@ -18,83 +18,51 @@
 package baritone.api.utils;

 import baritone.api.utils.accessor.IItemStack;
-import baritone.api.utils.accessor.ILootTable;
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import net.minecraft.Util;
-import net.minecraft.client.Minecraft;
-import net.minecraft.commands.Commands;
-import net.minecraft.core.LayeredRegistryAccess;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.resources.RegistryDataLoader;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.RegistryLayer;
-import net.minecraft.server.ReloadableServerRegistries;
-import net.minecraft.server.ReloadableServerResources;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.progress.ChunkProgressListener;
-import net.minecraft.server.packs.PackType;
-import net.minecraft.server.packs.VanillaPackResources;
-import net.minecraft.server.packs.repository.PackRepository;
-import net.minecraft.server.packs.repository.ServerPacksSource;
-import net.minecraft.server.packs.resources.CloseableResourceManager;
-import net.minecraft.server.packs.resources.MultiPackResourceManager;
-import net.minecraft.server.packs.resources.ResourceManager;
-import net.minecraft.world.RandomSequences;
-import net.minecraft.world.flag.FeatureFlagSet;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
-import net.minecraft.world.level.CustomSpawner;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.WorldDataConfiguration;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.state.properties.Property;
-import net.minecraft.world.level.dimension.LevelStem;
-import net.minecraft.world.level.storage.LevelStorageSource;
-import net.minecraft.world.level.storage.ServerLevelData;
-import net.minecraft.world.level.storage.loot.BuiltInLootTables;
-import net.minecraft.world.level.storage.loot.LootContext;
-import net.minecraft.world.level.storage.loot.LootParams;
-import net.minecraft.world.level.storage.loot.LootTable;
-import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
-import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
-import net.minecraft.world.phys.Vec3;
-import sun.misc.Unsafe;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.block.*;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.ResourceLocation;

 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
+import java.util.function.Consumer;
+import java.util.regex.MatchResult;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;

 public final class BlockOptionalMeta {
-    // id or id[] or id[properties] where id and properties are any text with at least one character
-    private static final Pattern PATTERN = Pattern.compile("^(?<id>.+?)(?:\\[(?<properties>.+?)?\\])?$");
+    // id:meta or id[] or id[properties] where id and properties are any text with at least one character and meta is a one or two digit number
+    private static final Pattern PATTERN = Pattern.compile("^(?<id>.+?)(?::(?<meta>\\d\\d?)|\\[(?<properties>.+?)?\\])?$");

    private final Block block;
+    private final int meta;
+    private final boolean noMeta;
    private final String propertiesDescription; // exists so toString() can return something more useful than a list of all blockstates
-    private final Set<BlockState> blockstates;
-    private final ImmutableSet<Integer> stateHashes;
-    private final ImmutableSet<Integer> stackHashes;
-    private static Map<Block, List<Item>> drops = new HashMap<>();
+    private final Set<IBlockState> blockstates;
+    private final Set<Integer> stateHashes;
+    private final Set<Integer> stackHashes;
+    private static final Map<Object, Object> normalizations;

-    public BlockOptionalMeta(@Nonnull Block block) {
+    public BlockOptionalMeta(@Nonnull Block block, @Nullable Integer meta) {
        this.block = block;
+        this.noMeta = meta == null;
+        this.meta = noMeta ? 0 : meta;
        this.propertiesDescription = "{}";
-        this.blockstates = getStates(block, Collections.emptyMap());
+        this.blockstates = getStates(block, meta, Collections.emptyMap());
        this.stateHashes = getStateHashes(blockstates);
        this.stackHashes = getStackHashes(blockstates);
    }

+    public BlockOptionalMeta(@Nonnull Block block) {
+        this(block, null);
+    }
+
    public BlockOptionalMeta(@Nonnull String selector) {
        Matcher matcher = PATTERN.matcher(selector);

@@ -102,24 +70,188 @@ public final class BlockOptionalMeta {
            throw new IllegalArgumentException("invalid block selector");
        }

-        block = BlockUtils.stringToBlockRequired(matcher.group("id"));
+        noMeta = matcher.group("meta") == null;
+
+        ResourceLocation id = new ResourceLocation(matcher.group("id"));
+
+        if (!Block.REGISTRY.containsKey(id)) {
+            throw new IllegalArgumentException("Invalid block ID");
+        }
+        block = Block.REGISTRY.getObject(id);

        String props = matcher.group("properties");
-        Map<Property<?>, ?> properties = props == null || props.equals("") ? Collections.emptyMap() : parseProperties(block, props);
+        Map<IProperty<?>, ?> properties = props == null || props.equals("") ? Collections.emptyMap() : parseProperties(block, props);

        propertiesDescription = props == null ? "{}" : "{" + props.replace("=", ":") + "}";
-        blockstates = getStates(block, properties);
+        meta = noMeta ? 0 : Integer.parseInt(matcher.group("meta"));
+        blockstates = getStates(block, getMeta(), properties);
        stateHashes = getStateHashes(blockstates);
        stackHashes = getStackHashes(blockstates);
    }

-    private static <C extends Comparable<C>, P extends Property<C>> P castToIProperty(Object value) {
+    static {
+        Map<Object, Object> _normalizations = new HashMap<>();
+        Consumer<Enum> put = instance -> _normalizations.put(instance.getClass(), instance);
+        put.accept(EnumFacing.NORTH);
+        put.accept(EnumFacing.Axis.Y);
+        put.accept(BlockLog.EnumAxis.Y);
+        put.accept(BlockStairs.EnumHalf.BOTTOM);
+        put.accept(BlockStairs.EnumShape.STRAIGHT);
+        put.accept(BlockLever.EnumOrientation.DOWN_X);
+        put.accept(BlockDoublePlant.EnumBlockHalf.LOWER);
+        put.accept(BlockSlab.EnumBlockHalf.BOTTOM);
+        put.accept(BlockDoor.EnumDoorHalf.LOWER);
+        put.accept(BlockDoor.EnumHingePosition.LEFT);
+        put.accept(BlockBed.EnumPartType.HEAD);
+        put.accept(BlockRailBase.EnumRailDirection.NORTH_SOUTH);
+        put.accept(BlockTrapDoor.DoorHalf.BOTTOM);
+        _normalizations.put(BlockBanner.ROTATION, 0);
+        _normalizations.put(BlockBed.OCCUPIED, false);
+        _normalizations.put(BlockBrewingStand.HAS_BOTTLE[0], false);
+        _normalizations.put(BlockBrewingStand.HAS_BOTTLE[1], false);
+        _normalizations.put(BlockBrewingStand.HAS_BOTTLE[2], false);
+        _normalizations.put(BlockButton.POWERED, false);
+        // _normalizations.put(BlockCactus.AGE, 0);
+        // _normalizations.put(BlockCauldron.LEVEL, 0);
+        // _normalizations.put(BlockChorusFlower.AGE, 0);
+        _normalizations.put(BlockChorusPlant.NORTH, false);
+        _normalizations.put(BlockChorusPlant.EAST, false);
+        _normalizations.put(BlockChorusPlant.SOUTH, false);
+        _normalizations.put(BlockChorusPlant.WEST, false);
+        _normalizations.put(BlockChorusPlant.UP, false);
+        _normalizations.put(BlockChorusPlant.DOWN, false);
+        // _normalizations.put(BlockCocoa.AGE, 0);
+        // _normalizations.put(BlockCrops.AGE, 0);
+        _normalizations.put(BlockDirt.SNOWY, false);
+        _normalizations.put(BlockDoor.OPEN, false);
+        _normalizations.put(BlockDoor.POWERED, false);
+        // _normalizations.put(BlockFarmland.MOISTURE, 0);
+        _normalizations.put(BlockFence.NORTH, false);
+        _normalizations.put(BlockFence.EAST, false);
+        _normalizations.put(BlockFence.WEST, false);
+        _normalizations.put(BlockFence.SOUTH, false);
+        // _normalizations.put(BlockFenceGate.POWERED, false);
+        // _normalizations.put(BlockFenceGate.IN_WALL, false);
+        _normalizations.put(BlockFire.AGE, 0);
+        _normalizations.put(BlockFire.NORTH, false);
+        _normalizations.put(BlockFire.EAST, false);
+        _normalizations.put(BlockFire.SOUTH, false);
+        _normalizations.put(BlockFire.WEST, false);
+        _normalizations.put(BlockFire.UPPER, false);
+        // _normalizations.put(BlockFrostedIce.AGE, 0);
+        _normalizations.put(BlockGrass.SNOWY, false);
+        // _normalizations.put(BlockHopper.ENABLED, true);
+        // _normalizations.put(BlockLever.POWERED, false);
+        // _normalizations.put(BlockLiquid.LEVEL, 0);
+        // _normalizations.put(BlockMycelium.SNOWY, false);
+        // _normalizations.put(BlockNetherWart.AGE, false);
+        _normalizations.put(BlockLeaves.CHECK_DECAY, false);
+        // _normalizations.put(BlockLeaves.DECAYABLE, false);
+        // _normalizations.put(BlockObserver.POWERED, false);
+        _normalizations.put(BlockPane.NORTH, false);
+        _normalizations.put(BlockPane.EAST, false);
+        _normalizations.put(BlockPane.WEST, false);
+        _normalizations.put(BlockPane.SOUTH, false);
+        // _normalizations.put(BlockPistonBase.EXTENDED, false);
+        // _normalizations.put(BlockPressurePlate.POWERED, false);
+        // _normalizations.put(BlockPressurePlateWeighted.POWER, false);
+        _normalizations.put(BlockQuartz.EnumType.LINES_X, BlockQuartz.EnumType.LINES_Y);
+        _normalizations.put(BlockQuartz.EnumType.LINES_Z, BlockQuartz.EnumType.LINES_Y);
+        // _normalizations.put(BlockRailDetector.POWERED, false);
+        // _normalizations.put(BlockRailPowered.POWERED, false);
+        _normalizations.put(BlockRedstoneWire.NORTH, false);
+        _normalizations.put(BlockRedstoneWire.EAST, false);
+        _normalizations.put(BlockRedstoneWire.SOUTH, false);
+        _normalizations.put(BlockRedstoneWire.WEST, false);
+        // _normalizations.put(BlockReed.AGE, false);
+        _normalizations.put(BlockSapling.STAGE, 0);
+        _normalizations.put(BlockSkull.NODROP, false);
+        _normalizations.put(BlockStandingSign.ROTATION, 0);
+        _normalizations.put(BlockStem.AGE, 0);
+        _normalizations.put(BlockTripWire.NORTH, false);
+        _normalizations.put(BlockTripWire.EAST, false);
+        _normalizations.put(BlockTripWire.WEST, false);
+        _normalizations.put(BlockTripWire.SOUTH, false);
+        _normalizations.put(BlockVine.NORTH, false);
+        _normalizations.put(BlockVine.EAST, false);
+        _normalizations.put(BlockVine.SOUTH, false);
+        _normalizations.put(BlockVine.WEST, false);
+        _normalizations.put(BlockVine.UP, false);
+        _normalizations.put(BlockWall.UP, false);
+        _normalizations.put(BlockWall.NORTH, false);
+        _normalizations.put(BlockWall.EAST, false);
+        _normalizations.put(BlockWall.WEST, false);
+        _normalizations.put(BlockWall.SOUTH, false);
+        normalizations = Collections.unmodifiableMap(_normalizations);
+    }
+
+    public static <C extends Comparable<C>, P extends IProperty<C>> P castToIProperty(Object value) {
        //noinspection unchecked
        return (P) value;
    }

-    private static Map<Property<?>, ?> parseProperties(Block block, String raw) {
-        ImmutableMap.Builder<Property<?>, Object> builder = ImmutableMap.builder();
+    public static <C extends Comparable<C>, P extends IProperty<C>> C castToIPropertyValue(P iproperty, Object value) {
+        //noinspection unchecked
+        return (C) value;
+    }
+
+    /**
+     * Normalizes the specified blockstate by setting meta-affecting properties which
+     * are not being targeted by the meta parameter to their default values.
+     * <p>
+     * For example, block variant/color is the primary target for the meta value, so properties
+     * such as rotation/facing direction will be set to default values in order to nullify
+     * the effect that they have on the state's meta value.
+     *
+     * @param state The state to normalize
+     * @return The normalized block state
+     */
+    public static IBlockState normalize(IBlockState state) {
+        IBlockState newState = state;
+
+        for (IProperty<?> property : state.getProperties().keySet()) {
+            Class<?> valueClass = property.getValueClass();
+            if (normalizations.containsKey(property)) {
+                try {
+                    newState = newState.withProperty(
+                            castToIProperty(property),
+                            castToIPropertyValue(property, normalizations.get(property))
+                    );
+                } catch (IllegalArgumentException ignored) {}
+            } else if (normalizations.containsKey(state.getValue(property))) {
+                try {
+                    newState = newState.withProperty(
+                            castToIProperty(property),
+                            castToIPropertyValue(property, normalizations.get(state.getValue(property)))
+                    );
+                } catch (IllegalArgumentException ignored) {}
+            } else if (normalizations.containsKey(valueClass)) {
+                try {
+                    newState = newState.withProperty(
+                            castToIProperty(property),
+                            castToIPropertyValue(property, normalizations.get(valueClass))
+                    );
+                } catch (IllegalArgumentException ignored) {}
+            }
+        }
+
+        return newState;
+    }
+
+    /**
+     * Evaluate the target meta value for the specified state. The target meta value is
+     * most often that which is influenced by the variant/color property of the block state.
+     *
+     * @param state The state to check
+     * @return The target meta of the state
+     * @see #normalize(IBlockState)
+     */
+    public static int stateMeta(IBlockState state) {
+        return state.getBlock().getMetaFromState(normalize(state));
+    }
+
+    private static Map<IProperty<?>, ?> parseProperties(Block block, String raw) {
+        ImmutableMap.Builder<IProperty<?>, Object> builder = ImmutableMap.builder();
        for (String pair : raw.split(",")) {
            String[] parts = pair.split("=");
            if (parts.length != 2) {
@@ -127,9 +259,9 @@ public final class BlockOptionalMeta {
            }
            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(
+            IProperty<?> key = block.getBlockState().getProperty(rawKey);
+            Comparable<?> value = castToIProperty(key).parseValue(rawValue)
+                    .toJavaUtil().orElseThrow(() -> new IllegalArgumentException(String.format(
                            "\"%s\" is not a valid value for %s on %s",
                            rawValue, key, block
                    )));
@@ -138,30 +270,31 @@ public final class BlockOptionalMeta {
        return builder.build();
    }

-    private static Set<BlockState> getStates(@Nonnull Block block, @Nonnull Map<Property<?>, ?> properties) {
-        return block.getStateDefinition().getPossibleStates().stream()
+    private static Set<IBlockState> getStates(@Nonnull Block block, @Nullable Integer meta, @Nonnull Map<IProperty<?>, ?> properties) {
+        return block.getBlockState().getValidStates().stream()
+                .filter(blockstate -> meta == null || stateMeta(blockstate) == meta)
                .filter(blockstate -> properties.entrySet().stream().allMatch(entry ->
                        blockstate.getValue(entry.getKey()) == entry.getValue()
                ))
                .collect(Collectors.toSet());
    }

-    private static ImmutableSet<Integer> getStateHashes(Set<BlockState> blockstates) {
+    private static ImmutableSet<Integer> getStateHashes(Set<IBlockState> blockstates) {
        return ImmutableSet.copyOf(
                blockstates.stream()
-                        .map(BlockState::hashCode)
+                        .map(IBlockState::hashCode)
                        .toArray(Integer[]::new)
        );
    }

-    private static ImmutableSet<Integer> getStackHashes(Set<BlockState> blockstates) {
+    private static ImmutableSet<Integer> getStackHashes(Set<IBlockState> blockstates) {
        //noinspection ConstantConditions
        return ImmutableSet.copyOf(
                blockstates.stream()
-                        .flatMap(state -> drops(state.getBlock())
-                                .stream()
-                                .map(item -> new ItemStack(item, 1))
-                        )
+                        .map(state -> new ItemStack(
+                                state.getBlock().getItemDropped(state, new Random(), 0),
+                                state.getBlock().damageDropped(state)
+                        ))
                        .map(stack -> ((IItemStack) (Object) stack).getBaritoneHash())
                        .toArray(Integer[]::new)
        );
@@ -171,11 +304,16 @@ public final class BlockOptionalMeta {
        return block;
    }

+    @Deprecated // deprecated because getMeta() == null no longer implies that this BOM only cares about the block
+    public Integer getMeta() {
+        return noMeta ? null : meta;
+    }
+
    public boolean matches(@Nonnull Block block) {
        return block == this.block;
    }

-    public boolean matches(@Nonnull BlockState blockstate) {
+    public boolean matches(@Nonnull IBlockState blockstate) {
        Block block = blockstate.getBlock();
        return block == this.block && stateHashes.contains(blockstate.hashCode());
    }
@@ -184,17 +322,28 @@ public final class BlockOptionalMeta {
        //noinspection ConstantConditions
        int hash = ((IItemStack) (Object) stack).getBaritoneHash();

-        hash -= stack.getDamageValue();
+        if (noMeta) {
+            hash -= stack.getItemDamage();
+        }

        return stackHashes.contains(hash);
    }

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

-    public BlockState getAnyBlockState() {
+    public static IBlockState blockStateFromStack(ItemStack stack) {
+        //noinspection deprecation
+        return Block.getBlockFromItem(stack.getItem()).getStateFromMeta(stack.getMetadata());
+    }
+
+    public IBlockState getAnyBlockState() {
        if (blockstates.size() > 0) {
            return blockstates.iterator().next();
        }
@@ -202,144 +351,11 @@ public final class BlockOptionalMeta {
        return null;
    }

-    public Set<BlockState> getAllBlockStates() {
+    public Set<IBlockState> getAllBlockStates() {
        return blockstates;
    }

    public Set<Integer> stackHashes() {
        return stackHashes;
    }
-
-    private static Method getVanillaServerPack;
-
-    private static VanillaPackResources getVanillaServerPack() {
-        if (getVanillaServerPack == null) {
-            getVanillaServerPack = Arrays.stream(ServerPacksSource.class.getDeclaredMethods()).filter(field -> field.getReturnType() == VanillaPackResources.class).findFirst().orElseThrow();
-            getVanillaServerPack.setAccessible(true);
-        }
-
-        try {
-            return (VanillaPackResources) getVanillaServerPack.invoke(null);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return null;
-    }
-
-    private static synchronized List<Item> drops(Block b) {
-        return drops.computeIfAbsent(b, block -> {
-            ResourceLocation lootTableLocation = block.getLootTable().location();
-            if (lootTableLocation.equals(BuiltInLootTables.EMPTY.location())) {
-                return Collections.emptyList();
-            } else {
-                List<Item> items = new ArrayList<>();
-                try {
-                    ServerLevel lv2 = ServerLevelStub.fastCreate();
-
-                    LootParams.Builder lv5 = new LootParams.Builder(lv2)
-                        .withParameter(LootContextParams.ORIGIN, Vec3.ZERO)
-                        .withParameter(LootContextParams.BLOCK_STATE, b.defaultBlockState())
-                        .withParameter(LootContextParams.TOOL, new ItemStack(Items.NETHERITE_PICKAXE, 1));
-                    getDrops(block, lv5).stream().map(ItemStack::getItem).forEach(items::add);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return items;
-            }
-        });
-    }
-
-    private static List<ItemStack> getDrops(Block state, LootParams.Builder params) {
-        ResourceKey<LootTable> lv = state.getLootTable();
-        if (lv == BuiltInLootTables.EMPTY) {
-            return Collections.emptyList();
-        } else {
-            LootParams lv2 = params.withParameter(LootContextParams.BLOCK_STATE, state.defaultBlockState()).create(LootContextParamSets.BLOCK);
-            ServerLevelStub lv3 = (ServerLevelStub) lv2.getLevel();
-            LootTable lv4 = lv3.holder().getLootTable(lv);
-            return((ILootTable) lv4).invokeGetRandomItems(new LootContext.Builder(lv2).withOptionalRandomSeed(1).create(null));
-        }
-    }
-
-    public static class ServerLevelStub extends ServerLevel {
-        private static Minecraft client = Minecraft.getInstance();
-        private static Unsafe unsafe = getUnsafe();
-        private static CompletableFuture<RegistryAccess> registryAccess = load();
-
-        public ServerLevelStub(MinecraftServer $$0, Executor $$1, LevelStorageSource.LevelStorageAccess $$2, ServerLevelData $$3, ResourceKey<Level> $$4, LevelStem $$5, ChunkProgressListener $$6, boolean $$7, long $$8, List<CustomSpawner> $$9, boolean $$10, @Nullable RandomSequences $$11) {
-            super($$0, $$1, $$2, $$3, $$4, $$5, $$6, $$7, $$8, $$9, $$10, $$11);
-        }
-
-        @Override
-        public FeatureFlagSet enabledFeatures() {
-            assert client.level != null;
-            return client.level.enabledFeatures();
-        }
-
-        public static ServerLevelStub fastCreate() {
-            try {
-                return (ServerLevelStub) unsafe.allocateInstance(ServerLevelStub.class);
-            } catch (InstantiationException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        @Override
-        public RegistryAccess registryAccess() {
-            return registryAccess.join();
-        }
-
-        public ReloadableServerRegistries.Holder holder() {
-            return new ReloadableServerRegistries.Holder(registryAccess().freeze());
-        }
-
-        public static Unsafe getUnsafe() {
-            try {
-                Field theUnsafe = Unsafe.class.getDeclaredField("theUnsafe");
-                theUnsafe.setAccessible(true);
-                return (Unsafe) theUnsafe.get(null);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        public static CompletableFuture<RegistryAccess> load() {
-            PackRepository packRepository = Minecraft.getInstance().getResourcePackRepository();
-            CloseableResourceManager closeableResourceManager = new MultiPackResourceManager(PackType.SERVER_DATA, packRepository.openAllSelected());
-            LayeredRegistryAccess<RegistryLayer> layeredRegistryAccess = loadAndReplaceLayer(
-                closeableResourceManager, RegistryLayer.createRegistryAccess(), RegistryLayer.WORLDGEN, RegistryDataLoader.WORLDGEN_REGISTRIES
-            );
-            return ReloadableServerResources.loadResources(
-                closeableResourceManager,
-                layeredRegistryAccess,
-                WorldDataConfiguration.DEFAULT.enabledFeatures(),
-                Commands.CommandSelection.INTEGRATED,
-                2,
-                Runnable::run,
-                Minecraft.getInstance()
-            ).thenApply(reloadableServerResources -> reloadableServerResources.fullRegistries().get());
-        }
-
-        private static LayeredRegistryAccess<RegistryLayer> loadAndReplaceLayer(
-            ResourceManager resourceManager,
-            LayeredRegistryAccess<RegistryLayer> registryAccess,
-            RegistryLayer registryLayer,
-            List<RegistryDataLoader.RegistryData<?>> registryData
-        ) {
-            RegistryAccess.Frozen frozen = loadLayer(resourceManager, registryAccess, registryLayer, registryData);
-            return registryAccess.replaceFrom(registryLayer, frozen);
-        }
-
-        private static RegistryAccess.Frozen loadLayer(
-            ResourceManager resourceManager,
-            LayeredRegistryAccess<RegistryLayer> registryAccess,
-            RegistryLayer registryLayer,
-            List<RegistryDataLoader.RegistryData<?>> registryData
-        ) {
-            RegistryAccess.Frozen frozen = registryAccess.getAccessForLoading(registryLayer);
-            return RegistryDataLoader.load(resourceManager, frozen, registryData);
-        }
-
-    }
 }
--- a/src/api/java/baritone/api/utils/BlockOptionalMetaLookup.java
+++ b/src/api/java/baritone/api/utils/BlockOptionalMetaLookup.java
@@ -19,9 +19,9 @@ package baritone.api.utils;

 import baritone.api.utils.accessor.IItemStack;
 import com.google.common.collect.ImmutableSet;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.item.ItemStack;

 import java.util.Arrays;
 import java.util.HashSet;
@@ -31,14 +31,14 @@ import java.util.stream.Stream;

 public class BlockOptionalMetaLookup {
    private final ImmutableSet<Block> blockSet;
-    private final ImmutableSet<BlockState> blockStateSet;
+    private final ImmutableSet<IBlockState> 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<IBlockState> blockStates = new HashSet<>();
        Set<Integer> stacks = new HashSet<>();
        for (BlockOptionalMeta bom : boms) {
            blocks.add(bom.getBlock());
@@ -73,14 +73,14 @@ public class BlockOptionalMetaLookup {
        return blockSet.contains(block);
    }

-    public boolean has(BlockState state) {
+    public boolean has(IBlockState state) {
        return blockStateSet.contains(state);
    }

    public boolean has(ItemStack stack) {
        int hash = ((IItemStack) (Object) stack).getBaritoneHash();
-        hash -= stack.getDamageValue();
-        return stackHashes.contains(hash);
+        return stackHashes.contains(hash)
+                || stackHashes.contains(hash - stack.getItemDamage());
    }

    public List<BlockOptionalMeta> blocks() {
--- a/src/api/java/baritone/api/utils/BlockUtils.java
+++ b/src/api/java/baritone/api/utils/BlockUtils.java
@@ -17,19 +17,18 @@

 package baritone.api.utils;

+import net.minecraft.block.Block;
+import net.minecraft.util.ResourceLocation;
+
 import java.util.HashMap;
 import java.util.Map;
-import net.minecraft.core.Registry;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.block.Block;

 public class BlockUtils {

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

    public static String blockToString(Block block) {
-        ResourceLocation loc = BuiltInRegistries.BLOCK.getKey(block);
+        ResourceLocation loc = Block.REGISTRY.getNameForObject(block);
        String name = loc.getPath(); // normally, only write the part after the minecraft:
        if (!loc.getNamespace().equals("minecraft")) {
            // Baritone is running on top of forge with mods installed, perhaps?
@@ -57,7 +56,7 @@ public class BlockUtils {
        if (resourceCache.containsKey(name)) {
            return null; // cached as null
        }
-        block = BuiltInRegistries.BLOCK.getOptional(ResourceLocation.tryParse(name.contains(":") ? name : "minecraft:" + name)).orElse(null);
+        block = Block.getBlockFromName(name.contains(":") ? name : "minecraft:" + name);
        Map<String, Block> copy = new HashMap<>(resourceCache); // read only copy is safe, wont throw concurrentmodification
        copy.put(name, block);
        resourceCache = copy;
--- a/src/api/java/baritone/api/utils/Helper.java
+++ b/src/api/java/baritone/api/utils/Helper.java
@@ -18,12 +18,10 @@
 package baritone.api.utils;

 import baritone.api.BaritoneAPI;
-import baritone.api.Settings;
-import net.minecraft.ChatFormatting;
-import net.minecraft.client.GuiMessageTag;
 import net.minecraft.client.Minecraft;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.TextComponentString;
+import net.minecraft.util.text.TextFormatting;

 import java.util.Arrays;
 import java.util.Calendar;
@@ -44,30 +42,25 @@ public interface Helper {
    Helper HELPER = new Helper() {};

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

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

        // Outer brackets
-        MutableComponent prefix = Component.literal("");
-        prefix.setStyle(baritone.getStyle().withColor(ChatFormatting.DARK_PURPLE));
-        prefix.append("[");
-        prefix.append(baritone);
-        prefix.append("]");
+        ITextComponent prefix = new TextComponentString("");
+        prefix.getStyle().setColor(TextFormatting.DARK_PURPLE);
+        prefix.appendText("[");
+        prefix.appendSibling(baritone);
+        prefix.appendText("]");

        return prefix;
    }
@@ -78,8 +71,8 @@ public interface Helper {
     * @param title   The title to display in the popup
     * @param message The message to display in the popup
     */
-    default void logToast(Component title, Component message) {
-        Minecraft.getInstance().execute(() -> BaritoneAPI.getSettings().toaster.value.accept(title, message));
+    default void logToast(ITextComponent title, ITextComponent message) {
+        Minecraft.getMinecraft().addScheduledTask(() -> BaritoneAPI.getSettings().toaster.value.accept(title, message));
    }

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

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

    /**
@@ -140,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));
+        Minecraft.getMinecraft().addScheduledTask(() -> BaritoneAPI.getSettings().notifier.value.accept(message, error));
    }

    /**
@@ -165,17 +158,19 @@ public interface Helper {
     * @param logAsToast Whether to log as a toast notification
     * @param components The components to send
     */
-    default void logDirect(boolean logAsToast, Component... components) {
-        MutableComponent component = Component.literal("");
-        if (!logAsToast && !BaritoneAPI.getSettings().useMessageTag.value) {
-            component.append(getPrefix());
-            component.append(Component.literal(" "));
+    default void logDirect(boolean logAsToast, ITextComponent... components) {
+        ITextComponent component = new TextComponentString("");
+        if (!logAsToast) {
+            // If we are not logging as a Toast
+            // Append the prefix to the base component line
+            component.appendSibling(getPrefix());
+            component.appendSibling(new TextComponentString(" "));
        }
-        Arrays.asList(components).forEach(component::append);
+        Arrays.asList(components).forEach(component::appendSibling);
        if (logAsToast) {
            logToast(getPrefix(), component);
        } else {
-            Minecraft.getInstance().execute(() -> BaritoneAPI.getSettings().logger.value.accept(component));
+            Minecraft.getMinecraft().addScheduledTask(() -> BaritoneAPI.getSettings().logger.value.accept(component));
        }
    }

@@ -184,7 +179,7 @@ public interface Helper {
     *
     * @param components The components to send
     */
-    default void logDirect(Component... components) {
+    default void logDirect(ITextComponent... components) {
        logDirect(BaritoneAPI.getSettings().logAsToast.value, components);
    }

@@ -196,10 +191,10 @@ public interface Helper {
     * @param color      The color to print that message in
     * @param logAsToast Whether to log as a toast notification
     */
-    default void logDirect(String message, ChatFormatting color, boolean logAsToast) {
+    default void logDirect(String message, TextFormatting color, boolean logAsToast) {
        Stream.of(message.split("\n")).forEach(line -> {
-            MutableComponent component = Component.literal(line.replace("\t", "    "));
-            component.setStyle(component.getStyle().withColor(color));
+            ITextComponent component = new TextComponentString(line.replace("\t", "    "));
+            component.getStyle().setColor(color);
            logDirect(logAsToast, component);
        });
    }
@@ -211,7 +206,7 @@ public interface Helper {
     * @param message The message to display in chat
     * @param color   The color to print that message in
     */
-    default void logDirect(String message, ChatFormatting color) {
+    default void logDirect(String message, TextFormatting color) {
        logDirect(message, color, BaritoneAPI.getSettings().logAsToast.value);
    }

@@ -223,7 +218,7 @@ public interface Helper {
     * @param logAsToast Whether to log as a toast notification
     */
    default void logDirect(String message, boolean logAsToast) {
-        logDirect(message, ChatFormatting.GRAY, logAsToast);
+        logDirect(message, TextFormatting.GRAY, logAsToast);
    }

    /**
@@ -239,7 +234,7 @@ public interface Helper {
    default void logUnhandledException(final Throwable exception) {
        HELPER.logDirect("An unhandled exception occurred. " +
                        "The error is in your game's log, please report this at https://github.com/cabaletta/baritone/issues",
-                ChatFormatting.RED);
+                TextFormatting.RED);
        exception.printStackTrace();
    }
 }
--- a/src/api/java/baritone/api/utils/IPlayerContext.java
+++ b/src/api/java/baritone/api/utils/IPlayerContext.java
@@ -18,20 +18,15 @@
 package baritone.api.utils;

 import baritone.api.cache.IWorldData;
+import net.minecraft.block.BlockSlab;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.SlabBlock;
-import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.phys.HitResult;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.World;

 import java.util.Optional;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;

 /**
 * @author Brady
@@ -41,28 +36,19 @@ public interface IPlayerContext {

    Minecraft minecraft();

-    LocalPlayer player();
+    EntityPlayerSP player();

    IPlayerController playerController();

-    Level world();
-
-    default Iterable<Entity> entities() {
-        return ((ClientLevel) world()).entitiesForRendering();
-    }
-
-    default Stream<Entity> entitiesStream() {
-        return StreamSupport.stream(entities().spliterator(), false);
-    }
-
+    World world();

    IWorldData worldData();

-    HitResult objectMouseOver();
+    RayTraceResult objectMouseOver();

    default BetterBlockPos playerFeet() {
        // TODO find a better way to deal with soul sand!!!!!
-        BetterBlockPos feet = new BetterBlockPos(player().position().x, player().position().y + 0.1251, player().position().z);
+        BetterBlockPos feet = new BetterBlockPos(player().posX, player().posY + 0.1251, player().posZ);

        // sometimes when calling this from another thread or while world is null, it'll throw a NullPointerException
        // that causes the game to immediately crash
@@ -73,34 +59,34 @@ public interface IPlayerContext {
        // this does not impact performance at all since we're not null checking constantly
        // if there is an exception, the only overhead is Java generating the exception object... so we can ignore it
        try {
-            if (world().getBlockState(feet).getBlock() instanceof SlabBlock) {
-                return feet.above();
+            if (world().getBlockState(feet).getBlock() instanceof BlockSlab) {
+                return feet.up();
            }
        } catch (NullPointerException ignored) {}

        return feet;
    }

-    default Vec3 playerFeetAsVec() {
-        return new Vec3(player().position().x, player().position().y, player().position().z);
+    default Vec3d playerFeetAsVec() {
+        return new Vec3d(player().posX, player().posY, player().posZ);
    }

-    default Vec3 playerHead() {
-        return new Vec3(player().position().x, player().position().y + player().getEyeHeight(), player().position().z);
+    default Vec3d playerHead() {
+        return new Vec3d(player().posX, player().posY + player().getEyeHeight(), player().posZ);
    }

-    default Vec3 playerMotion() {
-        return player().getDeltaMovement();
+    default Vec3d playerMotion() {
+        return new Vec3d(player().motionX, player().motionY, player().motionZ);
    }

    BetterBlockPos viewerPos();

    default Rotation playerRotations() {
-        return new Rotation(player().getYRot(), player().getXRot());
+        return new Rotation(player().rotationYaw, player().rotationPitch);
    }

    static double eyeHeight(boolean ifSneaking) {
-        return ifSneaking ? 1.27 : 1.62;
+        return ifSneaking ? 1.54 : 1.62;
    }

    /**
@@ -109,9 +95,9 @@ public interface IPlayerContext {
     * @return The position of the highlighted block
     */
    default Optional<BlockPos> getSelectedBlock() {
-        HitResult result = objectMouseOver();
-        if (result != null && result.getType() == HitResult.Type.BLOCK) {
-            return Optional.of(((BlockHitResult) result).getBlockPos());
+        RayTraceResult result = objectMouseOver();
+        if (result != null && result.typeOfHit == RayTraceResult.Type.BLOCK) {
+            return Optional.of(result.getBlockPos());
        }
        return Optional.empty();
    }
--- a/src/api/java/baritone/api/utils/IPlayerController.java
+++ b/src/api/java/baritone/api/utils/IPlayerController.java
@@ -18,16 +18,17 @@
 package baritone.api.utils;

 import baritone.api.BaritoneAPI;
-import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.InteractionResult;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.inventory.ClickType;
-import net.minecraft.world.level.GameType;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.ClickType;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumActionResult;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.GameType;
+import net.minecraft.world.World;

 /**
 * @author Brady
@@ -39,19 +40,19 @@ public interface IPlayerController {

    boolean hasBrokenBlock();

-    boolean onPlayerDamageBlock(BlockPos pos, Direction side);
+    boolean onPlayerDamageBlock(BlockPos pos, EnumFacing side);

    void resetBlockRemoving();

-    void windowClick(int windowId, int slotId, int mouseButton, ClickType type, Player player);
+    ItemStack windowClick(int windowId, int slotId, int mouseButton, ClickType type, EntityPlayer player);

    GameType getGameType();

-    InteractionResult processRightClickBlock(LocalPlayer player, Level world, InteractionHand hand, BlockHitResult result);
+    EnumActionResult processRightClickBlock(EntityPlayerSP player, World world, BlockPos pos, EnumFacing direction, Vec3d vec, EnumHand hand);

-    InteractionResult processRightClick(LocalPlayer player, Level world, InteractionHand hand);
+    EnumActionResult processRightClick(EntityPlayerSP player, World world, EnumHand hand);

-    boolean clickBlock(BlockPos loc, Direction face);
+    boolean clickBlock(BlockPos loc, EnumFacing face);

    void setHittingBlock(boolean hittingBlock);

--- a/src/api/java/baritone/api/utils/RayTraceUtils.java
+++ b/src/api/java/baritone/api/utils/RayTraceUtils.java
@@ -17,10 +17,9 @@

 package baritone.api.utils;

-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.ClipContext;
-import net.minecraft.world.phys.HitResult;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.Vec3d;

 /**
 * @author Brady
@@ -40,28 +39,27 @@ public final class RayTraceUtils {
     * @param blockReachDistance The block reach distance of the entity
     * @return The calculated raytrace result
     */
-    public static HitResult rayTraceTowards(Entity entity, Rotation rotation, double blockReachDistance) {
+    public static RayTraceResult rayTraceTowards(Entity entity, Rotation rotation, double blockReachDistance) {
        return rayTraceTowards(entity, rotation, blockReachDistance, false);
    }

-    public static HitResult rayTraceTowards(Entity entity, Rotation rotation, double blockReachDistance, boolean wouldSneak) {
-        Vec3 start;
+    public static RayTraceResult rayTraceTowards(Entity entity, Rotation rotation, double blockReachDistance, boolean wouldSneak) {
+        Vec3d start;
        if (wouldSneak) {
            start = inferSneakingEyePosition(entity);
        } else {
-            start = entity.getEyePosition(1.0F); // do whatever is correct
+            start = entity.getPositionEyes(1.0F); // do whatever is correct
        }
-        
-        Vec3 direction = RotationUtils.calcLookDirectionFromRotation(rotation);
-        Vec3 end = start.add(
+        Vec3d direction = RotationUtils.calcLookDirectionFromRotation(rotation);
+        Vec3d end = start.add(
                direction.x * blockReachDistance,
                direction.y * blockReachDistance,
                direction.z * blockReachDistance
        );
-        return entity.level().clip(new ClipContext(start, end, ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, entity));
+        return entity.world.rayTraceBlocks(start, end, false, false, true);
    }

-    public static Vec3 inferSneakingEyePosition(Entity entity) {
-        return new Vec3(entity.getX(), entity.getY() + IPlayerContext.eyeHeight(true), entity.getZ());
+    public static Vec3d inferSneakingEyePosition(Entity entity) {
+        return new Vec3d(entity.posX, entity.posY + IPlayerContext.eyeHeight(true), entity.posZ);
    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Brady	3873aae710	surely this is ok	2023-07-16 19:14:44 -05:00
Brady	19b66903d0	move cull code	2023-07-16 18:58:13 -05:00
Brady	839ddaf85e	hack fix babij trolle	2023-07-16 18:55:14 -05:00
Brady	b4780ca17e	based	2023-07-16 18:54:58 -05:00