v1.8.4

Merge 1.17.1 into 1.18.2

.github/workflows/gradle_build.yml

@@ -14,10 +14,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 8
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '8'
+        java-version: '17'
         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
+      run: ./gradlew build -Pbaritone.forge_build -Ploom.platform=forge
 
     - 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 8
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '8'
+        java-version: '17'
         distribution: 'temurin'
         
     - name: Grant execute permission for gradlew

.gitignore

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

Dockerfile

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

build.gradle

@@ -15,67 +15,28 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-group 'baritone'
-version '1.6.4'
-
-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'
-    }
+plugins {
+    id 'java'
+    id 'dev.architectury.loom' version '0.10.0-SNAPSHOT'
+    id 'maven-publish'
 }
 
 
-import baritone.gradle.fabric.CreateVolderYarn
+archivesBaseName  = project.archives_base_name
+version = project.mod_version
+group = project.maven_group
+
 import baritone.gradle.task.CreateDistTask
 import baritone.gradle.task.ProguardTask
-import net.minecraftforge.gradle.userdev.tasks.RenameJarInPlace
-import org.apache.tools.ant.taskdefs.condition.Os
 
-apply plugin: 'java'
-apply plugin: 'maven'
+def compileType = project.hasProperty("baritone.fabric_build") ? "FABRIC" : project.hasProperty("baritone.forge_build") ? "FORGE" : "OFFICIAL"
 
-def mcpVersion = [channel: 'snapshot', version: '20201028-1.16.3']
+sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
 
-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
@@ -91,122 +52,63 @@ 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
     }
 }
 
-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"
-                }
-            }
+loom {
+    if (compileType.equals("FORGE")) {
+        forge {
+            mixinConfig 'mixins.baritone.json'
         }
     }
+    mixin.defaultRefmapName = "mixins.baritone.refmap.json"
 
-    mixin {
-        defaultObfuscationEnv searge
-        add sourceSets.launch, 'mixins.baritone.refmap.json'
+    runs {
+        client {
+            source = sourceSets.launch
+        }
     }
 }
 
+
 repositories {
-    mavenCentral()
-
-    maven {
-        name = 'SpongePowered'
-        url = 'https://repo.spongepowered.org/repository/maven-public/'
-    }
     maven {
         name = 'impactdevelopment-repo'
         url = 'https://impactdevelopment.github.io/maven/'
     }
     maven {
-        url = 'https://www.dogforce-games.com/maven/'
+        name = "ldtteam"
+        url = "https://maven.parchmentmc.net/"
     }
+    mavenCentral()
 }
 
 dependencies {
-    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"
-
-        // 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'
-        }
+    if (compileType.equals("FORGE")) {
+        forge "net.minecraftforge:forge:${project.forge_version}"
     }
+    mappings loom.layered() {
+        officialMojangMappings()
+        //technically optional, but really helpful in dev:
+//        parchment("org.parchmentmc.data:parchment-1.17.1:2021.10.24@zip" as String)
+    }
+    minecraft "com.mojang:minecraft:${project.minecraft_version}"
+    if (!compileType.equals("FORGE")) {
+        modImplementation "net.fabricmc:fabric-loader:${project.fabric_version}"
+    }
+    // this makes it compile with the forge tweak stuff
+    implementation 'com.github.ImpactDevelopment:SimpleTweaker:1.2'
+    implementation('net.minecraft:launchwrapper:1.12') {
+        exclude module: 'lwjgl'
+        exclude module: 'asm-debug-all'
+    }
+
+    implementation 'com.google.code.findbugs:jsr305:3.0.2'
 
     testImplementation 'junit:junit:4.12'
 }
@@ -219,25 +121,24 @@ javadoc {
     classpath += sourceSets.api.compileClasspath
 }
 
-if (getProject().hasProperty("baritone.fabric_build")) {
-    // skidded from fabric-example-mod (comments and all)
-    tasks.withType(JavaCompile).configureEach {
-        // ensure that the encoding is set to UTF-8, no matter what the system default is
-        // this fixes some edge cases with special characters not displaying correctly
-        // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-        // If Javadoc is generated, this must be specified in that task too.
-        it.options.encoding = "UTF-8"
+// skidded from fabric-example-mod (comments and all)
+tasks.withType(JavaCompile).configureEach {
+    // ensure that the encoding is set to UTF-8, no matter what the system default is
+    // this fixes some edge cases with special characters not displaying correctly
+    // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+    // If Javadoc is generated, this must be specified in that task too.
+    it.options.encoding = "UTF-8"
 
-        // The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
-        // JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
-        // We'll use that if it's available, but otherwise we'll use the older option.
-        def targetVersion = 8
-        if (JavaVersion.current().isJava9Compatible()) {
-            it.options.release = targetVersion
-        }
+    // The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
+    // JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
+    // We'll use that if it's available, but otherwise we'll use the older option.
+    def targetVersion = 16
+    if (JavaVersion.current().isJava9Compatible()) {
+        it.options.release = targetVersion
     }
 }
 
+
 jar {
     from sourceSets.launch.output, sourceSets.api.output
 
@@ -269,93 +170,21 @@ jar {
     }
 }
 
-// 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()
+if (compileType.equals("OFFICIAL")) {
+    remapJar {
+        toM.set "official"
+    }
 }
 
-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()
+
+
+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
 }
 
-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 createDist(type: CreateDistTask, dependsOn: proguard)
 
 
-    task proguard(type: ProguardTask, dependsOn: createSrgMc) { // TODO: dont need to create srg mc if doing notch build
-        url 'https://downloads.sourceforge.net/project/proguard/proguard/6.0/proguard6.0.3.zip'
-        extract 'proguard6.0.3/lib/proguard.jar'
-    }
-
-    task createDist(type: CreateDistTask, dependsOn: proguard)
-
-}
 build.finalizedBy(createDist)
-
-install {
-    def jarApiName = String.format("%s-api-%s", rootProject.name, version.toString())
-    def jarApiForgeName = String.format("%s-api-forge-%s", rootProject.name, version.toString())
-    def jarSAName = String.format("%s-standalone-%s", rootProject.name, version.toString())
-    def jarSAForgeName = String.format("%s-standalone-forge-%s", rootProject.name, version.toString())
-
-    artifacts {
-        archives file("$buildDir/libs/"+jarApiName+".jar")
-        archives file("$buildDir/libs/"+jarApiForgeName+".jar")
-        archives file("$buildDir/libs/"+jarSAName+".jar")
-        archives file("$buildDir/libs/"+jarSAForgeName+".jar")
-    }
-    repositories.mavenInstaller {
-		addFilter('api') { artifact, file -> artifact.name == "baritone-api" }
-		addFilter('api-forge') { artifact, file -> artifact.name == "baritone-api-forge" }
-		addFilter('standalone') { artifact, file -> artifact.name == "baritone-standalone" }
-		addFilter('standalone-forge') { artifact, file -> artifact.name == "baritone-standalone-forge" }
-    }
-}
-
-install.dependsOn(build)

buildSrc/build.gradle

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

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

@@ -1,259 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.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!");
+            throw new IllegalStateException("Artifact not found! Run build first! Missing file: " + this.artifactPath);
         }
     }
 
