diff --git a/.gitignore b/.gitignore index 91625b0bb..42abafa51 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,6 @@ nbproject/ /updatenames.sh /src/minecraft/net /src/minecraft/mcp +/classes + +*.class diff --git a/src/main/java/baritone/mining/MickeyMine.java b/src/main/java/baritone/mining/MickeyMine.java index 6307ab2e0..fc60e6898 100644 --- a/src/main/java/baritone/mining/MickeyMine.java +++ b/src/main/java/baritone/mining/MickeyMine.java @@ -392,11 +392,11 @@ public class MickeyMine extends ManagerTick { } public static IntegerTuple tupleFromChunk(Chunk chunk) { - return new IntegerTuple(chunk.xPosition, chunk.zPosition); + return new IntegerTuple(chunk.x, chunk.z); } public static IntegerTuple tupleFromBlockPos(BlockPos blockPos) { - return tupleFromChunk(Minecraft.getMinecraft().world.getChunkFromBlockCoords(blockPos)); + return tupleFromChunk(Minecraft.getMinecraft().world.getChunk(blockPos)); } @Override diff --git a/src/main/java/baritone/pathfinding/PathFinder.java b/src/main/java/baritone/pathfinding/PathFinder.java index 234adb430..b0528739f 100644 --- a/src/main/java/baritone/pathfinding/PathFinder.java +++ b/src/main/java/baritone/pathfinding/PathFinder.java @@ -114,7 +114,7 @@ public class PathFinder { if (actionCost >= Action.COST_INF) { continue; } - if (Minecraft.getMinecraft().world.getChunkFromBlockCoords(actionToGetToNeighbor.to) instanceof EmptyChunk) { + if (Minecraft.getMinecraft().world.getChunk(actionToGetToNeighbor.to) instanceof EmptyChunk) { numEmptyChunk++; continue; } diff --git a/src/main/java/baritone/schematic/SchematicLoader.java b/src/main/java/baritone/schematic/SchematicLoader.java index f0876ae8a..f82214433 100644 --- a/src/main/java/baritone/schematic/SchematicLoader.java +++ b/src/main/java/baritone/schematic/SchematicLoader.java @@ -30,7 +30,7 @@ public class SchematicLoader { private static final HashMap cachedSchematics = new HashMap<>(); private SchematicLoader() { - schematicDir = new File(Minecraft.getMinecraft().mcDataDir, "schematics"); + schematicDir = new File(Minecraft.getMinecraft().gameDir, "schematics"); schematicDir.mkdir(); for (File file : schematicDir.listFiles(new FileFilter() { @Override diff --git a/src/main/java/baritone/util/Memory.java b/src/main/java/baritone/util/Memory.java index facc8474c..481e6ec02 100644 --- a/src/main/java/baritone/util/Memory.java +++ b/src/main/java/baritone/util/Memory.java @@ -359,7 +359,7 @@ public class Memory extends Manager { return n; } public static boolean blockLoaded(BlockPos pos) { - return !(Minecraft.getMinecraft().world.getChunkFromBlockCoords(pos) instanceof EmptyChunk); + return !(Minecraft.getMinecraft().world.getChunk(pos) instanceof EmptyChunk); } public static String gotoCommand(String targetName) { for (String name : playerLocationMemory.keySet()) { diff --git a/src/main/java/baritone/util/ToolSet.java b/src/main/java/baritone/util/ToolSet.java index a8e680d5d..0d18eae09 100644 --- a/src/main/java/baritone/util/ToolSet.java +++ b/src/main/java/baritone/util/ToolSet.java @@ -60,6 +60,7 @@ public class ToolSet { item = Item.getByNameOrId("minecraft:apple"); } //Out.log(inv[i]); + float v = item.getStrVsBlock(new ItemStack(item), b); //Out.log("v: " + v); if (v > value) {