deprecate 1.14.4

2022-02-02 00:13:57 -08:00
56 changed files with 544 additions and 989 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
 run/
 autotest/
 dist/
-volderyarn/

 # Gradle
 build/
--- a/2
+++ b/2
@@ -13,5 +13,3 @@ COPY . /code
 WORKDIR /code

 RUN ./gradlew build
-RUN ./gradlew build -Pbaritone.forge_build
-RUN ./gradlew build -Pbaritone.fabric_build
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@
 */

 group 'baritone'
-version '1.5.3'
+version '1.4.6'

 buildscript {
    repositories {
@@ -28,42 +28,22 @@ buildscript {
            name = 'impactdevelopment-repo'
            url = 'https://impactdevelopment.github.io/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'
    }
 }

-
-import baritone.gradle.fabric.CreateVolderYarn
 import baritone.gradle.task.CreateDistTask
 import baritone.gradle.task.ProguardTask
-import net.minecraftforge.gradle.userdev.tasks.RenameJarInPlace
 import org.apache.tools.ant.taskdefs.condition.Os

 apply plugin: 'java'
-
-def mcpVersion = [channel: 'snapshot', version: '20200515-1.15.1']
-
-if (getProject().hasProperty("baritone.fabric_build")) {
-    CreateVolderYarn.genMappings("1.15.2", mcpVersion)
-    apply plugin: 'fabric-loom'
-} else {
-    apply plugin: 'net.minecraftforge.gradle'
-    apply plugin: 'org.spongepowered.mixin'
-}
-
+apply plugin: 'net.minecraftforge.gradle'
+apply plugin: 'org.spongepowered.mixin'

 sourceCompatibility = targetCompatibility = '1.8'
 compileJava {
@@ -71,7 +51,6 @@ compileJava {
    options.encoding = "UTF-8" // allow emoji in comments :^)
 }

-
 sourceSets {
    api {
        compileClasspath += main.compileClasspath
@@ -101,59 +80,46 @@ 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'
-        }
+minecraft {
+    mappings channel: 'snapshot', version: '20190814-1.14.3'
+    reobfMappings 'notch'

-        runs {
-            client {
-                workingDirectory project.file('run')
-                source sourceSets.launch
+    runs {
+        client {
+            workingDirectory project.file('run')
+            source sourceSets.launch

-                main 'baritone.launch.LaunchTesting'
+            main 'baritone.launch.LaunchTesting'

-                environment 'assetIndex', '{asset_index}'
-                environment 'assetDirectory', downloadAssets.output
-                environment 'nativesDirectory', extractNatives.output
+            environment 'assetIndex', '{asset_index}'
+            environment 'assetDirectory', downloadAssets.output
+            environment 'nativesDirectory', extractNatives.output

-                environment 'tweakClass', 'baritone.launch.BaritoneTweaker'
+            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"
-                }
+            if (Os.isFamily(Os.FAMILY_MAC)) {
+                jvmArgs "-XstartOnFirstThread"
            }
        }
-    }

-    mixin {
-        defaultObfuscationEnv searge
-        add sourceSets.launch, 'mixins.baritone.refmap.json'
+        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"
+            }
+        }
    }
 }

@@ -172,39 +138,30 @@ repositories {
 }

 dependencies {
-    if (getProject().hasProperty("baritone.fabric_build")) {
-        minecraft "com.mojang:minecraft:1.15.2"
-        mappings fileTree(dir: "./build/volderyarn", include: "**.jar")
-        modImplementation "net.fabricmc:fabric-loader:0.9.1+build.205"
+    minecraft 'com.github.ImpactDevelopment:Vanilla:1.14.4'

-        // 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.15.2'
-
-        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.+') {
-            // 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'
-        }
+    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.7.11-SNAPSHOT') {
+        // Mixin includes a lot of dependencies that are too up-to-date
+        exclude module: 'launchwrapper'
+        exclude module: 'guava'
+        exclude module: 'gson'
+        exclude module: 'commons-io'
+        exclude module: 'log4j-core'
    }

    testImplementation 'junit:junit:4.12'
 }

+mixin {
+    defaultObfuscationEnv searge
+    add sourceSets.launch, 'mixins.baritone.refmap.json'
+}
+
 javadoc {
    options.addStringOption('Xwerror', '-quiet') // makes the build fail on travis when there is a javadoc error
    options.linkSource true
@@ -213,25 +170,6 @@ 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"
-
-        // The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
-        // JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
-        // We'll use that if it's available, but otherwise we'll use the older option.
-        def targetVersion = 8
-        if (JavaVersion.current().isJava9Compatible()) {
-            it.options.release = targetVersion
-        }
-    }
-}
-
 jar {
    from sourceSets.launch.output, sourceSets.api.output

@@ -243,91 +181,21 @@ jar {
    preserveFileTimestamps = false
    reproducibleFileOrder = true

-    if (getProject().hasProperty("baritone.fabric_build")) {
-        filesMatching("fabric.mod.json") {
-            expand "version": version
-        }
-    } else {
-        exclude("fabric.mod.json")
-    }
-
-
    manifest {
        attributes(
                'MixinConfigs': 'mixins.baritone.json',
-                "MixinConnector": "baritone.launch.BaritoneMixinConnector",

                'Implementation-Title': 'Baritone',
-                'Implementation-Version': version,
+                'Implementation-Version': version
        )
    }
 }

-// 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()
+task proguard(type: ProguardTask) {
+    url 'https://downloads.sourceforge.net/project/proguard/proguard/6.0/proguard6.0.3.zip'
+    extract 'proguard6.0.3/lib/proguard.jar'
 }

-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 createDist(type: CreateDistTask, dependsOn: proguard)

-if (getProject().hasProperty("baritone.fabric_build")) {
-    task copyMcJar(type: Copy) {
-        def mcJar = { getClientJarFabric() }
-
-        from mcJar
-        into 'build/createMcIntermediaryJar/'
-        rename { 'client.jar' }
-    }
-
-    task proguard(type: ProguardTask, dependsOn: copyMcJar) {
-        url 'https://downloads.sourceforge.net/project/proguard/proguard/6.0/proguard6.0.3.zip'
-        extract 'proguard6.0.3/lib/proguard.jar'
-    }
-
-    task createDist(type: CreateDistTask, dependsOn: proguard)
-
-} else {
-    task copyMcJar(type: Copy) {
-        def mcJar = { getClientJar() }
-
-        from mcJar
-        into 'build/createMcSrgJar/'
-        rename { 'client-srg.jar' }
-    }
-
-    task createSrgMc(type: RenameJarInPlace) {
-        setInput(new File(copyMcJar.getOutputs().getFiles().getSingleFile(), "client-srg.jar"))
-        setClasspath(files({ getClientJar() }))
-
-        // fork
-        setMappingType(net.minecraftforge.gradle.common.util.MappingFile.Mapping.SEARGE)
-        setJarTask('trans alaska pipeline')
-    }
-
-    project.afterEvaluate {
-        createSrgMc.dependsOn(extractSrg, copyMcJar)
-        createSrgMc.setMappings(extractSrg.getOutput())
-    }
-
-
-    task proguard(type: ProguardTask, dependsOn: createSrgMc) { // TODO: dont need to create srg mc if doing notch build
-        url 'https://downloads.sourceforge.net/project/proguard/proguard/6.0/proguard6.0.3.zip'
-        extract 'proguard6.0.3/lib/proguard.jar'
-    }
-
-    task createDist(type: CreateDistTask, dependsOn: proguard)
-
-}
 build.finalizedBy(createDist)
--- a/buildSrc/src/main/java/baritone/gradle/fabric/CreateVolderYarn.java
+++ b/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<>();
-    }
-}
--- a/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java
+++ b/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java
@@ -20,7 +20,6 @@ package baritone.gradle.task;
 import org.gradle.api.DefaultTask;

 import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -41,53 +40,31 @@ class BaritoneGradleTask extends DefaultTask {
            PROGUARD_STANDALONE_CONFIG      = "standalone.pro",
            PROGUARD_EXPORT_PATH            = "proguard_out.jar",

-            ARTIFACT_STANDARD           = "%s-%s.jar",
-            ARTIFACT_UNOPTIMIZED        = "%s-unoptimized-%s.jar",
-            ARTIFACT_API                = "%s-api-%s.jar",
-            ARTIFACT_STANDALONE         = "%s-standalone-%s.jar",
-            ARTIFACT_FORGE_UNOPTIMIZED  = "%s-unoptimized-forge-%s.jar",
-            ARTIFACT_FORGE_API          = "%s-api-forge-%s.jar",
-            ARTIFACT_FORGE_STANDALONE   = "%s-standalone-forge-%s.jar",
-            ARTIFACT_FABRIC_UNOPTIMIZED = "%s-unoptimized-fabric-%s.jar",
-            ARTIFACT_FABRIC_API         = "%s-api-fabric-%s.jar",
-            ARTIFACT_FABRIC_STANDALONE  = "%s-standalone-fabric-%s.jar";
+            ARTIFACT_STANDARD         = "%s-%s.jar",
+            ARTIFACT_UNOPTIMIZED      = "%s-unoptimized-%s.jar",
+            ARTIFACT_API              = "%s-api-%s.jar",
+            ARTIFACT_STANDALONE       = "%s-standalone-%s.jar";

    protected String artifactName, artifactVersion;
-    protected final Path
-        artifactPath,
-        artifactUnoptimizedPath, artifactApiPath, artifactStandalonePath, // these are different for forge builds
-        proguardOut;
+    protected Path artifactPath, artifactUnoptimizedPath, artifactApiPath, artifactStandalonePath, proguardOut;

-    public BaritoneGradleTask() {
+    protected void verifyArtifacts() throws IllegalStateException {
        this.artifactName = getProject().getName();
        this.artifactVersion = getProject().getVersion().toString();

-        this.artifactPath = this.getBuildFile(formatVersion(ARTIFACT_STANDARD));
-
-        if (getProject().hasProperty("baritone.forge_build")) {
-            this.artifactUnoptimizedPath = this.getBuildFile(formatVersion(ARTIFACT_FORGE_UNOPTIMIZED));
-            this.artifactApiPath         = this.getBuildFile(formatVersion(ARTIFACT_FORGE_API));
-            this.artifactStandalonePath  = this.getBuildFile(formatVersion(ARTIFACT_FORGE_STANDALONE));
-        } else if (getProject().hasProperty("baritone.fabric_build")) {
-            this.artifactUnoptimizedPath = this.getBuildFile(formatVersion(ARTIFACT_FABRIC_UNOPTIMIZED));
-            this.artifactApiPath         = this.getBuildFile(formatVersion(ARTIFACT_FABRIC_API));
-            this.artifactStandalonePath  = this.getBuildFile(formatVersion(ARTIFACT_FABRIC_STANDALONE));
-        } else {
-            this.artifactUnoptimizedPath = this.getBuildFile(formatVersion(ARTIFACT_UNOPTIMIZED));
-            this.artifactApiPath         = this.getBuildFile(formatVersion(ARTIFACT_API));
-            this.artifactStandalonePath  = this.getBuildFile(formatVersion(ARTIFACT_STANDALONE));
-        }
+        this.artifactPath                = this.getBuildFile(formatVersion(ARTIFACT_STANDARD));
+        this.artifactUnoptimizedPath     = this.getBuildFile(formatVersion(ARTIFACT_UNOPTIMIZED));
+        this.artifactApiPath             = this.getBuildFile(formatVersion(ARTIFACT_API));
+        this.artifactStandalonePath      = this.getBuildFile(formatVersion(ARTIFACT_STANDALONE));

        this.proguardOut = this.getTemporaryFile(PROGUARD_EXPORT_PATH);
-    }

-    protected void verifyArtifacts() throws IllegalStateException {
        if (!Files.exists(this.artifactPath)) {
            throw new IllegalStateException("Artifact not found! Run build first!");
        }
    }

-    protected void write(InputStream stream, Path file) throws IOException {
+    protected void write(InputStream stream, Path file) throws Exception {
        if (Files.exists(file)) {
            Files.delete(file);
        }
--- a/buildSrc/src/main/java/baritone/gradle/task/CreateDistTask.java
+++ b/buildSrc/src/main/java/baritone/gradle/task/CreateDistTask.java
@@ -23,9 +23,9 @@ import javax.xml.bind.DatatypeConverter;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.security.MessageDigest;
-import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;

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

@@ -42,9 +42,9 @@ public class CreateDistTask extends BaritoneGradleTask {
        super.verifyArtifacts();

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

        // NIO will not automatically create directories
        Path dir = getRelativeFile("dist/");
@@ -53,14 +53,12 @@ public class CreateDistTask extends BaritoneGradleTask {
        }

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

        // Calculate all checksums and format them like "shasum"
-        List<String> shasum = getAllDistJars().stream()
-                .filter(Files::exists)
+        List<String> shasum = Stream.of(api, standalone, unoptimized)
                .map(path -> sha1(path) + "  " + path.getFileName().toString())
                .collect(Collectors.toList());

@@ -70,24 +68,6 @@ public class CreateDistTask extends BaritoneGradleTask {
        Files.write(getRelativeFile("dist/checksums.txt"), shasum);
    }

-    private static String getFileName(Path p) {
-        return p.getFileName().toString();
-    }
-
-    private List<Path> getAllDistJars() {
-        return Arrays.asList(
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_API)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_FABRIC_API)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_API)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_STANDALONE)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_FABRIC_STANDALONE)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_STANDALONE)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_UNOPTIMIZED)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_FABRIC_UNOPTIMIZED)),
-                getRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_UNOPTIMIZED))
-        );
-    }
-
    private static synchronized String sha1(Path path) {
        try {
            if (SHA1_DIGEST == null) {
--- a/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java
+++ b/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java
@@ -209,30 +209,18 @@ public class ProguardTask extends BaritoneGradleTask {
        String out = IOUtils.toString(p.getInputStream(), "UTF-8").split("\n")[0].split("Opened ")[1].replace("]", "");
        template.add(2, "-libraryjars '" + out + "'");

-        {
-            final Stream<File> libraries;
-            {
-                // Discover all of the libraries that we will need to acquire from gradle
-                final Stream<File> dependencies = acquireDependencies()
-                    // remove MCP mapped jar
-                    .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);
-
-                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;
-                }
+        // Discover all of the libraries that we will need to acquire from gradle
+        acquireDependencies().forEach(f -> {
+            if (f.toString().endsWith("-recomp.jar")) {
+                // remove MCP mapped jar
+                return;
            }
-            libraries.forEach(f -> {
-                template.add(2, "-libraryjars '" + f + "'");
-            });
-        }
+            if (f.toString().endsWith("client-extra.jar")) {
+                // go from the extra to the original downloaded client
+                f = new File(f.getParentFile(), "client.jar");
+            }
+            template.add(2, "-libraryjars '" + f + "'");
+        });

        // API config doesn't require any changes from the changes that we made to the template
        Files.write(getTemporaryFile(PROGUARD_API_CONFIG), template);
@@ -243,14 +231,8 @@ public class ProguardTask extends BaritoneGradleTask {
        Files.write(getTemporaryFile(PROGUARD_STANDALONE_CONFIG), standalone);
    }

-    private File getSrgMcJar() {
-        return getProject().getTasks().findByName("copyMcJar").getOutputs().getFiles().getSingleFile();
-    }
-
    private Stream<File> acquireDependencies() {
-        return getProject().getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("launch").getRuntimeClasspath().getFiles()
-            .stream()
-            .filter(File::isFile);
+        return getProject().getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("launch").getRuntimeClasspath().getFiles().stream().filter(File::isFile);
    }

    private void proguardApi() throws Exception {
--- a/scripts/proguard.pro
+++ b/scripts/proguard.pro
@@ -16,10 +16,7 @@
 -dontwarn org.lwjgl.**
 # also lwjgl lol
 -dontwarn module-info
-# we dont have forge
-dontwarn baritone.launch.BaritoneForgeModXD

-# please do not change the comment below
 -keep class baritone.api.** { *; } # this is the keep api

 # service provider needs these class names
--- a/src/api/java/baritone/api/BaritoneAPI.java
+++ b/src/api/java/baritone/api/BaritoneAPI.java
@@ -19,6 +19,9 @@ package baritone.api;

 import baritone.api.utils.SettingsUtil;

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

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

    public static IBaritoneProvider getProvider() {
--- a/src/api/java/baritone/api/Settings.java
+++ b/src/api/java/baritone/api/Settings.java
@@ -1025,11 +1025,6 @@ public final class Settings {
     */
    public final Setting<Consumer<ITextComponent>> logger = new Setting<>(Minecraft.getInstance().ingameGUI.getChatGUI()::printChatMessage);

-    /**
-     * Print out ALL command exceptions as a stack trace to stdout, even simple syntax errors
-     */
-    public final Setting<Boolean> verboseCommandExceptions = new Setting<>(false);
-
    /**
     * The size of the box that is rendered when the current goal is a GoalYLevel
     */
--- a/src/api/java/baritone/api/event/events/RenderEvent.java
+++ b/src/api/java/baritone/api/event/events/RenderEvent.java
@@ -17,9 +17,6 @@

 package baritone.api.event.events;

-import com.mojang.blaze3d.matrix.MatrixStack;
-import net.minecraft.client.renderer.Matrix4f;
-
 /**
 * @author Brady
 * @since 8/5/2018
@@ -31,13 +28,8 @@ public final class RenderEvent {
     */
    private final float partialTicks;

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

    /**
@@ -46,12 +38,4 @@ public final class RenderEvent {
    public final float getPartialTicks() {
        return this.partialTicks;
    }
-
-    public MatrixStack getModelViewStack() {
-        return this.modelViewStack;
-    }
-
-    public Matrix4f getProjectionMatrix() {
-        return this.projectionMatrix;
-    }
 }
--- a/src/api/java/baritone/api/utils/BlockOptionalMeta.java
+++ b/src/api/java/baritone/api/utils/BlockOptionalMeta.java
@@ -28,6 +28,7 @@ import net.minecraft.resources.*;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.Unit;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.registry.Registry;
 import net.minecraft.world.storage.loot.*;

 import javax.annotation.Nonnull;
@@ -36,6 +37,7 @@ import java.util.concurrent.CompletableFuture;
 import java.util.regex.MatchResult;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;

 public final class BlockOptionalMeta {

@@ -45,7 +47,6 @@ public final class BlockOptionalMeta {
    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 Map<Block, List<Item>> drops = new HashMap<>();

    public BlockOptionalMeta(@Nonnull Block block) {
@@ -64,7 +65,13 @@ public final class BlockOptionalMeta {

        MatchResult matchResult = matcher.toMatchResult();

-        block = BlockUtils.stringToBlockRequired(matchResult.group(1));
+        ResourceLocation id = new ResourceLocation(matchResult.group(1));
+
+        if (!Registry.BLOCK.containsKey(id)) {
+            throw new IllegalArgumentException("Invalid block ID");
+        }
+
+        block = Registry.BLOCK.getValue(id).orElse(null);
        blockstates = getStates(block);
        stateHashes = getStateHashes(blockstates);
        stackHashes = getStackHashes(blockstates);
@@ -137,7 +144,7 @@ public final class BlockOptionalMeta {
            rpl.reloadPacksFromFinders();
            IResourcePack thePack = ((ResourcePackInfo) rpl.getAllPacks().iterator().next()).getResourcePack();
            IReloadableResourceManager resourceManager = new SimpleReloadableResourceManager(ResourcePackType.SERVER_DATA, null);
-            manager = new LootTableManager(predicate);
+            manager = new LootTableManager();
            resourceManager.addReloadListener(manager);
            try {
                resourceManager.reloadResourcesAndThen(new ThreadPerTaskExecutor(Thread::new), new ThreadPerTaskExecutor(Thread::new), Collections.singletonList(thePack), CompletableFuture.completedFuture(Unit.INSTANCE)).get();
@@ -148,30 +155,13 @@ public final class BlockOptionalMeta {
        return manager;
    }

-    public static LootPredicateManager getPredicateManager() {
-        return predicate;
-    }
-
    private static synchronized List<Item> drops(Block b) {
        return drops.computeIfAbsent(b, block -> {
            ResourceLocation lootTableLocation = block.getLootTable();
            if (lootTableLocation == LootTables.EMPTY) {
                return Collections.emptyList();
            } else {
-                List<Item> items = new ArrayList<>();
-
-                // the other overload for generate doesnt work in forge because forge adds code that requires a non null world
-                getManager().getLootTableFromLocation(lootTableLocation).generate(
-                        new LootContext.Builder(null)
-                                .withRandom(new Random())
-                                .withParameter(LootParameters.POSITION, BlockPos.ZERO)
-                                .withParameter(LootParameters.TOOL, ItemStack.EMPTY)
-                                .withNullableParameter(LootParameters.BLOCK_ENTITY, null)
-                                .withParameter(LootParameters.BLOCK_STATE, block.getDefaultState())
-                                .build(LootParameterSets.BLOCK),
-                        stack -> items.add(stack.getItem())
-                );
-                return items;
+                return getManager().getLootTableFromLocation(lootTableLocation).generate(new LootContext.Builder(null).withRandom(new Random()).withParameter(LootParameters.POSITION, BlockPos.ZERO).withParameter(LootParameters.TOOL, ItemStack.EMPTY).withNullableParameter(LootParameters.BLOCK_ENTITY, null).withParameter(LootParameters.BLOCK_STATE, block.getDefaultState()).build(LootParameterSets.BLOCK)).stream().map(ItemStack::getItem).collect(Collectors.toList());
            }
        });
    }
--- a/src/api/java/baritone/api/utils/IPlayerContext.java
+++ b/src/api/java/baritone/api/utils/IPlayerContext.java
@@ -59,7 +59,7 @@ public interface IPlayerContext {

    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().posX, player().posY + 0.1251, player().posZ);

        // sometimes when calling this from another thread or while world is null, it'll throw a NullPointerException
        // that causes the game to immediately crash
@@ -79,11 +79,11 @@ public interface IPlayerContext {
    }

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

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

    default Rotation playerRotations() {
--- a/src/api/java/baritone/api/utils/RayTraceUtils.java
+++ b/src/api/java/baritone/api/utils/RayTraceUtils.java
@@ -61,6 +61,6 @@ public final class RayTraceUtils {
    }

    public static Vec3d inferSneakingEyePosition(Entity entity) {
-        return new Vec3d(entity.getPosX(), entity.getPosY() + IPlayerContext.eyeHeight(true), entity.getPosZ());
+        return new Vec3d(entity.posX, entity.posY + IPlayerContext.eyeHeight(true), entity.posZ);
    }
 }
--- a/src/api/java/baritone/api/utils/VecUtils.java
+++ b/src/api/java/baritone/api/utils/VecUtils.java
@@ -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.posX, entity.posY, entity.posZ);
    }

    /**
@@ -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.posX, pos.getY() + 0.5, entity.posZ);
    }
 }
--- a/src/launch/java/baritone/launch/BaritoneMixinConnector.java
+++ b/src/launch/java/baritone/launch/BaritoneMixinConnector.java
@@ -1,29 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.launch;
-
-import org.spongepowered.asm.mixin.Mixins;
-import org.spongepowered.asm.mixin.connect.IMixinConnector;
-
-public class BaritoneMixinConnector implements IMixinConnector {
-
-    @Override
-    public void connect() {
-        Mixins.addConfiguration("mixins.baritone.json");
-    }
-}
--- a/src/launch/java/baritone/launch/mixins/MixinBlockStateContainer.java
+++ b/src/launch/java/baritone/launch/mixins/MixinBlockStateContainer.java
@@ -18,22 +18,22 @@
 package baritone.launch.mixins;

 import baritone.utils.accessor.IBitArray;
-import baritone.utils.accessor.IPalettedContainer;
+import baritone.utils.accessor.IBlockStateContainer;
 import net.minecraft.block.BlockState;
 import net.minecraft.util.BitArray;
-import net.minecraft.util.palette.IPalette;
-import net.minecraft.util.palette.PalettedContainer;
+import net.minecraft.world.chunk.BlockStateContainer;
+import net.minecraft.world.chunk.IBlockStatePalette;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

-@Mixin(PalettedContainer.class)
-public abstract class MixinPalettedContainer implements IPalettedContainer {
+@Mixin(BlockStateContainer.class)
+public abstract class MixinBlockStateContainer implements IBlockStateContainer {

    @Shadow
    protected BitArray storage;

    @Shadow
-    protected IPalette<BlockState> palette;
+    protected IBlockStatePalette<BlockState> palette;

    @Override
    public BlockState getAtPalette(int index) {
--- a/src/launch/java/baritone/launch/mixins/MixinCommandSuggestionHelper.java
+++ b/src/launch/java/baritone/launch/mixins/MixinCommandSuggestionHelper.java
@@ -22,7 +22,7 @@ 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.screen.ChatScreen;
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -40,28 +40,27 @@ import java.util.stream.Stream;
 * @author Brady
 * @since 10/9/2019
 */
-@Mixin(CommandSuggestionHelper.class)
-public class MixinCommandSuggestionHelper {
+@Mixin(ChatScreen.class)
+public class MixinChatScreen {
+
+    @Shadow
+    protected TextFieldWidget inputField;

    @Shadow
    @Final
-    private TextFieldWidget field_228095_d_;
+    protected List<String> commandUsage;

    @Shadow
-    @Final
-    private List<String> field_228103_l_;
-
-    @Shadow
-    private CompletableFuture<Suggestions> field_228107_p_;
+    private CompletableFuture<Suggestions> pendingSuggestions;

    @Inject(
-            method = "init",
+            method = "updateSuggestion",
            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.field_228095_d_.getText().substring(0, Math.min(this.field_228095_d_.getText().length(), this.field_228095_d_.getCursorPosition()));
+        String prefix = this.inputField.getText().substring(0, Math.min(this.inputField.getText().length(), this.inputField.getCursorPosition()));

        TabCompleteEvent event = new TabCompleteEvent(prefix);
        BaritoneAPI.getProvider().getPrimaryBaritone().getGameEventHandler().onPreTabComplete(event);
@@ -75,14 +74,14 @@ public class MixinCommandSuggestionHelper {
            ci.cancel();

            // TODO: Support populating the command usage
-            this.field_228103_l_.clear();
+            this.commandUsage.clear();

            if (event.completions.length == 0) {
-                this.field_228107_p_ = Suggestions.empty();
+                this.pendingSuggestions = Suggestions.empty();
            } else {
-                int offset = this.field_228095_d_.getText().endsWith(" ")
-                        ? this.field_228095_d_.getCursorPosition()
-                        : this.field_228095_d_.getText().lastIndexOf(" ") + 1; // If there is no space this is still 0 haha yes
+                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

                List<Suggestion> suggestionList = Stream.of(event.completions)
                        .map(s -> new Suggestion(StringRange.between(offset, offset + s.length()), s))
@@ -92,8 +91,8 @@ public class MixinCommandSuggestionHelper {
                        StringRange.between(offset, offset + suggestionList.stream().mapToInt(s -> s.getText().length()).max().orElse(0)),
                        suggestionList);

-                this.field_228107_p_ = new CompletableFuture<>();
-                this.field_228107_p_.complete(suggestions);
+                this.pendingSuggestions = new CompletableFuture<>();
+                this.pendingSuggestions.complete(suggestions);
            }
        }
    }
--- a/src/launch/java/baritone/launch/mixins/MixinEntityRenderManager.java
+++ b/src/launch/java/baritone/launch/mixins/MixinEntityRenderManager.java
@@ -20,23 +20,29 @@ package baritone.launch.mixins;
 import baritone.utils.accessor.IEntityRenderManager;
 import net.minecraft.client.renderer.entity.EntityRendererManager;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;

@Mixin(EntityRendererManager.class)
 public class MixinEntityRenderManager implements IEntityRenderManager {
-
+    @Shadow
+    private double renderPosX;
+    @Shadow
+    private double renderPosY;
+    @Shadow
+    private double renderPosZ;

    @Override
    public double renderPosX() {
-        return ((EntityRendererManager) (Object) this).info.getProjectedView().x;
+        return renderPosX;
    }

    @Override
    public double renderPosY() {
-        return ((EntityRendererManager) (Object) this).info.getProjectedView().y;
+        return renderPosY;
    }

    @Override
    public double renderPosZ() {
-        return ((EntityRendererManager) (Object) this).info.getProjectedView().z;
+        return renderPosZ;
    }
 }
--- a/src/launch/java/baritone/launch/mixins/MixinWorldRenderer.java
+++ b/src/launch/java/baritone/launch/mixins/MixinWorldRenderer.java
@@ -20,29 +20,26 @@ 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.*;
+import net.minecraft.client.renderer.GameRenderer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;

-/**
- * @author Brady
- * @since 2/13/2020
- */
-@Mixin(WorldRenderer.class)
-public class MixinWorldRenderer {
+@Mixin(GameRenderer.class)
+public class MixinGameRenderer {

    @Inject(
-            method = "updateCameraAndRender",
-            at = @At("RETURN"),
-            locals = LocalCapture.CAPTURE_FAILSOFT
+            method = "updateCameraAndRender(FJ)V",
+            at = @At(
+                    value = "INVOKE_STRING",
+                    target = "Lnet/minecraft/profiler/IProfiler;endStartSection(Ljava/lang/String;)V",
+                    args = {"ldc=hand"}
+            )
    )
-    private void onStartHand(MatrixStack matrixStackIn, float partialTicks, long finishTimeNano, boolean drawBlockOutline, ActiveRenderInfo activeRenderInfoIn, GameRenderer gameRendererIn, LightTexture lightmapIn, Matrix4f projectionIn, CallbackInfo ci) {
+    private void renderWorldPass(float partialTicks, long finishTimeNano, CallbackInfo ci) {
        for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            ibaritone.getGameEventHandler().onRenderPass(new RenderEvent(partialTicks, matrixStackIn, projectionIn));
+            ibaritone.getGameEventHandler().onRenderPass(new RenderEvent(partialTicks));
        }
    }
-}
+}
--- a/src/launch/java/baritone/launch/mixins/MixinLivingEntity.java
+++ b/src/launch/java/baritone/launch/mixins/MixinLivingEntity.java
@@ -31,7 +31,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

-import static org.objectweb.asm.Opcodes.GETFIELD;
+import static org.spongepowered.asm.lib.Opcodes.GETFIELD;

 /**
 * @author Brady
--- a/src/launch/java/baritone/launch/mixins/MixinLootContext.java
+++ b/src/launch/java/baritone/launch/mixins/MixinLootContext.java
@@ -21,7 +21,6 @@ import baritone.api.utils.BlockOptionalMeta;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.server.ServerWorld;
 import net.minecraft.world.storage.loot.LootContext;
-import net.minecraft.world.storage.loot.LootPredicateManager;
 import net.minecraft.world.storage.loot.LootTableManager;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -57,18 +56,4 @@ public class MixinLootContext {
        }
        return server.getLootTableManager();
    }
-
-    @Redirect(
-            method = "build",
-            at = @At(
-                    value = "INVOKE",
-                    target = "net/minecraft/server/MinecraftServer.func_229736_aP_()Lnet/minecraft/world/storage/loot/LootPredicateManager;"
-            )
-    )
-    private LootPredicateManager getLootPredicateManager(MinecraftServer server) {
-        if (server == null) {
-            return BlockOptionalMeta.getPredicateManager();
-        }
-        return server.func_229736_aP_();
-    }
 }
--- a/src/launch/java/baritone/launch/mixins/MixinMinecraft.java
+++ b/src/launch/java/baritone/launch/mixins/MixinMinecraft.java
@@ -19,6 +19,7 @@ package baritone.launch.mixins;

 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
+import baritone.api.event.events.BlockInteractEvent;
 import baritone.api.event.events.TickEvent;
 import baritone.api.event.events.WorldEvent;
 import baritone.api.event.events.type.EventState;
@@ -26,13 +27,18 @@ 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 org.objectweb.asm.Opcodes;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ActionResultType;
+import net.minecraft.util.Hand;
+import net.minecraft.util.math.BlockRayTraceResult;
+import org.spongepowered.asm.lib.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.LocalCapture;

 import java.util.function.BiFunction;

@@ -49,7 +55,7 @@ public class MixinMinecraft {
    public ClientWorld world;

    @Inject(
-            method = "<init>",
+            method = "init",
            at = @At("RETURN")
    )
    private void postInit(CallbackInfo ci) {
@@ -130,24 +136,16 @@ public class MixinMinecraft {
        return (BaritoneAPI.getProvider().getPrimaryBaritone().getPathingBehavior().isPathing() && player != null) || screen.passEvents;
    }

-    // TODO
-    // FIXME
-    // bradyfix
-    // i cant mixin
-    // lol
-    // https://discordapp.com/channels/208753003996512258/503692253881958400/674760939681349652
-    // https://discordapp.com/channels/208753003996512258/503692253881958400/674756457966862376
-    /*@Inject(
+    @Inject(
            method = "rightClickMouse",
            at = @At(
                    value = "INVOKE",
-                    target = "net/minecraft/client/entity/player/ClientPlayerEntity.swingArm(Lnet/minecraft/util/Hand;)V",
-                    ordinal = 1
+                    target = "net/minecraft/client/entity/player/ClientPlayerEntity.swingArm(Lnet/minecraft/util/Hand;)V"
            ),
            locals = LocalCapture.CAPTURE_FAILHARD
    )
-    private void onBlockUse(CallbackInfo ci, Hand var1[], int var2, int var3, Hand enumhand, ItemStack itemstack, EntityRayTraceResult rt, Entity ent, ActionResultType art, BlockRayTraceResult raytrace, int i, ActionResultType enumactionresult) {
+    private void onBlockUse(CallbackInfo ci, Hand var1[], int var2, int var3, Hand enumhand, ItemStack itemstack, BlockRayTraceResult raytrace, int i, ActionResultType enumactionresult) {
        // rightClickMouse is only for the main player
        BaritoneAPI.getProvider().getPrimaryBaritone().getGameEventHandler().onBlockInteract(new BlockInteractEvent(raytrace.getPos(), BlockInteractEvent.Type.USE));
-    }*/
+    }
 }
--- a/src/launch/resources/META-INF/mods.toml
+++ b/src/launch/resources/META-INF/mods.toml
@@ -1,32 +0,0 @@
-# This is an example mods.toml file. It contains the data relating to the loading mods.
-# There are several mandatory fields (#mandatory), and many more that are optional (#optional).
-# The overall format is standard TOML format, v0.5.0.
-# Note that there are a couple of TOML lists in this file.
-# Find more information on toml format here:  https://github.com/toml-lang/toml
-# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
-modLoader="javafml" #mandatory
-# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
-loaderVersion="[31,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
-# A URL to refer people to when problems occur with this mod
-issueTrackerURL="https://github.com/cabaletta/baritone/issues" #optional
-# A list of mods - how many allowed here is determined by the individual mod loader
-[[mods]] #mandatory
-# The modid of the mod
-modId="baritoe" #mandatory
-# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it
-version="${file.jarVersion}" #mandatory
- # A display name for the mod
-displayName="Baritone" #mandatory
-# A URL for the "homepage" for this mod, displayed in the mod UI
-displayURL="https://github.com/cabaletta/baritone" #optional
-# A file name (in the root of the mod JAR) containing a logo for display
-#logoFile="examplemod.png" #optional
-# A text field displayed in the mod UI
-credits="Hat Gamers" #optional
-# A text field displayed in the mod UI
-authors="leijurv, Brady" #optional
-# The description text for the mod (multi line!) (#mandatory)
-description='''
-A Minecraft pathfinder bot.
-'''
-
--- a/src/launch/resources/baritone/launch/BaritoneForgeModXD.class
+++ b/src/launch/resources/baritone/launch/BaritoneForgeModXD.class
--- a/src/launch/resources/fabric.mod.json
+++ b/src/launch/resources/fabric.mod.json
@@ -1,31 +0,0 @@
-
-{
-  "schemaVersion": 1,
-  "id": "baritone",
-  "version": "${version}",
-
-  "name": "Baritone",
-  "description": "Google Maps for Blockgame",
-  "authors": [
-    "leijurv", "Brady"
-  ],
-  "contact": {
-    "homepage": "https://github.com/cabaletta/baritone",
-    "sources": "https://github.com/cabaletta/baritone"
-  },
-
-  "license": "LGPL-3.0",
-  "icon": "assets/baritone/icon.png",
-
-  "environment": "*",
-  "entrypoints": {
-  },
-  "mixins": [
-    "mixins.baritone.json"
-  ],
-
-  "depends": {
-    "fabricloader": ">=0.7.4",
-    "minecraft": "1.15.x"
-  }
-}
--- a/src/launch/resources/mixins.baritone.json
+++ b/src/launch/resources/mixins.baritone.json
@@ -9,21 +9,21 @@
  },
  "client": [
    "MixinBitArray",
+    "MixinBlockStateContainer",
+    "MixinChatScreen",
    "MixinChunkArray",
    "MixinClientChunkProvider",
    "MixinClientPlayerEntity",
    "MixinClientPlayNetHandler",
-    "MixinCommandSuggestionHelper",
    "MixinEntity",
    "MixinEntityRenderManager",
+    "MixinGameRenderer",
    "MixinItemStack",
    "MixinLivingEntity",
    "MixinLootContext",
    "MixinMinecraft",
    "MixinNetworkManager",
-    "MixinPalettedContainer",
    "MixinPlayerController",
-    "MixinScreen",
-    "MixinWorldRenderer"
+    "MixinScreen"
  ]
 }
--- a/src/launch/resources/pack.mcmeta
+++ b/src/launch/resources/pack.mcmeta
@@ -1,6 +0,0 @@
-{
-    "pack": {
-        "description": "baritoe",
-        "pack_format": 5
-    }
-}
--- a/src/main/java/baritone/behavior/InventoryBehavior.java
+++ b/src/main/java/baritone/behavior/InventoryBehavior.java
@@ -137,7 +137,7 @@ public final class InventoryBehavior extends Behavior {

    public boolean selectThrowawayForLocation(boolean select, int x, int y, int z) {
        BlockState maybe = baritone.getBuilderProcess().placeAt(x, y, z, baritone.bsi.get0(x, y, z));
-        if (maybe != null && throwaway(select, stack -> stack.getItem() instanceof BlockItem && maybe.equals(((BlockItem) stack.getItem()).getBlock().getStateForPlacement(new BlockItemUseContext(new ItemUseContext(ctx.world(), ctx.player(), Hand.MAIN_HAND, stack, new BlockRayTraceResult(new Vec3d(ctx.player().getPositionVec().x, ctx.player().getPositionVec().y, ctx.player().getPositionVec().z), Direction.UP, ctx.playerFeet(), false)) {}))))) {
+        if (maybe != null && throwaway(select, stack -> stack.getItem() instanceof BlockItem && maybe.equals(((BlockItem) stack.getItem()).getBlock().getStateForPlacement(new BlockItemUseContext(new ItemUseContext(ctx.world(), ctx.player(), Hand.MAIN_HAND, stack, new BlockRayTraceResult(new Vec3d(ctx.player().posX, ctx.player().posY, ctx.player().posZ), Direction.UP, ctx.playerFeet(), false)) {}))))) {
            return true; // gotem
        }
        if (maybe != null && throwaway(select, stack -> stack.getItem() instanceof BlockItem && ((BlockItem) stack.getItem()).getBlock().equals(maybe.getBlock()))) {
--- a/src/main/java/baritone/behavior/PathingBehavior.java
+++ b/src/main/java/baritone/behavior/PathingBehavior.java
@@ -381,8 +381,8 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
        BetterBlockPos feet = ctx.playerFeet();
        if (!MovementHelper.canWalkOn(ctx, feet.down())) {
            if (ctx.player().onGround) {
-                double playerX = ctx.player().getPositionVec().x;
-                double playerZ = ctx.player().getPositionVec().z;
+                double playerX = ctx.player().posX;
+                double playerZ = ctx.player().posZ;
                ArrayList<BetterBlockPos> closest = new ArrayList<>();
                for (int dx = -1; dx <= 1; dx++) {
                    for (int dz = -1; dz <= 1; dz++) {
--- a/src/main/java/baritone/cache/ChunkPacker.java
+++ b/src/main/java/baritone/cache/ChunkPacker.java
@@ -23,7 +23,7 @@ import baritone.utils.pathing.PathingBlockType;
 import net.minecraft.block.*;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.palette.PalettedContainer;
+import net.minecraft.world.chunk.BlockStateContainer;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.ChunkSection;

@@ -59,7 +59,7 @@ public final class ChunkPacker {
                    // since a bitset is initialized to all zero, and air is saved as zeros
                    continue;
                }
-                PalettedContainer<BlockState> bsc = extendedblockstorage.getData();
+                BlockStateContainer<BlockState> bsc = extendedblockstorage.getData();
                int yReal = y0 << 4;
                // the mapping of BlockStateContainer.getIndex from xyz to index is y << 8 | z << 4 | x;
                // for better cache locality, iterate in that order
--- a/src/main/java/baritone/cache/WorldScanner.java
+++ b/src/main/java/baritone/cache/WorldScanner.java
@@ -22,7 +22,7 @@ import baritone.api.cache.IWorldScanner;
 import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.BlockOptionalMetaLookup;
 import baritone.api.utils.IPlayerContext;
-import baritone.utils.accessor.IPalettedContainer;
+import baritone.utils.accessor.IBlockStateContainer;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.multiplayer.ClientChunkProvider;
 import net.minecraft.util.math.BlockPos;
@@ -155,7 +155,7 @@ public enum WorldScanner implements IWorldScanner {
                continue;
            }
            int yReal = y0 << 4;
-            IPalettedContainer bsc = (IPalettedContainer) section.getData();
+            IBlockStateContainer bsc = (IBlockStateContainer) section.getData();
            // storageArray uses an optimized algorithm that's faster than getAt
            // creating this array and then using getAtPalette is faster than even getFast(int index)
            int[] storage = bsc.storageArray();
--- a/src/main/java/baritone/command/argument/ArgConsumer.java
+++ b/src/main/java/baritone/command/argument/ArgConsumer.java
@@ -17,7 +17,6 @@

 package baritone.command.argument;

-import baritone.Baritone;
 import baritone.api.IBaritone;
 import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.argument.ICommandArgument;
@@ -317,9 +316,6 @@ public class ArgConsumer implements IArgConsumer {
        try {
            return datatype.apply(this.context, original);
        } catch (Exception e) {
-            if (Baritone.settings().verboseCommandExceptions.value) {
-                e.printStackTrace();
-            }
            throw new CommandInvalidTypeException(hasAny() ? peek() : consumed(), datatype.getClass().getSimpleName(), e);
        }
    }
@@ -349,9 +345,6 @@ public class ArgConsumer implements IArgConsumer {
        try {
            return datatype.get(this.context);
        } catch (Exception e) {
-            if (Baritone.settings().verboseCommandExceptions.value) {
-                e.printStackTrace();
-            }
            throw new CommandInvalidTypeException(hasAny() ? peek() : consumed(), datatype.getClass().getSimpleName(), e);
        }
    }
--- a/src/main/java/baritone/command/defaults/SelCommand.java
+++ b/src/main/java/baritone/command/defaults/SelCommand.java
@@ -67,7 +67,7 @@ public class SelCommand extends Command {
                float lineWidth = Baritone.settings().selectionLineWidth.value;
                boolean ignoreDepth = Baritone.settings().renderSelectionIgnoreDepth.value;
                IRenderer.startLines(color, opacity, lineWidth, ignoreDepth);
-                IRenderer.drawAABB(event.getModelViewStack(), new AxisAlignedBB(pos1, pos1.add(1, 1, 1)));
+                IRenderer.drawAABB(new AxisAlignedBB(pos1, pos1.add(1, 1, 1)));
                IRenderer.endLines(ignoreDepth);
            }
        });
--- a/src/main/java/baritone/pathing/movement/MovementHelper.java
+++ b/src/main/java/baritone/pathing/movement/MovementHelper.java
@@ -92,7 +92,7 @@ public interface MovementHelper extends ActionCosts, Helper {
        if (block instanceof AirBlock) { // early return for most common case
            return true;
        }
-        if (block == Blocks.FIRE || block == Blocks.TRIPWIRE || block == Blocks.COBWEB || block == Blocks.END_PORTAL || block == Blocks.COCOA || block instanceof AbstractSkullBlock || block == Blocks.BUBBLE_COLUMN || block instanceof ShulkerBoxBlock || block instanceof SlabBlock || block instanceof TrapDoorBlock || block == Blocks.HONEY_BLOCK || block == Blocks.END_ROD) {
+        if (block == Blocks.FIRE || block == Blocks.TRIPWIRE || block == Blocks.COBWEB || block == Blocks.END_PORTAL || block == Blocks.COCOA || block instanceof AbstractSkullBlock || block == Blocks.BUBBLE_COLUMN || block instanceof ShulkerBoxBlock || block instanceof SlabBlock || block instanceof TrapDoorBlock || block == Blocks.END_ROD) {
            return false;
        }
        if (Baritone.settings().blocksToAvoid.value.contains(block)) {
@@ -296,7 +296,7 @@ public interface MovementHelper extends ActionCosts, Helper {
     */
    static boolean canWalkOn(BlockStateInterface bsi, int x, int y, int z, BlockState state) {
        Block block = state.getBlock();
-        if (block instanceof AirBlock || block == Blocks.MAGMA_BLOCK || block == Blocks.BUBBLE_COLUMN || block == Blocks.HONEY_BLOCK) {
+        if (block instanceof AirBlock || block == Blocks.MAGMA_BLOCK || block == Blocks.BUBBLE_COLUMN) {
            // early return for most common case (air)
            // plus magma, which is a normal cube but it hurts you
            return false;
--- a/src/main/java/baritone/pathing/movement/movements/MovementAscend.java
+++ b/src/main/java/baritone/pathing/movement/movements/MovementAscend.java
@@ -177,7 +177,7 @@ public class MovementAscend extends Movement {
            ticksWithoutPlacement++;
            if (MovementHelper.attemptToPlaceABlock(state, baritone, dest.down(), false, true) == PlaceResult.READY_TO_PLACE) {
                state.setInput(Input.SNEAK, true);
-                if (ctx.player().isCrouching()) {
+                if (ctx.player().isSneaking()) {
                    state.setInput(Input.CLICK_RIGHT, true);
                }
            }
@@ -200,8 +200,8 @@ public class MovementAscend extends Movement {

        int xAxis = Math.abs(src.getX() - dest.getX()); // either 0 or 1
        int zAxis = Math.abs(src.getZ() - dest.getZ()); // either 0 or 1
-        double flatDistToNext = xAxis * Math.abs((dest.getX() + 0.5D) - ctx.player().getPositionVec().x) + zAxis * Math.abs((dest.getZ() + 0.5D) - ctx.player().getPositionVec().z);
-        double sideDist = zAxis * Math.abs((dest.getX() + 0.5D) - ctx.player().getPositionVec().x) + xAxis * Math.abs((dest.getZ() + 0.5D) - ctx.player().getPositionVec().z);
+        double flatDistToNext = xAxis * Math.abs((dest.getX() + 0.5D) - ctx.player().posX) + zAxis * Math.abs((dest.getZ() + 0.5D) - ctx.player().posZ);
+        double sideDist = zAxis * Math.abs((dest.getX() + 0.5D) - ctx.player().posX) + xAxis * Math.abs((dest.getZ() + 0.5D) - ctx.player().posZ);

        double lateralMotion = xAxis * ctx.player().getMotion().z + zAxis * ctx.player().getMotion().x;
        if (Math.abs(lateralMotion) > 0.1) {
--- a/src/main/java/baritone/pathing/movement/movements/MovementDescend.java
+++ b/src/main/java/baritone/pathing/movement/movements/MovementDescend.java
@@ -212,11 +212,11 @@ public class MovementDescend extends Movement {

        BlockPos playerFeet = ctx.playerFeet();
        BlockPos fakeDest = new BlockPos(dest.getX() * 2 - src.getX(), dest.getY(), dest.getZ() * 2 - src.getZ());
-        if ((playerFeet.equals(dest) || playerFeet.equals(fakeDest)) && (MovementHelper.isLiquid(ctx, dest) || ctx.player().getPositionVec().y - dest.getY() < 0.5)) { // lilypads
+        if ((playerFeet.equals(dest) || playerFeet.equals(fakeDest)) && (MovementHelper.isLiquid(ctx, dest) || ctx.player().posY - dest.getY() < 0.5)) { // lilypads
            // Wait until we're actually on the ground before saying we're done because sometimes we continue to fall if the next action starts immediately
            return state.setStatus(MovementStatus.SUCCESS);
            /* else {
-                // System.out.println(player().getPositionVec().y + " " + playerFeet.getY() + " " + (player().getPositionVec().y - playerFeet.getY()));
+                // System.out.println(player().posY + " " + playerFeet.getY() + " " + (player().posY - playerFeet.getY()));
            }*/
        }
        if (safeMode()) {
@@ -231,11 +231,11 @@ public class MovementDescend extends Movement {
            )).setInput(Input.MOVE_FORWARD, true);
            return state;
        }
-        double diffX = ctx.player().getPositionVec().x - (dest.getX() + 0.5);
-        double diffZ = ctx.player().getPositionVec().z - (dest.getZ() + 0.5);
+        double diffX = ctx.player().posX - (dest.getX() + 0.5);
+        double diffZ = ctx.player().posZ - (dest.getZ() + 0.5);
        double ab = Math.sqrt(diffX * diffX + diffZ * diffZ);
-        double x = ctx.player().getPositionVec().x - (src.getX() + 0.5);
-        double z = ctx.player().getPositionVec().z - (src.getZ() + 0.5);
+        double x = ctx.player().posX - (src.getX() + 0.5);
+        double z = ctx.player().posZ - (src.getZ() + 0.5);
        double fromStart = Math.sqrt(x * x + z * z);
        if (!playerFeet.equals(dest) || ab > 0.25) {
            if (numTicks++ < 20 && fromStart < 1.25) {
--- a/src/main/java/baritone/pathing/movement/movements/MovementDiagonal.java
+++ b/src/main/java/baritone/pathing/movement/movements/MovementDiagonal.java
@@ -63,9 +63,9 @@ public class MovementDiagonal extends Movement {
        //return MovementHelper.canWalkOn(ctx, ctx.playerFeet().down());
        ClientPlayerEntity player = ctx.player();
        double offset = 0.25;
-        double x = player.getPositionVec().x;
-        double y = player.getPositionVec().y - 1;
-        double z = player.getPositionVec().z;
+        double x = player.posX;
+        double y = player.posY - 1;
+        double z = player.posZ;
        //standard
        if (ctx.playerFeet().equals(src)) {
            return true;
@@ -256,7 +256,7 @@ public class MovementDiagonal extends Movement {
        } else if (!playerInValidPosition() && !(MovementHelper.isLiquid(ctx, src) && getValidPositions().contains(ctx.playerFeet().up()))) {
            return state.setStatus(MovementStatus.UNREACHABLE);
        }
-        if (dest.y > src.y && ctx.player().getPositionVec().y < src.y + 0.1 && ctx.player().collidedHorizontally) {
+        if (dest.y > src.y && ctx.player().posY < src.y + 0.1 && ctx.player().collidedHorizontally) {
            state.setInput(Input.JUMP, true);
        }
        if (sprint()) {
--- a/src/main/java/baritone/pathing/movement/movements/MovementDownward.java
+++ b/src/main/java/baritone/pathing/movement/movements/MovementDownward.java
@@ -84,8 +84,8 @@ public class MovementDownward extends Movement {
        } else if (!playerInValidPosition()) {
            return state.setStatus(MovementStatus.UNREACHABLE);
        }
-        double diffX = ctx.player().getPositionVec().x - (dest.getX() + 0.5);
-        double diffZ = ctx.player().getPositionVec().z - (dest.getZ() + 0.5);
+        double diffX = ctx.player().posX - (dest.getX() + 0.5);
+        double diffZ = ctx.player().posZ - (dest.getZ() + 0.5);
        double ab = Math.sqrt(diffX * diffX + diffZ * diffZ);

        if (numTicks++ < 10 && ab < 0.2) {
--- a/src/main/java/baritone/pathing/movement/movements/MovementFall.java
+++ b/src/main/java/baritone/pathing/movement/movements/MovementFall.java
@@ -100,7 +100,7 @@ public class MovementFall extends Movement {
                return state.setStatus(MovementStatus.UNREACHABLE);
            }

-            if (ctx.player().getPositionVec().y - dest.getY() < ctx.playerController().getBlockReachDistance() && !ctx.player().onGround) {
+            if (ctx.player().posY - dest.getY() < ctx.playerController().getBlockReachDistance() && !ctx.player().onGround) {
                ctx.player().inventory.currentItem = ctx.player().inventory.getSlotFor(STACK_BUCKET_WATER);

                targetRotation = new Rotation(toDest.getYaw(), 90.0F);
@@ -115,7 +115,7 @@ public class MovementFall extends Movement {
        } else {
            state.setTarget(new MovementTarget(toDest, false));
        }
-        if (playerFeet.equals(dest) && (ctx.player().getPositionVec().y - playerFeet.getY() < 0.094 || isWater)) { // 0.094 because lilypads
+        if (playerFeet.equals(dest) && (ctx.player().posY - playerFeet.getY() < 0.094 || isWater)) { // 0.094 because lilypads
            if (isWater) { // only match water, not flowing water (which we cannot pick up with a bucket)
                if (PlayerInventory.isHotbar(ctx.player().inventory.getSlotFor(STACK_BUCKET_EMPTY))) {
                    ctx.player().inventory.currentItem = ctx.player().inventory.getSlotFor(STACK_BUCKET_EMPTY);
@@ -134,7 +134,7 @@ public class MovementFall extends Movement {
            }
        }
        Vec3d destCenter = VecUtils.getBlockPosCenter(dest); // we are moving to the 0.5 center not the edge (like if we were falling on a ladder)
-        if (Math.abs(ctx.player().getPositionVec().x + ctx.player().getMotion().x - destCenter.x) > 0.1 || Math.abs(ctx.player().getPositionVec().z + ctx.player().getMotion().z - destCenter.z) > 0.1) {
+        if (Math.abs(ctx.player().posX + ctx.player().getMotion().x - destCenter.x) > 0.1 || Math.abs(ctx.player().posZ + ctx.player().getMotion().z - destCenter.z) > 0.1) {
            if (!ctx.player().onGround && Math.abs(ctx.player().getMotion().y) > 0.4) {
                state.setInput(Input.SNEAK, true);
            }
@@ -144,7 +144,7 @@ public class MovementFall extends Movement {
        if (avoid == null) {
            avoid = src.subtract(dest);
        } else {
-            double dist = Math.abs(avoid.getX() * (destCenter.x - avoid.getX() / 2.0 - ctx.player().getPositionVec().x)) + Math.abs(avoid.getZ() * (destCenter.z - avoid.getZ() / 2.0 - ctx.player().getPositionVec().z));
+            double dist = Math.abs(avoid.getX() * (destCenter.x - avoid.getX() / 2.0 - ctx.player().posX)) + Math.abs(avoid.getZ() * (destCenter.z - avoid.getZ() / 2.0 - ctx.player().posZ));
            if (dist < 0.6) {
                state.setInput(Input.MOVE_FORWARD, true);
            } else if (!ctx.player().onGround) {
--- a/src/main/java/baritone/pathing/movement/movements/MovementParkour.java
+++ b/src/main/java/baritone/pathing/movement/movements/MovementParkour.java
@@ -246,19 +246,19 @@ public class MovementParkour extends Movement {
                // but i did it anyway
                return state.setStatus(MovementStatus.SUCCESS);
            }
-            if (ctx.player().getPositionVec().y - ctx.playerFeet().getY() < 0.094) { // lilypads
+            if (ctx.player().posY - ctx.playerFeet().getY() < 0.094) { // lilypads
                state.setStatus(MovementStatus.SUCCESS);
            }
        } else if (!ctx.playerFeet().equals(src)) {
-            if (ctx.playerFeet().equals(src.offset(direction)) || ctx.player().getPositionVec().y - src.y > 0.0001) {
+            if (ctx.playerFeet().equals(src.offset(direction)) || ctx.player().posY - src.y > 0.0001) {
                if (!MovementHelper.canWalkOn(ctx, dest.down()) && !ctx.player().onGround && MovementHelper.attemptToPlaceABlock(state, baritone, dest.down(), true, false) == PlaceResult.READY_TO_PLACE) {
                    // go in the opposite order to check DOWN before all horizontals -- down is preferable because you don't have to look to the side while in midair, which could mess up the trajectory
                    state.setInput(Input.CLICK_RIGHT, true);
                }
                // prevent jumping too late by checking for ascend
                if (dist == 3 && !ascend) { // this is a 2 block gap, dest = src + direction * 3
-                    double xDiff = (src.x + 0.5) - ctx.player().getPositionVec().x;
-                    double zDiff = (src.z + 0.5) - ctx.player().getPositionVec().z;
+                    double xDiff = (src.x + 0.5) - ctx.player().posX;
+                    double zDiff = (src.z + 0.5) - ctx.player().posZ;
                    double distFromStart = Math.max(Math.abs(xDiff), Math.abs(zDiff));
                    if (distFromStart < 0.7) {
                        return state;
--- a/src/main/java/baritone/pathing/movement/movements/MovementPillar.java
+++ b/src/main/java/baritone/pathing/movement/movements/MovementPillar.java
@@ -172,7 +172,7 @@ public class MovementPillar extends Movement {
            // stay centered while swimming up a water column
            state.setTarget(new MovementState.MovementTarget(RotationUtils.calcRotationFromVec3d(ctx.playerHead(), VecUtils.getBlockPosCenter(dest), ctx.playerRotations()), false));
            Vec3d destCenter = VecUtils.getBlockPosCenter(dest);
-            if (Math.abs(ctx.player().getPositionVec().x - destCenter.x) > 0.2 || Math.abs(ctx.player().getPositionVec().z - destCenter.z) > 0.2) {
+            if (Math.abs(ctx.player().posX - destCenter.x) > 0.2 || Math.abs(ctx.player().posZ - destCenter.z) > 0.2) {
                state.setInput(Input.MOVE_FORWARD, true);
            }
            if (ctx.playerFeet().equals(dest)) {
@@ -218,11 +218,11 @@ public class MovementPillar extends Movement {
            }


-            state.setInput(Input.SNEAK, ctx.player().getPositionVec().y > dest.getY() || ctx.player().getPositionVec().y < src.getY() + 0.2D); // delay placement by 1 tick for ncp compatibility
+            state.setInput(Input.SNEAK, ctx.player().posY > dest.getY() || ctx.player().posY < src.getY() + 0.2D); // delay placement by 1 tick for ncp compatibility
            // since (lower down) we only right click once player.isSneaking, and that happens the tick after we request to sneak

-            double diffX = ctx.player().getPositionVec().x - (dest.getX() + 0.5);
-            double diffZ = ctx.player().getPositionVec().z - (dest.getZ() + 0.5);
+            double diffX = ctx.player().posX - (dest.getX() + 0.5);
+            double diffZ = ctx.player().posZ - (dest.getZ() + 0.5);
            double dist = Math.sqrt(diffX * diffX + diffZ * diffZ);
            double flatMotion = Math.sqrt(ctx.player().getMotion().x * ctx.player().getMotion().x + ctx.player().getMotion().z * ctx.player().getMotion().z);
            if (dist > 0.17) {//why 0.17? because it seemed like a good number, that's why
@@ -236,7 +236,7 @@ public class MovementPillar extends Movement {
                state.setTarget(new MovementState.MovementTarget(rotation, true));
            } else if (flatMotion < 0.05) {
                // If our Y coordinate is above our goal, stop jumping
-                state.setInput(Input.JUMP, ctx.player().getPositionVec().y < dest.getY());
+                state.setInput(Input.JUMP, ctx.player().posY < dest.getY());
            }


@@ -251,7 +251,7 @@ public class MovementPillar extends Movement {
                    state.setInput(Input.JUMP, false); // breaking is like 5x slower when you're jumping
                    state.setInput(Input.CLICK_LEFT, true);
                    blockIsThere = false;
-                } else if (ctx.player().isCrouching() && (ctx.isLookingAt(src.down()) || ctx.isLookingAt(src)) && ctx.player().getPositionVec().y > dest.getY() + 0.1) {
+                } else if (ctx.player().isSneaking() && (ctx.isLookingAt(src.down()) || ctx.isLookingAt(src)) && ctx.player().posY > dest.getY() + 0.1) {
                    state.setInput(Input.CLICK_RIGHT, true);
                }
            }
--- a/src/main/java/baritone/pathing/movement/movements/MovementTraverse.java
+++ b/src/main/java/baritone/pathing/movement/movements/MovementTraverse.java
@@ -175,7 +175,7 @@ public class MovementTraverse extends Movement {
                return state;
            }
            // and we aren't already pressed up against the block
-            double dist = Math.max(Math.abs(ctx.player().getPositionVec().x - (dest.getX() + 0.5D)), Math.abs(ctx.player().getPositionVec().z - (dest.getZ() + 0.5D)));
+            double dist = Math.max(Math.abs(ctx.player().posX - (dest.getX() + 0.5D)), Math.abs(ctx.player().posZ - (dest.getZ() + 0.5D)));
            if (dist < 0.83) {
                return state;
            }
@@ -245,7 +245,7 @@ public class MovementTraverse extends Movement {
            }
            Block low = BlockStateInterface.get(ctx, src).getBlock();
            Block high = BlockStateInterface.get(ctx, src.up()).getBlock();
-            if (ctx.player().getPositionVec().y > src.y + 0.1D && !ctx.player().onGround && (low == Blocks.VINE || low == Blocks.LADDER || high == Blocks.VINE || high == Blocks.LADDER)) {
+            if (ctx.player().posY > src.y + 0.1D && !ctx.player().onGround && (low == Blocks.VINE || low == Blocks.LADDER || high == Blocks.VINE || high == Blocks.LADDER)) {
                // hitting W could cause us to climb the ladder instead of going forward
                // wait until we're on the ground
                return state;
@@ -272,21 +272,21 @@ public class MovementTraverse extends Movement {
            wasTheBridgeBlockAlwaysThere = false;
            Block standingOn = BlockStateInterface.get(ctx, feet.down()).getBlock();
            if (standingOn.equals(Blocks.SOUL_SAND) || standingOn instanceof SlabBlock) { // see issue #118
-                double dist = Math.max(Math.abs(dest.getX() + 0.5 - ctx.player().getPositionVec().x), Math.abs(dest.getZ() + 0.5 - ctx.player().getPositionVec().z));
+                double dist = Math.max(Math.abs(dest.getX() + 0.5 - ctx.player().posX), Math.abs(dest.getZ() + 0.5 - ctx.player().posZ));
                if (dist < 0.85) { // 0.5 + 0.3 + epsilon
                    MovementHelper.moveTowards(ctx, state, dest);
                    return state.setInput(Input.MOVE_FORWARD, false)
                            .setInput(Input.MOVE_BACK, true);
                }
            }
-            double dist1 = Math.max(Math.abs(ctx.player().getPositionVec().x - (dest.getX() + 0.5D)), Math.abs(ctx.player().getPositionVec().z - (dest.getZ() + 0.5D)));
+            double dist1 = Math.max(Math.abs(ctx.player().posX - (dest.getX() + 0.5D)), Math.abs(ctx.player().posZ - (dest.getZ() + 0.5D)));
            PlaceResult p = MovementHelper.attemptToPlaceABlock(state, baritone, dest.down(), false, true);
            if ((p == PlaceResult.READY_TO_PLACE || dist1 < 0.6) && !Baritone.settings().assumeSafeWalk.value) {
                state.setInput(Input.SNEAK, true);
            }
            switch (p) {
                case READY_TO_PLACE: {
-                    if (ctx.player().isCrouching() || Baritone.settings().assumeSafeWalk.value) {
+                    if (ctx.player().isSneaking() || Baritone.settings().assumeSafeWalk.value) {
                        state.setInput(Input.CLICK_RIGHT, true);
                    }
                    return state;
@@ -319,7 +319,7 @@ public class MovementTraverse extends Movement {

                Rotation backToFace = RotationUtils.calcRotationFromVec3d(ctx.playerHead(), new Vec3d(faceX, faceY, faceZ), ctx.playerRotations());
                float pitch = backToFace.getPitch();
-                double dist2 = Math.max(Math.abs(ctx.player().getPositionVec().x - faceX), Math.abs(ctx.player().getPositionVec().z - faceZ));
+                double dist2 = Math.max(Math.abs(ctx.player().posX - faceX), Math.abs(ctx.player().posZ - faceZ));
                if (dist2 < 0.29) { // see issue #208
                    float yaw = RotationUtils.calcRotationFromVec3d(VecUtils.getBlockPosCenter(dest), ctx.playerHead(), ctx.playerRotations()).getYaw();
                    state.setTarget(new MovementState.MovementTarget(new Rotation(yaw, pitch), true));
--- a/src/main/java/baritone/pathing/path/PathExecutor.java
+++ b/src/main/java/baritone/pathing/path/PathExecutor.java
@@ -413,7 +413,7 @@ public class PathExecutor implements IPathExecutor, Helper {
                // playerFeet adds 0.1251 to account for soul sand
                // farmland is 0.9375
                // 0.07 is to account for farmland
-                if (ctx.player().getPositionVec().y >= center.getY() - 0.07) {
+                if (ctx.player().posY >= center.getY() - 0.07) {
                    behavior.baritone.getInputOverrideHandler().setInputForceState(Input.JUMP, false);
                    return true;
                }
@@ -484,7 +484,7 @@ public class PathExecutor implements IPathExecutor, Helper {
    }

    private static boolean skipNow(IPlayerContext ctx, IMovement current) {
-        double offTarget = Math.abs(current.getDirection().getX() * (current.getSrc().z + 0.5D - ctx.player().getPositionVec().z)) + Math.abs(current.getDirection().getZ() * (current.getSrc().x + 0.5D - ctx.player().getPositionVec().x));
+        double offTarget = Math.abs(current.getDirection().getX() * (current.getSrc().z + 0.5D - ctx.player().posZ)) + Math.abs(current.getDirection().getZ() * (current.getSrc().x + 0.5D - ctx.player().posX));
        if (offTarget > 0.1) {
            return false;
        }
@@ -494,7 +494,7 @@ public class PathExecutor implements IPathExecutor, Helper {
            return true;
        }
        // wait 0.3
-        double flatDist = Math.abs(current.getDirection().getX() * (headBonk.getX() + 0.5D - ctx.player().getPositionVec().x)) + Math.abs(current.getDirection().getZ() * (headBonk.getZ() + 0.5 - ctx.player().getPositionVec().z));
+        double flatDist = Math.abs(current.getDirection().getX() * (headBonk.getX() + 0.5D - ctx.player().posX)) + Math.abs(current.getDirection().getZ() * (headBonk.getZ() + 0.5 - ctx.player().posZ));
        return flatDist > 0.8;
    }

--- a/src/main/java/baritone/process/BuilderProcess.java
+++ b/src/main/java/baritone/process/BuilderProcess.java
@@ -448,7 +448,7 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
            BetterBlockPos pos = toBreak.get().getA();
            baritone.getLookBehavior().updateTarget(rot, true);
            MovementHelper.switchToBestToolFor(ctx, bcc.get(pos));
-            if (ctx.player().isCrouching()) {
+            if (ctx.player().isSneaking()) {
                // really horrible bug where a block is visible for breaking while sneaking but not otherwise
                // so you can't see it, it goes to place something else, sneaks, then the next tick it tries to break
                // and is unable since it's unsneaked in the intermediary tick
@@ -812,7 +812,7 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
                continue;
            }
            // <toxic cloud>
-            result.add(((BlockItem) stack.getItem()).getBlock().getStateForPlacement(new BlockItemUseContext(new ItemUseContext(ctx.world(), ctx.player(), Hand.MAIN_HAND, stack, new BlockRayTraceResult(new Vec3d(ctx.player().getPositionVec().x, ctx.player().getPositionVec().y, ctx.player().getPositionVec().z), Direction.UP, ctx.playerFeet(), false)) {})));
+            result.add(((BlockItem) stack.getItem()).getBlock().getStateForPlacement(new BlockItemUseContext(new ItemUseContext(ctx.world(), ctx.player(), Hand.MAIN_HAND, stack, new BlockRayTraceResult(new Vec3d(ctx.player().posX, ctx.player().posY, ctx.player().posZ), Direction.UP, ctx.playerFeet(), false)) {})));
            // </toxic cloud>
        }
        return result;
--- a/src/main/java/baritone/process/FarmProcess.java
+++ b/src/main/java/baritone/process/FarmProcess.java
@@ -300,7 +300,7 @@ public final class FarmProcess extends BaritoneProcessHelper implements IFarmPro
                ItemEntity ei = (ItemEntity) entity;
                if (PICKUP_DROPPED.contains(ei.getItem().getItem())) {
                    // +0.1 because of farmland's 0.9375 dummy height lol
-                    goalz.add(new GoalBlock(new BlockPos(entity.getPositionVec().x, entity.getPositionVec().y + 0.1, entity.getPositionVec().z)));
+                    goalz.add(new GoalBlock(new BlockPos(entity.posX, entity.posY + 0.1, entity.posZ)));
                }
            }
        }
--- a/src/main/java/baritone/process/FollowProcess.java
+++ b/src/main/java/baritone/process/FollowProcess.java
@@ -60,7 +60,7 @@ public final class FollowProcess extends BaritoneProcessHelper implements IFollo
            pos = new BlockPos(following);
        } else {
            GoalXZ g = GoalXZ.fromDirection(following.getPositionVector(), Baritone.settings().followOffsetDirection.value, Baritone.settings().followOffsetDistance.value);
-            pos = new BlockPos(g.getX(), following.getPositionVec().y, g.getZ());
+            pos = new BlockPos(g.getX(), following.posY, g.getZ());
        }
        return new GoalNear(pos, Baritone.settings().followRadius.value);
    }
--- a/src/main/java/baritone/selection/SelectionRenderer.java
+++ b/src/main/java/baritone/selection/SelectionRenderer.java
@@ -5,7 +5,6 @@ import baritone.api.event.events.RenderEvent;
 import baritone.api.event.listener.AbstractGameEventListener;
 import baritone.api.selection.ISelection;
 import baritone.utils.IRenderer;
-import com.mojang.blaze3d.matrix.MatrixStack;
 import net.minecraft.util.math.AxisAlignedBB;

 public class SelectionRenderer implements IRenderer, AbstractGameEventListener {
@@ -19,7 +18,7 @@ public class SelectionRenderer implements IRenderer, AbstractGameEventListener {
        baritone.getGameEventHandler().registerEventListener(this);
    }

-    public static void renderSelections(MatrixStack stack, ISelection[] selections) {
+    public static void renderSelections(ISelection[] selections) {
        float opacity = settings.selectionOpacity.value;
        boolean ignoreDepth = settings.renderSelectionIgnoreDepth.value;
        float lineWidth = settings.selectionLineWidth.value;
@@ -31,20 +30,20 @@ public class SelectionRenderer implements IRenderer, AbstractGameEventListener {
        IRenderer.startLines(settings.colorSelection.value, opacity, lineWidth, ignoreDepth);

        for (ISelection selection : selections) {
-            IRenderer.drawAABB(stack, selection.aabb(), SELECTION_BOX_EXPANSION);
+            IRenderer.drawAABB(selection.aabb(), SELECTION_BOX_EXPANSION);
        }

        if (settings.renderSelectionCorners.value) {
            IRenderer.glColor(settings.colorSelectionPos1.value, opacity);

            for (ISelection selection : selections) {
-                IRenderer.drawAABB(stack, new AxisAlignedBB(selection.pos1(), selection.pos1().add(1, 1, 1)));
+                IRenderer.drawAABB(new AxisAlignedBB(selection.pos1(), selection.pos1().add(1, 1, 1)));
            }

            IRenderer.glColor(settings.colorSelectionPos2.value, opacity);

            for (ISelection selection : selections) {
-                IRenderer.drawAABB(stack, new AxisAlignedBB(selection.pos2(), selection.pos2().add(1, 1, 1)));
+                IRenderer.drawAABB(new AxisAlignedBB(selection.pos2(), selection.pos2().add(1, 1, 1)));
            }
        }

@@ -53,6 +52,6 @@ public class SelectionRenderer implements IRenderer, AbstractGameEventListener {

    @Override
    public void onRenderPass(RenderEvent event) {
-        renderSelections(event.getModelViewStack(), manager.getSelections());
+        renderSelections(manager.getSelections());
    }
 }
--- a/src/main/java/baritone/utils/BlockStateInterface.java
+++ b/src/main/java/baritone/utils/BlockStateInterface.java
@@ -44,7 +44,7 @@ public class BlockStateInterface {
    private final ClientChunkProvider provider;
    private final WorldData worldData;
    protected final IBlockReader world;
-    public final BlockPos.Mutable isPassableBlockPos;
+    public final BlockPos.MutableBlockPos isPassableBlockPos;
    public final IBlockReader access;

    private Chunk prev = null;
@@ -74,7 +74,7 @@ public class BlockStateInterface {
        if (!Minecraft.getInstance().isOnExecutionThread()) {
            throw new IllegalStateException();
        }
-        this.isPassableBlockPos = new BlockPos.Mutable();
+        this.isPassableBlockPos = new BlockPos.MutableBlockPos();
        this.access = new BlockStateInterfaceAccessWrapper(this);
    }

--- a/src/main/java/baritone/utils/GuiClick.java
+++ b/src/main/java/baritone/utils/GuiClick.java
@@ -22,20 +22,21 @@ import baritone.api.BaritoneAPI;
 import baritone.api.pathing.goals.GoalBlock;
 import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.Helper;
-import com.mojang.blaze3d.matrix.MatrixStack;
-import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.platform.GlStateManager;
 import net.minecraft.client.entity.player.ClientPlayerEntity;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.renderer.Matrix4f;
-import net.minecraft.client.renderer.Vector4f;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.math.*;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.util.text.event.ClickEvent;
+import org.lwjgl.BufferUtils;
+import org.lwjgl.opengl.GL11;

 import java.awt.*;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
 import java.util.Collections;

 import static baritone.api.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX;
@@ -43,7 +44,11 @@ import static org.lwjgl.opengl.GL11.*;

 public class GuiClick extends Screen implements Helper {

-    private Matrix4f projectionViewMatrix;
+    // My name is Brady and I grant leijurv permission to use this pasted code
+    private final FloatBuffer MODELVIEW = BufferUtils.createFloatBuffer(16);
+    private final FloatBuffer PROJECTION = BufferUtils.createFloatBuffer(16);
+    private final IntBuffer VIEWPORT = BufferUtils.createIntBuffer(16);
+    private final FloatBuffer TO_WORLD_BUFFER = BufferUtils.createFloatBuffer(3);

    private BlockPos clickStart;
    private BlockPos currentMouseOver;
@@ -61,10 +66,9 @@ public class GuiClick extends Screen implements Helper {
    public void render(int mouseX, int mouseY, float partialTicks) {
        double mx = mc.mouseHelper.getMouseX();
        double my = mc.mouseHelper.getMouseY();
-
-        my = mc.getMainWindow().getHeight() - my;
-        my *= mc.getMainWindow().getFramebufferHeight() / (double) mc.getMainWindow().getHeight();
-        mx *= mc.getMainWindow().getFramebufferWidth() / (double) mc.getMainWindow().getWidth();
+        my = mc.mainWindow.getHeight() - my;
+        my *= mc.mainWindow.getFramebufferHeight() / (double) mc.mainWindow.getHeight();
+        mx *= mc.mainWindow.getFramebufferWidth() / (double) mc.mainWindow.getWidth();
        Vec3d near = toWorld(mx, my, 0);
        Vec3d far = toWorld(mx, my, 1); // "Use 0.945 that's what stack overflow says" - leijurv
        if (near != null && far != null) {
@@ -111,52 +115,224 @@ public class GuiClick extends Screen implements Helper {
        return super.mouseClicked(mouseX, mouseY, mouseButton);
    }

-    public void onRender(MatrixStack modelViewStack, Matrix4f projectionMatrix) {
-        this.projectionViewMatrix = projectionMatrix.copy();
-        this.projectionViewMatrix.mul(modelViewStack.getLast().getMatrix());
-        this.projectionViewMatrix.invert();
+    public void onRender() {
+        GlStateManager.getMatrix(GL_MODELVIEW_MATRIX, (FloatBuffer) MODELVIEW.clear());
+        GlStateManager.getMatrix(GL_PROJECTION_MATRIX, (FloatBuffer) PROJECTION.clear());
+        GL11.glGetIntegerv(GL_VIEWPORT, (IntBuffer) VIEWPORT.clear());

        if (currentMouseOver != null) {
            Entity e = mc.getRenderViewEntity();
            // drawSingleSelectionBox WHEN?
-            PathRenderer.drawManySelectionBoxes(modelViewStack, e, Collections.singletonList(currentMouseOver), Color.CYAN);
+            PathRenderer.drawManySelectionBoxes(e, Collections.singletonList(currentMouseOver), Color.CYAN);
            if (clickStart != null && !clickStart.equals(currentMouseOver)) {
-                RenderSystem.enableBlend();
-                RenderSystem.blendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO);
-                RenderSystem.color4f(Color.RED.getColorComponents(null)[0], Color.RED.getColorComponents(null)[1], Color.RED.getColorComponents(null)[2], 0.4F);
-                RenderSystem.lineWidth(Baritone.settings().pathRenderLineWidthPixels.value);
-                RenderSystem.disableTexture();
-                RenderSystem.depthMask(false);
-                RenderSystem.disableDepthTest();
+                GlStateManager.enableBlend();
+                GlStateManager.blendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO);
+                GlStateManager.color4f(Color.RED.getColorComponents(null)[0], Color.RED.getColorComponents(null)[1], Color.RED.getColorComponents(null)[2], 0.4F);
+                GlStateManager.lineWidth(Baritone.settings().pathRenderLineWidthPixels.value);
+                GlStateManager.disableTexture();
+                GlStateManager.depthMask(false);
+                GlStateManager.disableDepthTest();
                BetterBlockPos a = new BetterBlockPos(currentMouseOver);
                BetterBlockPos b = new BetterBlockPos(clickStart);
-                IRenderer.drawAABB(modelViewStack, new AxisAlignedBB(Math.min(a.x, b.x), Math.min(a.y, b.y), Math.min(a.z, b.z), Math.max(a.x, b.x) + 1, Math.max(a.y, b.y) + 1, Math.max(a.z, b.z) + 1));
-                RenderSystem.enableDepthTest();
+                IRenderer.drawAABB(new AxisAlignedBB(Math.min(a.x, b.x), Math.min(a.y, b.y), Math.min(a.z, b.z), Math.max(a.x, b.x) + 1, Math.max(a.y, b.y) + 1, Math.max(a.z, b.z) + 1));
+                GlStateManager.enableDepthTest();

-                RenderSystem.depthMask(true);
-                RenderSystem.enableTexture();
-                RenderSystem.disableBlend();
+                GlStateManager.depthMask(true);
+                GlStateManager.enableTexture();
+                GlStateManager.disableBlend();
            }
        }
    }

    private Vec3d toWorld(double x, double y, double z) {
-        if (this.projectionViewMatrix == null) {
-            return null;
+        boolean result = gluUnProject((float) x, (float) y, (float) z, MODELVIEW, PROJECTION, VIEWPORT, (FloatBuffer) TO_WORLD_BUFFER.clear());
+        if (result) {
+            return new Vec3d(TO_WORLD_BUFFER.get(0), TO_WORLD_BUFFER.get(1), TO_WORLD_BUFFER.get(2));
        }
+        return null;
+    }

-        x /= mc.getMainWindow().getFramebufferWidth();
-        y /= mc.getMainWindow().getFramebufferHeight();
-        x = x * 2 - 1;
-        y = y * 2 - 1;
+    // skidded from lwjgl2 :ok_hand:
+    // its uhhhhh mit license so its ok
+    // here is the uhh license
+    /*
+     * Copyright (c) 2002-2007 Lightweight Java Game Library Project
+     * All rights reserved.
+     *
+     * Redistribution and use in source and binary forms, with or without
+     * modification, are permitted provided that the following conditions are
+     * met:
+     *
+     * * Redistributions of source code must retain the above copyright
+     *   notice, this list of conditions and the following disclaimer.
+     *
+     * * Redistributions in binary form must reproduce the above copyright
+     *   notice, this list of conditions and the following disclaimer in the
+     *   documentation and/or other materials provided with the distribution.
+     *
+     * * Neither the name of 'Light Weight Java Game Library' nor the names of
+     *   its contributors may be used to endorse or promote products derived
+     *   from this software without specific prior written permission.
+     *
+     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+     * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+     * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+     * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+     * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+     * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+     * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+     * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+     * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+     * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+     */
+
+    public static boolean gluUnProject(
+            float winx,
+            float winy,
+            float winz,
+            FloatBuffer modelMatrix,
+            FloatBuffer projMatrix,
+            IntBuffer viewport,
+            FloatBuffer obj_pos) {
+        FloatBuffer finalMatrix = BufferUtils.createFloatBuffer(16);
+        float[] in = new float[4];
+        float[] out = new float[4];
+
+        __gluMultMatricesf(modelMatrix, projMatrix, finalMatrix);
+
+        if (!__gluInvertMatrixf(finalMatrix, finalMatrix))
+            return false;
+
+        in[0] = winx;
+        in[1] = winy;
+        in[2] = winz;
+        in[3] = 1.0f;
+
+        // Map x and y from window coordinates
+        in[0] = (in[0] - viewport.get(viewport.position() + 0)) / viewport.get(viewport.position() + 2);
+        in[1] = (in[1] - viewport.get(viewport.position() + 1)) / viewport.get(viewport.position() + 3);
+
+        // Map to range -1 to 1
+        in[0] = in[0] * 2 - 1;
+        in[1] = in[1] * 2 - 1;
+        in[2] = in[2] * 2 - 1;
+
+        __gluMultMatrixVecf(finalMatrix, in, out);
+
+        if (out[3] == 0.0)
+            return false;
+
+        out[3] = 1.0f / out[3];
+
+        obj_pos.put(obj_pos.position() + 0, out[0] * out[3]);
+        obj_pos.put(obj_pos.position() + 1, out[1] * out[3]);
+        obj_pos.put(obj_pos.position() + 2, out[2] * out[3]);
+
+        return true;
+    }
+
+    private static void __gluMultMatrixVecf(FloatBuffer m, float[] in, float[] out) {
+        for (int i = 0; i < 4; i++) {
+            out[i] =
+                    in[0] * m.get(m.position() + 0 * 4 + i)
+                            + in[1] * m.get(m.position() + 1 * 4 + i)
+                            + in[2] * m.get(m.position() + 2 * 4 + i)
+                            + in[3] * m.get(m.position() + 3 * 4 + i);

-        Vector4f pos = new Vector4f((float) x, (float) y, (float) z, 1.0F);
-        pos.transform(this.projectionViewMatrix);
-        if (pos.getW() == 0) {
-            return null;
        }
+    }

-        pos.perspectiveDivide();
-        return new Vec3d(pos.getX(), pos.getY(), pos.getZ());
+    private static void __gluMultMatricesf(FloatBuffer a, FloatBuffer b, FloatBuffer r) {
+        for (int i = 0; i < 4; i++) {
+            for (int j = 0; j < 4; j++) {
+                r.put(r.position() + i * 4 + j,
+                        a.get(a.position() + i * 4 + 0) * b.get(b.position() + 0 * 4 + j) + a.get(a.position() + i * 4 + 1) * b.get(b.position() + 1 * 4 + j) + a.get(a.position() + i * 4 + 2) * b.get(b.position() + 2 * 4 + j) + a.get(a.position() + i * 4 + 3) * b.get(b.position() + 3 * 4 + j));
+            }
+        }
+    }
+
+    private static boolean __gluInvertMatrixf(FloatBuffer src, FloatBuffer inverse) {
+        int i, j, k, swap;
+        float t;
+        FloatBuffer temp = BufferUtils.createFloatBuffer(16);
+
+
+        for (i = 0; i < 16; i++) {
+            temp.put(i, src.get(i + src.position()));
+        }
+        __gluMakeIdentityf(inverse);
+
+        for (i = 0; i < 4; i++) {
+            /*
+             * * Look for largest element in column
+             */
+            swap = i;
+            for (j = i + 1; j < 4; j++) {
+                /*
+                 * if (fabs(temp[j][i]) > fabs(temp[i][i])) { swap = j;
+                 */
+                if (Math.abs(temp.get(j * 4 + i)) > Math.abs(temp.get(i * 4 + i))) {
+                    swap = j;
+                }
+            }
+
+            if (swap != i) {
+                /*
+                 * * Swap rows.
+                 */
+                for (k = 0; k < 4; k++) {
+                    t = temp.get(i * 4 + k);
+                    temp.put(i * 4 + k, temp.get(swap * 4 + k));
+                    temp.put(swap * 4 + k, t);
+
+                    t = inverse.get(i * 4 + k);
+                    inverse.put(i * 4 + k, inverse.get(swap * 4 + k));
+                    //inverse.put((i << 2) + k, inverse.get((swap << 2) + k));
+                    inverse.put(swap * 4 + k, t);
+                    //inverse.put((swap << 2) + k, t);
+                }
+            }
+
+            if (temp.get(i * 4 + i) == 0) {
+                /*
+                 * * No non-zero pivot. The matrix is singular, which shouldn't *
+                 * happen. This means the user gave us a bad matrix.
+                 */
+                return false;
+            }
+
+            t = temp.get(i * 4 + i);
+            for (k = 0; k < 4; k++) {
+                temp.put(i * 4 + k, temp.get(i * 4 + k) / t);
+                inverse.put(i * 4 + k, inverse.get(i * 4 + k) / t);
+            }
+            for (j = 0; j < 4; j++) {
+                if (j != i) {
+                    t = temp.get(j * 4 + i);
+                    for (k = 0; k < 4; k++) {
+                        temp.put(j * 4 + k, temp.get(j * 4 + k) - temp.get(i * 4 + k) * t);
+                        inverse.put(j * 4 + k, inverse.get(j * 4 + k) - inverse.get(i * 4 + k) * t);
+						/*inverse.put(
+							(j << 2) + k,
+							inverse.get((j << 2) + k) - inverse.get((i << 2) + k) * t);*/
+                    }
+                }
+            }
+        }
+        return true;
+    }
+
+    private static final float[] IDENTITY_MATRIX =
+            new float[]{
+                    1.0f, 0.0f, 0.0f, 0.0f,
+                    0.0f, 1.0f, 0.0f, 0.0f,
+                    0.0f, 0.0f, 1.0f, 0.0f,
+                    0.0f, 0.0f, 0.0f, 1.0f};
+
+    private static void __gluMakeIdentityf(FloatBuffer m) {
+        int oldPos = m.position();
+        m.put(IDENTITY_MATRIX);
+        m.position(oldPos);
    }
 }
--- a/src/main/java/baritone/utils/IRenderer.java
+++ b/src/main/java/baritone/utils/IRenderer.java
@@ -21,10 +21,8 @@ import baritone.api.BaritoneAPI;
 import baritone.api.Settings;
 import baritone.api.utils.Helper;
 import baritone.utils.accessor.IEntityRenderManager;
-import com.mojang.blaze3d.matrix.MatrixStack;
-import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.platform.GlStateManager;
 import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.Matrix4f;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.util.math.AxisAlignedBB;
@@ -42,19 +40,19 @@ public interface IRenderer {

    static void glColor(Color color, float alpha) {
        float[] colorComponents = color.getColorComponents(null);
-        RenderSystem.color4f(colorComponents[0], colorComponents[1], colorComponents[2], alpha);
+        GlStateManager.color4f(colorComponents[0], colorComponents[1], colorComponents[2], alpha);
    }

    static void startLines(Color color, float alpha, float lineWidth, boolean ignoreDepth) {
-        RenderSystem.enableBlend();
-        RenderSystem.blendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO);
+        GlStateManager.enableBlend();
+        GlStateManager.blendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO);
        glColor(color, alpha);
-        RenderSystem.lineWidth(lineWidth);
-        RenderSystem.disableTexture();
-        RenderSystem.depthMask(false);
+        GlStateManager.lineWidth(lineWidth);
+        GlStateManager.disableTexture();
+        GlStateManager.depthMask(false);

        if (ignoreDepth) {
-            RenderSystem.disableDepthTest();
+            GlStateManager.disableDepthTest();
        }
    }

@@ -64,50 +62,49 @@ public interface IRenderer {

    static void endLines(boolean ignoredDepth) {
        if (ignoredDepth) {
-            RenderSystem.enableDepthTest();
+            GlStateManager.enableDepthTest();
        }

-        RenderSystem.depthMask(true);
-        RenderSystem.enableTexture();
-        RenderSystem.disableBlend();
+        GlStateManager.depthMask(true);
+        GlStateManager.enableTexture();
+        GlStateManager.disableBlend();
    }

-    static void drawAABB(MatrixStack stack, AxisAlignedBB aabb) {
+    static void drawAABB(AxisAlignedBB aabb) {
        AxisAlignedBB toDraw = aabb.offset(-renderManager.renderPosX(), -renderManager.renderPosY(), -renderManager.renderPosZ());

-        Matrix4f matrix4f = stack.getLast().getMatrix();
        buffer.begin(GL_LINES, DefaultVertexFormats.POSITION);
        // bottom
-        buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.minY, (float) toDraw.minZ).endVertex();
-        buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.minY, (float) toDraw.minZ).endVertex();
-        buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.minY, (float) toDraw.minZ).endVertex();
-        buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.minY, (float) toDraw.maxZ).endVertex();
-        buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.minY, (float) toDraw.maxZ).endVertex();
-        buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.minY, (float) toDraw.maxZ).endVertex();
-        buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.minY, (float) toDraw.maxZ).endVertex();
-        buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.minY, (float) toDraw.minZ).endVertex();
+        buffer.pos(toDraw.minX, toDraw.minY, toDraw.minZ).endVertex();
+        buffer.pos(toDraw.maxX, toDraw.minY, toDraw.minZ).endVertex();
+        buffer.pos(toDraw.maxX, toDraw.minY, toDraw.minZ).endVertex();
+        buffer.pos(toDraw.maxX, toDraw.minY, toDraw.maxZ).endVertex();
+        buffer.pos(toDraw.maxX, toDraw.minY, toDraw.maxZ).endVertex();
+        buffer.pos(toDraw.minX, toDraw.minY, toDraw.maxZ).endVertex();
+        buffer.pos(toDraw.minX, toDraw.minY, toDraw.maxZ).endVertex();
+        buffer.pos(toDraw.minX, toDraw.minY, toDraw.minZ).endVertex();
        // top
-        buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.maxY, (float) toDraw.minZ).endVertex();
-        buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.maxY, (float) toDraw.minZ).endVertex();
-        buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.maxY, (float) toDraw.minZ).endVertex();
-        buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.maxY, (float) toDraw.maxZ).endVertex();
-        buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.maxY, (float) toDraw.maxZ).endVertex();
-        buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.maxY, (float) toDraw.maxZ).endVertex();
-        buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.maxY, (float) toDraw.maxZ).endVertex();
-        buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.maxY, (float) toDraw.minZ).endVertex();
+        buffer.pos(toDraw.minX, toDraw.maxY, toDraw.minZ).endVertex();
+        buffer.pos(toDraw.maxX, toDraw.maxY, toDraw.minZ).endVertex();
+        buffer.pos(toDraw.maxX, toDraw.maxY, toDraw.minZ).endVertex();
+        buffer.pos(toDraw.maxX, toDraw.maxY, toDraw.maxZ).endVertex();
+        buffer.pos(toDraw.maxX, toDraw.maxY, toDraw.maxZ).endVertex();
+        buffer.pos(toDraw.minX, toDraw.maxY, toDraw.maxZ).endVertex();
+        buffer.pos(toDraw.minX, toDraw.maxY, toDraw.maxZ).endVertex();
+        buffer.pos(toDraw.minX, toDraw.maxY, toDraw.minZ).endVertex();
        // corners
-        buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.minY, (float) toDraw.minZ).endVertex();
-        buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.maxY, (float) toDraw.minZ).endVertex();
-        buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.minY, (float) toDraw.minZ).endVertex();
-        buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.maxY, (float) toDraw.minZ).endVertex();
-        buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.minY, (float) toDraw.maxZ).endVertex();
-        buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.maxY, (float) toDraw.maxZ).endVertex();
-        buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.minY, (float) toDraw.maxZ).endVertex();
-        buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.maxY, (float) toDraw.maxZ).endVertex();
+        buffer.pos(toDraw.minX, toDraw.minY, toDraw.minZ).endVertex();
+        buffer.pos(toDraw.minX, toDraw.maxY, toDraw.minZ).endVertex();
+        buffer.pos(toDraw.maxX, toDraw.minY, toDraw.minZ).endVertex();
+        buffer.pos(toDraw.maxX, toDraw.maxY, toDraw.minZ).endVertex();
+        buffer.pos(toDraw.maxX, toDraw.minY, toDraw.maxZ).endVertex();
+        buffer.pos(toDraw.maxX, toDraw.maxY, toDraw.maxZ).endVertex();
+        buffer.pos(toDraw.minX, toDraw.minY, toDraw.maxZ).endVertex();
+        buffer.pos(toDraw.minX, toDraw.maxY, toDraw.maxZ).endVertex();
        tessellator.draw();
    }

-    static void drawAABB(MatrixStack stack, AxisAlignedBB aabb, double expand) {
-        drawAABB(stack, aabb.grow(expand, expand, expand));
+    static void drawAABB(AxisAlignedBB aabb, double expand) {
+        drawAABB(aabb.grow(expand, expand, expand));
    }
 }
--- a/src/main/java/baritone/utils/PathRenderer.java
+++ b/src/main/java/baritone/utils/PathRenderer.java
@@ -26,10 +26,8 @@ import baritone.api.utils.Helper;
 import baritone.api.utils.interfaces.IGoalRenderPos;
 import baritone.behavior.PathingBehavior;
 import baritone.pathing.path.PathExecutor;
-import com.mojang.blaze3d.matrix.MatrixStack;
-import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.platform.GlStateManager;
 import net.minecraft.block.BlockState;
-import net.minecraft.client.renderer.Matrix4f;
 import net.minecraft.client.renderer.tileentity.BeaconTileEntityRenderer;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.entity.Entity;
@@ -74,7 +72,7 @@ public final class PathRenderer implements IRenderer, Helper {
        float partialTicks = event.getPartialTicks();
        Goal goal = behavior.getGoal();
        if (Helper.mc.currentScreen instanceof GuiClick) {
-            ((GuiClick) Helper.mc.currentScreen).onRender(event.getModelViewStack(), event.getProjectionMatrix());
+            ((GuiClick) Helper.mc.currentScreen).onRender();
        }

        int thisPlayerDimension = behavior.baritone.getPlayerContext().world().getDimension().getType().getId();
@@ -95,7 +93,7 @@ public final class PathRenderer implements IRenderer, Helper {
        }

        if (goal != null && settings.renderGoal.value) {
-            drawDankLitGoalBox(event.getModelViewStack(), renderView, goal, partialTicks, settings.colorGoalBox.value);
+            drawDankLitGoalBox(renderView, goal, partialTicks, settings.colorGoalBox.value);
        }

        if (!settings.renderPath.value) {
@@ -105,9 +103,9 @@ public final class PathRenderer implements IRenderer, Helper {
        PathExecutor current = behavior.getCurrent(); // this should prevent most race conditions?
        PathExecutor next = behavior.getNext(); // like, now it's not possible for current!=null to be true, then suddenly false because of another thread
        if (current != null && settings.renderSelectionBoxes.value) {
-            drawManySelectionBoxes(event.getModelViewStack(), renderView, current.toBreak(), settings.colorBlocksToBreak.value);
-            drawManySelectionBoxes(event.getModelViewStack(), renderView, current.toPlace(), settings.colorBlocksToPlace.value);
-            drawManySelectionBoxes(event.getModelViewStack(), renderView, current.toWalkInto(), settings.colorBlocksToWalkInto.value);
+            drawManySelectionBoxes(renderView, current.toBreak(), settings.colorBlocksToBreak.value);
+            drawManySelectionBoxes(renderView, current.toPlace(), settings.colorBlocksToPlace.value);
+            drawManySelectionBoxes(renderView, current.toWalkInto(), settings.colorBlocksToWalkInto.value);
        }

        //drawManySelectionBoxes(player, Collections.singletonList(behavior.pathStart()), partialTicks, Color.WHITE);
@@ -115,27 +113,27 @@ public final class PathRenderer implements IRenderer, Helper {
        // Render the current path, if there is one
        if (current != null && current.getPath() != null) {
            int renderBegin = Math.max(current.getPosition() - 3, 0);
-            drawPath(event.getModelViewStack(), current.getPath(), renderBegin, settings.colorCurrentPath.value, settings.fadePath.value, 10, 20);
+            drawPath(current.getPath(), renderBegin, settings.colorCurrentPath.value, settings.fadePath.value, 10, 20);
        }

        if (next != null && next.getPath() != null) {
-            drawPath(event.getModelViewStack(), next.getPath(), 0, settings.colorNextPath.value, settings.fadePath.value, 10, 20);
+            drawPath(next.getPath(), 0, settings.colorNextPath.value, settings.fadePath.value, 10, 20);
        }

        // If there is a path calculation currently running, render the path calculation process
        behavior.getInProgress().ifPresent(currentlyRunning -> {
            currentlyRunning.bestPathSoFar().ifPresent(p -> {
-                drawPath(event.getModelViewStack(), p, 0, settings.colorBestPathSoFar.value, settings.fadePath.value, 10, 20);
+                drawPath(p, 0, settings.colorBestPathSoFar.value, settings.fadePath.value, 10, 20);
            });

            currentlyRunning.pathToMostRecentNodeConsidered().ifPresent(mr -> {
-                drawPath(event.getModelViewStack(), mr, 0, settings.colorMostRecentConsidered.value, settings.fadePath.value, 10, 20);
-                drawManySelectionBoxes(event.getModelViewStack(), renderView, Collections.singletonList(mr.getDest()), settings.colorMostRecentConsidered.value);
+                drawPath(mr, 0, settings.colorMostRecentConsidered.value, settings.fadePath.value, 10, 20);
+                drawManySelectionBoxes(renderView, Collections.singletonList(mr.getDest()), settings.colorMostRecentConsidered.value);
            });
        });
    }

-    public static void drawPath(MatrixStack stack, IPath path, int startIndex, Color color, boolean fadeOut, int fadeStart0, int fadeEnd0) {
+    public static void drawPath(IPath path, int startIndex, Color color, boolean fadeOut, int fadeStart0, int fadeEnd0) {
        IRenderer.startLines(color, settings.pathRenderLineWidthPixels.value, settings.renderPathIgnoreDepth.value);

        int fadeStart = fadeStart0 + startIndex;
@@ -171,7 +169,7 @@ public final class PathRenderer implements IRenderer, Helper {
                IRenderer.glColor(color, alpha);
            }

-            drawLine(stack, start.x, start.y, start.z, end.x, end.y, end.z);
+            drawLine(start.x, start.y, start.z, end.x, end.y, end.z);

            tessellator.draw();
        }
@@ -180,26 +178,24 @@ public final class PathRenderer implements IRenderer, Helper {
    }


-    public static void drawLine(MatrixStack stack, double x1, double y1, double z1, double x2, double y2, double z2) {
-        Matrix4f matrix4f = stack.getLast().getMatrix();
-
+    public static void drawLine(double x1, double y1, double z1, double x2, double y2, double z2) {
        double vpX = posX();
        double vpY = posY();
        double vpZ = posZ();
        boolean renderPathAsFrickinThingy = !settings.renderPathAsLine.value;

        buffer.begin(renderPathAsFrickinThingy ? GL_LINE_STRIP : GL_LINES, DefaultVertexFormats.POSITION);
-        buffer.pos(matrix4f, (float) (x1 + 0.5D - vpX), (float) (y1 + 0.5D - vpY), (float) (z1 + 0.5D - vpZ)).endVertex();
-        buffer.pos(matrix4f, (float) (x2 + 0.5D - vpX), (float) (y2 + 0.5D - vpY), (float) (z2 + 0.5D - vpZ)).endVertex();
+        buffer.pos(x1 + 0.5D - vpX, y1 + 0.5D - vpY, z1 + 0.5D - vpZ).endVertex();
+        buffer.pos(x2 + 0.5D - vpX, y2 + 0.5D - vpY, z2 + 0.5D - vpZ).endVertex();

        if (renderPathAsFrickinThingy) {
-            buffer.pos(matrix4f, (float) (x2 + 0.5D - vpX), (float) (y2 + 0.53D - vpY), (float) (z2 + 0.5D - vpZ)).endVertex();
-            buffer.pos(matrix4f, (float) (x1 + 0.5D - vpX), (float) (y1 + 0.53D - vpY), (float) (z1 + 0.5D - vpZ)).endVertex();
-            buffer.pos(matrix4f, (float) (x1 + 0.5D - vpX), (float) (y1 + 0.5D - vpY), (float) (z1 + 0.5D - vpZ)).endVertex();
+            buffer.pos(x2 + 0.5D - vpX, y2 + 0.53D - vpY, z2 + 0.5D - vpZ).endVertex();
+            buffer.pos(x1 + 0.5D - vpX, y1 + 0.53D - vpY, z1 + 0.5D - vpZ).endVertex();
+            buffer.pos(x1 + 0.5D - vpX, y1 + 0.5D - vpY, z1 + 0.5D - vpZ).endVertex();
        }
    }

-    public static void drawManySelectionBoxes(MatrixStack stack, Entity player, Collection<BlockPos> positions, Color color) {
+    public static void drawManySelectionBoxes(Entity player, Collection<BlockPos> positions, Color color) {
        IRenderer.startLines(color, settings.pathRenderLineWidthPixels.value, settings.renderSelectionBoxesIgnoreDepth.value);

        //BlockPos blockpos = movingObjectPositionIn.getBlockPos();
@@ -210,13 +206,13 @@ public final class PathRenderer implements IRenderer, Helper {
            VoxelShape shape = state.getShape(player.world, pos);
            AxisAlignedBB toDraw = shape.isEmpty() ? VoxelShapes.fullCube().getBoundingBox() : shape.getBoundingBox();
            toDraw = toDraw.offset(pos);
-            IRenderer.drawAABB(stack, toDraw, .002D);
+            IRenderer.drawAABB(toDraw, .002D);
        });

        IRenderer.endLines(settings.renderSelectionBoxesIgnoreDepth.value);
    }

-    public static void drawDankLitGoalBox(MatrixStack stack, Entity player, Goal goal, float partialTicks, Color color) {
+    public static void drawDankLitGoalBox(Entity player, Goal goal, float partialTicks, Color color) {
        double renderPosX = posX();
        double renderPosY = posY();
        double renderPosZ = posZ();
@@ -251,32 +247,27 @@ public final class PathRenderer implements IRenderer, Helper {

                Helper.mc.getTextureManager().bindTexture(TEXTURE_BEACON_BEAM);
                if (settings.renderGoalIgnoreDepth.value) {
-                    RenderSystem.disableDepthTest();
+                    GlStateManager.disableDepthTest();
                }

-                stack.push(); // push
-                stack.translate(goalPos.getX() - renderPosX, -renderPosY, goalPos.getZ() - renderPosZ); // translate
-
                BeaconTileEntityRenderer.renderBeamSegment(
-                        stack,
-                        mc.getRenderTypeBuffers().getBufferSource(),
-                        TEXTURE_BEACON_BEAM,
+                        goalPos.getX() - renderPosX,
+                        -renderPosY,
+                        goalPos.getZ() - renderPosZ,
                        partialTicks,
-                        1.0F,
+                        1.0,
                        player.world.getGameTime(),
                        0,
                        256,
                        color.getColorComponents(null),

                        // Arguments filled by the private method lol
-                        0.2F,
-                        0.25F
+                        0.2D,
+                        0.25D
                );

-                stack.pop(); // pop
-
                if (settings.renderGoalIgnoreDepth.value) {
-                    RenderSystem.enableDepthTest();
+                    GlStateManager.enableDepthTest();
                }

                glPopAttrib();
@@ -294,18 +285,18 @@ public final class PathRenderer implements IRenderer, Helper {
            maxY = 256 - renderPosY;
        } else if (goal instanceof GoalComposite) {
            for (Goal g : ((GoalComposite) goal).goals()) {
-                drawDankLitGoalBox(stack, player, g, partialTicks, color);
+                drawDankLitGoalBox(player, g, partialTicks, color);
            }
            return;
        } else if (goal instanceof GoalInverted) {
-            drawDankLitGoalBox(stack, player, ((GoalInverted) goal).origin, partialTicks, settings.colorInvertedGoalBox.value);
+            drawDankLitGoalBox(player, ((GoalInverted) goal).origin, partialTicks, settings.colorInvertedGoalBox.value);
            return;
        } else if (goal instanceof GoalYLevel) {
            GoalYLevel goalpos = (GoalYLevel) goal;
-            minX = player.getPositionVec().x - settings.yLevelBoxSize.value - renderPosX;
-            minZ = player.getPositionVec().z - settings.yLevelBoxSize.value - renderPosZ;
-            maxX = player.getPositionVec().x + settings.yLevelBoxSize.value - renderPosX;
-            maxZ = player.getPositionVec().z + settings.yLevelBoxSize.value - renderPosZ;
+            minX = player.posX - settings.yLevelBoxSize.value - renderPosX;
+            minZ = player.posZ - settings.yLevelBoxSize.value - renderPosZ;
+            maxX = player.posX + settings.yLevelBoxSize.value - renderPosX;
+            maxZ = player.posZ + settings.yLevelBoxSize.value - renderPosZ;
            minY = ((GoalYLevel) goal).level - renderPosY;
            maxY = minY + 2;
            y1 = 1 + y + goalpos.level - renderPosY;
@@ -316,32 +307,31 @@ public final class PathRenderer implements IRenderer, Helper {

        IRenderer.startLines(color, settings.goalRenderLineWidthPixels.value, settings.renderGoalIgnoreDepth.value);

-        renderHorizontalQuad(stack, minX, maxX, minZ, maxZ, y1);
-        renderHorizontalQuad(stack, minX, maxX, minZ, maxZ, y2);
+        renderHorizontalQuad(minX, maxX, minZ, maxZ, y1);
+        renderHorizontalQuad(minX, maxX, minZ, maxZ, y2);
+

-        Matrix4f matrix4f = stack.getLast().getMatrix();
        buffer.begin(GL_LINES, DefaultVertexFormats.POSITION);
-        buffer.pos(matrix4f, (float) minX, (float) minY, (float) minZ).endVertex();
-        buffer.pos(matrix4f, (float) minX, (float) maxY, (float) minZ).endVertex();
-        buffer.pos(matrix4f, (float) maxX, (float) minY, (float) minZ).endVertex();
-        buffer.pos(matrix4f, (float) maxX, (float) maxY, (float) minZ).endVertex();
-        buffer.pos(matrix4f, (float) maxX, (float) minY, (float) maxZ).endVertex();
-        buffer.pos(matrix4f, (float) maxX, (float) maxY, (float) maxZ).endVertex();
-        buffer.pos(matrix4f, (float) minX, (float) minY, (float) maxZ).endVertex();
-        buffer.pos(matrix4f, (float) minX, (float) maxY, (float) maxZ).endVertex();
+        buffer.pos(minX, minY, minZ).endVertex();
+        buffer.pos(minX, maxY, minZ).endVertex();
+        buffer.pos(maxX, minY, minZ).endVertex();
+        buffer.pos(maxX, maxY, minZ).endVertex();
+        buffer.pos(maxX, minY, maxZ).endVertex();
+        buffer.pos(maxX, maxY, maxZ).endVertex();
+        buffer.pos(minX, minY, maxZ).endVertex();
+        buffer.pos(minX, maxY, maxZ).endVertex();
        tessellator.draw();

        IRenderer.endLines(settings.renderGoalIgnoreDepth.value);
    }

-    private static void renderHorizontalQuad(MatrixStack stack, double minX, double maxX, double minZ, double maxZ, double y) {
+    private static void renderHorizontalQuad(double minX, double maxX, double minZ, double maxZ, double y) {
        if (y != 0) {
-            Matrix4f matrix4f = stack.getLast().getMatrix();
            buffer.begin(GL_LINE_LOOP, DefaultVertexFormats.POSITION);
-            buffer.pos(matrix4f, (float) minX, (float) y, (float) minZ).endVertex();
-            buffer.pos(matrix4f, (float) maxX, (float) y, (float) minZ).endVertex();
-            buffer.pos(matrix4f, (float) maxX, (float) y, (float) maxZ).endVertex();
-            buffer.pos(matrix4f, (float) minX, (float) y, (float) maxZ).endVertex();
+            buffer.pos(minX, y, minZ).endVertex();
+            buffer.pos(maxX, y, minZ).endVertex();
+            buffer.pos(maxX, y, maxZ).endVertex();
+            buffer.pos(minX, y, maxZ).endVertex();
            tessellator.draw();
        }
    }
--- a/src/main/java/baritone/utils/PlayerMovementInput.java
+++ b/src/main/java/baritone/utils/PlayerMovementInput.java
@@ -29,11 +29,11 @@ public class PlayerMovementInput extends MovementInput {
    }

    @Override
-    public void func_225607_a_(boolean p_225607_1_) {
+    public void tick(boolean p_217607_1_, boolean p_217607_2_) {
        this.moveStrafe = 0.0F;
        this.moveForward = 0.0F;

-        this.jump = handler.isInputForcedDown(Input.JUMP); // oppa gangnam style
+        jump = handler.isInputForcedDown(Input.JUMP); // oppa gangnam style

        if (this.forwardKeyDown = handler.isInputForcedDown(Input.MOVE_FORWARD)) {
            this.moveForward++;
@@ -51,7 +51,7 @@ public class PlayerMovementInput extends MovementInput {
            this.moveStrafe--;
        }

-        if (this.sneaking = handler.isInputForcedDown(Input.SNEAK)) {
+        if (this.sneak = handler.isInputForcedDown(Input.SNEAK)) {
            this.moveStrafe *= 0.3D;
            this.moveForward *= 0.3D;
        }
--- a/src/main/java/baritone/utils/accessor/IBlockStateContainer.java
+++ b/src/main/java/baritone/utils/accessor/IBlockStateContainer.java
@@ -19,7 +19,7 @@ package baritone.utils.accessor;

 import net.minecraft.block.BlockState;

-public interface IPalettedContainer {
+public interface IBlockStateContainer {

    BlockState getAtPalette(int index);

--- a/src/main/java/baritone/utils/schematic/format/defaults/MCEditSchematic.java
+++ b/src/main/java/baritone/utils/schematic/format/defaults/MCEditSchematic.java
@@ -70,4 +70,4 @@ public final class MCEditSchematic extends StaticSchematic {
            }
        }
    }
-}
+}
--- a/src/main/resources/META-INF/services/baritone.api.IBaritoneProvider
+++ b/src/main/resources/META-INF/services/baritone.api.IBaritoneProvider
@@ -0,0 +1 @@
+baritone.BaritoneProvider