@@ -99,7 +99,7 @@ class BaritoneGradleTask extends DefaultTask {
     }
 
     protected Path getRelativeFile(String file) {
-        return Paths.get(new File(file).getAbsolutePath());
+        return Paths.get(new File(new File(getProject().getBuildDir(), "../"), 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 javax.xml.bind.DatatypeConverter;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.security.MessageDigest;
@@ -93,10 +93,22 @@ public class CreateDistTask extends BaritoneGradleTask {
             if (SHA1_DIGEST == null) {
                 SHA1_DIGEST = MessageDigest.getInstance("SHA-1");
             }
-            return DatatypeConverter.printHexBinary(SHA1_DIGEST.digest(Files.readAllBytes(path))).toLowerCase();
+            return bytesToHex(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,21 +22,10 @@ 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;
@@ -59,13 +48,33 @@ 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();
@@ -76,6 +85,32 @@ 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);
@@ -184,15 +219,16 @@ public class ProguardTask extends BaritoneGradleTask {
     }
 
     private boolean validateJavaVersion(String java) {
-        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");
+        //TODO: fix for j16
+//        final JavaVersion javaVersion = new DefaultJvmVersionDetector(new DefaultExecActionFactory(new IdentityFileResolver())).getJavaVersion(java);
+//
+//        if (!javaVersion.getMajorVersion().equals("8")) {
+//            System.out.println("Failed to validate Java version " + javaVersion.toString() + " [" + java + "] for ProGuard libraryjars");
+//            // throw new RuntimeException("Java version incorrect: " + javaVersion.getMajorVersion() + " for " + java);
+//            return false;
+//        }
+//
+//        System.out.println("Validated Java version " + javaVersion.toString() + " [" + java + "] for ProGuard libraryjars");
         return true;
     }
 
@@ -204,30 +240,19 @@ public class ProguardTask extends BaritoneGradleTask {
         template.add(0, "-injars '" + this.artifactPath.toString() + "'");
         template.add(1, "-outjars '" + this.getTemporaryFile(PROGUARD_EXPORT_PATH) + "'");
 
-        // 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 + "'");
+        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)");
 
         {
             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
-                    .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);
+                    // remove MCP mapped jar, and nashorn
+                    .filter(f -> !f.toString().endsWith("-recomp.jar") && !f.getName().startsWith("nashorn") && !f.getName().startsWith("coremods"));
 
-                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 = dependencies
+                    .map(f -> isMcJar(f) ? copyMcTargetJar : f);
             }
             libraries.forEach(f -> {
                 template.add(2, "-libraryjars '" + f + "'");
@@ -277,6 +302,10 @@ 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

@@ -0,0 +1,13 @@
+org.gradle.jvmargs=-Xmx2048M
+
+mod_version=1.8.4
+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,6 +1,5 @@
-#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,5 +1,21 @@
 #!/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
@@ -28,7 +44,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=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -66,6 +82,7 @@ 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
@@ -109,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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
@@ -138,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $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
 
@@ -159,14 +177,9 @@ 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,3 +1,19 @@
+@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
@@ -13,15 +29,18 @@ 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=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @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 init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ 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 %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

settings.gradle

@@ -15,5 +15,28 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-rootProject.name = 'baritone'
+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

@@ -21,10 +21,9 @@ import baritone.api.cache.IWorldScanner;
 import baritone.api.command.ICommand;
 import baritone.api.command.ICommandSystem;
 import baritone.api.schematic.ISchematicSystem;
-import net.minecraft.client.entity.player.ClientPlayerEntity;
-
 import java.util.List;
 import java.util.Objects;
+import net.minecraft.client.player.LocalPlayer;
 
 /**
  * Provides the present {@link IBaritone} instances, as well as non-baritone instance related APIs.
@@ -47,19 +46,19 @@ public interface IBaritoneProvider {
      * returned by {@link #getPrimaryBaritone()}.
      *
      * @return All active {@link IBaritone} instances.
-     * @see #getBaritoneForPlayer(ClientPlayerEntity)
+     * @see #getBaritoneForPlayer(LocalPlayer)
      */
     List<IBaritone> getAllBaritones();
 
     /**
-     * Provides the {@link IBaritone} instance for a given {@link ClientPlayerEntity}. This will likely be
+     * Provides the {@link IBaritone} instance for a given {@link LocalPlayer}. This will likely be
      * replaced with or be overloaded in addition to {@code #getBaritoneForUser(IBaritoneUser)} when
      * {@code bot-system} is merged into {@code master}.
      *
      * @param player The player
      * @return The {@link IBaritone} instance.
      */
-    default IBaritone getBaritoneForPlayer(ClientPlayerEntity player) {
+    default IBaritone getBaritoneForPlayer(LocalPlayer player) {
         for (IBaritone baritone : getAllBaritones()) {
             if (Objects.equals(player, baritone.getPlayerContext().player())) {
                 return baritone;

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

@@ -21,19 +21,20 @@ 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.item.Item;
-import net.minecraft.util.math.vector.Vector3i;
-import net.minecraft.util.text.ITextComponent;
-
+import net.minecraft.core.Vec3i;
+import net.minecraft.network.chat.BaseComponent;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
 import java.awt.*;
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-import java.util.List;
 import java.util.*;
+import java.util.List;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
@@ -842,6 +843,7 @@ 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);
 
@@ -934,7 +936,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<Vector3i> buildRepeat = new Setting<>(new Vector3i(0, 0, 0));
+    public final Setting<Vec3i> buildRepeat = new Setting<>(new Vec3i(0, 0, 0));
 
     /**
      * How many times to buildrepeat. -1 for infinite.
@@ -1063,7 +1065,7 @@ public final class Settings {
     /**
      * What Y level to go to for legit strip mining
      */
-    public final Setting<Integer> legitMineYLevel = new Setting<>(11);
+    public final Setting<Integer> legitMineYLevel = new Setting<>(-59);
 
     /**
      * Magically see ores that are separated diagonally from existing ores. Basically like mining around the ores that it finds
@@ -1141,7 +1143,7 @@ public final class Settings {
      * via {@link Consumer#andThen(Consumer)} or it can completely be overriden via setting
      * {@link Setting#value};
      */
-    public final Setting<Consumer<ITextComponent>> logger = new Setting<>(msg -> Minecraft.getInstance().ingameGUI.getChatGUI().printChatMessage(msg));
+    public final Setting<Consumer<Component>> logger = new Setting<>(msg -> Minecraft.getInstance().gui.getChat().addMessage(msg));
 
     /**
      * The function that is called when Baritone will send a desktop notification. This function can be added to
@@ -1155,7 +1157,7 @@ public final class Settings {
      * via {@link Consumer#andThen(Consumer)} or it can completely be overriden via setting
      * {@link Setting#value};
      */
-    public final Setting<BiConsumer<ITextComponent, ITextComponent>> toaster = new Setting<>(BaritoneToast::addOrUpdate);
+    public final Setting<BiConsumer<Component, Component>> toaster = new Setting<>(BaritoneToast::addOrUpdate);
 
     /**
      * Print out ALL command exceptions as a stack trace to stdout, even simple syntax errors

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

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

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

@@ -17,10 +17,9 @@
 
 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
@@ -44,7 +43,7 @@ public interface ICachedWorld {
      *
      * @param chunk The chunk to pack and store
      */
-    void queueForPacking(Chunk chunk);
+    void queueForPacking(LevelChunk chunk);
 
     /**
      * Returns whether or not the block at the specified X and Z coordinates

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

@@ -19,11 +19,10 @@ 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,11 +27,10 @@ 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.util.Direction;
+import net.minecraft.core.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,11 +19,10 @@ package baritone.api.command.datatypes;
 
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
-import net.minecraft.block.Block;
-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.level.block.Block;
 
 public enum BlockById implements IDatatypeFor<Block> {
     INSTANCE;

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

@@ -19,11 +19,10 @@ 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/ForDirection.java

@@ -19,10 +19,9 @@ 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;
@@ -36,7 +35,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::getName2).map(String::toLowerCase))
+                        .map(Direction::getName).map(String::toLowerCase))
                 .filterPrefix(ctx.getConsumer().getString())
                 .stream();
     }

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

@@ -20,21 +20,20 @@ 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<PlayerEntity> {
+public enum NearbyPlayer implements IDatatypeFor<Player> {
     INSTANCE;
 
     @Override
-    public PlayerEntity get(IDatatypeContext ctx) throws CommandException {
+    public Player get(IDatatypeContext ctx) throws CommandException {
         final String username = ctx.getConsumer().getString();
         return getPlayers(ctx).stream()
                 .filter(s -> s.getName().getString().equalsIgnoreCase(username))
@@ -44,13 +43,13 @@ public enum NearbyPlayer implements IDatatypeFor<PlayerEntity> {
     @Override
     public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
         return new TabCompleteHelper()
-                .append(getPlayers(ctx).stream().map(PlayerEntity::getName).map(ITextComponent::getString))
+                .append(getPlayers(ctx).stream().map(Player::getName).map(Component::getString))
                 .filterPrefix(ctx.getConsumer().getString())
                 .sortAlphabetically()
                 .stream();
     }
 
-    private static List<? extends PlayerEntity> getPlayers(IDatatypeContext ctx) {
-        return ctx.getBaritone().getPlayerContext().world().getPlayers();
+    private static List<? extends Player> getPlayers(IDatatypeContext ctx) {
+        return ctx.getBaritone().getPlayerContext().world().players();
     }
 }

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

@@ -94,7 +94,7 @@ public enum RelativeFile implements IDatatypePost<File, File> {
     }
 
     public static File gameDir() {
-        File gameDir = HELPER.mc.gameDir.getAbsoluteFile();
+        File gameDir = HELPER.mc.gameDirectory.getAbsoluteFile();
         if (gameDir.getName().equals(".")) {
             return gameDir.getParentFile();
         }

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

@@ -21,9 +21,8 @@ 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;
@@ -36,9 +35,9 @@ public enum RelativeGoalBlock implements IDatatypePost<GoalBlock, BetterBlockPos
 
         final IArgConsumer consumer = ctx.getConsumer();
         return new GoalBlock(
-                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))
+                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))
         );
     }
 

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

@@ -21,9 +21,8 @@ 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;
@@ -36,8 +35,8 @@ public enum RelativeGoalXZ implements IDatatypePost<GoalXZ, BetterBlockPos> {
 
         final IArgConsumer consumer = ctx.getConsumer();
         return new GoalXZ(
-                MathHelper.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.x)),
-                MathHelper.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.z))
+                Mth.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.x)),
+                Mth.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.z))
         );
     }
 

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

@@ -21,9 +21,8 @@ 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;
@@ -35,7 +34,7 @@ public enum RelativeGoalYLevel implements IDatatypePost<GoalYLevel, BetterBlockP
         }
 
         return new GoalYLevel(
-                MathHelper.floor(ctx.getConsumer().getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.y))
+                Mth.floor(ctx.getConsumer().getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.y))
         );
     }
 

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

@@ -19,9 +19,8 @@ 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;
 
@@ -39,7 +38,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",
-                TextFormatting.RED);
+                ChatFormatting.RED);
 
         this.printStackTrace();
     }

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

@@ -19,9 +19,8 @@ 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;
 
@@ -50,6 +49,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(), TextFormatting.RED);
+        HELPER.logDirect(this.getMessage(), ChatFormatting.RED);
     }
 }

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

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

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

@@ -23,14 +23,13 @@ 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.util.math.BlockPos;
+import net.minecraft.core.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.IPacket;
-import net.minecraft.network.NetworkManager;
+import net.minecraft.network.Connection;
+import net.minecraft.network.protocol.Packet;
 
 /**
  * @author Brady
@@ -27,19 +27,19 @@ import net.minecraft.network.NetworkManager;
  */
 public final class PacketEvent {
 
-    private final NetworkManager networkManager;
+    private final Connection networkManager;
 
     private final EventState state;
 
-    private final IPacket<?> packet;
+    private final Packet<?> packet;
 
-    public PacketEvent(NetworkManager networkManager, EventState state, IPacket<?> packet) {
+    public PacketEvent(Connection networkManager, EventState state, Packet<?> packet) {
         this.networkManager = networkManager;
         this.state = state;
         this.packet = packet;
     }
 
-    public final NetworkManager getNetworkManager() {
+    public final Connection getNetworkManager() {
         return this.networkManager;
     }
 
@@ -47,12 +47,12 @@ public final class PacketEvent {
         return this.state;
     }
 
-    public final IPacket<?> getPacket() {
+    public final Packet<?> getPacket() {
         return this.packet;
     }
 
     @SuppressWarnings("unchecked")
-    public final <T extends IPacket<?>> T cast() {
+    public final <T extends Packet<?>> 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.matrix.MatrixStack;
-import net.minecraft.util.math.vector.Matrix4f;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.math.Matrix4f;
 
 /**
  * @author Brady
@@ -32,9 +32,9 @@ public final class RenderEvent {
     private final float partialTicks;
 
     private final Matrix4f projectionMatrix;
-    private final MatrixStack modelViewStack;
+    private final PoseStack modelViewStack;
 
-    public RenderEvent(float partialTicks, MatrixStack modelViewStack, Matrix4f projectionMatrix) {
+    public RenderEvent(float partialTicks, PoseStack modelViewStack, Matrix4f projectionMatrix) {
         this.partialTicks = partialTicks;
         this.modelViewStack = modelViewStack;
         this.projectionMatrix = projectionMatrix;
@@ -47,7 +47,7 @@ public final class RenderEvent {
         return this.partialTicks;
     }
 
-    public MatrixStack getModelViewStack() {
+    public PoseStack getModelViewStack() {
         return this.modelViewStack;
     }
 

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

@@ -17,9 +17,9 @@
 
 package baritone.api.event.events;
 
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.phys.Vec3;
 
 /**
  * @author Brady
@@ -70,7 +70,7 @@ public final class RotationMoveEvent {
         /**
          * Called when the player's motion is updated.
          *
-         * @see Entity#moveRelative(float, Vector3d)
+         * @see Entity#moveRelative(float, Vec3)
          */
         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.world.ClientWorld;
+import net.minecraft.client.multiplayer.ClientLevel;
 
 /**
  * @author Brady
@@ -29,14 +29,14 @@ public final class WorldEvent {
     /**
      * The new world that is being loaded. {@code null} if being unloaded.
      */
-    private final ClientWorld world;
+    private final ClientLevel world;
 
     /**
      * The state of the event
      */
     private final EventState state;
 
-    public WorldEvent(ClientWorld world, EventState state) {
+    public WorldEvent(ClientLevel 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 ClientWorld getWorld() {
+    public final ClientLevel 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.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;
+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;
 
 /**
  * @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#runTick()
+     * @see Minecraft#tick()
      */
     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 ClientPlayerEntity#tick()
+     * @see LocalPlayer#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 ClientPlayerEntity#sendChatMessage(String)
+     * @see LocalPlayer#chat(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#loadWorld(ClientWorld)
+     * @see Minecraft#setLevel(ClientLevel)
      */
     void onWorldEvent(WorldEvent event);
 
@@ -89,7 +89,7 @@ public interface IGameEventListener {
      * Runs before a outbound packet is sent
      *
      * @param event The event
-     * @see IPacket
+     * @see Packet
      */
     void onSendPacket(PacketEvent event);
 
@@ -97,7 +97,7 @@ public interface IGameEventListener {
      * Runs before an inbound packet is processed
      *
      * @param event The event
-     * @see IPacket
+     * @see Packet
      */
     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, Vector3d)
+     * @see Entity#moveRelative(float, Vec3)
      */
     void onPlayerRotationMove(RotationMoveEvent event);
 
     /**
-     * Called whenever the sprint keybind state is checked in {@link ClientPlayerEntity#livingTick}
+     * Called whenever the sprint keybind state is checked in {@link LocalPlayer#aiStep}
      *
      * @param event The event
-     * @see ClientPlayerEntity#livingTick()
+     * @see LocalPlayer#aiStep()
      */
     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.util.math.BlockPos;
+import net.minecraft.core.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

@@ -19,7 +19,7 @@ package baritone.api.pathing.goals;
 
 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.interfaces.IGoalRenderPos;
-import net.minecraft.util.math.BlockPos;
+import net.minecraft.core.BlockPos;
 
 /**
  * A specific BlockPos goal

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

@@ -19,7 +19,7 @@ package baritone.api.pathing.goals;
 
 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.interfaces.IGoalRenderPos;
-import net.minecraft.util.math.BlockPos;
+import net.minecraft.core.BlockPos;
 
 
 /**

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

@@ -21,7 +21,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.util.math.BlockPos;
+import net.minecraft.core.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.util.math.BlockPos;
+import net.minecraft.core.BlockPos;
 
 import java.util.Arrays;
 

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

@@ -18,8 +18,8 @@
 package baritone.api.pathing.goals;
 
 import baritone.api.utils.SettingsUtil;
-import net.minecraft.util.Direction;
-import net.minecraft.util.math.BlockPos;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
 
 /**
  * Dig a tunnel in a certain direction, but if you have to deviate from the path, go back to where you started
@@ -36,8 +36,8 @@ public class GoalStrictDirection implements Goal {
         x = origin.getX();
         y = origin.getY();
         z = origin.getZ();
-        dx = direction.getXOffset();
-        dz = direction.getZOffset();
+        dx = direction.getStepX();
+        dz = direction.getStepZ();
         if (dx == 0 && dz == 0) {
             throw new IllegalArgumentException(direction + "");
         }

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

@@ -19,7 +19,7 @@ package baritone.api.pathing.goals;
 
 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.interfaces.IGoalRenderPos;
-import net.minecraft.util.math.BlockPos;
+import net.minecraft.core.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.math.MathHelper;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.Mth;
+import net.minecraft.world.phys.Vec3;
 
 /**
  * Useful for long-range goals that don't have a specific Y level.
@@ -94,11 +94,11 @@ public class GoalXZ implements Goal {
         return (diagonal + straight) * BaritoneAPI.getSettings().costHeuristic.value; // big TODO tune
     }
 
-    public static GoalXZ fromDirection(Vector3d origin, float yaw, double distance) {
+    public static GoalXZ fromDirection(Vec3 origin, float yaw, double distance) {
         float theta = (float) Math.toRadians(yaw);
-        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));
+        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));
     }
 
     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[257];
-        for (int i = 0; i < 257; i++) {
+        double[] costs = new double[4097];
+        for (int i = 0; i < 4097; 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.util.math.BlockPos;
+import net.minecraft.core.BlockPos;
 
 /**
  * @author Brady

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

@@ -18,11 +18,10 @@
 package baritone.api.process;
 
 import baritone.api.schematic.ISchematic;
-import net.minecraft.block.BlockState;
 import net.minecraft.client.Minecraft;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Vector3i;
-
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.level.block.state.BlockState;
 import java.io.File;
 import java.util.List;
 
@@ -39,7 +38,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, Vector3i origin);
+    void build(String name, ISchematic schematic, Vec3i origin);
 
     /**
      * Requests a build for the specified schematic, labeled as specified, with the specified origin.
@@ -49,10 +48,10 @@ 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, Vector3i origin);
+    boolean build(String name, File schematic, Vec3i origin);
 
     default boolean build(String schematicFile, BlockPos origin) {
-        File file = new File(new File(Minecraft.getInstance().gameDir, "schematics"), schematicFile);
+        File file = new File(new File(Minecraft.getInstance().gameDirectory, "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.util.math.BlockPos;
+import net.minecraft.core.BlockPos;
 
 public interface IFarmProcess extends IBaritoneProcess {
 

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

@@ -17,10 +17,9 @@
 
 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.block.Block;
+import net.minecraft.world.level.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,9 +19,8 @@ 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,10 +17,9 @@
 
 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,7 +18,8 @@
 package baritone.api.schematic;
 
 import baritone.api.utils.BlockOptionalMeta;
-import net.minecraft.block.BlockState;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.state.BlockState;
 
 import java.util.List;
 

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

@@ -17,10 +17,9 @@
 
 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.block.BlockState;
+import net.minecraft.world.level.block.state.BlockState;
 
 /**
  * A static schematic is capable of providing the desired state at a given position without

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

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

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

@@ -18,7 +18,7 @@
 package baritone.api.schematic;
 
 import baritone.api.utils.BlockOptionalMetaLookup;
-import net.minecraft.block.BlockState;
+import net.minecraft.world.level.block.state.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.block.BlockState;
+import net.minecraft.world.level.block.state.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.block.AirBlock;
-import net.minecraft.block.Block;
-import net.minecraft.block.Blocks;
-import net.minecraft.block.BlockState;
-import net.minecraft.state.Property;
+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 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.getDefaultState(); // can always "place" air
+                return current.getBlock() instanceof AirBlock ? current : Blocks.AIR.defaultBlockState(); // 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).getDefaultState();
+        return substitutes.get(0).defaultBlockState();
     }
 
     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.getBlock().getStateContainer().getProperties();
-        BlockState newState = block.getDefaultState();
+        Collection<Property<?>> properties = state.getProperties();
+        BlockState newState = block.defaultBlockState();
         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.with(prop, fromState.get(prop));
+        return toState.setValue(prop, fromState.getValue(prop));
     }
 }

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

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

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

@@ -18,9 +18,9 @@
 package baritone.api.selection;
 
 import baritone.api.utils.BetterBlockPos;
-import net.minecraft.util.Direction;
-import net.minecraft.util.math.AxisAlignedBB;
-import net.minecraft.util.math.vector.Vector3i;
+import net.minecraft.core.Direction;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.phys.AABB;
 
 /**
  * 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.
      */
-    Vector3i size();
+    Vec3i size();
 
     /**
-     * @return An {@link AxisAlignedBB} encompassing all blocks in this selection.
+     * @return An {@link AABB} encompassing all blocks in this selection.
      */
-    AxisAlignedBB aabb();
+    AABB 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.util.Direction;
+import net.minecraft.core.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,12 +17,11 @@
 
 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)
@@ -49,7 +48,7 @@ public final class BetterBlockPos extends BlockPos {
     }
 
     public BetterBlockPos(double x, double y, double z) {
-        this(MathHelper.floor(x), MathHelper.floor(y), MathHelper.floor(z));
+        this(Mth.floor(x), Mth.floor(y), Mth.floor(z));
     }
 
     public BetterBlockPos(BlockPos pos) {
@@ -116,7 +115,7 @@ public final class BetterBlockPos extends BlockPos {
     }
 
     @Override
-    public BetterBlockPos up() {
+    public BetterBlockPos above() {
         // this is unimaginably faster than blockpos.up
         // that literally calls
         // this.up(1)
@@ -130,35 +129,35 @@ public final class BetterBlockPos extends BlockPos {
     }
 
     @Override
-    public BetterBlockPos up(int amt) {
+    public BetterBlockPos above(int amt) {
         // see comment in up()
         return amt == 0 ? this : new BetterBlockPos(x, y + amt, z);
     }
 
     @Override
-    public BetterBlockPos down() {
+    public BetterBlockPos below() {
         // see comment in up()
         return new BetterBlockPos(x, y - 1, z);
     }
 
     @Override
-    public BetterBlockPos down(int amt) {
+    public BetterBlockPos below(int amt) {
         // see comment in up()
         return amt == 0 ? this : new BetterBlockPos(x, y - amt, z);
     }
 
     @Override
-    public BetterBlockPos offset(Direction dir) {
-        Vector3i vec = dir.getDirectionVec();
+    public BetterBlockPos relative(Direction dir) {
+        Vec3i vec = dir.getNormal();
         return new BetterBlockPos(x + vec.getX(), y + vec.getY(), z + vec.getZ());
     }
 
     @Override
-    public BetterBlockPos offset(Direction dir, int dist) {
+    public BetterBlockPos relative(Direction dir, int dist) {
         if (dist == 0) {
             return this;
         }
-        Vector3i vec = dir.getDirectionVec();
+        Vec3i vec = dir.getNormal();
         return new BetterBlockPos(x + vec.getX() * dist, y + vec.getY() * dist, z + vec.getZ() * dist);
     }
 

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

@@ -20,17 +20,27 @@ package baritone.api.utils;
 import baritone.api.utils.accessor.IItemStack;
 import com.google.common.collect.ImmutableSet;
 import io.netty.util.concurrent.ThreadPerTaskExecutor;
-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.core.BlockPos;
 import net.minecraft.resources.*;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.packs.PackResources;
+import net.minecraft.server.packs.PackType;
+import net.minecraft.server.packs.repository.Pack;
+import net.minecraft.server.packs.repository.PackRepository;
+import net.minecraft.server.packs.repository.ServerPacksSource;
+import net.minecraft.server.packs.resources.ReloadableResourceManager;
 import net.minecraft.util.Unit;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Vector3d;
-
+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 javax.annotation.Nonnull;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
@@ -45,8 +55,8 @@ public final class BlockOptionalMeta {
     private final ImmutableSet<Integer> stateHashes;
     private final ImmutableSet<Integer> stackHashes;
     private static final Pattern pattern = Pattern.compile("^(.+?)(?::(\\d+))?$");
-    private static LootTableManager manager;
-    private static LootPredicateManager predicate = new LootPredicateManager();
+    private static LootTables manager;
+    private static PredicateManager predicate = new PredicateManager();
     private static Map<Block, List<Item>> drops = new HashMap<>();
 
     public BlockOptionalMeta(@Nonnull Block block) {
@@ -72,7 +82,7 @@ public final class BlockOptionalMeta {
     }
 
     private static Set<BlockState> getStates(@Nonnull Block block) {
-        return new HashSet<>(block.getStateContainer().getValidStates());
+        return new HashSet<>(block.getStateDefinition().getPossibleStates());
     }
 
     private static ImmutableSet<Integer> getStateHashes(Set<BlockState> blockstates) {
@@ -113,7 +123,7 @@ public final class BlockOptionalMeta {
         //noinspection ConstantConditions
         int hash = ((IItemStack) (Object) stack).getBaritoneHash();
 
-        hash -= stack.getDamage();
+        hash -= stack.getDamageValue();
 
         return stackHashes.contains(hash);
     }
@@ -131,16 +141,16 @@ public final class BlockOptionalMeta {
         return null;
     }
 
-    public static LootTableManager getManager() {
+    public static LootTables getManager() {
         if (manager == null) {
-            ResourcePackList rpl = new ResourcePackList(ResourcePackInfo::new, new ServerPackFinder());
-            rpl.reloadPacksFromFinders();
-            IResourcePack thePack = rpl.getAllPacks().iterator().next().getResourcePack();
-            IReloadableResourceManager resourceManager = new SimpleReloadableResourceManager(ResourcePackType.SERVER_DATA);
-            manager = new LootTableManager(predicate);
-            resourceManager.addReloadListener(manager);
+            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);
             try {
-                resourceManager.reloadResourcesAndThen(new ThreadPerTaskExecutor(Thread::new), new ThreadPerTaskExecutor(Thread::new), Collections.singletonList(thePack), CompletableFuture.completedFuture(Unit.INSTANCE)).get();
+                resourceManager.createReload(new ThreadPerTaskExecutor(Thread::new), new ThreadPerTaskExecutor(Thread::new), CompletableFuture.completedFuture(Unit.INSTANCE), Collections.singletonList(thePack)).done().get();
             } catch (Exception exception) {
                 throw new RuntimeException(exception);
             }
@@ -148,27 +158,27 @@ public final class BlockOptionalMeta {
         return manager;
     }
 
-    public static LootPredicateManager getPredicateManager() {
+    public static PredicateManager getPredicateManager() {
         return predicate;
     }
 
     private static synchronized List<Item> drops(Block b) {
         return drops.computeIfAbsent(b, block -> {
             ResourceLocation lootTableLocation = block.getLootTable();
-            if (lootTableLocation == LootTables.EMPTY) {
+            if (lootTableLocation == BuiltInLootTables.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().getLootTableFromLocation(lootTableLocation).generate(
-                        new LootContext.Builder(null)
+                getManager().get(lootTableLocation).getRandomItems(
+                        new LootContext.Builder((ServerLevel) null)
                                 .withRandom(new Random())
-                                .withParameter(LootParameters.field_237457_g_, Vector3d.copy(BlockPos.NULL_VECTOR))
-                                .withParameter(LootParameters.TOOL, ItemStack.EMPTY)
-                                .withNullableParameter(LootParameters.BLOCK_ENTITY, null)
-                                .withParameter(LootParameters.BLOCK_STATE, block.getDefaultState())
-                                .build(LootParameterSets.BLOCK),
+                                .withParameter(LootContextParams.ORIGIN, Vec3.atLowerCornerOf(BlockPos.ZERO))
+                                .withParameter(LootContextParams.TOOL, ItemStack.EMPTY)
+                                .withOptionalParameter(LootContextParams.BLOCK_ENTITY, null)
+                                .withParameter(LootContextParams.BLOCK_STATE, block.defaultBlockState())
+                                .create(LootContextParamSets.BLOCK),
                         stack -> items.add(stack.getItem())
                 );
                 return items;

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

@@ -17,13 +17,12 @@
 
 package baritone.api.utils;
 
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
-import net.minecraft.item.ItemStack;
-
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Stream;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockState;
 
 public class BlockOptionalMetaLookup {
 

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

@@ -17,12 +17,11 @@
 
 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 {
 
@@ -57,7 +56,7 @@ public class BlockUtils {
         if (resourceCache.containsKey(name)) {
             return null; // cached as null
         }
-        block = Registry.BLOCK.getOptional(ResourceLocation.tryCreate(name.contains(":") ? name : "minecraft:" + name)).orElse(null);
+        block = Registry.BLOCK.getOptional(ResourceLocation.tryParse(name.contains(":") ? name : "minecraft:" + name)).orElse(null);
         Map<String, Block> copy = new HashMap<>(resourceCache); // read only copy is safe, wont throw concurrentmodification
         copy.put(name, block);
         resourceCache = copy;

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

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

@@ -18,19 +18,18 @@
 package baritone.api.utils;
 
 import baritone.api.cache.IWorldData;
-import net.minecraft.block.SlabBlock;
-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;
 import java.util.stream.StreamSupport;
+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;
 
 /**
  * @author Brady
@@ -38,14 +37,14 @@ import java.util.stream.StreamSupport;
  */
 public interface IPlayerContext {
 
-    ClientPlayerEntity player();
+    LocalPlayer player();
 
     IPlayerController playerController();
 
-    World world();
+    Level world();
 
     default Iterable<Entity> entities() {
-        return ((ClientWorld) world()).getAllEntities();
+        return ((ClientLevel) world()).entitiesForRendering();
     }
 
     default Stream<Entity> entitiesStream() {
@@ -55,11 +54,11 @@ public interface IPlayerContext {
 
     IWorldData worldData();
 
-    RayTraceResult objectMouseOver();
+    HitResult objectMouseOver();
 
     default BetterBlockPos playerFeet() {
         // TODO find a better way to deal with soul sand!!!!!
-        BetterBlockPos feet = new BetterBlockPos(player().getPositionVec().x, player().getPositionVec().y + 0.1251, player().getPositionVec().z);
+        BetterBlockPos feet = new BetterBlockPos(player().position().x, player().position().y + 0.1251, player().position().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
@@ -71,23 +70,23 @@ 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.up();
+                return feet.above();
             }
         } catch (NullPointerException ignored) {}
 
         return feet;
     }
 
-    default Vector3d playerFeetAsVec() {
-        return new Vector3d(player().getPositionVec().x, player().getPositionVec().y, player().getPositionVec().z);
+    default Vec3 playerFeetAsVec() {
+        return new Vec3(player().position().x, player().position().y, player().position().z);
     }
 
-    default Vector3d playerHead() {
-        return new Vector3d(player().getPositionVec().x, player().getPositionVec().y + player().getEyeHeight(), player().getPositionVec().z);
+    default Vec3 playerHead() {
+        return new Vec3(player().position().x, player().position().y + player().getEyeHeight(), player().position().z);
     }
 
     default Rotation playerRotations() {
-        return new Rotation(player().rotationYaw, player().rotationPitch);
+        return new Rotation(player().getYRot(), player().getXRot());
     }
 
     static double eyeHeight(boolean ifSneaking) {
@@ -100,9 +99,9 @@ public interface IPlayerContext {
      * @return The position of the highlighted block
      */
     default Optional<BlockPos> getSelectedBlock() {
-        RayTraceResult result = objectMouseOver();
-        if (result != null && result.getType() == RayTraceResult.Type.BLOCK) {
-            return Optional.of(((BlockRayTraceResult) result).getPos());
+        HitResult result = objectMouseOver();
+        if (result != null && result.getType() == HitResult.Type.BLOCK) {
+            return Optional.of(((BlockHitResult) result).getBlockPos());
         }
         return Optional.empty();
     }

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

@@ -18,17 +18,16 @@
 package baritone.api.utils;
 
 import baritone.api.BaritoneAPI;
-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;
+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;
 
 /**
  * @author Brady
@@ -44,13 +43,13 @@ public interface IPlayerController {
 
     void resetBlockRemoving();
 
-    ItemStack windowClick(int windowId, int slotId, int mouseButton, ClickType type, PlayerEntity player);
+    void windowClick(int windowId, int slotId, int mouseButton, ClickType type, Player player);
 
     GameType getGameType();
 
-    ActionResultType processRightClickBlock(ClientPlayerEntity player, World world, Hand hand, BlockRayTraceResult result);
+    InteractionResult processRightClickBlock(LocalPlayer player, Level world, InteractionHand hand, BlockHitResult result);
 
-    ActionResultType processRightClick(ClientPlayerEntity player, World world, Hand hand);
+    InteractionResult processRightClick(LocalPlayer player, Level world, InteractionHand 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.entity.Entity;
-import net.minecraft.util.math.RayTraceContext;
-import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.ClipContext;
+import net.minecraft.world.phys.HitResult;
+import net.minecraft.world.phys.Vec3;
 
 /**
  * @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 RayTraceResult rayTraceTowards(Entity entity, Rotation rotation, double blockReachDistance) {
+    public static HitResult rayTraceTowards(Entity entity, Rotation rotation, double blockReachDistance) {
         return rayTraceTowards(entity, rotation, blockReachDistance, false);
     }
 
-    public static RayTraceResult rayTraceTowards(Entity entity, Rotation rotation, double blockReachDistance, boolean wouldSneak) {
-        Vector3d start;
+    public static HitResult rayTraceTowards(Entity entity, Rotation rotation, double blockReachDistance, boolean wouldSneak) {
+        Vec3 start;
         if (wouldSneak) {
             start = inferSneakingEyePosition(entity);
         } else {
             start = entity.getEyePosition(1.0F); // do whatever is correct
         }
-        Vector3d direction = RotationUtils.calcVector3dFromRotation(rotation);
-        Vector3d end = start.add(
+        Vec3 direction = RotationUtils.calcVector3dFromRotation(rotation);
+        Vec3 end = start.add(
                 direction.x * blockReachDistance,
                 direction.y * blockReachDistance,
                 direction.z * blockReachDistance
         );
-        return entity.world.rayTraceBlocks(new RayTraceContext(start, end, RayTraceContext.BlockMode.OUTLINE, RayTraceContext.FluidMode.NONE, entity));
+        return entity.level.clip(new ClipContext(start, end, ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, entity));
     }
 
-    public static Vector3d inferSneakingEyePosition(Entity entity) {
-        return new Vector3d(entity.getPosX(), entity.getPosY() + IPlayerContext.eyeHeight(true), entity.getPosZ());
+    public static Vec3 inferSneakingEyePosition(Entity entity) {
+        return new Vec3(entity.getX(), entity.getY() + IPlayerContext.eyeHeight(true), entity.getZ());
     }
 }

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

@@ -19,20 +19,19 @@ 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
@@ -53,13 +52,13 @@ public final class RotationUtils {
     /**
      * Offsets from the root block position to the center of each side.
      */
-    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 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 RotationUtils() {}
@@ -72,7 +71,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 Vector3d(orig.getX(), orig.getY(), orig.getZ()), new Vector3d(dest.getX(), dest.getY(), dest.getZ()));
+        return calcRotationFromVec3d(new Vec3(orig.getX(), orig.getY(), orig.getZ()), new Vec3(dest.getX(), dest.getY(), dest.getZ()));
     }
 
     /**
@@ -101,7 +100,7 @@ public final class RotationUtils {
      * @return The rotation from the origin to the destination
      * @see #wrapAnglesToRelative(Rotation, Rotation)
      */
-    public static Rotation calcRotationFromVec3d(Vector3d orig, Vector3d dest, Rotation current) {
+    public static Rotation calcRotationFromVec3d(Vec3 orig, Vec3 dest, Rotation current) {
         return wrapAnglesToRelative(current, calcRotationFromVec3d(orig, dest));
     }
 
@@ -112,11 +111,11 @@ public final class RotationUtils {
      * @param dest The destination position
      * @return The rotation from the origin to the destination
      */
-    private static Rotation calcRotationFromVec3d(Vector3d orig, Vector3d dest) {
+    private static Rotation calcRotationFromVec3d(Vec3 orig, Vec3 dest) {
         double[] delta = {orig.x - dest.x, orig.y - dest.y, orig.z - dest.z};
-        double yaw = MathHelper.atan2(delta[0], -delta[2]);
+        double yaw = Mth.atan2(delta[0], -delta[2]);
         double dist = Math.sqrt(delta[0] * delta[0] + delta[2] * delta[2]);
-        double pitch = MathHelper.atan2(delta[1], dist);
+        double pitch = Mth.atan2(delta[1], dist);
         return new Rotation(
                 (float) (yaw * RAD_TO_DEG),
                 (float) (pitch * RAD_TO_DEG)
@@ -129,19 +128,19 @@ public final class RotationUtils {
      * @param rotation The input rotation
      * @return Look vector for the rotation
      */
-    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));
+    public static Vec3 calcVector3dFromRotation(Rotation rotation) {
+        float f = Mth.cos(-rotation.getYaw() * (float) DEG_TO_RAD - (float) Math.PI);
+        float f1 = Mth.sin(-rotation.getYaw() * (float) DEG_TO_RAD - (float) Math.PI);
+        float f2 = -Mth.cos(-rotation.getPitch() * (float) DEG_TO_RAD);
+        float f3 = Mth.sin(-rotation.getPitch() * (float) DEG_TO_RAD);
+        return new Vec3((double) (f1 * f2), (double) f3, (double) (f * f2));
     }
 
     /**
      * @param ctx Context for the viewing entity
      * @param pos The target block position
      * @return The optional rotation
-     * @see #reachable(ClientPlayerEntity, BlockPos, double)
+     * @see #reachable(LocalPlayer, BlockPos, double)
      */
     public static Optional<Rotation> reachable(IPlayerContext ctx, BlockPos pos) {
         return reachable(ctx.player(), pos, ctx.playerController().getBlockReachDistance());
@@ -163,11 +162,11 @@ public final class RotationUtils {
      * @param blockReachDistance The block reach distance of the entity
      * @return The optional rotation
      */
-    public static Optional<Rotation> reachable(ClientPlayerEntity entity, BlockPos pos, double blockReachDistance) {
+    public static Optional<Rotation> reachable(LocalPlayer entity, BlockPos pos, double blockReachDistance) {
         return reachable(entity, pos, blockReachDistance, false);
     }
 
-    public static Optional<Rotation> reachable(ClientPlayerEntity entity, BlockPos pos, double blockReachDistance, boolean wouldSneak) {
+    public static Optional<Rotation> reachable(LocalPlayer entity, BlockPos pos, double blockReachDistance, boolean wouldSneak) {
         IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer(entity);
         if (baritone.getPlayerContext().isLookingAt(pos)) {
             /*
@@ -180,11 +179,11 @@ public final class RotationUtils {
              *
              * or if you're a normal person literally all this does it ensure that we don't nudge the pitch to a normal level
              */
-            Rotation hypothetical = new Rotation(entity.rotationYaw, entity.rotationPitch + 0.0001F);
+            Rotation hypothetical = new Rotation(entity.getYRot(), entity.getXRot() + 0.0001F);
             if (wouldSneak) {
                 // the concern here is: what if we're looking at it now, but as soon as we start sneaking we no longer are
-                RayTraceResult result = RayTraceUtils.rayTraceTowards(entity, hypothetical, blockReachDistance, true);
-                if (result != null && result.getType() == RayTraceResult.Type.BLOCK && ((BlockRayTraceResult) result).getPos().equals(pos)) {
+                HitResult result = RayTraceUtils.rayTraceTowards(entity, hypothetical, blockReachDistance, true);
+                if (result != null && result.getType() == HitResult.Type.BLOCK && ((BlockHitResult) result).getBlockPos().equals(pos)) {
                     return Optional.of(hypothetical); // yes, if we sneaked we would still be looking at the block
                 }
             } else {
@@ -197,16 +196,16 @@ public final class RotationUtils {
             return possibleRotation;
         }
 
-        BlockState state = entity.world.getBlockState(pos);
-        VoxelShape shape = state.getShape(entity.world, pos);
+        BlockState state = entity.level.getBlockState(pos);
+        VoxelShape shape = state.getShape(entity.level, pos);
         if (shape.isEmpty()) {
-            shape = VoxelShapes.fullCube();
+            shape = Shapes.block();
         }
-        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(entity, pos, new Vector3d(pos.getX(), pos.getY(), pos.getZ()).add(xDiff, yDiff, zDiff), blockReachDistance, wouldSneak);
+        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(entity, pos, new Vec3(pos.getX(), pos.getY(), pos.getZ()).add(xDiff, yDiff, zDiff), blockReachDistance, wouldSneak);
             if (possibleRotation.isPresent()) {
                 return possibleRotation;
             }
@@ -225,16 +224,16 @@ public final class RotationUtils {
      * @param blockReachDistance The block reach distance of the entity
      * @return The optional rotation
      */
-    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);
+    public static Optional<Rotation> reachableOffset(Entity entity, BlockPos pos, Vec3 offsetPos, double blockReachDistance, boolean wouldSneak) {
+        Vec3 eyes = wouldSneak ? RayTraceUtils.inferSneakingEyePosition(entity) : entity.getEyePosition(1.0F);
+        Rotation rotation = calcRotationFromVec3d(eyes, offsetPos, new Rotation(entity.getYRot(), entity.getXRot()));
+        HitResult result = RayTraceUtils.rayTraceTowards(entity, rotation, blockReachDistance, wouldSneak);
         //System.out.println(result);
-        if (result != null && result.getType() == RayTraceResult.Type.BLOCK) {
-            if (((BlockRayTraceResult) result).getPos().equals(pos)) {
+        if (result != null && result.getType() == HitResult.Type.BLOCK) {
+            if (((BlockHitResult) result).getBlockPos().equals(pos)) {
                 return Optional.of(rotation);
             }
-            if (entity.world.getBlockState(pos).getBlock() instanceof AbstractFireBlock && ((BlockRayTraceResult) result).getPos().equals(pos.down())) {
+            if (entity.level.getBlockState(pos).getBlock() instanceof BaseFireBlock && ((BlockHitResult) result).getBlockPos().equals(pos.below())) {
                 return Optional.of(rotation);
             }
         }
@@ -251,6 +250,6 @@ public final class RotationUtils {
      * @return The optional rotation
      */
     public static Optional<Rotation> reachableCenter(Entity entity, BlockPos pos, double blockReachDistance, boolean wouldSneak) {
-        return reachableOffset(entity, pos, VecUtils.calculateBlockCenter(entity.world, pos), blockReachDistance, wouldSneak);
+        return reachableOffset(entity, pos, VecUtils.calculateBlockCenter(entity.level, pos), blockReachDistance, wouldSneak);
     }
 }

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

@@ -19,14 +19,13 @@ 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.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 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 java.awt.*;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -50,7 +49,7 @@ import java.util.stream.Stream;
 
 public class SettingsUtil {
 
-    private static final Path SETTINGS_PATH = Minecraft.getInstance().gameDir.toPath().resolve("baritone").resolve("settings.txt");
+    private static final Path SETTINGS_PATH = Minecraft.getInstance().gameDirectory.toPath().resolve("baritone").resolve("settings.txt");
     private static final Pattern SETTING_PATTERN = Pattern.compile("^(?<setting>[^ ]+) +(?<value>.+)"); // key and value split by the first space
     private static final String[] JAVA_ONLY_SETTINGS = {"logger", "notifier", "toaster"};
 
@@ -242,8 +241,8 @@ public class SettingsUtil {
                 color -> color.getRed() + "," + color.getGreen() + "," + color.getBlue()
         ),
         VEC3I(
-                Vector3i.class,
-                str -> new Vector3i(Integer.parseInt(str.split(",")[0]), Integer.parseInt(str.split(",")[1]), Integer.parseInt(str.split(",")[2])),
+                Vec3i.class,
+                str -> new Vec3i(Integer.parseInt(str.split(",")[0]), Integer.parseInt(str.split(",")[1]), Integer.parseInt(str.split(",")[2])),
                 vec -> vec.getX() + "," + vec.getY() + "," + vec.getZ()
         ),
         BLOCK(
@@ -253,7 +252,7 @@ public class SettingsUtil {
         ),
         ITEM(
                 Item.class,
-                str -> Registry.ITEM.getOrDefault(new ResourceLocation(str.trim())), // TODO this now returns AIR on failure instead of null, is that an issue?
+                str -> Registry.ITEM.get(new ResourceLocation(str.trim())), // TODO this now returns AIR on failure instead of null, is that an issue?
                 item -> Registry.ITEM.getKey(item).toString()
         ),
         LIST() {

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

@@ -17,14 +17,14 @@
 
 package baritone.api.utils;
 
-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;
+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;
 
 /**
  * @author Brady
@@ -42,22 +42,22 @@ public final class VecUtils {
      * @return The center of the block's bounding box
      * @see #getBlockPosCenter(BlockPos)
      */
-    public static Vector3d calculateBlockCenter(World world, BlockPos pos) {
+    public static Vec3 calculateBlockCenter(Level world, BlockPos pos) {
         BlockState b = world.getBlockState(pos);
         VoxelShape shape = b.getCollisionShape(world, pos);
         if (shape.isEmpty()) {
             return getBlockPosCenter(pos);
         }
-        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;
+        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;
         if (Double.isNaN(xDiff) || Double.isNaN(yDiff) || Double.isNaN(zDiff)) {
             throw new IllegalStateException(b + " " + pos + " " + shape);
         }
-        if (b.getBlock() instanceof AbstractFireBlock) {//look at bottom of fire when putting it out
+        if (b.getBlock() instanceof BaseFireBlock) {//look at bottom of fire when putting it out
             yDiff = 0;
         }
-        return new Vector3d(
+        return new Vec3(
                 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(World, BlockPos)
+     * @see #calculateBlockCenter(Level, BlockPos)
      */
-    public static Vector3d getBlockPosCenter(BlockPos pos) {
-        return new Vector3d(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
+    public static Vec3 getBlockPosCenter(BlockPos pos) {
+        return new Vec3(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.getPositionVec().x, entity.getPositionVec().y, entity.getPositionVec().z);
+        return distanceToCenter(pos, entity.position().x, entity.position().y, entity.position().z);
     }
 
     /**
@@ -118,6 +118,6 @@ public final class VecUtils {
      * @see #getBlockPosCenter(BlockPos)
      */
     public static double entityFlatDistanceToCenter(Entity entity, BlockPos pos) {
-        return distanceToCenter(pos, entity.getPositionVec().x, pos.getY() + 0.5, entity.getPositionVec().z);
+        return distanceToCenter(pos, entity.position().x, pos.getY() + 0.5, entity.position().z);
     }
 }

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

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

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.ClientChunkProvider$ChunkArray")
+@Mixin(targets = "net.minecraft.client.multiplayer.ClientChunkCache$Storage")
 public abstract class MixinChunkArray implements IChunkArray {
     @Shadow
-    private AtomicReferenceArray<Chunk> chunks;
+    private AtomicReferenceArray<LevelChunk> chunks;
     @Shadow
-    private int viewDistance;
+    private int chunkRadius;
     @Shadow
-    private int sideLength;
+    private int viewRange;
     @Shadow
-    private int centerX;
+    private int viewCenterX;
     @Shadow
-    private int centerZ;
+    private int viewCenterZ;
     @Shadow
-    private int loaded;
+    private int chunkCount;
 
     @Shadow
-    protected abstract boolean inView(int x, int z);
+    protected abstract boolean inRange(int x, int z);
 
     @Shadow
     protected abstract int getIndex(int x, int z);
 
     @Shadow
-    protected abstract void replace(int index, Chunk chunk);
+    protected abstract void replace(int index, LevelChunk chunk);
 
     @Override
     public int centerX() {
-        return centerX;
+        return viewCenterX;
     }
 
     @Override
     public int centerZ() {
-        return centerZ;
+        return viewCenterZ;
     }
 
     @Override
     public int viewDistance() {
-        return viewDistance;
+        return chunkRadius;
     }
 
     @Override
-    public AtomicReferenceArray<Chunk> getChunks() {
+    public AtomicReferenceArray<LevelChunk> getChunks() {
         return chunks;
     }
 
     @Override
     public void copyFrom(IChunkArray other) {
-        centerX = other.centerX();
-        centerZ = other.centerZ();
+        viewCenterX = other.centerX();
+        viewCenterZ = other.centerZ();
 
-        AtomicReferenceArray<Chunk> copyingFrom = other.getChunks();
+        AtomicReferenceArray<LevelChunk> copyingFrom = other.getChunks();
         for (int k = 0; k < copyingFrom.length(); ++k) {
-            Chunk chunk = copyingFrom.get(k);
+            LevelChunk chunk = copyingFrom.get(k);
             if (chunk != null) {
                 ChunkPos chunkpos = chunk.getPos();
-                if (inView(chunkpos.x, chunkpos.z)) {
+                if (inRange(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,24 +19,26 @@ package baritone.launch.mixins;
 
 import baritone.utils.accessor.IChunkArray;
 import baritone.utils.accessor.IClientChunkProvider;
-import net.minecraft.client.multiplayer.ClientChunkProvider;
-import net.minecraft.client.world.ClientWorld;
+import org.spongepowered.asm.mixin.Final;
 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(ClientChunkProvider.class)
+@Mixin(ClientChunkCache.class)
 public class MixinClientChunkProvider implements IClientChunkProvider {
 
+    @Final
     @Shadow
-    private ClientWorld world;
+    ClientLevel level;
 
     @Override
-    public ClientChunkProvider createThreadSafeCopy() {
+    public ClientChunkCache createThreadSafeCopy() {
         IChunkArray arr = extractReferenceArray();
-        ClientChunkProvider result = new ClientChunkProvider(world, arr.viewDistance() - 3); // -3 because its adds 3 for no reason lmao
+        ClientChunkCache result = new ClientChunkCache(level, 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()) {
@@ -47,7 +49,7 @@ public class MixinClientChunkProvider implements IClientChunkProvider {
 
     @Override
     public IChunkArray extractReferenceArray() {
-        for (Field f : ClientChunkProvider.class.getDeclaredFields()) {
+        for (Field f : ClientChunkCache.class.getDeclaredFields()) {
             if (IChunkArray.class.isAssignableFrom(f.getType())) {
                 try {
                     return (IChunkArray) f.get(this);
@@ -56,6 +58,6 @@ public class MixinClientChunkProvider implements IClientChunkProvider {
                 }
             }
         }
-        throw new RuntimeException(Arrays.toString(ClientChunkProvider.class.getDeclaredFields()));
+        throw new RuntimeException(Arrays.toString(ClientChunkCache.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.entity.player.ClientPlayerEntity;
-import net.minecraft.client.network.play.ClientPlayNetHandler;
-import net.minecraft.network.play.server.*;
-import net.minecraft.util.math.ChunkPos;
+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 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(ClientPlayNetHandler.class)
+@Mixin(ClientPacketListener.class)
 public class MixinClientPlayNetHandler {
 
     // unused lol
@@ -64,19 +64,19 @@ public class MixinClientPlayNetHandler {
     }*/
 
     @Inject(
-            method = "handleChunkData",
+            method = "handleLevelChunkWithLight",
             at = @At("RETURN")
     )
-    private void postHandleChunkData(SChunkDataPacket packetIn, CallbackInfo ci) {
+    private void postHandleChunkData(ClientboundLevelChunkWithLightPacket packetIn, CallbackInfo ci) {
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            ClientPlayerEntity player = ibaritone.getPlayerContext().player();
-            if (player != null && player.connection == (ClientPlayNetHandler) (Object) this) {
+            LocalPlayer player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (ClientPacketListener) (Object) this) {
                 ibaritone.getGameEventHandler().onChunkEvent(
                         new ChunkEvent(
                                 EventState.POST,
-                                packetIn.isFullChunk() ? ChunkEvent.Type.POPULATE_FULL : ChunkEvent.Type.POPULATE_PARTIAL,
-                                packetIn.getChunkX(),
-                                packetIn.getChunkZ()
+                                !packetIn.isSkippable() ? ChunkEvent.Type.POPULATE_FULL : ChunkEvent.Type.POPULATE_PARTIAL,
+                                packetIn.getX(),
+                                packetIn.getZ()
                         )
                 );
             }
@@ -84,13 +84,13 @@ public class MixinClientPlayNetHandler {
     }
 
     @Inject(
-            method = "processChunkUnload",
+            method = "handleForgetLevelChunk",
             at = @At("HEAD")
     )
-    private void preChunkUnload(SUnloadChunkPacket packet, CallbackInfo ci) {
+    private void preChunkUnload(ClientboundForgetLevelChunkPacket packet, CallbackInfo ci) {
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            ClientPlayerEntity player = ibaritone.getPlayerContext().player();
-            if (player != null && player.connection == (ClientPlayNetHandler) (Object) this) {
+            LocalPlayer player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (ClientPacketListener) (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 = "processChunkUnload",
+            method = "handleForgetLevelChunk",
             at = @At("RETURN")
     )
-    private void postChunkUnload(SUnloadChunkPacket packet, CallbackInfo ci) {
+    private void postChunkUnload(ClientboundForgetLevelChunkPacket packet, CallbackInfo ci) {
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            ClientPlayerEntity player = ibaritone.getPlayerContext().player();
-            if (player != null && player.connection == (ClientPlayNetHandler) (Object) this) {
+            LocalPlayer player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (ClientPacketListener) (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 = "handleBlockChange",
+            method = "handleBlockUpdate",
             at = @At("RETURN")
     )
-    private void postHandleBlockChange(SChangeBlockPacket packetIn, CallbackInfo ci) {
+    private void postHandleBlockChange(ClientboundBlockUpdatePacket packetIn, CallbackInfo ci) {
         if (!Baritone.settings().repackOnAnyBlockChange.value) {
             return;
         }
-        if (!CachedChunk.BLOCKS_TO_KEEP_TRACK_OF.contains(packetIn.getState().getBlock())) {
+        if (!CachedChunk.BLOCKS_TO_KEEP_TRACK_OF.contains(packetIn.getBlockState().getBlock())) {
             return;
         }
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            ClientPlayerEntity player = ibaritone.getPlayerContext().player();
-            if (player != null && player.connection == (ClientPlayNetHandler) (Object) this) {
+            LocalPlayer player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (ClientPacketListener) (Object) this) {
                 ibaritone.getGameEventHandler().onChunkEvent(
                         new ChunkEvent(
                                 EventState.POST,
@@ -140,15 +140,15 @@ public class MixinClientPlayNetHandler {
     }
 
     @Inject(
-            method = "handleMultiBlockChange",
+            method = "handleChunkBlocksUpdate",
             at = @At("RETURN")
     )
-    private void postHandleMultiBlockChange(SMultiBlockChangePacket packetIn, CallbackInfo ci) {
+    private void postHandleMultiBlockChange(ClientboundSectionBlocksUpdatePacket packetIn, CallbackInfo ci) {
         if (!Baritone.settings().repackOnAnyBlockChange.value) {
             return;
         }
         ChunkPos[] chunkPos = new ChunkPos[1];
-        packetIn.func_244310_a((pos, state) -> {
+        packetIn.runUpdates((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()) {
-            ClientPlayerEntity player = ibaritone.getPlayerContext().player();
-            if (player != null && player.connection == (ClientPlayNetHandler) (Object) this) {
+            LocalPlayer player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (ClientPacketListener) (Object) this) {
                 ibaritone.getGameEventHandler().onChunkEvent(
                         new ChunkEvent(
                                 EventState.POST,
@@ -172,16 +172,16 @@ public class MixinClientPlayNetHandler {
     }
 
     @Inject(
-            method = "handleCombatEvent",
+            method = "handlePlayerCombatKill",
             at = @At(
                     value = "INVOKE",
-                    target = "net/minecraft/client/Minecraft.displayGuiScreen(Lnet/minecraft/client/gui/screen/Screen;)V"
+                    target = "Lnet/minecraft/client/player/LocalPlayer;shouldShowDeathScreen()Z"
             )
     )
-    private void onPlayerDeath(SCombatPacket packetIn, CallbackInfo ci) {
+    private void onPlayerDeath(ClientboundPlayerCombatKillPacket packetIn, CallbackInfo ci) {
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            ClientPlayerEntity player = ibaritone.getPlayerContext().player();
-            if (player != null && player.connection == (ClientPlayNetHandler) (Object) this) {
+            LocalPlayer player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (ClientPacketListener) (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.entity.player.ClientPlayerEntity;
-import net.minecraft.client.settings.KeyBinding;
-import net.minecraft.entity.player.PlayerAbilities;
+import net.minecraft.client.KeyMapping;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.world.entity.player.Abilities;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.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(ClientPlayerEntity.class)
+@Mixin(LocalPlayer.class)
 public class MixinClientPlayerEntity {
 
     @Inject(
-            method = "sendChatMessage",
+            method = "chat",
             at = @At("HEAD"),
             cancellable = true
     )
     private void sendChatMessage(String msg, CallbackInfo ci) {
         ChatEvent event = new ChatEvent(msg);
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this);
         if (baritone == null) {
             return;
         }
@@ -61,13 +61,13 @@ public class MixinClientPlayerEntity {
             method = "tick",
             at = @At(
                     value = "INVOKE",
-                    target = "net/minecraft/client/entity/player/ClientPlayerEntity.isPassenger()Z",
+                    target = "net/minecraft/client/player/LocalPlayer.isPassenger()Z",
                     shift = At.Shift.BY,
                     by = -3
             )
     )
     private void onPreUpdate(CallbackInfo ci) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this);
         if (baritone != null) {
             baritone.getGameEventHandler().onPlayerUpdate(new PlayerUpdateEvent(EventState.PRE));
         }
@@ -77,44 +77,44 @@ public class MixinClientPlayerEntity {
             method = "tick",
             at = @At(
                     value = "INVOKE",
-                    target = "net/minecraft/client/entity/player/ClientPlayerEntity.onUpdateWalkingPlayer()V",
+                    target = "net/minecraft/client/player/LocalPlayer.sendPosition()V",
                     shift = At.Shift.BY,
                     by = 2
             )
     )
     private void onPostUpdate(CallbackInfo ci) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this);
         if (baritone != null) {
             baritone.getGameEventHandler().onPlayerUpdate(new PlayerUpdateEvent(EventState.POST));
         }
     }
 
     @Redirect(
-            method = "livingTick",
+            method = "aiStep",
             at = @At(
                     value = "FIELD",
-                    target = "net/minecraft/entity/player/PlayerAbilities.allowFlying:Z"
+                    target = "net/minecraft/world/entity/player/Abilities.mayfly:Z"
             )
     )
-    private boolean isAllowFlying(PlayerAbilities capabilities) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
+    private boolean isAllowFlying(Abilities capabilities) {
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this);
         if (baritone == null) {
-            return capabilities.allowFlying;
+            return capabilities.mayfly;
         }
-        return !baritone.getPathingBehavior().isPathing() && capabilities.allowFlying;
+        return !baritone.getPathingBehavior().isPathing() && capabilities.mayfly;
     }
 
     @Redirect(
-            method = "livingTick",
+            method = "aiStep",
             at = @At(
                     value = "INVOKE",
-                    target = "net/minecraft/client/settings/KeyBinding.isKeyDown()Z"
+                    target = "net/minecraft/client/KeyMapping.isDown()Z"
             )
     )
-    private boolean isKeyDown(KeyBinding keyBinding) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
+    private boolean isKeyDown(KeyMapping keyBinding) {
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this);
         if (baritone == null) {
-            return keyBinding.isKeyDown();
+            return keyBinding.isDown();
         }
         SprintStateEvent event = new SprintStateEvent();
         baritone.getGameEventHandler().onPlayerSprintState(event);
@@ -125,17 +125,17 @@ public class MixinClientPlayerEntity {
             // hitting control shouldn't make all bots sprint
             return false;
         }
-        return keyBinding.isKeyDown();
+        return keyBinding.isDown();
     }
 
     @Inject(
-            method = "updateRidden",
+            method = "rideTick",
             at = @At(
                     value = "HEAD"
             )
     )
     private void updateRidden(CallbackInfo cb) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this);
         if (baritone != null) {
             ((LookBehavior) baritone.getLookBehavior()).pig();
         }

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

@@ -22,8 +22,6 @@ import baritone.api.event.events.TabCompleteEvent;
 import com.mojang.brigadier.context.StringRange;
 import com.mojang.brigadier.suggestion.Suggestion;
 import com.mojang.brigadier.suggestion.Suggestions;
-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;
@@ -35,33 +33,35 @@ import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import net.minecraft.client.gui.components.CommandSuggestions;
+import net.minecraft.client.gui.components.EditBox;
 
 /**
  * @author Brady
  * @since 10/9/2019
  */
-@Mixin(CommandSuggestionHelper.class)
+@Mixin(CommandSuggestions.class)
 public class MixinCommandSuggestionHelper {
 
     @Shadow
     @Final
-    private TextFieldWidget inputField;
+    EditBox input;
 
     @Shadow
     @Final
-    private List<String> exceptionList;
+    private List<String> commandUsage;
 
     @Shadow
-    private CompletableFuture<Suggestions> suggestionsFuture;
+    private CompletableFuture<Suggestions> pendingSuggestions;
 
     @Inject(
-            method = "init",
+            method = "updateCommandInfo",
             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.inputField.getText().substring(0, Math.min(this.inputField.getText().length(), this.inputField.getCursorPosition()));
+        String prefix = this.input.getValue().substring(0, Math.min(this.input.getValue().length(), this.input.getCursorPosition()));
 
         TabCompleteEvent event = new TabCompleteEvent(prefix);
         BaritoneAPI.getProvider().getPrimaryBaritone().getGameEventHandler().onPreTabComplete(event);
@@ -75,14 +75,14 @@ public class MixinCommandSuggestionHelper {
             ci.cancel();
 
             // TODO: Support populating the command usage
-            this.exceptionList.clear();
+            this.commandUsage.clear();
 
             if (event.completions.length == 0) {
-                this.suggestionsFuture = Suggestions.empty();
+                this.pendingSuggestions = Suggestions.empty();
             } else {
-                int offset = this.inputField.getText().endsWith(" ")
-                        ? this.inputField.getCursorPosition()
-                        : this.inputField.getText().lastIndexOf(" ") + 1; // If there is no space this is still 0 haha yes
+                int offset = this.input.getValue().endsWith(" ")
+                        ? this.input.getCursorPosition()
+                        : this.input.getValue().lastIndexOf(" ") + 1; // If there is no space this is still 0 haha yes
 
                 List<Suggestion> suggestionList = Stream.of(event.completions)
                         .map(s -> new Suggestion(StringRange.between(offset, offset + s.length()), s))
@@ -92,8 +92,8 @@ public class MixinCommandSuggestionHelper {
                         StringRange.between(offset, offset + suggestionList.stream().mapToInt(s -> s.getText().length()).max().orElse(0)),
                         suggestionList);
 
-                this.suggestionsFuture = new CompletableFuture<>();
-                this.suggestionsFuture.complete(suggestions);
+                this.pendingSuggestions = new CompletableFuture<>();
+                this.pendingSuggestions.complete(suggestions);
             }
         }
     }

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.entity.player.ClientPlayerEntity;
-import net.minecraft.entity.Entity;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.world.entity.Entity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -31,7 +31,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public class MixinEntity {
 
     @Shadow
-    private float rotationYaw;
+    private float yRot;
 
     float yawRestore;
 
@@ -40,14 +40,14 @@ public class MixinEntity {
             at = @At("HEAD")
     )
     private void moveRelativeHead(CallbackInfo info) {
-        this.yawRestore = this.rotationYaw;
+        this.yawRestore = this.yRot;
         // noinspection ConstantConditions
-        if (!ClientPlayerEntity.class.isInstance(this) || BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this) == null) {
+        if (!LocalPlayer.class.isInstance(this) || BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this) == null) {
             return;
         }
-        RotationMoveEvent motionUpdateRotationEvent = new RotationMoveEvent(RotationMoveEvent.Type.MOTION_UPDATE, this.rotationYaw);
-        BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this).getGameEventHandler().onPlayerRotationMove(motionUpdateRotationEvent);
-        this.rotationYaw = motionUpdateRotationEvent.getYaw();
+        RotationMoveEvent motionUpdateRotationEvent = new RotationMoveEvent(RotationMoveEvent.Type.MOTION_UPDATE, this.yRot);
+        BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this).getGameEventHandler().onPlayerRotationMove(motionUpdateRotationEvent);
+        this.yRot = motionUpdateRotationEvent.getYaw();
     }
 
     @Inject(
@@ -55,6 +55,6 @@ public class MixinEntity {
             at = @At("RETURN")
     )
     private void moveRelativeReturn(CallbackInfo info) {
-        this.rotationYaw = this.yawRestore;
+        this.yRot = this.yawRestore;
     }
 }

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.EntityRendererManager;
+import net.minecraft.client.renderer.entity.EntityRenderDispatcher;
 import org.spongepowered.asm.mixin.Mixin;
 
-@Mixin(EntityRendererManager.class)
+@Mixin(EntityRenderDispatcher.class)
 public class MixinEntityRenderManager implements IEntityRenderManager {
 
 
     @Override
     public double renderPosX() {
-        return ((EntityRendererManager) (Object) this).info.getProjectedView().x;
+        return ((EntityRenderDispatcher) (Object) this).camera.getPosition().x;
     }
 
     @Override
     public double renderPosY() {
-        return ((EntityRendererManager) (Object) this).info.getProjectedView().y;
+        return ((EntityRenderDispatcher) (Object) this).camera.getPosition().y;
     }
 
     @Override
     public double renderPosZ() {
-        return ((EntityRendererManager) (Object) this).info.getProjectedView().z;
+        return ((EntityRenderDispatcher) (Object) this).camera.getPosition().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.item.Item;
-import net.minecraft.item.ItemStack;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.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 getDamage();
+    protected abstract int getDamageValue();
 
     private void recalculateHash() {
-        baritoneHash = item == null ? -1 : item.hashCode() + getDamage();
+        baritoneHash = item == null ? -1 : item.hashCode() + getDamageValue();
     }
 
     @Inject(
@@ -54,7 +54,7 @@ public abstract class MixinItemStack implements IItemStack {
     }
 
     @Inject(
-            method = "setDamage",
+            method = "setDamageValue",
             at = @At("TAIL")
     )
     private void onItemDamageSet(CallbackInfo ci) {
@@ -63,6 +63,8 @@ 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,11 +20,11 @@ package baritone.launch.mixins;
 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
 import baritone.api.event.events.RotationMoveEvent;
-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.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 org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -45,38 +45,37 @@ public abstract class MixinLivingEntity extends Entity {
      */
     private RotationMoveEvent jumpRotationEvent;
 
-    public MixinLivingEntity(EntityType<?> entityTypeIn, World worldIn) {
+    public MixinLivingEntity(EntityType<?> entityTypeIn, Level worldIn) {
         super(entityTypeIn, worldIn);
     }
 
     @Inject(
-            method = "jump",
+            method = "jumpFromGround",
             at = @At("HEAD")
     )
     private void preMoveRelative(CallbackInfo ci) {
         // noinspection ConstantConditions
-        if (ClientPlayerEntity.class.isInstance(this)) {
-            IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
+        if (LocalPlayer.class.isInstance(this)) {
+            IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this);
             if (baritone != null) {
-                this.jumpRotationEvent = new RotationMoveEvent(RotationMoveEvent.Type.JUMP, this.rotationYaw);
+                this.jumpRotationEvent = new RotationMoveEvent(RotationMoveEvent.Type.JUMP, this.getYRot());
                 baritone.getGameEventHandler().onPlayerRotationMove(this.jumpRotationEvent);
             }
         }
     }
 
     @Redirect(
-            method = "jump",
+            method = "jumpFromGround",
             at = @At(
-                    value = "FIELD",
-                    opcode = GETFIELD,
-                    target = "net/minecraft/entity/LivingEntity.rotationYaw:F"
+                    value = "INVOKE",
+                    target = "net/minecraft/world/entity/LivingEntity.getYRot()F"
             )
     )
     private float overrideYaw(LivingEntity self) {
-        if (self instanceof ClientPlayerEntity && BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this) != null) {
+        if (self instanceof LocalPlayer && BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this) != null) {
             return this.jumpRotationEvent.getYaw();
         }
-        return self.rotationYaw;
+        return self.getYRot();
     }
 
 

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.world.server.ServerWorld;
+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 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 = "build",
+            method = "create",
             at = @At(
                     value = "INVOKE",
-                    target = "net/minecraft/world/server/ServerWorld.getServer()Lnet/minecraft/server/MinecraftServer;"
+                    target = "net/minecraft/server/level/ServerLevel.getServer()Lnet/minecraft/server/MinecraftServer;"
             )
     )
-    private MinecraftServer getServer(ServerWorld world) {
+    private MinecraftServer getServer(ServerLevel world) {
         if (world == null) {
             return null;
         }
@@ -45,30 +45,30 @@ public class MixinLootContext {
     }
 
     @Redirect(
-            method = "build",
+            method = "create",
             at = @At(
                     value = "INVOKE",
-                    target = "net/minecraft/server/MinecraftServer.getLootTableManager()Lnet/minecraft/loot/LootTableManager;"
+                    target = "Lnet/minecraft/server/MinecraftServer;getLootTables()Lnet/minecraft/world/level/storage/loot/LootTables;"
             )
     )
-    private LootTableManager getLootTableManager(MinecraftServer server) {
+    private LootTables getLootTableManager(MinecraftServer server) {
         if (server == null) {
             return BlockOptionalMeta.getManager();
         }
-        return server.getLootTableManager();
+        return server.getLootTables();
     }
 
     @Redirect(
-            method = "build",
+            method = "create",
             at = @At(
                     value = "INVOKE",
-                    target = "net/minecraft/server/MinecraftServer.func_229736_aP_()Lnet/minecraft/loot/LootPredicateManager;"
+                    target = "Lnet/minecraft/server/MinecraftServer;getPredicateManager()Lnet/minecraft/world/level/storage/loot/PredicateManager;"
             )
     )
-    private LootPredicateManager getLootPredicateManager(MinecraftServer server) {
+    private PredicateManager getLootPredicateManager(MinecraftServer server) {
         if (server == null) {
             return BlockOptionalMeta.getPredicateManager();
         }
-        return server.func_229736_aP_();
+        return server.getPredicateManager();
     }
 }

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

@@ -23,9 +23,9 @@ import baritone.api.event.events.TickEvent;
 import baritone.api.event.events.WorldEvent;
 import baritone.api.event.events.type.EventState;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.player.ClientPlayerEntity;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.world.ClientWorld;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.client.player.LocalPlayer;
 import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -44,9 +44,9 @@ import java.util.function.BiFunction;
 public class MixinMinecraft {
 
     @Shadow
-    public ClientPlayerEntity player;
+    public LocalPlayer player;
     @Shadow
-    public ClientWorld world;
+    public ClientLevel level;
 
     @Inject(
             method = "<init>",
@@ -58,14 +58,14 @@ public class MixinMinecraft {
 
 
     @Inject(
-            method = "runTick",
+            method = "tick",
             at = @At(
-                    value = "FIELD",
-                    opcode = Opcodes.GETFIELD,
-                    target = "net/minecraft/client/Minecraft.currentScreen:Lnet/minecraft/client/gui/screen/Screen;",
-                    ordinal = 5,
-                    shift = At.Shift.BY,
-                    by = -3
+            value = "FIELD",
+            opcode = Opcodes.GETFIELD,
+            target = "Lnet/minecraft/client/Minecraft;screen:Lnet/minecraft/client/gui/screens/Screen;",
+            ordinal = 4,
+            shift  = At.Shift.BY,
+            by = -3
             )
     )
     private void runTick(CallbackInfo ci) {
@@ -83,12 +83,12 @@ public class MixinMinecraft {
     }
 
     @Inject(
-            method = "loadWorld(Lnet/minecraft/client/world/ClientWorld;)V",
+            method = "setLevel",
             at = @At("HEAD")
     )
-    private void preLoadWorld(ClientWorld world, CallbackInfo ci) {
+    private void preLoadWorld(ClientLevel world, CallbackInfo ci) {
         // If we're unloading the world but one doesn't exist, ignore it
-        if (this.world == null && world == null) {
+        if (this.level == null && world == null) {
             return;
         }
 
@@ -103,10 +103,10 @@ public class MixinMinecraft {
     }
 
     @Inject(
-            method = "loadWorld(Lnet/minecraft/client/world/ClientWorld;)V",
+            method = "setLevel",
             at = @At("RETURN")
     )
-    private void postLoadWorld(ClientWorld world, CallbackInfo ci) {
+    private void postLoadWorld(ClientLevel world, CallbackInfo ci) {
         // still fire event for both null, as that means we've just finished exiting a world
 
         // mc.world changing is only the primary baritone
@@ -119,11 +119,11 @@ public class MixinMinecraft {
     }
 
     @Redirect(
-            method = "runTick",
+            method = "tick",
             at = @At(
                     value = "FIELD",
                     opcode = Opcodes.GETFIELD,
-                    target = "net/minecraft/client/gui/screen/Screen.passEvents:Z"
+                    target = "Lnet/minecraft/client/gui/screens/Screen;passEvents:Z"
             )
     )
     private boolean passEvents(Screen screen) {

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

@@ -25,9 +25,9 @@ import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GenericFutureListener;
-import net.minecraft.network.IPacket;
-import net.minecraft.network.NetworkManager;
-import net.minecraft.network.PacketDirection;
+import net.minecraft.network.Connection;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.PacketFlow;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -39,7 +39,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
  * @author Brady
  * @since 8/6/2018
  */
-@Mixin(NetworkManager.class)
+@Mixin(Connection.class)
 public class MixinNetworkManager {
 
     @Shadow
@@ -47,36 +47,36 @@ public class MixinNetworkManager {
 
     @Shadow
     @Final
-    private PacketDirection direction;
+    private PacketFlow receiving;
 
     @Inject(
-            method = "dispatchPacket",
+            method = "sendPacket",
             at = @At("HEAD")
     )
-    private void preDispatchPacket(IPacket<?> inPacket, final GenericFutureListener<? extends Future<? super Void>> futureListeners, CallbackInfo ci) {
-        if (this.direction != PacketDirection.CLIENTBOUND) {
+    private void preDispatchPacket(Packet<?> inPacket, final GenericFutureListener<? extends Future<? super Void>> futureListeners, CallbackInfo ci) {
+        if (this.receiving != PacketFlow.CLIENTBOUND) {
             return;
         }
 
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            if (ibaritone.getPlayerContext().player() != null && ibaritone.getPlayerContext().player().connection.getNetworkManager() == (NetworkManager) (Object) this) {
-                ibaritone.getGameEventHandler().onSendPacket(new PacketEvent((NetworkManager) (Object) this, EventState.PRE, inPacket));
+            if (ibaritone.getPlayerContext().player() != null && ibaritone.getPlayerContext().player().connection.getConnection() == (Connection) (Object) this) {
+                ibaritone.getGameEventHandler().onSendPacket(new PacketEvent((Connection) (Object) this, EventState.PRE, inPacket));
             }
         }
     }
 
     @Inject(
-            method = "dispatchPacket",
+            method = "sendPacket",
             at = @At("RETURN")
     )
-    private void postDispatchPacket(IPacket<?> inPacket, final GenericFutureListener<? extends Future<? super Void>> futureListeners, CallbackInfo ci) {
-        if (this.direction != PacketDirection.CLIENTBOUND) {
+    private void postDispatchPacket(Packet<?> inPacket, final GenericFutureListener<? extends Future<? super Void>> futureListeners, CallbackInfo ci) {
+        if (this.receiving != PacketFlow.CLIENTBOUND) {
             return;
         }
 
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            if (ibaritone.getPlayerContext().player() != null && ibaritone.getPlayerContext().player().connection.getNetworkManager() == (NetworkManager) (Object) this) {
-                ibaritone.getGameEventHandler().onSendPacket(new PacketEvent((NetworkManager) (Object) this, EventState.POST, inPacket));
+            if (ibaritone.getPlayerContext().player() != null && ibaritone.getPlayerContext().player().connection.getConnection() == (Connection) (Object) this) {
+                ibaritone.getGameEventHandler().onSendPacket(new PacketEvent((Connection) (Object) this, EventState.POST, inPacket));
             }
         }
     }
@@ -85,16 +85,16 @@ public class MixinNetworkManager {
             method = "channelRead0",
             at = @At(
                     value = "INVOKE",
-                    target = "net/minecraft/network/NetworkManager.processPacket(Lnet/minecraft/network/IPacket;Lnet/minecraft/network/INetHandler;)V"
+                    target = "net/minecraft/network/Connection.genericsFtw(Lnet/minecraft/network/protocol/Packet;Lnet/minecraft/network/PacketListener;)V"
             )
     )
-    private void preProcessPacket(ChannelHandlerContext context, IPacket<?> packet, CallbackInfo ci) {
-        if (this.direction != PacketDirection.CLIENTBOUND) {
+    private void preProcessPacket(ChannelHandlerContext context, Packet<?> packet, CallbackInfo ci) {
+        if (this.receiving != PacketFlow.CLIENTBOUND) {
             return;
         }
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            if (ibaritone.getPlayerContext().player() != null && ibaritone.getPlayerContext().player().connection.getNetworkManager() == (NetworkManager) (Object) this) {
-                ibaritone.getGameEventHandler().onReceivePacket(new PacketEvent((NetworkManager) (Object) this, EventState.PRE, packet));
+            if (ibaritone.getPlayerContext().player() != null && ibaritone.getPlayerContext().player().connection.getConnection() == (Connection) (Object) this) {
+                ibaritone.getGameEventHandler().onReceivePacket(new PacketEvent((Connection) (Object) this, EventState.PRE, packet));
             }
         }
     }
@@ -103,13 +103,13 @@ public class MixinNetworkManager {
             method = "channelRead0",
             at = @At("RETURN")
     )
-    private void postProcessPacket(ChannelHandlerContext context, IPacket<?> packet, CallbackInfo ci) {
-        if (!this.channel.isOpen() || this.direction != PacketDirection.CLIENTBOUND) {
+    private void postProcessPacket(ChannelHandlerContext context, Packet<?> packet, CallbackInfo ci) {
+        if (!this.channel.isOpen() || this.receiving != PacketFlow.CLIENTBOUND) {
             return;
         }
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            if (ibaritone.getPlayerContext().player() != null && ibaritone.getPlayerContext().player().connection.getNetworkManager() == (NetworkManager) (Object) this) {
-                ibaritone.getGameEventHandler().onReceivePacket(new PacketEvent((NetworkManager) (Object) this, EventState.POST, packet));
+            if (ibaritone.getPlayerContext().player() != null && ibaritone.getPlayerContext().player().connection.getConnection() == (Connection) (Object) this) {
+                ibaritone.getGameEventHandler().onReceivePacket(new PacketEvent((Connection) (Object) this, EventState.POST, packet));
             }
         }
     }

src/launch/java/baritone/launch/mixins/MixinPlayerController.java

@@ -18,24 +18,24 @@
 package baritone.launch.mixins;
 
 import baritone.utils.accessor.IPlayerControllerMP;
-import net.minecraft.client.multiplayer.PlayerController;
-import net.minecraft.util.math.BlockPos;
+import net.minecraft.client.multiplayer.MultiPlayerGameMode;
+import net.minecraft.core.BlockPos;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.asm.mixin.gen.Invoker;
 
-@Mixin(PlayerController.class)
+@Mixin(MultiPlayerGameMode.class)
 public abstract class MixinPlayerController implements IPlayerControllerMP {
 
-    @Accessor
+    @Accessor("isDestroying")
     @Override
     public abstract void setIsHittingBlock(boolean isHittingBlock);
 
-    @Accessor
+    @Accessor("destroyBlockPos")
     @Override
     public abstract BlockPos getCurrentBlock();
 
-    @Invoker
+    @Invoker("ensureHasSentCarriedItem")
     @Override
     public abstract void callSyncCurrentPlayItem();
 }

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

@@ -18,11 +18,11 @@
 package baritone.launch.mixins;
 
 import baritone.utils.accessor.IGuiScreen;
-import net.minecraft.client.gui.screen.Screen;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
 
 import java.net.URI;
+import net.minecraft.client.gui.screens.Screen;
 
 @Mixin(Screen.class)
 public abstract class MixinScreen implements IGuiScreen {

src/launch/java/baritone/launch/mixins/MixinSodiumChunkProvider.java

@@ -1,94 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.launch.mixins;
-
-import baritone.utils.accessor.IChunkArray;
-import baritone.utils.accessor.IClientChunkProvider;
-import baritone.utils.accessor.ISodiumChunkArray;
-import net.minecraft.client.multiplayer.ClientChunkProvider;
-import net.minecraft.client.world.ClientWorld;
-import org.spongepowered.asm.mixin.*;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-import java.util.concurrent.locks.StampedLock;
-
-@Pseudo
-@Mixin(targets = "me.jellysquid.mods.sodium.client.world.SodiumChunkManager", remap = false)
-public class MixinSodiumChunkProvider implements IClientChunkProvider {
-    
-    @Shadow
-    @Final
-    private StampedLock lock;
-    
-    @Shadow
-    @Final
-    private ClientWorld world;
-    
-    @Shadow
-    private int radius;
-    
-    @Unique
-    private static Constructor<?> thisConstructor = null;
-    
-    @Unique
-    private static Field chunkArrayField = null;
-    
-    @Override
-    public ClientChunkProvider createThreadSafeCopy() {
-        // similar operation to https://github.com/jellysquid3/sodium-fabric/blob/d3528521d48a130322c910c6f0725cf365ebae6f/src/main/java/me/jellysquid/mods/sodium/client/world/SodiumChunkManager.java#L139
-        long stamp = this.lock.writeLock();
-        
-        try {
-            ISodiumChunkArray refArray = extractReferenceArray();
-            if (thisConstructor == null) {
-                thisConstructor = this.getClass().getConstructor(ClientWorld.class, int.class);
-            }
-            ClientChunkProvider result = (ClientChunkProvider) thisConstructor.newInstance(world, radius - 3); // -3 because it adds 3 for no reason here too lmao
-            IChunkArray copyArr = ((IClientChunkProvider) result).extractReferenceArray();
-            copyArr.copyFrom(refArray);
-            return result;
-        } catch (InstantiationException | InvocationTargetException | NoSuchMethodException | IllegalAccessException e) {
-            throw new RuntimeException("Sodium chunk manager initialization for baritone failed", e);
-        } finally {
-            // put this in finally so we can't break anything.
-            this.lock.unlockWrite(stamp);
-        }
-    }
-    
-    @Override
-    public ISodiumChunkArray extractReferenceArray() {
-        https://docs.oracle.com/javase/specs/jls/se7/html/jls-14.html#jls-14.15
-        if (chunkArrayField == null) {
-            for (Field f : this.getClass().getDeclaredFields()) {
-                if (ISodiumChunkArray.class.isAssignableFrom(f.getType())) {
-                    chunkArrayField = f;
-                    break https;
-                }
-            }
-            throw new RuntimeException(Arrays.toString(this.getClass().getDeclaredFields()));
-        }
-        try {
-            return (ISodiumChunkArray) chunkArrayField.get(this);
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}

src/launch/java/baritone/launch/mixins/MixinSodiumFixedLongHashTable.java

@@ -1,80 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.launch.mixins;
-
-import baritone.utils.accessor.IChunkArray;
-import baritone.utils.accessor.ISodiumChunkArray;
-import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
-import it.unimi.dsi.fastutil.objects.ObjectIterator;
-import net.minecraft.world.chunk.Chunk;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Pseudo;
-import org.spongepowered.asm.mixin.Shadow;
-
-import java.util.concurrent.atomic.AtomicReferenceArray;
-
-@Pseudo
-@Mixin(targets = "me.jellysquid.mods.sodium.client.util.collections.FixedLongHashTable", remap = false)
-public abstract class MixinSodiumFixedLongHashTable implements ISodiumChunkArray {
-    
-    @Shadow
-    public abstract ObjectIterator<Long2ObjectMap.Entry<Object>> iterator();
-    
-    @Shadow
-    public abstract Object put(final long k, final Object v);
-    
-    /**
-    * similar to https://github.com/jellysquid3/sodium-fabric/blob/d3528521d48a130322c910c6f0725cf365ebae6f/src/main/java/me/jellysquid/mods/sodium/client/world/SodiumChunkManager.java#L149
-    * except that since we aren't changing the radius, the key value doesn't change.
-    */
-    @Override
-    public void copyFrom(IChunkArray other) {
-        ObjectIterator<Long2ObjectMap.Entry<Object>> it = ((ISodiumChunkArray) other).callIterator();
-        while (it.hasNext()) {
-            Long2ObjectMap.Entry<Object> entry = it.next();
-            this.put(entry.getLongKey(), entry.getValue());
-        }
-    }
-    
-    @Override
-    public ObjectIterator<Long2ObjectMap.Entry<Object>> callIterator() {
-        return iterator();
-    }
-    
-    //these are useless here...
-    @Override
-    public AtomicReferenceArray<Chunk> getChunks() {
-        return null;
-    }
-    
-    @Override
-    public int centerX() {
-        return 0;
-    }
-    
-    @Override
-    public int centerZ() {
-        return 0;
-    }
-    
-    @Override
-    public int viewDistance() {
-        return 0;
-    }
-    
-}

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

@@ -20,12 +20,12 @@ package baritone.launch.mixins;
 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
 import baritone.api.event.events.RenderEvent;
-import com.mojang.blaze3d.matrix.MatrixStack;
-import net.minecraft.client.renderer.ActiveRenderInfo;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.math.Matrix4f;
+import net.minecraft.client.Camera;
 import net.minecraft.client.renderer.GameRenderer;
+import net.minecraft.client.renderer.LevelRenderer;
 import net.minecraft.client.renderer.LightTexture;
-import net.minecraft.client.renderer.WorldRenderer;
-import net.minecraft.util.math.vector.Matrix4f;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -36,15 +36,15 @@ import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
  * @author Brady
  * @since 2/13/2020
  */
-@Mixin(WorldRenderer.class)
+@Mixin(LevelRenderer.class)
 public class MixinWorldRenderer {
 
     @Inject(
-            method = "updateCameraAndRender",
+            method = "renderLevel",
             at = @At("RETURN"),
             locals = LocalCapture.CAPTURE_FAILSOFT
     )
-    private void onStartHand(MatrixStack matrixStackIn, float partialTicks, long finishTimeNano, boolean drawBlockOutline, ActiveRenderInfo activeRenderInfoIn, GameRenderer gameRendererIn, LightTexture lightmapIn, Matrix4f projectionIn, CallbackInfo ci) {
+    private void onStartHand(PoseStack matrixStackIn, float partialTicks, long finishTimeNano, boolean drawBlockOutline, Camera activeRenderInfoIn, GameRenderer gameRendererIn, LightTexture lightmapIn, Matrix4f projectionIn, CallbackInfo ci) {
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
             ibaritone.getGameEventHandler().onRenderPass(new RenderEvent(partialTicks, matrixStackIn, projectionIn));
         }

src/launch/resources/META-INF/MANIFEST.MF

@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+MixinConfigs: mixins.baritone.json
+MixinConnector: baritone.launch.BaritoneMixinConnector
+Implementation-Title: Baritone
+Implementation-Version: version

src/launch/resources/fabric.mod.json

@@ -25,7 +25,7 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.7.4",
-    "minecraft": "1.16.x"
+    "fabricloader": ">=0.11.0",
+    "minecraft": "1.18.x"
   }
 }

src/launch/resources/mixins.baritone.json

@@ -2,7 +2,7 @@
   "required": true,
   "package": "baritone.launch.mixins",
   "refmap": "mixins.baritone.refmap.json",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_17",
   "verbose": false,
   "injectors": {
     "maxShiftBy": 2
@@ -22,8 +22,6 @@
     "MixinNetworkManager",
     "MixinPlayerController",
     "MixinScreen",
-    "MixinSodiumChunkProvider",
-    "MixinSodiumFixedLongHashTable",
     "MixinWorldRenderer"
   ]
 }