v1.6.4

Merge master into 1.16.5

.github/workflows/gradle_build.yml

@@ -13,12 +13,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up JDK 8
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: '8'
-        distribution: 'adopt'
+        distribution: 'temurin'
         
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
@@ -26,14 +26,20 @@ jobs:
     - name: Build with Gradle
       run: ./gradlew build
       
+    - name: Build (fabric) with Gradle
+      run: ./gradlew build -Pbaritone.fabric_build
+
+    - name: Build (forge) with Gradle
+      run: ./gradlew build -Pbaritone.forge_build
+
     - name: Archive Artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: Artifacts
         path: dist/
         
     - name: Archive mapping.txt
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: Mappings
         path: build/tmp/proguard/mapping.txt

.github/workflows/run_tests.yml

@@ -11,12 +11,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 9
-      uses: actions/setup-java@v2
+    - uses: actions/checkout@v3
+    - name: Set up JDK 8
+      uses: actions/setup-java@v3
       with:
         java-version: '8'
-        distribution: 'adopt'
+        distribution: 'temurin'
         
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew

.gitignore

@@ -4,6 +4,7 @@
 run/
 autotest/
 dist/
+volderyarn/
 
 # Gradle
 build/
@@ -11,6 +12,8 @@ build/
 classes/
 *.class
 
+/out
+
 # IntelliJ Files
 .idea/
 *.iml

.gitlab-ci.yml

@@ -0,0 +1,14 @@
+image: java:8
+
+before_script:
+  - which java
+  - which javac
+
+build:
+  script:
+    - ./gradlew build
+    - ./gradlew build -Pbaritone.forge_build
+  artifacts:
+    paths:
+      - dist/*
+    expire_in: 1 week

Dockerfile

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

README.md

@@ -54,7 +54,9 @@ Baritone is the pathfinding system used in [Impact](https://impactclient.net/) s
 
 [Tutorial playlist](https://www.youtube.com/playlist?list=PLnwnJ1qsS7CoQl9Si-RTluuzCo_4Oulpa)
 
-The easiest way to install Baritone is to install [Impact](https://impactclient.net/), which comes with Baritone. The second easiest way (for 1.12.2 only) is to install the v1.2.* `api-forge` jar from [releases](https://github.com/cabaletta/baritone/releases). **For 1.12.2 Forge, just click [here](https://github.com/cabaletta/baritone/releases/download/v1.2.15/baritone-api-forge-1.2.15.jar)**. Otherwise, see [Installation & setup](SETUP.md). Once Baritone is installed, look [here](USAGE.md) for instructions on how to use it.
+The easiest way to install Baritone is to install [Impact](https://impactclient.net/), which comes with Baritone. The second easiest way (for 1.12.2 only) is to 
+install the v1.2.* `api-forge` jar from [releases](https://github.com/cabaletta/baritone/releases). **For 1.12.2 Forge, just click 
+[here](https://github.com/cabaletta/baritone/releases/download/v1.2.17/baritone-api-forge-1.2.17.jar)**. Otherwise, see [Installation & setup](SETUP.md). Once Baritone is installed, look [here](USAGE.md) for instructions on how to use it.
 
 For 1.16.5, [click here](https://www.youtube.com/watch?v=_4eVJ9Qz2J8) and see description. If you need Forge or Fabric 1.16.5, look [here](https://github.com/cabaletta/baritone/releases/tag/v1.6.3) and get the `api-forge` or `api-fabric` jar. **For 1.16.5 Fabric, just click [here](https://github.com/cabaletta/baritone/releases/download/v1.6.3/baritone-api-fabric-1.6.3.jar)**.
 

build.gradle

@@ -16,7 +16,7 @@
  */
 
 group 'baritone'
-version '1.2.15'
+version '1.6.4'
 
 buildscript {
     repositories {
@@ -25,26 +25,49 @@ buildscript {
             url = 'http://files.minecraftforge.net/maven'
         }
         maven {
-            name = 'SpongePowered'
-            url = 'https://repo.spongepowered.org/repository/maven-public/'
+            name = 'impactdevelopment-repo'
+            url = 'https://impactdevelopment.github.io/maven/'
         }
+        maven {
+            url = 'https://www.dogforce-games.com/maven/'
+        }
+        maven {
+            url = 'https://maven.fabricmc.net/'
+        }
+        maven {
+            url = 'https://libraries.minecraft.net/'
+        }
+        mavenCentral()
         jcenter()
     }
 
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
-        classpath 'org.spongepowered:mixingradle:0.6-SNAPSHOT'
+        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'
 apply plugin: 'maven'
-apply plugin: 'net.minecraftforge.gradle.tweaker-client'
-apply plugin: 'org.spongepowered.mixin'
+
+def mcpVersion = [channel: 'snapshot', version: '20201028-1.16.3']
+
+if (getProject().hasProperty("baritone.fabric_build")) {
+    CreateVolderYarn.genMappings("1.16.5", mcpVersion)
+    apply plugin: 'fabric-loom'
+} else {
+    apply plugin: 'net.minecraftforge.gradle'
+    apply plugin: 'org.spongepowered.mixin'
+}
+
 
 sourceCompatibility = targetCompatibility = '1.8'
 compileJava {
@@ -52,9 +75,21 @@ compileJava {
     options.encoding = "UTF-8" // allow emoji in comments :^)
 }
 
+
 sourceSets {
+    api {
+        compileClasspath += main.compileClasspath
+    }
+    main {
+        compileClasspath += api.output
+    }
+    test {
+        compileClasspath += main.compileClasspath + main.runtimeClasspath + main.output
+        runtimeClasspath += main.compileClasspath + main.runtimeClasspath + main.output
+    }
     launch {
         compileClasspath += main.compileClasspath + main.runtimeClasspath + main.output
+        runtimeClasspath += main.compileClasspath + main.runtimeClasspath + main.output
     }
 
     schematica_api {
@@ -66,46 +101,114 @@ sourceSets {
     }
 }
 
-minecraft {
-    version = '1.12.2'
-    mappings = 'stable_39'
-    tweakClass = 'baritone.launch.BaritoneTweaker'
-    runDir = 'run'
+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
 
-    // The sources jar should use SRG names not MCP to ensure compatibility with all mappings
-    makeObfSourceJar = true
+        if (getProject().hasProperty("baritone.forge_build")) {
+            reobfMappings 'searge'
+        } else {
+            reobfMappings 'notch'
+        }
+
+        runs {
+            client {
+                workingDirectory project.file('run')
+                source sourceSets.launch
+
+                main 'baritone.launch.LaunchTesting'
+
+                environment 'assetIndex', '{asset_index}'
+                environment 'assetDirectory', downloadAssets.output
+                environment 'nativesDirectory', extractNatives.output
+
+                environment 'tweakClass', 'baritone.launch.BaritoneTweaker'
+
+                if (Os.isFamily(Os.FAMILY_MAC)) {
+                    jvmArgs "-XstartOnFirstThread"
+                }
+            }
+
+            autoTest {
+                workingDirectory project.file('autotest')
+                source sourceSets.launch
+
+                main 'baritone.launch.LaunchTesting'
+
+                environment 'assetIndex', '{asset_index}'
+                environment 'assetDirectory', downloadAssets.output
+                environment 'nativesDirectory', extractNatives.output
+
+                environment 'tweakClass', 'baritone.launch.BaritoneTweaker'
+                environment 'BARITONE_AUTO_TEST', 'true'
+
+                if (Os.isFamily(Os.FAMILY_MAC)) {
+                    jvmArgs "-XstartOnFirstThread"
+                }
+            }
+        }
+    }
+
+    mixin {
+        defaultObfuscationEnv searge
+        add sourceSets.launch, 'mixins.baritone.refmap.json'
+    }
 }
 
 repositories {
     mavenCentral()
 
     maven {
-        name = 'spongepowered-repo'
+        name = 'SpongePowered'
         url = 'https://repo.spongepowered.org/repository/maven-public/'
     }
-
     maven {
         name = 'impactdevelopment-repo'
         url = 'https://impactdevelopment.github.io/maven/'
     }
+    maven {
+        url = 'https://www.dogforce-games.com/maven/'
+    }
 }
 
 dependencies {
-    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'
-}
+    if (getProject().hasProperty("baritone.fabric_build")) {
+        minecraft "com.mojang:minecraft:1.16.5"
+        mappings fileTree(dir: "./build/volderyarn", include: "**.jar")
+        modImplementation "net.fabricmc:fabric-loader:0.9.1+build.205"
 
-mixin {
-    defaultObfuscationEnv searge
-    add sourceSets.launch, 'mixins.baritone.refmap.json'
+        // this makes it compile with the forge tweak stuff
+        implementation 'com.github.ImpactDevelopment:SimpleTweaker:1.2'
+        implementation('net.minecraft:launchwrapper:1.12') {
+            exclude module: 'lwjgl'
+        }
+
+        implementation 'com.google.code.findbugs:jsr305:3.0.2'
+    } else {
+        minecraft 'com.github.ImpactDevelopment:Vanilla:1.16.5'
+
+        runtime launchCompile('net.minecraft:launchwrapper:1.12') {
+            exclude module: 'lwjgl'
+        }
+        runtime launchCompile('org.ow2.asm:asm-debug-all:5.2')
+        runtime launchCompile('com.github.ImpactDevelopment:SimpleTweaker:1.2')
+        runtime launchCompile('org.spongepowered:mixin:0.8.3') {
+            // Mixin includes a lot of dependencies that are too up-to-date
+            exclude module: 'launchwrapper'
+            exclude module: 'guava'
+            exclude module: 'gson'
+            exclude module: 'commons-io'
+            exclude module: 'log4j-core'
+        }
+    }
+
+    testImplementation 'junit:junit:4.12'
 }
 
 javadoc {
@@ -116,6 +219,25 @@ 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
 
@@ -127,23 +249,93 @@ 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,
         )
     }
 }
 
-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'
+// 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 createDist(type: CreateDistTask, dependsOn: proguard)
+File getClientJarFabric() {
+    return project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("launch").getRuntimeClasspath().getFiles()
+            .stream()
+            .filter({ f -> f.getName().endsWith("-v2.jar") && f.getName().startsWith("minecraft-") })
+            .map({ f -> new File(f.getParentFile().getParentFile(), f.getName().toString().replace("mapped", "intermediary")) })
+            .findFirst()
+            .get()
+}
 
