v1.3.5

Fixes #485

.gitignore

@@ -11,6 +11,8 @@ build/
 classes/
 *.class
 
+/out
+
 # IntelliJ Files
 .idea/
 *.iml

.travis.yml

@@ -10,7 +10,7 @@ install:
 
 script:
 - docker run --rm cabaletta/baritone ./gradlew javadoc
-- docker run --name baritone cabaletta/baritone /bin/sh -c "set -e; /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 128x128x24 -ac +extension GLX +render; DISPLAY=:99 BARITONE_AUTO_TEST=true ./gradlew runClient"
+- docker run --name baritone cabaletta/baritone /bin/sh -c "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 128x128x24 -ac +extension GLX +render; DISPLAY=:99 BARITONE_AUTO_TEST=true ./gradlew runAutoTest; cat /code/autotest/success"
 - docker cp baritone:/code/dist dist
 - ls dist
 - cat dist/checksums.txt

PROTOCOL.md

@@ -1,36 +0,0 @@
-# Baritone Comms Protocol
-
-## Data Types
-
-| Name       | Descriptor                                                | Java                        |
-|------------|-----------------------------------------------------------|-----------------------------|
-| coordinate | Big endian 8-byte floating point number                   | [readDouble], [writeDouble] |
-| string     | unsigned short (length) followed by UTF-8 character bytes | [readUTF],    [writeUTF]    |
-
-## Inbound
-
-Allows the server to execute a chat command on behalf of the client's player
-
-### Chat
-
-| Name    | Type   |
-|---------|--------|
-| Message | string |
-
-## Outbound
-
-Update the player position with the server
-
-### Status
-
-| Name | Type       |
-|------|------------|
-| X    | coordinate |
-| Y    | coordinate |
-| Z    | coordinate |
-
-<!-- External links -->
-[readUTF]:     https://docs.oracle.com/javase/7/docs/api/java/io/DataInputStream.html#readUTF()
-[writeUTF]:    https://docs.oracle.com/javase/7/docs/api/java/io/DataOutputStream.html#writeUTF(java.lang.String)
-[readDouble]:  https://docs.oracle.com/javase/7/docs/api/java/io/DataInputStream.html#readDouble()
-[writeDouble]: https://docs.oracle.com/javase/7/docs/api/java/io/DataOutputStream.html#writeDouble(double)

README.md

