v1.6.5

.github/workflows/gradle_build.yml

@@ -14,10 +14,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
+    - name: Set up JDK 8
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '8'
         distribution: 'temurin'
         
     - name: Grant execute permission for gradlew
@@ -25,12 +25,12 @@ jobs:
       
     - name: Build with Gradle
       run: ./gradlew build
-
+      
     - name: Build (fabric) with Gradle
       run: ./gradlew build -Pbaritone.fabric_build
 
     - name: Build (forge) with Gradle
-      run: ./gradlew build -Pbaritone.forge_build -Ploom.platform=forge
+      run: ./gradlew build -Pbaritone.forge_build
 
     - name: Archive Artifacts
       uses: actions/upload-artifact@v3

.github/workflows/run_tests.yml

@@ -12,10 +12,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
+    - name: Set up JDK 8
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '8'
         distribution: 'temurin'
         
     - name: Grant execute permission for gradlew

.gitignore

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

Dockerfile

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

README.md

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

build.gradle

@@ -15,28 +15,67 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-plugins {
-    id 'java'
-    id 'dev.architectury.loom' version '0.10.0-SNAPSHOT'
-    id 'maven-publish'
+group 'baritone'
+version '1.6.5'
+
+buildscript {
+    repositories {
+        maven {
+            name = 'forge'
+            url = 'http://files.minecraftforge.net/maven'
+        }
+        maven {
+            name = 'impactdevelopment-repo'
+            url = 'https://impactdevelopment.github.io/maven/'
+        }
+        maven {
+            url = 'https://www.dogforce-games.com/maven/'
+        }
+        maven {
+            url = 'https://maven.fabricmc.net/'
+        }
+        maven {
+            url = 'https://libraries.minecraft.net/'
+        }
+        mavenCentral()
+        jcenter()
+    }
+
+    dependencies {
+        classpath group: 'com.github.ImpactDevelopment', name: 'ForgeGradle', version: '3.0.115'
+        classpath group: 'com.github.ImpactDevelopment', name: 'MixinGradle', version: '0.6.2'
+        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.7-SNAPSHOT'
+    }
 }
 
 
-archivesBaseName  = project.archives_base_name
-version = project.mod_version
-group = project.maven_group
-
+import baritone.gradle.fabric.CreateVolderYarn
 import baritone.gradle.task.CreateDistTask
 import baritone.gradle.task.ProguardTask
+import net.minecraftforge.gradle.userdev.tasks.RenameJarInPlace
+import org.apache.tools.ant.taskdefs.condition.Os
 
-def compileType = project.hasProperty("baritone.fabric_build") ? "FABRIC" : project.hasProperty("baritone.forge_build") ? "FORGE" : "OFFICIAL"
+apply plugin: 'java'
+apply plugin: 'maven'
 
-sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
+def mcpVersion = [channel: 'snapshot', version: '20201028-1.16.3']
 
+if (getProject().hasProperty("baritone.fabric_build")) {
+    CreateVolderYarn.genMappings("1.16.5", mcpVersion)
+    apply plugin: 'fabric-loom'
+} else {
+    apply plugin: 'net.minecraftforge.gradle'
+    apply plugin: 'org.spongepowered.mixin'
+}
+
+
+sourceCompatibility = targetCompatibility = '1.8'
 compileJava {
+    sourceCompatibility = targetCompatibility = '1.8'
     options.encoding = "UTF-8" // allow emoji in comments :^)
 }
 
+
 sourceSets {
     api {
         compileClasspath += main.compileClasspath
@@ -52,63 +91,122 @@ sourceSets {
         compileClasspath += main.compileClasspath + main.runtimeClasspath + main.output
         runtimeClasspath += main.compileClasspath + main.runtimeClasspath + main.output
     }
+
     schematica_api {
         compileClasspath += main.compileClasspath
     }
+
     main {
         compileClasspath += schematica_api.output
     }
 }
 
-loom {
-    if (compileType.equals("FORGE")) {
-        forge {
-            mixinConfig 'mixins.baritone.json'
+task sourceJar(type: Jar, dependsOn: classes) {
+    classifier = 'sources'
+    from sourceSets.api.allSource
+}
+if (getProject().hasProperty("baritone.fabric_build")) {
+    minecraft.refmapName = "mixins.baritone.refmap.json"
+} else {
+    minecraft {
+        mappings mcpVersion
+
+        if (getProject().hasProperty("baritone.forge_build")) {
+            reobfMappings 'searge'
+        } else {
+            reobfMappings 'notch'
+        }
+
+        runs {
+            client {
+                workingDirectory project.file('run')
+                source sourceSets.launch
+
+                main 'baritone.launch.LaunchTesting'
+
+                environment 'assetIndex', '{asset_index}'
+                environment 'assetDirectory', downloadAssets.output
+                environment 'nativesDirectory', extractNatives.output
+
+                environment 'tweakClass', 'baritone.launch.BaritoneTweaker'
+
+                if (Os.isFamily(Os.FAMILY_MAC)) {
+                    jvmArgs "-XstartOnFirstThread"
+                }
+            }
+
+            autoTest {
+                workingDirectory project.file('autotest')
+                source sourceSets.launch
+
+                main 'baritone.launch.LaunchTesting'
+
+                environment 'assetIndex', '{asset_index}'
+                environment 'assetDirectory', downloadAssets.output
+                environment 'nativesDirectory', extractNatives.output
+
+                environment 'tweakClass', 'baritone.launch.BaritoneTweaker'
+                environment 'BARITONE_AUTO_TEST', 'true'
+
+                if (Os.isFamily(Os.FAMILY_MAC)) {
+                    jvmArgs "-XstartOnFirstThread"
+                }
+            }
         }
     }
-    mixin.defaultRefmapName = "mixins.baritone.refmap.json"
 
-    runs {
-        client {
-            source = sourceSets.launch
-        }
+    mixin {
+        defaultObfuscationEnv searge
+        add sourceSets.launch, 'mixins.baritone.refmap.json'
     }
 }
 
-
 repositories {
+    mavenCentral()
+
+    maven {
+        name = 'SpongePowered'
+        url = 'https://repo.spongepowered.org/repository/maven-public/'
+    }
     maven {
         name = 'impactdevelopment-repo'
         url = 'https://impactdevelopment.github.io/maven/'
     }
     maven {
-        name = "ldtteam"
-        url = "https://maven.parchmentmc.net/"
+        url = 'https://www.dogforce-games.com/maven/'
     }
-    mavenCentral()
 }
 
 dependencies {
-    if (compileType.equals("FORGE")) {
-        forge "net.minecraftforge:forge:${project.forge_version}"
-    }
-    mappings loom.layered() {
-        officialMojangMappings()
-        //technically optional, but really helpful in dev:
-//        parchment("org.parchmentmc.data:parchment-1.17.1:2021.10.24@zip" as String)
-    }
-    minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    if (!compileType.equals("FORGE")) {
-        modImplementation "net.fabricmc:fabric-loader:${project.fabric_version}"
-    }
-    // this makes it compile with the forge tweak stuff
-    implementation 'com.github.ImpactDevelopment:SimpleTweaker:1.2'
-    implementation('net.minecraft:launchwrapper:1.12') {
-        exclude module: 'lwjgl'
-        exclude module: 'asm-debug-all'
-    }
+    if (getProject().hasProperty("baritone.fabric_build")) {
+        minecraft "com.mojang:minecraft:1.16.5"
+        mappings fileTree(dir: "./build/volderyarn", include: "**.jar")
+        modImplementation "net.fabricmc:fabric-loader:0.9.1+build.205"
 
-    implementation 'com.google.code.findbugs:jsr305:3.0.2'
+        // this makes it compile with the forge tweak stuff
+        implementation 'com.github.ImpactDevelopment:SimpleTweaker:1.2'
+        implementation('net.minecraft:launchwrapper:1.12') {
+            exclude module: 'lwjgl'
+        }
+
+        implementation 'com.google.code.findbugs:jsr305:3.0.2'
+    } else {
+        minecraft 'com.github.ImpactDevelopment:Vanilla:1.16.5'
+
+        runtime launchCompile('net.minecraft:launchwrapper:1.12') {
+            exclude module: 'lwjgl'
+        }
+        runtime launchCompile('org.ow2.asm:asm-debug-all:5.2')
+        runtime launchCompile('com.github.ImpactDevelopment:SimpleTweaker:1.2')
+        runtime launchCompile('org.spongepowered:mixin:0.8.3') {
+            // Mixin includes a lot of dependencies that are too up-to-date
+            exclude module: 'launchwrapper'
+            exclude module: 'guava'
+            exclude module: 'gson'
+            exclude module: 'commons-io'
+            exclude module: 'log4j-core'
+        }
+    }
 
     testImplementation 'junit:junit:4.12'
 }
@@ -121,24 +219,25 @@ javadoc {
     classpath += sourceSets.api.compileClasspath
 }
 
-// skidded from fabric-example-mod (comments and all)
-tasks.withType(JavaCompile).configureEach {
-    // ensure that the encoding is set to UTF-8, no matter what the system default is
-    // this fixes some edge cases with special characters not displaying correctly
-    // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-    // If Javadoc is generated, this must be specified in that task too.
-    it.options.encoding = "UTF-8"
+if (getProject().hasProperty("baritone.fabric_build")) {
+    // skidded from fabric-example-mod (comments and all)
+    tasks.withType(JavaCompile).configureEach {
+        // ensure that the encoding is set to UTF-8, no matter what the system default is
+        // this fixes some edge cases with special characters not displaying correctly
+        // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+        // If Javadoc is generated, this must be specified in that task too.
+        it.options.encoding = "UTF-8"
 
-    // The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
-    // JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
-    // We'll use that if it's available, but otherwise we'll use the older option.
-    def targetVersion = 16
-    if (JavaVersion.current().isJava9Compatible()) {
-        it.options.release = targetVersion
+        // The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
+        // JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
+        // We'll use that if it's available, but otherwise we'll use the older option.
+        def targetVersion = 8
+        if (JavaVersion.current().isJava9Compatible()) {
+            it.options.release = targetVersion
+        }
     }
 }
 
-
 jar {
     from sourceSets.launch.output, sourceSets.api.output
 
@@ -170,21 +269,93 @@ jar {
     }
 }
 
-if (compileType.equals("OFFICIAL")) {
-    remapJar {
-        toM.set "official"
+// skidded from ProguardTask
+File getClientJar() {
+    return project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("launch").getRuntimeClasspath().getFiles()
+            .stream()
+            .filter({ f -> f.toString().endsWith("client-extra.jar") })
+            .map({ f -> new File(f.getParentFile(), "client.jar") })
+            .findFirst()
+            .get()
+}
+
+File getClientJarFabric() {
+    return project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("launch").getRuntimeClasspath().getFiles()
+            .stream()
+            .filter({ f -> f.getName().endsWith("-v2.jar") && f.getName().startsWith("minecraft-") })
+            .map({ f -> new File(f.getParentFile().getParentFile(), f.getName().toString().replace("mapped", "intermediary")) })
+            .findFirst()
+            .get()
+}
+
+if (getProject().hasProperty("baritone.fabric_build")) {
+    task copyMcJar(type: Copy) {
+        def mcJar = { getClientJarFabric() }
+
+        from mcJar
+        into 'build/createMcIntermediaryJar/'
+        rename { 'client.jar' }
+    }
+
+    task proguard(type: ProguardTask, dependsOn: copyMcJar) {
+        url 'https://downloads.sourceforge.net/project/proguard/proguard/6.0/proguard6.0.3.zip'
+        extract 'proguard6.0.3/lib/proguard.jar'
+    }
+
+    task createDist(type: CreateDistTask, dependsOn: proguard)
+
+} else {
+    task copyMcJar(type: Copy) {
+        def mcJar = { getClientJar() }
+
+        from mcJar
+        into 'build/createMcSrgJar/'
+        rename { 'client-srg.jar' }
+    }
+
+    task createSrgMc(type: RenameJarInPlace) {
+        setInput(new File(copyMcJar.getOutputs().getFiles().getSingleFile(), "client-srg.jar"))
+        setClasspath(files({ getClientJar() }))
+
+        // fork
+        setMappingType(net.minecraftforge.gradle.common.util.MappingFile.Mapping.SEARGE)
+        setJarTask('trans alaska pipeline')
+    }
+
+    project.afterEvaluate {
+        createSrgMc.dependsOn(extractSrg, copyMcJar)
+        createSrgMc.setMappings(extractSrg.getOutput())
+    }
+
+
+    task proguard(type: ProguardTask, dependsOn: createSrgMc) { // TODO: dont need to create srg mc if doing notch build
+        url 'https://downloads.sourceforge.net/project/proguard/proguard/6.0/proguard6.0.3.zip'
+        extract 'proguard6.0.3/lib/proguard.jar'
+    }
+
+    task createDist(type: CreateDistTask, dependsOn: proguard)
+
+}
+build.finalizedBy(createDist)
+
+install {
+    def jarApiName = String.format("%s-api-%s", rootProject.name, version.toString())
+    def jarApiForgeName = String.format("%s-api-forge-%s", rootProject.name, version.toString())
+    def jarSAName = String.format("%s-standalone-%s", rootProject.name, version.toString())
+    def jarSAForgeName = String.format("%s-standalone-forge-%s", rootProject.name, version.toString())
+
+    artifacts {
+        archives file("$buildDir/libs/"+jarApiName+".jar")
+        archives file("$buildDir/libs/"+jarApiForgeName+".jar")
+        archives file("$buildDir/libs/"+jarSAName+".jar")
+        archives file("$buildDir/libs/"+jarSAForgeName+".jar")
+    }
+    repositories.mavenInstaller {
+		addFilter('api') { artifact, file -> artifact.name == "baritone-api" }
+		addFilter('api-forge') { artifact, file -> artifact.name == "baritone-api-forge" }
+		addFilter('standalone') { artifact, file -> artifact.name == "baritone-standalone" }
+		addFilter('standalone-forge') { artifact, file -> artifact.name == "baritone-standalone-forge" }
     }
 }
 
-
-
-task proguard(type: ProguardTask) {
-    url 'https://github.com/Guardsquare/proguard/releases/download/v7.2.0-beta2/proguard-7.2.0-beta2.zip'
-    extract 'proguard-7.2.0-beta2/lib/proguard.jar'
-    compType compileType
-}
-
-task createDist(type: CreateDistTask, dependsOn: proguard)
-
-
-build.finalizedBy(createDist)
+install.dependsOn(build)

buildSrc/build.gradle

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

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

@@ -0,0 +1,259 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.gradle.fabric;
+
+import java.io.*;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+import java.util.zip.ZipOutputStream;
+
+/**
+ * @Author Wagyourtail
+ */
+public class CreateVolderYarn {
+    public static String VOLDERYARNFOLDER = "./build/volderyarn/";
+    public static String VOLDERYARN = "volderyarn-%s-%s-%s.jar";
+
+    public static void genMappings(String mcVersion, Map<String, String> mcpVersion) throws IOException {
+        //download yarn intermediary
+        URL intURL = new URL(String.format("https://maven.fabricmc.net/net/fabricmc/intermediary/%s/intermediary-%s-v2.jar", mcVersion, mcVersion));
+        String intermediary = readZipContentFromURL(intURL, "mappings/mappings.tiny").get("mappings/mappings.tiny");
+        Map<String, ClassData> mappings = parseTinyMap(intermediary);
+
+        //download srg
+        URL srgURL = new URL(String.format("https://files.minecraftforge.net/maven/de/oceanlabs/mcp/mcp_config/%s/mcp_config-%s.zip", mcVersion, mcVersion));
+        String tsrg = readZipContentFromURL(srgURL, "config/joined.tsrg").get("config/joined.tsrg");
+        MCPData mcpData = addTSRGData(mappings, tsrg);
+
+        //download mcp
+        URL mcpURL = new URL(String.format("https://files.minecraftforge.net/maven/de/oceanlabs/mcp/mcp_%s/%s/mcp_%s-%s.zip", mcpVersion.get("channel"), mcpVersion.get("version"), mcpVersion.get("channel"), mcpVersion.get("version")));
+        Map<String, String> mcpfiles = readZipContentFromURL(mcpURL, "fields.csv", "methods.csv");
+        addMCPData(mcpData, mcpfiles.get("fields.csv"), mcpfiles.get("methods.csv"));
+
+        StringBuilder builder = new StringBuilder("tiny\t2\t0\tintermediary\tnamed");
+        for (ClassData clazz : mappings.values()) {
+            builder.append("\n").append(clazz.getIntToMCP());
+        }
+
+        File outputFolder = new File(VOLDERYARNFOLDER);
+        if (!outputFolder.exists() && !outputFolder.mkdirs())
+            throw new RuntimeException("Failed to create dir for volderyarn mappings.");
+
+        for (File f : outputFolder.listFiles()) {
+            if (!f.isDirectory()) f.delete();
+        }
+
+        File outputFile = new File(outputFolder, String.format(VOLDERYARN, mcVersion, mcpVersion.get("channel"), mcpVersion.get("version")));
+        if (!outputFile.getParentFile().exists()) {
+            if (!outputFile.getParentFile().mkdir())
+                throw new FileNotFoundException("Failed to create folder for volderyarn!");
+        }
+
+        try (ZipOutputStream output = new ZipOutputStream(new FileOutputStream(outputFile))) {
+            output.putNextEntry(new ZipEntry("mappings/mappings.tiny"));
+            byte[] outData = builder.toString().getBytes(StandardCharsets.UTF_8);
+            output.write(outData, 0, outData.length);
+        }
+    }
+
+    private static Map<String, ClassData> parseTinyMap(String map) {
+        Map<String, ClassData> mappings = new LinkedHashMap<>();
+        ClassData clazzdata = null;
+        for (String line : map.split("\n")) {
+            String[] parts = line.trim().split("\t");
+            switch (parts[0]) {
+                case "c":
+                    mappings.put(parts[1], clazzdata = new ClassData(mappings, parts[1], parts[2]));
+                    break;
+                case "m":
+                    assert clazzdata != null;
+                    clazzdata.addMethod(parts[2], parts[1], parts[3]);
+                    break;
+                case "f":
+                    assert clazzdata != null;
+                    clazzdata.addField(parts[2], parts[1], parts[3]);
+                    break;
+                default:
+            }
+        }
+        return mappings;
+    }
+
+    private static MCPData addTSRGData(Map<String, ClassData> mappings, String tsrg) {
+        MCPData mcpData = new MCPData();
+        String[] classes = String.join("\t", tsrg.split("\n\t")).split("\n");
+        for (String c : classes) {
+            String[] lines = c.split("\t");
+            String[] classData = lines[0].split("\\s+");
+            ClassData clazz = mappings.get(classData[0]);
+            if (clazz == null) continue;
+            clazz.mcpName = classData[1];
+            for (int i = 1; i < lines.length; ++i) {
+                String[] lineData = lines[i].split("\\s+");
+                //method
+                if (lineData.length == 3) {
+                    if (!mcpData.methods.containsKey(lineData[2])) mcpData.methods.put(lineData[2], new LinkedList<>());
+                    MethodData d = clazz.methods.get(lineData[0] + lineData[1]);
+                    if (d == null) continue;
+                    d.mcpName = lineData[2];
+                    mcpData.methods.get(lineData[2]).add(d);
+                    //field
+                } else {
+                    if (!mcpData.fields.containsKey(lineData[1])) mcpData.fields.put(lineData[1], new LinkedList<>());
+                    FieldData d = clazz.fields.get(lineData[0]);
+                    if (d == null) continue;
+                    d.mcpName = lineData[1];
+                    mcpData.fields.get(lineData[1]).add(d);
+                }
+            }
+        }
+        return mcpData;
+    }
+
+    private static void addMCPData(MCPData mcpData, String fields, String methods) {
+        for (String field : fields.split("\n")) {
+            String[] fieldData = field.split(",");
+            mcpData.fields.getOrDefault(fieldData[0].trim(), new LinkedList<>()).forEach(f -> f.mcpName = fieldData[1].trim());
+        }
+
+        for (String method : methods.split("\n")) {
+            String[] methodData = method.split(",");
+            mcpData.methods.getOrDefault(methodData[0].trim(), new LinkedList<>()).forEach(m -> m.mcpName = methodData[1].trim());
+        }
+    }
+
+    private static Map<String, String> readZipContentFromURL(URL remote, String... files) throws IOException {
+        try (ZipInputStream is = new ZipInputStream(new BufferedInputStream(remote.openStream(), 1024))) {
+            byte[] buff = new byte[1024];
+            ZipEntry entry;
+            Set<String> fileList = new HashSet<>(Arrays.asList(files));
+            Map<String, String> fileContents = new HashMap<>();
+            while ((entry = is.getNextEntry()) != null) {
+                if (fileList.contains(entry.getName())) {
+                    StringBuilder builder = new StringBuilder();
+                    int read;
+                    while ((read = is.read(buff, 0, 1024)) > 0) {
+                        builder.append(new String(buff, 0, read));
+                    }
+                    fileContents.put(entry.getName(), builder.toString());
+                }
+            }
+            return fileContents;
+        }
+    }
+
+    private static class ClassData {
+        final Map<String, ClassData> classMap;
+        final String obf;
+        final String intermediary;
+        String mcpName;
+
+        final Map<String, MethodData> methods = new LinkedHashMap<>();
+        final Map<String, FieldData> fields = new LinkedHashMap<>();
+
+        public ClassData(Map<String, ClassData> classMap, String obf, String intermediary) {
+            this.classMap = classMap;
+            this.obf = obf;
+            this.intermediary = intermediary;
+        }
+
+        public void addMethod(String obf, String obfSig, String intermediary) {
+            methods.put(obf + obfSig, new MethodData(classMap, obf, obfSig, intermediary));
+        }
+
+        public void addField(String obf, String obfSig, String intermediary) {
+            fields.put(obf, new FieldData(classMap, obf, obfSig, intermediary));
+        }
+
+        public String getIntToMCP() {
+            StringBuilder builder = new StringBuilder("c\t").append(intermediary).append("\t").append(mcpName);
+            for (MethodData method : methods.values()) {
+                builder.append("\n\tm\t").append(method.getIntermediarySig()).append("\t").append(method.intermediary).append("\t").append(method.mcpName);
+            }
+            for (FieldData field : fields.values()) {
+                builder.append("\n\tf\t").append(field.getIntermediarySig()).append("\t").append(field.intermediary).append("\t").append(field.mcpName);
+            }
+            return builder.toString();
+        }
+    }
+
+    private static class MethodData {
+        final Map<String, ClassData> classMap;
+        final String obf;
+        final String intermediary;
+        String mcpName;
+
+        final String obfSig;
+
+        public MethodData(Map<String, ClassData> classMap, String obf, String obfSig, String intermediary) {
+            this.classMap = classMap;
+            this.obf = obf;
+            this.obfSig = obfSig;
+            this.intermediary = intermediary;
+        }
+
+        public String getIntermediarySig() {
+            int offset = 0;
+            Matcher m = Pattern.compile("L(.+?);").matcher(obfSig);
+            String intSig = obfSig;
+            while (m.find()) {
+                if (!classMap.containsKey(m.group(1))) continue;
+                String intName = classMap.get(m.group(1)).intermediary;
+                intSig = intSig.substring(0, m.start(1) + offset) + intName + intSig.substring(m.end(1) + offset);
+                offset += intName.length() - m.group(1).length();
+            }
+            return intSig;
+        }
+    }
+
+    private static class FieldData {
+        final Map<String, ClassData> classMap;
+        final String obf;
+        final String intermediary;
+        String mcpName;
+
+        final String obfSig;
+
+        public FieldData(Map<String, ClassData> classMap, String obf, String obfSig, String intermediary) {
+            this.classMap = classMap;
+            this.obf = obf;
+            this.obfSig = obfSig;
+            this.intermediary = intermediary;
+        }
+
+        public String getIntermediarySig() {
+            Matcher m = Pattern.compile("(\\[*)L(.+?);").matcher(obfSig);
+            if (m.find()) {
+                if (!classMap.containsKey(m.group(2))) return obfSig;
+                return m.group(1) + "L" + classMap.get(m.group(2)).intermediary + ";";
+            } else {
+                return obfSig;
+            }
+        }
+    }
+
+    private static class MCPData {
+        final Map<String, List<MethodData>> methods = new HashMap<>();
+        final Map<String, List<FieldData>> fields = new HashMap<>();
+    }
+}

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

@@ -83,7 +83,7 @@ class BaritoneGradleTask extends DefaultTask {
 
     protected void verifyArtifacts() throws IllegalStateException {
         if (!Files.exists(this.artifactPath)) {
-            throw new IllegalStateException("Artifact not found! Run build first! Missing file: " + this.artifactPath);
+            throw new IllegalStateException("Artifact not found! Run build first!");
         }
     }
 
@@ -99,7 +99,7 @@ class BaritoneGradleTask extends DefaultTask {
     }
 
     protected Path getRelativeFile(String file) {
-        return Paths.get(new File(new File(getProject().getBuildDir(), "../"), file).getAbsolutePath());
+        return Paths.get(new File(file).getAbsolutePath());
     }
 
     protected Path getTemporaryFile(String file) {

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

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

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

@@ -22,10 +22,21 @@ import org.apache.commons.io.IOUtils;
 import org.gradle.api.plugins.JavaPluginConvention;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.TaskAction;
+import org.gradle.api.JavaVersion;
+import org.gradle.api.NamedDomainObjectContainer;
+import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.artifacts.Dependency;
+import org.gradle.api.internal.file.IdentityFileResolver;
+import org.gradle.api.internal.plugins.DefaultConvention;
+import org.gradle.api.tasks.Input;
+import org.gradle.api.tasks.TaskAction;
 import org.gradle.api.tasks.TaskCollection;
 import org.gradle.api.tasks.compile.ForkOptions;
 import org.gradle.api.tasks.compile.JavaCompile;
+import org.gradle.internal.Pair;
 import org.gradle.internal.jvm.Jvm;
+import org.gradle.internal.jvm.inspection.DefaultJvmVersionDetector;
+import org.gradle.process.internal.DefaultExecActionFactory;
 
 import java.io.*;
 import java.net.URL;
@@ -48,33 +59,13 @@ public class ProguardTask extends BaritoneGradleTask {
     @Input
     private String url;
 
-    public String getUrl() {
-        return url;
-    }
-
     @Input
     private String extract;
 
-    public String getExtract() {
-        return extract;
-    }
-
-    @Input
-    private String compType;
-
-    public String getCompType() {
-        return compType;
-    }
-
-    private final File copyMcTargetDir = new File("./build/createMcIntermediaryJar").getAbsoluteFile();
-    private final File copyMcTargetJar = new File(copyMcTargetDir, "client.jar");
-
     @TaskAction
     protected void exec() throws Exception {
         super.verifyArtifacts();
 
-        copyMcJar();
-
         // "Haha brady why don't you make separate tasks"
         processArtifact();
         downloadProguard();
@@ -85,32 +76,6 @@ public class ProguardTask extends BaritoneGradleTask {
         cleanup();
     }
 
-    private boolean isMcJar(File f) {
-        return f.getName().startsWith(compType.equals("FORGE") ? "forge-" : "minecraft-") && f.getName().contains("minecraft-mapped");
-    }
-
-    private void copyMcJar() throws IOException {
-        File mcClientJar = this.getProject().getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("launch").getRuntimeClasspath().getFiles()
-            .stream()
-            .filter(this::isMcJar)
-            .map(f -> {
-                switch (compType) {
-                    case "OFFICIAL":
-                        return new File(f.getParentFile().getParentFile(), "minecraft-merged.jar");
-                    case "FABRIC":
-                        return new File(f.getParentFile(), "minecraft-intermediary.jar");
-                    case "FORGE":
-                        return new File(f.getParentFile(), "minecraft-srg.jar");
-                }
-                return null;
-                })
-            .findFirst()
-            .get();
-        if (!mcClientJar.exists()) throw new IOException("Failed to find minecraft! " + mcClientJar.getAbsolutePath());
-        if (!copyMcTargetDir.exists() && !copyMcTargetDir.mkdirs()) throw new IOException("Failed to create target for copyMcJar");
-        Files.copy(mcClientJar.toPath(), copyMcTargetJar.toPath(), REPLACE_EXISTING);
-    }
-
     private void processArtifact() throws Exception {
         if (Files.exists(this.artifactUnoptimizedPath)) {
             Files.delete(this.artifactUnoptimizedPath);
@@ -219,16 +184,15 @@ public class ProguardTask extends BaritoneGradleTask {
     }
 
     private boolean validateJavaVersion(String java) {
-        //TODO: fix for j16
-//        final JavaVersion javaVersion = new DefaultJvmVersionDetector(new DefaultExecActionFactory(new IdentityFileResolver())).getJavaVersion(java);
-//
-//        if (!javaVersion.getMajorVersion().equals("8")) {
-//            System.out.println("Failed to validate Java version " + javaVersion.toString() + " [" + java + "] for ProGuard libraryjars");
-//            // throw new RuntimeException("Java version incorrect: " + javaVersion.getMajorVersion() + " for " + java);
-//            return false;
-//        }
-//
-//        System.out.println("Validated Java version " + javaVersion.toString() + " [" + java + "] for ProGuard libraryjars");
+        final JavaVersion javaVersion = new DefaultJvmVersionDetector(new DefaultExecActionFactory(new IdentityFileResolver())).getJavaVersion(java);
+
+        if (!javaVersion.getMajorVersion().equals("8")) {
+            System.out.println("Failed to validate Java version " + javaVersion.toString() + " [" + java + "] for ProGuard libraryjars");
+            // throw new RuntimeException("Java version incorrect: " + javaVersion.getMajorVersion() + " for " + java);
+            return false;
+        }
+
+        System.out.println("Validated Java version " + javaVersion.toString() + " [" + java + "] for ProGuard libraryjars");
         return true;
     }
 
@@ -240,19 +204,30 @@ public class ProguardTask extends BaritoneGradleTask {
         template.add(0, "-injars '" + this.artifactPath.toString() + "'");
         template.add(1, "-outjars '" + this.getTemporaryFile(PROGUARD_EXPORT_PATH) + "'");
 
-        template.add(2, "-libraryjars  <java.home>/jmods/java.base.jmod(!**.jar;!module-info.class)");
-        template.add(3, "-libraryjars  <java.home>/jmods/java.desktop.jmod(!**.jar;!module-info.class)");
+        // Acquire the RT jar using "java -verbose". This doesn't work on Java 9+
+        Process p = new ProcessBuilder(this.getJavaBinPathForProguard(), "-verbose").start();
+        String out = IOUtils.toString(p.getInputStream(), "UTF-8").split("\n")[0].split("Opened ")[1].replace("]", "");
+        template.add(2, "-libraryjars '" + out + "'");
 
         {
             final Stream<File> libraries;
             {
                 // Discover all of the libraries that we will need to acquire from gradle
                 final Stream<File> dependencies = acquireDependencies()
-                    // remove MCP mapped jar, and nashorn
-                    .filter(f -> !f.toString().endsWith("-recomp.jar") && !f.getName().startsWith("nashorn") && !f.getName().startsWith("coremods"));
+                    // remove MCP mapped jar
+                    .filter(f -> !f.toString().endsWith("-recomp.jar"))
+                    // go from the extra to the original downloaded client
+                    .map(f -> f.toString().endsWith("client-extra.jar") ? new File(f.getParentFile(), "client.jar") : f);
 
-                libraries = dependencies
-                    .map(f -> isMcJar(f) ? copyMcTargetJar : f);
+                if (getProject().hasProperty("baritone.forge_build")) {
+                    libraries = dependencies
+                        .map(f -> f.toString().endsWith("client.jar") ? getSrgMcJar() : f);
+                } else if (getProject().hasProperty("baritone.fabric_build")) {
+                    libraries = dependencies
+                        .map(f -> f.getName().endsWith("-v2.jar") && f.getName().startsWith("minecraft-") ? getSrgMcJar() : f);
+                } else {
+                    libraries = dependencies;
+                }
             }
             libraries.forEach(f -> {
                 template.add(2, "-libraryjars '" + f + "'");
@@ -302,10 +277,6 @@ public class ProguardTask extends BaritoneGradleTask {
         this.extract = extract;
     }
 
-    public void setCompType(String compType) {
-        this.compType = compType;
-    }
-
     private void runProguard(Path config) throws Exception {
         // Delete the existing proguard output file. Proguard probably handles this already, but why not do it ourselves
         if (Files.exists(this.proguardOut)) {

gradle.properties

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

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,21 +1,5 @@
 #!/usr/bin/env sh
 
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -44,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS=""
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -82,7 +66,6 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
-
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -126,11 +109,10 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -156,19 +138,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=`expr $i + 1`
+        i=$((i+1))
     done
     case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -177,9 +159,14 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=`save "$@"`
+APP_ARGS=$(save "$@")
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,19 +1,3 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -29,18 +13,15 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS=
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if "%ERRORLEVEL%" == "0" goto init
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +35,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto execute
+if exist "%JAVA_EXE%" goto init
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,14 +45,28 @@ echo location of your Java installation.
 
 goto fail
 
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
-
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 
 :end
 @rem End local scope for the variables with windows NT shell

scripts/proguard.pro

@@ -19,8 +19,6 @@
 -dontwarn module-info
 # we dont have forge
 -dontwarn baritone.launch.BaritoneForgeModXD
-# progard doesn't like signature polymorphism
--dontwarn java.lang.invoke.MethodHandle
 
 # please do not change the comment below
 -keep class baritone.api.** { *; } # this is the keep api

settings.gradle

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

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

@@ -22,7 +22,7 @@ import baritone.api.command.ICommand;
 import baritone.api.command.ICommandSystem;
 import baritone.api.schematic.ISchematicSystem;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.client.entity.player.ClientPlayerEntity;
 
 import java.util.List;
 import java.util.Objects;
@@ -48,17 +48,17 @@ public interface IBaritoneProvider {
      * returned by {@link #getPrimaryBaritone()}.
      *
      * @return All active {@link IBaritone} instances.
-     * @see #getBaritoneForPlayer(LocalPlayer)
+     * @see #getBaritoneForPlayer(ClientPlayerEntity)
      */
     List<IBaritone> getAllBaritones();
 
     /**
-     * Provides the {@link IBaritone} instance for a given {@link LocalPlayer}.
+     * Provides the {@link IBaritone} instance for a given {@link ClientPlayerEntity}.
      *
      * @param player The player
      * @return The {@link IBaritone} instance.
      */
-    default IBaritone getBaritoneForPlayer(LocalPlayer player) {
+    default IBaritone getBaritoneForPlayer(ClientPlayerEntity player) {
         for (IBaritone baritone : this.getAllBaritones()) {
             if (Objects.equals(player, baritone.getPlayerContext().player())) {
                 return baritone;

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

@@ -21,14 +21,13 @@ import baritone.api.utils.NotificationHelper;
 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.TypeUtils;
 import baritone.api.utils.gui.BaritoneToast;
+import net.minecraft.block.Block;
+import net.minecraft.block.Blocks;
 import net.minecraft.client.Minecraft;
-import net.minecraft.core.Vec3i;
-import net.minecraft.network.chat.BaseComponent;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TextComponent;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.util.math.vector.Vector3i;
+import net.minecraft.util.text.ITextComponent;
+
 import java.awt.*;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -37,8 +36,8 @@ import java.lang.annotation.Target;
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-import java.util.*;
 import java.util.List;
+import java.util.*;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
@@ -875,14 +874,13 @@ public final class Settings {
 
     /**
      * Sets the minimum y level whilst mining - set to 0 to turn off.
-     * if world has negative y values, subtract the min world height to get the value to put here
      */
     public final Setting<Integer> minYLevelWhileMining = new Setting<>(0);
 
     /**
      * Sets the maximum y level to mine ores at.
      */
-    public final Setting<Integer> maxYLevelWhileMining = new Setting<>(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,7 +971,7 @@ public final class Settings {
     /**
      * How far to move before repeating the build. 0 to disable repeating on a certain axis, 0,0,0 to disable entirely
      */
-    public final Setting<Vec3i> buildRepeat = new Setting<>(new Vec3i(0, 0, 0));
+    public final Setting<Vector3i> buildRepeat = new Setting<>(new Vector3i(0, 0, 0));
 
     /**
      * How many times to buildrepeat. -1 for infinite.
@@ -1102,7 +1100,7 @@ public final class Settings {
     /**
      * What Y level to go to for legit strip mining
      */
-    public final Setting<Integer> legitMineYLevel = new Setting<>(-59);
+    public final Setting<Integer> legitMineYLevel = new Setting<>(11);
 
     /**
      * Magically see ores that are separated diagonally from existing ores. Basically like mining around the ores that it finds
@@ -1181,7 +1179,7 @@ public final class Settings {
      * {@link Setting#value};
      */
     @JavaOnly
-    public final Setting<Consumer<Component>> logger = new Setting<>(msg -> Minecraft.getInstance().gui.getChat().addMessage(msg));
+    public final Setting<Consumer<ITextComponent>> logger = new Setting<>(msg -> Minecraft.getInstance().ingameGUI.getChatGUI().printChatMessage(msg));
 
     /**
      * The function that is called when Baritone will send a desktop notification. This function can be added to
@@ -1197,7 +1195,7 @@ public final class Settings {
      * {@link Setting#value};
      */
     @JavaOnly
-    public final Setting<BiConsumer<Component, Component>> toaster = new Setting<>(BaritoneToast::addOrUpdate);
+    public final Setting<BiConsumer<ITextComponent, ITextComponent>> toaster = new Setting<>(BaritoneToast::addOrUpdate);
 
     /**
      * Print out ALL command exceptions as a stack trace to stdout, even simple syntax errors

src/api/java/baritone/api/cache/IBlockTypeAccess.java

@@ -17,8 +17,8 @@
 
 package baritone.api.cache;
 
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.block.BlockState;
+import net.minecraft.util.math.BlockPos;
 
 /**
  * @author Brady

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

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

src/api/java/baritone/api/cache/IWorldScanner.java

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

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

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

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

@@ -19,7 +19,7 @@ package baritone.api.command.argument;
 
 import baritone.api.command.argparser.IArgParser;
 import baritone.api.command.exception.CommandInvalidTypeException;
-import net.minecraft.core.Direction;
+import net.minecraft.util.Direction;
 
 /**
  * A {@link ICommandArgument} is an immutable object representing one command argument. It contains data on the index of

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

@@ -19,9 +19,9 @@ package baritone.api.command.datatypes;
 
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
-import net.minecraft.core.Registry;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.block.Block;
+import net.minecraft.block.Block;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.registry.Registry;
 
 import java.util.regex.Pattern;
 import java.util.stream.Stream;

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

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

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

@@ -19,7 +19,7 @@ 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.Direction;
 
 import java.util.Locale;
 import java.util.stream.Stream;
@@ -36,7 +36,7 @@ public enum ForAxis implements IDatatypeFor<Direction.Axis> {
     public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
         return new TabCompleteHelper()
                 .append(Stream.of(Direction.Axis.values())
-                        .map(Direction.Axis::getName).map(String::toLowerCase))
+                        .map(Direction.Axis::getString).map(String::toLowerCase))
                 .filterPrefix(ctx.getConsumer().getString())
                 .stream();
     }

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

@@ -20,10 +20,10 @@ package baritone.api.command.datatypes;
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
 import baritone.api.utils.BlockOptionalMeta;
-import net.minecraft.core.Registry;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.properties.Property;
+import net.minecraft.block.Block;
+import net.minecraft.state.Property;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.registry.Registry;
 
 import java.util.Set;
 import java.util.regex.Pattern;
@@ -99,7 +99,7 @@ public enum ForBlockOptionalMeta implements IDatatypeFor<BlockOptionalMeta> {
             String prefix = arg.substring(0, arg.length() - lastProperty.length());
             return new TabCompleteHelper()
                     .append(
-                            block.getStateDefinition()
+                            block.getStateContainer()
                                     .getProperties()
                                     .stream()
                                     .map(Property::getName)
@@ -121,7 +121,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);
+        Property<?> property = block.getStateContainer().getProperty(lastName);
         if (property == null) {
             // The property does not exist so there's no values to complete
             return Stream.empty();
@@ -149,6 +149,6 @@ 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);
+        return property.getAllowedValues().stream().map(property::getName);
     }
 }

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

@@ -19,9 +19,10 @@ package baritone.api.command.datatypes;
 
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
+import net.minecraft.util.Direction;
+
 import java.util.Locale;
 import java.util.stream.Stream;
-import net.minecraft.core.Direction;
 
 public enum ForDirection implements IDatatypeFor<Direction> {
     INSTANCE;
@@ -35,7 +36,7 @@ public enum ForDirection implements IDatatypeFor<Direction> {
     public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
         return new TabCompleteHelper()
                 .append(Stream.of(Direction.values())
-                        .map(Direction::getName).map(String::toLowerCase))
+                        .map(Direction::getName2).map(String::toLowerCase))
                 .filterPrefix(ctx.getConsumer().getString())
                 .stream();
     }

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

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

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

@@ -99,7 +99,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();
         }

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -23,13 +23,14 @@ import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.manager.ICommandManager;
 import baritone.api.event.events.TabCompleteEvent;
 import baritone.api.utils.SettingsUtil;
+import net.minecraft.util.ResourceLocation;
+
 import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
-import net.minecraft.resources.ResourceLocation;
 
 /**
  * The {@link TabCompleteHelper} is a <b>single-use</b> object that helps you handle tab completion. It includes helper

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

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

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

@@ -18,8 +18,8 @@
 package baritone.api.event.events;
 
 import baritone.api.event.events.type.EventState;
-import net.minecraft.network.Connection;
-import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.IPacket;
+import net.minecraft.network.NetworkManager;
 
 /**
  * @author Brady
@@ -27,19 +27,19 @@ import net.minecraft.network.protocol.Packet;
  */
 public final class PacketEvent {
 
-    private final Connection networkManager;
+    private final NetworkManager networkManager;
 
     private final EventState state;
 
-    private final Packet<?> packet;
+    private final IPacket<?> packet;
 
-    public PacketEvent(Connection networkManager, EventState state, Packet<?> packet) {
+    public PacketEvent(NetworkManager networkManager, EventState state, IPacket<?> packet) {
         this.networkManager = networkManager;
         this.state = state;
         this.packet = packet;
     }
 
-    public final Connection getNetworkManager() {
+    public final NetworkManager getNetworkManager() {
         return this.networkManager;
     }
 
@@ -47,12 +47,12 @@ public final class PacketEvent {
         return this.state;
     }
 
-    public final Packet<?> getPacket() {
+    public final IPacket<?> getPacket() {
         return this.packet;
     }
 
     @SuppressWarnings("unchecked")
-    public final <T extends Packet<?>> T cast() {
+    public final <T extends IPacket<?>> T cast() {
         return (T) this.packet;
     }
 }

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

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

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

@@ -18,9 +18,9 @@
 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.LivingEntity;
+import net.minecraft.util.math.vector.Vector3d;
 
 /**
  * @author Brady
@@ -100,7 +100,7 @@ public final class RotationMoveEvent {
         /**
          * Called when the player's motion is updated.
          *
-         * @see Entity#moveRelative(float, Vec3)
+         * @see Entity#moveRelative(float, Vector3d)
          */
         MOTION_UPDATE,
 

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

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

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

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

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

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

src/api/java/baritone/api/pathing/goals/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

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;
 
 
 /**

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 {
 

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;

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.Direction;
+import net.minecraft.util.math.BlockPos;
 
 /**
  * Dig a tunnel in a certain direction, but if you have to deviate from the path, go back to where you started
@@ -37,8 +37,8 @@ public class GoalStrictDirection implements Goal {
         x = origin.getX();
         y = origin.getY();
         z = origin.getZ();
-        dx = direction.getStepX();
-        dz = direction.getStepZ();
+        dx = direction.getXOffset();
+        dz = direction.getZOffset();
         if (dx == 0 && dz == 0) {
             throw new IllegalArgumentException(direction + "");
         }

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

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

@@ -20,8 +20,8 @@ package baritone.api.pathing.goals;
 import baritone.api.BaritoneAPI;
 import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.SettingsUtil;
-import net.minecraft.util.Mth;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.vector.Vector3d;
 
 /**
  * Useful for long-range goals that don't have a specific Y level.
@@ -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(Vector3d origin, float yaw, double distance) {
         float theta = (float) Math.toRadians(yaw);
-        double x = origin.x - Mth.sin(theta) * distance;
-        double z = origin.z + Mth.cos(theta) * distance;
-        return new GoalXZ(Mth.floor(x), Mth.floor(z));
+        double x = origin.x - MathHelper.sin(theta) * distance;
+        double z = origin.z + MathHelper.cos(theta) * distance;
+        return new GoalXZ(MathHelper.floor(x), MathHelper.floor(z));
     }
 
     public int getX() {

src/api/java/baritone/api/pathing/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;

src/api/java/baritone/api/pathing/movement/IMovement.java

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

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

@@ -18,10 +18,11 @@
 package baritone.api.process;
 
 import baritone.api.schematic.ISchematic;
+import net.minecraft.block.BlockState;
 import net.minecraft.client.Minecraft;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Vec3i;
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.vector.Vector3i;
+
 import java.io.File;
 import java.util.List;
 
@@ -38,7 +39,7 @@ public interface IBuilderProcess extends IBaritoneProcess {
      * @param schematic The object representation of the schematic
      * @param origin    The origin position of the schematic being built
      */
-    void build(String name, ISchematic schematic, Vec3i origin);
+    void build(String name, ISchematic schematic, Vector3i origin);
 
     /**
      * Requests a build for the specified schematic, labeled as specified, with the specified origin.
@@ -48,11 +49,11 @@ public interface IBuilderProcess extends IBaritoneProcess {
      * @param origin    The origin position of the schematic being built
      * @return Whether or not the schematic was able to load from file
      */
-    boolean build(String name, File schematic, Vec3i origin);
+    boolean build(String name, File schematic, Vector3i origin);
 
     @Deprecated
     default boolean build(String schematicFile, BlockPos origin) {
-        File file = new File(new File(Minecraft.getInstance().gameDirectory, "schematics"), schematicFile);
+        File file = new File(new File(Minecraft.getInstance().gameDir, "schematics"), schematicFile);
         return build(schematicFile, file, origin);
     }
 

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

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

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

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

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

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

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

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

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

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

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

@@ -18,8 +18,7 @@
 package baritone.api.schematic;
 
 import baritone.api.utils.BlockOptionalMeta;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.block.BlockState;
 
 import java.util.List;
 

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

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

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

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

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

@@ -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.BlockState;
 
 import java.util.List;
 

src/api/java/baritone/api/schematic/ReplaceSchematic.java

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

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

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

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

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

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

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

src/api/java/baritone/api/schematic/mask/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.BlockState;
 
 /**
  * @author Brady

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.BlockState;
 
 /**
  * A mask that is context-free. In other words, it doesn't require the current block state to determine if a relative

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.BlockState;
 
 /**
  * @author Brady

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.BlockState;
 
 /**
  * @author Brady

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.Direction;
 
 /**
  * @author Brady

src/api/java/baritone/api/selection/ISelection.java

@@ -18,9 +18,9 @@
 package baritone.api.selection;
 
 import baritone.api.utils.BetterBlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.core.Vec3i;
-import net.minecraft.world.phys.AABB;
+import net.minecraft.util.Direction;
+import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.vector.Vector3i;
 
 /**
  * A selection is an immutable object representing the current selection. The selection is commonly used for certain
@@ -51,12 +51,12 @@ public interface ISelection {
     /**
      * @return The size of this ISelection.
      */
-    Vec3i size();
+    Vector3i size();
 
     /**
-     * @return An {@link AABB} encompassing all blocks in this selection.
+     * @return An {@link AxisAlignedBB} encompassing all blocks in this selection.
      */
-    AABB aabb();
+    AxisAlignedBB aabb();
 
     /**
      * Returns a new {@link ISelection} expanded in the specified direction by the specified number of blocks.

src/api/java/baritone/api/selection/ISelectionManager.java

@@ -18,7 +18,7 @@
 package baritone.api.selection;
 
 import baritone.api.utils.BetterBlockPos;
-import net.minecraft.core.Direction;
+import net.minecraft.util.Direction;
 
 /**
  * The selection manager handles setting Baritone's selections. You can set the selection here, as well as retrieving

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

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

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

@@ -21,27 +21,18 @@ import baritone.api.utils.accessor.IItemStack;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import io.netty.util.concurrent.ThreadPerTaskExecutor;
-import net.minecraft.core.BlockPos;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.loot.*;
 import net.minecraft.resources.*;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.packs.PackResources;
-import net.minecraft.server.packs.PackType;
-import net.minecraft.server.packs.repository.PackRepository;
-import net.minecraft.server.packs.repository.ServerPacksSource;
-import net.minecraft.server.packs.resources.ReloadableResourceManager;
+import net.minecraft.state.Property;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.Unit;
-import net.minecraft.world.level.block.state.properties.Property;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.storage.loot.BuiltInLootTables;
-import net.minecraft.world.level.storage.loot.LootContext;
-import net.minecraft.world.level.storage.loot.LootTables;
-import net.minecraft.world.level.storage.loot.PredicateManager;
-import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
-import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.vector.Vector3d;
+
 import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -64,8 +55,8 @@ public final class BlockOptionalMeta {
     private final Set<BlockState> blockstates;
     private final Set<Integer> stateHashes;
     private final Set<Integer> stackHashes;
-    private static LootTables manager;
-    private static PredicateManager predicate = new PredicateManager();
+    private static LootTableManager manager;
+    private static LootPredicateManager predicate = new LootPredicateManager();
     private static Map<Block, List<Item>> drops = new HashMap<>();
 
     public BlockOptionalMeta(@Nonnull Block block) {
@@ -108,8 +99,8 @@ public final class BlockOptionalMeta {
             }
             String rawKey = parts[0];
             String rawValue = parts[1];
-            Property<?> key = block.getStateDefinition().getProperty(rawKey);
-            Comparable<?> value = castToIProperty(key).getValue(rawValue)
+            Property<?> key = block.getStateContainer().getProperty(rawKey);
+            Comparable<?> value = castToIProperty(key).parseValue(rawValue)
                     .orElseThrow(() -> new IllegalArgumentException(String.format(
                             "\"%s\" is not a valid value for %s on %s",
                             rawValue, key, block
@@ -120,9 +111,9 @@ public final class BlockOptionalMeta {
     }
 
     private static Set<BlockState> getStates(@Nonnull Block block, @Nonnull Map<Property<?>, ?> properties) {
-        return block.getStateDefinition().getPossibleStates().stream()
+        return block.getStateContainer().getValidStates().stream()
                 .filter(blockstate -> properties.entrySet().stream().allMatch(entry ->
-                        blockstate.getValue(entry.getKey()) == entry.getValue()
+                        blockstate.get(entry.getKey()) == entry.getValue()
                 ))
                 .collect(Collectors.toSet());
     }
@@ -165,7 +156,7 @@ public final class BlockOptionalMeta {
         //noinspection ConstantConditions
         int hash = ((IItemStack) (Object) stack).getBaritoneHash();
 
-        hash -= stack.getDamageValue();
+        hash -= stack.getDamage();
 
         return stackHashes.contains(hash);
     }
@@ -191,16 +182,16 @@ public final class BlockOptionalMeta {
         return stackHashes;
     }
 
-    public static LootTables getManager() {
+    public static LootTableManager getManager() {
         if (manager == null) {
-            PackRepository rpl = new PackRepository(PackType.SERVER_DATA, new ServerPacksSource());
-            rpl.reload();
-            PackResources thePack = rpl.getAvailablePacks().iterator().next().open();
-            ReloadableResourceManager resourceManager = new ReloadableResourceManager(PackType.SERVER_DATA);
-            manager = new LootTables(predicate);
-            resourceManager.registerReloadListener(manager);
+            ResourcePackList rpl = new ResourcePackList(ResourcePackInfo::new, new ServerPackFinder());
+            rpl.reloadPacksFromFinders();
+            IResourcePack thePack = rpl.getAllPacks().iterator().next().getResourcePack();
+            IReloadableResourceManager resourceManager = new SimpleReloadableResourceManager(ResourcePackType.SERVER_DATA);
+            manager = new LootTableManager(predicate);
+            resourceManager.addReloadListener(manager);
             try {
-                resourceManager.createReload(new ThreadPerTaskExecutor(Thread::new), new ThreadPerTaskExecutor(Thread::new), CompletableFuture.completedFuture(Unit.INSTANCE), Collections.singletonList(thePack)).done().get();
+                resourceManager.reloadResourcesAndThen(new ThreadPerTaskExecutor(Thread::new), new ThreadPerTaskExecutor(Thread::new), Collections.singletonList(thePack), CompletableFuture.completedFuture(Unit.INSTANCE)).get();
             } catch (Exception exception) {
                 throw new RuntimeException(exception);
             }
@@ -208,27 +199,27 @@ public final class BlockOptionalMeta {
         return manager;
     }
 
-    public static PredicateManager getPredicateManager() {
+    public static LootPredicateManager getPredicateManager() {
         return predicate;
     }
 
     private static synchronized List<Item> drops(Block b) {
         return drops.computeIfAbsent(b, block -> {
             ResourceLocation lootTableLocation = block.getLootTable();
-            if (lootTableLocation == BuiltInLootTables.EMPTY) {
+            if (lootTableLocation == LootTables.EMPTY) {
                 return Collections.emptyList();
             } else {
                 List<Item> items = new ArrayList<>();
 
                 // the other overload for generate doesnt work in forge because forge adds code that requires a non null world
-                getManager().get(lootTableLocation).getRandomItems(
-                        new LootContext.Builder((ServerLevel) null)
+                getManager().getLootTableFromLocation(lootTableLocation).generate(
+                        new LootContext.Builder(null)
                                 .withRandom(new Random())
-                                .withParameter(LootContextParams.ORIGIN, Vec3.atLowerCornerOf(BlockPos.ZERO))
-                                .withParameter(LootContextParams.TOOL, ItemStack.EMPTY)
-                                .withOptionalParameter(LootContextParams.BLOCK_ENTITY, null)
-                                .withParameter(LootContextParams.BLOCK_STATE, block.defaultBlockState())
-                                .create(LootContextParamSets.BLOCK),
+                                .withParameter(LootParameters.field_237457_g_, Vector3d.copy(BlockPos.NULL_VECTOR))
+                                .withParameter(LootParameters.TOOL, ItemStack.EMPTY)
+                                .withNullableParameter(LootParameters.BLOCK_ENTITY, null)
+                                .withParameter(LootParameters.BLOCK_STATE, block.getDefaultState())
+                                .build(LootParameterSets.BLOCK),
                         stack -> items.add(stack.getItem())
                 );
                 return items;

src/api/java/baritone/api/utils/BlockOptionalMetaLookup.java

@@ -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.BlockState;
+import net.minecraft.item.ItemStack;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -79,7 +79,7 @@ public class BlockOptionalMetaLookup {
 
     public boolean has(ItemStack stack) {
         int hash = ((IItemStack) (Object) stack).getBaritoneHash();
-        hash -= stack.getDamageValue();
+        hash -= stack.getDamage();
         return stackHashes.contains(hash);
     }
 

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

@@ -17,11 +17,12 @@
 
 package baritone.api.utils;
 
+import net.minecraft.block.Block;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.registry.Registry;
+
 import java.util.HashMap;
 import java.util.Map;
-import net.minecraft.core.Registry;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.block.Block;
 
 public class BlockUtils {
 
@@ -56,7 +57,7 @@ public class BlockUtils {
         if (resourceCache.containsKey(name)) {
             return null; // cached as null
         }
-        block = Registry.BLOCK.getOptional(ResourceLocation.tryParse(name.contains(":") ? name : "minecraft:" + name)).orElse(null);
+        block = Registry.BLOCK.getOptional(ResourceLocation.tryCreate(name.contains(":") ? name : "minecraft:" + name)).orElse(null);
         Map<String, Block> copy = new HashMap<>(resourceCache); // read only copy is safe, wont throw concurrentmodification
         copy.put(name, block);
         resourceCache = copy;

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

@@ -18,12 +18,12 @@
 package baritone.api.utils;
 
 import baritone.api.BaritoneAPI;
-import baritone.api.utils.gui.BaritoneToast;
-import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
-import net.minecraft.network.chat.BaseComponent;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TextComponent;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.StringTextComponent;
+import net.minecraft.util.text.TextComponent;
+import net.minecraft.util.text.TextFormatting;
+
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.stream.Stream;
@@ -49,19 +49,19 @@ public interface Helper {
     @Deprecated
     Minecraft mc = Minecraft.getInstance();
 
-    static Component getPrefix() {
+    static ITextComponent getPrefix() {
         // Inner text component
         final Calendar now = Calendar.getInstance();
         final boolean xd = now.get(Calendar.MONTH) == Calendar.APRIL && now.get(Calendar.DAY_OF_MONTH) <= 3;
-        BaseComponent baritone = new TextComponent(xd ? "Baritoe" : BaritoneAPI.getSettings().shortBaritonePrefix.value ? "B" : "Baritone");
-        baritone.setStyle(baritone.getStyle().withColor(ChatFormatting.LIGHT_PURPLE));
+        TextComponent baritone = new StringTextComponent(xd ? "Baritoe" : BaritoneAPI.getSettings().shortBaritonePrefix.value ? "B" : "Baritone");
+        baritone.setStyle(baritone.getStyle().setFormatting(TextFormatting.LIGHT_PURPLE));
 
         // Outer brackets
-        BaseComponent prefix = new TextComponent("");
-        prefix.setStyle(baritone.getStyle().withColor(ChatFormatting.DARK_PURPLE));
-        prefix.append("[");
+        TextComponent prefix = new StringTextComponent("");
+        prefix.setStyle(baritone.getStyle().setFormatting(TextFormatting.DARK_PURPLE));
+        prefix.appendString("[");
         prefix.append(baritone);
-        prefix.append("]");
+        prefix.appendString("]");
 
         return prefix;
     }
@@ -72,7 +72,7 @@ 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) {
+    default void logToast(ITextComponent title, ITextComponent message) {
         Minecraft.getInstance().execute(() -> BaritoneAPI.getSettings().toaster.value.accept(title, message));
     }
 
@@ -83,7 +83,7 @@ public interface Helper {
      * @param message The message to display in the popup
      */
     default void logToast(String title, String message) {
-        logToast(new TextComponent(title), new TextComponent(message));
+        logToast(new StringTextComponent(title), new StringTextComponent(message));
     }
 
     /**
@@ -92,7 +92,7 @@ public interface Helper {
      * @param message The message to display in the popup
      */
     default void logToast(String message) {
-        logToast(Helper.getPrefix(), new TextComponent(message));
+        logToast(Helper.getPrefix(), new StringTextComponent(message));
     }
 
     /**
@@ -159,10 +159,10 @@ public interface Helper {
      * @param logAsToast Whether to log as a toast notification
      * @param components The components to send
      */
-    default void logDirect(boolean logAsToast, Component... components) {
-        BaseComponent component = new TextComponent("");
+    default void logDirect(boolean logAsToast, ITextComponent... components) {
+        TextComponent component = new StringTextComponent("");
         component.append(getPrefix());
-        component.append(new TextComponent(" "));
+        component.append(new StringTextComponent(" "));
         Arrays.asList(components).forEach(component::append);
         if (logAsToast) {
             logToast(getPrefix(), component);
@@ -176,7 +176,7 @@ public interface Helper {
      *
      * @param components The components to send
      */
-    default void logDirect(Component... components) {
+    default void logDirect(ITextComponent... components) {
         logDirect(BaritoneAPI.getSettings().logAsToast.value, components);
     }
 
@@ -188,10 +188,10 @@ public interface Helper {
      * @param color      The color to print that message in
      * @param logAsToast Whether to log as a toast notification
      */
-    default void logDirect(String message, ChatFormatting color, boolean logAsToast) {
+    default void logDirect(String message, TextFormatting color, boolean logAsToast) {
         Stream.of(message.split("\n")).forEach(line -> {
-            BaseComponent component = new TextComponent(line.replace("\t", "    "));
-            component.setStyle(component.getStyle().withColor(color));
+            TextComponent component = new StringTextComponent(line.replace("\t", "    "));
+            component.setStyle(component.getStyle().setFormatting(color));
             logDirect(logAsToast, component);
         });
     }
@@ -203,7 +203,7 @@ public interface Helper {
      * @param message The message to display in chat
      * @param color   The color to print that message in
      */
-    default void logDirect(String message, ChatFormatting color) {
+    default void logDirect(String message, TextFormatting color) {
         logDirect(message, color, BaritoneAPI.getSettings().logAsToast.value);
     }
 
@@ -215,7 +215,7 @@ public interface Helper {
      * @param logAsToast Whether to log as a toast notification
      */
     default void logDirect(String message, boolean logAsToast) {
-        logDirect(message, ChatFormatting.GRAY, logAsToast);
+        logDirect(message, TextFormatting.GRAY, logAsToast);
     }
 
     /**

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

@@ -18,16 +18,16 @@
 package baritone.api.utils;
 
 import baritone.api.cache.IWorldData;
+import net.minecraft.block.SlabBlock;
 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.player.ClientPlayerEntity;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.BlockRayTraceResult;
+import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.world.World;
 
 import java.util.Optional;
 import java.util.stream.Stream;
@@ -41,14 +41,14 @@ public interface IPlayerContext {
 
     Minecraft minecraft();
 
-    LocalPlayer player();
+    ClientPlayerEntity player();
 
     IPlayerController playerController();
 
-    Level world();
+    World world();
 
     default Iterable<Entity> entities() {
-        return ((ClientLevel) world()).entitiesForRendering();
+        return ((ClientWorld) world()).getAllEntities();
     }
 
     default Stream<Entity> entitiesStream() {
@@ -58,11 +58,11 @@ public interface IPlayerContext {
 
     IWorldData worldData();
 
-    HitResult objectMouseOver();
+    RayTraceResult objectMouseOver();
 
     default BetterBlockPos playerFeet() {
         // TODO find a better way to deal with soul sand!!!!!
-        BetterBlockPos feet = new BetterBlockPos(player().position().x, player().position().y + 0.1251, player().position().z);
+        BetterBlockPos feet = new BetterBlockPos(player().getPositionVec().x, player().getPositionVec().y + 0.1251, player().getPositionVec().z);
 
         // sometimes when calling this from another thread or while world is null, it'll throw a NullPointerException
         // that causes the game to immediately crash
@@ -74,25 +74,25 @@ public interface IPlayerContext {
         // if there is an exception, the only overhead is Java generating the exception object... so we can ignore it
         try {
             if (world().getBlockState(feet).getBlock() instanceof SlabBlock) {
-                return feet.above();
+                return feet.up();
             }
         } catch (NullPointerException ignored) {}
 
         return feet;
     }
 
-    default Vec3 playerFeetAsVec() {
-        return new Vec3(player().position().x, player().position().y, player().position().z);
+    default Vector3d playerFeetAsVec() {
+        return new Vector3d(player().getPositionVec().x, player().getPositionVec().y, player().getPositionVec().z);
     }
 
-    default Vec3 playerHead() {
-        return new Vec3(player().position().x, player().position().y + player().getEyeHeight(), player().position().z);
+    default Vector3d playerHead() {
+        return new Vector3d(player().getPositionVec().x, player().getPositionVec().y + player().getEyeHeight(), player().getPositionVec().z);
     }
 
     BetterBlockPos viewerPos();
 
     default Rotation playerRotations() {
-        return new Rotation(player().getYRot(), player().getXRot());
+        return new Rotation(player().rotationYaw, player().rotationPitch);
     }
 
     static double eyeHeight(boolean ifSneaking) {
@@ -105,9 +105,9 @@ public interface IPlayerContext {
      * @return The position of the highlighted block
      */
     default Optional<BlockPos> getSelectedBlock() {
-        HitResult result = objectMouseOver();
-        if (result != null && result.getType() == HitResult.Type.BLOCK) {
-            return Optional.of(((BlockHitResult) result).getBlockPos());
+        RayTraceResult result = objectMouseOver();
+        if (result != null && result.getType() == RayTraceResult.Type.BLOCK) {
+            return Optional.of(((BlockRayTraceResult) result).getPos());
         }
         return Optional.empty();
     }

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

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

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

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

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

@@ -19,19 +19,20 @@ package baritone.api.utils;
 
 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
+import net.minecraft.block.AbstractFireBlock;
+import net.minecraft.block.BlockState;
+import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.Direction;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.BlockRayTraceResult;
+import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.shapes.VoxelShape;
+import net.minecraft.util.math.shapes.VoxelShapes;
+import net.minecraft.util.math.vector.Vector3d;
+
 import java.util.Optional;
-import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.util.Mth;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.block.BaseFireBlock;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.phys.HitResult;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.phys.shapes.Shapes;
-import net.minecraft.world.phys.shapes.VoxelShape;
 
 /**
  * @author Brady
@@ -52,13 +53,13 @@ public final class RotationUtils {
     /**
      * Offsets from the root block position to the center of each side.
      */
-    private static final Vec3[] BLOCK_SIDE_MULTIPLIERS = new Vec3[]{
-            new Vec3(0.5, 0, 0.5), // Down
-            new Vec3(0.5, 1, 0.5), // Up
-            new Vec3(0.5, 0.5, 0), // North
-            new Vec3(0.5, 0.5, 1), // South
-            new Vec3(0, 0.5, 0.5), // West
-            new Vec3(1, 0.5, 0.5)  // East
+    private static final Vector3d[] BLOCK_SIDE_MULTIPLIERS = new Vector3d[]{
+            new Vector3d(0.5, 0, 0.5), // Down
+            new Vector3d(0.5, 1, 0.5), // Up
+            new Vector3d(0.5, 0.5, 0), // North
+            new Vector3d(0.5, 0.5, 1), // South
+            new Vector3d(0, 0.5, 0.5), // West
+            new Vector3d(1, 0.5, 0.5)  // East
     };
 
     private RotationUtils() {}
@@ -71,7 +72,7 @@ public final class RotationUtils {
      * @return The rotation from the origin to the destination
      */
     public static Rotation calcRotationFromCoords(BlockPos orig, BlockPos dest) {
-        return calcRotationFromVec3d(new Vec3(orig.getX(), orig.getY(), orig.getZ()), new Vec3(dest.getX(), dest.getY(), dest.getZ()));
+        return calcRotationFromVec3d(new Vector3d(orig.getX(), orig.getY(), orig.getZ()), new Vector3d(dest.getX(), dest.getY(), dest.getZ()));
     }
 
     /**
@@ -100,7 +101,7 @@ public final class RotationUtils {
      * @return The rotation from the origin to the destination
      * @see #wrapAnglesToRelative(Rotation, Rotation)
      */
-    public static Rotation calcRotationFromVec3d(Vec3 orig, Vec3 dest, Rotation current) {
+    public static Rotation calcRotationFromVec3d(Vector3d orig, Vector3d dest, Rotation current) {
         return wrapAnglesToRelative(current, calcRotationFromVec3d(orig, dest));
     }
 
@@ -111,11 +112,11 @@ public final class RotationUtils {
      * @param dest The destination position
      * @return The rotation from the origin to the destination
      */
-    private static Rotation calcRotationFromVec3d(Vec3 orig, Vec3 dest) {
+    private static Rotation calcRotationFromVec3d(Vector3d orig, Vector3d dest) {
         double[] delta = {orig.x - dest.x, orig.y - dest.y, orig.z - dest.z};
-        double yaw = Mth.atan2(delta[0], -delta[2]);
+        double yaw = MathHelper.atan2(delta[0], -delta[2]);
         double dist = Math.sqrt(delta[0] * delta[0] + delta[2] * delta[2]);
-        double pitch = Mth.atan2(delta[1], dist);
+        double pitch = MathHelper.atan2(delta[1], dist);
         return new Rotation(
                 (float) (yaw * RAD_TO_DEG),
                 (float) (pitch * RAD_TO_DEG)
@@ -128,12 +129,12 @@ public final class RotationUtils {
      * @param rotation The input rotation
      * @return Look vector for the rotation
      */
-    public static Vec3 calcVector3dFromRotation(Rotation rotation) {
-        float f = Mth.cos(-rotation.getYaw() * (float) DEG_TO_RAD - (float) Math.PI);
-        float f1 = Mth.sin(-rotation.getYaw() * (float) DEG_TO_RAD - (float) Math.PI);
-        float f2 = -Mth.cos(-rotation.getPitch() * (float) DEG_TO_RAD);
-        float f3 = Mth.sin(-rotation.getPitch() * (float) DEG_TO_RAD);
-        return new Vec3((double) (f1 * f2), (double) f3, (double) (f * f2));
+    public static Vector3d calcVector3dFromRotation(Rotation rotation) {
+        float f = MathHelper.cos(-rotation.getYaw() * (float) DEG_TO_RAD - (float) Math.PI);
+        float f1 = MathHelper.sin(-rotation.getYaw() * (float) DEG_TO_RAD - (float) Math.PI);
+        float f2 = -MathHelper.cos(-rotation.getPitch() * (float) DEG_TO_RAD);
+        float f3 = MathHelper.sin(-rotation.getPitch() * (float) DEG_TO_RAD);
+        return new Vector3d((double) (f1 * f2), (double) f3, (double) (f * f2));
     }
 
     /**
@@ -181,8 +182,8 @@ public final class RotationUtils {
             Rotation hypothetical = ctx.playerRotations().add(new Rotation(0, 0.0001F));
             if (wouldSneak) {
                 // the concern here is: what if we're looking at it now, but as soon as we start sneaking we no longer are
-                HitResult result = RayTraceUtils.rayTraceTowards(ctx.player(), hypothetical, blockReachDistance, true);
-                if (result != null && result.getType() == HitResult.Type.BLOCK && ((BlockHitResult) result).getBlockPos().equals(pos)) {
+                RayTraceResult result = RayTraceUtils.rayTraceTowards(ctx.player(), hypothetical, blockReachDistance, true);
+                if (result != null && result.getType() == RayTraceResult.Type.BLOCK && ((BlockRayTraceResult) result).getPos().equals(pos)) {
                     return Optional.of(hypothetical); // yes, if we sneaked we would still be looking at the block
                 }
             } else {
@@ -198,13 +199,13 @@ public final class RotationUtils {
         BlockState state = ctx.world().getBlockState(pos);
         VoxelShape shape = state.getShape(ctx.world(), pos);
         if (shape.isEmpty()) {
-            shape = Shapes.block();
+            shape = VoxelShapes.fullCube();
         }
-        for (Vec3 sideOffset : BLOCK_SIDE_MULTIPLIERS) {
-            double xDiff = shape.min(Direction.Axis.X) * sideOffset.x + shape.max(Direction.Axis.X) * (1 - sideOffset.x);
-            double yDiff = shape.min(Direction.Axis.Y) * sideOffset.y + shape.max(Direction.Axis.Y) * (1 - sideOffset.y);
-            double zDiff = shape.min(Direction.Axis.Z) * sideOffset.z + shape.max(Direction.Axis.Z) * (1 - sideOffset.z);
-            possibleRotation = reachableOffset(ctx, pos, new Vec3(pos.getX(), pos.getY(), pos.getZ()).add(xDiff, yDiff, zDiff), blockReachDistance, wouldSneak);
+        for (Vector3d sideOffset : BLOCK_SIDE_MULTIPLIERS) {
+            double xDiff = shape.getStart(Direction.Axis.X) * sideOffset.x + shape.getEnd(Direction.Axis.X) * (1 - sideOffset.x);
+            double yDiff = shape.getStart(Direction.Axis.Y) * sideOffset.y + shape.getEnd(Direction.Axis.Y) * (1 - sideOffset.y);
+            double zDiff = shape.getStart(Direction.Axis.Z) * sideOffset.z + shape.getEnd(Direction.Axis.Z) * (1 - sideOffset.z);
+            possibleRotation = reachableOffset(ctx, pos, new Vector3d(pos.getX(), pos.getY(), pos.getZ()).add(xDiff, yDiff, zDiff), blockReachDistance, wouldSneak);
             if (possibleRotation.isPresent()) {
                 return possibleRotation;
             }
@@ -223,17 +224,17 @@ public final class RotationUtils {
      * @param blockReachDistance The block reach distance of the entity
      * @return The optional rotation
      */
-    public static Optional<Rotation> reachableOffset(IPlayerContext ctx, BlockPos pos, Vec3 offsetPos, double blockReachDistance, boolean wouldSneak) {
-        Vec3 eyes = wouldSneak ? RayTraceUtils.inferSneakingEyePosition(ctx.player()) : ctx.player().getEyePosition(1.0F);
+    public static Optional<Rotation> reachableOffset(IPlayerContext ctx, BlockPos pos, Vector3d offsetPos, double blockReachDistance, boolean wouldSneak) {
+        Vector3d eyes = wouldSneak ? RayTraceUtils.inferSneakingEyePosition(ctx.player()) : ctx.player().getEyePosition(1.0F);
         Rotation rotation = calcRotationFromVec3d(eyes, offsetPos, ctx.playerRotations());
         Rotation actualRotation = BaritoneAPI.getProvider().getBaritoneForPlayer(ctx.player()).getLookBehavior().getAimProcessor().peekRotation(rotation);
-        HitResult result = RayTraceUtils.rayTraceTowards(ctx.player(), actualRotation, blockReachDistance, wouldSneak);
+        RayTraceResult result = RayTraceUtils.rayTraceTowards(ctx.player(), actualRotation, blockReachDistance, wouldSneak);
         //System.out.println(result);
-        if (result != null && result.getType() == HitResult.Type.BLOCK) {
-            if (((BlockHitResult) result).getBlockPos().equals(pos)) {
+        if (result != null && result.getType() == RayTraceResult.Type.BLOCK) {
+            if (((BlockRayTraceResult) result).getPos().equals(pos)) {
                 return Optional.of(rotation);
             }
-            if (ctx.world().getBlockState(pos).getBlock() instanceof BaseFireBlock && ((BlockHitResult) result).getBlockPos().equals(pos.below())) {
+            if (ctx.world().getBlockState(pos).getBlock() instanceof AbstractFireBlock && ((BlockRayTraceResult) result).getPos().equals(pos.down())) {
                 return Optional.of(rotation);
             }
         }
@@ -254,28 +255,28 @@ public final class RotationUtils {
     }
 
     @Deprecated
-    public static Optional<Rotation> reachable(LocalPlayer entity, BlockPos pos, double blockReachDistance) {
+    public static Optional<Rotation> reachable(ClientPlayerEntity entity, BlockPos pos, double blockReachDistance) {
         return reachable(entity, pos, blockReachDistance, false);
     }
 
     @Deprecated
-    public static Optional<Rotation> reachable(LocalPlayer entity, BlockPos pos, double blockReachDistance, boolean wouldSneak) {
+    public static Optional<Rotation> reachable(ClientPlayerEntity entity, BlockPos pos, double blockReachDistance, boolean wouldSneak) {
         IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer(entity);
         IPlayerContext ctx = baritone.getPlayerContext();
         return reachable(ctx, pos, blockReachDistance, wouldSneak);
     }
 
     @Deprecated
-    public static Optional<Rotation> reachableOffset(Entity entity, BlockPos pos, Vec3 offsetPos, double blockReachDistance, boolean wouldSneak) {
-        Vec3 eyes = wouldSneak ? RayTraceUtils.inferSneakingEyePosition(entity) : entity.getEyePosition(1.0F);
-        Rotation rotation = calcRotationFromVec3d(eyes, offsetPos, new Rotation(entity.getYRot(), entity.getXRot()));
-        HitResult result = RayTraceUtils.rayTraceTowards(entity, rotation, blockReachDistance, wouldSneak);
+    public static Optional<Rotation> reachableOffset(Entity entity, BlockPos pos, Vector3d offsetPos, double blockReachDistance, boolean wouldSneak) {
+        Vector3d eyes = wouldSneak ? RayTraceUtils.inferSneakingEyePosition(entity) : entity.getEyePosition(1.0F);
+        Rotation rotation = calcRotationFromVec3d(eyes, offsetPos, new Rotation(entity.rotationYaw, entity.rotationPitch));
+        RayTraceResult result = RayTraceUtils.rayTraceTowards(entity, rotation, blockReachDistance, wouldSneak);
         //System.out.println(result);
-        if (result != null && result.getType() == HitResult.Type.BLOCK) {
-            if (((BlockHitResult) result).getBlockPos().equals(pos)) {
+        if (result != null && result.getType() == RayTraceResult.Type.BLOCK) {
+            if (((BlockRayTraceResult) result).getPos().equals(pos)) {
                 return Optional.of(rotation);
             }
-            if (entity.level.getBlockState(pos).getBlock() instanceof BaseFireBlock && ((BlockHitResult) result).getBlockPos().equals(pos.below())) {
+            if (entity.world.getBlockState(pos).getBlock() instanceof AbstractFireBlock && ((BlockRayTraceResult) result).getPos().equals(pos.down())) {
                 return Optional.of(rotation);
             }
         }
@@ -284,6 +285,6 @@ public final class RotationUtils {
 
     @Deprecated
     public static Optional<Rotation> reachableCenter(Entity entity, BlockPos pos, double blockReachDistance, boolean wouldSneak) {
-        return reachableOffset(entity, pos, VecUtils.calculateBlockCenter(entity.level, pos), blockReachDistance, wouldSneak);
+        return reachableOffset(entity, pos, VecUtils.calculateBlockCenter(entity.world, pos), blockReachDistance, wouldSneak);
     }
 }

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

@@ -19,13 +19,14 @@ package baritone.api.utils;
 
 import baritone.api.BaritoneAPI;
 import baritone.api.Settings;
+import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
-import net.minecraft.core.Direction;
-import net.minecraft.core.Registry;
-import net.minecraft.core.Vec3i;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.level.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.util.Direction;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.math.vector.Vector3i;
+import net.minecraft.util.registry.Registry;
+
 import java.awt.*;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -106,7 +107,7 @@ public class SettingsUtil {
     }
 
     private static Path settingsByName(String name) {
-        return Minecraft.getInstance().gameDirectory.toPath().resolve("baritone").resolve(name);
+        return Minecraft.getInstance().gameDir.toPath().resolve("baritone").resolve(name);
     }
 
     public static List<Settings.Setting> modifiedSettings(Settings settings) {
@@ -239,8 +240,8 @@ public class SettingsUtil {
                 color -> color.getRed() + "," + color.getGreen() + "," + color.getBlue()
         ),
         VEC3I(
-                Vec3i.class,
-                str -> new Vec3i(Integer.parseInt(str.split(",")[0]), Integer.parseInt(str.split(",")[1]), Integer.parseInt(str.split(",")[2])),
+                Vector3i.class,
+                str -> new Vector3i(Integer.parseInt(str.split(",")[0]), Integer.parseInt(str.split(",")[1]), Integer.parseInt(str.split(",")[2])),
                 vec -> vec.getX() + "," + vec.getY() + "," + vec.getZ()
         ),
         BLOCK(
@@ -250,7 +251,7 @@ public class SettingsUtil {
         ),
         ITEM(
                 Item.class,
-                str -> Registry.ITEM.get(new ResourceLocation(str.trim())), // TODO this now returns AIR on failure instead of null, is that an issue?
+                str -> Registry.ITEM.getOrDefault(new ResourceLocation(str.trim())), // TODO this now returns AIR on failure instead of null, is that an issue?
                 item -> Registry.ITEM.getKey(item).toString()
         ),
         LIST() {

src/api/java/baritone/api/utils/VecUtils.java

@@ -17,14 +17,14 @@
 
 package baritone.api.utils;
 
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.BaseFireBlock;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.phys.shapes.VoxelShape;
+import net.minecraft.block.AbstractFireBlock;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.Direction;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.shapes.VoxelShape;
+import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.world.World;
 
 /**
  * @author Brady
@@ -42,22 +42,22 @@ public final class VecUtils {
      * @return The center of the block's bounding box
      * @see #getBlockPosCenter(BlockPos)
      */
-    public static Vec3 calculateBlockCenter(Level world, BlockPos pos) {
+    public static Vector3d calculateBlockCenter(World world, BlockPos pos) {
         BlockState b = world.getBlockState(pos);
         VoxelShape shape = b.getCollisionShape(world, pos);
         if (shape.isEmpty()) {
             return getBlockPosCenter(pos);
         }
-        double xDiff = (shape.min(Direction.Axis.X) + shape.max(Direction.Axis.X)) / 2;
-        double yDiff = (shape.min(Direction.Axis.Y) + shape.max(Direction.Axis.Y)) / 2;
-        double zDiff = (shape.min(Direction.Axis.Z) + shape.max(Direction.Axis.Z)) / 2;
+        double xDiff = (shape.getStart(Direction.Axis.X) + shape.getEnd(Direction.Axis.X)) / 2;
+        double yDiff = (shape.getStart(Direction.Axis.Y) + shape.getEnd(Direction.Axis.Y)) / 2;
+        double zDiff = (shape.getStart(Direction.Axis.Z) + shape.getEnd(Direction.Axis.Z)) / 2;
         if (Double.isNaN(xDiff) || Double.isNaN(yDiff) || Double.isNaN(zDiff)) {
             throw new IllegalStateException(b + " " + pos + " " + shape);
         }
-        if (b.getBlock() instanceof BaseFireBlock) {//look at bottom of fire when putting it out
+        if (b.getBlock() instanceof AbstractFireBlock) {//look at bottom of fire when putting it out
             yDiff = 0;
         }
-        return new Vec3(
+        return new Vector3d(
                 pos.getX() + xDiff,
                 pos.getY() + yDiff,
                 pos.getZ() + zDiff
@@ -72,10 +72,10 @@ public final class VecUtils {
      *
      * @param pos The block position
      * @return The assumed center of the position
-     * @see #calculateBlockCenter(Level, BlockPos)
+     * @see #calculateBlockCenter(World, BlockPos)
      */
-    public static Vec3 getBlockPosCenter(BlockPos pos) {
-        return new Vec3(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
+    public static Vector3d getBlockPosCenter(BlockPos pos) {
+        return new Vector3d(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
     }
 
     /**
@@ -105,7 +105,7 @@ public final class VecUtils {
      * @see #getBlockPosCenter(BlockPos)
      */
     public static double entityDistanceToCenter(Entity entity, BlockPos pos) {
-        return distanceToCenter(pos, entity.position().x, entity.position().y, entity.position().z);
+        return distanceToCenter(pos, entity.getPositionVec().x, entity.getPositionVec().y, entity.getPositionVec().z);
     }
 
     /**
@@ -118,6 +118,6 @@ public final class VecUtils {
      * @see #getBlockPosCenter(BlockPos)
      */
     public static double entityFlatDistanceToCenter(Entity entity, BlockPos pos) {
-        return distanceToCenter(pos, entity.position().x, pos.getY() + 0.5, entity.position().z);
+        return distanceToCenter(pos, entity.getPositionVec().x, pos.getY() + 0.5, entity.getPositionVec().z);
     }
 }

src/api/java/baritone/api/utils/gui/BaritoneToast.java

@@ -17,66 +17,64 @@
 
 package baritone.api.utils.gui;
 
+import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.platform.GlStateManager;
-import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.components.toasts.Toast;
-import net.minecraft.client.gui.components.toasts.ToastComponent;
-import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.client.gui.toasts.IToast;
+import net.minecraft.client.gui.toasts.ToastGui;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.text.ITextComponent;
 
-public class BaritoneToast implements Toast {
+public class BaritoneToast implements IToast {
     private String title;
     private String subtitle;
     private long firstDrawTime;
     private boolean newDisplay;
     private long totalShowTime;
 
-    public BaritoneToast(Component titleComponent, Component subtitleComponent, long totalShowTime) {
+    public BaritoneToast(ITextComponent titleComponent, ITextComponent subtitleComponent, long totalShowTime) {
         this.title = titleComponent.getString();
         this.subtitle = subtitleComponent == null ? null : subtitleComponent.getString();
         this.totalShowTime = totalShowTime;
     }
 
-    public Visibility render(PoseStack matrixStack, ToastComponent toastGui, long delta) {
+    public Visibility func_230444_a_(MatrixStack matrixStack, ToastGui toastGui, long delta) {
         if (this.newDisplay) {
             this.firstDrawTime = delta;
             this.newDisplay = false;
         }
 
-
-        //TODO: check
-        toastGui.getMinecraft().getTextureManager().bindForSetup(new ResourceLocation("textures/gui/toasts.png"));
-        //GlStateManager._color4f(1.0F, 1.0F, 1.0F, 255.0F);
+        toastGui.getMinecraft().getTextureManager().bindTexture(new ResourceLocation("textures/gui/toasts.png"));
+        GlStateManager.color4f(1.0F, 1.0F, 1.0F, 255.0f);
         toastGui.blit(matrixStack, 0, 0, 0, 32, 160, 32);
 
         if (this.subtitle == null) {
-            toastGui.getMinecraft().font.draw(matrixStack, this.title, 18, 12, -11534256);
+            toastGui.getMinecraft().fontRenderer.drawString(matrixStack, this.title, 18, 12, -11534256);
         } else {
-            toastGui.getMinecraft().font.draw(matrixStack, this.title, 18, 7, -11534256);
-            toastGui.getMinecraft().font.draw(matrixStack, this.subtitle, 18, 18, -16777216);
+            toastGui.getMinecraft().fontRenderer.drawString(matrixStack, this.title, 18, 7, -11534256);
+            toastGui.getMinecraft().fontRenderer.drawString(matrixStack, this.subtitle, 18, 18, -16777216);
         }
 
         return delta - this.firstDrawTime < totalShowTime ? Visibility.SHOW : Visibility.HIDE;
     }
 
-    public void setDisplayedText(Component titleComponent, Component subtitleComponent) {
+    public void setDisplayedText(ITextComponent titleComponent, ITextComponent subtitleComponent) {
         this.title = titleComponent.getString();
         this.subtitle = subtitleComponent == null ? null : subtitleComponent.getString();
         this.newDisplay = true;
     }
 
-    public static void addOrUpdate(ToastComponent toast, Component title, Component subtitle, long totalShowTime) {
+    public static void addOrUpdate(ToastGui toast, ITextComponent title, ITextComponent subtitle, long totalShowTime) {
         BaritoneToast baritonetoast = toast.getToast(BaritoneToast.class, new Object());
 
         if (baritonetoast == null) {
-            toast.addToast(new BaritoneToast(title, subtitle, totalShowTime));
+            toast.add(new BaritoneToast(title, subtitle, totalShowTime));
         } else {
             baritonetoast.setDisplayedText(title, subtitle);
         }
     }
 
-    public static void addOrUpdate(Component title, Component subtitle) {
-        addOrUpdate(Minecraft.getInstance().getToasts(), title, subtitle, baritone.api.BaritoneAPI.getSettings().toastTimer.value);
+    public static void addOrUpdate(ITextComponent title, ITextComponent subtitle) {
+        addOrUpdate(Minecraft.getInstance().getToastGui(), title, subtitle, baritone.api.BaritoneAPI.getSettings().toastTimer.value);
     }
 }

src/api/java/baritone/api/utils/interfaces/IGoalRenderPos.java

@@ -17,7 +17,7 @@
 
 package baritone.api.utils.interfaces;
 
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;
 
 public interface IGoalRenderPos {
 

src/launch/java/baritone/launch/mixins/MixinBitArray.java

@@ -0,0 +1,46 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.launch.mixins;
+
+import baritone.utils.accessor.IBitArray;
+import net.minecraft.util.BitArray;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+@Mixin(BitArray.class)
+public abstract class MixinBitArray implements IBitArray {
+
+    @Shadow
+    @Final
+    private int bitsPerEntry;
+
+    @Shadow
+    @Final
+    private long maxEntryValue;
+
+    @Override
+    public long getMaxEntryValue() {
+        return maxEntryValue;
+    }
+
+    @Override
+    public int getBitsPerEntry() {
+        return bitsPerEntry;
+    }
+}

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

@@ -18,68 +18,68 @@
 package baritone.launch.mixins;
 
 import baritone.utils.accessor.IChunkArray;
+import net.minecraft.util.math.ChunkPos;
+import net.minecraft.world.chunk.Chunk;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
 import java.util.concurrent.atomic.AtomicReferenceArray;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.chunk.LevelChunk;
 
-@Mixin(targets = "net.minecraft.client.multiplayer.ClientChunkCache$Storage")
+@Mixin(targets = "net.minecraft.client.multiplayer.ClientChunkProvider$ChunkArray")
 public abstract class MixinChunkArray implements IChunkArray {
     @Shadow
-    private AtomicReferenceArray<LevelChunk> chunks;
+    private AtomicReferenceArray<Chunk> chunks;
     @Shadow
-    private int chunkRadius;
+    private int viewDistance;
     @Shadow
-    private int viewRange;
+    private int sideLength;
     @Shadow
-    private int viewCenterX;
+    private int centerX;
     @Shadow
-    private int viewCenterZ;
+    private int centerZ;
     @Shadow
-    private int chunkCount;
+    private int loaded;
 
     @Shadow
-    protected abstract boolean inRange(int x, int z);
+    protected abstract boolean inView(int x, int z);
 
     @Shadow
     protected abstract int getIndex(int x, int z);
 
     @Shadow
-    protected abstract void replace(int index, LevelChunk chunk);
+    protected abstract void replace(int index, Chunk chunk);
 
     @Override
     public int centerX() {
-        return viewCenterX;
+        return centerX;
     }
 
     @Override
     public int centerZ() {
-        return viewCenterZ;
+        return centerZ;
     }
 
     @Override
     public int viewDistance() {
-        return chunkRadius;
+        return viewDistance;
     }
 
     @Override
-    public AtomicReferenceArray<LevelChunk> getChunks() {
+    public AtomicReferenceArray<Chunk> getChunks() {
         return chunks;
     }
 
     @Override
     public void copyFrom(IChunkArray other) {
-        viewCenterX = other.centerX();
-        viewCenterZ = other.centerZ();
+        centerX = other.centerX();
+        centerZ = other.centerZ();
 
-        AtomicReferenceArray<LevelChunk> copyingFrom = other.getChunks();
+        AtomicReferenceArray<Chunk> copyingFrom = other.getChunks();
         for (int k = 0; k < copyingFrom.length(); ++k) {
-            LevelChunk chunk = copyingFrom.get(k);
+            Chunk chunk = copyingFrom.get(k);
             if (chunk != null) {
                 ChunkPos chunkpos = chunk.getPos();
-                if (inRange(chunkpos.x, chunkpos.z)) {
+                if (inView(chunkpos.x, chunkpos.z)) {
                     int index = getIndex(chunkpos.x, chunkpos.z);
                     if (chunks.get(index) != null) {
                         throw new IllegalStateException("Doing this would mutate the client's REAL loaded chunks?!");

src/launch/java/baritone/launch/mixins/MixinClientChunkProvider.java

@@ -19,26 +19,24 @@ package baritone.launch.mixins;
 
 import baritone.utils.accessor.IChunkArray;
 import baritone.utils.accessor.IClientChunkProvider;
-import org.spongepowered.asm.mixin.Final;
+import net.minecraft.client.multiplayer.ClientChunkProvider;
+import net.minecraft.client.world.ClientWorld;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
 import java.lang.reflect.Field;
 import java.util.Arrays;
-import net.minecraft.client.multiplayer.ClientChunkCache;
-import net.minecraft.client.multiplayer.ClientLevel;
 
-@Mixin(ClientChunkCache.class)
+@Mixin(ClientChunkProvider.class)
 public class MixinClientChunkProvider implements IClientChunkProvider {
 
-    @Final
     @Shadow
-    ClientLevel level;
+    private ClientWorld world;
 
     @Override
-    public ClientChunkCache createThreadSafeCopy() {
+    public ClientChunkProvider createThreadSafeCopy() {
         IChunkArray arr = extractReferenceArray();
-        ClientChunkCache result = new ClientChunkCache(level, arr.viewDistance() - 3); // -3 because its adds 3 for no reason lmao
+        ClientChunkProvider result = new ClientChunkProvider(world, arr.viewDistance() - 3); // -3 because its adds 3 for no reason lmao
         IChunkArray copyArr = ((IClientChunkProvider) result).extractReferenceArray();
         copyArr.copyFrom(arr);
         if (copyArr.viewDistance() != arr.viewDistance()) {
@@ -49,7 +47,7 @@ public class MixinClientChunkProvider implements IClientChunkProvider {
 
     @Override
     public IChunkArray extractReferenceArray() {
-        for (Field f : ClientChunkCache.class.getDeclaredFields()) {
+        for (Field f : ClientChunkProvider.class.getDeclaredFields()) {
             if (IChunkArray.class.isAssignableFrom(f.getType())) {
                 try {
                     return (IChunkArray) f.get(this);
@@ -58,6 +56,6 @@ public class MixinClientChunkProvider implements IClientChunkProvider {
                 }
             }
         }
-        throw new RuntimeException(Arrays.toString(ClientChunkCache.class.getDeclaredFields()));
+        throw new RuntimeException(Arrays.toString(ClientChunkProvider.class.getDeclaredFields()));
     }
 }

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

@@ -23,10 +23,10 @@ import baritone.api.IBaritone;
 import baritone.api.event.events.ChunkEvent;
 import baritone.api.event.events.type.EventState;
 import baritone.cache.CachedChunk;
-import net.minecraft.client.multiplayer.ClientPacketListener;
-import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.network.protocol.game.*;
-import net.minecraft.world.level.ChunkPos;
+import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.client.network.play.ClientPlayNetHandler;
+import net.minecraft.network.play.server.*;
+import net.minecraft.util.math.ChunkPos;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -36,7 +36,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
  * @author Brady
  * @since 8/3/2018
  */
-@Mixin(ClientPacketListener.class)
+@Mixin(ClientPlayNetHandler.class)
 public class MixinClientPlayNetHandler {
 
     // unused lol
@@ -64,19 +64,19 @@ public class MixinClientPlayNetHandler {
     }*/
 
     @Inject(
-            method = "handleLevelChunkWithLight",
+            method = "handleChunkData",
             at = @At("RETURN")
     )
-    private void postHandleChunkData(ClientboundLevelChunkWithLightPacket packetIn, CallbackInfo ci) {
+    private void postHandleChunkData(SChunkDataPacket packetIn, CallbackInfo ci) {
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            LocalPlayer player = ibaritone.getPlayerContext().player();
-            if (player != null && player.connection == (ClientPacketListener) (Object) this) {
+            ClientPlayerEntity player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (ClientPlayNetHandler) (Object) this) {
                 ibaritone.getGameEventHandler().onChunkEvent(
                         new ChunkEvent(
                                 EventState.POST,
-                                !packetIn.isSkippable() ? ChunkEvent.Type.POPULATE_FULL : ChunkEvent.Type.POPULATE_PARTIAL,
-                                packetIn.getX(),
-                                packetIn.getZ()
+                                packetIn.isFullChunk() ? ChunkEvent.Type.POPULATE_FULL : ChunkEvent.Type.POPULATE_PARTIAL,
+                                packetIn.getChunkX(),
+                                packetIn.getChunkZ()
                         )
                 );
             }
@@ -84,13 +84,13 @@ public class MixinClientPlayNetHandler {
     }
 
     @Inject(
-            method = "handleForgetLevelChunk",
+            method = "processChunkUnload",
             at = @At("HEAD")
     )
-    private void preChunkUnload(ClientboundForgetLevelChunkPacket packet, CallbackInfo ci) {
+    private void preChunkUnload(SUnloadChunkPacket packet, CallbackInfo ci) {
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            LocalPlayer player = ibaritone.getPlayerContext().player();
-            if (player != null && player.connection == (ClientPacketListener) (Object) this) {
+            ClientPlayerEntity player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (ClientPlayNetHandler) (Object) this) {
                 ibaritone.getGameEventHandler().onChunkEvent(
                         new ChunkEvent(EventState.PRE, ChunkEvent.Type.UNLOAD, packet.getX(), packet.getZ())
                 );
@@ -99,13 +99,13 @@ public class MixinClientPlayNetHandler {
     }
 
     @Inject(
-            method = "handleForgetLevelChunk",
+            method = "processChunkUnload",
             at = @At("RETURN")
     )
-    private void postChunkUnload(ClientboundForgetLevelChunkPacket packet, CallbackInfo ci) {
+    private void postChunkUnload(SUnloadChunkPacket packet, CallbackInfo ci) {
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            LocalPlayer player = ibaritone.getPlayerContext().player();
-            if (player != null && player.connection == (ClientPacketListener) (Object) this) {
+            ClientPlayerEntity player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (ClientPlayNetHandler) (Object) this) {
                 ibaritone.getGameEventHandler().onChunkEvent(
                         new ChunkEvent(EventState.POST, ChunkEvent.Type.UNLOAD, packet.getX(), packet.getZ())
                 );
@@ -114,19 +114,19 @@ public class MixinClientPlayNetHandler {
     }
 
     @Inject(
-            method = "handleBlockUpdate",
+            method = "handleBlockChange",
             at = @At("RETURN")
     )
-    private void postHandleBlockChange(ClientboundBlockUpdatePacket packetIn, CallbackInfo ci) {
+    private void postHandleBlockChange(SChangeBlockPacket packetIn, CallbackInfo ci) {
         if (!Baritone.settings().repackOnAnyBlockChange.value) {
             return;
         }
-        if (!CachedChunk.BLOCKS_TO_KEEP_TRACK_OF.contains(packetIn.getBlockState().getBlock())) {
+        if (!CachedChunk.BLOCKS_TO_KEEP_TRACK_OF.contains(packetIn.getState().getBlock())) {
             return;
         }
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            LocalPlayer player = ibaritone.getPlayerContext().player();
-            if (player != null && player.connection == (ClientPacketListener) (Object) this) {
+            ClientPlayerEntity player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (ClientPlayNetHandler) (Object) this) {
                 ibaritone.getGameEventHandler().onChunkEvent(
                         new ChunkEvent(
                                 EventState.POST,
@@ -140,15 +140,15 @@ public class MixinClientPlayNetHandler {
     }
 
     @Inject(
-            method = "handleChunkBlocksUpdate",
+            method = "handleMultiBlockChange",
             at = @At("RETURN")
     )
-    private void postHandleMultiBlockChange(ClientboundSectionBlocksUpdatePacket packetIn, CallbackInfo ci) {
+    private void postHandleMultiBlockChange(SMultiBlockChangePacket packetIn, CallbackInfo ci) {
         if (!Baritone.settings().repackOnAnyBlockChange.value) {
             return;
         }
         ChunkPos[] chunkPos = new ChunkPos[1];
-        packetIn.runUpdates((pos, state) -> {
+        packetIn.func_244310_a((pos, state) -> {
             if (CachedChunk.BLOCKS_TO_KEEP_TRACK_OF.contains(state.getBlock())) {
                 chunkPos[0] = new ChunkPos(pos);
             }
@@ -157,8 +157,8 @@ public class MixinClientPlayNetHandler {
             return;
         }
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            LocalPlayer player = ibaritone.getPlayerContext().player();
-            if (player != null && player.connection == (ClientPacketListener) (Object) this) {
+            ClientPlayerEntity player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (ClientPlayNetHandler) (Object) this) {
                 ibaritone.getGameEventHandler().onChunkEvent(
                         new ChunkEvent(
                                 EventState.POST,
@@ -172,16 +172,16 @@ public class MixinClientPlayNetHandler {
     }
 
     @Inject(
-            method = "handlePlayerCombatKill",
+            method = "handleCombatEvent",
             at = @At(
                     value = "INVOKE",
-                    target = "Lnet/minecraft/client/player/LocalPlayer;shouldShowDeathScreen()Z"
+                    target = "net/minecraft/client/Minecraft.displayGuiScreen(Lnet/minecraft/client/gui/screen/Screen;)V"
             )
     )
-    private void onPlayerDeath(ClientboundPlayerCombatKillPacket packetIn, CallbackInfo ci) {
+    private void onPlayerDeath(SCombatPacket packetIn, CallbackInfo ci) {
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            LocalPlayer player = ibaritone.getPlayerContext().player();
-            if (player != null && player.connection == (ClientPacketListener) (Object) this) {
+            ClientPlayerEntity player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (ClientPlayNetHandler) (Object) this) {
                 ibaritone.getGameEventHandler().onPlayerDeath();
             }
         }

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

@@ -24,9 +24,9 @@ import baritone.api.event.events.PlayerUpdateEvent;
 import baritone.api.event.events.SprintStateEvent;
 import baritone.api.event.events.type.EventState;
 import baritone.behavior.LookBehavior;
-import net.minecraft.client.KeyMapping;
-import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.world.entity.player.Abilities;
+import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.entity.player.PlayerAbilities;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -37,17 +37,17 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
  * @author Brady
  * @since 8/1/2018
  */
-@Mixin(LocalPlayer.class)
+@Mixin(ClientPlayerEntity.class)
 public class MixinClientPlayerEntity {
 
     @Inject(
-            method = "chat",
+            method = "sendChatMessage",
             at = @At("HEAD"),
             cancellable = true
     )
     private void sendChatMessage(String msg, CallbackInfo ci) {
         ChatEvent event = new ChatEvent(msg);
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this);
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
         if (baritone == null) {
             return;
         }
@@ -61,43 +61,43 @@ public class MixinClientPlayerEntity {
             method = "tick",
             at = @At(
                     value = "INVOKE",
-                    target = "net/minecraft/client/player/AbstractClientPlayer.tick()V",
+                    target = "net/minecraft/client/entity/player/AbstractClientPlayerEntity.tick()V",
                     shift = At.Shift.AFTER
             )
     )
     private void onPreUpdate(CallbackInfo ci) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this);
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
         if (baritone != null) {
             baritone.getGameEventHandler().onPlayerUpdate(new PlayerUpdateEvent(EventState.PRE));
         }
     }
 
     @Redirect(
-            method = "aiStep",
+            method = "livingTick",
             at = @At(
                     value = "FIELD",
-                    target = "net/minecraft/world/entity/player/Abilities.mayfly:Z"
+                    target = "net/minecraft/entity/player/PlayerAbilities.allowFlying:Z"
             )
     )
-    private boolean isAllowFlying(Abilities capabilities) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this);
+    private boolean isAllowFlying(PlayerAbilities capabilities) {
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
         if (baritone == null) {
-            return capabilities.mayfly;
+            return capabilities.allowFlying;
         }
-        return !baritone.getPathingBehavior().isPathing() && capabilities.mayfly;
+        return !baritone.getPathingBehavior().isPathing() && capabilities.allowFlying;
     }
 
     @Redirect(
-            method = "aiStep",
+            method = "livingTick",
             at = @At(
                     value = "INVOKE",
-                    target = "net/minecraft/client/KeyMapping.isDown()Z"
+                    target = "net/minecraft/client/settings/KeyBinding.isKeyDown()Z"
             )
     )
-    private boolean isKeyDown(KeyMapping keyBinding) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this);
+    private boolean isKeyDown(KeyBinding keyBinding) {
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
         if (baritone == null) {
-            return keyBinding.isDown();
+            return keyBinding.isKeyDown();
         }
         SprintStateEvent event = new SprintStateEvent();
         baritone.getGameEventHandler().onPlayerSprintState(event);
@@ -108,17 +108,17 @@ public class MixinClientPlayerEntity {
             // hitting control shouldn't make all bots sprint
             return false;
         }
-        return keyBinding.isDown();
+        return keyBinding.isKeyDown();
     }
 
     @Inject(
-            method = "rideTick",
+            method = "updateRidden",
             at = @At(
                     value = "HEAD"
             )
     )
     private void updateRidden(CallbackInfo cb) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this);
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
         if (baritone != null) {
             ((LookBehavior) baritone.getLookBehavior()).pig();
         }

src/launch/java/baritone/launch/mixins/MixinCommandSuggestionHelper.java

@@ -23,8 +23,8 @@ import com.mojang.brigadier.ParseResults;
 import com.mojang.brigadier.context.StringRange;
 import com.mojang.brigadier.suggestion.Suggestion;
 import com.mojang.brigadier.suggestion.Suggestions;
-import net.minecraft.client.gui.components.CommandSuggestions;
-import net.minecraft.client.gui.components.EditBox;
+import net.minecraft.client.gui.CommandSuggestionHelper;
+import net.minecraft.client.gui.widget.TextFieldWidget;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -41,37 +41,37 @@ import java.util.stream.Stream;
  * @author Brady
  * @since 10/9/2019
  */
-@Mixin(CommandSuggestions.class)
+@Mixin(CommandSuggestionHelper.class)
 public class MixinCommandSuggestionHelper {
 
     @Shadow
     @Final
-    EditBox input;
+    private TextFieldWidget inputField;
 
     @Shadow
     @Final
-    private List<String> commandUsage;
+    private List<String> exceptionList;
 
     @Shadow
-    private ParseResults currentParse;
+    private ParseResults parseResults;
 
     @Shadow
-    private CompletableFuture<Suggestions> pendingSuggestions;
+    private CompletableFuture<Suggestions> suggestionsFuture;
 
     @Shadow
-    private CommandSuggestions.SuggestionsList suggestions;
+    private CommandSuggestionHelper.Suggestions suggestions;
 
     @Shadow
-    boolean keepSuggestions;
+    boolean isApplyingSuggestion;
 
     @Inject(
-            method = "updateCommandInfo",
+            method = "init",
             at = @At("HEAD"),
             cancellable = true
     )
     private void preUpdateSuggestion(CallbackInfo ci) {
         // Anything that is present in the input text before the cursor position
-        String prefix = this.input.getValue().substring(0, Math.min(this.input.getValue().length(), this.input.getCursorPosition()));
+        String prefix = this.inputField.getText().substring(0, Math.min(this.inputField.getText().length(), this.inputField.getCursorPosition()));
 
         TabCompleteEvent event = new TabCompleteEvent(prefix);
         BaritoneAPI.getProvider().getPrimaryBaritone().getGameEventHandler().onPreTabComplete(event);
@@ -84,19 +84,19 @@ public class MixinCommandSuggestionHelper {
         if (event.completions != null) {
             ci.cancel();
 
-            this.currentParse = null; // stop coloring
+            this.parseResults = null; // stop coloring
 
-            if (this.keepSuggestions) { // Supress suggestions update when cycling suggestions.
+            if (this.isApplyingSuggestion) { // Supress suggestions update when cycling suggestions.
                 return;
             }
 
-            this.input.setSuggestion(null); // clear old suggestions
+            this.inputField.setSuggestion(null); // clear old suggestions
             this.suggestions = null;
             // TODO: Support populating the command usage
-            this.commandUsage.clear();
+            this.exceptionList.clear();
 
             if (event.completions.length == 0) {
-                this.pendingSuggestions = Suggestions.empty();
+                this.suggestionsFuture = Suggestions.empty();
             } else {
                 StringRange range = StringRange.between(prefix.lastIndexOf(" ") + 1, prefix.length()); // if there is no space this starts at 0
 
@@ -106,10 +106,10 @@ public class MixinCommandSuggestionHelper {
 
                 Suggestions suggestions = new Suggestions(range, suggestionList);
 
-                this.pendingSuggestions = new CompletableFuture<>();
-                this.pendingSuggestions.complete(suggestions);
+                this.suggestionsFuture = new CompletableFuture<>();
+                this.suggestionsFuture.complete(suggestions);
             }
-            ((CommandSuggestions) (Object) this).showSuggestions(true); // actually populate the suggestions list from the suggestions future
+            ((CommandSuggestionHelper) (Object) this).updateSuggestions(true); // actually populate the suggestions list from the suggestions future
         }
     }
 }

src/launch/java/baritone/launch/mixins/MixinEntity.java

@@ -19,8 +19,8 @@ package baritone.launch.mixins;
 
 import baritone.api.BaritoneAPI;
 import baritone.api.event.events.RotationMoveEvent;
-import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.world.entity.Entity;
+import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.entity.Entity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -32,10 +32,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public class MixinEntity {
 
     @Shadow
-    private float yRot;
+    private float rotationYaw;
 
     @Shadow
-    private float xRot;
+    private float rotationPitch;
 
     @Unique
     private RotationMoveEvent motionUpdateRotationEvent;
@@ -46,13 +46,13 @@ public class MixinEntity {
     )
     private void moveRelativeHead(CallbackInfo info) {
         // noinspection ConstantConditions
-        if (!LocalPlayer.class.isInstance(this) || BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this) == null) {
+        if (!ClientPlayerEntity.class.isInstance(this) || BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this) == null) {
             return;
         }
-        this.motionUpdateRotationEvent = new RotationMoveEvent(RotationMoveEvent.Type.MOTION_UPDATE, this.yRot, this.xRot);
-        BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this).getGameEventHandler().onPlayerRotationMove(motionUpdateRotationEvent);
-        this.yRot = this.motionUpdateRotationEvent.getYaw();
-        this.xRot = this.motionUpdateRotationEvent.getPitch();
+        this.motionUpdateRotationEvent = new RotationMoveEvent(RotationMoveEvent.Type.MOTION_UPDATE, this.rotationYaw, this.rotationPitch);
+        BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this).getGameEventHandler().onPlayerRotationMove(motionUpdateRotationEvent);
+        this.rotationYaw = this.motionUpdateRotationEvent.getYaw();
+        this.rotationPitch = this.motionUpdateRotationEvent.getPitch();
     }
 
     @Inject(
@@ -61,8 +61,8 @@ public class MixinEntity {
     )
     private void moveRelativeReturn(CallbackInfo info) {
         if (this.motionUpdateRotationEvent != null) {
-            this.yRot = this.motionUpdateRotationEvent.getOriginal().getYaw();
-            this.xRot = this.motionUpdateRotationEvent.getOriginal().getPitch();
+            this.rotationYaw = this.motionUpdateRotationEvent.getOriginal().getYaw();
+            this.rotationPitch = this.motionUpdateRotationEvent.getOriginal().getPitch();
             this.motionUpdateRotationEvent = null;
         }
     }

src/launch/java/baritone/launch/mixins/MixinEntityRenderManager.java

@@ -18,25 +18,25 @@
 package baritone.launch.mixins;
 
 import baritone.utils.accessor.IEntityRenderManager;
-import net.minecraft.client.renderer.entity.EntityRenderDispatcher;
+import net.minecraft.client.renderer.entity.EntityRendererManager;
 import org.spongepowered.asm.mixin.Mixin;
 
-@Mixin(EntityRenderDispatcher.class)
+@Mixin(EntityRendererManager.class)
 public class MixinEntityRenderManager implements IEntityRenderManager {
 
 
     @Override
     public double renderPosX() {
-        return ((EntityRenderDispatcher) (Object) this).camera.getPosition().x;
+        return ((EntityRendererManager) (Object) this).info.getProjectedView().x;
     }
 
     @Override
     public double renderPosY() {
-        return ((EntityRenderDispatcher) (Object) this).camera.getPosition().y;
+        return ((EntityRendererManager) (Object) this).info.getProjectedView().y;
     }
 
     @Override
     public double renderPosZ() {
-        return ((EntityRenderDispatcher) (Object) this).camera.getPosition().z;
+        return ((EntityRendererManager) (Object) this).info.getProjectedView().z;
     }
 }

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

@@ -18,8 +18,8 @@
 package baritone.launch.mixins;
 
 import baritone.api.utils.accessor.IItemStack;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -39,10 +39,10 @@ public abstract class MixinItemStack implements IItemStack {
     private int baritoneHash;
 
     @Shadow
-    protected abstract int getDamageValue();
+    protected abstract int getDamage();
 
     private void recalculateHash() {
-        baritoneHash = item == null ? -1 : item.hashCode() + getDamageValue();
+        baritoneHash = item == null ? -1 : item.hashCode() + getDamage();
     }
 
     @Inject(
@@ -54,7 +54,7 @@ public abstract class MixinItemStack implements IItemStack {
     }
 
     @Inject(
-            method = "setDamageValue",
+            method = "setDamage",
             at = @At("TAIL")
     )
     private void onItemDamageSet(CallbackInfo ci) {
@@ -63,8 +63,6 @@ public abstract class MixinItemStack implements IItemStack {
 
     @Override
     public int getBaritoneHash() {
-        // TODO: figure out why <init> mixin not working, was 0 for some reason
-        if (baritoneHash == 0) recalculateHash();
         return baritoneHash;
     }
 }

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

@@ -20,12 +20,12 @@ package baritone.launch.mixins;
 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
 import baritone.api.event.events.RotationMoveEvent;
-import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityType;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.world.World;
+import net.minecraft.util.math.vector.Vector3d;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -53,48 +53,49 @@ public abstract class MixinLivingEntity extends Entity {
     @Unique
     private RotationMoveEvent elytraRotationEvent;
 
-    public MixinLivingEntity(EntityType<?> entityTypeIn, Level worldIn) {
+    public MixinLivingEntity(EntityType<?> entityTypeIn, World worldIn) {
         super(entityTypeIn, worldIn);
     }
 
     @Inject(
-            method = "jumpFromGround",
+            method = "jump",
             at = @At("HEAD")
     )
     private void preMoveRelative(CallbackInfo ci) {
         this.getBaritone().ifPresent(baritone -> {
-            this.jumpRotationEvent = new RotationMoveEvent(RotationMoveEvent.Type.JUMP, this.getYRot(), this.getXRot());
+            this.jumpRotationEvent = new RotationMoveEvent(RotationMoveEvent.Type.JUMP, this.rotationYaw, this.rotationPitch);
             baritone.getGameEventHandler().onPlayerRotationMove(this.jumpRotationEvent);
         });
     }
 
     @Redirect(
-            method = "jumpFromGround",
+            method = "jump",
             at = @At(
-                    value = "INVOKE",
-                    target = "net/minecraft/world/entity/LivingEntity.getYRot()F"
+                    value = "FIELD",
+                    opcode = GETFIELD,
+                    target = "net/minecraft/entity/LivingEntity.rotationYaw:F"
             )
     )
     private float overrideYaw(LivingEntity self) {
-        if (self instanceof LocalPlayer && BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this) != null) {
+        if (self instanceof ClientPlayerEntity && BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this) != null) {
             return this.jumpRotationEvent.getYaw();
         }
-        return self.getYRot();
+        return self.rotationYaw;
     }
 
     @Inject(
             method = "travel",
             at = @At(
                     value = "INVOKE",
-                    target = "net/minecraft/world/entity/LivingEntity.getLookAngle()Lnet/minecraft/world/phys/Vec3;"
+                    target = "net/minecraft/entity/LivingEntity.getLookVec()Lnet/minecraft/util/math/vector/Vector3d;"
             )
     )
-    private void onPreElytraMove(Vec3 direction, CallbackInfo ci) {
+    private void onPreElytraMove(Vector3d direction, CallbackInfo ci) {
         this.getBaritone().ifPresent(baritone -> {
-            this.elytraRotationEvent = new RotationMoveEvent(RotationMoveEvent.Type.MOTION_UPDATE, this.getYRot(), this.getXRot());
+            this.elytraRotationEvent = new RotationMoveEvent(RotationMoveEvent.Type.MOTION_UPDATE, this.rotationYaw, this.rotationPitch);
             baritone.getGameEventHandler().onPlayerRotationMove(this.elytraRotationEvent);
-            this.setYRot(this.elytraRotationEvent.getYaw());
-            this.setXRot(this.elytraRotationEvent.getPitch());
+            this.rotationYaw = this.elytraRotationEvent.getYaw();
+            this.rotationPitch = this.elytraRotationEvent.getPitch();
         });
     }
 
@@ -102,14 +103,14 @@ public abstract class MixinLivingEntity extends Entity {
             method = "travel",
             at = @At(
                     value = "INVOKE",
-                    target = "net/minecraft/world/entity/Entity.move(Lnet/minecraft/world/entity/MoverType;Lnet/minecraft/world/phys/Vec3;)V",
+                    target = "net/minecraft/entity/Entity.move(Lnet/minecraft/entity/MoverType;Lnet/minecraft/util/math/vector/Vector3d;)V",
                     shift = At.Shift.AFTER
             )
     )
     private void onPostElytraMove(float strafe, float vertical, float forward, CallbackInfo ci) {
         if (this.elytraRotationEvent != null) {
-            this.setYRot(this.elytraRotationEvent.getOriginal().getYaw());
-            this.setXRot(this.elytraRotationEvent.getOriginal().getPitch());
+            this.rotationYaw = this.elytraRotationEvent.getOriginal().getYaw();
+            this.rotationPitch = this.elytraRotationEvent.getOriginal().getPitch();
             this.elytraRotationEvent = null;
         }
     }
@@ -117,8 +118,8 @@ public abstract class MixinLivingEntity extends Entity {
     @Unique
     private Optional<IBaritone> getBaritone() {
         // noinspection ConstantConditions
-        if (LocalPlayer.class.isInstance(this)) {
-            return Optional.ofNullable(BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this));
+        if (ClientPlayerEntity.class.isInstance(this)) {
+            return Optional.ofNullable(BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this));
         } else {
             return Optional.empty();
         }

src/launch/java/baritone/launch/mixins/MixinLootContext.java

@@ -18,11 +18,11 @@
 package baritone.launch.mixins;
 
 import baritone.api.utils.BlockOptionalMeta;
+import net.minecraft.loot.LootContext;
+import net.minecraft.loot.LootPredicateManager;
+import net.minecraft.loot.LootTableManager;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.storage.loot.LootContext;
-import net.minecraft.world.level.storage.loot.LootTables;
-import net.minecraft.world.level.storage.loot.PredicateManager;
+import net.minecraft.world.server.ServerWorld;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
@@ -31,13 +31,13 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 public class MixinLootContext {
 
     @Redirect(
-            method = "create",
+            method = "build",
             at = @At(
                     value = "INVOKE",
-                    target = "net/minecraft/server/level/ServerLevel.getServer()Lnet/minecraft/server/MinecraftServer;"
+                    target = "net/minecraft/world/server/ServerWorld.getServer()Lnet/minecraft/server/MinecraftServer;"
             )
     )
-    private MinecraftServer getServer(ServerLevel world) {
+    private MinecraftServer getServer(ServerWorld world) {
         if (world == null) {
             return null;
         }
@@ -45,30 +45,30 @@ public class MixinLootContext {
     }
 
     @Redirect(
-            method = "create",
+            method = "build",
             at = @At(
                     value = "INVOKE",
-                    target = "Lnet/minecraft/server/MinecraftServer;getLootTables()Lnet/minecraft/world/level/storage/loot/LootTables;"
+                    target = "net/minecraft/server/MinecraftServer.getLootTableManager()Lnet/minecraft/loot/LootTableManager;"
             )
     )
-    private LootTables getLootTableManager(MinecraftServer server) {
+    private LootTableManager getLootTableManager(MinecraftServer server) {
         if (server == null) {
             return BlockOptionalMeta.getManager();
         }
-        return server.getLootTables();
+        return server.getLootTableManager();
     }
 
     @Redirect(
-            method = "create",
+            method = "build",
             at = @At(
                     value = "INVOKE",
-                    target = "Lnet/minecraft/server/MinecraftServer;getPredicateManager()Lnet/minecraft/world/level/storage/loot/PredicateManager;"
+                    target = "net/minecraft/server/MinecraftServer.func_229736_aP_()Lnet/minecraft/loot/LootPredicateManager;"
             )
     )
-    private PredicateManager getLootPredicateManager(MinecraftServer server) {
+    private LootPredicateManager getLootPredicateManager(MinecraftServer server) {
         if (server == null) {
             return BlockOptionalMeta.getPredicateManager();
         }
-        return server.getPredicateManager();
+        return server.func_229736_aP_();
     }
 }