+if (getProject().hasProperty("baritone.fabric_build")) {
+    task copyMcJar(type: Copy) {
+        def mcJar = { getClientJarFabric() }
+
+        from mcJar
+        into 'build/createMcIntermediaryJar/'
+        rename { 'client.jar' }
+    }
+
+    task proguard(type: ProguardTask, dependsOn: copyMcJar) {
+        url 'https://downloads.sourceforge.net/project/proguard/proguard/6.0/proguard6.0.3.zip'
+        extract 'proguard6.0.3/lib/proguard.jar'
+    }
+
+    task createDist(type: CreateDistTask, dependsOn: proguard)
+
+} else {
+    task copyMcJar(type: Copy) {
+        def mcJar = { getClientJar() }
+
+        from mcJar
+        into 'build/createMcSrgJar/'
+        rename { 'client-srg.jar' }
+    }
+
+    task createSrgMc(type: RenameJarInPlace) {
+        setInput(new File(copyMcJar.getOutputs().getFiles().getSingleFile(), "client-srg.jar"))
+        setClasspath(files({ getClientJar() }))
+
+        // fork
+        setMappingType(net.minecraftforge.gradle.common.util.MappingFile.Mapping.SEARGE)
+        setJarTask('trans alaska pipeline')
+    }
+
+    project.afterEvaluate {
+        createSrgMc.dependsOn(extractSrg, copyMcJar)
+        createSrgMc.setMappings(extractSrg.getOutput())
+    }
+
+
+    task proguard(type: ProguardTask, dependsOn: createSrgMc) { // TODO: dont need to create srg mc if doing notch build
+        url 'https://downloads.sourceforge.net/project/proguard/proguard/6.0/proguard6.0.3.zip'
+        extract 'proguard6.0.3/lib/proguard.jar'
+    }
+
+    task createDist(type: CreateDistTask, dependsOn: proguard)
+
+}
 build.finalizedBy(createDist)
 
 install {

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

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

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

@@ -20,6 +20,7 @@ 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;
@@ -40,37 +41,53 @@ class BaritoneGradleTask extends DefaultTask {
             PROGUARD_STANDALONE_CONFIG      = "standalone.pro",
             PROGUARD_EXPORT_PATH            = "proguard_out.jar",
 
-            TEMP_LIBRARY_DIR = "tempLibraries/",
-
-            ARTIFACT_STANDARD         = "%s-%s.jar",
-            ARTIFACT_UNOPTIMIZED      = "%s-unoptimized-%s.jar",
-            ARTIFACT_API              = "%s-api-%s.jar",
-            ARTIFACT_STANDALONE       = "%s-standalone-%s.jar",
-            ARTIFACT_FORGE_API        = "%s-api-forge-%s.jar",
-            ARTIFACT_FORGE_STANDALONE = "%s-standalone-forge-%s.jar";
+            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";
 
     protected String artifactName, artifactVersion;
-    protected Path artifactPath, artifactUnoptimizedPath, artifactApiPath, artifactStandalonePath, artifactForgeApiPath, artifactForgeStandalonePath, proguardOut;
+    protected final Path
+        artifactPath,
+        artifactUnoptimizedPath, artifactApiPath, artifactStandalonePath, // these are different for forge builds
+        proguardOut;
 
-    protected void verifyArtifacts() throws IllegalStateException {
+    public BaritoneGradleTask() {
         this.artifactName = getProject().getName();
         this.artifactVersion = getProject().getVersion().toString();
 
-        this.artifactPath                = this.getBuildFile(formatVersion(ARTIFACT_STANDARD));
-        this.artifactUnoptimizedPath     = this.getBuildFile(formatVersion(ARTIFACT_UNOPTIMIZED));
-        this.artifactApiPath             = this.getBuildFile(formatVersion(ARTIFACT_API));
-        this.artifactStandalonePath      = this.getBuildFile(formatVersion(ARTIFACT_STANDALONE));
-        this.artifactForgeApiPath        = this.getBuildFile(formatVersion(ARTIFACT_FORGE_API));
-        this.artifactForgeStandalonePath = this.getBuildFile(formatVersion(ARTIFACT_FORGE_STANDALONE));
+        this.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.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 Exception {
+    protected void write(InputStream stream, Path file) throws IOException {
         if (Files.exists(file)) {
             Files.delete(file);
         }

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,11 +42,9 @@ public class CreateDistTask extends BaritoneGradleTask {
         super.verifyArtifacts();
 
         // Define the distribution file paths
-        Path api             = getRelativeFile("dist/" + formatVersion(ARTIFACT_API));
-        Path standalone      = getRelativeFile("dist/" + formatVersion(ARTIFACT_STANDALONE));
-        Path unoptimized     = getRelativeFile("dist/" + formatVersion(ARTIFACT_UNOPTIMIZED));
-        Path forgeApi        = getRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_API));
-        Path forgeStandalone = getRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_STANDALONE));
+        Path api = getRelativeFile("dist/" + getFileName(artifactApiPath));
+        Path standalone = getRelativeFile("dist/" + getFileName(artifactStandalonePath));
+        Path unoptimized = getRelativeFile("dist/" + getFileName(artifactUnoptimizedPath));
 
         // NIO will not automatically create directories
         Path dir = getRelativeFile("dist/");
@@ -55,14 +53,14 @@ public class CreateDistTask extends BaritoneGradleTask {
         }
 
         // Copy build jars to dist/
-        Files.copy(this.artifactApiPath,             api,             REPLACE_EXISTING);
-        Files.copy(this.artifactStandalonePath,      standalone,      REPLACE_EXISTING);
-        Files.copy(this.artifactUnoptimizedPath,     unoptimized,     REPLACE_EXISTING);
-        Files.copy(this.artifactForgeApiPath,        forgeApi,        REPLACE_EXISTING);
-        Files.copy(this.artifactForgeStandalonePath, forgeStandalone, REPLACE_EXISTING);
+        // 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);
 
         // Calculate all checksums and format them like "shasum"
-        List<String> shasum = Stream.of(api, forgeApi, standalone, forgeStandalone, unoptimized)
+        List<String> shasum = getAllDistJars().stream()
+                .filter(Files::exists)
                 .map(path -> sha1(path) + "  " + path.getFileName().toString())
                 .collect(Collectors.toList());
 
@@ -72,6 +70,24 @@ 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) {

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

@@ -18,9 +18,10 @@
 package baritone.gradle.task;
 
 import baritone.gradle.util.Determinizer;
-import baritone.gradle.util.MappingType;
-import baritone.gradle.util.ReobfWrapper;
 import org.apache.commons.io.IOUtils;
+import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.tasks.Input;
+import org.gradle.api.tasks.TaskAction;
 import org.gradle.api.JavaVersion;
 import org.gradle.api.NamedDomainObjectContainer;
 import org.gradle.api.artifacts.Configuration;
@@ -38,14 +39,12 @@ import org.gradle.internal.jvm.inspection.DefaultJvmVersionDetector;
 import org.gradle.process.internal.DefaultExecActionFactory;
 
 import java.io.*;
-import java.lang.reflect.Field;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
@@ -57,18 +56,12 @@ import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
  */
 public class ProguardTask extends BaritoneGradleTask {
 
-    private static final Pattern TEMP_LIBRARY_PATTERN = Pattern.compile("-libraryjars 'tempLibraries\\/([a-zA-Z0-9/_\\-\\.]+)\\.jar'");
-
     @Input
     private String url;
 
     @Input
     private String extract;
 
-    private List<String> requiredLibraries;
-
-    private File mixin;
-
     @TaskAction
     protected void exec() throws Exception {
         super.verifyArtifacts();
@@ -78,7 +71,6 @@ public class ProguardTask extends BaritoneGradleTask {
         downloadProguard();
         extractProguard();
         generateConfigs();
-        acquireDependencies();
         proguardApi();
         proguardStandalone();
         cleanup();
@@ -89,7 +81,7 @@ public class ProguardTask extends BaritoneGradleTask {
             Files.delete(this.artifactUnoptimizedPath);
         }
 
-        Determinizer.determinize(this.artifactPath.toString(), this.artifactUnoptimizedPath.toString(), Optional.empty());
+        Determinizer.determinize(this.artifactPath.toString(), this.artifactUnoptimizedPath.toString());
     }
 
     private void downloadProguard() throws Exception {
@@ -209,14 +201,39 @@ public class ProguardTask extends BaritoneGradleTask {
 
         // Setup the template that will be used to derive the API and Standalone configs
         List<String> template = Files.readAllLines(getTemporaryFile(PROGUARD_CONFIG_DEST));
-        template.add(0, "-injars " + this.artifactPath.toString());
-        template.add(1, "-outjars " + this.getTemporaryFile(PROGUARD_EXPORT_PATH));
+        template.add(0, "-injars '" + this.artifactPath.toString() + "'");
+        template.add(1, "-outjars '" + this.getTemporaryFile(PROGUARD_EXPORT_PATH) + "'");
 
         // Acquire the RT jar using "java -verbose". This doesn't work on Java 9+
         Process p = new ProcessBuilder(this.getJavaBinPathForProguard(), "-verbose").start();
         String out = IOUtils.toString(p.getInputStream(), "UTF-8").split("\n")[0].split("Opened ")[1].replace("]", "");
         template.add(2, "-libraryjars '" + out + "'");
 
+        {
+            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;
+                }
+            }
+            libraries.forEach(f -> {
+                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);
 
@@ -224,165 +241,26 @@ public class ProguardTask extends BaritoneGradleTask {
         List<String> standalone = new ArrayList<>(template);
         standalone.removeIf(s -> s.contains("# this is the keep api"));
         Files.write(getTemporaryFile(PROGUARD_STANDALONE_CONFIG), standalone);
-
-        // Discover all of the libraries that we will need to acquire from gradle
-        this.requiredLibraries = new ArrayList<>();
-        template.forEach(line -> {
-            if (!line.startsWith("#")) {
-                Matcher m = TEMP_LIBRARY_PATTERN.matcher(line);
-                if (m.find()) {
-                    this.requiredLibraries.add(m.group(1));
-                }
-            }
-        });
     }
 
-    private void acquireDependencies() throws Exception {
-
-        // Create a map of all of the dependencies that we are able to access in this project
-        // Likely a better way to do this, I just pair the dependency with the first valid configuration
-        Map<String, Pair<Configuration, Dependency>> dependencyLookupMap = new HashMap<>();
-        getProject().getConfigurations().stream().filter(Configuration::isCanBeResolved).forEach(config ->
-                config.getAllDependencies().forEach(dependency ->
-                        dependencyLookupMap.putIfAbsent(dependency.getName() + "-" + dependency.getVersion(), Pair.of(config, dependency))));
-
-        // Create the directory if it doesn't already exist
-        Path tempLibraries = getTemporaryFile(TEMP_LIBRARY_DIR);
-        if (!Files.exists(tempLibraries)) {
-            Files.createDirectory(tempLibraries);
-        }
-
-        // Iterate the required libraries to copy them to tempLibraries
-        for (String lib : this.requiredLibraries) {
-            // copy from the forgegradle cache
-            if (lib.equals("minecraft")) {
-                Path cachedJar = getMinecraftJar();
-                Path inTempDir = getTemporaryFile("tempLibraries/minecraft.jar");
-                // TODO: maybe try not to copy every time
-                Files.copy(cachedJar, inTempDir, REPLACE_EXISTING);
-
-                continue;
-            }
-
-            // Find a configuration/dependency pair that matches the desired library
-            Pair<Configuration, Dependency> pair = null;
-            for (Map.Entry<String, Pair<Configuration, Dependency>> entry : dependencyLookupMap.entrySet()) {
-                if (entry.getKey().startsWith(lib)) {
-                    pair = entry.getValue();
-                }
-            }
-
-            // The pair must be non-null
-            Objects.requireNonNull(pair);
-
-            // Find the library jar file, and copy it to tempLibraries
-            for (File file : pair.getLeft().files(pair.getRight())) {
-                if (file.getName().startsWith(lib)) {
-                    if (lib.contains("mixin")) {
-                        mixin = file;
-                    }
-                    Files.copy(file.toPath(), getTemporaryFile("tempLibraries/" + lib + ".jar"), REPLACE_EXISTING);
-                }
-            }
-        }
-        if (mixin == null) {
-            throw new IllegalStateException("Unable to find mixin jar");
-        }
+    private File getSrgMcJar() {
+        return getProject().getTasks().findByName("copyMcJar").getOutputs().getFiles().getSingleFile();
     }
 
-    // a bunch of epic stuff to get the path to the cached jar
-    private Path getMinecraftJar() throws Exception {
-        MappingType mappingType;
-        try {
-            mappingType = getMappingType();
-        } catch (Exception e) {
-            System.err.println("Failed to get mapping type, assuming NOTCH.");
-            mappingType = MappingType.NOTCH;
-        }
-
-        String suffix;
-        switch (mappingType) {
-            case NOTCH:
-                suffix = "";
-                break;
-            case SEARGE:
-                suffix = "-srgBin";
-                break;
-            case CUSTOM:
-                throw new IllegalStateException("Custom mappings not supported!");
-            default:
-                throw new IllegalStateException("Unknown mapping type: " + mappingType);
-        }
-
-        DefaultConvention convention = (DefaultConvention) this.getProject().getConvention();
-        Object extension = convention.getAsMap().get("minecraft");
-        Objects.requireNonNull(extension);
-
-        // for some reason cant use Class.forName
-        Class<?> class_baseExtension = extension.getClass().getSuperclass().getSuperclass().getSuperclass(); // <-- cursed
-        Field f_replacer = class_baseExtension.getDeclaredField("replacer");
-        f_replacer.setAccessible(true);
-        Object replacer = f_replacer.get(extension);
-        Class<?> class_replacementProvider = replacer.getClass();
-        Field replacement_replaceMap = class_replacementProvider.getDeclaredField("replaceMap");
-        replacement_replaceMap.setAccessible(true);
-
-        Map<String, Object> replacements = (Map) replacement_replaceMap.get(replacer);
-        String cacheDir = replacements.get("CACHE_DIR").toString() + "/net/minecraft";
-        String mcVersion = replacements.get("MC_VERSION").toString();
-        String mcpInsert = replacements.get("MAPPING_CHANNEL").toString() + "/" + replacements.get("MAPPING_VERSION").toString();
-        String fullJarName = "minecraft-" + mcVersion + suffix + ".jar";
-
-        String baseDir = String.format("%s/minecraft/%s/", cacheDir, mcVersion);
-
-        String jarPath;
-        if (mappingType == MappingType.SEARGE) {
-            jarPath = String.format("%s/%s/%s", baseDir, mcpInsert, fullJarName);
-        } else {
-            jarPath = baseDir + fullJarName;
-        }
-        jarPath = jarPath
-                .replace("/", File.separator)
-                .replace("\\", File.separator); // hecking regex
-
-        return new File(jarPath).toPath();
-    }
-
-    // throws IllegalStateException if mapping type is ambiguous or it fails to find it
-    private MappingType getMappingType() {
-        // if it fails to find this then its probably a forgegradle version problem
-        Set<Object> reobf = (NamedDomainObjectContainer<Object>) this.getProject().getExtensions().getByName("reobf");
-
-        List<MappingType> mappingTypes = getUsedMappingTypes(reobf);
-        long mappingTypesUsed = mappingTypes.size();
-        if (mappingTypesUsed == 0) {
-            throw new IllegalStateException("Failed to find mapping type (no jar task?)");
-        }
-        if (mappingTypesUsed > 1) {
-            throw new IllegalStateException("Ambiguous mapping type (multiple jars with different mapping types?)");
-        }
-
-        return mappingTypes.get(0);
-    }
-
-    private List<MappingType> getUsedMappingTypes(Set<Object> reobf) {
-        return reobf.stream()
-                .map(ReobfWrapper::new)
-                .map(ReobfWrapper::getMappingType)
-                .distinct()
-                .collect(Collectors.toList());
+    private Stream<File> acquireDependencies() {
+        return getProject().getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("launch").getRuntimeClasspath().getFiles()
+            .stream()
+            .filter(File::isFile);
     }
 
     private void proguardApi() throws Exception {
         runProguard(getTemporaryFile(PROGUARD_API_CONFIG));
-        Determinizer.determinize(this.proguardOut.toString(), this.artifactApiPath.toString(), Optional.empty());
-        Determinizer.determinize(this.proguardOut.toString(), this.artifactForgeApiPath.toString(), Optional.of(mixin));
+        Determinizer.determinize(this.proguardOut.toString(), this.artifactApiPath.toString());
     }
 
     private void proguardStandalone() throws Exception {
         runProguard(getTemporaryFile(PROGUARD_STANDALONE_CONFIG));
-        Determinizer.determinize(this.proguardOut.toString(), this.artifactStandalonePath.toString(), Optional.empty());
-        Determinizer.determinize(this.proguardOut.toString(), this.artifactForgeStandalonePath.toString(), Optional.of(mixin));
+        Determinizer.determinize(this.proguardOut.toString(), this.artifactStandalonePath.toString());
     }
 
     private void cleanup() {
@@ -405,9 +283,15 @@ public class ProguardTask extends BaritoneGradleTask {
             Files.delete(this.proguardOut);
         }
 
-        Path proguardJar = getTemporaryFile(PROGUARD_JAR);
+        // Make paths relative to work directory; fixes spaces in path to config, @"" doesn't work
+        Path workingDirectory = getTemporaryFile("");
+        Path proguardJar = workingDirectory.relativize(getTemporaryFile(PROGUARD_JAR));
+        config = workingDirectory.relativize(config);
+        
+        // Honestly, if you still have spaces in your path at this point, you're SOL.
+
         Process p = new ProcessBuilder("java", "-jar", proguardJar.toString(), "@" + config.toString())
-                .directory(getTemporaryFile("").toFile()) // Set the working directory to the temporary folder]
+                .directory(workingDirectory.toFile()) // Set the working directory to the temporary folder]
                 .start();
 
         // We can't do output inherit process I/O with gradle for some reason and have it work, so we have to do this

buildSrc/src/main/java/baritone/gradle/util/Determinizer.java

@@ -22,7 +22,10 @@ import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 
 import java.io.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.jar.JarOutputStream;
@@ -36,7 +39,7 @@ import java.util.stream.Collectors;
  */
 public class Determinizer {
 
-    public static void determinize(String inputPath, String outputPath, Optional<File> toInclude) throws IOException {
+    public static void determinize(String inputPath, String outputPath) throws IOException {
         System.out.println("Running Determinizer");
         System.out.println(" Input path: " + inputPath);
         System.out.println(" Output path: " + outputPath);
@@ -63,30 +66,10 @@ public class Determinizer {
                 if (entry.getName().endsWith(".refmap.json")) {
                     JsonObject object = new JsonParser().parse(new InputStreamReader(jarFile.getInputStream(entry))).getAsJsonObject();
                     jos.write(writeSorted(object).getBytes());
-                } else if (entry.getName().equals("META-INF/MANIFEST.MF") && toInclude.isPresent()) { // only replace for forge jar
-                    ByteArrayOutputStream cancer = new ByteArrayOutputStream();
-                    copy(jarFile.getInputStream(entry), cancer);
-                    String manifest = new String(cancer.toByteArray());
-                    if (!manifest.contains("baritone.launch.BaritoneTweaker")) {
-                        throw new IllegalStateException("unable to replace");
-                    }
-                    manifest = manifest.replace("baritone.launch.BaritoneTweaker", "org.spongepowered.asm.launch.MixinTweaker");
-                    jos.write(manifest.getBytes());
                 } else {
                     copy(jarFile.getInputStream(entry), jos);
                 }
             }
-            if (toInclude.isPresent()) {
-                try (JarFile mixin = new JarFile(toInclude.get())) {
-                    for (JarEntry entry : mixin.stream().sorted(Comparator.comparing(JarEntry::getName)).collect(Collectors.toList())) {
-                        if (entry.getName().startsWith("META-INF") && !entry.getName().startsWith("META-INF/services")) {
-                            continue;
-                        }
-                        jos.putNextEntry(entry);
-                        copy(mixin.getInputStream(entry), jos);
-                    }
-                }
-            }
             jos.finish();
         }
     }

buildSrc/src/main/java/baritone/gradle/util/ReobfWrapper.java

@@ -1,63 +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.util;
-
-import java.lang.reflect.Field;
-import java.util.Objects;
-
-/**
- * All credits go to AsmLibGradle and its contributors.
- *
- * @see <a href="https://github.com/pozzed/AsmLibGradle/blob/8f917dbc3939eab7a3d9daf54d9d285fdf34f4b2/src/main/java/net/futureclient/asmlib/forgegradle/ReobfWrapper.java">Original Source</a>
- */
-public class ReobfWrapper {
-
-    private final Object instance;
-    private final Class<?> type;
-
-    public ReobfWrapper(Object instance) {
-        this.instance = instance;
-        Objects.requireNonNull(instance);
-        this.type = instance.getClass();
-    }
-
-    public String getName() {
-        try {
-            Field nameField = type.getDeclaredField("name");
-            nameField.setAccessible(true);
-            return (String) nameField.get(this.instance);
-        } catch (ReflectiveOperationException ex) {
-            throw new IllegalStateException(ex);
-        }
-    }
-
-    public MappingType getMappingType() {
-        try {
-            Field enumField = type.getDeclaredField("mappingType");
-            enumField.setAccessible(true);
-            Enum<?> aEnum = (Enum<?>) enumField.get(this.instance);
-            MappingType mappingType = MappingType.values()[aEnum.ordinal()];
-            if (!aEnum.name().equals(mappingType.name())) {
-                throw new IllegalStateException("ForgeGradle ReobfMappingType is not equivalent to MappingType (version error?)");
-            }
-            return mappingType;
-        } catch (ReflectiveOperationException ex) {
-            throw new IllegalStateException(ex);
-        }
-    }
-}

scripts/proguard.pro

@@ -15,7 +15,12 @@
 
 # lwjgl is weird
 -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
@@ -42,58 +47,10 @@
 
 #try to keep usage of schematica in separate classes
 -keep class baritone.utils.schematic.schematica.**
+-keep class baritone.utils.schematic.litematica.**
 #proguard doesnt like it when it cant find our fake schematica classes
 -dontwarn baritone.utils.schematic.schematica.**
-
-# copy all necessary libraries into tempLibraries to build
-
-# The correct jar will be copied from the forgegradle cache based on the mapping type being compiled with
--libraryjars 'tempLibraries/minecraft.jar'
-
--libraryjars 'tempLibraries/SimpleTweaker-1.2.jar'
-
--libraryjars 'tempLibraries/authlib-1.5.25.jar'
--libraryjars 'tempLibraries/codecjorbis-20101023.jar'
--libraryjars 'tempLibraries/codecwav-20101023.jar'
--libraryjars 'tempLibraries/commons-codec-1.10.jar'
--libraryjars 'tempLibraries/commons-compress-1.8.1.jar'
--libraryjars 'tempLibraries/commons-io-2.5.jar'
--libraryjars 'tempLibraries/commons-lang3-3.5.jar'
--libraryjars 'tempLibraries/commons-logging-1.1.3.jar'
--libraryjars 'tempLibraries/fastutil-7.1.0.jar'
--libraryjars 'tempLibraries/gson-2.8.0.jar'
--libraryjars 'tempLibraries/guava-21.0.jar'
--libraryjars 'tempLibraries/httpclient-4.3.3.jar'
--libraryjars 'tempLibraries/httpcore-4.3.2.jar'
--libraryjars 'tempLibraries/icu4j-core-mojang-51.2.jar'
--libraryjars 'tempLibraries/jinput-2.0.5.jar'
--libraryjars 'tempLibraries/jna-4.4.0.jar'
--libraryjars 'tempLibraries/jopt-simple-5.0.3.jar'
--libraryjars 'tempLibraries/jsr305-3.0.1.jar'
--libraryjars 'tempLibraries/jutils-1.0.0.jar'
--libraryjars 'tempLibraries/libraryjavasound-20101123.jar'
--libraryjars 'tempLibraries/librarylwjglopenal-20100824.jar'
--libraryjars 'tempLibraries/log4j-api-2.8.1.jar'
--libraryjars 'tempLibraries/log4j-core-2.8.1.jar'
-
-# startsWith is used to check the library, and mac/linux differ in which version they use
-# this is FINE
--libraryjars 'tempLibraries/lwjgl-.jar'
--libraryjars 'tempLibraries/lwjgl_util-.jar'
-
--libraryjars 'tempLibraries/netty-all-4.1.9.Final.jar'
--libraryjars 'tempLibraries/oshi-core-1.1.jar'
--libraryjars 'tempLibraries/patchy-1.3.9.jar'
--libraryjars 'tempLibraries/platform-3.4.0.jar'
--libraryjars 'tempLibraries/realms-1.10.22.jar'
--libraryjars 'tempLibraries/soundsystem-20120107.jar'
--libraryjars 'tempLibraries/text2speech-1.10.3.jar'
-
--libraryjars 'tempLibraries/mixin-0.7.11-SNAPSHOT.jar'
--libraryjars 'tempLibraries/launchwrapper-1.11.jar' # TODO why does only 1.11.jar exist?
-
-
-
+-dontwarn baritone.utils.schematic.litematica.**
 
 # Keep - Applications. Keep all application classes, along with their 'main'
 # methods.

src/api/java/baritone/api/BaritoneAPI.java

@@ -19,9 +19,6 @@ 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.
  *
@@ -37,9 +34,11 @@ public final class BaritoneAPI {
         settings = new Settings();
         SettingsUtil.readAndApply(settings);
 
-        ServiceLoader<IBaritoneProvider> baritoneLoader = ServiceLoader.load(IBaritoneProvider.class);
-        Iterator<IBaritoneProvider> instances = baritoneLoader.iterator();
-        provider = instances.next();
+        try {
+            provider = (IBaritoneProvider) Class.forName("baritone.BaritoneProvider").newInstance();
+        } catch (ReflectiveOperationException ex) {
+            throw new RuntimeException(ex);
+        }
     }
 
     public static IBaritoneProvider getProvider() {

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

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

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

@@ -22,10 +22,10 @@ import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.TypeUtils;
 import baritone.api.utils.gui.BaritoneToast;
 import net.minecraft.block.Block;
+import net.minecraft.block.Blocks;
 import net.minecraft.client.Minecraft;
-import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
-import net.minecraft.util.math.Vec3i;
+import net.minecraft.util.math.vector.Vector3i;
 import net.minecraft.util.text.ITextComponent;
 
 import java.awt.*;
@@ -34,8 +34,8 @@ import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.List;
 import java.util.*;
-import java.util.function.Consumer;
 import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 
 /**
  * Baritone's settings. Settings apply to all Baritone instances.
@@ -44,8 +44,6 @@ import java.util.function.BiConsumer;
  */
 public final class Settings {
 
-    public final Setting<Boolean> iUnderstandThatBepWillUnironicallySendMyCoordsInChat = new Setting<>(false);
-
     /**
      * Allow Baritone to break blocks
      */
@@ -109,6 +107,13 @@ public final class Settings {
      */
     public final Setting<Double> walkOnWaterOnePenalty = new Setting<>(3D);
 
+    /**
+     * Don't allow breaking blocks next to liquids.
+     * <p>
+     * Enable if you have mods adding custom fluid physics.
+     */
+    public final Setting<Boolean> strictLiquidCheck = new Setting<>(false);
+
     /**
      * Allow Baritone to fall arbitrary distances and place a water bucket beneath it.
      * Reliability: questionable.
@@ -118,6 +123,8 @@ public final class Settings {
     /**
      * Allow Baritone to assume it can walk on still water just like any other block.
      * This functionality is assumed to be provided by a separate library that might have imported Baritone.
+     * <p>
+     * Note: This will prevent some usage of the frostwalker enchantment, like pillaring up from water.
      */
     public final Setting<Boolean> assumeWalkOnWater = new Setting<>(false);
 
@@ -181,10 +188,10 @@ public final class Settings {
      * Blocks that Baritone is allowed to place (as throwaway, for sneak bridging, pillaring, etc.)
      */
     public final Setting<List<Item>> acceptableThrowawayItems = new Setting<>(new ArrayList<>(Arrays.asList(
-            Item.getItemFromBlock(Blocks.DIRT),
-            Item.getItemFromBlock(Blocks.COBBLESTONE),
-            Item.getItemFromBlock(Blocks.NETHERRACK),
-            Item.getItemFromBlock(Blocks.STONE)
+            Blocks.DIRT.asItem(),
+            Blocks.COBBLESTONE.asItem(),
+            Blocks.NETHERRACK.asItem(),
+            Blocks.STONE.asItem()
     )));
 
     /**
@@ -198,7 +205,7 @@ public final class Settings {
      * Blocks that Baritone is not allowed to break
      */
     public final Setting<List<Block>> blocksToDisallowBreaking = new Setting<>(new ArrayList<>(
-        // Leave Empty by Default
+            // Leave Empty by Default
     ));
 
     /**
@@ -207,11 +214,8 @@ public final class Settings {
     public final Setting<List<Block>> blocksToAvoidBreaking = new Setting<>(new ArrayList<>(Arrays.asList( // TODO can this be a HashSet or ImmutableSet?
             Blocks.CRAFTING_TABLE,
             Blocks.FURNACE,
-            Blocks.LIT_FURNACE,
             Blocks.CHEST,
-            Blocks.TRAPPED_CHEST,
-            Blocks.STANDING_SIGN,
-            Blocks.WALL_SIGN
+            Blocks.TRAPPED_CHEST
     )));
 
     /**
@@ -281,6 +285,12 @@ public final class Settings {
      */
     public final Setting<Boolean> buildIgnoreDirection = new Setting<>(false);
 
+    /**
+     * A list of names of block properties the builder will ignore.
+     */
+    public final Setting<List<String>> buildIgnoreProperties = new Setting<>(new ArrayList<>(Arrays.asList(
+    )));
+
     /**
      * If this setting is true, Baritone will never break a block that is adjacent to an unsupported falling block.
      * <p>
@@ -345,6 +355,11 @@ public final class Settings {
      */
     public final Setting<Integer> rightClickSpeed = new Setting<>(4);
 
+    /**
+     * How many degrees to randomize the yaw every tick. Set to 0 to disable
+     */
+    public final Setting<Double> randomLooking113 = new Setting<>(2d);
+
     /**
      * Block reach distance
      */
@@ -914,12 +929,12 @@ public final class Settings {
     /**
      * Only build the selected part of schematics
      */
-     public final Setting<Boolean> buildOnlySelection = new Setting<>(false);
+    public final Setting<Boolean> buildOnlySelection = new Setting<>(false);
 
     /**
      * How far to move before repeating the build. 0 to disable repeating on a certain axis, 0,0,0 to disable entirely
      */
-    public final Setting<Vec3i> buildRepeat = new Setting<>(new Vec3i(0, 0, 0));
+    public final Setting<Vector3i> buildRepeat = new Setting<>(new Vector3i(0, 0, 0));
 
     /**
      * How many times to buildrepeat. -1 for infinite.
@@ -1126,7 +1141,7 @@ public final class Settings {
      * via {@link Consumer#andThen(Consumer)} or it can completely be overriden via setting
      * {@link Setting#value};
      */
-    public final Setting<Consumer<ITextComponent>> logger = new Setting<>(msg -> Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(msg));
+    public final Setting<Consumer<ITextComponent>> logger = new Setting<>(msg -> Minecraft.getInstance().ingameGUI.getChatGUI().printChatMessage(msg));
 
     /**
      * The function that is called when Baritone will send a desktop notification. This function can be added to
@@ -1142,6 +1157,11 @@ public final class Settings {
      */
     public final Setting<BiConsumer<ITextComponent, ITextComponent>> toaster = new Setting<>(BaritoneToast::addOrUpdate);
 
+    /**
+     * Print out ALL command exceptions as a stack trace to stdout, even simple syntax errors
+     */
+    public final Setting<Boolean> verboseCommandExceptions = new Setting<>(false);
+
     /**
      * The size of the box that is rendered when the current goal is a GoalYLevel
      */

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

@@ -17,7 +17,7 @@
 
 package baritone.api.cache;
 
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 import net.minecraft.util.math.BlockPos;
 
 /**
@@ -26,9 +26,9 @@ import net.minecraft.util.math.BlockPos;
  */
 public interface IBlockTypeAccess {
 
-    IBlockState getBlock(int x, int y, int z);
+    BlockState getBlock(int x, int y, int z);
 
-    default IBlockState getBlock(BlockPos pos) {
+    default BlockState getBlock(BlockPos pos) {
         return getBlock(pos.getX(), pos.getY(), pos.getZ());
     }
 }

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

@@ -27,7 +27,7 @@ import baritone.api.command.exception.CommandInvalidTypeException;
 import baritone.api.command.exception.CommandNotEnoughArgumentsException;
 import baritone.api.command.exception.CommandTooManyArgumentsException;
 import baritone.api.utils.Helper;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 
 import java.util.Deque;
 import java.util.LinkedList;
@@ -404,8 +404,8 @@ public interface IArgConsumer {
     /**
      * Gets an enum value from the enum class with the same name as the next argument's value
      * <p>
-     * For example if you getEnum as an {@link EnumFacing}, and the next argument's value is "up", this will return
-     * {@link EnumFacing#UP}
+     * For example if you getEnum as an {@link Direction}, and the next argument's value is "up", this will return
+     * {@link Direction#UP}
      *
      * @param enumClass The enum class to search
      * @return An enum constant of that class with the same name as the next argument's value
@@ -419,8 +419,8 @@ public interface IArgConsumer {
     /**
      * Gets an enum value from the enum class with the same name as the next argument's value
      * <p>
-     * For example if you getEnum as an {@link EnumFacing}, and the next argument's value is "up", this will return
-     * {@link EnumFacing#UP}
+     * For example if you getEnum as an {@link Direction}, and the next argument's value is "up", this will return
+     * {@link Direction#UP}
      *
      * @param enumClass The enum class to search
      * @param def       The default value
@@ -436,8 +436,8 @@ public interface IArgConsumer {
     /**
      * Gets an enum value from the enum class with the same name as the next argument's value
      * <p>
-     * For example if you getEnum as an {@link EnumFacing}, and the next argument's value is "up", this will return
-     * {@link EnumFacing#UP}
+     * For example if you getEnum as an {@link Direction}, and the next argument's value is "up", this will return
+     * {@link Direction#UP}
      *
      * @param enumClass The enum class to search
      * @return An enum constant of that class with the same name as the next argument's value, or {@code null} if it

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

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

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

@@ -20,8 +20,8 @@ package baritone.api.command.datatypes;
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
 import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.registry.Registry;
 
 import java.util.stream.Stream;
 
@@ -32,7 +32,7 @@ public enum BlockById implements IDatatypeFor<Block> {
     public Block get(IDatatypeContext ctx) throws CommandException {
         ResourceLocation id = new ResourceLocation(ctx.getConsumer().getString());
         Block block;
-        if ((block = Block.REGISTRY.getObject(id)) == Blocks.AIR) {
+        if ((block = Registry.BLOCK.getOptional(id).orElse(null)) == null) {
             throw new IllegalArgumentException("no block found by that id");
         }
         return block;
@@ -42,7 +42,7 @@ public enum BlockById implements IDatatypeFor<Block> {
     public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
         return new TabCompleteHelper()
                 .append(
-                        Block.REGISTRY.getKeys()
+                        Registry.BLOCK.keySet()
                                 .stream()
                                 .map(Object::toString)
                 )

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

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

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

@@ -19,24 +19,24 @@ package baritone.api.command.datatypes;
 
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 
 import java.util.Locale;
 import java.util.stream.Stream;
 
-public enum ForEnumFacing implements IDatatypeFor<EnumFacing> {
+public enum ForDirection implements IDatatypeFor<Direction> {
     INSTANCE;
 
     @Override
-    public EnumFacing get(IDatatypeContext ctx) throws CommandException {
-        return EnumFacing.valueOf(ctx.getConsumer().getString().toUpperCase(Locale.US));
+    public Direction get(IDatatypeContext ctx) throws CommandException {
+        return Direction.valueOf(ctx.getConsumer().getString().toUpperCase(Locale.US));
     }
 
     @Override
     public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
         return new TabCompleteHelper()
-                .append(Stream.of(EnumFacing.values())
-                        .map(EnumFacing::getName).map(String::toLowerCase))
+                .append(Stream.of(Direction.values())
+                        .map(Direction::getName2).map(String::toLowerCase))
                 .filterPrefix(ctx.getConsumer().getString())
                 .stream();
     }

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

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

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

@@ -26,7 +26,8 @@ import java.util.stream.Stream;
 
 public enum RelativeCoordinate implements IDatatypePost<Double, Double> {
     INSTANCE;
-    private static Pattern PATTERN = Pattern.compile("^(~?)([+-]?(?:\\d+(?:\\.\\d*)?|\\.\\d+)([k-k]?)|)$");
+    private static String ScalesAliasRegex = "[kKmM]";
+    private static Pattern PATTERN = Pattern.compile("^(~?)([+-]?(?:\\d+(?:\\.\\d*)?|\\.\\d+)(" + ScalesAliasRegex + "?)|)$");
 
     @Override
     public Double apply(IDatatypeContext ctx, Double origin) throws CommandException {
@@ -41,11 +42,15 @@ public enum RelativeCoordinate implements IDatatypePost<Double, Double> {
 
         boolean isRelative = !matcher.group(1).isEmpty();
 
-        double offset = matcher.group(2).isEmpty() ? 0 : Double.parseDouble(matcher.group(2).replaceAll("k", ""));
+        double offset = matcher.group(2).isEmpty() ? 0 : Double.parseDouble(matcher.group(2).replaceAll(ScalesAliasRegex, ""));
 
-        if (matcher.group(2).contains("k")) {
+        if (matcher.group(2).toLowerCase().contains("k")) {
             offset *= 1000;
         }
+        if (matcher.group(2).toLowerCase().contains("m")) {
+            offset *= 1000000;
+        }
+
 
         if (isRelative) {
             return origin + offset;

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

@@ -83,10 +83,10 @@ public enum RelativeFile implements IDatatypePost<File, File> {
         boolean useParent = !currentPathStringThing.isEmpty() && !currentPathStringThing.endsWith(File.separator);
         File currentFile = currentPath.isAbsolute() ? currentPath.toFile() : new File(base, currentPathStringThing);
         return Stream.of(Objects.requireNonNull(getCanonicalFileUnchecked(
-                useParent
-                        ? currentFile.getParentFile()
-                        : currentFile
-        ).listFiles()))
+                        useParent
+                                ? currentFile.getParentFile()
+                                : currentFile
+                ).listFiles()))
                 .map(f -> (currentPath.isAbsolute() ? f : basePath.relativize(f.toPath()).toString()) +
                         (f.isDirectory() ? File.separator : ""))
                 .filter(s -> s.toLowerCase(Locale.US).startsWith(currentPathStringThing.toLowerCase(Locale.US)))

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

@@ -22,7 +22,8 @@ import baritone.api.command.exception.CommandException;
 import baritone.api.command.exception.CommandInvalidTypeException;
 import baritone.api.utils.Helper;
 import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TextComponentString;
+import net.minecraft.util.text.StringTextComponent;
+import net.minecraft.util.text.TextComponent;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.util.text.event.ClickEvent;
 import net.minecraft.util.text.event.HoverEvent;
@@ -74,40 +75,40 @@ public class Paginator<E> implements Helper {
         }
         boolean hasPrevPage = commandPrefix != null && validPage(page - 1);
         boolean hasNextPage = commandPrefix != null && validPage(page + 1);
-        ITextComponent prevPageComponent = new TextComponentString("<<");
+        TextComponent prevPageComponent = new StringTextComponent("<<");
         if (hasPrevPage) {
-            prevPageComponent.getStyle()
+            prevPageComponent.setStyle(prevPageComponent.getStyle()
                     .setClickEvent(new ClickEvent(
                             ClickEvent.Action.RUN_COMMAND,
                             String.format("%s %d", commandPrefix, page - 1)
                     ))
                     .setHoverEvent(new HoverEvent(
                             HoverEvent.Action.SHOW_TEXT,
-                            new TextComponentString("Click to view previous page")
-                    ));
+                            new StringTextComponent("Click to view previous page")
+                    )));
         } else {
-            prevPageComponent.getStyle().setColor(TextFormatting.DARK_GRAY);
+            prevPageComponent.setStyle(prevPageComponent.getStyle().setFormatting(TextFormatting.DARK_GRAY));
         }
-        ITextComponent nextPageComponent = new TextComponentString(">>");
+        TextComponent nextPageComponent = new StringTextComponent(">>");
         if (hasNextPage) {
-            nextPageComponent.getStyle()
+            nextPageComponent.setStyle(nextPageComponent.getStyle()
                     .setClickEvent(new ClickEvent(
                             ClickEvent.Action.RUN_COMMAND,
                             String.format("%s %d", commandPrefix, page + 1)
                     ))
                     .setHoverEvent(new HoverEvent(
                             HoverEvent.Action.SHOW_TEXT,
-                            new TextComponentString("Click to view next page")
-                    ));
+                            new StringTextComponent("Click to view next page")
+                    )));
         } else {
-            nextPageComponent.getStyle().setColor(TextFormatting.DARK_GRAY);
+            nextPageComponent.setStyle(nextPageComponent.getStyle().setFormatting(TextFormatting.DARK_GRAY));
         }
-        ITextComponent pagerComponent = new TextComponentString("");
-        pagerComponent.getStyle().setColor(TextFormatting.GRAY);
-        pagerComponent.appendSibling(prevPageComponent);
-        pagerComponent.appendText(" | ");
-        pagerComponent.appendSibling(nextPageComponent);
-        pagerComponent.appendText(String.format(" %d/%d", page, getMaxPage()));
+        TextComponent pagerComponent = new StringTextComponent("");
+        pagerComponent.setStyle(pagerComponent.getStyle().setFormatting(TextFormatting.GRAY));
+        pagerComponent.append(prevPageComponent);
+        pagerComponent.appendString(" | ");
+        pagerComponent.append(nextPageComponent);
+        pagerComponent.appendString(String.format(" %d/%d", page, getMaxPage()));
         logDirect(pagerComponent);
     }
 

src/api/java/baritone/api/command/registry/Registry.java

@@ -84,7 +84,7 @@ public class Registry<V> {
      * @param entry The entry to unregister.
      */
     public void unregister(V entry) {
-        if (registered(entry)) {
+        if (!registered(entry)) {
             return;
         }
         _entries.remove(entry);

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

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

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

@@ -17,6 +17,9 @@
 
 package baritone.api.event.events;
 
+import com.mojang.blaze3d.matrix.MatrixStack;
+import net.minecraft.util.math.vector.Matrix4f;
+
 /**
  * @author Brady
  * @since 8/5/2018
@@ -28,8 +31,13 @@ public final class RenderEvent {
      */
     private final float partialTicks;
 
-    public RenderEvent(float partialTicks) {
+    private final Matrix4f projectionMatrix;
+    private final MatrixStack modelViewStack;
+
+    public RenderEvent(float partialTicks, MatrixStack modelViewStack, Matrix4f projectionMatrix) {
         this.partialTicks = partialTicks;
+        this.modelViewStack = modelViewStack;
+        this.projectionMatrix = projectionMatrix;
     }
 
     /**
@@ -38,4 +46,12 @@ public final class RenderEvent {
     public final float getPartialTicks() {
         return this.partialTicks;
     }
+
+    public MatrixStack getModelViewStack() {
+        return this.modelViewStack;
+    }
+
+    public Matrix4f getProjectionMatrix() {
+        return this.projectionMatrix;
+    }
 }

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

@@ -18,7 +18,8 @@
 package baritone.api.event.events;
 
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.util.math.vector.Vector3d;
 
 /**
  * @author Brady
@@ -69,14 +70,14 @@ public final class RotationMoveEvent {
         /**
          * Called when the player's motion is updated.
          *
-         * @see Entity#moveRelative(float, float, float, float)
+         * @see Entity#moveRelative(float, Vector3d)
          */
         MOTION_UPDATE,
 
         /**
          * Called when the player jumps.
          *
-         * @see EntityLivingBase#jump
+         * @see LivingEntity
          */
         JUMP
     }

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

@@ -22,7 +22,7 @@ import baritone.api.event.events.type.Cancellable;
 /**
  * @author LoganDark
  */
-public class TabCompleteEvent extends Cancellable {
+public final class TabCompleteEvent extends Cancellable {
 
     public final String prefix;
     public String[] completions;

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

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

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

@@ -18,14 +18,13 @@
 package baritone.api.event.listener;
 
 import baritone.api.event.events.*;
-import io.netty.util.concurrent.GenericFutureListener;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.client.gui.GuiGameOver;
-import net.minecraft.client.multiplayer.WorldClient;
-import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.client.gui.screen.DeathScreen;
+import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.Entity;
-import net.minecraft.network.Packet;
+import net.minecraft.network.IPacket;
+import net.minecraft.util.math.vector.Vector3d;
 
 /**
  * @author Brady
@@ -45,7 +44,7 @@ public interface IGameEventListener {
      * Run once per game tick from before and after the player rotation is sent to the server.
      *
      * @param event The event
-     * @see EntityPlayerSP#onUpdate()
+     * @see ClientPlayerEntity#tick()
      */
     void onPlayerUpdate(PlayerUpdateEvent event);
 
@@ -53,7 +52,7 @@ public interface IGameEventListener {
      * Runs whenever the client player sends a message to the server.
      *
      * @param event The event
-     * @see EntityPlayerSP#sendChatMessage(String)
+     * @see ClientPlayerEntity#sendChatMessage(String)
      */
     void onSendChatMessage(ChatEvent event);
 
@@ -68,14 +67,11 @@ public interface IGameEventListener {
      * Runs before and after whenever a chunk is either loaded, unloaded, or populated.
      *
      * @param event The event
-     * @see WorldClient#doPreChunk(int, int, boolean)
      */
     void onChunkEvent(ChunkEvent event);
 
     /**
-     * Runs once per world render pass. Two passes are made when {@link GameSettings#anaglyph} is on.
-     * <p>
-     * <b>Note:</b> {@link GameSettings#anaglyph} has been removed in Minecraft 1.13
+     * Runs once per world render pass.
      *
      * @param event The event
      */
@@ -85,7 +81,7 @@ public interface IGameEventListener {
      * Runs before and after whenever a new world is loaded
      *
      * @param event The event
-     * @see Minecraft#loadWorld(WorldClient, String)
+     * @see Minecraft#loadWorld(ClientWorld)
      */
     void onWorldEvent(WorldEvent event);
 
@@ -93,8 +89,7 @@ public interface IGameEventListener {
      * Runs before a outbound packet is sent
      *
      * @param event The event
-     * @see Packet
-     * @see GenericFutureListener
+     * @see IPacket
      */
     void onSendPacket(PacketEvent event);
 
@@ -102,8 +97,7 @@ public interface IGameEventListener {
      * Runs before an inbound packet is processed
      *
      * @param event The event
-     * @see Packet
-     * @see GenericFutureListener
+     * @see IPacket
      */
     void onReceivePacket(PacketEvent event);
 
@@ -112,15 +106,15 @@ public interface IGameEventListener {
      * and before and after the player jumps.
      *
      * @param event The event
-     * @see Entity#moveRelative(float, float, float, float)
+     * @see Entity#moveRelative(float, Vector3d)
      */
     void onPlayerRotationMove(RotationMoveEvent event);
 
     /**
-     * Called whenever the sprint keybind state is checked in {@link EntityPlayerSP#onLivingUpdate}
+     * Called whenever the sprint keybind state is checked in {@link ClientPlayerEntity#livingTick}
      *
      * @param event The event
-     * @see EntityPlayerSP#onLivingUpdate()
+     * @see ClientPlayerEntity#livingTick()
      */
     void onPlayerSprintState(SprintStateEvent event);
 
@@ -132,9 +126,9 @@ public interface IGameEventListener {
     void onBlockInteract(BlockInteractEvent event);
 
     /**
-     * Called when the local player dies, as indicated by the creation of the {@link GuiGameOver} screen.
+     * Called when the local player dies, as indicated by the creation of the {@link DeathScreen} screen.
      *
-     * @see GuiGameOver
+     * @see DeathScreen
      */
     void onPlayerDeath();
 

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

@@ -19,8 +19,8 @@ package baritone.api.pathing.goals;
 
 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.interfaces.IGoalRenderPos;
-import it.unimi.dsi.fastutil.doubles.DoubleOpenHashSet;
 import it.unimi.dsi.fastutil.doubles.DoubleIterator;
+import it.unimi.dsi.fastutil.doubles.DoubleOpenHashSet;
 import net.minecraft.util.math.BlockPos;
 
 public class GoalNear implements Goal, IGoalRenderPos {

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

@@ -18,8 +18,8 @@
 package baritone.api.pathing.goals;
 
 import baritone.api.utils.SettingsUtil;
-import it.unimi.dsi.fastutil.doubles.DoubleOpenHashSet;
 import it.unimi.dsi.fastutil.doubles.DoubleIterator;
+import it.unimi.dsi.fastutil.doubles.DoubleOpenHashSet;
 import net.minecraft.util.math.BlockPos;
 
 import java.util.Arrays;

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

@@ -18,7 +18,7 @@
 package baritone.api.pathing.goals;
 
 import baritone.api.utils.SettingsUtil;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 
 /**
@@ -32,7 +32,7 @@ public class GoalStrictDirection implements Goal {
     public final int dx;
     public final int dz;
 
-    public GoalStrictDirection(BlockPos origin, EnumFacing direction) {
+    public GoalStrictDirection(BlockPos origin, Direction direction) {
         x = origin.getX();
         y = origin.getY();
         z = origin.getZ();

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

@@ -21,7 +21,7 @@ import baritone.api.BaritoneAPI;
 import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.SettingsUtil;
 import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.math.vector.Vector3d;
 
 /**
  * Useful for long-range goals that don't have a specific Y level.
@@ -94,7 +94,7 @@ public class GoalXZ implements Goal {
         return (diagonal + straight) * BaritoneAPI.getSettings().costHeuristic.value; // big TODO tune
     }
 
-    public static GoalXZ fromDirection(Vec3d origin, float yaw, double distance) {
+    public static GoalXZ fromDirection(Vector3d origin, float yaw, double distance) {
         float theta = (float) Math.toRadians(yaw);
         double x = origin.x - MathHelper.sin(theta) * distance;
         double z = origin.z + MathHelper.cos(theta) * distance;

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

@@ -18,10 +18,10 @@
 package baritone.api.process;
 
 import baritone.api.schematic.ISchematic;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec3i;
+import net.minecraft.util.math.vector.Vector3i;
 
 import java.io.File;
 import java.util.List;
@@ -39,7 +39,7 @@ public interface IBuilderProcess extends IBaritoneProcess {
      * @param schematic The object representation of the schematic
      * @param origin    The origin position of the schematic being built
      */
-    void build(String name, ISchematic schematic, Vec3i origin);
+    void build(String name, ISchematic schematic, Vector3i origin);
 
     /**
      * Requests a build for the specified schematic, labeled as specified, with the specified origin.
@@ -49,15 +49,17 @@ public interface IBuilderProcess extends IBaritoneProcess {
      * @param origin    The origin position of the schematic being built
      * @return Whether or not the schematic was able to load from file
      */
-    boolean build(String name, File schematic, Vec3i origin);
+    boolean build(String name, File schematic, Vector3i origin);
 
     default boolean build(String schematicFile, BlockPos origin) {
-        File file = new File(new File(Minecraft.getMinecraft().gameDir, "schematics"), schematicFile);
+        File file = new File(new File(Minecraft.getInstance().gameDir, "schematics"), schematicFile);
         return build(schematicFile, file, origin);
     }
 
     void buildOpenSchematic();
 
+    void buildOpenLitematic(int i);
+
     void pause();
 
     boolean isPaused();
@@ -71,5 +73,5 @@ public interface IBuilderProcess extends IBaritoneProcess {
      * schematics, for example, to pick a state that the builder process will be happy with, because any variation will
      * cause it to give up. This is updated every tick, but only while the builder process is active.
      */
-    List<IBlockState> getApproxPlaceable();
+    List<BlockState> getApproxPlaceable();
 }

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

@@ -17,7 +17,7 @@
 
 package baritone.api.schematic;
 
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -47,7 +47,7 @@ public class CompositeSchematic extends AbstractSchematic {
         recalcArr();
     }
 
-    private CompositeSchematicEntry getSchematic(int x, int y, int z, IBlockState currentState) {
+    private CompositeSchematicEntry getSchematic(int x, int y, int z, BlockState currentState) {
         for (CompositeSchematicEntry entry : schematicArr) {
             if (x >= entry.x && y >= entry.y && z >= entry.z &&
                     entry.schematic.inSchematic(x - entry.x, y - entry.y, z - entry.z, currentState)) {
@@ -58,13 +58,13 @@ public class CompositeSchematic extends AbstractSchematic {
     }
 
     @Override
-    public boolean inSchematic(int x, int y, int z, IBlockState currentState) {
+    public boolean inSchematic(int x, int y, int z, BlockState currentState) {
         CompositeSchematicEntry entry = getSchematic(x, y, z, currentState);
         return entry != null && entry.schematic.inSchematic(x - entry.x, y - entry.y, z - entry.z, currentState);
     }
 
     @Override
-    public IBlockState desiredState(int x, int y, int z, IBlockState current, List<IBlockState> approxPlaceable) {
+    public BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable) {
         CompositeSchematicEntry entry = getSchematic(x, y, z, current);
         if (entry == null) {
             throw new IllegalStateException("couldn't find schematic for this position");

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

@@ -18,7 +18,7 @@
 package baritone.api.schematic;
 
 import baritone.api.utils.BlockOptionalMeta;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 
 import java.util.List;
 
@@ -31,8 +31,8 @@ public class FillSchematic extends AbstractSchematic {
         this.bom = bom;
     }
 
-    public FillSchematic(int x, int y, int z, IBlockState state) {
-        this(x, y, z, new BlockOptionalMeta(state.getBlock(), state.getBlock().getMetaFromState(state)));
+    public FillSchematic(int x, int y, int z, BlockState state) {
+        this(x, y, z, new BlockOptionalMeta(state.getBlock()));
     }
 
     public BlockOptionalMeta getBom() {
@@ -40,11 +40,11 @@ public class FillSchematic extends AbstractSchematic {
     }
 
     @Override
-    public IBlockState desiredState(int x, int y, int z, IBlockState current, List<IBlockState> approxPlaceable) {
+    public BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable) {
         if (bom.matches(current)) {
             return current;
         }
-        for (IBlockState placeable : approxPlaceable) {
+        for (BlockState placeable : approxPlaceable) {
             if (bom.matches(placeable)) {
                 return placeable;
             }

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

@@ -17,8 +17,8 @@
 
 package baritone.api.schematic;
 
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.block.BlockState;
+import net.minecraft.util.Direction;
 
 import java.util.List;
 
@@ -44,11 +44,11 @@ public interface ISchematic {
      * @param currentState The current state of that block in the world, or null
      * @return Whether or not the specified position is within the bounds of this schematic
      */
-    default boolean inSchematic(int x, int y, int z, IBlockState currentState) {
+    default boolean inSchematic(int x, int y, int z, BlockState currentState) {
         return x >= 0 && x < widthX() && y >= 0 && y < heightY() && z >= 0 && z < lengthZ();
     }
 
-    default int size(EnumFacing.Axis axis) {
+    default int size(Direction.Axis axis) {
         switch (axis) {
             case X:
                 return widthX();
@@ -71,7 +71,7 @@ public interface ISchematic {
      * @param approxPlaceable The list of blockstates estimated to be placeable
      * @return The desired block state at the specified position
      */
-    IBlockState desiredState(int x, int y, int z, IBlockState current, List<IBlockState> approxPlaceable);
+    BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable);
 
     /**
      * Resets possible caches to avoid wrong behavior when moving the schematic around

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

@@ -17,7 +17,7 @@
 
 package baritone.api.schematic;
 
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 
 /**
  * A static schematic is capable of providing the desired state at a given position without
@@ -30,7 +30,7 @@ import net.minecraft.block.state.IBlockState;
 public interface IStaticSchematic extends ISchematic {
 
     /**
-     * Gets the {@link IBlockState} for a given position in this schematic. It should be guaranteed
+     * Gets the {@link BlockState} for a given position in this schematic. It should be guaranteed
      * that the return value of this method will not change given that the parameters are the same.
      *
      * @param x The X block position
@@ -38,19 +38,19 @@ public interface IStaticSchematic extends ISchematic {
      * @param z The Z block position
      * @return The desired state at the specified position.
      */
-    IBlockState getDirect(int x, int y, int z);
+    BlockState getDirect(int x, int y, int z);
 
     /**
-     * Returns an {@link IBlockState} array of size {@link #heightY()} which contains all
-     * desired block states in the specified vertical column. The index of {@link IBlockState}s
+     * Returns an {@link BlockState} array of size {@link #heightY()} which contains all
+     * desired block states in the specified vertical column. The index of {@link BlockState}s
      * in the array are equivalent to their Y position in the schematic.
      *
      * @param x The X column position
      * @param z The Z column position
-     * @return An {@link IBlockState} array
+     * @return An {@link BlockState} array
      */
-    default IBlockState[] getColumn(int x, int z) {
-        IBlockState[] column = new IBlockState[this.heightY()];
+    default BlockState[] getColumn(int x, int z) {
+        BlockState[] column = new BlockState[this.heightY()];
         for (int i = 0; i < this.heightY(); i++) {
             column[i] = getDirect(x, i, z);
         }

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

@@ -17,7 +17,7 @@
 
 package baritone.api.schematic;
 
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 
 import java.util.List;
 
@@ -30,15 +30,15 @@ public abstract class MaskSchematic extends AbstractSchematic {
         this.schematic = schematic;
     }
 
-    protected abstract boolean partOfMask(int x, int y, int z, IBlockState currentState);
+    protected abstract boolean partOfMask(int x, int y, int z, BlockState currentState);
 
     @Override
-    public boolean inSchematic(int x, int y, int z, IBlockState currentState) {
+    public boolean inSchematic(int x, int y, int z, BlockState currentState) {
         return schematic.inSchematic(x, y, z, currentState) && partOfMask(x, y, z, currentState);
     }
 
     @Override
-    public IBlockState desiredState(int x, int y, int z, IBlockState current, List<IBlockState> approxPlaceable) {
+    public BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable) {
         return schematic.desiredState(x, y, z, current, approxPlaceable);
     }
 }

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

@@ -18,7 +18,7 @@
 package baritone.api.schematic;
 
 import baritone.api.utils.BlockOptionalMetaLookup;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 
 public class ReplaceSchematic extends MaskSchematic {
 
@@ -44,7 +44,7 @@ public class ReplaceSchematic extends MaskSchematic {
     }
 
     @Override
-    protected boolean partOfMask(int x, int y, int z, IBlockState currentState) {
+    protected boolean partOfMask(int x, int y, int z, BlockState currentState) {
         if (cache[x][y][z] == null) {
             cache[x][y][z] = filter.has(currentState);
         }

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

@@ -17,7 +17,7 @@
 
 package baritone.api.schematic;
 
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 
 public class ShellSchematic extends MaskSchematic {
 
@@ -26,7 +26,7 @@ public class ShellSchematic extends MaskSchematic {
     }
 
     @Override
-    protected boolean partOfMask(int x, int y, int z, IBlockState currentState) {
+    protected boolean partOfMask(int x, int y, int z, BlockState currentState) {
         return x == 0 || y == 0 || z == 0 || x == widthX() - 1 || y == heightY() - 1 || z == lengthZ() - 1;
     }
 }

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

@@ -17,11 +17,12 @@
 
 package baritone.api.schematic;
 
+import net.minecraft.block.AirBlock;
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockAir;
-import net.minecraft.block.properties.IProperty;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.init.Blocks;
+import net.minecraft.block.Blocks;
+import net.minecraft.block.BlockState;
+import net.minecraft.state.Property;
+
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -31,35 +32,35 @@ public class SubstituteSchematic extends AbstractSchematic {
 
     private final ISchematic schematic;
     private final Map<Block, List<Block>> substitutions;
-    private final Map<IBlockState, Map<Block, IBlockState>> blockStateCache = new HashMap<>();
+    private final Map<BlockState, Map<Block, BlockState>> blockStateCache = new HashMap<>();
 
-    public SubstituteSchematic(ISchematic schematic, Map<Block,List<Block>> substitutions) {
+    public SubstituteSchematic(ISchematic schematic, Map<Block, List<Block>> substitutions) {
         super(schematic.widthX(), schematic.heightY(), schematic.lengthZ());
         this.schematic = schematic;
         this.substitutions = substitutions;
     }
 
     @Override
-    public boolean inSchematic(int x, int y, int z, IBlockState currentState) {
+    public boolean inSchematic(int x, int y, int z, BlockState currentState) {
         return schematic.inSchematic(x, y, z, currentState);
     }
 
     @Override
-    public IBlockState desiredState(int x, int y, int z, IBlockState current, List<IBlockState> approxPlaceable) {
-        IBlockState desired = schematic.desiredState(x, y, z, current, approxPlaceable);
+    public BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable) {
+        BlockState desired = schematic.desiredState(x, y, z, current, approxPlaceable);
         Block desiredBlock = desired.getBlock();
         if (!substitutions.containsKey(desiredBlock)) {
             return desired;
         }
         List<Block> substitutes = substitutions.get(desiredBlock);
-        if (substitutes.contains(current.getBlock()) && !(current.getBlock() instanceof BlockAir)) {// don't preserve air, it's almost always there and almost never wanted
+        if (substitutes.contains(current.getBlock()) && !(current.getBlock() instanceof AirBlock)) {// don't preserve air, it's almost always there and almost never wanted
             return withBlock(desired, current.getBlock());
         }
         for (Block substitute : substitutes) {
-            if (substitute instanceof BlockAir) {
-                return current.getBlock() instanceof BlockAir ? current : Blocks.AIR.getDefaultState(); // can always "place" air
+            if (substitute instanceof AirBlock) {
+                return current.getBlock() instanceof AirBlock ? current : Blocks.AIR.getDefaultState(); // can always "place" air
             }
-            for (IBlockState placeable : approxPlaceable) {
+            for (BlockState placeable : approxPlaceable) {
                 if (substitute.equals(placeable.getBlock())) {
                     return withBlock(desired, placeable.getBlock());
                 }
@@ -68,22 +69,23 @@ public class SubstituteSchematic extends AbstractSchematic {
         return substitutes.get(0).getDefaultState();
     }
 
-    private IBlockState withBlock(IBlockState state, Block block) {
+    private BlockState withBlock(BlockState state, Block block) {
         if (blockStateCache.containsKey(state) && blockStateCache.get(state).containsKey(block)) {
             return blockStateCache.get(state).get(block);
         }
-        Collection<IProperty<?>> properties = state.getPropertyKeys();
-        IBlockState newState = block.getDefaultState();
-        for (IProperty<?> property : properties) {
+        Collection<Property<?>> properties = state.getBlock().getStateContainer().getProperties();
+        BlockState newState = block.getDefaultState();
+        for (Property<?> property : properties) {
             try {
                 newState = copySingleProp(state, newState, property);
             } catch (IllegalArgumentException e) { //property does not exist for target block
             }
         }
-        blockStateCache.computeIfAbsent(state, s -> new HashMap<Block,IBlockState>()).put(block, newState);
+        blockStateCache.computeIfAbsent(state, s -> new HashMap<Block, BlockState>()).put(block, newState);
         return newState;
     }
-    private <T extends Comparable<T>> IBlockState copySingleProp(IBlockState fromState, IBlockState toState, IProperty<T> prop) {
-        return toState.withProperty(prop, fromState.getValue(prop));
+
+    private <T extends Comparable<T>> BlockState copySingleProp(BlockState fromState, BlockState toState, Property<T> prop) {
+        return toState.with(prop, fromState.get(prop));
     }
 }

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

@@ -17,7 +17,7 @@
 
 package baritone.api.schematic;
 
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 
 public class WallsSchematic extends MaskSchematic {
 
@@ -26,7 +26,7 @@ public class WallsSchematic extends MaskSchematic {
     }
 
     @Override
-    protected boolean partOfMask(int x, int y, int z, IBlockState currentState) {
+    protected boolean partOfMask(int x, int y, int z, BlockState currentState) {
         return x == 0 || z == 0 || x == widthX() - 1 || z == lengthZ() - 1;
     }
 }

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

@@ -18,9 +18,9 @@
 package baritone.api.selection;
 
 import baritone.api.utils.BetterBlockPos;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.AxisAlignedBB;
-import net.minecraft.util.math.Vec3i;
+import net.minecraft.util.math.vector.Vector3i;
 
 /**
  * A selection is an immutable object representing the current selection. The selection is commonly used for certain
@@ -51,7 +51,7 @@ public interface ISelection {
     /**
      * @return The size of this ISelection.
      */
-    Vec3i size();
+    Vector3i size();
 
     /**
      * @return An {@link AxisAlignedBB} encompassing all blocks in this selection.
@@ -65,7 +65,7 @@ public interface ISelection {
      * @param blocks    How many blocks to expand it.
      * @return A new selection, expanded as specified.
      */
-    ISelection expand(EnumFacing direction, int blocks);
+    ISelection expand(Direction direction, int blocks);
 
     /**
      * Returns a new {@link ISelection} contracted in the specified direction by the specified number of blocks.
@@ -77,7 +77,7 @@ public interface ISelection {
      * @param blocks    How many blocks to contract it.
      * @return A new selection, contracted as specified.
      */
-    ISelection contract(EnumFacing direction, int blocks);
+    ISelection contract(Direction direction, int blocks);
 
     /**
      * Returns a new {@link ISelection} shifted in the specified direction by the specified number of blocks. This moves
@@ -87,5 +87,5 @@ public interface ISelection {
      * @param blocks    How many blocks to shift it.
      * @return A new selection, shifted as specified.
      */
-    ISelection shift(EnumFacing direction, int blocks);
+    ISelection shift(Direction direction, int blocks);
 }

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

@@ -18,7 +18,7 @@
 package baritone.api.selection;
 
 import baritone.api.utils.BetterBlockPos;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 
 /**
  * The selection manager handles setting Baritone's selections. You can set the selection here, as well as retrieving
@@ -87,7 +87,7 @@ public interface ISelectionManager {
      * @param blocks    How many blocks to expand it.
      * @return The new selection, expanded as specified.
      */
-    ISelection expand(ISelection selection, EnumFacing direction, int blocks);
+    ISelection expand(ISelection selection, Direction direction, int blocks);
 
     /**
      * Replaces the specified {@link ISelection} with one contracted in the specified direction by the specified number
@@ -101,7 +101,7 @@ public interface ISelectionManager {
      * @param blocks    How many blocks to contract it.
      * @return The new selection, contracted as specified.
      */
-    ISelection contract(ISelection selection, EnumFacing direction, int blocks);
+    ISelection contract(ISelection selection, Direction direction, int blocks);
 
     /**
      * Replaces the specified {@link ISelection} with one shifted in the specified direction by the specified number of
@@ -112,5 +112,5 @@ public interface ISelectionManager {
      * @param blocks    How many blocks to shift it.
      * @return The new selection, shifted as specified.
      */
-    ISelection shift(ISelection selection, EnumFacing direction, int blocks);
+    ISelection shift(ISelection selection, Direction direction, int blocks);
 }

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

@@ -17,10 +17,10 @@
 
 package baritone.api.utils;
 
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.math.Vec3i;
+import net.minecraft.util.math.vector.Vector3i;
 
 import javax.annotation.Nonnull;
 
@@ -120,10 +120,10 @@ public final class BetterBlockPos extends BlockPos {
         // this is unimaginably faster than blockpos.up
         // that literally calls
         // this.up(1)
-        // which calls this.offset(EnumFacing.UP, 1)
+        // which calls this.offset(Direction.UP, 1)
         // which does return n == 0 ? this : new BlockPos(this.getX() + facing.getXOffset() * n, this.getY() + facing.getYOffset() * n, this.getZ() + facing.getZOffset() * n);
 
-        // how many function calls is that? up(), up(int), offset(EnumFacing, int), new BlockPos, getX, getXOffset, getY, getYOffset, getZ, getZOffset
+        // how many function calls is that? up(), up(int), offset(Direction, int), new BlockPos, getX, getXOffset, getY, getYOffset, getZ, getZOffset
         // that's ten.
         // this is one function call.
         return new BetterBlockPos(x, y + 1, z);
@@ -148,17 +148,17 @@ public final class BetterBlockPos extends BlockPos {
     }
 
     @Override
-    public BetterBlockPos offset(EnumFacing dir) {
-        Vec3i vec = dir.getDirectionVec();
+    public BetterBlockPos offset(Direction dir) {
+        Vector3i vec = dir.getDirectionVec();
         return new BetterBlockPos(x + vec.getX(), y + vec.getY(), z + vec.getZ());
     }
 
     @Override
-    public BetterBlockPos offset(EnumFacing dir, int dist) {
+    public BetterBlockPos offset(Direction dir, int dist) {
         if (dist == 0) {
             return this;
         }
-        Vec3i vec = dir.getDirectionVec();
+        Vector3i vec = dir.getDirectionVec();
         return new BetterBlockPos(x + vec.getX() * dist, y + vec.getY() * dist, z + vec.getZ() * dist);
     }
 

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

@@ -19,44 +19,41 @@ package baritone.api.utils;
 
 import baritone.api.utils.accessor.IItemStack;
 import com.google.common.collect.ImmutableSet;
-import net.minecraft.block.*;
-import net.minecraft.block.properties.IProperty;
-import net.minecraft.block.state.IBlockState;
+import io.netty.util.concurrent.ThreadPerTaskExecutor;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.loot.*;
+import net.minecraft.resources.*;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Unit;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.vector.Vector3d;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.util.*;
-import java.util.function.Consumer;
+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 {
 
     private final Block block;
-    private final int meta;
-    private final boolean noMeta;
-    private final Set<IBlockState> blockstates;
+    private final Set<BlockState> blockstates;
     private final ImmutableSet<Integer> stateHashes;
     private final ImmutableSet<Integer> stackHashes;
     private static final Pattern pattern = Pattern.compile("^(.+?)(?::(\\d+))?$");
-    private static final Map<Object, Object> normalizations;
-
-    public BlockOptionalMeta(@Nonnull Block block, @Nullable Integer meta) {
-        this.block = block;
-        this.noMeta = meta == null;
-        this.meta = noMeta ? 0 : meta;
-        this.blockstates = getStates(block, meta);
-        this.stateHashes = getStateHashes(blockstates);
-        this.stackHashes = getStackHashes(blockstates);
-    }
+    private static LootTableManager manager;
+    private static LootPredicateManager predicate = new LootPredicateManager();
+    private static Map<Block, List<Item>> drops = new HashMap<>();
 
     public BlockOptionalMeta(@Nonnull Block block) {
-        this(block, null);
+        this.block = block;
+        this.blockstates = getStates(block);
+        this.stateHashes = getStateHashes(blockstates);
+        this.stackHashes = getStackHashes(blockstates);
     }
 
     public BlockOptionalMeta(@Nonnull String selector) {
@@ -67,204 +64,33 @@ public final class BlockOptionalMeta {
         }
 
         MatchResult matchResult = matcher.toMatchResult();
-        noMeta = matchResult.group(2) == null;
 
-        ResourceLocation id = new ResourceLocation(matchResult.group(1));
-
-        if (!Block.REGISTRY.containsKey(id)) {
-            throw new IllegalArgumentException("Invalid block ID");
-        }
-
-        block = Block.REGISTRY.getObject(id);
-        meta = noMeta ? 0 : Integer.parseInt(matchResult.group(2));
-        blockstates = getStates(block, getMeta());
+        block = BlockUtils.stringToBlockRequired(matchResult.group(1));
+        blockstates = getStates(block);
         stateHashes = getStateHashes(blockstates);
         stackHashes = getStackHashes(blockstates);
     }
 
-    static {
-        Map<Object, Object> _normalizations = new HashMap<>();
-        Consumer<Enum> put = instance -> _normalizations.put(instance.getClass(), instance);
-        put.accept(EnumFacing.NORTH);
-        put.accept(EnumFacing.Axis.Y);
-        put.accept(BlockLog.EnumAxis.Y);
-        put.accept(BlockStairs.EnumHalf.BOTTOM);
-        put.accept(BlockStairs.EnumShape.STRAIGHT);
-        put.accept(BlockLever.EnumOrientation.DOWN_X);
-        put.accept(BlockDoublePlant.EnumBlockHalf.LOWER);
-        put.accept(BlockSlab.EnumBlockHalf.BOTTOM);
-        put.accept(BlockDoor.EnumDoorHalf.LOWER);
-        put.accept(BlockDoor.EnumHingePosition.LEFT);
-        put.accept(BlockBed.EnumPartType.HEAD);
-        put.accept(BlockRailBase.EnumRailDirection.NORTH_SOUTH);
-        put.accept(BlockTrapDoor.DoorHalf.BOTTOM);
-        _normalizations.put(BlockBanner.ROTATION, 0);
-        _normalizations.put(BlockBed.OCCUPIED, false);
-        _normalizations.put(BlockBrewingStand.HAS_BOTTLE[0], false);
-        _normalizations.put(BlockBrewingStand.HAS_BOTTLE[1], false);
-        _normalizations.put(BlockBrewingStand.HAS_BOTTLE[2], false);
-        _normalizations.put(BlockButton.POWERED, false);
-        // _normalizations.put(BlockCactus.AGE, 0);
-        // _normalizations.put(BlockCauldron.LEVEL, 0);
-        // _normalizations.put(BlockChorusFlower.AGE, 0);
-        _normalizations.put(BlockChorusPlant.NORTH, false);
-        _normalizations.put(BlockChorusPlant.EAST, false);
-        _normalizations.put(BlockChorusPlant.SOUTH, false);
-        _normalizations.put(BlockChorusPlant.WEST, false);
-        _normalizations.put(BlockChorusPlant.UP, false);
-        _normalizations.put(BlockChorusPlant.DOWN, false);
-        // _normalizations.put(BlockCocoa.AGE, 0);
-        // _normalizations.put(BlockCrops.AGE, 0);
-        _normalizations.put(BlockDirt.SNOWY, false);
-        _normalizations.put(BlockDoor.OPEN, false);
-        _normalizations.put(BlockDoor.POWERED, false);
-        // _normalizations.put(BlockFarmland.MOISTURE, 0);
-        _normalizations.put(BlockFence.NORTH, false);
-        _normalizations.put(BlockFence.EAST, false);
-        _normalizations.put(BlockFence.WEST, false);
-        _normalizations.put(BlockFence.SOUTH, false);
-        // _normalizations.put(BlockFenceGate.POWERED, false);
-        // _normalizations.put(BlockFenceGate.IN_WALL, false);
-        _normalizations.put(BlockFire.AGE, 0);
-        _normalizations.put(BlockFire.NORTH, false);
-        _normalizations.put(BlockFire.EAST, false);
-        _normalizations.put(BlockFire.SOUTH, false);
-        _normalizations.put(BlockFire.WEST, false);
-        _normalizations.put(BlockFire.UPPER, false);
-        // _normalizations.put(BlockFrostedIce.AGE, 0);
-        _normalizations.put(BlockGrass.SNOWY, false);
-        // _normalizations.put(BlockHopper.ENABLED, true);
-        // _normalizations.put(BlockLever.POWERED, false);
-        // _normalizations.put(BlockLiquid.LEVEL, 0);
-        // _normalizations.put(BlockMycelium.SNOWY, false);
-        // _normalizations.put(BlockNetherWart.AGE, false);
-        _normalizations.put(BlockLeaves.CHECK_DECAY, false);
-        // _normalizations.put(BlockLeaves.DECAYABLE, false);
-        // _normalizations.put(BlockObserver.POWERED, false);
-        _normalizations.put(BlockPane.NORTH, false);
-        _normalizations.put(BlockPane.EAST, false);
-        _normalizations.put(BlockPane.WEST, false);
-        _normalizations.put(BlockPane.SOUTH, false);
-        // _normalizations.put(BlockPistonBase.EXTENDED, false);
-        // _normalizations.put(BlockPressurePlate.POWERED, false);
-        // _normalizations.put(BlockPressurePlateWeighted.POWER, false);
-        _normalizations.put(BlockQuartz.EnumType.LINES_X, BlockQuartz.EnumType.LINES_Y);
-        _normalizations.put(BlockQuartz.EnumType.LINES_Z, BlockQuartz.EnumType.LINES_Y);
-        // _normalizations.put(BlockRailDetector.POWERED, false);
-        // _normalizations.put(BlockRailPowered.POWERED, false);
-        _normalizations.put(BlockRedstoneWire.NORTH, false);
-        _normalizations.put(BlockRedstoneWire.EAST, false);
-        _normalizations.put(BlockRedstoneWire.SOUTH, false);
-        _normalizations.put(BlockRedstoneWire.WEST, false);
-        // _normalizations.put(BlockReed.AGE, false);
-        _normalizations.put(BlockSapling.STAGE, 0);
-        _normalizations.put(BlockSkull.NODROP, false);
-        _normalizations.put(BlockStandingSign.ROTATION, 0);
-        _normalizations.put(BlockStem.AGE, 0);
-        _normalizations.put(BlockTripWire.NORTH, false);
-        _normalizations.put(BlockTripWire.EAST, false);
-        _normalizations.put(BlockTripWire.WEST, false);
-        _normalizations.put(BlockTripWire.SOUTH, false);
-        _normalizations.put(BlockVine.NORTH, false);
-        _normalizations.put(BlockVine.EAST, false);
-        _normalizations.put(BlockVine.SOUTH, false);
-        _normalizations.put(BlockVine.WEST, false);
-        _normalizations.put(BlockVine.UP, false);
-        _normalizations.put(BlockWall.UP, false);
-        _normalizations.put(BlockWall.NORTH, false);
-        _normalizations.put(BlockWall.EAST, false);
-        _normalizations.put(BlockWall.WEST, false);
-        _normalizations.put(BlockWall.SOUTH, false);
-        normalizations = Collections.unmodifiableMap(_normalizations);
+    private static Set<BlockState> getStates(@Nonnull Block block) {
+        return new HashSet<>(block.getStateContainer().getValidStates());
     }
 
-    public static <C extends Comparable<C>, P extends IProperty<C>> P castToIProperty(Object value) {
-        //noinspection unchecked
-        return (P) value;
-    }
-
-    public static <C extends Comparable<C>, P extends IProperty<C>> C castToIPropertyValue(P iproperty, Object value) {
-        //noinspection unchecked
-        return (C) value;
-    }
-
-    /**
-     * Normalizes the specified blockstate by setting meta-affecting properties which
-     * are not being targeted by the meta parameter to their default values.
-     * <p>
-     * For example, block variant/color is the primary target for the meta value, so properties
-     * such as rotation/facing direction will be set to default values in order to nullify
-     * the effect that they have on the state's meta value.
-     *
-     * @param state The state to normalize
-     * @return The normalized block state
-     */
-    public static IBlockState normalize(IBlockState state) {
-        IBlockState newState = state;
-
-        for (IProperty<?> property : state.getProperties().keySet()) {
-            Class<?> valueClass = property.getValueClass();
-            if (normalizations.containsKey(property)) {
-                try {
-                    newState = newState.withProperty(
-                            castToIProperty(property),
-                            castToIPropertyValue(property, normalizations.get(property))
-                    );
-                } catch (IllegalArgumentException ignored) {}
-            } else if (normalizations.containsKey(state.getValue(property))) {
-                try {
-                    newState = newState.withProperty(
-                            castToIProperty(property),
-                            castToIPropertyValue(property, normalizations.get(state.getValue(property)))
-                    );
-                } catch (IllegalArgumentException ignored) {}
-            } else if (normalizations.containsKey(valueClass)) {
-                try {
-                    newState = newState.withProperty(
-                            castToIProperty(property),
-                            castToIPropertyValue(property, normalizations.get(valueClass))
-                    );
-                } catch (IllegalArgumentException ignored) {}
-            }
-        }
-
-        return newState;
-    }
-
-    /**
-     * Evaluate the target meta value for the specified state. The target meta value is
-     * most often that which is influenced by the variant/color property of the block state.
-     *
-     * @param state The state to check
-     * @return The target meta of the state
-     * @see #normalize(IBlockState)
-     */
-    public static int stateMeta(IBlockState state) {
-        return state.getBlock().getMetaFromState(normalize(state));
-    }
-
-    private static Set<IBlockState> getStates(@Nonnull Block block, @Nullable Integer meta) {
-        return block.getBlockState().getValidStates().stream()
-                .filter(blockstate -> meta == null || stateMeta(blockstate) == meta)
-                .collect(Collectors.toSet());
-    }
-
-    private static ImmutableSet<Integer> getStateHashes(Set<IBlockState> blockstates) {
+    private static ImmutableSet<Integer> getStateHashes(Set<BlockState> blockstates) {
         return ImmutableSet.copyOf(
                 blockstates.stream()
-                        .map(IBlockState::hashCode)
+                        .map(BlockState::hashCode)
                         .toArray(Integer[]::new)
         );
     }
 
-    private static ImmutableSet<Integer> getStackHashes(Set<IBlockState> blockstates) {
+    private static ImmutableSet<Integer> getStackHashes(Set<BlockState> blockstates) {
         //noinspection ConstantConditions
         return ImmutableSet.copyOf(
                 blockstates.stream()
-                        .map(state -> new ItemStack(
-                                state.getBlock().getItemDropped(state, new Random(), 0),
-                                state.getBlock().damageDropped(state)
-                        ))
+                        .flatMap(state -> drops(state.getBlock())
+                                .stream()
+                                .map(item -> new ItemStack(item, 1))
+                        )
                         .map(stack -> ((IItemStack) (Object) stack).getBaritoneHash())
                         .toArray(Integer[]::new)
         );
@@ -274,15 +100,11 @@ public final class BlockOptionalMeta {
         return block;
     }
 
-    public Integer getMeta() {
-        return noMeta ? null : meta;
-    }
-
     public boolean matches(@Nonnull Block block) {
         return block == this.block;
     }
 
-    public boolean matches(@Nonnull IBlockState blockstate) {
+    public boolean matches(@Nonnull BlockState blockstate) {
         Block block = blockstate.getBlock();
         return block == this.block && stateHashes.contains(blockstate.hashCode());
     }
@@ -291,28 +113,66 @@ public final class BlockOptionalMeta {
         //noinspection ConstantConditions
         int hash = ((IItemStack) (Object) stack).getBaritoneHash();
 
-        if (noMeta) {
-            hash -= stack.getItemDamage();
-        }
+        hash -= stack.getDamage();
 
         return stackHashes.contains(hash);
     }
 
     @Override
     public String toString() {
-        return String.format("BlockOptionalMeta{block=%s,meta=%s}", block, getMeta());
+        return String.format("BlockOptionalMeta{block=%s}", block);
     }
 
-    public static IBlockState blockStateFromStack(ItemStack stack) {
-        //noinspection deprecation
-        return Block.getBlockFromItem(stack.getItem()).getStateFromMeta(stack.getMetadata());
-    }
-
-    public IBlockState getAnyBlockState() {
+    public BlockState getAnyBlockState() {
         if (blockstates.size() > 0) {
             return blockstates.iterator().next();
         }
 
         return null;
     }
+
+    public static LootTableManager getManager() {
+        if (manager == null) {
+            ResourcePackList rpl = new ResourcePackList(ResourcePackInfo::new, new ServerPackFinder());
+            rpl.reloadPacksFromFinders();
+            IResourcePack thePack = rpl.getAllPacks().iterator().next().getResourcePack();
+            IReloadableResourceManager resourceManager = new SimpleReloadableResourceManager(ResourcePackType.SERVER_DATA);
+            manager = new LootTableManager(predicate);
+            resourceManager.addReloadListener(manager);
+            try {
+                resourceManager.reloadResourcesAndThen(new ThreadPerTaskExecutor(Thread::new), new ThreadPerTaskExecutor(Thread::new), Collections.singletonList(thePack), CompletableFuture.completedFuture(Unit.INSTANCE)).get();
+            } catch (Exception exception) {
+                throw new RuntimeException(exception);
+            }
+        }
+        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.field_237457_g_, Vector3d.copy(BlockPos.NULL_VECTOR))
+                                .withParameter(LootParameters.TOOL, ItemStack.EMPTY)
+                                .withNullableParameter(LootParameters.BLOCK_ENTITY, null)
+                                .withParameter(LootParameters.BLOCK_STATE, block.getDefaultState())
+                                .build(LootParameterSets.BLOCK),
+                        stack -> items.add(stack.getItem())
+                );
+                return items;
+            }
+        });
+    }
 }

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

@@ -18,7 +18,7 @@
 package baritone.api.utils;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 import net.minecraft.item.ItemStack;
 
 import java.util.Arrays;
@@ -61,7 +61,7 @@ public class BlockOptionalMetaLookup {
         return false;
     }
 
-    public boolean has(IBlockState state) {
+    public boolean has(BlockState state) {
         for (BlockOptionalMeta bom : boms) {
             if (bom.matches(state)) {
                 return true;

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

@@ -19,6 +19,7 @@ package baritone.api.utils;
 
 import net.minecraft.block.Block;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.registry.Registry;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -28,7 +29,7 @@ public class BlockUtils {
     private static transient Map<String, Block> resourceCache = new HashMap<>();
 
     public static String blockToString(Block block) {
-        ResourceLocation loc = Block.REGISTRY.getNameForObject(block);
+        ResourceLocation loc = Registry.BLOCK.getKey(block);
         String name = loc.getPath(); // normally, only write the part after the minecraft:
         if (!loc.getNamespace().equals("minecraft")) {
             // Baritone is running on top of forge with mods installed, perhaps?
@@ -56,7 +57,7 @@ public class BlockUtils {
         if (resourceCache.containsKey(name)) {
             return null; // cached as null
         }
-        block = Block.getBlockFromName(name.contains(":") ? name : "minecraft:" + name);
+        block = Registry.BLOCK.getOptional(ResourceLocation.tryCreate(name.contains(":") ? name : "minecraft:" + name)).orElse(null);
         Map<String, Block> copy = new HashMap<>(resourceCache); // read only copy is safe, wont throw concurrentmodification
         copy.put(name, block);
         resourceCache = copy;

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

@@ -20,7 +20,8 @@ package baritone.api.utils;
 import baritone.api.BaritoneAPI;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TextComponentString;
+import net.minecraft.util.text.StringTextComponent;
+import net.minecraft.util.text.TextComponent;
 import net.minecraft.util.text.TextFormatting;
 
 import java.util.Arrays;
@@ -44,21 +45,21 @@ public interface Helper {
     /**
      * Instance of the game
      */
-    Minecraft mc = Minecraft.getMinecraft();
+    Minecraft mc = Minecraft.getInstance();
 
     static ITextComponent getPrefix() {
         // Inner text component
         final Calendar now = Calendar.getInstance();
         final boolean xd = now.get(Calendar.MONTH) == Calendar.APRIL && now.get(Calendar.DAY_OF_MONTH) <= 3;
-        ITextComponent baritone = new TextComponentString(xd ? "Baritoe" : BaritoneAPI.getSettings().shortBaritonePrefix.value ? "B" : "Baritone");
-        baritone.getStyle().setColor(TextFormatting.LIGHT_PURPLE);
+        TextComponent baritone = new StringTextComponent(xd ? "Baritoe" : BaritoneAPI.getSettings().shortBaritonePrefix.value ? "B" : "Baritone");
+        baritone.setStyle(baritone.getStyle().setFormatting(TextFormatting.LIGHT_PURPLE));
 
         // Outer brackets
-        ITextComponent prefix = new TextComponentString("");
-        prefix.getStyle().setColor(TextFormatting.DARK_PURPLE);
-        prefix.appendText("[");
-        prefix.appendSibling(baritone);
-        prefix.appendText("]");
+        TextComponent prefix = new StringTextComponent("");
+        prefix.setStyle(baritone.getStyle().setFormatting(TextFormatting.DARK_PURPLE));
+        prefix.appendString("[");
+        prefix.append(baritone);
+        prefix.appendString("]");
 
         return prefix;
     }
@@ -70,7 +71,7 @@ public interface Helper {
      * @param message The message to display in the popup
      */
     default void logToast(ITextComponent title, ITextComponent message) {
-        mc.addScheduledTask(() -> BaritoneAPI.getSettings().toaster.value.accept(title, message));
+        mc.execute(() -> BaritoneAPI.getSettings().toaster.value.accept(title, message));
     }
 
     /**
@@ -80,7 +81,7 @@ public interface Helper {
      * @param message The message to display in the popup
      */
     default void logToast(String title, String message) {
-        logToast(new TextComponentString(title), new TextComponentString(message));
+        logToast(new StringTextComponent(title), new StringTextComponent(message));
     }
 
     /**
@@ -89,7 +90,7 @@ public interface Helper {
      * @param message The message to display in the popup
      */
     default void logToast(String message) {
-        logToast(Helper.getPrefix(), new TextComponentString(message));
+        logToast(Helper.getPrefix(), new StringTextComponent(message));
     }
 
     /**
@@ -131,7 +132,7 @@ public interface Helper {
      * @param error   Whether to log as an error
      */
     default void logNotificationDirect(String message, boolean error) {
-        mc.addScheduledTask(() -> BaritoneAPI.getSettings().notifier.value.accept(message, error));
+        mc.execute(() -> BaritoneAPI.getSettings().notifier.value.accept(message, error));
     }
 
     /**
@@ -157,18 +158,14 @@ public interface Helper {
      * @param components The components to send
      */
     default void logDirect(boolean logAsToast, ITextComponent... components) {
-        ITextComponent component = new TextComponentString("");
-        if (!logAsToast) {
-            // If we are not logging as a Toast
-            // Append the prefix to the base component line
-            component.appendSibling(getPrefix());
-            component.appendSibling(new TextComponentString(" "));
-        }
-        Arrays.asList(components).forEach(component::appendSibling);
+        TextComponent component = new StringTextComponent("");
+        component.append(getPrefix());
+        component.append(new StringTextComponent(" "));
+        Arrays.asList(components).forEach(component::append);
         if (logAsToast) {
             logToast(getPrefix(), component);
         } else {
-            mc.addScheduledTask(() -> BaritoneAPI.getSettings().logger.value.accept(component));
+            mc.execute(() -> BaritoneAPI.getSettings().logger.value.accept(component));
         }
     }
 
@@ -191,8 +188,8 @@ public interface Helper {
      */
     default void logDirect(String message, TextFormatting color, boolean logAsToast) {
         Stream.of(message.split("\n")).forEach(line -> {
-            ITextComponent component = new TextComponentString(line.replace("\t", "    "));
-            component.getStyle().setColor(color);
+            TextComponent component = new StringTextComponent(line.replace("\t", "    "));
+            component.setStyle(component.getStyle().setFormatting(color));
             logDirect(logAsToast, component);
         });
     }

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

@@ -18,14 +18,19 @@
 package baritone.api.utils;
 
 import baritone.api.cache.IWorldData;
-import net.minecraft.block.BlockSlab;
-import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.block.SlabBlock;
+import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.entity.Entity;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.BlockRayTraceResult;
 import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.math.vector.Vector3d;
 import net.minecraft.world.World;
 
 import java.util.Optional;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 
 /**
  * @author Brady
@@ -33,19 +38,28 @@ import java.util.Optional;
  */
 public interface IPlayerContext {
 
-    EntityPlayerSP player();
+    ClientPlayerEntity player();
 
     IPlayerController playerController();
 
     World world();
 
+    default Iterable<Entity> entities() {
+        return ((ClientWorld) world()).getAllEntities();
+    }
+
+    default Stream<Entity> entitiesStream() {
+        return StreamSupport.stream(entities().spliterator(), false);
+    }
+
+
     IWorldData worldData();
 
     RayTraceResult objectMouseOver();
 
     default BetterBlockPos playerFeet() {
         // TODO find a better way to deal with soul sand!!!!!
-        BetterBlockPos feet = new BetterBlockPos(player().posX, player().posY + 0.1251, player().posZ);
+        BetterBlockPos feet = new BetterBlockPos(player().getPositionVec().x, player().getPositionVec().y + 0.1251, player().getPositionVec().z);
 
         // sometimes when calling this from another thread or while world is null, it'll throw a NullPointerException
         // that causes the game to immediately crash
@@ -56,7 +70,7 @@ public interface IPlayerContext {
         // this does not impact performance at all since we're not null checking constantly
         // if there is an exception, the only overhead is Java generating the exception object... so we can ignore it
         try {
-            if (world().getBlockState(feet).getBlock() instanceof BlockSlab) {
+            if (world().getBlockState(feet).getBlock() instanceof SlabBlock) {
                 return feet.up();
             }
         } catch (NullPointerException ignored) {}
@@ -64,12 +78,12 @@ public interface IPlayerContext {
         return feet;
     }
 
-    default Vec3d playerFeetAsVec() {
-        return new Vec3d(player().posX, player().posY, player().posZ);
+    default Vector3d playerFeetAsVec() {
+        return new Vector3d(player().getPositionVec().x, player().getPositionVec().y, player().getPositionVec().z);
     }
 
-    default Vec3d playerHead() {
-        return new Vec3d(player().posX, player().posY + player().getEyeHeight(), player().posZ);
+    default Vector3d playerHead() {
+        return new Vector3d(player().getPositionVec().x, player().getPositionVec().y + player().getEyeHeight(), player().getPositionVec().z);
     }
 
     default Rotation playerRotations() {
@@ -77,7 +91,7 @@ public interface IPlayerContext {
     }
 
     static double eyeHeight(boolean ifSneaking) {
-        return ifSneaking ? 1.54 : 1.62;
+        return ifSneaking ? 1.27 : 1.62;
     }
 
     /**
@@ -87,8 +101,8 @@ public interface IPlayerContext {
      */
     default Optional<BlockPos> getSelectedBlock() {
         RayTraceResult result = objectMouseOver();
-        if (result != null && result.typeOfHit == RayTraceResult.Type.BLOCK) {
-            return Optional.of(result.getBlockPos());
+        if (result != null && result.getType() == RayTraceResult.Type.BLOCK) {
+            return Optional.of(((BlockRayTraceResult) result).getPos());
         }
         return Optional.empty();
     }

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

@@ -18,15 +18,15 @@
 package baritone.api.utils;
 
 import baritone.api.BaritoneAPI;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.ClickType;
+import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.inventory.container.ClickType;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.ActionResultType;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.math.BlockRayTraceResult;
 import net.minecraft.world.GameType;
 import net.minecraft.world.World;
 
@@ -40,19 +40,19 @@ public interface IPlayerController {
 
     boolean hasBrokenBlock();
 
-    boolean onPlayerDamageBlock(BlockPos pos, EnumFacing side);
+    boolean onPlayerDamageBlock(BlockPos pos, Direction side);
 
     void resetBlockRemoving();
 
-    ItemStack windowClick(int windowId, int slotId, int mouseButton, ClickType type, EntityPlayer player);
+    ItemStack windowClick(int windowId, int slotId, int mouseButton, ClickType type, PlayerEntity player);
 
     GameType getGameType();
 
-    EnumActionResult processRightClickBlock(EntityPlayerSP player, World world, BlockPos pos, EnumFacing direction, Vec3d vec, EnumHand hand);
+    ActionResultType processRightClickBlock(ClientPlayerEntity player, World world, Hand hand, BlockRayTraceResult result);
 
-    EnumActionResult processRightClick(EntityPlayerSP player, World world, EnumHand hand);
+    ActionResultType processRightClick(ClientPlayerEntity player, World world, Hand hand);
 
-    boolean clickBlock(BlockPos loc, EnumFacing face);
+    boolean clickBlock(BlockPos loc, Direction face);
 
     void setHittingBlock(boolean hittingBlock);
 

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

@@ -18,8 +18,9 @@
 package baritone.api.utils;
 
 import net.minecraft.entity.Entity;
+import net.minecraft.util.math.RayTraceContext;
 import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.math.vector.Vector3d;
 
 /**
  * @author Brady
@@ -44,22 +45,22 @@ public final class RayTraceUtils {
     }
 
     public static RayTraceResult rayTraceTowards(Entity entity, Rotation rotation, double blockReachDistance, boolean wouldSneak) {
-        Vec3d start;
+        Vector3d start;
         if (wouldSneak) {
             start = inferSneakingEyePosition(entity);
         } else {
-            start = entity.getPositionEyes(1.0F); // do whatever is correct
+            start = entity.getEyePosition(1.0F); // do whatever is correct
         }
-        Vec3d direction = RotationUtils.calcVec3dFromRotation(rotation);
-        Vec3d end = start.add(
+        Vector3d direction = RotationUtils.calcVector3dFromRotation(rotation);
+        Vector3d end = start.add(
                 direction.x * blockReachDistance,
                 direction.y * blockReachDistance,
                 direction.z * blockReachDistance
         );
-        return entity.world.rayTraceBlocks(start, end, false, false, true);
+        return entity.world.rayTraceBlocks(new RayTraceContext(start, end, RayTraceContext.BlockMode.OUTLINE, RayTraceContext.FluidMode.NONE, entity));
     }
 
-    public static Vec3d inferSneakingEyePosition(Entity entity) {
-        return new Vec3d(entity.posX, entity.posY + IPlayerContext.eyeHeight(true), entity.posZ);
+    public static Vector3d inferSneakingEyePosition(Entity entity) {
+        return new Vector3d(entity.getPosX(), entity.getPosY() + IPlayerContext.eyeHeight(true), entity.getPosZ());
     }
 }

src/api/java/baritone/api/utils/Rotation.java

@@ -36,6 +36,9 @@ public class Rotation {
     public Rotation(float yaw, float pitch) {
         this.yaw = yaw;
         this.pitch = pitch;
+        if (Float.isInfinite(yaw) || Float.isNaN(yaw) || Float.isInfinite(pitch) || Float.isNaN(pitch)) {
+            throw new IllegalStateException(yaw + " " + pitch);
+        }
     }
 
     /**

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

@@ -19,11 +19,18 @@ package baritone.api.utils;
 
 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
-import net.minecraft.block.BlockFire;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.block.AbstractFireBlock;
+import net.minecraft.block.BlockState;
+import net.minecraft.client.entity.player.ClientPlayerEntity;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.math.*;
+import net.minecraft.util.Direction;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.BlockRayTraceResult;
+import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.shapes.VoxelShape;
+import net.minecraft.util.math.shapes.VoxelShapes;
+import net.minecraft.util.math.vector.Vector3d;
 
 import java.util.Optional;
 
@@ -46,13 +53,13 @@ public final class RotationUtils {
     /**
      * Offsets from the root block position to the center of each side.
      */
-    private static final Vec3d[] BLOCK_SIDE_MULTIPLIERS = new Vec3d[]{
-            new Vec3d(0.5, 0, 0.5), // Down
-            new Vec3d(0.5, 1, 0.5), // Up
-            new Vec3d(0.5, 0.5, 0), // North
-            new Vec3d(0.5, 0.5, 1), // South
-            new Vec3d(0, 0.5, 0.5), // West
-            new Vec3d(1, 0.5, 0.5)  // East
+    private static final Vector3d[] BLOCK_SIDE_MULTIPLIERS = new Vector3d[]{
+            new Vector3d(0.5, 0, 0.5), // Down
+            new Vector3d(0.5, 1, 0.5), // Up
+            new Vector3d(0.5, 0.5, 0), // North
+            new Vector3d(0.5, 0.5, 1), // South
+            new Vector3d(0, 0.5, 0.5), // West
+            new Vector3d(1, 0.5, 0.5)  // East
     };
 
     private RotationUtils() {}
@@ -65,7 +72,7 @@ public final class RotationUtils {
      * @return The rotation from the origin to the destination
      */
     public static Rotation calcRotationFromCoords(BlockPos orig, BlockPos dest) {
-        return calcRotationFromVec3d(new Vec3d(orig), new Vec3d(dest));
+        return calcRotationFromVec3d(new Vector3d(orig.getX(), orig.getY(), orig.getZ()), new Vector3d(dest.getX(), dest.getY(), dest.getZ()));
     }
 
     /**
@@ -94,7 +101,7 @@ public final class RotationUtils {
      * @return The rotation from the origin to the destination
      * @see #wrapAnglesToRelative(Rotation, Rotation)
      */
-    public static Rotation calcRotationFromVec3d(Vec3d orig, Vec3d dest, Rotation current) {
+    public static Rotation calcRotationFromVec3d(Vector3d orig, Vector3d dest, Rotation current) {
         return wrapAnglesToRelative(current, calcRotationFromVec3d(orig, dest));
     }
 
@@ -105,7 +112,7 @@ public final class RotationUtils {
      * @param dest The destination position
      * @return The rotation from the origin to the destination
      */
-    private static Rotation calcRotationFromVec3d(Vec3d orig, Vec3d dest) {
+    private static Rotation calcRotationFromVec3d(Vector3d orig, Vector3d dest) {
         double[] delta = {orig.x - dest.x, orig.y - dest.y, orig.z - dest.z};
         double yaw = MathHelper.atan2(delta[0], -delta[2]);
         double dist = Math.sqrt(delta[0] * delta[0] + delta[2] * delta[2]);
@@ -122,19 +129,19 @@ public final class RotationUtils {
      * @param rotation The input rotation
      * @return Look vector for the rotation
      */
-    public static Vec3d calcVec3dFromRotation(Rotation rotation) {
+    public static Vector3d calcVector3dFromRotation(Rotation rotation) {
         float f = MathHelper.cos(-rotation.getYaw() * (float) DEG_TO_RAD - (float) Math.PI);
         float f1 = MathHelper.sin(-rotation.getYaw() * (float) DEG_TO_RAD - (float) Math.PI);
         float f2 = -MathHelper.cos(-rotation.getPitch() * (float) DEG_TO_RAD);
         float f3 = MathHelper.sin(-rotation.getPitch() * (float) DEG_TO_RAD);
-        return new Vec3d((double) (f1 * f2), (double) f3, (double) (f * f2));
+        return new Vector3d((double) (f1 * f2), (double) f3, (double) (f * f2));
     }
 
     /**
      * @param ctx Context for the viewing entity
      * @param pos The target block position
      * @return The optional rotation
-     * @see #reachable(EntityPlayerSP, BlockPos, double)
+     * @see #reachable(ClientPlayerEntity, BlockPos, double)
      */
     public static Optional<Rotation> reachable(IPlayerContext ctx, BlockPos pos) {
         return reachable(ctx.player(), pos, ctx.playerController().getBlockReachDistance());
@@ -156,11 +163,11 @@ public final class RotationUtils {
      * @param blockReachDistance The block reach distance of the entity
      * @return The optional rotation
      */
-    public static Optional<Rotation> reachable(EntityPlayerSP entity, BlockPos pos, double blockReachDistance) {
+    public static Optional<Rotation> reachable(ClientPlayerEntity entity, BlockPos pos, double blockReachDistance) {
         return reachable(entity, pos, blockReachDistance, false);
     }
 
-    public static Optional<Rotation> reachable(EntityPlayerSP entity, BlockPos pos, double blockReachDistance, boolean wouldSneak) {
+    public static Optional<Rotation> reachable(ClientPlayerEntity entity, BlockPos pos, double blockReachDistance, boolean wouldSneak) {
         IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer(entity);
         if (baritone.getPlayerContext().isLookingAt(pos)) {
             /*
@@ -177,7 +184,7 @@ public final class RotationUtils {
             if (wouldSneak) {
                 // the concern here is: what if we're looking at it now, but as soon as we start sneaking we no longer are
                 RayTraceResult result = RayTraceUtils.rayTraceTowards(entity, hypothetical, blockReachDistance, true);
-                if (result != null && result.typeOfHit == RayTraceResult.Type.BLOCK && result.getBlockPos().equals(pos)) {
+                if (result != null && result.getType() == RayTraceResult.Type.BLOCK && ((BlockRayTraceResult) result).getPos().equals(pos)) {
                     return Optional.of(hypothetical); // yes, if we sneaked we would still be looking at the block
                 }
             } else {
@@ -190,13 +197,16 @@ public final class RotationUtils {
             return possibleRotation;
         }
 
-        IBlockState state = entity.world.getBlockState(pos);
-        AxisAlignedBB aabb = state.getBoundingBox(entity.world, pos);
-        for (Vec3d sideOffset : BLOCK_SIDE_MULTIPLIERS) {
-            double xDiff = aabb.minX * sideOffset.x + aabb.maxX * (1 - sideOffset.x);
-            double yDiff = aabb.minY * sideOffset.y + aabb.maxY * (1 - sideOffset.y);
-            double zDiff = aabb.minZ * sideOffset.z + aabb.maxZ * (1 - sideOffset.z);
-            possibleRotation = reachableOffset(entity, pos, new Vec3d(pos).add(xDiff, yDiff, zDiff), blockReachDistance, wouldSneak);
+        BlockState state = entity.world.getBlockState(pos);
+        VoxelShape shape = state.getShape(entity.world, pos);
+        if (shape.isEmpty()) {
+            shape = VoxelShapes.fullCube();
+        }
+        for (Vector3d sideOffset : BLOCK_SIDE_MULTIPLIERS) {
+            double xDiff = shape.getStart(Direction.Axis.X) * sideOffset.x + shape.getEnd(Direction.Axis.X) * (1 - sideOffset.x);
+            double yDiff = shape.getStart(Direction.Axis.Y) * sideOffset.y + shape.getEnd(Direction.Axis.Y) * (1 - sideOffset.y);
+            double zDiff = shape.getStart(Direction.Axis.Z) * sideOffset.z + shape.getEnd(Direction.Axis.Z) * (1 - sideOffset.z);
+            possibleRotation = reachableOffset(entity, pos, new Vector3d(pos.getX(), pos.getY(), pos.getZ()).add(xDiff, yDiff, zDiff), blockReachDistance, wouldSneak);
             if (possibleRotation.isPresent()) {
                 return possibleRotation;
             }
@@ -215,16 +225,16 @@ public final class RotationUtils {
      * @param blockReachDistance The block reach distance of the entity
      * @return The optional rotation
      */
-    public static Optional<Rotation> reachableOffset(Entity entity, BlockPos pos, Vec3d offsetPos, double blockReachDistance, boolean wouldSneak) {
-        Vec3d eyes = wouldSneak ? RayTraceUtils.inferSneakingEyePosition(entity) : entity.getPositionEyes(1.0F);
+    public static Optional<Rotation> reachableOffset(Entity entity, BlockPos pos, Vector3d offsetPos, double blockReachDistance, boolean wouldSneak) {
+        Vector3d eyes = wouldSneak ? RayTraceUtils.inferSneakingEyePosition(entity) : entity.getEyePosition(1.0F);
         Rotation rotation = calcRotationFromVec3d(eyes, offsetPos, new Rotation(entity.rotationYaw, entity.rotationPitch));
         RayTraceResult result = RayTraceUtils.rayTraceTowards(entity, rotation, blockReachDistance, wouldSneak);
         //System.out.println(result);
-        if (result != null && result.typeOfHit == RayTraceResult.Type.BLOCK) {
-            if (result.getBlockPos().equals(pos)) {
+        if (result != null && result.getType() == RayTraceResult.Type.BLOCK) {
+            if (((BlockRayTraceResult) result).getPos().equals(pos)) {
                 return Optional.of(rotation);
             }
-            if (entity.world.getBlockState(pos).getBlock() instanceof BlockFire && result.getBlockPos().equals(pos.down())) {
+            if (entity.world.getBlockState(pos).getBlock() instanceof AbstractFireBlock && ((BlockRayTraceResult) result).getPos().equals(pos.down())) {
                 return Optional.of(rotation);
             }
         }

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

@@ -20,9 +20,12 @@ package baritone.api.utils;
 import baritone.api.BaritoneAPI;
 import baritone.api.Settings;
 import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
 import net.minecraft.item.Item;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.Vec3i;
+import net.minecraft.util.Direction;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.math.vector.Vector3i;
+import net.minecraft.util.registry.Registry;
 
 import java.awt.*;
 import java.io.BufferedReader;
@@ -44,14 +47,14 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static net.minecraft.client.Minecraft.getMinecraft;
 
 public class SettingsUtil {
 
-    private static final Path SETTINGS_PATH = getMinecraft().gameDir.toPath().resolve("baritone").resolve("settings.txt");
+    private static final Path SETTINGS_PATH = Minecraft.getInstance().gameDir.toPath().resolve("baritone").resolve("settings.txt");
     private static final Pattern SETTING_PATTERN = Pattern.compile("^(?<setting>[^ ]+) +(?<value>.+)"); // key and value split by the first space
     private static final String[] JAVA_ONLY_SETTINGS = {"logger", "notifier", "toaster"};
 
+
     private static boolean isComment(String line) {
         return line.startsWith("#") || line.startsWith("//");
     }
@@ -176,7 +179,7 @@ public class SettingsUtil {
     /**
      * This should always be the same as whether the setting can be parsed from or serialized to a string
      *
-     * @param the setting
+     * @param setting The Setting
      * @return true if the setting can not be set or read by the user
      */
     public static boolean javaOnlySetting(Settings.Setting setting) {
@@ -232,15 +235,15 @@ public class SettingsUtil {
         FLOAT(Float.class, Float::parseFloat),
         LONG(Long.class, Long::parseLong),
         STRING(String.class, String::new),
-        ENUMFACING(EnumFacing.class, EnumFacing::byName),
+        DIRECTION(Direction.class, Direction::byName),
         COLOR(
                 Color.class,
                 str -> new Color(Integer.parseInt(str.split(",")[0]), Integer.parseInt(str.split(",")[1]), Integer.parseInt(str.split(",")[2])),
                 color -> color.getRed() + "," + color.getGreen() + "," + color.getBlue()
         ),
         VEC3I(
-                Vec3i.class,
-                str -> new Vec3i(Integer.parseInt(str.split(",")[0]), Integer.parseInt(str.split(",")[1]), Integer.parseInt(str.split(",")[2])),
+                Vector3i.class,
+                str -> new Vector3i(Integer.parseInt(str.split(",")[0]), Integer.parseInt(str.split(",")[1]), Integer.parseInt(str.split(",")[2])),
                 vec -> vec.getX() + "," + vec.getY() + "," + vec.getZ()
         ),
         BLOCK(
@@ -250,15 +253,14 @@ public class SettingsUtil {
         ),
         ITEM(
                 Item.class,
-                str -> Item.getByNameOrId(str.trim()),
-                item -> Item.REGISTRY.getNameForObject(item).toString()
+                str -> Registry.ITEM.getOrDefault(new ResourceLocation(str.trim())), // TODO this now returns AIR on failure instead of null, is that an issue?
+                item -> Registry.ITEM.getKey(item).toString()
         ),
         LIST() {
             @Override
             public Object parse(ParserContext context, String raw) {
                 Type type = ((ParameterizedType) context.getSetting().getType()).getActualTypeArguments()[0];
                 Parser parser = Parser.getParser(type);
-
                 return Stream.of(raw.split(","))
                         .map(s -> parser.parse(context, s))
                         .collect(Collectors.toList());
@@ -299,7 +301,7 @@ public class SettingsUtil {
                 Parser keyParser = Parser.getParser(keyType);
                 Parser valueParser = Parser.getParser(valueType);
 
-                return ((Map<?,?>) value).entrySet().stream()
+                return ((Map<?, ?>) value).entrySet().stream()
                         .map(o -> keyParser.toString(context, o.getKey()) + "->" + valueParser.toString(context, o.getValue()))
                         .collect(Collectors.joining(","));
             }

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

@@ -17,12 +17,13 @@
 
 package baritone.api.utils;
 
-import net.minecraft.block.BlockFire;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.AbstractFireBlock;
+import net.minecraft.block.BlockState;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.math.shapes.VoxelShape;
+import net.minecraft.util.math.vector.Vector3d;
 import net.minecraft.world.World;
 
 /**
@@ -41,16 +42,22 @@ public final class VecUtils {
      * @return The center of the block's bounding box
      * @see #getBlockPosCenter(BlockPos)
      */
-    public static Vec3d calculateBlockCenter(World world, BlockPos pos) {
-        IBlockState b = world.getBlockState(pos);
-        AxisAlignedBB bbox = b.getBoundingBox(world, pos);
-        double xDiff = (bbox.minX + bbox.maxX) / 2;
-        double yDiff = (bbox.minY + bbox.maxY) / 2;
-        double zDiff = (bbox.minZ + bbox.maxZ) / 2;
-        if (b.getBlock() instanceof BlockFire) {//look at bottom of fire when putting it out
+    public static Vector3d calculateBlockCenter(World world, BlockPos pos) {
+        BlockState b = world.getBlockState(pos);
+        VoxelShape shape = b.getCollisionShape(world, pos);
+        if (shape.isEmpty()) {
+            return getBlockPosCenter(pos);
+        }
+        double xDiff = (shape.getStart(Direction.Axis.X) + shape.getEnd(Direction.Axis.X)) / 2;
+        double yDiff = (shape.getStart(Direction.Axis.Y) + shape.getEnd(Direction.Axis.Y)) / 2;
+        double zDiff = (shape.getStart(Direction.Axis.Z) + shape.getEnd(Direction.Axis.Z)) / 2;
+        if (Double.isNaN(xDiff) || Double.isNaN(yDiff) || Double.isNaN(zDiff)) {
+            throw new IllegalStateException(b + " " + pos + " " + shape);
+        }
+        if (b.getBlock() instanceof AbstractFireBlock) {//look at bottom of fire when putting it out
             yDiff = 0;
         }
-        return new Vec3d(
+        return new Vector3d(
                 pos.getX() + xDiff,
                 pos.getY() + yDiff,
                 pos.getZ() + zDiff
@@ -67,8 +74,8 @@ public final class VecUtils {
      * @return The assumed center of the position
      * @see #calculateBlockCenter(World, BlockPos)
      */
-    public static Vec3d getBlockPosCenter(BlockPos pos) {
-        return new Vec3d(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
+    public static Vector3d getBlockPosCenter(BlockPos pos) {
+        return new Vector3d(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
     }
 
     /**
@@ -98,7 +105,7 @@ public final class VecUtils {
      * @see #getBlockPosCenter(BlockPos)
      */
     public static double entityDistanceToCenter(Entity entity, BlockPos pos) {
-        return distanceToCenter(pos, entity.posX, entity.posY, entity.posZ);
+        return distanceToCenter(pos, entity.getPositionVec().x, entity.getPositionVec().y, entity.getPositionVec().z);
     }
 
     /**
@@ -111,6 +118,6 @@ public final class VecUtils {
      * @see #getBlockPosCenter(BlockPos)
      */
     public static double entityFlatDistanceToCenter(Entity entity, BlockPos pos) {
-        return distanceToCenter(pos, entity.posX, pos.getY() + 0.5, entity.posZ);
+        return distanceToCenter(pos, entity.getPositionVec().x, pos.getY() + 0.5, entity.getPositionVec().z);
     }
 }

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

@@ -17,9 +17,10 @@
 
 package baritone.api.utils.gui;
 
-import net.minecraft.client.gui.toasts.GuiToast;
+import com.mojang.blaze3d.matrix.MatrixStack;
+import com.mojang.blaze3d.platform.GlStateManager;
 import net.minecraft.client.gui.toasts.IToast;
-import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.gui.toasts.ToastGui;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.ITextComponent;
 
@@ -31,38 +32,38 @@ public class BaritoneToast implements IToast {
     private long totalShowTime;
 
     public BaritoneToast(ITextComponent titleComponent, ITextComponent subtitleComponent, long totalShowTime) {
-        this.title = titleComponent.getFormattedText();
-        this.subtitle = subtitleComponent == null ? null : subtitleComponent.getFormattedText();
+        this.title = titleComponent.getString();
+        this.subtitle = subtitleComponent == null ? null : subtitleComponent.getString();
         this.totalShowTime = totalShowTime;
     }
 
-    public Visibility draw(GuiToast toastGui, long delta) {
+    public Visibility func_230444_a_(MatrixStack matrixStack, ToastGui toastGui, long delta) {
         if (this.newDisplay) {
             this.firstDrawTime = delta;
             this.newDisplay = false;
         }
 
         toastGui.getMinecraft().getTextureManager().bindTexture(new ResourceLocation("textures/gui/toasts.png"));
-        GlStateManager.color(1.0F, 1.0F, 1.0F, 255.0f);
-        toastGui.drawTexturedModalRect(0, 0, 0, 32, 160, 32);
+        GlStateManager.color4f(1.0F, 1.0F, 1.0F, 255.0f);
+        toastGui.blit(matrixStack, 0, 0, 0, 32, 160, 32);
 
         if (this.subtitle == null) {
-            toastGui.getMinecraft().fontRenderer.drawString(this.title, 18, 12, -11534256);
+            toastGui.getMinecraft().fontRenderer.drawString(matrixStack, this.title, 18, 12, -11534256);
         } else {
-            toastGui.getMinecraft().fontRenderer.drawString(this.title, 18, 7, -11534256);
-            toastGui.getMinecraft().fontRenderer.drawString(this.subtitle, 18, 18, -16777216);
+            toastGui.getMinecraft().fontRenderer.drawString(matrixStack, this.title, 18, 7, -11534256);
+            toastGui.getMinecraft().fontRenderer.drawString(matrixStack, this.subtitle, 18, 18, -16777216);
         }
 
         return delta - this.firstDrawTime < totalShowTime ? Visibility.SHOW : Visibility.HIDE;
     }
 
     public void setDisplayedText(ITextComponent titleComponent, ITextComponent subtitleComponent) {
-        this.title = titleComponent.getFormattedText();
-        this.subtitle = subtitleComponent == null ? null : subtitleComponent.getFormattedText();
+        this.title = titleComponent.getString();
+        this.subtitle = subtitleComponent == null ? null : subtitleComponent.getString();
         this.newDisplay = true;
     }
 
-    public static void addOrUpdate(GuiToast toast, ITextComponent title, ITextComponent subtitle, long totalShowTime) {
+    public static void addOrUpdate(ToastGui toast, ITextComponent title, ITextComponent subtitle, long totalShowTime) {
         BaritoneToast baritonetoast = toast.getToast(BaritoneToast.class, new Object());
 
         if (baritonetoast == null) {
@@ -73,6 +74,6 @@ public class BaritoneToast implements IToast {
     }
 
     public static void addOrUpdate(ITextComponent title, ITextComponent subtitle) {
-        addOrUpdate(net.minecraft.client.Minecraft.getMinecraft().getToastGui(), title, subtitle, baritone.api.BaritoneAPI.getSettings().toastTimer.value);
+        addOrUpdate(net.minecraft.client.Minecraft.getInstance().getToastGui(), title, subtitle, baritone.api.BaritoneAPI.getSettings().toastTimer.value);
     }
 }

src/launch/java/baritone/launch/BaritoneMixinConnector.java

@@ -0,0 +1,29 @@
+/*
+ * 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");
+    }
+}

src/launch/java/baritone/launch/LaunchTesting.java

@@ -0,0 +1,105 @@
+/*
+ * 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 com.google.common.base.Strings;
+import com.google.gson.GsonBuilder;
+import com.mojang.authlib.Agent;
+import com.mojang.authlib.exceptions.AuthenticationException;
+import com.mojang.authlib.properties.PropertyMap;
+import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
+import com.mojang.authlib.yggdrasil.YggdrasilUserAuthentication;
+import net.minecraft.launchwrapper.Launch;
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.net.Proxy;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Based on GradleStart from ForgeGradle 2.3
+ *
+ * @author Brady
+ * @since 3/11/2019
+ */
+public class LaunchTesting {
+
+    public static void main(String[] args) {
+        Map<String, String> arguments = new HashMap<>();
+
+        hackNatives();
+        arguments.put("version", "BaritownedDeveloperEnvironment");
+        arguments.put("assetIndex", System.getenv("assetIndex"));
+        arguments.put("assetsDir", System.getenv().getOrDefault("assetDirectory", "assets"));
+        arguments.put("accessToken", "FML");
+        arguments.put("userProperties", "{}");
+        arguments.put("tweakClass", System.getenv("tweakClass"));
+        String password = System.getenv("password");
+        if (password != null && !password.isEmpty()) {
+            attemptLogin(arguments, System.getenv("username"), System.getenv("password"));
+        }
+
+        List<String> argsArray = new ArrayList<>();
+        arguments.forEach((k, v) -> {
+            argsArray.add("--" + k);
+            argsArray.add(v);
+        });
+
+        Launch.main(argsArray.toArray(new String[0]));
+    }
+
+    private static void hackNatives() {
+        String paths = System.getProperty("java.library.path");
+        String nativesDir = System.getenv().get("nativesDirectory");
+
+        if (Strings.isNullOrEmpty(paths))
+            paths = nativesDir;
+        else
+            paths += File.pathSeparator + nativesDir;
+
+        System.setProperty("java.library.path", paths);
+
+        // hack the classloader now.
+        try {
+            final Field sysPathsField = ClassLoader.class.getDeclaredField("sys_paths");
+            sysPathsField.setAccessible(true);
+            sysPathsField.set(null, null);
+        } catch (Throwable ignored) {}
+    }
+
+    private static void attemptLogin(Map<String, String> argMap, String username, String password) {
+        YggdrasilUserAuthentication auth = (YggdrasilUserAuthentication) (new YggdrasilAuthenticationService(Proxy.NO_PROXY, "1")).createUserAuthentication(Agent.MINECRAFT);
+        auth.setUsername(username);
+        auth.setPassword(password);
+
+        try {
+            auth.logIn();
+        } catch (AuthenticationException var4) {
+            throw new RuntimeException(var4);
+        }
+
+        argMap.put("accessToken", auth.getAuthenticatedToken());
+        argMap.put("uuid", auth.getSelectedProfile().getId().toString().replace("-", ""));
+        argMap.put("username", auth.getSelectedProfile().getName());
+        argMap.put("userType", auth.getUserType().getName());
+        argMap.put("userProperties", (new GsonBuilder()).registerTypeAdapter(PropertyMap.class, new PropertyMap.Serializer()).create().toJson(auth.getUserProperties()));
+    }
+}

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

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

src/launch/java/baritone/launch/mixins/MixinBlockStateContainer.java

@@ -1,47 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.launch.mixins;
-
-import baritone.utils.accessor.IBitArray;
-import baritone.utils.accessor.IBlockStateContainer;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.util.BitArray;
-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(BlockStateContainer.class)
-public abstract class MixinBlockStateContainer implements IBlockStateContainer {
-
-    @Shadow
-    protected BitArray storage;
-
-    @Shadow
-    protected IBlockStatePalette palette;
-
-    @Override
-    public IBlockState getAtPalette(int index) {
-        return palette.getBlockState(index);
-    }
-
-    @Override
-    public int[] storageArray() {
-        return ((IBitArray) storage).toArray();
-    }
-}

src/launch/java/baritone/launch/mixins/MixinChatTabCompleter.java

@@ -1,39 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.launch.mixins;
-
-import net.minecraft.client.gui.GuiChat;
-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;
-
-@Mixin(GuiChat.ChatTabCompleter.class)
-public abstract class MixinChatTabCompleter extends MixinTabCompleter {
-
-    @Inject(
-            method = "complete",
-            at = @At("HEAD"),
-            cancellable = true
-    )
-    private void onComplete(CallbackInfo ci) {
-        if (dontComplete) {
-            ci.cancel();
-        }
-    }
-}

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

@@ -0,0 +1,92 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.launch.mixins;
+
+import baritone.utils.accessor.IChunkArray;
+import net.minecraft.util.math.ChunkPos;
+import net.minecraft.world.chunk.Chunk;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import java.util.concurrent.atomic.AtomicReferenceArray;
+
+@Mixin(targets = "net.minecraft.client.multiplayer.ClientChunkProvider$ChunkArray")
+public abstract class MixinChunkArray implements IChunkArray {
+    @Shadow
+    private AtomicReferenceArray<Chunk> chunks;
+    @Shadow
+    private int viewDistance;
+    @Shadow
+    private int sideLength;
+    @Shadow
+    private int centerX;
+    @Shadow
+    private int centerZ;
+    @Shadow
+    private int loaded;
+
+    @Shadow
+    protected abstract boolean inView(int x, int z);
+
+    @Shadow
+    protected abstract int getIndex(int x, int z);
+
+    @Shadow
+    protected abstract void replace(int index, Chunk chunk);
+
+    @Override
+    public int centerX() {
+        return centerX;
+    }
+
+    @Override
+    public int centerZ() {
+        return centerZ;
+    }
+
+    @Override
+    public int viewDistance() {
+        return viewDistance;
+    }
+
+    @Override
+    public AtomicReferenceArray<Chunk> getChunks() {
+        return chunks;
+    }
+
+    @Override
+    public void copyFrom(IChunkArray other) {
+        centerX = other.centerX();
+        centerZ = other.centerZ();
+
+        AtomicReferenceArray<Chunk> copyingFrom = other.getChunks();
+        for (int k = 0; k < copyingFrom.length(); ++k) {
+            Chunk chunk = copyingFrom.get(k);
+            if (chunk != null) {
+                ChunkPos chunkpos = chunk.getPos();
+                if (inView(chunkpos.x, chunkpos.z)) {
+                    int index = getIndex(chunkpos.x, chunkpos.z);
+                    if (chunks.get(index) != null) {
+                        throw new IllegalStateException("Doing this would mutate the client's REAL loaded chunks?!");
+                    }
+                    replace(index, chunk);
+                }
+            }
+        }
+    }
+}

src/launch/java/baritone/launch/mixins/MixinChunkProviderClient.java

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

src/launch/java/baritone/launch/mixins/MixinChunkProviderServer.java

@@ -1,42 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.launch.mixins;
-
-import baritone.utils.accessor.IChunkProviderServer;
-import net.minecraft.world.chunk.storage.IChunkLoader;
-import net.minecraft.world.gen.ChunkProviderServer;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-/**
- * @author Brady
- * @since 9/4/2018
- */
-@Mixin(ChunkProviderServer.class)
-public class MixinChunkProviderServer implements IChunkProviderServer {
-
-    @Shadow
-    @Final
-    private IChunkLoader chunkLoader;
-
-    @Override
-    public IChunkLoader getChunkLoader() {
-        return this.chunkLoader;
-    }
-}

src/launch/java/baritone/launch/mixins/MixinChunkRenderContainer.java

@@ -1,52 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.launch.mixins;
-
-import baritone.Baritone;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.ChunkRenderContainer;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.chunk.RenderChunk;
-import net.minecraft.util.math.BlockPos;
-import org.lwjgl.opengl.GL14;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-import static org.lwjgl.opengl.GL11.*;
-
-@Mixin(ChunkRenderContainer.class)
-public class MixinChunkRenderContainer {
-
-    @Redirect( // avoid creating CallbackInfo at all costs; this is called 40k times per second
-            method = "preRenderChunk",
-            at = @At(
-                    value = "INVOKE",
-                    target = "net/minecraft/client/renderer/chunk/RenderChunk.getPosition()Lnet/minecraft/util/math/BlockPos;"
-            )
-    )
-    private BlockPos getPosition(RenderChunk renderChunkIn) {
-        if (Baritone.settings().renderCachedChunks.value && !Minecraft.getMinecraft().isSingleplayer() && Minecraft.getMinecraft().world.getChunk(renderChunkIn.getPosition()).isEmpty()) {
-            GlStateManager.enableAlpha();
-            GlStateManager.enableBlend();
-            GL14.glBlendColor(0, 0, 0, Baritone.settings().cachedChunksOpacity.value);
-            GlStateManager.tryBlendFuncSeparate(GL_CONSTANT_ALPHA, GL_ONE_MINUS_CONSTANT_ALPHA, GL_ONE, GL_ZERO);
-        }
-        return renderChunkIn.getPosition();
-    }
-}

src/launch/java/baritone/launch/mixins/MixinChunkRenderWorker.java

@@ -1,57 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.launch.mixins;
-
-import baritone.Baritone;
-import baritone.api.BaritoneAPI;
-import baritone.api.utils.IPlayerContext;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.chunk.ChunkRenderWorker;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-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.Redirect;
-
-@Mixin(ChunkRenderWorker.class)
-public abstract class MixinChunkRenderWorker {
-
-    @Shadow
-    protected abstract boolean isChunkExisting(BlockPos pos, World worldIn);
-
-    @Redirect(
-            method = "processTask",
-            at = @At(
-                    value = "INVOKE",
-                    target = "net/minecraft/client/renderer/chunk/ChunkRenderWorker.isChunkExisting(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/World;)Z"
-            )
-    )
-    private boolean isChunkExisting(ChunkRenderWorker worker, BlockPos pos, World world) {
-        if (Baritone.settings().renderCachedChunks.value && !Minecraft.getMinecraft().isSingleplayer()) {
-            Baritone baritone = (Baritone) BaritoneAPI.getProvider().getPrimaryBaritone();
-            IPlayerContext ctx = baritone.getPlayerContext();
-            if (ctx.player() != null && ctx.world() != null && baritone.bsi != null) {
-                return baritone.bsi.isLoaded(pos.getX(), pos.getZ()) || this.isChunkExisting(pos, world);
-            }
-        }
-
-        return this.isChunkExisting(pos, world);
-    }
-}
-

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

@@ -0,0 +1,61 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.launch.mixins;
+
+import baritone.utils.accessor.IChunkArray;
+import baritone.utils.accessor.IClientChunkProvider;
+import net.minecraft.client.multiplayer.ClientChunkProvider;
+import net.minecraft.client.world.ClientWorld;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import java.lang.reflect.Field;
+import java.util.Arrays;
+
+@Mixin(ClientChunkProvider.class)
+public class MixinClientChunkProvider implements IClientChunkProvider {
+
+    @Shadow
+    private ClientWorld world;
+
+    @Override
+    public ClientChunkProvider createThreadSafeCopy() {
+        IChunkArray arr = extractReferenceArray();
+        ClientChunkProvider result = new ClientChunkProvider(world, arr.viewDistance() - 3); // -3 because its adds 3 for no reason lmao
+        IChunkArray copyArr = ((IClientChunkProvider) result).extractReferenceArray();
+        copyArr.copyFrom(arr);
+        if (copyArr.viewDistance() != arr.viewDistance()) {
+            throw new IllegalStateException(copyArr.viewDistance() + " " + arr.viewDistance());
+        }
+        return result;
+    }
+
+    @Override
+    public IChunkArray extractReferenceArray() {
+        for (Field f : ClientChunkProvider.class.getDeclaredFields()) {
+            if (IChunkArray.class.isAssignableFrom(f.getType())) {
+                try {
+                    return (IChunkArray) f.get(this);
+                } catch (IllegalAccessException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+        throw new RuntimeException(Arrays.toString(ClientChunkProvider.class.getDeclaredFields()));
+    }
+}

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

@@ -23,12 +23,9 @@ import baritone.api.IBaritone;
 import baritone.api.event.events.ChunkEvent;
 import baritone.api.event.events.type.EventState;
 import baritone.cache.CachedChunk;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.client.network.NetHandlerPlayClient;
-import net.minecraft.network.play.server.SPacketBlockChange;
-import net.minecraft.network.play.server.SPacketChunkData;
-import net.minecraft.network.play.server.SPacketCombatEvent;
-import net.minecraft.network.play.server.SPacketMultiBlockChange;
+import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.client.network.play.ClientPlayNetHandler;
+import net.minecraft.network.play.server.*;
 import net.minecraft.util.math.ChunkPos;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -39,20 +36,21 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
  * @author Brady
  * @since 8/3/2018
  */
-@Mixin(NetHandlerPlayClient.class)
-public class MixinNetHandlerPlayClient {
+@Mixin(ClientPlayNetHandler.class)
+public class MixinClientPlayNetHandler {
 
-    @Inject(
+    // unused lol
+    /*@Inject(
             method = "handleChunkData",
             at = @At(
                     value = "INVOKE",
-                    target = "net/minecraft/world/chunk/Chunk.read(Lnet/minecraft/network/PacketBuffer;IZ)V"
+                    target = "net/minecraft/client/multiplayer/ChunkProviderClient.func_212474_a(IILnet/minecraft/network/PacketBuffer;IZ)Lnet/minecraft/world/chunk/Chunk;"
             )
     )
     private void preRead(SPacketChunkData packetIn, CallbackInfo ci) {
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            EntityPlayerSP player = ibaritone.getPlayerContext().player();
-            if (player != null && player.connection == (NetHandlerPlayClient) (Object) this) {
+            ClientPlayerEntity player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (ClientPlayNetHandler) (Object) this) {
                 ibaritone.getGameEventHandler().onChunkEvent(
                         new ChunkEvent(
                                 EventState.PRE,
@@ -63,16 +61,16 @@ public class MixinNetHandlerPlayClient {
                 );
             }
         }
-    }
+    }*/
 
     @Inject(
             method = "handleChunkData",
             at = @At("RETURN")
     )
-    private void postHandleChunkData(SPacketChunkData packetIn, CallbackInfo ci) {
+    private void postHandleChunkData(SChunkDataPacket packetIn, CallbackInfo ci) {
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            EntityPlayerSP player = ibaritone.getPlayerContext().player();
-            if (player != null && player.connection == (NetHandlerPlayClient) (Object) this) {
+            ClientPlayerEntity player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (ClientPlayNetHandler) (Object) this) {
                 ibaritone.getGameEventHandler().onChunkEvent(
                         new ChunkEvent(
                                 EventState.POST,
@@ -85,26 +83,56 @@ public class MixinNetHandlerPlayClient {
         }
     }
 
+    @Inject(
+            method = "processChunkUnload",
+            at = @At("HEAD")
+    )
+    private void preChunkUnload(SUnloadChunkPacket packet, CallbackInfo ci) {
+        for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
+            ClientPlayerEntity player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (ClientPlayNetHandler) (Object) this) {
+                ibaritone.getGameEventHandler().onChunkEvent(
+                        new ChunkEvent(EventState.PRE, ChunkEvent.Type.UNLOAD, packet.getX(), packet.getZ())
+                );
+            }
+        }
+    }
+
+    @Inject(
+            method = "processChunkUnload",
+            at = @At("RETURN")
+    )
+    private void postChunkUnload(SUnloadChunkPacket packet, CallbackInfo ci) {
+        for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
+            ClientPlayerEntity player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (ClientPlayNetHandler) (Object) this) {
+                ibaritone.getGameEventHandler().onChunkEvent(
+                        new ChunkEvent(EventState.POST, ChunkEvent.Type.UNLOAD, packet.getX(), packet.getZ())
+                );
+            }
+        }
+    }
+
     @Inject(
             method = "handleBlockChange",
             at = @At("RETURN")
     )
-    private void postHandleBlockChange(SPacketBlockChange packetIn, CallbackInfo ci) {
+    private void postHandleBlockChange(SChangeBlockPacket packetIn, CallbackInfo ci) {
         if (!Baritone.settings().repackOnAnyBlockChange.value) {
             return;
         }
-        if (!CachedChunk.BLOCKS_TO_KEEP_TRACK_OF.contains(packetIn.getBlockState().getBlock())) {
+        if (!CachedChunk.BLOCKS_TO_KEEP_TRACK_OF.contains(packetIn.getState().getBlock())) {
             return;
         }
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            EntityPlayerSP player = ibaritone.getPlayerContext().player();
-            if (player != null && player.connection == (NetHandlerPlayClient) (Object) this) {
+            ClientPlayerEntity player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (ClientPlayNetHandler) (Object) this) {
                 ibaritone.getGameEventHandler().onChunkEvent(
                         new ChunkEvent(
                                 EventState.POST,
                                 ChunkEvent.Type.POPULATE_FULL,
-                                packetIn.getBlockPosition().getX() >> 4,
-                                packetIn.getBlockPosition().getZ() >> 4
+                                packetIn.getPos().getX() >> 4,
+                                packetIn.getPos().getZ() >> 4
                         )
                 );
             }
@@ -115,32 +143,28 @@ public class MixinNetHandlerPlayClient {
             method = "handleMultiBlockChange",
             at = @At("RETURN")
     )
-    private void postHandleMultiBlockChange(SPacketMultiBlockChange packetIn, CallbackInfo ci) {
+    private void postHandleMultiBlockChange(SMultiBlockChangePacket packetIn, CallbackInfo ci) {
         if (!Baritone.settings().repackOnAnyBlockChange.value) {
             return;
         }
-        if (packetIn.getChangedBlocks().length == 0) {
-            return;
-        }
-        https://docs.oracle.com/javase/specs/jls/se7/html/jls-14.html#jls-14.15
-        {
-            for (SPacketMultiBlockChange.BlockUpdateData update : packetIn.getChangedBlocks()) {
-                if (CachedChunk.BLOCKS_TO_KEEP_TRACK_OF.contains(update.getBlockState().getBlock())) {
-                    break https;
-                }
+        ChunkPos[] chunkPos = new ChunkPos[1];
+        packetIn.func_244310_a((pos, state) -> {
+            if (CachedChunk.BLOCKS_TO_KEEP_TRACK_OF.contains(state.getBlock())) {
+                chunkPos[0] = new ChunkPos(pos);
             }
+        });
+        if (chunkPos[0] == null) {
             return;
         }
-        ChunkPos pos = new ChunkPos(packetIn.getChangedBlocks()[0].getPos());
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            EntityPlayerSP player = ibaritone.getPlayerContext().player();
-            if (player != null && player.connection == (NetHandlerPlayClient) (Object) this) {
+            ClientPlayerEntity player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (ClientPlayNetHandler) (Object) this) {
                 ibaritone.getGameEventHandler().onChunkEvent(
                         new ChunkEvent(
                                 EventState.POST,
                                 ChunkEvent.Type.POPULATE_FULL,
-                                pos.x,
-                                pos.z
+                                chunkPos[0].x,
+                                chunkPos[0].z
                         )
                 );
             }
@@ -151,13 +175,13 @@ public class MixinNetHandlerPlayClient {
             method = "handleCombatEvent",
             at = @At(
                     value = "INVOKE",
-                    target = "net/minecraft/client/Minecraft.displayGuiScreen(Lnet/minecraft/client/gui/GuiScreen;)V"
+                    target = "net/minecraft/client/Minecraft.displayGuiScreen(Lnet/minecraft/client/gui/screen/Screen;)V"
             )
     )
-    private void onPlayerDeath(SPacketCombatEvent packetIn, CallbackInfo ci) {
+    private void onPlayerDeath(SCombatPacket packetIn, CallbackInfo ci) {
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            EntityPlayerSP player = ibaritone.getPlayerContext().player();
-            if (player != null && player.connection == (NetHandlerPlayClient) (Object) this) {
+            ClientPlayerEntity player = ibaritone.getPlayerContext().player();
+            if (player != null && player.connection == (ClientPlayNetHandler) (Object) this) {
                 ibaritone.getGameEventHandler().onPlayerDeath();
             }
         }

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

@@ -24,9 +24,9 @@ import baritone.api.event.events.PlayerUpdateEvent;
 import baritone.api.event.events.SprintStateEvent;
 import baritone.api.event.events.type.EventState;
 import baritone.behavior.LookBehavior;
-import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.entity.player.ClientPlayerEntity;
 import net.minecraft.client.settings.KeyBinding;
-import net.minecraft.entity.player.PlayerCapabilities;
+import net.minecraft.entity.player.PlayerAbilities;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -37,8 +37,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
  * @author Brady
  * @since 8/1/2018
  */
-@Mixin(EntityPlayerSP.class)
-public class MixinEntityPlayerSP {
+@Mixin(ClientPlayerEntity.class)
+public class MixinClientPlayerEntity {
 
     @Inject(
             method = "sendChatMessage",
@@ -47,7 +47,7 @@ public class MixinEntityPlayerSP {
     )
     private void sendChatMessage(String msg, CallbackInfo ci) {
         ChatEvent event = new ChatEvent(msg);
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this);
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
         if (baritone == null) {
             return;
         }
@@ -58,46 +58,46 @@ public class MixinEntityPlayerSP {
     }
 
     @Inject(
-            method = "onUpdate",
+            method = "tick",
             at = @At(
                     value = "INVOKE",
-                    target = "net/minecraft/client/entity/EntityPlayerSP.isRiding()Z",
+                    target = "net/minecraft/client/entity/player/ClientPlayerEntity.isPassenger()Z",
                     shift = At.Shift.BY,
                     by = -3
             )
     )
     private void onPreUpdate(CallbackInfo ci) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this);
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
         if (baritone != null) {
             baritone.getGameEventHandler().onPlayerUpdate(new PlayerUpdateEvent(EventState.PRE));
         }
     }
 
     @Inject(
-            method = "onUpdate",
+            method = "tick",
             at = @At(
                     value = "INVOKE",
-                    target = "net/minecraft/client/entity/EntityPlayerSP.onUpdateWalkingPlayer()V",
+                    target = "net/minecraft/client/entity/player/ClientPlayerEntity.onUpdateWalkingPlayer()V",
                     shift = At.Shift.BY,
                     by = 2
             )
     )
     private void onPostUpdate(CallbackInfo ci) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this);
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
         if (baritone != null) {
             baritone.getGameEventHandler().onPlayerUpdate(new PlayerUpdateEvent(EventState.POST));
         }
     }
 
     @Redirect(
-            method = "onLivingUpdate",
+            method = "livingTick",
             at = @At(
                     value = "FIELD",
-                    target = "net/minecraft/entity/player/PlayerCapabilities.allowFlying:Z"
+                    target = "net/minecraft/entity/player/PlayerAbilities.allowFlying:Z"
             )
     )
-    private boolean isAllowFlying(PlayerCapabilities capabilities) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this);
+    private boolean isAllowFlying(PlayerAbilities capabilities) {
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
         if (baritone == null) {
             return capabilities.allowFlying;
         }
@@ -105,14 +105,14 @@ public class MixinEntityPlayerSP {
     }
 
     @Redirect(
-            method = "onLivingUpdate",
+            method = "livingTick",
             at = @At(
                     value = "INVOKE",
                     target = "net/minecraft/client/settings/KeyBinding.isKeyDown()Z"
             )
     )
     private boolean isKeyDown(KeyBinding keyBinding) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this);
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
         if (baritone == null) {
             return keyBinding.isKeyDown();
         }
@@ -135,7 +135,7 @@ public class MixinEntityPlayerSP {
             )
     )
     private void updateRidden(CallbackInfo cb) {
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this);
+        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
         if (baritone != null) {
             ((LookBehavior) baritone.getLookBehavior()).pig();
         }

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

@@ -0,0 +1,100 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.launch.mixins;
+
+import baritone.api.BaritoneAPI;
+import baritone.api.event.events.TabCompleteEvent;
+import com.mojang.brigadier.context.StringRange;
+import com.mojang.brigadier.suggestion.Suggestion;
+import com.mojang.brigadier.suggestion.Suggestions;
+import net.minecraft.client.gui.CommandSuggestionHelper;
+import net.minecraft.client.gui.widget.TextFieldWidget;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * @author Brady
+ * @since 10/9/2019
+ */
+@Mixin(CommandSuggestionHelper.class)
+public class MixinCommandSuggestionHelper {
+
+    @Shadow
+    @Final
+    private TextFieldWidget inputField;
+
+    @Shadow
+    @Final
+    private List<String> exceptionList;
+
+    @Shadow
+    private CompletableFuture<Suggestions> suggestionsFuture;
+
+    @Inject(
+            method = "init",
+            at = @At("HEAD"),
+            cancellable = true
+    )
+    private void preUpdateSuggestion(CallbackInfo ci) {
+        // Anything that is present in the input text before the cursor position
+        String prefix = this.inputField.getText().substring(0, Math.min(this.inputField.getText().length(), this.inputField.getCursorPosition()));
+
+        TabCompleteEvent event = new TabCompleteEvent(prefix);
+        BaritoneAPI.getProvider().getPrimaryBaritone().getGameEventHandler().onPreTabComplete(event);
+
+        if (event.isCancelled()) {
+            ci.cancel();
+            return;
+        }
+
+        if (event.completions != null) {
+            ci.cancel();
+
+            // TODO: Support populating the command usage
+            this.exceptionList.clear();
+
+            if (event.completions.length == 0) {
+                this.suggestionsFuture = Suggestions.empty();
+            } else {
+                int offset = this.inputField.getText().endsWith(" ")
+                        ? this.inputField.getCursorPosition()
+                        : this.inputField.getText().lastIndexOf(" ") + 1; // If there is no space this is still 0 haha yes
+
+                List<Suggestion> suggestionList = Stream.of(event.completions)
+                        .map(s -> new Suggestion(StringRange.between(offset, offset + s.length()), s))
+                        .collect(Collectors.toList());
+
+                Suggestions suggestions = new Suggestions(
+                        StringRange.between(offset, offset + suggestionList.stream().mapToInt(s -> s.getText().length()).max().orElse(0)),
+                        suggestionList);
+
+                this.suggestionsFuture = new CompletableFuture<>();
+                this.suggestionsFuture.complete(suggestions);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,60 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.launch.mixins;
+
+import baritone.api.BaritoneAPI;
+import baritone.api.event.events.RotationMoveEvent;
+import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.entity.Entity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(Entity.class)
+public class MixinEntity {
+
+    @Shadow
+    private float rotationYaw;
+
+    float yawRestore;
+
+    @Inject(
+            method = "moveRelative",
+            at = @At("HEAD")
+    )
+    private void moveRelativeHead(CallbackInfo info) {
+        this.yawRestore = this.rotationYaw;
+        // noinspection ConstantConditions
+        if (!ClientPlayerEntity.class.isInstance(this) || BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this) == null) {
+            return;
+        }
+        RotationMoveEvent motionUpdateRotationEvent = new RotationMoveEvent(RotationMoveEvent.Type.MOTION_UPDATE, this.rotationYaw);
+        BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this).getGameEventHandler().onPlayerRotationMove(motionUpdateRotationEvent);
+        this.rotationYaw = motionUpdateRotationEvent.getYaw();
+    }
+
+    @Inject(
+            method = "moveRelative",
+            at = @At("RETURN")
+    )
+    private void moveRelativeReturn(CallbackInfo info) {
+        this.rotationYaw = this.yawRestore;
+    }
+}

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

@@ -17,27 +17,26 @@
 
 package baritone.launch.mixins;
 
-import baritone.utils.accessor.IAnvilChunkLoader;
-import net.minecraft.world.chunk.storage.AnvilChunkLoader;
-import org.spongepowered.asm.mixin.Final;
+import baritone.utils.accessor.IEntityRenderManager;
+import net.minecraft.client.renderer.entity.EntityRendererManager;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 
-import java.io.File;
+@Mixin(EntityRendererManager.class)
+public class MixinEntityRenderManager implements IEntityRenderManager {
 
-/**
- * @author Brady
- * @since 9/4/2018
- */
-@Mixin(AnvilChunkLoader.class)
-public class MixinAnvilChunkLoader implements IAnvilChunkLoader {
-
-    @Shadow
-    @Final
-    private File chunkSaveLocation;
 
     @Override
-    public File getChunkSaveLocation() {
-        return this.chunkSaveLocation;
+    public double renderPosX() {
+        return ((EntityRendererManager) (Object) this).info.getProjectedView().x;
+    }
+
+    @Override
+    public double renderPosY() {
+        return ((EntityRendererManager) (Object) this).info.getProjectedView().y;
+    }
+
+    @Override
+    public double renderPosZ() {
+        return ((EntityRendererManager) (Object) this).info.getProjectedView().z;
     }
 }

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

@@ -35,14 +35,14 @@ public abstract class MixinItemStack implements IItemStack {
     @Final
     private Item item;
 
-    @Shadow
-    private int itemDamage;
-
     @Unique
     private int baritoneHash;
 
+    @Shadow
+    protected abstract int getDamage();
+
     private void recalculateHash() {
-        baritoneHash = item == null ? -1 : item.hashCode() + itemDamage;
+        baritoneHash = item == null ? -1 : item.hashCode() + getDamage();
     }
 
     @Inject(
@@ -54,7 +54,7 @@ public abstract class MixinItemStack implements IItemStack {
     }
 
     @Inject(
-            method = "setItemDamage",
+            method = "setDamage",
             at = @At("TAIL")
     )
     private void onItemDamageSet(CallbackInfo ci) {

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

@@ -20,9 +20,10 @@ package baritone.launch.mixins;
 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
 import baritone.api.event.events.RotationMoveEvent;
-import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.entity.player.ClientPlayerEntity;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.EntityType;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -30,23 +31,22 @@ 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.spongepowered.asm.lib.Opcodes.GETFIELD;
+import static org.objectweb.asm.Opcodes.GETFIELD;
 
 /**
  * @author Brady
  * @since 9/10/2018
  */
-@Mixin(EntityLivingBase.class)
-public abstract class MixinEntityLivingBase extends Entity {
+@Mixin(LivingEntity.class)
+public abstract class MixinLivingEntity extends Entity {
 
     /**
      * Event called to override the movement direction when jumping
      */
     private RotationMoveEvent jumpRotationEvent;
 
-    public MixinEntityLivingBase(World worldIn, RotationMoveEvent jumpRotationEvent) {
-        super(worldIn);
-        this.jumpRotationEvent = jumpRotationEvent;
+    public MixinLivingEntity(EntityType<?> entityTypeIn, World worldIn) {
+        super(entityTypeIn, worldIn);
     }
 
     @Inject(
@@ -55,8 +55,8 @@ public abstract class MixinEntityLivingBase extends Entity {
     )
     private void preMoveRelative(CallbackInfo ci) {
         // noinspection ConstantConditions
-        if (EntityPlayerSP.class.isInstance(this)) {
-            IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this);
+        if (ClientPlayerEntity.class.isInstance(this)) {
+            IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this);
             if (baritone != null) {
                 this.jumpRotationEvent = new RotationMoveEvent(RotationMoveEvent.Type.JUMP, this.rotationYaw);
                 baritone.getGameEventHandler().onPlayerRotationMove(this.jumpRotationEvent);
@@ -69,34 +69,15 @@ public abstract class MixinEntityLivingBase extends Entity {
             at = @At(
                     value = "FIELD",
                     opcode = GETFIELD,
-                    target = "net/minecraft/entity/EntityLivingBase.rotationYaw:F"
+                    target = "net/minecraft/entity/LivingEntity.rotationYaw:F"
             )
     )
-    private float overrideYaw(EntityLivingBase self) {
-        if (self instanceof EntityPlayerSP && BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this) != null) {
+    private float overrideYaw(LivingEntity self) {
+        if (self instanceof ClientPlayerEntity && BaritoneAPI.getProvider().getBaritoneForPlayer((ClientPlayerEntity) (Object) this) != null) {
             return this.jumpRotationEvent.getYaw();
         }
         return self.rotationYaw;
     }
 
-    @Redirect(
-            method = "travel",
-            at = @At(
-                    value = "INVOKE",
-                    target = "net/minecraft/entity/EntityLivingBase.moveRelative(FFFF)V"
-            )
-    )
-    private void travel(EntityLivingBase self, float strafe, float up, float forward, float friction) {
-        // noinspection ConstantConditions
-        if (!EntityPlayerSP.class.isInstance(this) || BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this) == null) {
-            moveRelative(strafe, up, forward, friction);
-            return;
-        }
-        RotationMoveEvent motionUpdateRotationEvent = new RotationMoveEvent(RotationMoveEvent.Type.MOTION_UPDATE, this.rotationYaw);
-        BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this).getGameEventHandler().onPlayerRotationMove(motionUpdateRotationEvent);
-        float originalYaw = this.rotationYaw;
-        this.rotationYaw = motionUpdateRotationEvent.getYaw();
-        this.moveRelative(strafe, up, forward, friction);
-        this.rotationYaw = originalYaw;
-    }
+
 }

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

@@ -0,0 +1,74 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.launch.mixins;
+
+import baritone.api.utils.BlockOptionalMeta;
+import net.minecraft.loot.LootContext;
+import net.minecraft.loot.LootPredicateManager;
+import net.minecraft.loot.LootTableManager;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.server.ServerWorld;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(LootContext.Builder.class)
+public class MixinLootContext {
+
+    @Redirect(
+            method = "build",
+            at = @At(
+                    value = "INVOKE",
+                    target = "net/minecraft/world/server/ServerWorld.getServer()Lnet/minecraft/server/MinecraftServer;"
+            )
+    )
+    private MinecraftServer getServer(ServerWorld world) {
+        if (world == null) {
+            return null;
+        }
+        return world.getServer();
+    }
+
+    @Redirect(
+            method = "build",
+            at = @At(
+                    value = "INVOKE",
+                    target = "net/minecraft/server/MinecraftServer.getLootTableManager()Lnet/minecraft/loot/LootTableManager;"
+            )
+    )
+    private LootTableManager getLootTableManager(MinecraftServer server) {
+        if (server == null) {
+            return BlockOptionalMeta.getManager();
+        }
+        return server.getLootTableManager();
+    }
+
+    @Redirect(
+            method = "build",
+            at = @At(
+                    value = "INVOKE",
+                    target = "net/minecraft/server/MinecraftServer.func_229736_aP_()Lnet/minecraft/loot/LootPredicateManager;"
+            )
+    )
+    private LootPredicateManager getLootPredicateManager(MinecraftServer server) {
+        if (server == null) {
+            return BlockOptionalMeta.getPredicateManager();
+        }
+        return server.func_229736_aP_();
+    }
+}

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

@@ -19,26 +19,20 @@ 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;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.multiplayer.WorldClient;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.math.BlockPos;
-import org.spongepowered.asm.lib.Opcodes;
+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 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;
 
@@ -50,24 +44,25 @@ import java.util.function.BiFunction;
 public class MixinMinecraft {
 
     @Shadow
-    public EntityPlayerSP player;
+    public ClientPlayerEntity player;
     @Shadow
-    public WorldClient world;
+    public ClientWorld world;
 
     @Inject(
-            method = "init",
+            method = "<init>",
             at = @At("RETURN")
     )
     private void postInit(CallbackInfo ci) {
         BaritoneAPI.getProvider().getPrimaryBaritone();
     }
 
+
     @Inject(
             method = "runTick",
             at = @At(
                     value = "FIELD",
                     opcode = Opcodes.GETFIELD,
-                    target = "net/minecraft/client/Minecraft.currentScreen:Lnet/minecraft/client/gui/GuiScreen;",
+                    target = "net/minecraft/client/Minecraft.currentScreen:Lnet/minecraft/client/gui/screen/Screen;",
                     ordinal = 5,
                     shift = At.Shift.BY,
                     by = -3
@@ -88,10 +83,10 @@ public class MixinMinecraft {
     }
 
     @Inject(
-            method = "loadWorld(Lnet/minecraft/client/multiplayer/WorldClient;Ljava/lang/String;)V",
+            method = "loadWorld(Lnet/minecraft/client/world/ClientWorld;)V",
             at = @At("HEAD")
     )
-    private void preLoadWorld(WorldClient world, String loadingMessage, CallbackInfo ci) {
+    private void preLoadWorld(ClientWorld world, CallbackInfo ci) {
         // If we're unloading the world but one doesn't exist, ignore it
         if (this.world == null && world == null) {
             return;
@@ -108,10 +103,10 @@ public class MixinMinecraft {
     }
 
     @Inject(
-            method = "loadWorld(Lnet/minecraft/client/multiplayer/WorldClient;Ljava/lang/String;)V",
+            method = "loadWorld(Lnet/minecraft/client/world/ClientWorld;)V",
             at = @At("RETURN")
     )
-    private void postLoadWorld(WorldClient world, String loadingMessage, CallbackInfo ci) {
+    private void postLoadWorld(ClientWorld world, CallbackInfo ci) {
         // still fire event for both null, as that means we've just finished exiting a world
 
         // mc.world changing is only the primary baritone
@@ -128,37 +123,32 @@ public class MixinMinecraft {
             at = @At(
                     value = "FIELD",
                     opcode = Opcodes.GETFIELD,
-                    target = "net/minecraft/client/gui/GuiScreen.allowUserInput:Z"
+                    target = "net/minecraft/client/gui/screen/Screen.passEvents:Z"
             )
     )
-    private boolean isAllowUserInput(GuiScreen screen) {
+    private boolean passEvents(Screen screen) {
         // allow user input is only the primary baritone
-        return (BaritoneAPI.getProvider().getPrimaryBaritone().getPathingBehavior().isPathing() && player != null) || screen.allowUserInput;
+        return (BaritoneAPI.getProvider().getPrimaryBaritone().getPathingBehavior().isPathing() && player != null) || screen.passEvents;
     }
 
-    @Inject(
-            method = "clickMouse",
-            at = @At(
-                    value = "INVOKE",
-                    target = "net/minecraft/client/multiplayer/PlayerControllerMP.clickBlock(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/EnumFacing;)Z"
-            ),
-            locals = LocalCapture.CAPTURE_FAILHARD
-    )
-    private void onBlockBreak(CallbackInfo ci, BlockPos pos) {
-        // clickMouse is only for the main player
-        BaritoneAPI.getProvider().getPrimaryBaritone().getGameEventHandler().onBlockInteract(new BlockInteractEvent(pos, BlockInteractEvent.Type.START_BREAK));
-    }
-
-    @Inject(
+    // TODO
+    // FIXME
+    // bradyfix
+    // i cant mixin
+    // lol
+    // https://discordapp.com/channels/208753003996512258/503692253881958400/674760939681349652
+    // https://discordapp.com/channels/208753003996512258/503692253881958400/674756457966862376
+    /*@Inject(
             method = "rightClickMouse",
             at = @At(
                     value = "INVOKE",
-                    target = "net/minecraft/client/entity/EntityPlayerSP.swingArm(Lnet/minecraft/util/EnumHand;)V"
+                    target = "net/minecraft/client/entity/player/ClientPlayerEntity.swingArm(Lnet/minecraft/util/Hand;)V",
+                    ordinal = 1
             ),
             locals = LocalCapture.CAPTURE_FAILHARD
     )
-    private void onBlockUse(CallbackInfo ci, EnumHand var1[], int var2, int var3, EnumHand enumhand, ItemStack itemstack, BlockPos blockpos, int i, EnumActionResult enumactionresult) {
+    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) {
         // rightClickMouse is only for the main player
-        BaritoneAPI.getProvider().getPrimaryBaritone().getGameEventHandler().onBlockInteract(new BlockInteractEvent(blockpos, BlockInteractEvent.Type.USE));
-    }
+        BaritoneAPI.getProvider().getPrimaryBaritone().getGameEventHandler().onBlockInteract(new BlockInteractEvent(raytrace.getPos(), BlockInteractEvent.Type.USE));
+    }*/
 }

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

@@ -25,9 +25,9 @@ import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GenericFutureListener;
-import net.minecraft.network.EnumPacketDirection;
+import net.minecraft.network.IPacket;
 import net.minecraft.network.NetworkManager;
-import net.minecraft.network.Packet;
+import net.minecraft.network.PacketDirection;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -47,14 +47,14 @@ public class MixinNetworkManager {
 
     @Shadow
     @Final
-    private EnumPacketDirection direction;
+    private PacketDirection direction;
 
     @Inject(
             method = "dispatchPacket",
             at = @At("HEAD")
     )
-    private void preDispatchPacket(Packet<?> inPacket, final GenericFutureListener<? extends Future<? super Void>>[] futureListeners, CallbackInfo ci) {
-        if (this.direction != EnumPacketDirection.CLIENTBOUND) {
+    private void preDispatchPacket(IPacket<?> inPacket, final GenericFutureListener<? extends Future<? super Void>> futureListeners, CallbackInfo ci) {
+        if (this.direction != PacketDirection.CLIENTBOUND) {
             return;
         }
 
@@ -69,8 +69,8 @@ public class MixinNetworkManager {
             method = "dispatchPacket",
             at = @At("RETURN")
     )
-    private void postDispatchPacket(Packet<?> inPacket, final GenericFutureListener<? extends Future<? super Void>>[] futureListeners, CallbackInfo ci) {
-        if (this.direction != EnumPacketDirection.CLIENTBOUND) {
+    private void postDispatchPacket(IPacket<?> inPacket, final GenericFutureListener<? extends Future<? super Void>> futureListeners, CallbackInfo ci) {
+        if (this.direction != PacketDirection.CLIENTBOUND) {
             return;
         }
 
@@ -85,11 +85,11 @@ public class MixinNetworkManager {
             method = "channelRead0",
             at = @At(
                     value = "INVOKE",
-                    target = "net/minecraft/network/Packet.processPacket(Lnet/minecraft/network/INetHandler;)V"
+                    target = "net/minecraft/network/NetworkManager.processPacket(Lnet/minecraft/network/IPacket;Lnet/minecraft/network/INetHandler;)V"
             )
     )
-    private void preProcessPacket(ChannelHandlerContext context, Packet<?> packet, CallbackInfo ci) {
-        if (this.direction != EnumPacketDirection.CLIENTBOUND) {
+    private void preProcessPacket(ChannelHandlerContext context, IPacket<?> packet, CallbackInfo ci) {
+        if (this.direction != PacketDirection.CLIENTBOUND) {
             return;
         }
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
@@ -103,8 +103,8 @@ public class MixinNetworkManager {
             method = "channelRead0",
             at = @At("RETURN")
     )
-    private void postProcessPacket(ChannelHandlerContext context, Packet<?> packet, CallbackInfo ci) {
-        if (!this.channel.isOpen() || this.direction != EnumPacketDirection.CLIENTBOUND) {
+    private void postProcessPacket(ChannelHandlerContext context, IPacket<?> packet, CallbackInfo ci) {
+        if (!this.channel.isOpen() || this.direction != PacketDirection.CLIENTBOUND) {
             return;
         }
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {

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

@@ -18,14 +18,14 @@
 package baritone.launch.mixins;
 
 import baritone.utils.accessor.IPlayerControllerMP;
-import net.minecraft.client.multiplayer.PlayerControllerMP;
+import net.minecraft.client.multiplayer.PlayerController;
 import net.minecraft.util.math.BlockPos;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.asm.mixin.gen.Invoker;
 
-@Mixin(PlayerControllerMP.class)
-public abstract class MixinPlayerControllerMP implements IPlayerControllerMP {
+@Mixin(PlayerController.class)
+public abstract class MixinPlayerController implements IPlayerControllerMP {
 
     @Accessor
     @Override

src/launch/java/baritone/launch/mixins/MixinRenderChunk.java

@@ -1,89 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.launch.mixins;
-
-import baritone.Baritone;
-import baritone.api.BaritoneAPI;
-import baritone.api.utils.IPlayerContext;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.chunk.RenderChunk;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.ChunkCache;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-/**
- * @author Brady
- * @since 1/29/2019
- */
-@Mixin(RenderChunk.class)
-public class MixinRenderChunk {
-
-    @Redirect(
-            method = "rebuildChunk",
-            at = @At(
-                    value = "INVOKE",
-                    target = "net/minecraft/world/ChunkCache.isEmpty()Z"
-            )
-    )
-    private boolean isEmpty(ChunkCache chunkCache) {
-        if (!chunkCache.isEmpty()) {
-            return false;
-        }
-        if (Baritone.settings().renderCachedChunks.value && !Minecraft.getMinecraft().isSingleplayer()) {
-            Baritone baritone = (Baritone) BaritoneAPI.getProvider().getPrimaryBaritone();
-            IPlayerContext ctx = baritone.getPlayerContext();
-            if (ctx.player() != null && ctx.world() != null && baritone.bsi != null) {
-                BlockPos position = ((RenderChunk) (Object) this).getPosition();
-                // RenderChunk extends from -1,-1,-1 to +16,+16,+16
-                // then the constructor of ChunkCache extends it one more (presumably to get things like the connected status of fences? idk)
-                // so if ANY of the adjacent chunks are loaded, we are unempty
-                for (int dx = -1; dx <= 1; dx++) {
-                    for (int dz = -1; dz <= 1; dz++) {
-                        if (baritone.bsi.isLoaded(16 * dx + position.getX(), 16 * dz + position.getZ())) {
-                            return false;
-                        }
-                    }
-                }
-            }
-        }
-
-        return true;
-    }
-
-    @Redirect(
-            method = "rebuildChunk",
-            at = @At(
-                    value = "INVOKE",
-                    target = "net/minecraft/world/ChunkCache.getBlockState(Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/block/state/IBlockState;"
-            )
-    )
-    private IBlockState getBlockState(ChunkCache chunkCache, BlockPos pos) {
-        if (Baritone.settings().renderCachedChunks.value && !Minecraft.getMinecraft().isSingleplayer()) {
-            Baritone baritone = (Baritone) BaritoneAPI.getProvider().getPrimaryBaritone();
-            IPlayerContext ctx = baritone.getPlayerContext();
-            if (ctx.player() != null && ctx.world() != null && baritone.bsi != null) {
-                return baritone.bsi.get0(pos);
-            }
-        }
-
-        return chunkCache.getBlockState(pos);
-    }
-}

src/launch/java/baritone/launch/mixins/MixinRenderList.java

@@ -1,47 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.launch.mixins;
-
-import baritone.Baritone;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.RenderList;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-import static org.lwjgl.opengl.GL11.*;
-
-@Mixin(RenderList.class)
-public class MixinRenderList {
-
-    @Redirect( // avoid creating CallbackInfo at all costs; this is called 40k times per second
-            method = "renderChunkLayer",
-            at = @At(
-                    value = "INVOKE",
-                    target = "net/minecraft/client/renderer/GlStateManager.popMatrix()V"
-            )
-    )
-    private void popMatrix() {
-        if (Baritone.settings().renderCachedChunks.value && !Minecraft.getMinecraft().isSingleplayer()) {
-            // reset the blend func to normal (not dependent on constant alpha)
-            GlStateManager.tryBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO);
-        }
-        GlStateManager.popMatrix();
-    }
-}

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

@@ -18,16 +18,16 @@
 package baritone.launch.mixins;
 
 import baritone.utils.accessor.IGuiScreen;
-import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.screen.Screen;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
 
 import java.net.URI;
 
-@Mixin(GuiScreen.class)
-public abstract class MixinGuiScreen implements IGuiScreen {
+@Mixin(Screen.class)
+public abstract class MixinScreen implements IGuiScreen {
 
     @Override
-    @Invoker("openWebLink")
-    public abstract void openLink(URI url);
+    @Invoker("openLink")
+    public abstract void openLinkInvoker(URI url);
 }

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

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

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

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

src/launch/java/baritone/launch/mixins/MixinStateImplementation.java

@@ -1,60 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.launch.mixins;
-
-import com.google.common.collect.ImmutableMap;
-import net.minecraft.block.properties.IProperty;
-import org.spongepowered.asm.mixin.*;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(targets = "net.minecraft.block.state.BlockStateContainer$StateImplementation")
-public abstract class MixinStateImplementation {
-
-    @Shadow
-    @Final
-    private ImmutableMap<IProperty<?>, Comparable<?>> properties;
-
-    /**
-     * Block states are fucking immutable
-     */
-    @Unique
-    private int hashCode;
-
-    @Inject(
-            method = "<init>*",
-            at = @At("RETURN")
-    )
-    private void onInit(CallbackInfo ci) {
-        hashCode = properties.hashCode();
-    }
-
-    /**
-     * Cache this instead of using the fucking map every time
-     *
-     * @author LoganDark
-     * @reason Regular IBlockState generates a new hash every fucking time. This is not needed when scanning millions
-     * per second
-     */
-    @Override
-    @Overwrite
-    public int hashCode() {
-        return hashCode;
-    }
-}

src/launch/java/baritone/launch/mixins/MixinTabCompleter.java

@@ -1,83 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.launch.mixins;
-
-import baritone.api.BaritoneAPI;
-import baritone.api.IBaritone;
-import baritone.api.event.events.TabCompleteEvent;
-import net.minecraft.client.gui.GuiChat;
-import net.minecraft.client.gui.GuiTextField;
-import net.minecraft.util.TabCompleter;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(TabCompleter.class)
-public abstract class MixinTabCompleter {
-
-    @Shadow
-    @Final
-    protected GuiTextField textField;
-
-    @Shadow
-    protected boolean requestedCompletions;
-
-    @Shadow
-    public abstract void setCompletions(String... newCompl);
-
-    @Unique
-    protected boolean dontComplete = false;
-
-    @Inject(
-            method = "requestCompletions",
-            at = @At("HEAD"),
-            cancellable = true
-    )
-    private void onRequestCompletions(String prefix, CallbackInfo ci) {
-        if (!((Object) this instanceof GuiChat.ChatTabCompleter)) {
-            return;
-        }
-
-        IBaritone baritone = BaritoneAPI.getProvider().getPrimaryBaritone();
-
-        TabCompleteEvent event = new TabCompleteEvent(prefix);
-        baritone.getGameEventHandler().onPreTabComplete(event);
-
-        if (event.isCancelled()) {
-            ci.cancel();
-            return;
-        }
-
-        if (event.completions != null) {
-            ci.cancel();
-
-            this.dontComplete = true;
-
-            try {
-                this.requestedCompletions = true;
-                setCompletions(event.completions);
-            } finally {
-                this.dontComplete = false;
-            }
-        }
-    }
-}

src/launch/java/baritone/launch/mixins/MixinVboRenderList.java

@@ -1,47 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.launch.mixins;
-
-import baritone.Baritone;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.VboRenderList;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-import static org.lwjgl.opengl.GL11.*;
-
-@Mixin(VboRenderList.class)
-public class MixinVboRenderList {
-
-    @Redirect( // avoid creating CallbackInfo at all costs; this is called 40k times per second
-            method = "renderChunkLayer",
-            at = @At(
-                    value = "INVOKE",
-                    target = "net/minecraft/client/renderer/GlStateManager.popMatrix()V"
-            )
-    )
-    private void popMatrix() {
-        if (Baritone.settings().renderCachedChunks.value && !Minecraft.getMinecraft().isSingleplayer()) {
-            // reset the blend func to normal (not dependent on constant alpha)
-            GlStateManager.tryBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO);
-        }
-        GlStateManager.popMatrix();
-    }
-}

src/launch/java/baritone/launch/mixins/MixinWorldClient.java

@@ -1,75 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.launch.mixins;
-
-import baritone.api.BaritoneAPI;
-import baritone.api.IBaritone;
-import baritone.api.event.events.ChunkEvent;
-import baritone.api.event.events.type.EventState;
-import net.minecraft.client.multiplayer.WorldClient;
-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;
-
-/**
- * @author Brady
- * @since 8/2/2018
- */
-@Mixin(WorldClient.class)
-public class MixinWorldClient {
-
-    @Inject(
-            method = "doPreChunk",
-            at = @At("HEAD")
-    )
-    private void preDoPreChunk(int chunkX, int chunkZ, boolean loadChunk, CallbackInfo ci) {
-        for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            if (ibaritone.getPlayerContext().world() == (WorldClient) (Object) this) {
-                ibaritone.getGameEventHandler().onChunkEvent(
-                        new ChunkEvent(
-                                EventState.PRE,
-                                loadChunk ? ChunkEvent.Type.LOAD : ChunkEvent.Type.UNLOAD,
-                                chunkX,
-                                chunkZ
-                        )
-                );
-            }
-        }
-
-    }
-
-    @Inject(
-            method = "doPreChunk",
-            at = @At("RETURN")
-    )
-    private void postDoPreChunk(int chunkX, int chunkZ, boolean loadChunk, CallbackInfo ci) {
-        for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            if (ibaritone.getPlayerContext().world() == (WorldClient) (Object) this) {
-                ibaritone.getGameEventHandler().onChunkEvent(
-                        new ChunkEvent(
-                                EventState.POST,
-                                loadChunk ? ChunkEvent.Type.LOAD : ChunkEvent.Type.UNLOAD,
-                                chunkX,
-                                chunkZ
-                        )
-                );
-            }
-        }
-    }
-}

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

@@ -20,26 +20,33 @@ package baritone.launch.mixins;
 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
 import baritone.api.event.events.RenderEvent;
-import net.minecraft.client.renderer.EntityRenderer;
+import com.mojang.blaze3d.matrix.MatrixStack;
+import net.minecraft.client.renderer.ActiveRenderInfo;
+import net.minecraft.client.renderer.GameRenderer;
+import net.minecraft.client.renderer.LightTexture;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.util.math.vector.Matrix4f;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
-@Mixin(EntityRenderer.class)
-public class MixinEntityRenderer {
+/**
+ * @author Brady
+ * @since 2/13/2020
+ */
+@Mixin(WorldRenderer.class)
+public class MixinWorldRenderer {
 
     @Inject(
-            method = "renderWorldPass",
-            at = @At(
-                    value = "INVOKE_STRING",
-                    target = "Lnet/minecraft/profiler/Profiler;endStartSection(Ljava/lang/String;)V",
-                    args = {"ldc=hand"}
-            )
+            method = "updateCameraAndRender",
+            at = @At("RETURN"),
+            locals = LocalCapture.CAPTURE_FAILSOFT
     )
-    private void renderWorldPass(int pass, float partialTicks, long finishTimeNano, CallbackInfo ci) {
+    private void onStartHand(MatrixStack matrixStackIn, float partialTicks, long finishTimeNano, boolean drawBlockOutline, ActiveRenderInfo activeRenderInfoIn, GameRenderer gameRendererIn, LightTexture lightmapIn, Matrix4f projectionIn, CallbackInfo ci) {
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            ibaritone.getGameEventHandler().onRenderPass(new RenderEvent(partialTicks));
+            ibaritone.getGameEventHandler().onRenderPass(new RenderEvent(partialTicks, matrixStackIn, projectionIn));
         }
     }
-}
+}

src/launch/resources/META-INF/mods.toml

@@ -0,0 +1,33 @@
+# 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="[33,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
+license="https://raw.githubusercontent.com/cabaletta/baritone/1.16.2/LICENSE"
+# A URL to refer people to when problems occur with this mod
+issueTrackerURL="https://github.com/cabaletta/baritone/issues" #optional
+# A list of mods - how many allowed here is determined by the individual mod loader
+[[mods]] #mandatory
+# The modid of the mod
+modId="baritoe" #mandatory
+# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it
+version="${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.
+'''
+

src/launch/resources/fabric.mod.json

@@ -0,0 +1,31 @@
+
+{
+  "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.16.x"
+  }
+}

src/launch/resources/mixins.baritone.json

@@ -8,29 +8,22 @@
     "maxShiftBy": 2
   },
   "client": [
-    "MixinAnvilChunkLoader",
-    "MixinBitArray",
-    "MixinBlockStateContainer",
-    "MixinChatTabCompleter",
-    "MixinChunkProviderClient",
-    "MixinChunkProviderServer",
-    "MixinChunkRenderContainer",
-    "MixinChunkRenderWorker",
-    "MixinEntityLivingBase",
-    "MixinEntityPlayerSP",
-    "MixinEntityRenderer",
-    "MixinGuiScreen",
+    "MixinChunkArray",
+    "MixinClientChunkProvider",
+    "MixinClientPlayerEntity",
+    "MixinClientPlayNetHandler",
+    "MixinCommandSuggestionHelper",
+    "MixinEntity",
+    "MixinEntityRenderManager",
     "MixinItemStack",
-    "MixinItemTool",
+    "MixinLivingEntity",
+    "MixinLootContext",
     "MixinMinecraft",
-    "MixinNetHandlerPlayClient",
     "MixinNetworkManager",
-    "MixinPlayerControllerMP",
-    "MixinRenderChunk",
-    "MixinRenderList",
-    "MixinStateImplementation",
-    "MixinTabCompleter",
-    "MixinVboRenderList",
-    "MixinWorldClient"
+    "MixinPlayerController",
+    "MixinScreen",
+    "MixinSodiumChunkProvider",
+    "MixinSodiumFixedLongHashTable",
+    "MixinWorldRenderer"
   ]
 }

src/launch/resources/pack.mcmeta

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