@@ -19,7 +19,7 @@
 ![Lines of Code](https://tokei.rs/b1/github/cabaletta/baritone?category=code)
 [![GitHub contributors](https://img.shields.io/github/contributors/cabaletta/baritone.svg)](https://github.com/cabaletta/baritone/graphs/contributors/)
 [![GitHub commits](https://img.shields.io/github/commits-since/cabaletta/baritone/v1.0.0.svg)](https://github.com/cabaletta/baritone/commit/)
-[![Impact integration](https://img.shields.io/badge/Impact%20integration-v1.2.10%20/%20v1.3.5%20/%20v1.4.3-brightgreen.svg)](https://impactclient.net/)
+[![Impact integration](https://img.shields.io/badge/Impact%20integration-v1.2.8%20/%20v1.3.4%20/%20v1.4.1-brightgreen.svg)](https://impactclient.net/)
 [![ForgeHax integration](https://img.shields.io/badge/ForgeHax%20%22integration%22-scuffed-yellow.svg)](https://github.com/fr1kin/ForgeHax/)
 [![Aristois add-on integration](https://img.shields.io/badge/Aristois%20add--on%20integration-v1.3.4%20/%20v1.4.1-green.svg)](https://gitlab.com/emc-mods-indrit/baritone_api)
 [![WWE integration](https://img.shields.io/badge/WWE%20%22integration%22-master%3F-green.svg)](https://wweclient.com/)

USAGE.md

@@ -8,23 +8,11 @@ Baritone commands can also by default be typed in the chatbox. However if you ma
 
 To disable direct chat control (with no prefix), turn off the `chatControl` setting. To disable chat control with the `#` prefix, turn off the `prefixControl` setting. In Impact, `.b` cannot be disabled. Be careful that you don't leave yourself with all control methods disabled (if you do, reset your settings by deleting the file `minecraft/baritone/settings.txt` and relaunching).
 
-# For Baritone 1.2.10+, 1.3.5+, 1.4.2+
-
-Lots of the commands have changed, BUT `#help` is improved vastly (its clickable! commands have tab completion! oh my!).
-
-Try `#help` I promise it won't just send you back here =)
-
-"wtf where is cleararea" -> look at `#help sel`
-
-"wtf where is goto death, goto waypoint" -> look at `#help wp` (a "tag" is like "home" (created automatically on right clicking a bed) or "death" (created automatically on death) or "user" (has to be created manually)). So you might want `#wp save user coolbiome` then, to set the goal `#wp goal coolbiome` then `#path` to path to it. For death, `#wp goal death` (remember stuff is clickable!).
-
-just look at `#help` lmao
-
 # Commands
 
 **All** of these commands may need a prefix before them, as above ^.
 
-`help`
+`help` for (rudimentary) help. You can see what it says [here](https://github.com/cabaletta/baritone/blob/master/src/api/java/baritone/api/utils/ExampleBaritoneControl.java#L47).
 
 To toggle a boolean setting, just say its name in chat (for example saying `allowBreak` toggles whether Baritone will consider breaking blocks). For a numeric setting, say its name then the new value (like `primaryTimeoutMS 250`). It's case insensitive. To reset a setting to its default value, say `acceptableThrowawayItems reset`. To reset all settings, say `reset`. To see all settings that have been modified from their default values, say `modified`.
 
@@ -50,6 +38,12 @@ Some common examples:
 - `version` to get the version of Baritone you're running
 - `damn` daniel
 
+
+New commands:
+- `sel` to manage selections
+- some others
+
+
 For the rest of the commands, you can take a look at the code [here](https://github.com/cabaletta/baritone/blob/master/src/api/java/baritone/api/utils/ExampleBaritoneControl.java).
 
 All the settings and documentation are <a href="https://github.com/cabaletta/baritone/blob/master/src/api/java/baritone/api/Settings.java">here</a>. If you find HTML easier to read than Javadoc, you can look <a href="https://baritone.leijurv.com/baritone/api/Settings.html#field.detail">here</a>.

build.gradle

@@ -16,33 +16,33 @@
  */
 
 group 'baritone'
-version '1.2.10'
+version '1.3.5'
 
 buildscript {
     repositories {
+        jcenter()
         maven {
             name = 'forge'
             url = 'http://files.minecraftforge.net/maven'
         }
         maven {
-            name = 'SpongePowered'
-            url = 'http://repo.spongepowered.org/maven'
+            name = 'impactdevelopment-repo'
+            url = 'https://impactdevelopment.github.io/maven/'
         }
-        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'
     }
 }
 
-
 import baritone.gradle.task.CreateDistTask
 import baritone.gradle.task.ProguardTask
+import org.apache.tools.ant.taskdefs.condition.Os
 
 apply plugin: 'java'
-apply plugin: 'net.minecraftforge.gradle.tweaker-client'
+apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'org.spongepowered.mixin'
 
 sourceCompatibility = targetCompatibility = '1.8'
@@ -52,8 +52,19 @@ compileJava {
 }
 
 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 {
@@ -65,14 +76,51 @@ 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
+}
 
-    // The sources jar should use SRG names not MCP to ensure compatibility with all mappings
-    makeObfSourceJar = true
+minecraft {
+    mappings channel: 'snapshot', version: '20190307-1.13.1'
+    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"
+            }
+        }
+    }
 }
 
 repositories {
@@ -90,6 +138,12 @@ repositories {
 }
 
 dependencies {
+    minecraft 'com.github.ImpactDevelopment:Vanilla:1.13.2'
+
+    runtime launchCompile('net.minecraft:launchwrapper:1.12') {
+        exclude module: 'lwjgl'
+    }
+    runtime launchCompile('org.ow2.asm:asm-debug-all:5.2')
     runtime launchCompile('com.github.ImpactDevelopment:SimpleTweaker:1.2')
     runtime launchCompile('org.spongepowered:mixin:0.7.11-SNAPSHOT') {
         // Mixin includes a lot of dependencies that are too up-to-date
@@ -99,6 +153,7 @@ dependencies {
         exclude module: 'commons-io'
         exclude module: 'log4j-core'
     }
+
     testImplementation 'junit:junit:4.12'
 }
 

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

@@ -40,17 +40,13 @@ 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_STANDALONE       = "%s-standalone-%s.jar";
 
     protected String artifactName, artifactVersion;
-    protected Path artifactPath, artifactUnoptimizedPath, artifactApiPath, artifactStandalonePath, artifactForgeApiPath, artifactForgeStandalonePath, proguardOut;
+    protected Path artifactPath, artifactUnoptimizedPath, artifactApiPath, artifactStandalonePath, proguardOut;
 
     protected void verifyArtifacts() throws IllegalStateException {
         this.artifactName = getProject().getName();
@@ -60,8 +56,6 @@ class BaritoneGradleTask extends DefaultTask {
         this.artifactUnoptimizedPath     = this.getBuildFile(formatVersion(ARTIFACT_UNOPTIMIZED));
         this.artifactApiPath             = this.getBuildFile(formatVersion(ARTIFACT_API));
         this.artifactStandalonePath      = this.getBuildFile(formatVersion(ARTIFACT_STANDALONE));
-        this.artifactForgeApiPath        = this.getBuildFile(formatVersion(ARTIFACT_FORGE_API));
-        this.artifactForgeStandalonePath = this.getBuildFile(formatVersion(ARTIFACT_FORGE_STANDALONE));
 
         this.proguardOut = this.getTemporaryFile(PROGUARD_EXPORT_PATH);
 

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

@@ -45,8 +45,6 @@ public class CreateDistTask extends BaritoneGradleTask {
         Path api             = getRelativeFile("dist/" + formatVersion(ARTIFACT_API));
         Path standalone      = getRelativeFile("dist/" + formatVersion(ARTIFACT_STANDALONE));
         Path unoptimized     = getRelativeFile("dist/" + formatVersion(ARTIFACT_UNOPTIMIZED));
-        Path forgeApi        = getRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_API));
-        Path forgeStandalone = getRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_STANDALONE));
 
         // NIO will not automatically create directories
         Path dir = getRelativeFile("dist/");
@@ -58,11 +56,9 @@ public class CreateDistTask extends BaritoneGradleTask {
         Files.copy(this.artifactApiPath,             api,             REPLACE_EXISTING);
         Files.copy(this.artifactStandalonePath,      standalone,      REPLACE_EXISTING);
         Files.copy(this.artifactUnoptimizedPath,     unoptimized,     REPLACE_EXISTING);
-        Files.copy(this.artifactForgeApiPath,        forgeApi,        REPLACE_EXISTING);
-        Files.copy(this.artifactForgeStandalonePath, forgeStandalone, REPLACE_EXISTING);
 
         // Calculate all checksums and format them like "shasum"
-        List<String> shasum = Stream.of(api, forgeApi, standalone, forgeStandalone, unoptimized)
+        List<String> shasum = Stream.of(api, standalone, unoptimized)
                 .map(path -> sha1(path) + "  " + path.getFileName().toString())
                 .collect(Collectors.toList());
 

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

@@ -18,27 +18,18 @@
 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.NamedDomainObjectContainer;
-import org.gradle.api.artifacts.Configuration;
-import org.gradle.api.artifacts.Dependency;
-import org.gradle.api.internal.plugins.DefaultConvention;
+import org.gradle.api.plugins.JavaPluginConvention;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.TaskAction;
-import org.gradle.internal.Pair;
 
 import java.io.*;
-import java.lang.reflect.Field;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
-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;
 
@@ -50,18 +41,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();
@@ -71,7 +56,6 @@ public class ProguardTask extends BaritoneGradleTask {
         downloadProguard();
         extractProguard();
         generateConfigs();
-        acquireDependencies();
         proguardApi();
         proguardStandalone();
         cleanup();
@@ -82,7 +66,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 {
@@ -114,7 +98,19 @@ public class ProguardTask extends BaritoneGradleTask {
         Process p = new ProcessBuilder("java", "-verbose").start();
         String out = IOUtils.toString(p.getInputStream(), "UTF-8").split("\n")[0].split("Opened ")[1].replace("]", "");
         template.add(2, "-libraryjars '" + out + "'");
-        template.add(3, "-libraryjars '" + Paths.get(out).resolveSibling("jce.jar") + "'");
+
+        // Discover all of the libraries that we will need to acquire from gradle
+        acquireDependencies().forEach(f -> {
+            if (f.toString().endsWith("-recomp.jar")) {
+                // remove MCP mapped jar
+                return;
+            }
+            if (f.toString().endsWith("client-extra.jar")) {
+                // go from the extra to the original downloaded client
+                f = new File(f.getParentFile(), "client.jar");
+            }
+            template.add(2, "-libraryjars '" + f + "'");
+        });
 
         // API config doesn't require any changes from the changes that we made to the template
         Files.write(getTemporaryFile(PROGUARD_API_CONFIG), template);
@@ -123,165 +119,20 @@ 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");
-        }
-    }
-
-    // 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() {

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/MappingType.java

@@ -1,29 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.gradle.util;
-
-/**
- * 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/MappingType.java">Original Source</a>
- */
-public enum MappingType {
-    SEARGE,
-    NOTCH,
-    CUSTOM // forgegradle
-}

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

@@ -14,6 +14,8 @@
 
 # lwjgl is weird
 -dontwarn org.lwjgl.**
+# also lwjgl lol
+-dontwarn module-info
 
 -keep class baritone.api.** { *; } # this is the keep api
 
@@ -36,55 +38,6 @@
 #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.1.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?
-
-
-
 
 # Keep - Applications. Keep all application classes, along with their 'main'
 # methods.

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

@@ -17,11 +17,9 @@
 
 package baritone.api;
 
-import baritone.api.bot.IUserManager;
 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 java.util.List;
@@ -70,18 +68,13 @@ public interface IBaritoneProvider {
     }
 
     /**
-     * Returns the {@link IWorldScanner} instance. This is not a type returned by a
-     * {@link IBaritone} implementation because it is not linked with {@link IBaritone}.
+     * Returns the {@link IWorldScanner} instance. This is not a type returned by
+     * {@link IBaritone} implementation, because it is not linked with {@link IBaritone}.
      *
      * @return The {@link IWorldScanner} instance.
      */
     IWorldScanner getWorldScanner();
 
-    /**
-     * @return The {@link IUserManager} instance.
-     */
-    IUserManager getUserManager();
-
     /**
      * Returns the {@link ICommandSystem} instance. This is not bound to a specific {@link IBaritone}
      * instance because {@link ICommandSystem} itself controls global behavior for {@link ICommand}s.
@@ -89,9 +82,4 @@ public interface IBaritoneProvider {
      * @return The {@link ICommandSystem} instance.
      */
     ICommandSystem getCommandSystem();
-
-    /**
-     * @return The {@link ISchematicSystem} instance.
-     */
-    ISchematicSystem getSchematicSystem();
 }

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

@@ -158,10 +158,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()
     )));
 
     /**
@@ -177,27 +177,12 @@ 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.SIGN,
             Blocks.WALL_SIGN
     )));
 
-    /**
-     * A list of blocks to be treated as if they're air.
-     * <p>
-     * If a schematic asks for air at a certain position, and that position currently contains a block on this list, it will be treated as correct.
-     */
-    public final Setting<List<Block>> buildIgnoreBlocks = new Setting<>(new ArrayList<>(Arrays.asList(
-
-    )));
-
-    /**
-     * If this is true, the builder will treat all non-air blocks as correct. It will only place new blocks.
-     */
-    public final Setting<Boolean> buildIgnoreExisting = new Setting<>(false);
-
     /**
      * If this setting is true, Baritone will never break a block that is adjacent to an unsupported falling block.
      * <p>
@@ -248,7 +233,7 @@ public final class Settings {
     /**
      * If we overshoot a traverse and end up one block beyond the destination, mark it as successful anyway.
      * <p>
-     * This helps with speed exceeding 20m/s
+     * This helps with speed at >=20m/s
      */
     public final Setting<Boolean> overshootTraverse = new Setting<>(true);
 
@@ -263,9 +248,9 @@ public final class Settings {
     public final Setting<Integer> rightClickSpeed = new Setting<>(4);
 
     /**
-     * Block reach distance
+     * How many degrees to randomize the yaw every tick. Set to 0 to disable
      */
-    public final Setting<Float> blockReachDistance = new Setting<>(4.5f);
+    public final Setting<Double> randomLooking113 = new Setting<>(2d);
 
     /**
      * How many degrees to randomize the pitch and yaw every tick. Set to 0 to disable
@@ -757,11 +742,6 @@ public final class Settings {
      */
     public final Setting<Vec3i> buildRepeat = new Setting<>(new Vec3i(0, 0, 0));
 
-    /**
-     * How many times to buildrepeat. -1 for infinite.
-     */
-    public final Setting<Integer> buildRepeatCount = new Setting<>(-1);
-
     /**
      * Allow standing above a block while mining it, in BuilderProcess
      * <p>
@@ -811,12 +791,6 @@ public final class Settings {
      */
     public final Setting<Boolean> schematicOrientationZ = new Setting<>(false);
 
-    /**
-     * The fallback used by the build command when no extension is specified. This may be useful if schematics of a
-     * particular format are used often, and the user does not wish to have to specify the extension with every usage.
-     */
-    public final Setting<String> schematicFallbackExtension = new Setting<>("schematic");
-
     /**
      * Distance to scan every tick for updates. Expanding this beyond player reach distance (i.e. setting it to 6 or above)
      * is only necessary in very large schematics where rescanning the whole thing is costly.
@@ -954,7 +928,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<>(Minecraft.getMinecraft().ingameGUI.getChatGUI()::printChatMessage);
+    public final Setting<Consumer<ITextComponent>> logger = new Setting<>(Minecraft.getInstance().ingameGUI.getChatGUI()::printChatMessage);
 
     /**
      * The size of the box that is rendered when the current goal is a GoalYLevel

src/api/java/baritone/api/bot/IBaritoneUser.java

@@ -1,80 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.bot;
-
-import baritone.api.IBaritone;
-import baritone.api.utils.IPlayerController;
-import com.mojang.authlib.GameProfile;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.network.INetHandler;
-import net.minecraft.network.NetworkManager;
-import net.minecraft.network.play.INetHandlerPlayClient;
-import net.minecraft.util.Session;
-
-/**
- * @author Brady
- * @since 10/23/2018
- */
-public interface IBaritoneUser {
-
-    /**
-     * @return The network manager that is responsible for the current connection.
-     */
-    NetworkManager getNetworkManager();
-
-    /**
-     * Returns the current play network handler. Can also be acquired via
-     * {@link NetworkManager#getNetHandler()} from {@link #getNetworkManager()},
-     * and checking if the {@link INetHandler} is an instance of {@link INetHandlerPlayClient}.
-     *
-     * @return The current play network handler
-     */
-    INetHandlerPlayClient getConnection();
-
-    /**
-     * @return The locally managed entity for this user.
-     */
-    EntityPlayerSP getEntity();
-
-    /**
-     * @return The bot player controller
-     */
-    IPlayerController getPlayerController();
-
-    /**
-     * Returns the user login session. Should never be {@code null}, as this should be set when the
-     * user is constructed.
-     *
-     * @return This users's login session
-     */
-    Session getSession();
-
-    /**
-     * Returns the game profile for the account represented by this user.
-     *
-     * @return This users's profile.
-     */
-    GameProfile getProfile();
-
-    /**
-     * @return The manager that spawned this {@link IBaritoneUser}.
-     */
-    IUserManager getManager();
-
-    IBaritone getBaritone();
-}

src/api/java/baritone/api/bot/IUserManager.java

@@ -1,73 +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.api.bot;
-
-import baritone.api.bot.connect.IConnectionResult;
-import com.mojang.authlib.GameProfile;
-import net.minecraft.util.Session;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
-
-/**
- * @author Brady
- * @since 1/17/2019
- */
-public interface IUserManager {
-
-    /**
-     * Connects a new user with the specified {@link Session} to the current server.
-     *
-     * @param session The user session
-     * @return The result of the attempted connection
-     */
-    IConnectionResult connect(Session session);
-
-    /**
-     * Disconnects the specified {@link IBaritoneUser} from its current server.
-     *
-     * @param user The user to disconnect
-     */
-    void disconnect(IBaritoneUser user);
-
-    /**
-     * Finds the {@link IBaritoneUser} associated with the specified {@link GameProfile}
-     *
-     * @param profile The game profile of the user
-     * @return The user, {@link Optional#empty()} if no match or {@code profile} is {@code null}
-     */
-    default Optional<IBaritoneUser> getUserByProfile(GameProfile profile) {
-        return profile == null ? Optional.empty() : users().stream().filter(user -> user.getProfile().equals(profile)).findFirst();
-    }
-
-    /**
-     * Finds the {@link IBaritoneUser} associated with the specified {@link UUID}
-     *
-     * @param uuid The uuid of the user
-     * @return The user, {@link Optional#empty()} if no match or {@code uuid} is {@code null}
-     */
-    default Optional<IBaritoneUser> getUserByUUID(UUID uuid) {
-        return uuid == null ? Optional.empty() : users().stream().filter(user -> user.getProfile().getId().equals(uuid)).findFirst();
-    }
-
-    /**
-     * @return All of the users held by this manager
-     */
-    List<IBaritoneUser> users();
-}

src/api/java/baritone/api/bot/connect/ConnectionStatus.java

@@ -1,45 +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.api.bot.connect;
-
-/**
- * @author Brady
- * @since 11/6/2018
- */
-public enum ConnectionStatus {
-
-    /**
-     * The local player is not connected to a server, therefore, there is no target server to connect to.
-     */
-    NO_CURRENT_CONNECTION,
-
-    /**
-     * The IP of the targetted address to connect to could not be resolved.
-     */
-    CANT_RESOLVE_HOST,
-
-    /**
-     * The connection initialization failed.
-     */
-    CONNECTION_FAILED,
-
-    /**
-     * The connection was a success
-     */
-    SUCCESS
-}

src/api/java/baritone/api/bot/connect/IConnectionResult.java

@@ -1,44 +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.api.bot.connect;
-
-import baritone.api.bot.IBaritoneUser;
-
-import java.util.Optional;
-
-/**
- * @author Brady
- * @since 1/17/2019
- */
-public interface IConnectionResult {
-
-    /**
-     * @return The actual status of the connection attempt.
-     * @see ConnectionStatus
-     */
-    ConnectionStatus getStatus();
-
-    /**
-     * Returns the user that was created in this connection this result reflects, if
-     * {@link #getStatus()} is {@link ConnectionStatus#SUCCESS}, otherwise it will
-     * return {@link Optional#empty()}.
-     *
-     * @return The user created in the connection
-     */
-    Optional<IBaritoneUser> getUser();
-}

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

@@ -81,4 +81,6 @@ public interface ICachedWorld {
      * in a new thread by default.
      */
     void save();
+
+
 }

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

@@ -77,20 +77,10 @@ public interface IWorldScanner {
     }
 
     /**
-     * Overload of {@link #repack(IPlayerContext, int)} where the value of the {@code range} parameter is {@code 40}.
+     * Repacks 40 chunks around the player.
      *
-     * @param ctx The player, describing the origin
-     * @return The amount of chunks successfully queued for repacking
+     * @param ctx The player context for that player.
+     * @return The number of chunks queued for repacking.
      */
     int repack(IPlayerContext ctx);
-
-    /**
-     * Queues the chunks in a square formation around the specified player, using the specified
-     * range, which represents 1/2 the square's dimensions, where the player is in the center.
-     *
-     * @param ctx The player, describing the origin
-     * @param range The range to repack
-     * @return The amount of chunks successfully queued for repacking
-     */
-    int repack(IPlayerContext ctx, int range);
 }

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

@@ -22,6 +22,7 @@ import baritone.api.command.exception.CommandException;
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.registry.IRegistry;
 
 import java.util.stream.Stream;
 
@@ -32,7 +33,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 = IRegistry.BLOCK.get(id)) == Blocks.AIR) {
             throw new IllegalArgumentException("no block found by that id");
         }
         return block;
@@ -42,7 +43,7 @@ public enum BlockById implements IDatatypeFor<Block> {
     public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
         return new TabCompleteHelper()
                 .append(
-                        Block.REGISTRY.getKeys()
+                        IRegistry.BLOCK.keySet()
                                 .stream()
                                 .map(Object::toString)
                 )

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

@@ -17,22 +17,22 @@
 
 package baritone.api.command.datatypes;
 
-import baritone.api.command.helpers.TabCompleteHelper;
 import baritone.api.command.exception.CommandException;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityList;
+import baritone.api.command.helpers.TabCompleteHelper;
+import net.minecraft.entity.EntityType;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.registry.IRegistry;
 
 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;
-        if ((entity = EntityList.REGISTRY.getObject(id)) == null) {
+        EntityType entity;
+        if ((entity = IRegistry.ENTITY_TYPE.get(id)) == null) {
             throw new IllegalArgumentException("no entity found by that id");
         }
         return entity;
@@ -41,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(IRegistry.ENTITY_TYPE.stream().map(Object::toString))
                 .filterPrefixNamespaced(ctx.getConsumer().getString())
                 .sortAlphabetically()
                 .stream();

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

@@ -18,9 +18,10 @@
 package baritone.api.command.datatypes;
 
 import baritone.api.IBaritone;
-import baritone.api.command.helpers.TabCompleteHelper;
 import baritone.api.command.exception.CommandException;
+import baritone.api.command.helpers.TabCompleteHelper;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.text.ITextComponent;
 
 import java.util.List;
 import java.util.stream.Stream;
@@ -36,14 +37,14 @@ public enum NearbyPlayer implements IDatatypeFor<EntityPlayer> {
     public EntityPlayer 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(EntityPlayer::getName).map(ITextComponent::getString))
                 .filterPrefix(ctx.getConsumer().getString())
                 .sortAlphabetically()
                 .stream();

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

@@ -38,26 +38,38 @@ public enum RelativeGoal implements IDatatypePost<Goal, BetterBlockPos> {
         if (origin == null) {
             origin = BetterBlockPos.ORIGIN;
         }
-
         final IArgConsumer consumer = ctx.getConsumer();
 
-        GoalBlock goalBlock = consumer.peekDatatypePostOrNull(RelativeGoalBlock.INSTANCE, origin);
-        if (goalBlock != null) {
-            return goalBlock;
+        List<IDatatypePostFunction<Double, Double>> coords = new ArrayList<>();
+        final IArgConsumer copy = consumer.copy(); // This is a hack and should be fixed in the future probably
+        for (int i = 0; i < 3; i++) {
+            if (copy.peekDatatypeOrNull(RelativeCoordinate.INSTANCE) != null) {
+                coords.add(o -> consumer.getDatatypePost(RelativeCoordinate.INSTANCE, o));
+                copy.get(); // Consume so we actually decrement the remaining arguments
+            }
         }
 
-        GoalXZ goalXZ = consumer.peekDatatypePostOrNull(RelativeGoalXZ.INSTANCE, origin);
-        if (goalXZ != null) {
-            return goalXZ;
+        switch (coords.size()) {
+            case 0:
+                return new GoalBlock(origin);
+            case 1:
+                return new GoalYLevel(
+                        MathHelper.floor(coords.get(0).apply((double) origin.y))
+                );
+            case 2:
+                return new GoalXZ(
+                        MathHelper.floor(coords.get(0).apply((double) origin.x)),
+                        MathHelper.floor(coords.get(1).apply((double) origin.z))
+                );
+            case 3:
+                return new GoalBlock(
+                        MathHelper.floor(coords.get(0).apply((double) origin.x)),
+                        MathHelper.floor(coords.get(1).apply((double) origin.y)),
+                        MathHelper.floor(coords.get(2).apply((double) origin.z))
+                );
+            default:
+                throw new IllegalStateException("Unexpected coords size: " + coords.size());
         }
-
-        GoalYLevel goalYLevel = consumer.peekDatatypePostOrNull(RelativeGoalYLevel.INSTANCE, origin);
-        if (goalYLevel != null) {
-            return goalYLevel;
-        }
-
-        // when the user doesn't input anything, default to the origin
-        return new GoalBlock(origin);
     }
 
     @Override

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

@@ -22,8 +22,4 @@ public abstract class CommandErrorMessageException extends CommandException {
     protected CommandErrorMessageException(String reason) {
         super(reason);
     }
-
-    protected CommandErrorMessageException(String reason, Throwable cause) {
-        super(reason, cause);
-    }
 }

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

@@ -22,8 +22,4 @@ public abstract class CommandException extends Exception implements ICommandExce
     protected CommandException(String reason) {
         super(reason);
     }
-
-    protected CommandException(String reason, Throwable cause) {
-        super(reason, cause);
-    }
 }

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

@@ -23,21 +23,12 @@ public abstract class CommandInvalidArgumentException extends CommandErrorMessag
 
     public final ICommandArgument arg;
 
-    protected CommandInvalidArgumentException(ICommandArgument arg, String message) {
-        super(formatMessage(arg, message));
-        this.arg = arg;
-    }
-
-    protected CommandInvalidArgumentException(ICommandArgument arg, String message, Throwable cause) {
-        super(formatMessage(arg, message), cause);
-        this.arg = arg;
-    }
-
-    private static String formatMessage(ICommandArgument arg, String message) {
-        return String.format(
+    protected CommandInvalidArgumentException(ICommandArgument arg, String reason) {
+        super(String.format(
                 "Error at argument #%s: %s",
                 arg.getIndex() == -1 ? "<unknown>" : Integer.toString(arg.getIndex() + 1),
-                message
-        );
+                reason
+        ));
+        this.arg = arg;
     }
 }

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

@@ -26,7 +26,7 @@ public class CommandInvalidTypeException extends CommandInvalidArgumentException
     }
 
     public CommandInvalidTypeException(ICommandArgument arg, String expected, Throwable cause) {
-        super(arg, String.format("Expected %s", expected), cause);
+        super(arg, String.format("Expected %s.\nMore details: %s", expected, cause.getMessage()));
     }
 
     public CommandInvalidTypeException(ICommandArgument arg, String expected, String got) {
@@ -34,6 +34,6 @@ public class CommandInvalidTypeException extends CommandInvalidArgumentException
     }
 
     public CommandInvalidTypeException(ICommandArgument arg, String expected, String got, Throwable cause) {
-        super(arg, String.format("Expected %s, but got %s instead", expected, got), cause);
+        super(arg, String.format("Expected %s, but got %s instead.\nMore details: %s", expected, got, cause.getMessage()));
     }
 }

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

@@ -37,7 +37,7 @@ public class CommandUnhandledException extends RuntimeException implements IComm
 
     @Override
     public void handle(ICommand command, List<ICommandArgument> args) {
-        HELPER.logDirect("An unhandled exception occurred. " +
+        HELPER.logDirect("An unhandled exception occurred." +
                 "The error is in your game's log, please report this at https://github.com/cabaletta/baritone/issues",
                 TextFormatting.RED);
 

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

@@ -23,7 +23,7 @@ import baritone.api.event.events.type.Overrideable;
 /**
  * @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/TickEvent.java

@@ -19,20 +19,22 @@ package baritone.api.event.events;
 
 import baritone.api.event.events.type.EventState;
 
-import java.util.function.BiFunction;
-
 public final class TickEvent {
 
-    private static int overallTickCount;
-
     private final EventState state;
     private final Type type;
     private final int count;
 
-    public TickEvent(EventState state, Type type, int count) {
+    private static int overallTickCount;
+
+    public TickEvent(EventState state, Type type) {
         this.state = state;
         this.type = type;
-        this.count = count;
+        this.count = incrementCount();
+    }
+
+    private static synchronized int incrementCount() {
+        return overallTickCount++;
     }
 
     public int getCount() {
@@ -47,10 +49,6 @@ public final class TickEvent {
         return state;
     }
 
-    public static synchronized BiFunction<EventState, Type, TickEvent> createNextProvider() {
-        final int count = overallTickCount++;
-        return (state, type) -> new TickEvent(state, type, count);
-    }
 
     public enum Type {
         /**

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

@@ -18,12 +18,11 @@
 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.gui.GuiScreen;
 import net.minecraft.client.multiplayer.WorldClient;
-import net.minecraft.client.settings.GameSettings;
 import net.minecraft.entity.Entity;
 import net.minecraft.network.Packet;
 
@@ -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 EntityPlayerSP#tick()
      */
     void onPlayerUpdate(PlayerUpdateEvent 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(WorldClient, GuiScreen)
      */
     void onWorldEvent(WorldEvent event);
 
@@ -94,7 +90,6 @@ public interface IGameEventListener {
      *
      * @param event The event
      * @see Packet
-     * @see GenericFutureListener
      */
     void onSendPacket(PacketEvent event);
 
@@ -103,7 +98,6 @@ public interface IGameEventListener {
      *
      * @param event The event
      * @see Packet
-     * @see GenericFutureListener
      */
     void onReceivePacket(PacketEvent event);
 
@@ -117,10 +111,10 @@ public interface IGameEventListener {
     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 EntityPlayerSP#livingTick}
      *
      * @param event The event
-     * @see EntityPlayerSP#onLivingUpdate()
+     * @see EntityPlayerSP#livingTick()
      */
     void onPlayerSprintState(SprintStateEvent event);
 

src/api/java/baritone/api/pathing/calc/IPath.java

@@ -105,7 +105,7 @@ public interface IPath {
      * Returns the estimated number of ticks to complete the path from the given node index.
      *
      * @param pathPosition The index of the node we're calculating from
-     * @return The estimated number of ticks remaining from the given position
+     * @return The estimated number of ticks remaining frm the given position
      */
     default double ticksRemainingFrom(int pathPosition) {
         double sum = 0;
@@ -117,15 +117,6 @@ public interface IPath {
         return sum;
     }
 
-    /**
-     * Returns the estimated amount of time needed to complete this path from start to finish
-     *
-     * @return The estimated amount of time, in ticks
-     */
-    default double totalTicks() {
-        return ticksRemainingFrom(0);
-    }
-
     /**
      * Cuts off this path at the loaded chunk border, and returns the resulting path. Default
      * implementation just returns this path, without the intended functionality.

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

@@ -52,7 +52,7 @@ public interface IBuilderProcess extends IBaritoneProcess {
     boolean build(String name, File schematic, Vec3i 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);
     }
 

src/api/java/baritone/api/schematic/AbstractSchematic.java

@@ -23,10 +23,6 @@ public abstract class AbstractSchematic implements ISchematic {
     protected int y;
     protected int z;
 
-    public AbstractSchematic() {
-        this(0, 0, 0);
-    }
-
     public AbstractSchematic(int x, int y, int z) {
         this.x = x;
         this.y = y;

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

@@ -32,10 +32,6 @@ 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 BlockOptionalMeta getBom() {
         return bom;
     }

src/api/java/baritone/api/schematic/ISchematicSystem.java

@@ -1,44 +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.api.schematic;
-
-import baritone.api.command.registry.Registry;
-import baritone.api.schematic.format.ISchematicFormat;
-
-import java.io.File;
-import java.util.Optional;
-
-/**
- * @author Brady
- * @since 12/23/2019
- */
-public interface ISchematicSystem {
-
-    /**
-     * @return The registry of supported schematic formats
-     */
-    Registry<ISchematicFormat> getRegistry();
-
-    /**
-     * Attempts to find an {@link ISchematicFormat} that supports the specified schematic file.
-     *
-     * @param file A schematic file
-     * @return The corresponding format for the file, {@link Optional#empty()} if no candidates were found.
-     */
-    Optional<ISchematicFormat> getByFile(File file);
-}

src/api/java/baritone/api/schematic/IStaticSchematic.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.api.schematic;
-
-import net.minecraft.block.state.IBlockState;
-
-/**
- * A static schematic is capable of providing the desired state at a given position without
- * additional context. Schematics of this type are expected to have non-varying contents.
- * 
- * @see #getDirect(int, int, int) 
- *
- * @author Brady
- * @since 12/24/2019
- */
-public interface IStaticSchematic extends ISchematic {
-
-    /**
-     * Gets the {@link IBlockState} for a given position in this schematic. It should be guaranteed
-     * that the return value of this method will not change given that the parameters are the same.
-     *
-     * @param x The X block position
-     * @param y The Y block position
-     * @param z The Z block position
-     * @return The desired state at the specified position.
-     */
-    IBlockState 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
-     * 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
-     */
-    default IBlockState[] getColumn(int x, int z) {
-        IBlockState[] column = new IBlockState[this.heightY()];
-        for (int i = 0; i < this.heightY(); i++) {
-            column[i] = getDirect(x, i, z);
-        }
-        return column;
-    }
-}

src/api/java/baritone/api/schematic/format/ISchematicFormat.java

@@ -1,45 +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.api.schematic.format;
-
-import baritone.api.schematic.ISchematic;
-import baritone.api.schematic.IStaticSchematic;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * The base of a {@link ISchematic} file format
- *
- * @author Brady
- * @since 12/23/2019
- */
-public interface ISchematicFormat {
-
-    /**
-     * @return The parser for creating schematics of this format
-     */
-    IStaticSchematic parse(InputStream input) throws IOException;
-
-    /**
-     * @param file The file to check against
-     * @return Whether or not the specified file matches this schematic format
-     */
-    boolean isFileType(File file);
-}

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

@@ -20,45 +20,37 @@ 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 net.minecraft.item.ItemStack;
+import net.minecraft.state.IProperty;
+import net.minecraft.state.properties.*;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.registry.IRegistry;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.util.*;
 import java.util.function.Consumer;
 import java.util.regex.MatchResult;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 public final class BlockOptionalMeta {
 
     private final Block block;
-    private final int meta;
-    private final boolean noMeta;
     private final Set<IBlockState> 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) {
+    public BlockOptionalMeta(@Nonnull Block block) {
         this.block = block;
-        this.noMeta = meta == null;
-        this.meta = noMeta ? 0 : meta;
-        this.blockstates = getStates(block, meta);
+        this.blockstates = getStates(block);
         this.stateHashes = getStateHashes(blockstates);
         this.stackHashes = getStackHashes(blockstates);
     }
 
-    public BlockOptionalMeta(@Nonnull Block block) {
-        this(block, null);
-    }
-
     public BlockOptionalMeta(@Nonnull String selector) {
         Matcher matcher = pattern.matcher(selector);
 
@@ -67,17 +59,15 @@ 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)) {
+        if (!IRegistry.BLOCK.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 = IRegistry.BLOCK.get(id);
+        blockstates = getStates(block);
         stateHashes = getStateHashes(blockstates);
         stackHashes = getStackHashes(blockstates);
     }
@@ -87,17 +77,14 @@ public final class BlockOptionalMeta {
         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);
+        put.accept(Half.BOTTOM);
+        put.accept(StairsShape.STRAIGHT);
+        put.accept(AttachFace.FLOOR);
+        put.accept(DoubleBlockHalf.UPPER);
+        put.accept(SlabType.BOTTOM);
+        put.accept(DoorHingeSide.LEFT);
+        put.accept(BedPart.HEAD);
+        put.accept(RailShape.NORTH_SOUTH);
         _normalizations.put(BlockBanner.ROTATION, 0);
         _normalizations.put(BlockBed.OCCUPIED, false);
         _normalizations.put(BlockBrewingStand.HAS_BOTTLE[0], false);
@@ -115,7 +102,7 @@ public final class BlockOptionalMeta {
         _normalizations.put(BlockChorusPlant.DOWN, false);
         // _normalizations.put(BlockCocoa.AGE, 0);
         // _normalizations.put(BlockCrops.AGE, 0);
-        _normalizations.put(BlockDirt.SNOWY, false);
+        _normalizations.put(BlockDirtSnowy.SNOWY, false);
         _normalizations.put(BlockDoor.OPEN, false);
         _normalizations.put(BlockDoor.POWERED, false);
         // _normalizations.put(BlockFarmland.MOISTURE, 0);
@@ -130,7 +117,7 @@ public final class BlockOptionalMeta {
         _normalizations.put(BlockFire.EAST, false);
         _normalizations.put(BlockFire.SOUTH, false);
         _normalizations.put(BlockFire.WEST, false);
-        _normalizations.put(BlockFire.UPPER, false);
+        _normalizations.put(BlockFire.UP, false);
         // _normalizations.put(BlockFrostedIce.AGE, 0);
         _normalizations.put(BlockGrass.SNOWY, false);
         // _normalizations.put(BlockHopper.ENABLED, true);
@@ -138,7 +125,7 @@ public final class BlockOptionalMeta {
         // _normalizations.put(BlockLiquid.LEVEL, 0);
         // _normalizations.put(BlockMycelium.SNOWY, false);
         // _normalizations.put(BlockNetherWart.AGE, false);
-        _normalizations.put(BlockLeaves.CHECK_DECAY, false);
+        _normalizations.put(BlockLeaves.DISTANCE, false);
         // _normalizations.put(BlockLeaves.DECAYABLE, false);
         // _normalizations.put(BlockObserver.POWERED, false);
         _normalizations.put(BlockPane.NORTH, false);
@@ -148,8 +135,6 @@ public final class BlockOptionalMeta {
         // _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);
@@ -158,7 +143,6 @@ public final class BlockOptionalMeta {
         _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);
@@ -178,49 +162,38 @@ public final class BlockOptionalMeta {
         normalizations = Collections.unmodifiableMap(_normalizations);
     }
 
-    public static <C extends Comparable<C>, P extends IProperty<C>> P castToIProperty(Object value) {
+    private 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) {
+    private 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()) {
+        for (IProperty<?> property : state.getProperties()) {
             Class<?> valueClass = property.getValueClass();
             if (normalizations.containsKey(property)) {
                 try {
-                    newState = newState.withProperty(
+                    newState = newState.with(
                             castToIProperty(property),
                             castToIPropertyValue(property, normalizations.get(property))
                     );
                 } catch (IllegalArgumentException ignored) {}
-            } else if (normalizations.containsKey(state.getValue(property))) {
+            } else if (normalizations.containsKey(state.get(property))) {
                 try {
-                    newState = newState.withProperty(
+                    newState = newState.with(
                             castToIProperty(property),
-                            castToIPropertyValue(property, normalizations.get(state.getValue(property)))
+                            castToIPropertyValue(property, normalizations.get(state.get(property)))
                     );
                 } catch (IllegalArgumentException ignored) {}
             } else if (normalizations.containsKey(valueClass)) {
                 try {
-                    newState = newState.withProperty(
+                    newState = newState.with(
                             castToIProperty(property),
                             castToIPropertyValue(property, normalizations.get(valueClass))
                     );
@@ -231,23 +204,12 @@ public final class BlockOptionalMeta {
         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.
-     * 
-     * @see #normalize(IBlockState) 
-     * 
-     * @param state The state to check
-     * @return The target meta of the state
-     */
     public static int stateMeta(IBlockState state) {
-        return state.getBlock().getMetaFromState(normalize(state));
+        return state.hashCode();
     }
 
-    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 Set<IBlockState> getStates(@Nonnull Block block) {
+        return new HashSet<>(block.getStateContainer().getValidStates());
     }
 
     private static ImmutableSet<Integer> getStateHashes(Set<IBlockState> blockstates) {
@@ -263,8 +225,8 @@ public final class BlockOptionalMeta {
         return ImmutableSet.copyOf(
                 blockstates.stream()
                         .map(state -> new ItemStack(
-                                state.getBlock().getItemDropped(state, new Random(), 0),
-                                state.getBlock().damageDropped(state)
+                                state.getBlock().getItemDropped(state, null, null, 0).asItem(),
+                                1
                         ))
                         .map(stack -> ((IItemStack) (Object) stack).getBaritoneHash())
                         .toArray(Integer[]::new)
@@ -275,10 +237,6 @@ public final class BlockOptionalMeta {
         return block;
     }
 
-    public Integer getMeta() {
-        return noMeta ? null : meta;
-    }
-
     public boolean matches(@Nonnull Block block) {
         return block == this.block;
     }
@@ -292,21 +250,14 @@ 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());
-    }
-
-    public static IBlockState blockStateFromStack(ItemStack stack) {
-        //noinspection deprecation
-        return Block.getBlockFromItem(stack.getItem()).getStateFromMeta(stack.getMetadata());
+        return String.format("BlockOptionalMeta{block=%s}", block);
     }
 
     public IBlockState getAnyBlockState() {

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.IRegistry;
 
 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 = IRegistry.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 = IRegistry.BLOCK.get(ResourceLocation.tryCreate(name.contains(":") ? name : "minecraft:" + name));
         Map<String, Block> copy = new HashMap<>(resourceCache); // read only copy is safe, wont throw concurrentmodification
         copy.put(name, block);
         resourceCache = copy;

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

@@ -43,7 +43,7 @@ public interface Helper {
     /**
      * Instance of the game
      */
-    Minecraft mc = Minecraft.getMinecraft();
+    Minecraft mc = Minecraft.getInstance();
 
     static ITextComponent getPrefix() {
         // Inner text component
@@ -84,7 +84,7 @@ public interface Helper {
         component.appendSibling(getPrefix());
         component.appendSibling(new TextComponentString(" "));
         Arrays.asList(components).forEach(component::appendSibling);
-        Minecraft.getMinecraft().addScheduledTask(() -> BaritoneAPI.getSettings().logger.value.accept(component));
+        mc.addScheduledTask(() -> BaritoneAPI.getSettings().logger.value.accept(component));
     }
 
     /**

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

@@ -84,7 +84,7 @@ public interface IPlayerContext {
      */
     default Optional<BlockPos> getSelectedBlock() {
         RayTraceResult result = objectMouseOver();
-        if (result != null && result.typeOfHit == RayTraceResult.Type.BLOCK) {
+        if (result != null && result.type == RayTraceResult.Type.BLOCK) {
             return Optional.of(result.getBlockPos());
         }
         return Optional.empty();
@@ -101,8 +101,8 @@ public interface IPlayerContext {
      */
     default Optional<Entity> getSelectedEntity() {
         RayTraceResult result = objectMouseOver();
-        if (result != null && result.typeOfHit == RayTraceResult.Type.ENTITY) {
-            return Optional.of(result.entityHit);
+        if (result != null && result.type == RayTraceResult.Type.ENTITY) {
+            return Optional.of(result.entity);
         }
         return Optional.empty();
     }

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

@@ -17,7 +17,6 @@
 
 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;
@@ -46,8 +45,6 @@ public interface IPlayerController {
 
     ItemStack windowClick(int windowId, int slotId, int mouseButton, ClickType type, EntityPlayer player);
 
-    void setGameType(GameType type);
-
     GameType getGameType();
 
     EnumActionResult processRightClickBlock(EntityPlayerSP player, World world, BlockPos pos, EnumFacing direction, Vec3d vec, EnumHand hand);
@@ -59,6 +56,6 @@ public interface IPlayerController {
     void setHittingBlock(boolean hittingBlock);
 
     default double getBlockReachDistance() {
-        return this.getGameType().isCreative() ? 5.0F : BaritoneAPI.getSettings().blockReachDistance.value;
+        return this.getGameType().isCreative() ? 5.0F : 4.5F;
     }
 }

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

@@ -18,6 +18,7 @@
 package baritone.api.utils;
 
 import net.minecraft.entity.Entity;
+import net.minecraft.util.math.RayTraceFluidMode;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.math.Vec3d;
 
@@ -40,13 +41,13 @@ public final class RayTraceUtils {
      * @return The calculated raytrace result
      */
     public static RayTraceResult rayTraceTowards(Entity entity, Rotation rotation, double blockReachDistance) {
-        Vec3d start = entity.getPositionEyes(1.0F);
+        Vec3d start = entity.getEyePosition(1.0F);
         Vec3d direction = RotationUtils.calcVec3dFromRotation(rotation);
         Vec3d 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(start, end, RayTraceFluidMode.NEVER, false, true);
     }
 }

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

@@ -23,7 +23,13 @@ import net.minecraft.block.BlockFire;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.math.*;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.math.shapes.VoxelShape;
+import net.minecraft.util.math.shapes.VoxelShapes;
 
 import java.util.Optional;
 
@@ -174,11 +180,14 @@ public final class RotationUtils {
         }
 
         IBlockState state = entity.world.getBlockState(pos);
-        AxisAlignedBB aabb = state.getBoundingBox(entity.world, pos);
+        VoxelShape shape = state.getShape(entity.world, pos);
+        if (shape.isEmpty()) {
+            shape = VoxelShapes.fullCube();
+        }
         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);
+            double xDiff = shape.getStart(EnumFacing.Axis.X) * sideOffset.x + shape.getEnd(EnumFacing.Axis.X) * (1 - sideOffset.x);
+            double yDiff = shape.getStart(EnumFacing.Axis.Y) * sideOffset.y + shape.getEnd(EnumFacing.Axis.Y) * (1 - sideOffset.y);
+            double zDiff = shape.getStart(EnumFacing.Axis.Z) * sideOffset.z + shape.getEnd(EnumFacing.Axis.Z) * (1 - sideOffset.z);
             possibleRotation = reachableOffset(entity, pos, new Vec3d(pos).add(xDiff, yDiff, zDiff), blockReachDistance);
             if (possibleRotation.isPresent()) {
                 return possibleRotation;
@@ -199,10 +208,10 @@ public final class RotationUtils {
      * @return The optional rotation
      */
     public static Optional<Rotation> reachableOffset(Entity entity, BlockPos pos, Vec3d offsetPos, double blockReachDistance) {
-        Rotation rotation = calcRotationFromVec3d(entity.getPositionEyes(1.0F), offsetPos, new Rotation(entity.rotationYaw, entity.rotationPitch));
+        Rotation rotation = calcRotationFromVec3d(entity.getEyePosition(1.0F), offsetPos, new Rotation(entity.rotationYaw, entity.rotationPitch));
         RayTraceResult result = RayTraceUtils.rayTraceTowards(entity, rotation, blockReachDistance);
         //System.out.println(result);
-        if (result != null && result.typeOfHit == RayTraceResult.Type.BLOCK) {
+        if (result != null && result.type == RayTraceResult.Type.BLOCK) {
             if (result.getBlockPos().equals(pos)) {
                 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.ResourceLocation;
 import net.minecraft.util.math.Vec3i;
+import net.minecraft.util.registry.IRegistry;
 
 import java.awt.*;
 import java.io.BufferedReader;
@@ -43,13 +46,13 @@ 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 boolean isComment(String line) {
         return line.startsWith("#") || line.startsWith("//");
     }
@@ -233,15 +236,14 @@ public class SettingsUtil {
         ),
         ITEM(
                 Item.class,
-                str -> Item.getByNameOrId(str.trim()),
-                item -> Item.REGISTRY.getNameForObject(item).toString()
+                str -> IRegistry.ITEM.get(new ResourceLocation(str.trim())),
+                item -> IRegistry.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());

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

@@ -20,9 +20,10 @@ package baritone.api.utils;
 import net.minecraft.block.BlockFire;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.math.shapes.VoxelShape;
 import net.minecraft.world.World;
 
 /**
@@ -43,10 +44,16 @@ public final class VecUtils {
      */
     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;
+        VoxelShape shape = b.getCollisionShape(world, pos);
+        if (shape.isEmpty()) {
+            return getBlockPosCenter(pos);
+        }
+        double xDiff = (shape.getStart(EnumFacing.Axis.X) + shape.getEnd(EnumFacing.Axis.X)) / 2;
+        double yDiff = (shape.getStart(EnumFacing.Axis.Y) + shape.getEnd(EnumFacing.Axis.Y)) / 2;
+        double zDiff = (shape.getStart(EnumFacing.Axis.Z) + shape.getEnd(EnumFacing.Axis.Z)) / 2;
+        if (Double.isNaN(xDiff) || Double.isNaN(yDiff) || Double.isNaN(zDiff)) {
+            throw new IllegalStateException(b + " " + pos + " " + shape);
+        }
         if (b.getBlock() instanceof BlockFire) {//look at bottom of fire when putting it out
             yDiff = 0;
         }

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/MixinBlockStateContainer.java

@@ -33,11 +33,11 @@ public abstract class MixinBlockStateContainer implements IBlockStateContainer {
     protected BitArray storage;
 
     @Shadow
-    protected IBlockStatePalette palette;
+    protected IBlockStatePalette<IBlockState> palette;
 
     @Override
     public IBlockState getAtPalette(int index) {
-        return palette.getBlockState(index);
+        return palette.get(index);
     }
 
     @Override

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

@@ -28,7 +28,10 @@ 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.*;
+import static org.lwjgl.opengl.GL11.GL_ONE;
+import static org.lwjgl.opengl.GL11.GL_ZERO;
+import static org.lwjgl.opengl.GL14.GL_CONSTANT_ALPHA;
+import static org.lwjgl.opengl.GL14.GL_ONE_MINUS_CONSTANT_ALPHA;
 
 @Mixin(ChunkRenderContainer.class)
 public class MixinChunkRenderContainer {
@@ -41,11 +44,11 @@ public class MixinChunkRenderContainer {
             )
     )
     private BlockPos getPosition(RenderChunk renderChunkIn) {
-        if (Baritone.settings().renderCachedChunks.value && !Minecraft.getMinecraft().isSingleplayer() && Minecraft.getMinecraft().world.getChunk(renderChunkIn.getPosition()).isEmpty()) {
-            GlStateManager.enableAlpha();
+        if (Baritone.settings().renderCachedChunks.value && !Minecraft.getInstance().isSingleplayer() && Minecraft.getInstance().world.getChunk(renderChunkIn.getPosition()).isEmpty()) {
+            GlStateManager.enableAlphaTest();
             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);
+            GlStateManager.blendFuncSeparate(GL_CONSTANT_ALPHA, GL_ONE_MINUS_CONSTANT_ALPHA, GL_ONE, GL_ZERO);
         }
         return renderChunkIn.getPosition();
     }

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

@@ -43,7 +43,7 @@ public abstract class MixinChunkRenderWorker {
             )
     )
     private boolean isChunkExisting(ChunkRenderWorker worker, BlockPos pos, World world) {
-        if (Baritone.settings().renderCachedChunks.value && !Minecraft.getMinecraft().isSingleplayer()) {
+        if (Baritone.settings().renderCachedChunks.value && !Minecraft.getInstance().isSingleplayer()) {
             Baritone baritone = (Baritone) BaritoneAPI.getProvider().getPrimaryBaritone();
             IPlayerContext ctx = baritone.getPlayerContext();
             if (ctx.player() != null && ctx.world() != null && baritone.bsi != null) {

src/launch/java/baritone/launch/mixins/MixinEntityLivingBase.java

@@ -23,6 +23,7 @@ import baritone.api.event.events.RotationMoveEvent;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.EntityType;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -44,9 +45,8 @@ public abstract class MixinEntityLivingBase extends Entity {
      */
     private RotationMoveEvent jumpRotationEvent;
 
-    public MixinEntityLivingBase(World worldIn, RotationMoveEvent jumpRotationEvent) {
-        super(worldIn);
-        this.jumpRotationEvent = jumpRotationEvent;
+    public MixinEntityLivingBase(EntityType<?> entityTypeIn, World worldIn) {
+        super(entityTypeIn, worldIn);
     }
 
     @Inject(

src/launch/java/baritone/launch/mixins/MixinEntityPlayerSP.java

@@ -58,10 +58,10 @@ 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/EntityPlayerSP.isPassenger()Z",
                     shift = At.Shift.BY,
                     by = -3
             )
@@ -74,7 +74,7 @@ public class MixinEntityPlayerSP {
     }
 
     @Inject(
-            method = "onUpdate",
+            method = "tick",
             at = @At(
                     value = "INVOKE",
                     target = "net/minecraft/client/entity/EntityPlayerSP.onUpdateWalkingPlayer()V",
@@ -90,7 +90,7 @@ public class MixinEntityPlayerSP {
     }
 
     @Redirect(
-            method = "onLivingUpdate",
+            method = "livingTick",
             at = @At(
                     value = "FIELD",
                     target = "net/minecraft/entity/player/PlayerCapabilities.allowFlying:Z"
@@ -105,7 +105,7 @@ public class MixinEntityPlayerSP {
     }
 
     @Redirect(
-            method = "onLivingUpdate",
+            method = "livingTick",
             at = @At(
                     value = "INVOKE",
                     target = "net/minecraft/client/settings/KeyBinding.isKeyDown()Z"

src/launch/java/baritone/launch/mixins/MixinGameRenderer.java

@@ -20,24 +20,24 @@ 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 net.minecraft.client.renderer.GameRenderer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(EntityRenderer.class)
-public class MixinEntityRenderer {
+@Mixin(GameRenderer.class)
+public class MixinGameRenderer {
 
     @Inject(
-            method = "renderWorldPass",
+            method = "updateCameraAndRender(FJ)V",
             at = @At(
                     value = "INVOKE_STRING",
                     target = "Lnet/minecraft/profiler/Profiler;endStartSection(Ljava/lang/String;)V",
                     args = {"ldc=hand"}
             )
     )
-    private void renderWorldPass(int pass, float partialTicks, long finishTimeNano, CallbackInfo ci) {
+    private void renderWorldPass(float partialTicks, long finishTimeNano, CallbackInfo ci) {
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
             ibaritone.getGameEventHandler().onRenderPass(new RenderEvent(partialTicks));
         }

src/launch/java/baritone/launch/mixins/MixinGuiChat.java

@@ -0,0 +1,99 @@
+/*
+ * 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.GuiChat;
+import net.minecraft.client.gui.GuiTextField;
+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(GuiChat.class)
+public class MixinGuiChat {
+
+    @Shadow
+    protected GuiTextField inputField;
+
+    @Shadow
+    @Final
+    protected List<String> commandUsage;
+
+    @Shadow
+    private CompletableFuture<Suggestions> pendingSuggestions;
+
+    @Inject(
+            method = "updateSuggestion",
+            at = @At("HEAD"),
+            cancellable = true
+    )
+    private void preUpdateSuggestion(CallbackInfo ci) {
+        // Anything that is present in the input text before the cursor position
+        String prefix = this.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.commandUsage.clear();
+
+            if (event.completions.length == 0) {
+                this.pendingSuggestions = Suggestions.empty();
+            } else {
+                int offset = this.inputField.getText().endsWith(" ")
+                        ? this.inputField.getCursorPosition()
+                        : this.inputField.getText().lastIndexOf(" ") + 1; // If there is no space this is still 0 haha yes
+
+                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.pendingSuggestions = new CompletableFuture<>();
+                this.pendingSuggestions.complete(suggestions);
+            }
+        }
+    }
+}

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/MixinMinecraft.java

@@ -41,8 +41,6 @@ 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;
-
 /**
  * @author Brady
  * @since 7/31/2018
@@ -86,24 +84,22 @@ public class MixinMinecraft {
             )
     )
     private void runTick(CallbackInfo ci) {
-        final BiFunction<EventState, TickEvent.Type, TickEvent> tickProvider = TickEvent.createNextProvider();
+        for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
 
-        for (IBaritone baritone : BaritoneAPI.getProvider().getAllBaritones()) {
-
-            TickEvent.Type type = baritone.getPlayerContext().player() != null && baritone.getPlayerContext().world() != null
+            TickEvent.Type type = ibaritone.getPlayerContext().player() != null && ibaritone.getPlayerContext().world() != null
                     ? TickEvent.Type.IN
                     : TickEvent.Type.OUT;
 
-            baritone.getGameEventHandler().onTick(tickProvider.apply(EventState.PRE, type));
+            ibaritone.getGameEventHandler().onTick(new TickEvent(EventState.PRE, type));
         }
 
     }
 
     @Inject(
-            method = "loadWorld(Lnet/minecraft/client/multiplayer/WorldClient;Ljava/lang/String;)V",
+            method = "loadWorld(Lnet/minecraft/client/multiplayer/WorldClient;Lnet/minecraft/client/gui/GuiScreen;)V",
             at = @At("HEAD")
     )
-    private void preLoadWorld(WorldClient world, String loadingMessage, CallbackInfo ci) {
+    private void preLoadWorld(WorldClient world, GuiScreen loadingScreen, CallbackInfo ci) {
         // If we're unloading the world but one doesn't exist, ignore it
         if (this.world == null && world == null) {
             return;
@@ -120,10 +116,10 @@ public class MixinMinecraft {
     }
 
     @Inject(
-            method = "loadWorld(Lnet/minecraft/client/multiplayer/WorldClient;Ljava/lang/String;)V",
+            method = "loadWorld(Lnet/minecraft/client/multiplayer/WorldClient;Lnet/minecraft/client/gui/GuiScreen;)V",
             at = @At("RETURN")
     )
-    private void postLoadWorld(WorldClient world, String loadingMessage, CallbackInfo ci) {
+    private void postLoadWorld(WorldClient world, GuiScreen loadingScreen, 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

src/launch/java/baritone/launch/mixins/MixinNetHandlerPlayClient.java

@@ -24,6 +24,7 @@ import baritone.api.event.events.type.EventState;
 import net.minecraft.client.network.NetHandlerPlayClient;
 import net.minecraft.network.play.server.SPacketChunkData;
 import net.minecraft.network.play.server.SPacketCombatEvent;
+import net.minecraft.network.play.server.SPacketUnloadChunk;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -40,7 +41,7 @@ public class MixinNetHandlerPlayClient {
             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) {
@@ -77,6 +78,34 @@ public class MixinNetHandlerPlayClient {
         }
     }
 
+    @Inject(
+            method = "processChunkUnload",
+            at = @At("HEAD")
+    )
+    private void preChunkUnload(SPacketUnloadChunk packet, CallbackInfo ci) {
+        for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
+            if (ibaritone.getPlayerContext().player().connection == (NetHandlerPlayClient) (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(SPacketUnloadChunk packet, CallbackInfo ci) {
+        for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
+            if (ibaritone.getPlayerContext().player().connection == (NetHandlerPlayClient) (Object) this) {
+                ibaritone.getGameEventHandler().onChunkEvent(
+                        new ChunkEvent(EventState.POST, ChunkEvent.Type.UNLOAD, packet.getX(), packet.getZ())
+                );
+            }
+        }
+    }
+
     @Inject(
             method = "handleCombatEvent",
             at = @At(

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

@@ -53,7 +53,7 @@ public class MixinNetworkManager {
             method = "dispatchPacket",
             at = @At("HEAD")
     )
-    private void preDispatchPacket(Packet<?> inPacket, final GenericFutureListener<? extends Future<? super Void>>[] futureListeners, CallbackInfo ci) {
+    private void preDispatchPacket(Packet<?> inPacket, final GenericFutureListener<? extends Future<? super Void>> futureListeners, CallbackInfo ci) {
         if (this.direction != EnumPacketDirection.CLIENTBOUND) {
             return;
         }
@@ -69,7 +69,7 @@ public class MixinNetworkManager {
             method = "dispatchPacket",
             at = @At("RETURN")
     )
-    private void postDispatchPacket(Packet<?> inPacket, final GenericFutureListener<? extends Future<? super Void>>[] futureListeners, CallbackInfo ci) {
+    private void postDispatchPacket(Packet<?> inPacket, final GenericFutureListener<? extends Future<? super Void>> futureListeners, CallbackInfo ci) {
         if (this.direction != EnumPacketDirection.CLIENTBOUND) {
             return;
         }
@@ -85,7 +85,7 @@ 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/Packet;Lnet/minecraft/network/INetHandler;)V"
             )
     )
     private void preProcessPacket(ChannelHandlerContext context, Packet<?> packet, CallbackInfo ci) {

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

@@ -23,8 +23,8 @@ 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.client.renderer.chunk.RenderChunkCache;
 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;
@@ -40,43 +40,11 @@ public class MixinRenderChunk {
             method = "rebuildChunk",
             at = @At(
                     value = "INVOKE",
-                    target = "net/minecraft/world/ChunkCache.isEmpty()Z"
+                    target = "net/minecraft/client/renderer/chunk/RenderChunkCache.getBlockState(Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/block/state/IBlockState;"
             )
     )
-    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()) {
+    private IBlockState getBlockState(RenderChunkCache chunkCache, BlockPos pos) {
+        if (Baritone.settings().renderCachedChunks.value && !Minecraft.getInstance().isSingleplayer()) {
             Baritone baritone = (Baritone) BaritoneAPI.getProvider().getPrimaryBaritone();
             IPlayerContext ctx = baritone.getPlayerContext();
             if (ctx.player() != null && ctx.world() != null && baritone.bsi != null) {

src/launch/java/baritone/launch/mixins/MixinRenderChunkCache.java

@@ -17,23 +17,31 @@
 
 package baritone.launch.mixins;
 
-import net.minecraft.client.gui.GuiChat;
+import baritone.Baritone;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.chunk.RenderChunkCache;
+import net.minecraft.world.chunk.Chunk;
 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.Redirect;
 
-@Mixin(GuiChat.ChatTabCompleter.class)
-public abstract class MixinChatTabCompleter extends MixinTabCompleter {
+@Mixin(RenderChunkCache.class)
+public class MixinRenderChunkCache {
 
-    @Inject(
-            method = "complete",
-            at = @At("HEAD"),
-            cancellable = true
+    @Redirect(
+            method = "generateCache",
+            at = @At(
+                    value = "INVOKE",
+                    target = "net/minecraft/world/chunk/Chunk.isEmptyBetween(II)Z"
+            )
     )
-    private void onComplete(CallbackInfo ci) {
-        if (dontComplete) {
-            ci.cancel();
+    private static boolean isEmpty(Chunk chunk, int yStart, int yEnd) {
+        if (!chunk.isEmptyBetween(yStart, yEnd)) {
+            return false;
         }
+        if (chunk.isEmpty() && Baritone.settings().renderCachedChunks.value && Minecraft.getInstance().getIntegratedServer() == null) {
+            return false;
+        }
+        return true;
     }
 }

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

@@ -38,9 +38,9 @@ public class MixinRenderList {
             )
     )
     private void popMatrix() {
-        if (Baritone.settings().renderCachedChunks.value && !Minecraft.getMinecraft().isSingleplayer()) {
+        if (Baritone.settings().renderCachedChunks.value && !Minecraft.getInstance().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.blendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO);
         }
         GlStateManager.popMatrix();
     }

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

@@ -38,9 +38,9 @@ public class MixinVboRenderList {
             )
     )
     private void popMatrix() {
-        if (Baritone.settings().renderCachedChunks.value && !Minecraft.getMinecraft().isSingleplayer()) {
+        if (Baritone.settings().renderCachedChunks.value && !Minecraft.getInstance().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.blendFuncSeparate(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/resources/mixins.baritone.json

@@ -11,14 +11,14 @@
     "MixinAnvilChunkLoader",
     "MixinBitArray",
     "MixinBlockStateContainer",
-    "MixinChatTabCompleter",
     "MixinChunkProviderClient",
     "MixinChunkProviderServer",
     "MixinChunkRenderContainer",
     "MixinChunkRenderWorker",
     "MixinEntityLivingBase",
     "MixinEntityPlayerSP",
-    "MixinEntityRenderer",
+    "MixinGameRenderer",
+    "MixinGuiChat",
     "MixinGuiScreen",
     "MixinItemStack",
     "MixinMinecraft",
@@ -26,10 +26,8 @@
     "MixinNetworkManager",
     "MixinPlayerControllerMP",
     "MixinRenderChunk",
+    "MixinRenderChunkCache",
     "MixinRenderList",
-    "MixinStateImplementation",
-    "MixinTabCompleter",
-    "MixinVboRenderList",
-    "MixinWorldClient"
+    "MixinVboRenderList"
   ]
 }

src/main/java/baritone/Baritone.java

@@ -25,11 +25,12 @@ import baritone.api.utils.Helper;
 import baritone.api.utils.IPlayerContext;
 import baritone.behavior.*;
 import baritone.cache.WorldProvider;
-import baritone.command.manager.CommandManager;
 import baritone.event.GameEventHandler;
 import baritone.process.*;
 import baritone.selection.SelectionManager;
 import baritone.utils.*;
+import baritone.command.manager.CommandManager;
+import baritone.utils.player.PrimaryPlayerContext;
 import net.minecraft.client.Minecraft;
 
 import java.io.File;
@@ -52,7 +53,7 @@ public class Baritone implements IBaritone {
     static {
         threadPool = new ThreadPoolExecutor(4, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS, new SynchronousQueue<>());
 
-        dir = new File(Minecraft.getMinecraft().gameDir, "baritone");
+        dir = new File(Minecraft.getInstance().gameDir, "baritone");
         if (!Files.exists(dir.toPath())) {
             try {
                 Files.createDirectories(dir.toPath());
@@ -86,11 +87,11 @@ public class Baritone implements IBaritone {
 
     public BlockStateInterface bsi;
 
-    public Baritone(IPlayerContext playerContext) {
+    Baritone() {
         this.gameEventHandler = new GameEventHandler(this);
 
         // Define this before behaviors try and get it, or else it will be null and the builds will fail!
-        this.playerContext = playerContext;
+        this.playerContext = PrimaryPlayerContext.INSTANCE;
 
         {
             // the Behavior constructor calls baritone.registerBehavior(this) so this populates the behaviors arraylist
@@ -233,4 +234,4 @@ public class Baritone implements IBaritone {
     public static Executor getExecutor() {
         return threadPool;
     }
-}
+}

src/main/java/baritone/BaritoneProvider.java

@@ -19,19 +19,13 @@ package baritone;
 
 import baritone.api.IBaritone;
 import baritone.api.IBaritoneProvider;
-import baritone.api.bot.IBaritoneUser;
-import baritone.api.bot.IUserManager;
 import baritone.api.cache.IWorldScanner;
 import baritone.api.command.ICommandSystem;
-import baritone.bot.UserManager;
-import baritone.api.schematic.ISchematicSystem;
 import baritone.command.BaritoneChatControl;
 import baritone.cache.WorldScanner;
 import baritone.command.CommandSystem;
-import baritone.utils.player.PrimaryPlayerContext;
-import baritone.utils.schematic.SchematicSystem;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -41,9 +35,11 @@ import java.util.List;
 public final class BaritoneProvider implements IBaritoneProvider {
 
     private final Baritone primary;
+    private final List<IBaritone> all;
 
     {
-        this.primary = new Baritone(PrimaryPlayerContext.INSTANCE);
+        this.primary = new Baritone();
+        this.all = Collections.singletonList(this.primary);
 
         // Setup chat control, just for the primary instance
         new BaritoneChatControl(this.primary);
@@ -56,12 +52,7 @@ public final class BaritoneProvider implements IBaritoneProvider {
 
     @Override
     public List<IBaritone> getAllBaritones() {
-        List<IBaritone> baritones = new ArrayList<>();
-        baritones.add(getPrimaryBaritone());
-        for (IBaritoneUser ibu : UserManager.INSTANCE.users()) {
-            baritones.add(ibu.getBaritone());
-        }
-        return baritones;
+        return all;
     }
 
     @Override
@@ -69,18 +60,8 @@ public final class BaritoneProvider implements IBaritoneProvider {
         return WorldScanner.INSTANCE;
     }
 
-    @Override
-    public IUserManager getUserManager() {
-        return UserManager.INSTANCE;
-    }
-
     @Override
     public ICommandSystem getCommandSystem() {
         return CommandSystem.INSTANCE;
     }
-
-    @Override
-    public ISchematicSystem getSchematicSystem() {
-        return SchematicSystem.INSTANCE;
-    }
 }

src/main/java/baritone/behavior/InventoryBehavior.java

@@ -134,7 +134,7 @@ public final class InventoryBehavior extends Behavior {
 
     public boolean selectThrowawayForLocation(boolean select, int x, int y, int z) {
         IBlockState maybe = baritone.getBuilderProcess().placeAt(x, y, z, baritone.bsi.get0(x, y, z));
-        if (maybe != null && throwaway(select, stack -> stack.getItem() instanceof ItemBlock && maybe.equals(((ItemBlock) stack.getItem()).getBlock().getStateForPlacement(ctx.world(), ctx.playerFeet(), EnumFacing.UP, (float) ctx.player().posX, (float) ctx.player().posY, (float) ctx.player().posZ, stack.getItem().getMetadata(stack.getMetadata()), ctx.player())))) {
+        if (maybe != null && throwaway(select, stack -> stack.getItem() instanceof ItemBlock && maybe.equals(((ItemBlock) stack.getItem()).getBlock().getStateForPlacement(new BlockItemUseContext(new ItemUseContext(ctx.player(), stack, ctx.playerFeet(), EnumFacing.UP, (float) ctx.player().posX, (float) ctx.player().posY, (float) ctx.player().posZ)))))) {
             return true; // gotem
         }
         if (maybe != null && throwaway(select, stack -> stack.getItem() instanceof ItemBlock && ((ItemBlock) stack.getItem()).getBlock().equals(maybe.getBlock()))) {

src/main/java/baritone/behavior/LookBehavior.java

@@ -28,9 +28,6 @@ public final class LookBehavior extends Behavior implements ILookBehavior {
 
     /**
      * Target's values are as follows:
-     * <p>
-     * getFirst() -> yaw
-     * getSecond() -> pitch
      */
     private Rotation target;
 
@@ -53,6 +50,13 @@ public final class LookBehavior extends Behavior implements ILookBehavior {
     @Override
     public void updateTarget(Rotation target, boolean force) {
         this.target = target;
+        if (!force) {
+            double rand = Math.random() - 0.5;
+            if (Math.abs(rand) < 0.1) {
+                rand *= 4;
+            }
+            this.target = new Rotation(this.target.getYaw() + (float) (rand * Baritone.settings().randomLooking113.value), this.target.getPitch());
+        }
         this.force = force || !Baritone.settings().freeLook.value;
     }
 

src/main/java/baritone/behavior/MemoryBehavior.java

@@ -32,7 +32,6 @@ import net.minecraft.block.BlockBed;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.Packet;
-import net.minecraft.network.play.client.CPacketClickWindow;
 import net.minecraft.network.play.client.CPacketCloseWindow;
 import net.minecraft.network.play.client.CPacketPlayerTryUseItemOnBlock;
 import net.minecraft.network.play.server.SPacketCloseWindow;
@@ -118,11 +117,6 @@ public final class MemoryBehavior extends Behavior {
             if (p instanceof CPacketCloseWindow) {
                 getCurrent().save();
             }
-
-            if (p instanceof CPacketClickWindow) {
-                CPacketClickWindow c = event.cast();
-                System.out.println("CLICK " + c.getWindowId() + " " + c.getSlotId() + " " + c.getUsedButton() + " " + c.getClickType());
-            }
         }
     }
 
@@ -160,21 +154,9 @@ public final class MemoryBehavior extends Behavior {
             if (p instanceof SPacketCloseWindow) {
                 getCurrent().save();
             }
-
-            // apparently doesn't happen
-            /*if (p instanceof SPacketWindowItems) {
-                SPacketWindowItems meme = (SPacketWindowItems) p;
-                if (meme.getWindowId() == ctx.player().openContainer.windowId && enderChestWindowId != null && meme.getWindowId() == enderChestWindowId) {
-                    System.out.println("RECEIVED GUARANTEED ECHEST CONTENTS" + meme.getItemStacks());
-                }
-            }*/
         }
     }
 
-    public boolean eChestOpen() {
-        return enderChestWindowId != null && ctx.player().openContainer.windowId == enderChestWindowId;
-    }
-
     @Override
     public void onBlockInteract(BlockInteractEvent event) {
         if (event.getType() == BlockInteractEvent.Type.USE && BlockStateInterface.getBlock(ctx, event.getPos()) instanceof BlockBed) {

src/main/java/baritone/bot/BaritoneUser.java

@@ -1,110 +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.bot;
-
-import baritone.Baritone;
-import baritone.api.IBaritone;
-import baritone.api.bot.IBaritoneUser;
-import baritone.api.bot.IUserManager;
-import baritone.api.utils.IPlayerController;
-import baritone.bot.spec.BotWorld;
-import baritone.bot.spec.EntityBot;
-import com.mojang.authlib.GameProfile;
-import net.minecraft.network.NetworkManager;
-import net.minecraft.network.play.INetHandlerPlayClient;
-import net.minecraft.util.Session;
-
-/**
- * Implementation of {@link IBaritoneUser}
- *
- * @author Brady
- * @since 11/6/2018
- */
-public class BaritoneUser implements IBaritoneUser {
-
-    private final UserManager manager;
-    private final NetworkManager networkManager;
-    private final Session session;
-
-    private GameProfile profile;
-    private INetHandlerPlayClient netHandlerPlayClient;
-
-    private BotWorld world;
-    private EntityBot player;
-    private IPlayerController playerController;
-
-    private final Baritone baritone;
-
-    BaritoneUser(UserManager manager, NetworkManager networkManager, Session session) {
-        this.manager = manager;
-        this.networkManager = networkManager;
-        this.session = session;
-        this.baritone = new Baritone(new BotPlayerContext(this));
-    }
-
-    public void onLoginSuccess(GameProfile profile, INetHandlerPlayClient netHandlerPlayClient) {
-        this.profile = profile;
-        this.netHandlerPlayClient = netHandlerPlayClient;
-    }
-
-    public void onWorldLoad(BotWorld world, EntityBot player, IPlayerController playerController) {
-        this.world = world;
-        this.player = player;
-        this.playerController = playerController;
-    }
-
-    @Override
-    public NetworkManager getNetworkManager() {
-        return this.networkManager;
-    }
-
-    @Override
-    public INetHandlerPlayClient getConnection() {
-        return this.netHandlerPlayClient;
-    }
-
-    @Override
-    public EntityBot getEntity() {
-        return this.player;
-    }
-
-    @Override
-    public IPlayerController getPlayerController() {
-        return this.playerController;
-    }
-
-    @Override
-    public Session getSession() {
-        return this.session;
-    }
-
-    @Override
-    public GameProfile getProfile() {
-        return this.profile;
-    }
-
-    @Override
-    public UserManager getManager() {
-        return this.manager;
-    }
-
-    @Override
-    public IBaritone getBaritone() {
-        return baritone;
-    }
-}

src/main/java/baritone/bot/BotPlayerContext.java

@@ -1,80 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package baritone.bot;
-
-import baritone.api.bot.IBaritoneUser;
-import baritone.api.cache.IWorldData;
-import baritone.api.utils.IPlayerContext;
-import baritone.api.utils.IPlayerController;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.world.World;
-
-public class BotPlayerContext implements IPlayerContext {
-
-    /**
-     * The backing {@link IBaritoneUser}
-     */
-    private final IBaritoneUser bot;
-
-    public BotPlayerContext(IBaritoneUser bot) {
-        this.bot = bot;
-    }
-
-    @Override
-    public EntityPlayerSP player() {
-        if (bot.getEntity() == null) {
-            return null;
-        }
-        return bot.getEntity();
-    }
-
-    @Override
-    public IPlayerController playerController() {
-        if (bot.getEntity() == null) {
-            return null;
-        }
-        return bot.getPlayerController();
-    }
-
-    @Override
-    public World world() {
-        if (bot.getEntity() == null) {
-            return null;
-        }
-        return bot.getEntity().world;
-    }
-
-    @Override
-    public IWorldData worldData() {
-        return bot.getBaritone().getWorldProvider().getCurrentWorld();
-    }
-
-    @Override
-    public RayTraceResult objectMouseOver() {
-        Entity entity = this.bot.getEntity();
-
-        if (entity != null) {
-            double blockReachDistance = this.bot.getPlayerController().getBlockReachDistance();
-            return entity.rayTrace(blockReachDistance, 1.0F);
-        }
-
-        return null;
-    }
-}

src/main/java/baritone/bot/BotWorldProvider.java

@@ -1,66 +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.bot;
-
-import baritone.bot.spec.BotWorld;
-import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import net.minecraft.world.GameType;
-import net.minecraft.world.WorldSettings;
-import net.minecraft.world.WorldType;
-
-/**
- * @author Brady
- * @since 11/7/2018
- */
-public class BotWorldProvider {
-
-    /**
-     * Generic world settings for a typical survival world.
-     */
-    private static final WorldSettings GENERIC_WORLD_SETTINGS = new WorldSettings(0L, GameType.SURVIVAL, true, false, WorldType.DEFAULT);
-
-    /**
-     * All of the dimensions mapped to their respective worlds.
-     */
-    private final Int2ObjectMap<BotWorld> worlds = new Int2ObjectArrayMap<>();
-
-    /**
-     * Gets or creates the {@link BotWorld} for the specified dimension
-     *
-     * @param dimension The dimension id
-     * @return The world
-     */
-    public BotWorld getWorld(int dimension) {
-        return worlds.computeIfAbsent(dimension, this::createWorldForDim);
-    }
-
-    /**
-     * Creates a new {@link BotWorld} for the given dimension id.
-     *
-     * @param dimension The dimension id
-     * @return The new world
-     */
-    private BotWorld createWorldForDim(int dimension) {
-        return new BotWorld(GENERIC_WORLD_SETTINGS, dimension);
-    }
-
-    public void tick() {
-        this.worlds.forEach((dim, world) -> world.updateEntities());
-    }
-}

src/main/java/baritone/bot/UserManager.java

@@ -1,164 +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.bot;
-
-import baritone.api.BaritoneAPI;
-import baritone.api.bot.IBaritoneUser;
-import baritone.api.bot.IUserManager;
-import baritone.api.bot.connect.IConnectionResult;
-import baritone.api.event.events.TickEvent;
-import baritone.api.event.events.type.EventState;
-import baritone.api.event.listener.AbstractGameEventListener;
-import baritone.api.utils.Helper;
-import baritone.bot.connect.ConnectionResult;
-import baritone.bot.handler.BotNetHandlerLoginClient;
-import net.minecraft.client.multiplayer.ServerAddress;
-import net.minecraft.client.multiplayer.ServerData;
-import net.minecraft.network.EnumConnectionState;
-import net.minecraft.network.NetworkManager;
-import net.minecraft.network.handshake.client.C00Handshake;
-import net.minecraft.network.login.client.CPacketLoginStart;
-import net.minecraft.util.Session;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import static baritone.api.bot.connect.ConnectionStatus.*;
-
-/**
- * @author Brady
- * @since 11/6/2018
- */
-public final class UserManager implements IUserManager, Helper {
-
-    public static final UserManager INSTANCE = new UserManager();
-
-    private final List<IBaritoneUser> users = new CopyOnWriteArrayList<>();
-
-    private final BotWorldProvider worldProvider;
-
-    private UserManager() {
-        // Setup an event listener that automatically disconnects bots when we're not in-game
-        BaritoneAPI.getProvider().getPrimaryBaritone().getGameEventHandler().registerEventListener(new AbstractGameEventListener() {
-
-            @Override
-            public final void onTick(TickEvent event) {
-                if (event.getState() == EventState.PRE) {
-                    if (event.getType() == TickEvent.Type.OUT)
-                        UserManager.this.users.forEach(UserManager.this::disconnect);
-
-                    UserManager.this.worldProvider.tick();
-                }
-            }
-        });
-
-        this.worldProvider = new BotWorldProvider();
-    }
-
-    /**
-     * Connects a new user with the specified {@link Session} to the current server.
-     *
-     * @param session The user session
-     * @return The result of the attempted connection
-     */
-    @Override
-    public final IConnectionResult connect(Session session) {
-        ServerData data = mc.getCurrentServerData();
-        if (data == null) {
-            return ConnectionResult.failed(NO_CURRENT_CONNECTION);
-        }
-
-        // Connect to the server from the parsed server data
-        return connect0(session, ServerAddress.fromString(data.serverIP));
-    }
-
-    /**
-     * Connects a new user with the specified {@link Session} to the specified server.
-     * <p>
-     * Hi Mickey :)
-     *
-     * @param session The user session
-     * @param address The address of the server to connect to
-     * @return The result of the attempted connection
-     */
-    private IConnectionResult connect0(Session session, ServerAddress address) {
-        InetAddress inetAddress;
-
-        try {
-            inetAddress = InetAddress.getByName(address.getIP());
-        } catch (UnknownHostException e) {
-            return ConnectionResult.failed(CANT_RESOLVE_HOST);
-        }
-
-        try {
-            // Initialize Connection
-            NetworkManager networkManager = NetworkManager.createNetworkManagerAndConnect(
-                    inetAddress,
-                    address.getPort(),
-                    mc.gameSettings.isUsingNativeTransport()
-            );
-
-            // Create User
-            BaritoneUser user = new BaritoneUser(this, networkManager, session);
-            this.users.add(user);
-
-            // Setup login handler and send connection packets
-            networkManager.setNetHandler(new BotNetHandlerLoginClient(networkManager, user));
-            networkManager.sendPacket(new C00Handshake(address.getIP(), address.getPort(), EnumConnectionState.LOGIN));
-            networkManager.sendPacket(new CPacketLoginStart(session.getProfile()));
-
-            return ConnectionResult.success(user);
-        } catch (Exception e) {
-            return ConnectionResult.failed(CONNECTION_FAILED);
-        }
-    }
-
-    /**
-     * Notifies the manager of an {@link IBaritoneUser} disconnect, and
-     * removes the {@link IBaritoneUser} from the list of users.
-     *
-     * @param user  The user that disconnected
-     * @param state The connection state at the time of disconnect
-     */
-    public final void notifyDisconnect(IBaritoneUser user, EnumConnectionState state) {
-        this.users.remove(user);
-    }
-
-    /**
-     * @return The bot world provider
-     */
-    public final BotWorldProvider getWorldProvider() {
-        return this.worldProvider;
-    }
-
-    @Override
-    public final void disconnect(IBaritoneUser user) {
-        // It's probably fine to pass null to this, because the handlers aren't doing anything with it
-        // noinspection ConstantConditions
-        user.getNetworkManager().closeChannel(null);
-        this.users.remove(user);
-    }
-
-    @Override
-    public final List<IBaritoneUser> users() {
-        return Collections.unmodifiableList(this.users);
-    }
-}

src/main/java/baritone/bot/connect/ConnectionResult.java

@@ -1,87 +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.bot.connect;
-
-import baritone.api.bot.IBaritoneUser;
-import baritone.api.bot.connect.ConnectionStatus;
-import baritone.api.bot.connect.IConnectionResult;
-
-import java.util.Objects;
-import java.util.Optional;
-
-import static baritone.api.bot.connect.ConnectionStatus.SUCCESS;
-
-/**
- * @author Brady
- * @since 11/6/2018
- */
-public final class ConnectionResult implements IConnectionResult {
-
-    /**
-     * The result status
-     */
-    private final ConnectionStatus status;
-
-    /**
-     * The user created, if the status is {@link ConnectionStatus#SUCCESS}
-     */
-    private final IBaritoneUser user;
-
-    private ConnectionResult(ConnectionStatus status, IBaritoneUser user) {
-        this.status = status;
-        this.user = user;
-    }
-
-    @Override
-    public ConnectionStatus getStatus() {
-        return this.status;
-    }
-
-    @Override
-    public Optional<IBaritoneUser> getUser() {
-        return Optional.ofNullable(user);
-    }
-
-    /**
-     * Creates a new failed {@link ConnectionResult}.
-     *
-     * @param status The failed connection status
-     * @return The connection result
-     * @throws IllegalArgumentException if {@code status} is {@link ConnectionStatus#SUCCESS}
-     */
-    public static ConnectionResult failed(ConnectionStatus status) {
-        if (status == SUCCESS) {
-            throw new IllegalArgumentException("Status must be a failure type");
-        }
-
-        return new ConnectionResult(status, null);
-    }
-
-    /**
-     * Creates a new success {@link ConnectionResult}.
-     *
-     * @param user The user created
-     * @return The connection result
-     * @throws IllegalArgumentException if {@code user} is {@code null}
-     */
-    public static ConnectionResult success(IBaritoneUser user) {
-        Objects.requireNonNull(user);
-
-        return new ConnectionResult(SUCCESS, user);
-    }
-}

src/main/java/baritone/bot/handler/BotNetHandlerLoginClient.java

@@ -1,118 +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.bot.handler;
-
-import baritone.bot.BaritoneUser;
-import com.mojang.authlib.GameProfile;
-import com.mojang.authlib.exceptions.AuthenticationException;
-import com.mojang.authlib.exceptions.AuthenticationUnavailableException;
-import com.mojang.authlib.exceptions.InvalidCredentialsException;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.network.NetHandlerLoginClient;
-import net.minecraft.network.EnumConnectionState;
-import net.minecraft.network.NetworkManager;
-import net.minecraft.network.login.client.CPacketEncryptionResponse;
-import net.minecraft.network.login.server.SPacketEncryptionRequest;
-import net.minecraft.network.login.server.SPacketLoginSuccess;
-import net.minecraft.util.CryptManager;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TextComponentTranslation;
-
-import javax.annotation.Nonnull;
-import javax.crypto.SecretKey;
-import java.math.BigInteger;
-import java.security.PublicKey;
-
-/**
- * Handles the login stage when connecting to a server.
- *
- * @author Brady
- * @since 10/29/2018
- */
-public class BotNetHandlerLoginClient extends NetHandlerLoginClient {
-
-    /**
-     * The {@link NetworkManager} that is managing the connection with the server.
-     */
-    private final NetworkManager networkManager;
-
-    /**
-     * The {@link Minecraft} game instance
-     */
-    private final Minecraft mc;
-
-    /**
-     * The bot of this connection
-     */
-    private final BaritoneUser user;
-
-    public BotNetHandlerLoginClient(NetworkManager networkManager, BaritoneUser user) {
-        super(networkManager, Minecraft.getMinecraft(), null);
-        this.networkManager = networkManager;
-        this.mc = Minecraft.getMinecraft();
-        this.user = user;
-    }
-
-    @Override
-    public void handleEncryptionRequest(SPacketEncryptionRequest packetIn) {
-        SecretKey secretkey = CryptManager.createNewSharedKey();
-        PublicKey publicKey = packetIn.getPublicKey();
-
-        // Setup joinServer payload info
-        GameProfile profile = this.user.getSession().getProfile();
-        String authenticationToken = this.user.getSession().getToken();
-        String serverId = new BigInteger(CryptManager.getServerIdHash(packetIn.getServerId(), publicKey, secretkey)).toString(16);
-
-        if (this.mc.getCurrentServerData() != null && this.mc.getCurrentServerData().isOnLAN()) {
-            try {
-                this.mc.getSessionService().joinServer(profile, authenticationToken, serverId);
-            } catch (AuthenticationException e) {
-                // Couldn't connect to auth servers but will continue to join LAN
-            }
-        } else {
-            try {
-                this.mc.getSessionService().joinServer(profile, authenticationToken, serverId);
-            } catch (AuthenticationUnavailableException e) {
-                this.networkManager.closeChannel(new TextComponentTranslation("disconnect.loginFailedInfo", new TextComponentTranslation("disconnect.loginFailedInfo.serversUnavailable")));
-                return;
-            } catch (InvalidCredentialsException e) {
-                this.networkManager.closeChannel(new TextComponentTranslation("disconnect.loginFailedInfo", new TextComponentTranslation("disconnect.loginFailedInfo.invalidSession")));
-                return;
-            } catch (AuthenticationException e) {
-                this.networkManager.closeChannel(new TextComponentTranslation("disconnect.loginFailedInfo", e.getMessage()));
-                return;
-            }
-        }
-
-        // noinspection unchecked
-        this.networkManager.sendPacket(new CPacketEncryptionResponse(secretkey, publicKey, packetIn.getVerifyToken()),
-                future -> BotNetHandlerLoginClient.this.networkManager.enableEncryption(secretkey));
-    }
-
-    @Override
-    public void handleLoginSuccess(SPacketLoginSuccess packetIn) {
-        this.networkManager.setConnectionState(EnumConnectionState.PLAY);
-        this.networkManager.setNetHandler(new BotNetHandlerPlayClient(this.networkManager, this.user, Minecraft.getMinecraft(), packetIn.getProfile()));
-    }
-
-    @Override
-    public void onDisconnect(@Nonnull ITextComponent reason) {
-        // It's important that we don't call the superclass method because that would mess up GUIs and make us upset
-        this.user.getManager().notifyDisconnect(this.user, EnumConnectionState.LOGIN);
-    }
-}

src/main/java/baritone/bot/handler/BotNetHandlerPlayClient.java

@@ -1,706 +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.bot.handler;
-
-import baritone.api.utils.Helper;
-import baritone.bot.BaritoneUser;
-import baritone.bot.spec.BotPlayerController;
-import baritone.bot.spec.BotWorld;
-import baritone.bot.spec.EntityBot;
-import com.mojang.authlib.GameProfile;
-import io.netty.buffer.Unpooled;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.client.multiplayer.ClientAdvancementManager;
-import net.minecraft.client.network.NetHandlerPlayClient;
-import net.minecraft.client.util.RecipeBookClient;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.entity.player.PlayerCapabilities;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.EnumConnectionState;
-import net.minecraft.network.NetworkManager;
-import net.minecraft.network.PacketBuffer;
-import net.minecraft.network.PacketThreadUtil;
-import net.minecraft.network.play.INetHandlerPlayClient;
-import net.minecraft.network.play.client.*;
-import net.minecraft.network.play.server.*;
-import net.minecraft.potion.Potion;
-import net.minecraft.potion.PotionEffect;
-import net.minecraft.stats.StatisticsManager;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.EnumHandSide;
-import net.minecraft.util.IThreadListener;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.world.Explosion;
-import net.minecraft.world.chunk.Chunk;
-
-import javax.annotation.Nonnull;
-
-// Notes
-// - Make some sort of system that prevents repetition of entity info updating
-//   - For some packets, such as ones that modify position, we can check if the existing server state matches the packet proposed state
-//   - For other things, we'll actually need the system
-
-/**
- * This class would effectively operate the same if we directly implemented {@link INetHandlerPlayClient},
- * however, the {@link EntityPlayerSP} constructor requires an actual implementation of
- * {@link NetHandlerPlayClient} in order to access the {@link GameProfile}.
- *
- * @author Brady
- * @since 10/22/2018
- */
-public class BotNetHandlerPlayClient extends NetHandlerPlayClient {
-
-    /**
-     * The {@link NetworkManager} that is managing the connection with the server.
-     */
-    private final NetworkManager networkManager;
-
-    /**
-     * This is the {@link Minecraft} game instance, however, to prevent unwanted references
-     * to the game instance fields, we refer to it as a {@link IThreadListener}.
-     */
-    private final IThreadListener client;
-
-    /**
-     * The bot of this connection
-     */
-    private final BaritoneUser user;
-
-    /**
-     * The bot entity
-     */
-    private EntityBot player;
-
-    /**
-     * The current world.
-     */
-    private BotWorld world;
-
-    /**
-     * The current player controller
-     */
-    private BotPlayerController playerController;
-
-    public BotNetHandlerPlayClient(NetworkManager networkManager, BaritoneUser user, Minecraft client, GameProfile profile) {
-        // noinspection ConstantConditions
-        super(client, null, networkManager, profile);
-        this.networkManager = networkManager;
-        this.client = client;
-        this.user = user;
-
-        // Notify the user that we're ingame
-        this.user.onLoginSuccess(profile, this);
-    }
-
-    @Override
-    public void handleSpawnObject(@Nonnull SPacketSpawnObject packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-    }
-
-    @Override
-    public void handleSpawnExperienceOrb(@Nonnull SPacketSpawnExperienceOrb packetIn) { /* We will want to know this if we want Tenor to collect XP */ }
-
-    @Override
-    public void handleSpawnGlobalEntity(@Nonnull SPacketSpawnGlobalEntity packetIn) { /* Only lightning bolts, this may change in the future */ }
-
-    @Override
-    public void handleSpawnMob(@Nonnull SPacketSpawnMob packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-    }
-
-    @Override
-    public void handleScoreboardObjective(@Nonnull SPacketScoreboardObjective packetIn) {}
-
-    @Override
-    public void handleSpawnPainting(@Nonnull SPacketSpawnPainting packetIn) {}
-
-    @Override
-    public void handleSpawnPlayer(@Nonnull SPacketSpawnPlayer packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-    }
-
-    @Override
-    public void handleAnimation(@Nonnull SPacketAnimation packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-
-        Entity entity = this.world.getEntityByID(packetIn.getEntityID());
-        if (entity != null) {
-            switch (packetIn.getAnimationType()) {
-                case 0: {
-                    ((EntityLivingBase) entity).swingArm(EnumHand.MAIN_HAND);
-                    break;
-                }
-                case 1: {
-                    entity.performHurtAnimation();
-                    break;
-                }
-                case 2: {
-                    ((EntityPlayer) entity).wakeUpPlayer(false, false, false);
-                    break;
-                }
-                case 3: {
-                    ((EntityLivingBase) entity).swingArm(EnumHand.OFF_HAND);
-                    break;
-                }
-            }
-        }
-    }
-
-    @Override
-    public void handleStatistics(@Nonnull SPacketStatistics packetIn) { /* Lol global bot stats when?? */ }
-
-    @Override
-    public void handleRecipeBook(@Nonnull SPacketRecipeBook packetIn) {}
-
-    @Override
-    public void handleBlockBreakAnim(@Nonnull SPacketBlockBreakAnim packetIn) {}
-
-    @Override
-    public void handleSignEditorOpen(@Nonnull SPacketSignEditorOpen packetIn) {}
-
-    @Override
-    public void handleUpdateTileEntity(@Nonnull SPacketUpdateTileEntity packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-    }
-
-    @Override
-    public void handleBlockAction(@Nonnull SPacketBlockAction packetIn) {}
-
-    @Override
-    public void handleBlockChange(@Nonnull SPacketBlockChange packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-
-        this.world.setBlockState(packetIn.getBlockPosition(), packetIn.getBlockState());
-    }
-
-    @Override
-    public void handleChat(@Nonnull SPacketChat packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-    }
-
-    @Override
-    public void handleTabComplete(@Nonnull SPacketTabComplete packetIn) {}
-
-    @Override
-    public void handleMultiBlockChange(@Nonnull SPacketMultiBlockChange packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-
-        for (SPacketMultiBlockChange.BlockUpdateData data : packetIn.getChangedBlocks()) {
-            this.world.setBlockState(data.getPos(), data.getBlockState());
-        }
-    }
-
-    @Override
-    public void handleMaps(@Nonnull SPacketMaps packetIn) {}
-
-    @Override
-    public void handleConfirmTransaction(@Nonnull SPacketConfirmTransaction packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-    }
-
-    @Override
-    public void handleCloseWindow(@Nonnull SPacketCloseWindow packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-
-        this.player.closeScreenAndDropStack();
-    }
-
-    @Override
-    public void handleWindowItems(@Nonnull SPacketWindowItems packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-
-        (packetIn.getWindowId() == 0 ? this.player.inventoryContainer : this.player.openContainer).setAll(packetIn.getItemStacks());
-    }
-
-    @Override
-    public void handleOpenWindow(@Nonnull SPacketOpenWindow packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-    }
-
-    @Override
-    public void handleWindowProperty(@Nonnull SPacketWindowProperty packetIn) {}
-
-    @Override
-    public void handleSetSlot(@Nonnull SPacketSetSlot packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-
-        ItemStack stack = packetIn.getStack();
-        int slot = packetIn.getSlot();
-
-        switch (packetIn.getWindowId()) {
-            case -1: {
-                this.player.inventory.setItemStack(stack);
-                break;
-            }
-            case -2: {
-                this.player.inventory.setInventorySlotContents(slot, stack);
-                break;
-            }
-            default: {
-                if (packetIn.getWindowId() == 0 && packetIn.getSlot() >= 36 && slot < 45) {
-                    this.player.inventoryContainer.putStackInSlot(slot, stack);
-                } else if (packetIn.getWindowId() == this.player.openContainer.windowId && packetIn.getWindowId() != 0) {
-                    this.player.openContainer.putStackInSlot(slot, stack);
-                }
-            }
-        }
-    }
-
-    @Override
-    public void handleCustomPayload(@Nonnull SPacketCustomPayload packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-    }
-
-    @Override
-    public void handleDisconnect(@Nonnull SPacketDisconnect packetIn) {
-        this.networkManager.closeChannel(packetIn.getReason());
-    }
-
-    @Override
-    public void handleUseBed(@Nonnull SPacketUseBed packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-    }
-
-    @Override
-    public void handleEntityStatus(@Nonnull SPacketEntityStatus packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-    }
-
-    @Override
-    public void handleEntityAttach(@Nonnull SPacketEntityAttach packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-    }
-
-    @Override
-    public void handleSetPassengers(@Nonnull SPacketSetPassengers packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-    }
-
-    @Override
-    public void handleExplosion(@Nonnull SPacketExplosion packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-
-        // noinspection ConstantConditions
-        new Explosion(this.world, null, packetIn.getX(), packetIn.getY(), packetIn.getZ(), packetIn.getStrength(), packetIn.getAffectedBlockPositions()).doExplosionB(true);
-        this.player.motionX += (double) packetIn.getMotionX();
-        this.player.motionY += (double) packetIn.getMotionY();
-        this.player.motionZ += (double) packetIn.getMotionZ();
-    }
-
-    @Override
-    public void handleChangeGameState(@Nonnull SPacketChangeGameState packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-    }
-
-    @Override
-    public void handleKeepAlive(@Nonnull SPacketKeepAlive packetIn) {
-        this.networkManager.sendPacket(new CPacketKeepAlive(packetIn.getId()));
-    }
-
-    @Override
-    public void handleChunkData(@Nonnull SPacketChunkData packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-
-        if (packetIn.isFullChunk()) {
-            this.world.doPreChunk(packetIn.getChunkX(), packetIn.getChunkZ(), true);
-        }
-
-        Chunk chunk = this.world.getChunk(packetIn.getChunkX(), packetIn.getChunkZ());
-        chunk.read(packetIn.getReadBuffer(), packetIn.getExtractedSize(), packetIn.isFullChunk());
-
-        for (NBTTagCompound tag : packetIn.getTileEntityTags()) {
-            BlockPos pos = new BlockPos(tag.getInteger("x"), tag.getInteger("y"), tag.getInteger("z"));
-            TileEntity tileEntity = this.world.getTileEntity(pos);
-
-            if (tileEntity != null) {
-                tileEntity.readFromNBT(tag);
-            }
-        }
-    }
-
-    @Override
-    public void processChunkUnload(@Nonnull SPacketUnloadChunk packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-        // TODO Unload chunks
-    }
-
-    @Override
-    public void handleEffect(@Nonnull SPacketEffect packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-    }
-
-    @Override
-    public void handleJoinGame(@Nonnull SPacketJoinGame packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-
-        this.playerController = new BotPlayerController(this.user);
-        this.world = this.user.getManager().getWorldProvider().getWorld(packetIn.getDimension());
-        this.player = new EntityBot(this.user, (Minecraft) this.client, this.world, this, new StatisticsManager(), new RecipeBookClient());
-        this.user.onWorldLoad(this.world, this.player, this.playerController);
-        this.player.preparePlayerToSpawn();
-        this.world.spawnEntity(this.player);
-        this.player.setEntityId(packetIn.getPlayerId());
-        this.player.dimension = packetIn.getDimension();
-        this.playerController.setGameType(packetIn.getGameType());
-        packetIn.getGameType().configurePlayerCapabilities(this.player.capabilities);
-
-        this.networkManager.sendPacket(new CPacketClientSettings("en_us", 8, EntityPlayer.EnumChatVisibility.FULL, true, 0, EnumHandSide.RIGHT));
-        this.networkManager.sendPacket(new CPacketCustomPayload("MC|Brand", new PacketBuffer(Unpooled.buffer()).writeString("vanilla")));
-
-        this.world.registerBot(packetIn.getPlayerId(), this.player);
-
-        Helper.HELPER.logDirect("Initialized Player and World");
-    }
-
-    @Override
-    public void handleEntityMovement(@Nonnull SPacketEntity packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-    }
-
-    @Override
-    public void handlePlayerPosLook(@Nonnull SPacketPlayerPosLook packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-
-        EntityPlayer player = this.player;
-        double d0 = packetIn.getX();
-        double d1 = packetIn.getY();
-        double d2 = packetIn.getZ();
-        float f = packetIn.getYaw();
-        float f1 = packetIn.getPitch();
-
-        if (packetIn.getFlags().contains(SPacketPlayerPosLook.EnumFlags.X)) {
-            d0 += player.posX;
-        } else {
-            player.motionX = 0.0D;
-        }
-
-        if (packetIn.getFlags().contains(SPacketPlayerPosLook.EnumFlags.Y)) {
-            d1 += player.posY;
-        } else {
-            player.motionY = 0.0D;
-        }
-
-        if (packetIn.getFlags().contains(SPacketPlayerPosLook.EnumFlags.Z)) {
-            d2 += player.posZ;
-        } else {
-            player.motionZ = 0.0D;
-        }
-
-        if (packetIn.getFlags().contains(SPacketPlayerPosLook.EnumFlags.X_ROT)) {
-            f1 += player.rotationPitch;
-        }
-
-        if (packetIn.getFlags().contains(SPacketPlayerPosLook.EnumFlags.Y_ROT)) {
-            f += player.rotationYaw;
-        }
-
-        player.setPositionAndRotation(d0, d1, d2, f, f1);
-        this.networkManager.sendPacket(new CPacketConfirmTeleport(packetIn.getTeleportId()));
-        this.networkManager.sendPacket(new CPacketPlayer.PositionRotation(player.posX, player.getEntityBoundingBox().minY, player.posZ, player.rotationYaw, player.rotationPitch, false));
-
-        this.player.prevPosX = this.player.posX;
-        this.player.prevPosY = this.player.posY;
-        this.player.prevPosZ = this.player.posZ;
-    }
-
-    @Override
-    public void handleParticles(@Nonnull SPacketParticles packetIn) {}
-
-    @Override
-    public void handlePlayerAbilities(@Nonnull SPacketPlayerAbilities packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-
-        PlayerCapabilities c = this.player.capabilities;
-        c.disableDamage = packetIn.isInvulnerable();
-        c.isFlying = packetIn.isFlying();
-        c.allowFlying = packetIn.isAllowFlying();
-        c.isCreativeMode = packetIn.isCreativeMode();
-        c.setFlySpeed(packetIn.getFlySpeed());
-        c.setPlayerWalkSpeed(packetIn.getWalkSpeed());
-    }
-
-    @Override
-    public void handlePlayerListItem(@Nonnull SPacketPlayerListItem packetIn) {
-        // okay now this is awesome
-        super.handlePlayerListItem(packetIn);
-    }
-
-    @Override
-    public void handleDestroyEntities(@Nonnull SPacketDestroyEntities packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-
-        for (int i = 0; i < packetIn.getEntityIDs().length; ++i) {
-            this.world.removeEntityFromWorld(packetIn.getEntityIDs()[i]);
-        }
-    }
-
-    @Override
-    public void handleRemoveEntityEffect(@Nonnull SPacketRemoveEntityEffect packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-
-        Entity entity = packetIn.getEntity(this.world);
-        if (entity instanceof EntityLivingBase) {
-            ((EntityLivingBase) entity).removeActivePotionEffect(packetIn.getPotion());
-        }
-    }
-
-    @Override
-    public void handleRespawn(@Nonnull SPacketRespawn packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-
-        if (packetIn.getDimensionID() != this.player.dimension) {
-            this.world.removeEntity(this.player);
-            this.world = this.user.getManager().getWorldProvider().getWorld(packetIn.getDimensionID());
-        }
-
-        EntityBot prev = this.player;
-
-        this.player = new EntityBot(this.user, (Minecraft) this.client, this.world, this, prev.getStatFileWriter(), prev.getRecipeBook());
-        this.user.onWorldLoad(this.world, this.player, this.playerController);
-        // noinspection ConstantConditions
-        this.player.getDataManager().setEntryValues(prev.getDataManager().getAll());
-        this.player.preparePlayerToSpawn();
-        this.world.spawnEntity(this.player);
-        this.player.setEntityId(prev.getEntityId());
-        this.player.dimension = packetIn.getDimensionID();
-        this.player.setServerBrand(prev.getServerBrand());
-        this.playerController.setGameType(packetIn.getGameType());
-    }
-
-    @Override
-    public void handleEntityHeadLook(@Nonnull SPacketEntityHeadLook packetIn) {}
-
-    @Override
-    public void handleHeldItemChange(@Nonnull SPacketHeldItemChange packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-
-        if (InventoryPlayer.isHotbar(packetIn.getHeldItemHotbarIndex())) {
-            this.player.inventory.currentItem = packetIn.getHeldItemHotbarIndex();
-        }
-    }
-
-    @Override
-    public void handleDisplayObjective(@Nonnull SPacketDisplayObjective packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-    }
-
-    @Override
-    public void handleEntityMetadata(@Nonnull SPacketEntityMetadata packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-
-        Entity entity = this.world.getEntityByID(packetIn.getEntityId());
-        if (entity != null && packetIn.getDataManagerEntries() != null) {
-            entity.getDataManager().setEntryValues(packetIn.getDataManagerEntries());
-        }
-    }
-
-    @Override
-    public void handleEntityVelocity(@Nonnull SPacketEntityVelocity packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-
-        Entity entity = this.world.getEntityByID(packetIn.getEntityID());
-        if (entity != null) {
-            entity.setVelocity(
-                    (double) packetIn.getMotionX() / 8000.0D,
-                    (double) packetIn.getMotionY() / 8000.0D,
-                    (double) packetIn.getMotionZ() / 8000.0D
-            );
-        }
-    }
-
-    @Override
-    public void handleEntityEquipment(@Nonnull SPacketEntityEquipment packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-
-        Entity entity = this.world.getEntityByID(packetIn.getEntityID());
-        if (entity != null) {
-            entity.setItemStackToSlot(packetIn.getEquipmentSlot(), packetIn.getItemStack());
-        }
-    }
-
-    @Override
-    public void handleSetExperience(@Nonnull SPacketSetExperience packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-
-        this.player.setXPStats(packetIn.getExperienceBar(), packetIn.getTotalExperience(), packetIn.getLevel());
-    }
-
-    @Override
-    public void handleUpdateHealth(@Nonnull SPacketUpdateHealth packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-
-        this.player.setPlayerSPHealth(packetIn.getHealth());
-        this.player.getFoodStats().setFoodLevel(packetIn.getFoodLevel());
-        this.player.getFoodStats().setFoodSaturationLevel(packetIn.getSaturationLevel());
-    }
-
-    @Override
-    public void handleTeams(@Nonnull SPacketTeams packetIn) {}
-
-    @Override
-    public void handleUpdateScore(@Nonnull SPacketUpdateScore packetIn) {}
-
-    @Override
-    public void handleSpawnPosition(@Nonnull SPacketSpawnPosition packetIn) { /* We probably don't need to know this, the server handles everything related to spawn psoition? */ }
-
-    @Override
-    public void handleTimeUpdate(@Nonnull SPacketTimeUpdate packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-
-        this.world.setTotalWorldTime(packetIn.getTotalWorldTime());
-        this.world.setWorldTime(packetIn.getWorldTime());
-
-        // TODO: Calculate World TPS
-    }
-
-    @Override
-    public void handleSoundEffect(@Nonnull SPacketSoundEffect packetIn) {}
-
-    @Override
-    public void handleCustomSound(@Nonnull SPacketCustomSound packetIn) {}
-
-    @Override
-    public void handleCollectItem(@Nonnull SPacketCollectItem packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-    }
-
-    @Override
-    public void handleEntityTeleport(@Nonnull SPacketEntityTeleport packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-    }
-
-    @Override
-    public void handleEntityProperties(@Nonnull SPacketEntityProperties packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-    }
-
-    @Override
-    public void handleEntityEffect(@Nonnull SPacketEntityEffect packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-
-        Entity entity = this.world.getEntityByID(packetIn.getEntityId());
-
-        if (entity instanceof EntityLivingBase) {
-            Potion potion = Potion.getPotionById(packetIn.getEffectId());
-
-            if (potion != null) {
-                PotionEffect effect = new PotionEffect(potion, packetIn.getDuration(), packetIn.getAmplifier(), packetIn.getIsAmbient(), packetIn.doesShowParticles());
-                effect.setPotionDurationMax(packetIn.isMaxDuration());
-                ((EntityLivingBase) entity).addPotionEffect(effect);
-            }
-        }
-    }
-
-    @Override
-    public void handleCombatEvent(@Nonnull SPacketCombatEvent packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-
-        // We only care if we died
-        if (packetIn.eventType == SPacketCombatEvent.Event.ENTITY_DIED) {
-            if (packetIn.playerId == this.player.getEntityId()) {
-                // Perform an instantaneous respawn
-                this.networkManager.sendPacket(new CPacketClientStatus(CPacketClientStatus.State.PERFORM_RESPAWN));
-            }
-        }
-    }
-
-    @Override
-    public void handleServerDifficulty(@Nonnull SPacketServerDifficulty packetIn) {}
-
-    @Override
-    public void handleCamera(SPacketCamera packetIn) {}
-
-    @Override
-    public void handleWorldBorder(@Nonnull SPacketWorldBorder packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-
-        packetIn.apply(this.world.getWorldBorder());
-    }
-
-    @Override
-    public void handleTitle(@Nonnull SPacketTitle packetIn) {}
-
-    @Override
-    public void handlePlayerListHeaderFooter(@Nonnull SPacketPlayerListHeaderFooter packetIn) {}
-
-    @Override
-    public void handleResourcePack(@Nonnull SPacketResourcePackSend packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-
-        // Lie to the server and tell them we accepted it in response
-        this.networkManager.sendPacket(new CPacketResourcePackStatus(CPacketResourcePackStatus.Action.ACCEPTED));
-        this.networkManager.sendPacket(new CPacketResourcePackStatus(CPacketResourcePackStatus.Action.SUCCESSFULLY_LOADED));
-    }
-
-    @Override
-    public void handleUpdateBossInfo(@Nonnull SPacketUpdateBossInfo packetIn) {}
-
-    @Override
-    public void handleCooldown(@Nonnull SPacketCooldown packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-
-        if (packetIn.getTicks() == 0) { // There is no cooldown
-            this.player.getCooldownTracker().removeCooldown(packetIn.getItem());
-        } else {
-            this.player.getCooldownTracker().setCooldown(packetIn.getItem(), packetIn.getTicks());
-        }
-    }
-
-    @Override
-    public void handleMoveVehicle(@Nonnull SPacketMoveVehicle packetIn) {
-        PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.client);
-        /* Atm Baritone doesn't even work on vehicles that well at all, so this is a major TODO */
-    }
-
-    @Override
-    public void handleAdvancementInfo(@Nonnull SPacketAdvancementInfo packetIn) {}
-
-    @Override
-    public void handleSelectAdvancementsTab(@Nonnull SPacketSelectAdvancementsTab packetIn) { /* Lol global bot achievements when? */ }
-
-    @Override
-    public void func_194307_a(@Nonnull SPacketPlaceGhostRecipe p_194307_1_) {}
-
-    @Override
-    public void onDisconnect(@Nonnull ITextComponent reason) {
-        // TODO Maybe more world unloadinde
-        this.world.removeEntity(this.player);
-        this.user.getManager().notifyDisconnect(this.user, EnumConnectionState.PLAY);
-    }
-
-    @Nonnull
-    @Override
-    public ClientAdvancementManager getAdvancementManager() {
-        throw new UnsupportedOperationException("This method shouldn't have been called; That is unepic!");
-    }
-
-    public EntityBot player() {
-        return player;
-    }
-
-    public BotWorld world() {
-        return world;
-    }
-}

src/main/java/baritone/bot/spec/BotPlayerController.java

@@ -1,260 +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.bot.spec;
-
-import baritone.api.bot.IBaritoneUser;
-import baritone.api.utils.IPlayerController;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockCommandBlock;
-import net.minecraft.block.BlockStructure;
-import net.minecraft.block.material.Material;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.inventory.ClickType;
-import net.minecraft.item.ItemStack;
-import net.minecraft.network.play.client.CPacketClickWindow;
-import net.minecraft.network.play.client.CPacketHeldItemChange;
-import net.minecraft.network.play.client.CPacketPlayerDigging;
-import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.GameType;
-import net.minecraft.world.World;
-
-/**
- * @author Brady
- * @since 11/14/2018
- */
-public class BotPlayerController implements IPlayerController {
-
-    private final IBaritoneUser user;
-    private GameType gameType;
-
-    private BlockPos currentBlock;
-    private ItemStack currentHittingItem;
-    private boolean hittingBlock;
-    private float blockDamage;
-    private int blockHitDelay;
-    private int heldItemServer;
-
-    public BotPlayerController(IBaritoneUser user) {
-        this.user = user;
-        this.currentHittingItem = ItemStack.EMPTY;
-    }
-
-    @Override
-    public boolean onPlayerDamageBlock(BlockPos pos, EnumFacing side) {
-        this.syncHeldItem();
-
-        EntityPlayerSP player = this.user.getEntity();
-        World world = player.world;
-
-        if (this.blockHitDelay > 0) {
-            this.blockHitDelay--;
-            return true;
-        }
-
-        if (!this.isHittingPosition(pos)) {
-            return this.clickBlock(pos, side);
-        }
-
-        IBlockState state = world.getBlockState(pos);
-
-        if (state.getMaterial() == Material.AIR) {
-            this.hittingBlock = false;
-            return false;
-        }
-
-        this.blockDamage += state.getPlayerRelativeBlockHardness(player, world, pos);
-
-        if (this.blockDamage >= 1.0F) {
-            this.hittingBlock = false;
-            this.blockDamage = 0.0F;
-            this.blockHitDelay = 5;
-
-            player.connection.sendPacket(new CPacketPlayerDigging(CPacketPlayerDigging.Action.STOP_DESTROY_BLOCK, pos, side));
-            this.handleBreak(pos);
-        }
-
-        world.sendBlockBreakProgress(player.getEntityId(), this.currentBlock, (int) (this.blockDamage * 10.0F) - 1);
-        return true;
-    }
-
-    @Override
-    public void resetBlockRemoving() {
-        if (this.hittingBlock) {
-            this.hittingBlock = false;
-            this.blockDamage = 0.0F;
-            this.user.getEntity().resetCooldown();
-            this.user.getEntity().connection.sendPacket(new CPacketPlayerDigging(CPacketPlayerDigging.Action.ABORT_DESTROY_BLOCK, this.currentBlock, EnumFacing.DOWN));
-        }
-    }
-
-    @Override
-    public ItemStack windowClick(int windowId, int slotId, int mouseButton, ClickType type, EntityPlayer player) {
-        short transactionID = player.openContainer.getNextTransactionID(player.inventory);
-        ItemStack stack = player.openContainer.slotClick(slotId, mouseButton, type, player);
-        this.user.getEntity().connection.sendPacket(new CPacketClickWindow(windowId, slotId, mouseButton, type, stack, transactionID));
-        return stack;
-    }
-
-    @Override
-    public void setGameType(GameType type) {
-        this.gameType = type;
-        this.gameType.configurePlayerCapabilities(this.user.getEntity().capabilities);
-    }
-
-    @Override
-    public GameType getGameType() {
-        return this.gameType;
-    }
-
-    @Override
-    public boolean clickBlock(BlockPos pos, EnumFacing side) {
-        EntityPlayerSP player = this.user.getEntity();
-        World world = player.world;
-
-        if (!canBreak(player, pos)) {
-            return false;
-        }
-
-        if (!this.hittingBlock || !this.isHittingPosition(pos)) {
-            if (this.hittingBlock) {
-                player.connection.sendPacket(new CPacketPlayerDigging(CPacketPlayerDigging.Action.ABORT_DESTROY_BLOCK, this.currentBlock, side));
-            }
-
-            IBlockState state = world.getBlockState(pos);
-            player.connection.sendPacket(new CPacketPlayerDigging(CPacketPlayerDigging.Action.START_DESTROY_BLOCK, pos, side));
-
-            if (state.getMaterial() != Material.AIR) {
-                if (this.blockDamage == 0.0F) {
-                    state.getBlock().onBlockClicked(world, pos, player);
-                }
-                if (state.getPlayerRelativeBlockHardness(player, player.world, pos) >= 1.0F) {
-                    this.handleBreak(pos);
-                }
-            } else {
-                this.hittingBlock = true;
-                this.currentBlock = pos;
-                this.blockDamage = 0.0F;
-                this.currentHittingItem = player.getHeldItemMainhand();
-                world.sendBlockBreakProgress(player.getEntityId(), this.currentBlock, (int) (this.blockDamage * 10.0F) - 1);
-            }
-        }
-
-        return true;
-    }
-
-    private void handleBreak(BlockPos pos) {
-        EntityPlayerSP player = this.user.getEntity();
-        World world = player.world;
-
-        IBlockState state = world.getBlockState(pos);
-        Block block = state.getBlock();
-
-        if ((block instanceof BlockCommandBlock || block instanceof BlockStructure) && !player.canUseCommandBlock()) {
-            return;
-        }
-
-        if (state.getMaterial() == Material.AIR) {
-            return;
-        }
-
-        block.onBlockHarvested(world, pos, state, player);
-
-        if (world.setBlockState(pos, Blocks.AIR.getDefaultState(), 11)) {
-            block.onPlayerDestroy(world, pos, state);
-        }
-
-        this.currentBlock = new BlockPos(this.currentBlock.getX(), -1, this.currentBlock.getZ());
-
-        ItemStack stack = player.getHeldItemMainhand();
-
-        if (!stack.isEmpty()) {
-            stack.onBlockDestroyed(world, state, pos, player);
-
-            if (stack.isEmpty()) {
-                player.setHeldItem(EnumHand.MAIN_HAND, ItemStack.EMPTY);
-            }
-        }
-    }
-
-    private boolean canBreak(EntityPlayer player, BlockPos pos) {
-        if (this.gameType.isCreative() || this.gameType == GameType.SPECTATOR) {
-            return false;
-        }
-
-        if (!player.world.getWorldBorder().contains(pos)) {
-            return false;
-        }
-
-        if (this.gameType.hasLimitedInteractions() && !player.isAllowEdit()) {
-            ItemStack stack = player.getHeldItemMainhand();
-            return !stack.isEmpty() && stack.canDestroy(player.world.getBlockState(pos).getBlock());
-        }
-
-        return true;
-    }
-
-    private boolean isHittingPosition(BlockPos pos) {
-        ItemStack stack = this.user.getEntity().getHeldItemMainhand();
-        boolean itemUnchanged = this.currentHittingItem.isEmpty() && stack.isEmpty();
-
-        if (!this.currentHittingItem.isEmpty() && !stack.isEmpty()) {
-            itemUnchanged = stack.getItem() == this.currentHittingItem.getItem()
-                    && ItemStack.areItemStackTagsEqual(stack, this.currentHittingItem)
-                    && (stack.isItemStackDamageable() || stack.getMetadata() == this.currentHittingItem.getMetadata());
-        }
-
-        return pos.equals(this.currentBlock) && itemUnchanged;
-    }
-
-    @Override
-    public void syncHeldItem() {
-        int heldItemClient = this.user.getEntity().inventory.currentItem;
-
-        if (heldItemClient != this.heldItemServer) {
-            this.heldItemServer = heldItemClient;
-            this.user.getEntity().connection.sendPacket(new CPacketHeldItemChange(this.heldItemServer));
-        }
-    }
-
-    @Override
-    public boolean hasBrokenBlock() {
-        return this.currentBlock.getY() == -1;
-    }
-
-    @Override
-    public EnumActionResult processRightClickBlock(EntityPlayerSP player, World world, BlockPos pos, EnumFacing direction, Vec3d vec, EnumHand hand) {
-        throw new AbstractMethodError("Lol");
-    }
-
-    @Override
-    public EnumActionResult processRightClick(EntityPlayerSP player, World world, EnumHand hand) {
-        throw new AbstractMethodError("Lol");
-    }
-
-    @Override
-    public void setHittingBlock(boolean hittingBlock) {
-        this.hittingBlock = hittingBlock;
-    }
-}

src/main/java/baritone/bot/spec/BotWorld.java

@@ -1,84 +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.bot.spec;
-
-import net.minecraft.client.multiplayer.ChunkProviderClient;
-import net.minecraft.entity.Entity;
-import net.minecraft.profiler.Profiler;
-import net.minecraft.world.DimensionType;
-import net.minecraft.world.World;
-import net.minecraft.world.WorldSettings;
-import net.minecraft.world.chunk.IChunkProvider;
-import net.minecraft.world.storage.SaveHandlerMP;
-import net.minecraft.world.storage.WorldInfo;
-
-import javax.annotation.Nonnull;
-
-/**
- * @author Brady
- * @since 11/7/2018
- */
-public class BotWorld extends World {
-
-    private static Profiler BOT_WORLD_PROFILER = new Profiler();
-    private static int worldNum = 0;
-
-    private ChunkProviderClient chunkProviderClient;
-
-    public BotWorld(WorldSettings settings, int dimension) {
-        super(
-                new SaveHandlerMP(),
-                new WorldInfo(settings, "BotWorld" + ++worldNum),
-                DimensionType.getById(dimension).createDimension(),
-                BOT_WORLD_PROFILER,
-                true
-        );
-        this.provider.setWorld(this);
-        this.chunkProvider = this.createChunkProvider();
-    }
-
-    @Override
-    @Nonnull
-    protected IChunkProvider createChunkProvider() {
-        return (this.chunkProviderClient = new ChunkProviderClient(this));
-    }
-
-    @Override
-    protected boolean isChunkLoaded(int x, int z, boolean allowEmpty) {
-        return allowEmpty || !this.chunkProviderClient.provideChunk(x, z).isEmpty();
-    }
-
-    public void registerBot(int entityID, EntityBot entity) {
-        this.entitiesById.addKey(entityID, entity);
-    }
-
-    public void removeEntityFromWorld(int entityID) {
-        Entity entity = this.entitiesById.removeObject(entityID);
-        if (entity != null) {
-            this.removeEntity(entity);
-        }
-    }
-
-    public void doPreChunk(int chunkX, int chunkZ, boolean loadChunk) {
-        if (loadChunk) {
-            this.chunkProviderClient.loadChunk(chunkX, chunkZ);
-        } else {
-            this.chunkProviderClient.unloadChunk(chunkX, chunkZ);
-        }
-    }
-}

src/main/java/baritone/bot/spec/EntityBot.java

@@ -1,170 +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.bot.spec;
-
-import baritone.api.bot.IBaritoneUser;
-import baritone.utils.PlayerMovementInput;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.client.network.NetHandlerPlayClient;
-import net.minecraft.client.network.NetworkPlayerInfo;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.IMerchant;
-import net.minecraft.entity.passive.AbstractHorse;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-import net.minecraft.stats.RecipeBook;
-import net.minecraft.stats.StatisticsManager;
-import net.minecraft.tileentity.CommandBlockBaseLogic;
-import net.minecraft.tileentity.TileEntityCommandBlock;
-import net.minecraft.tileentity.TileEntitySign;
-import net.minecraft.tileentity.TileEntityStructure;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.world.GameType;
-import net.minecraft.world.IInteractionObject;
-import net.minecraft.world.World;
-
-import javax.annotation.Nullable;
-
-// Some Notes:
-// startRiding references the sound manager
-// onUpdateWalkingPlayer references the gameSettings autoJump flag
-// notifyDataManagerChange references the sound manager
-// onLivingUpdate makes a lot of references to mc fields
-//  - playerController
-//  - currentScreen
-//  - gameSettings
-//  - tutorial
-// What needs to be considered
-//  - The server tells us what our entity id should be, the bot entity should respect this.
-
-/**
- * @author Brady
- * @since 10/23/2018
- */
-@SuppressWarnings("EntityConstructor")
-public class EntityBot extends EntityPlayerSP {
-
-    private final IBaritoneUser user;
-    private NetworkPlayerInfo playerInfo;
-
-    public EntityBot(IBaritoneUser user, Minecraft mc, World world, NetHandlerPlayClient netHandlerPlayClient, StatisticsManager statisticsManager, RecipeBook recipeBook) {
-        super(mc, world, netHandlerPlayClient, statisticsManager, recipeBook);
-        this.user = user;
-        this.movementInput = new PlayerMovementInput(this.user.getBaritone().getInputOverrideHandler());
-    }
-
-    @Override
-    public void closeScreenAndDropStack() {
-        this.inventory.setItemStack(ItemStack.EMPTY);
-
-        // EntityPlayer#closeScreen
-        this.openContainer = this.inventoryContainer;
-    }
-
-    @Override
-    public void sendStatusMessage(ITextComponent chatComponent, boolean actionBar) {
-        // TODO: Custom message handling
-    }
-
-    @Override
-    public void sendMessage(ITextComponent component) {
-        // TODO: Custom message handling
-    }
-
-    @Override
-    public void openEditSign(TileEntitySign signTile) {
-        // TODO: Custom GUI handling
-    }
-
-    @Override
-    public void displayGuiEditCommandCart(CommandBlockBaseLogic commandBlock) {
-        // TODO: Custom GUI handling
-    }
-
-    @Override
-    public void displayGuiCommandBlock(TileEntityCommandBlock commandBlock) {
-        // TODO: Custom GUI handling
-    }
-
-    @Override
-    public void openEditStructure(TileEntityStructure structure) {
-        // TODO: Custom GUI handling
-    }
-
-    @Override
-    public void openBook(ItemStack stack, EnumHand hand) {
-        // TODO: Custom GUI handling
-    }
-
-    @Override
-    public void displayGUIChest(IInventory chestInventory) {
-        // TODO: Custom GUI handling
-    }
-
-    @Override
-    public void openGuiHorseInventory(AbstractHorse horse, IInventory inventoryIn) {
-        // TODO: Custom GUI handling
-    }
-
-    @Override
-    public void displayGui(IInteractionObject guiOwner) {
-        // TODO: Custom GUI handling
-    }
-
-    @Override
-    public void displayVillagerTradeGui(IMerchant villager) {
-        // TODO: Custom GUI handling
-    }
-
-    @Override
-    public void onCriticalHit(Entity entityHit) {
-        // Don't render
-    }
-
-    @Override
-    public void onEnchantmentCritical(Entity entityHit) {
-        // Don't render
-    }
-
-    @Override
-    protected boolean isCurrentViewEntity() {
-        return true;
-    }
-
-    @Override
-    public boolean isSpectator() {
-        NetworkPlayerInfo networkplayerinfo = this.connection.getPlayerInfo(this.getGameProfile().getId());
-        // noinspection ConstantConditions
-        return networkplayerinfo != null && networkplayerinfo.getGameType() == GameType.SPECTATOR;
-    }
-
-    @Override
-    public boolean isCreative() {
-        NetworkPlayerInfo networkplayerinfo = this.connection.getPlayerInfo(this.getGameProfile().getId());
-        // noinspection ConstantConditions
-        return networkplayerinfo != null && networkplayerinfo.getGameType() == GameType.CREATIVE;
-    }
-
-    @Nullable
-    @Override
-    protected NetworkPlayerInfo getPlayerInfo() {
-        return this.playerInfo == null ? (this.playerInfo = this.connection.getPlayerInfo(this.getUniqueID())) : null;
-    }
-}

src/main/java/baritone/cache/CachedChunk.java

@@ -38,23 +38,13 @@ import java.util.Map;
 public final class CachedChunk {
 
     public static final ImmutableSet<Block> BLOCKS_TO_KEEP_TRACK_OF = ImmutableSet.of(
-            Blocks.DIAMOND_BLOCK,
-            //Blocks.COAL_ORE,
-            Blocks.COAL_BLOCK,
-            //Blocks.IRON_ORE,
-            Blocks.IRON_BLOCK,
-            //Blocks.GOLD_ORE,
-            Blocks.GOLD_BLOCK,
-            Blocks.EMERALD_ORE,
-            Blocks.EMERALD_BLOCK,
-
             Blocks.ENDER_CHEST,
             Blocks.FURNACE,
             Blocks.CHEST,
             Blocks.TRAPPED_CHEST,
             Blocks.END_PORTAL,
             Blocks.END_PORTAL_FRAME,
-            Blocks.MOB_SPAWNER,
+            Blocks.SPAWNER,
             Blocks.BARRIER,
             Blocks.OBSERVER,
             Blocks.WHITE_SHULKER_BOX,
@@ -65,7 +55,7 @@ public final class CachedChunk {
             Blocks.LIME_SHULKER_BOX,
             Blocks.PINK_SHULKER_BOX,
             Blocks.GRAY_SHULKER_BOX,
-            Blocks.SILVER_SHULKER_BOX,
+            Blocks.LIGHT_GRAY_SHULKER_BOX,
             Blocks.CYAN_SHULKER_BOX,
             Blocks.PURPLE_SHULKER_BOX,
             Blocks.BLUE_SHULKER_BOX,
@@ -73,25 +63,52 @@ public final class CachedChunk {
             Blocks.GREEN_SHULKER_BOX,
             Blocks.RED_SHULKER_BOX,
             Blocks.BLACK_SHULKER_BOX,
-            Blocks.PORTAL,
+            Blocks.NETHER_PORTAL,
             Blocks.HOPPER,
             Blocks.BEACON,
             Blocks.BREWING_STAND,
-            Blocks.SKULL,
+
+// TODO: Maybe add a predicate for blocks to keep track of?
+// This should really not need to happen
+            Blocks.CREEPER_HEAD,
+            Blocks.CREEPER_WALL_HEAD,
+            Blocks.DRAGON_HEAD,
+            Blocks.DRAGON_WALL_HEAD,
+            Blocks.PLAYER_HEAD,
+            Blocks.PLAYER_WALL_HEAD,
+            Blocks.ZOMBIE_HEAD,
+            Blocks.ZOMBIE_WALL_HEAD,
+            Blocks.SKELETON_SKULL,
+            Blocks.SKELETON_WALL_SKULL,
+            Blocks.WITHER_SKELETON_SKULL,
+            Blocks.WITHER_SKELETON_WALL_SKULL,
             Blocks.ENCHANTING_TABLE,
             Blocks.ANVIL,
-            Blocks.LIT_FURNACE,
-            Blocks.BED,
+            Blocks.WHITE_BED,
+            Blocks.ORANGE_BED,
+            Blocks.MAGENTA_BED,
+            Blocks.LIGHT_BLUE_BED,
+            Blocks.YELLOW_BED,
+            Blocks.LIME_BED,
+            Blocks.PINK_BED,
+            Blocks.GRAY_BED,
+            Blocks.LIGHT_GRAY_BED,
+            Blocks.CYAN_BED,
+            Blocks.PURPLE_BED,
+            Blocks.BLUE_BED,
+            Blocks.BROWN_BED,
+            Blocks.GREEN_BED,
+            Blocks.RED_BED,
+            Blocks.BLACK_BED,
             Blocks.DRAGON_EGG,
             Blocks.JUKEBOX,
             Blocks.END_GATEWAY,
-            Blocks.WEB,
+            Blocks.COBWEB,
             Blocks.NETHER_WART,
             Blocks.LADDER,
             Blocks.VINE
     );
 
-
     /**
      * The size of the chunk data in bits. Equal to 16 KiB.
      * <p>
@@ -170,8 +187,8 @@ public final class CachedChunk {
 
             // we have this exact block, it's a surface block
             /*System.out.println("Saying that " + x + "," + y + "," + z + " is " + state);
-            if (!Minecraft.getMinecraft().world.getBlockState(new BlockPos(x + this.x * 16, y, z + this.z * 16)).getBlock().equals(state.getBlock())) {
-                throw new IllegalStateException("failed " + Minecraft.getMinecraft().world.getBlockState(new BlockPos(x + this.x * 16, y, z + this.z * 16)).getBlock() + " " + state.getBlock() + " " + (x + this.x * 16) + " " + y + " " + (z + this.z * 16));
+            if (!Minecraft.getInstance().world.getBlockState(new BlockPos(x + this.x * 16, y, z + this.z * 16)).getBlock().equals(state.getBlock())) {
+                throw new IllegalStateException("failed " + Minecraft.getInstance().world.getBlockState(new BlockPos(x + this.x * 16, y, z + this.z * 16)).getBlock() + " " + state.getBlock() + " " + (x + this.x * 16) + " " + y + " " + (z + this.z * 16));
             }*/
             return overview[internalPos];
         }

src/main/java/baritone/cache/ChunkPacker.java

@@ -24,9 +24,10 @@ import net.minecraft.block.*;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.chunk.BlockStateContainer;
 import net.minecraft.world.chunk.Chunk;
-import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
+import net.minecraft.world.chunk.ChunkSection;
 
 import java.util.*;
 
@@ -44,9 +45,9 @@ public final class ChunkPacker {
         Map<String, List<BlockPos>> specialBlocks = new HashMap<>();
         BitSet bitSet = new BitSet(CachedChunk.SIZE);
         try {
-            ExtendedBlockStorage[] chunkInternalStorageArray = chunk.getBlockStorageArray();
+            ChunkSection[] chunkInternalStorageArray = chunk.getSections();
             for (int y0 = 0; y0 < 16; y0++) {
-                ExtendedBlockStorage extendedblockstorage = chunkInternalStorageArray[y0];
+                ChunkSection extendedblockstorage = chunkInternalStorageArray[y0];
                 if (extendedblockstorage == null) {
                     // any 16x16x16 area that's all air will have null storage
                     // for example, in an ocean biome, with air from y=64 to y=256
@@ -58,7 +59,7 @@ public final class ChunkPacker {
                     // since a bitset is initialized to all zero, and air is saved as zeros
                     continue;
                 }
-                BlockStateContainer bsc = extendedblockstorage.getData();
+                BlockStateContainer<IBlockState> bsc = extendedblockstorage.getData();
                 int yReal = y0 << 4;
                 // the mapping of BlockStateContainer.getIndex from xyz to index is y << 8 | z << 4 | x;
                 // for better cache locality, iterate in that order
@@ -105,10 +106,9 @@ public final class ChunkPacker {
         return new CachedChunk(chunk.x, chunk.z, bitSet, blocks, specialBlocks, System.currentTimeMillis());
     }
 
-
     private static PathingBlockType getPathingBlockType(IBlockState state, Chunk chunk, int x, int y, int z) {
         Block block = state.getBlock();
-        if (block == Blocks.WATER || block == Blocks.FLOWING_WATER) {
+        if (MovementHelper.isWater(state)) {
             // only water source blocks are plausibly usable, flowing water should be avoid
             // FLOWING_WATER is a waterfall, it doesn't really matter and caching it as AVOID just makes it look wrong
             if (MovementHelper.possiblyFlowing(state)) {
@@ -123,7 +123,8 @@ public final class ChunkPacker {
                 return PathingBlockType.AVOID;
             }
             if (x == 0 || x == 15 || z == 0 || z == 15) {
-                if (BlockLiquid.getSlopeAngle(chunk.getWorld(), new BlockPos(x + chunk.x << 4, y, z + chunk.z << 4), state.getMaterial(), state) == -1000.0F) {
+                Vec3d flow = state.getFluidState().getFlow(chunk.getWorld(), new BlockPos(x + chunk.x << 4, y, z + chunk.z << 4));
+                if (flow.x != 0.0 || flow.z != 0.0) {
                     return PathingBlockType.WATER;
                 }
                 return PathingBlockType.AVOID;
@@ -131,14 +132,14 @@ public final class ChunkPacker {
             return PathingBlockType.WATER;
         }
 
-        if (MovementHelper.avoidWalkingInto(block) || MovementHelper.isBottomSlab(state)) {
+        if (MovementHelper.avoidWalkingInto(state) || MovementHelper.isBottomSlab(state)) {
             return PathingBlockType.AVOID;
         }
         // We used to do an AABB check here
         // however, this failed in the nether when you were near a nether fortress
         // because fences check their adjacent blocks in the world for their fence connection status to determine AABB shape
         // this caused a nullpointerexception when we saved chunks on unload, because they were unable to check their neighbors
-        if (block == Blocks.AIR || block instanceof BlockTallGrass || block instanceof BlockDoublePlant || block instanceof BlockFlower) {
+        if (block instanceof BlockAir || block instanceof BlockTallGrass || block instanceof BlockDoublePlant || block instanceof BlockFlower) {
             return PathingBlockType.AIR;
         }
 

src/main/java/baritone/cache/WorldProvider.java

@@ -24,6 +24,7 @@ import baritone.utils.accessor.IAnvilChunkLoader;
 import baritone.utils.accessor.IChunkProviderServer;
 import net.minecraft.server.integrated.IntegratedServer;
 import net.minecraft.world.WorldServer;
+import net.minecraft.world.dimension.DimensionType;
 import org.apache.commons.lang3.SystemUtils;
 
 import java.io.File;
@@ -55,7 +56,7 @@ public class WorldProvider implements IWorldProvider, Helper {
      *
      * @param dimension The ID of the world's dimension
      */
-    public final void initWorld(int dimension) {
+    public final void initWorld(DimensionType dimension) {
         File directory;
         File readme;
 
@@ -92,7 +93,7 @@ public class WorldProvider implements IWorldProvider, Helper {
         } catch (IOException ignored) {}
 
         // We will actually store the world data in a subfolder: "DIM<id>"
-        Path dir = new File(directory, "DIM" + dimension).toPath();
+        Path dir = new File(directory, "DIM" + dimension.getId()).toPath();
         if (!Files.exists(dir)) {
             try {
                 Files.createDirectories(dir);
@@ -101,7 +102,7 @@ public class WorldProvider implements IWorldProvider, Helper {
 
         System.out.println("Baritone world data dir: " + dir);
         synchronized (worldCache) {
-            this.currentWorld = worldCache.computeIfAbsent(dir, d -> new WorldData(d, dimension));
+            this.currentWorld = worldCache.computeIfAbsent(dir, d -> new WorldData(d, dimension.getId()));
         }
     }
 

src/main/java/baritone/cache/WorldScanner.java

@@ -28,8 +28,8 @@ import net.minecraft.client.multiplayer.ChunkProviderClient;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.chunk.ChunkSection;
 import net.minecraft.world.chunk.IChunkProvider;
-import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
 
 import java.util.*;
 import java.util.stream.IntStream;
@@ -72,7 +72,7 @@ public enum WorldScanner implements IWorldScanner {
                     foundChunks = true;
                     int chunkX = xoff + playerChunkX;
                     int chunkZ = zoff + playerChunkZ;
-                    Chunk chunk = chunkProvider.getLoadedChunk(chunkX, chunkZ);
+                    Chunk chunk = chunkProvider.getChunk(chunkX, chunkZ, false, false);
                     if (chunk == null) {
                         continue;
                     }
@@ -99,7 +99,7 @@ public enum WorldScanner implements IWorldScanner {
         }
 
         ChunkProviderClient chunkProvider = (ChunkProviderClient) ctx.world().getChunkProvider();
-        Chunk chunk = chunkProvider.getLoadedChunk(pos.x, pos.z);
+        Chunk chunk = chunkProvider.getChunk(pos.x, pos.z, false, false);
         int playerY = ctx.playerFeet().getY();
 
         if (chunk == null || chunk.isEmpty()) {
@@ -111,47 +111,12 @@ public enum WorldScanner implements IWorldScanner {
         return res;
     }
 
-    @Override
-    public int repack(IPlayerContext ctx) {
-        return this.repack(ctx, 40);
-    }
-
-    @Override
-    public int repack(IPlayerContext ctx, int range) {
-        IChunkProvider chunkProvider = ctx.world().getChunkProvider();
-        ICachedWorld cachedWorld = ctx.worldData().getCachedWorld();
-
-        BetterBlockPos playerPos = ctx.playerFeet();
-
-        int playerChunkX = playerPos.getX() >> 4;
-        int playerChunkZ = playerPos.getZ() >> 4;
-
-        int minX = playerChunkX - range;
-        int minZ = playerChunkZ - range;
-        int maxX = playerChunkX + range;
-        int maxZ = playerChunkZ + range;
-
-        int queued = 0;
-        for (int x = minX; x <= maxX; x++) {
-            for (int z = minZ; z <= maxZ; z++) {
-                Chunk chunk = chunkProvider.getLoadedChunk(x, z);
-
-                if (chunk != null && !chunk.isEmpty()) {
-                    queued++;
-                    cachedWorld.queueForPacking(chunk);
-                }
-            }
-        }
-
-        return queued;
-    }
-
     private boolean scanChunkInto(int chunkX, int chunkZ, Chunk chunk, BlockOptionalMetaLookup filter, Collection<BlockPos> result, int max, int yLevelThreshold, int playerY, int[] coordinateIterationOrder) {
-        ExtendedBlockStorage[] chunkInternalStorageArray = chunk.getBlockStorageArray();
+        ChunkSection[] chunkInternalStorageArray = chunk.getSections();
         boolean foundWithinY = false;
         for (int yIndex = 0; yIndex < 16; yIndex++) {
             int y0 = coordinateIterationOrder[yIndex];
-            ExtendedBlockStorage extendedblockstorage = chunkInternalStorageArray[y0];
+            ChunkSection extendedblockstorage = chunkInternalStorageArray[y0];
             if (extendedblockstorage == null) {
                 continue;
             }
@@ -182,4 +147,26 @@ public enum WorldScanner implements IWorldScanner {
         }
         return foundWithinY;
     }
+
+    public int repack(IPlayerContext ctx) {
+        IChunkProvider chunkProvider = ctx.world().getChunkProvider();
+        ICachedWorld cachedWorld = ctx.worldData().getCachedWorld();
+
+        BetterBlockPos playerPos = ctx.playerFeet();
+        int playerChunkX = playerPos.getX() >> 4;
+        int playerChunkZ = playerPos.getZ() >> 4;
+        int queued = 0;
+        for (int x = playerChunkX - 40; x <= playerChunkX + 40; x++) {
+            for (int z = playerChunkZ - 40; z <= playerChunkZ + 40; z++) {
+                Chunk chunk = chunkProvider.getChunk(x, z, false, false);
+
+                if (chunk != null && !chunk.isEmpty()) {
+                    queued++;
+                    cachedWorld.queueForPacking(chunk);
+                }
+            }
+        }
+
+        return queued;
+    }
 }

src/main/java/baritone/command/BaritoneChatControl.java

@@ -68,7 +68,7 @@ public class BaritoneChatControl implements Helper, AbstractGameEventListener {
             event.cancel();
             String commandStr = msg.substring(forceRun ? FORCE_COMMAND_PREFIX.length() : prefix.length());
             if (!runCommand(commandStr) && !commandStr.trim().isEmpty()) {
-                new CommandNotFoundException(CommandManager.expand(commandStr).getFirst()).handle(null, null);
+                new CommandNotFoundException(CommandManager.expand(commandStr).getA()).handle(null, null);
             }
         } else if ((settings.chatControl.value || settings.chatControlAnyway.value) && runCommand(msg)) {
             event.cancel();
@@ -108,9 +108,9 @@ public class BaritoneChatControl implements Helper, AbstractGameEventListener {
             return this.runCommand("help");
         }
         Tuple<String, List<ICommandArgument>> pair = CommandManager.expand(msg);
-        String command = pair.getFirst();
-        String rest = msg.substring(pair.getFirst().length());
-        ArgConsumer argc = new ArgConsumer(this.manager, pair.getSecond());
+        String command = pair.getA();
+        String rest = msg.substring(pair.getA().length());
+        ArgConsumer argc = new ArgConsumer(this.manager, pair.getB());
         if (!argc.hasAny()) {
             Settings.Setting setting = settings.byLowerName.get(command.toLowerCase(Locale.US));
             if (setting != null) {
@@ -127,7 +127,7 @@ public class BaritoneChatControl implements Helper, AbstractGameEventListener {
                 if (setting.getName().equals("logger")) {
                     continue;
                 }
-                if (setting.getName().equalsIgnoreCase(pair.getFirst())) {
+                if (setting.getName().equalsIgnoreCase(pair.getA())) {
                     logRanCommand(command, rest);
                     try {
                         this.manager.execute(String.format("set %s %s", setting.getName(), argc.getString()));
@@ -138,7 +138,7 @@ public class BaritoneChatControl implements Helper, AbstractGameEventListener {
         }
 
         // If the command exists, then handle echoing the input
-        if (this.manager.getCommand(pair.getFirst()) != null) {
+        if (this.manager.getCommand(pair.getA()) != null) {
             logRanCommand(command, rest);
         }
 

src/main/java/baritone/command/argument/ArgConsumer.java

@@ -316,7 +316,8 @@ public class ArgConsumer implements IArgConsumer {
         try {
             return datatype.apply(this.context, original);
         } catch (Exception e) {
-            throw new CommandInvalidTypeException(hasAny() ? peek() : consumed(), datatype.getClass().getSimpleName(), e);
+            e.printStackTrace();
+            throw new CommandInvalidTypeException(hasAny() ? peek() : consumed(), datatype.getClass().getSimpleName());
         }
     }
 
@@ -345,7 +346,7 @@ public class ArgConsumer implements IArgConsumer {
         try {
             return datatype.get(this.context);
         } catch (Exception e) {
-            throw new CommandInvalidTypeException(hasAny() ? peek() : consumed(), datatype.getClass().getSimpleName(), e);
+            throw new CommandInvalidTypeException(hasAny() ? peek() : consumed(), datatype.getClass().getSimpleName());
         }
     }
 

src/main/java/baritone/command/defaults/BuildCommand.java

@@ -17,7 +17,6 @@
 
 package baritone.command.defaults;
 
-import baritone.Baritone;
 import baritone.api.IBaritone;
 import baritone.api.utils.BetterBlockPos;
 import baritone.api.command.Command;
@@ -27,16 +26,16 @@ import baritone.api.command.exception.CommandException;
 import baritone.api.command.exception.CommandInvalidStateException;
 import baritone.api.command.argument.IArgConsumer;
 import net.minecraft.client.Minecraft;
-import org.apache.commons.io.FilenameUtils;
 
 import java.io.File;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Locale;
 import java.util.stream.Stream;
 
 public class BuildCommand extends Command {
 
-    private static final File schematicsDir = new File(Minecraft.getMinecraft().gameDir, "schematics");
+    private static final File schematicsDir = new File(mc.gameDir, "schematics");
 
     public BuildCommand(IBaritone baritone) {
         super(baritone, "build");
@@ -45,8 +44,8 @@ public class BuildCommand extends Command {
     @Override
     public void execute(String label, IArgConsumer args) throws CommandException {
         File file = args.getDatatypePost(RelativeFile.INSTANCE, schematicsDir).getAbsoluteFile();
-        if (FilenameUtils.getExtension(file.getAbsolutePath()).isEmpty()) {
-            file = new File(file.getAbsolutePath() + "." + Baritone.settings().schematicFallbackExtension);
+        if (!file.getName().toLowerCase(Locale.US).endsWith(".schematic")) {
+            file = new File(file.getAbsolutePath() + ".schematic");
         }
         BetterBlockPos origin = ctx.playerFeet();
         BetterBlockPos buildOrigin;

src/main/java/baritone/command/defaults/CancelCommand.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.command.defaults;
+
+import baritone.api.IBaritone;
+import baritone.api.command.Command;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.argument.IArgConsumer;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Stream;
+
+public class CancelCommand extends Command {
+
+    public CancelCommand(IBaritone baritone) {
+        super(baritone, "cancel", "stop");
+    }
+
+    @Override
+    public void execute(String label, IArgConsumer args) throws CommandException {
+        args.requireMax(0);
+        baritone.getPathingBehavior().cancelEverything();
+        logDirect("ok canceled");
+    }
+
+    @Override
+    public Stream<String> tabComplete(String label, IArgConsumer args) {
+        return Stream.empty();
+    }
+
+    @Override
+    public String getShortDesc() {
+        return "Cancel what Baritone is currently doing";
+    }
+
+    @Override
+    public List<String> getLongDesc() {
+        return Arrays.asList(
+                "The cancel command tells Baritone to stop whatever it's currently doing.",
+                "",
+                "Usage:",
+                "> cancel"
+        );
+    }
+}

src/main/java/baritone/command/defaults/DefaultCommands.java

@@ -24,53 +24,52 @@ import java.util.*;
 
 public final class DefaultCommands {
 
-    private DefaultCommands() {
-    }
+    private DefaultCommands() {}
 
     public static List<ICommand> createAll(IBaritone baritone) {
         Objects.requireNonNull(baritone);
         List<ICommand> commands = new ArrayList<>(Arrays.asList(
-                new HelpCommand(baritone),
-                new SetCommand(baritone),
-                new CommandAlias(baritone, Arrays.asList("modified", "mod", "baritone", "modifiedsettings"), "List modified settings", "set modified"),
-                new CommandAlias(baritone, "reset", "Reset all settings or just one", "set reset"),
-                new GoalCommand(baritone),
-                new GotoCommand(baritone),
-                new PathCommand(baritone),
-                new ProcCommand(baritone),
-                new VersionCommand(baritone),
-                new RepackCommand(baritone),
-                new BuildCommand(baritone),
-                new SchematicaCommand(baritone),
-                new ComeCommand(baritone),
-                new AxisCommand(baritone),
-                new ForceCancelCommand(baritone),
-                new GcCommand(baritone),
-                new InvertCommand(baritone),
-                new TunnelCommand(baritone),
-                new RenderCommand(baritone),
-                new FarmCommand(baritone),
-                new ChestsCommand(baritone),
-                new FollowCommand(baritone),
-                new ExploreFilterCommand(baritone),
-                new ReloadAllCommand(baritone),
-                new SaveAllCommand(baritone),
-                new ExploreCommand(baritone),
-                new BlacklistCommand(baritone),
-                new FindCommand(baritone),
-                new MineCommand(baritone),
-                new ClickCommand(baritone),
-                new ThisWayCommand(baritone),
-                new WaypointsCommand(baritone),
-                new CommandAlias(baritone, "sethome", "Sets your home waypoint", "waypoints save home"),
-                new CommandAlias(baritone, "home", "Set goal to your home waypoint", "waypoints goal home"),
-                new SelCommand(baritone)
+            new HelpCommand(baritone),
+            new SetCommand(baritone),
+            new CommandAlias(baritone, Arrays.asList("modified", "mod", "baritone", "modifiedsettings"), "List modified settings", "set modified"),
+            new CommandAlias(baritone, "reset", "Reset all settings or just one", "set reset"),
+            new GoalCommand(baritone),
+            new GotoCommand(baritone),
+            new PathCommand(baritone),
+            new ProcCommand(baritone),
+            new VersionCommand(baritone),
+            new RepackCommand(baritone),
+            new BuildCommand(baritone),
+            new SchematicaCommand(baritone),
+            new ComeCommand(baritone),
+            new AxisCommand(baritone),
+            new CancelCommand(baritone),
+            new ForceCancelCommand(baritone),
+            new GcCommand(baritone),
+            new InvertCommand(baritone),
+            new TunnelCommand(baritone),
+            new RenderCommand(baritone),
+            new FarmCommand(baritone),
+            new ChestsCommand(baritone),
+            new FollowCommand(baritone),
+            new ExploreFilterCommand(baritone),
+            new ReloadAllCommand(baritone),
+            new SaveAllCommand(baritone),
+            new ExploreCommand(baritone),
+            new BlacklistCommand(baritone),
+            new FindCommand(baritone),
+            new MineCommand(baritone),
+            new ClickCommand(baritone),
+            new ThisWayCommand(baritone),
+            new WaypointsCommand(baritone),
+            new CommandAlias(baritone, "sethome", "Sets your home waypoint", "waypoints save home"),
+            new CommandAlias(baritone, "home", "Set goal to your home waypoint", "waypoints goal home"),
+            new SelCommand(baritone)
         ));
-        ExecutionControlCommands prc = new ExecutionControlCommands(baritone);
+        PauseResumeCommands prc = new PauseResumeCommands(baritone);
         commands.add(prc.pauseCommand);
         commands.add(prc.resumeCommand);
         commands.add(prc.pausedCommand);
-        commands.add(prc.cancelCommand);
         return Collections.unmodifiableList(commands);
     }
 }

src/main/java/baritone/command/defaults/FindCommand.java

@@ -24,6 +24,7 @@ import baritone.api.command.datatypes.BlockById;
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.argument.IArgConsumer;
 import net.minecraft.block.Block;
+import net.minecraft.util.registry.IRegistry;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -46,7 +47,7 @@ public class FindCommand extends Command {
         toFind.stream()
                 .flatMap(block ->
                         ctx.worldData().getCachedWorld().getLocationsOf(
-                                Block.REGISTRY.getNameForObject(block).getPath(),
+                                IRegistry.BLOCK.getKey(block).getPath(),
                                 Integer.MAX_VALUE,
                                 origin.x,
                                 origin.y,

src/main/java/baritone/command/defaults/FollowCommand.java

@@ -26,10 +26,11 @@ import baritone.api.command.exception.CommandException;
 import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.helpers.TabCompleteHelper;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityList;
 import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityType;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.registry.IRegistry;
 
 import java.util.*;
 import java.util.function.Predicate;
@@ -47,7 +48,7 @@ public class FollowCommand extends Command {
         FollowGroup group;
         FollowList list;
         List<Entity> entities = new ArrayList<>();
-        List<Class<? extends Entity>> classes = new ArrayList<>();
+        List<EntityType> classes = new ArrayList<>();
         if (args.hasExactlyOne()) {
             baritone.getFollowProcess().follow((group = args.getEnum(FollowGroup.class)).filter);
         } else {
@@ -56,9 +57,9 @@ public class FollowCommand extends Command {
             list = args.getEnum(FollowList.class);
             while (args.hasAny()) {
                 Object gotten = args.getDatatypeFor(list.datatype);
-                if (gotten instanceof Class) {
+                if (gotten instanceof EntityType) {
                     //noinspection unchecked
-                    classes.add((Class<? extends Entity>) gotten);
+                    classes.add((EntityType) gotten);
                 } else {
                     entities.add((Entity) gotten);
                 }
@@ -66,7 +67,7 @@ public class FollowCommand extends Command {
             baritone.getFollowProcess().follow(
                     classes.isEmpty()
                             ? entities::contains
-                            : e -> classes.stream().anyMatch(c -> c.isInstance(e))
+                            : e -> classes.stream().anyMatch(c -> c.getEntityClass().isInstance(e))
             );
         }
         if (group != null) {
@@ -79,7 +80,7 @@ public class FollowCommand extends Command {
                         .forEach(this::logDirect);
             } else {
                 classes.stream()
-                        .map(EntityList::getKey)
+                        .map(IRegistry.ENTITY_TYPE::getKey)
                         .map(Objects::requireNonNull)
                         .map(ResourceLocation::toString)
                         .forEach(this::logDirect);

src/main/java/baritone/command/defaults/GotoCommand.java

@@ -41,13 +41,9 @@ public class GotoCommand extends Command {
 
     @Override
     public void execute(String label, IArgConsumer args) throws CommandException {
-        // If we have a numeric first argument, then parse arguments as coordinates.
-        // Note: There is no reason to want to go where you're already at so there
-        // is no need to handle the case of empty arguments.
-        if (args.peekDatatypeOrNull(RelativeCoordinate.INSTANCE) != null) {
-            args.requireMax(3);
+        if (args.peekDatatypeOrNull(RelativeCoordinate.INSTANCE) != null) { // if we have a numeric first argument...
             BetterBlockPos origin = baritone.getPlayerContext().playerFeet();
-            Goal goal = args.getDatatypePost(RelativeGoal.INSTANCE, origin);
+            Goal goal = args.getDatatypePostOrNull(RelativeGoal.INSTANCE, origin);
             logDirect(String.format("Going to: %s", goal.toString()));
             baritone.getCustomGoalProcess().setGoalAndPath(goal);
             return;

src/main/java/baritone/command/defaults/PauseResumeCommands.java

@@ -18,13 +18,13 @@
 package baritone.command.defaults;
 
 import baritone.api.IBaritone;
-import baritone.api.command.Command;
-import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.exception.CommandException;
-import baritone.api.command.exception.CommandInvalidStateException;
 import baritone.api.process.IBaritoneProcess;
 import baritone.api.process.PathingCommand;
 import baritone.api.process.PathingCommandType;
+import baritone.api.command.Command;
+import baritone.api.command.exception.CommandException;
+import baritone.api.command.exception.CommandInvalidStateException;
+import baritone.api.command.argument.IArgConsumer;
 
 import java.util.Arrays;
 import java.util.List;
@@ -37,14 +37,13 @@ import java.util.stream.Stream;
  * TO USE THIS to pause and resume Baritone. Make your own process that returns {@link PathingCommandType#REQUEST_PAUSE
  * REQUEST_PAUSE} as needed.
  */
-public class ExecutionControlCommands {
+public class PauseResumeCommands {
 
     Command pauseCommand;
     Command resumeCommand;
     Command pausedCommand;
-    Command cancelCommand;
 
-    public ExecutionControlCommands(IBaritone baritone) {
+    public PauseResumeCommands(IBaritone baritone) {
         // array for mutability, non-field so reflection can't touch it
         final boolean[] paused = {false};
         baritone.getPathingControlManager().registerProcess(
@@ -65,8 +64,7 @@ public class ExecutionControlCommands {
                     }
 
                     @Override
-                    public void onLostControl() {
-                    }
+                    public void onLostControl() {}
 
                     @Override
                     public double priority() {
@@ -171,36 +169,5 @@ public class ExecutionControlCommands {
                 );
             }
         };
-        cancelCommand = new Command(baritone, "cancel", "stop") {
-            @Override
-            public void execute(String label, IArgConsumer args) throws CommandException {
-                args.requireMax(0);
-                if (paused[0]) {
-                    paused[0] = false;
-                }
-                baritone.getPathingBehavior().cancelEverything();
-                logDirect("ok canceled");
-            }
-
-            @Override
-            public Stream<String> tabComplete(String label, IArgConsumer args) {
-                return Stream.empty();
-            }
-
-            @Override
-            public String getShortDesc() {
-                return "Cancel what Baritone is currently doing";
-            }
-
-            @Override
-            public List<String> getLongDesc() {
-                return Arrays.asList(
-                        "The cancel command tells Baritone to stop whatever it's currently doing.",
-                        "",
-                        "Usage:",
-                        "> cancel"
-                );
-            }
-        };
     }
 }

src/main/java/baritone/command/defaults/RenderCommand.java

@@ -38,7 +38,7 @@ public class RenderCommand extends Command {
         args.requireMax(0);
         BetterBlockPos origin = ctx.playerFeet();
         int renderDistance = (mc.gameSettings.renderDistanceChunks + 1) * 16;
-        mc.renderGlobal.markBlockRangeForRenderUpdate(
+        mc.worldRenderer.markBlockRangeForRenderUpdate(
                 origin.x - renderDistance,
                 0,
                 origin.z - renderDistance,

src/main/java/baritone/command/manager/CommandManager.java

@@ -23,10 +23,10 @@ import baritone.api.command.ICommand;
 import baritone.api.command.argument.ICommandArgument;
 import baritone.api.command.exception.CommandUnhandledException;
 import baritone.api.command.exception.ICommandException;
-import baritone.command.argument.ArgConsumer;
 import baritone.api.command.helpers.TabCompleteHelper;
 import baritone.api.command.manager.ICommandManager;
 import baritone.api.command.registry.Registry;
+import baritone.command.argument.ArgConsumer;
 import baritone.command.argument.CommandArguments;
 import baritone.command.defaults.DefaultCommands;
 import net.minecraft.util.Tuple;
@@ -35,6 +35,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.stream.Stream;
 
+
 /**
  * The default, internal implementation of {@link ICommandManager}
  *
@@ -94,8 +95,8 @@ public class CommandManager implements ICommandManager {
     @Override
     public Stream<String> tabComplete(String prefix) {
         Tuple<String, List<ICommandArgument>> pair = expand(prefix, true);
-        String label = pair.getFirst();
-        List<ICommandArgument> args = pair.getSecond();
+        String label = pair.getA();
+        List<ICommandArgument> args = pair.getB();
         if (args.isEmpty()) {
             return new TabCompleteHelper()
                     .addCommands(this.baritone.getCommandManager())
@@ -107,8 +108,8 @@ public class CommandManager implements ICommandManager {
     }
 
     private ExecutionWrapper from(Tuple<String, List<ICommandArgument>> expanded) {
-        String label = expanded.getFirst();
-        ArgConsumer args = new ArgConsumer(this, expanded.getSecond());
+        String label = expanded.getA();
+        ArgConsumer args = new ArgConsumer(this, expanded.getB());
 
         ICommand command = this.getCommand(label);
         return command == null ? null : new ExecutionWrapper(command, label, args);
@@ -125,6 +126,7 @@ public class CommandManager implements ICommandManager {
     }
 
     private static final class ExecutionWrapper {
+
         private ICommand command;
         private String label;
         private ArgConsumer args;