Merge branch 'master' of github.com:cabaletta/baritone

This commit is contained in:
Leijurv 2018-08-01 14:14:14 -04:00
commit d1e42a9bf0
No known key found for this signature in database
GPG Key ID: 0936202430AE187C
2 changed files with 1 additions and 10 deletions

1
.gitignore vendored
View File

@ -8,6 +8,7 @@
.gradle/ .gradle/
/classes/ /classes/
*.class *.class
/run/
# IntelliJ Files # IntelliJ Files
.idea/ .idea/

View File

@ -66,16 +66,6 @@ public class Baritone {
public static long lastDeath = 0; public static long lastDeath = 0;
public static SchematicBuilder currentBuilder = null; public static SchematicBuilder currentBuilder = null;
public static void main(String[] args) throws IOException, InterruptedException {
String s = Autorun.class.getProtectionDomain().getCodeSource().getLocation().toString().substring(5) + "../../autorun/runmc.command";
if (s.contains("jar")) {
Autorun.start(args);
return;
}
Autorun.runprocess("/usr/local/bin/ant jar");
Autorun.runprocess("java -Djava.library.path=jars/versions/1.12.2/1.12.2-natives/ -jar dist/Baritone.jar");
}
public static IBlockState get(BlockPos pos) { // wrappers for future 1.13 compat public static IBlockState get(BlockPos pos) { // wrappers for future 1.13 compat
return world.getBlockState(pos); return world.getBlockState(pos);
} }