diff --git a/src/main/java/baritone/Baritone.java b/src/main/java/baritone/Baritone.java index a266a5a7..abc7c7c7 100644 --- a/src/main/java/baritone/Baritone.java +++ b/src/main/java/baritone/Baritone.java @@ -271,7 +271,7 @@ public class Baritone { } public static boolean isAir(BlockPos pos) { - return Baritone.get(pos).getBlock().equals(Block.getBlockById(0)); + return Baritone.get(pos).getBlock().equals(Blocks.AIR); } public static void findPathInNewThread(final boolean talkAboutIt) { @@ -385,7 +385,7 @@ public class Baritone { return; } IBlockState state = Baritone.get(pos); - if (state.getBlock().equals(Block.getBlockById(0))) { + if (state.getBlock().equals(Blocks.AIR)) { return; } switchtotool(state); diff --git a/src/main/java/baritone/mining/MickeyMine.java b/src/main/java/baritone/mining/MickeyMine.java index fc60e689..d6bb3cf4 100644 --- a/src/main/java/baritone/mining/MickeyMine.java +++ b/src/main/java/baritone/mining/MickeyMine.java @@ -283,7 +283,7 @@ public class MickeyMine extends ManagerTick { ArrayList shouldBeRemoved = new ArrayList(); for (BlockPos isMined : needsToBeMined) { Block block = Baritone.get(isMined).getBlock(); - if (isGoalBlock(isMined) || block.equals(Block.getBlockById(0)) || block.equals(Block.getBlockFromName("minecraft:torch")) || block.equals(Blocks.BEDROCK)) { + if (isGoalBlock(isMined) || block.equals(Blocks.AIR) || block.equals(Block.getBlockFromName("minecraft:torch")) || block.equals(Blocks.BEDROCK)) { hasBeenMined.add(isMined); shouldBeRemoved.add(isMined); updateBlocks(isMined); @@ -300,7 +300,7 @@ public class MickeyMine extends ManagerTick { ArrayList shouldBeRemoved = new ArrayList(); for (BlockPos isMined : priorityNeedsToBeMined) { Block block = Baritone.get(isMined).getBlock(); - if (block.equals(Block.getBlockById(0)) || block.equals(Block.getBlockFromName("minecraft:torch")) || block.equals(Blocks.BEDROCK)) { + if (block.equals(Blocks.AIR) || block.equals(Block.getBlockFromName("minecraft:torch")) || block.equals(Blocks.BEDROCK)) { hasBeenMined.add(isMined); shouldBeRemoved.add(isMined); updateBlocks(isMined); diff --git a/src/main/java/baritone/pathfinding/actions/ActionBridge.java b/src/main/java/baritone/pathfinding/actions/ActionBridge.java index 9405038f..63b3ae05 100644 --- a/src/main/java/baritone/pathfinding/actions/ActionBridge.java +++ b/src/main/java/baritone/pathfinding/actions/ActionBridge.java @@ -67,7 +67,7 @@ public class ActionBridge extends ActionPlaceOrBreak { if (f instanceof BlockLadder || f instanceof BlockVine) { return COST_INF; } - if (blocksToPlace[0].equals(Block.getBlockById(0)) || (!isWater(blocksToPlace[0]) && blocksToPlace[0].isReplaceable(Minecraft.getMinecraft().world, positionsToPlace[0]))) { + if (blocksToPlace[0].equals(Blocks.AIR) || (!isWater(blocksToPlace[0]) && blocksToPlace[0].isReplaceable(Minecraft.getMinecraft().world, positionsToPlace[0]))) { for (BlockPos against1 : against) { if (Baritone.isBlockNormalCube(against1)) { return WC + PLACE_ONE_BLOCK_COST + getTotalHardnessOfBlocksToBreak(ts); diff --git a/src/main/java/baritone/pathfinding/actions/ActionPlaceOrBreak.java b/src/main/java/baritone/pathfinding/actions/ActionPlaceOrBreak.java index 4b86929e..0df72fdc 100644 --- a/src/main/java/baritone/pathfinding/actions/ActionPlaceOrBreak.java +++ b/src/main/java/baritone/pathfinding/actions/ActionPlaceOrBreak.java @@ -89,7 +89,7 @@ public abstract class ActionPlaceOrBreak extends Action { } public static double getHardness(ToolSet ts, IBlockState block, BlockPos position) { - if (!block.equals(Block.getBlockById(0)) && !canWalkThrough(position)) { + if (!block.equals(Blocks.AIR) && !canWalkThrough(position)) { if (avoidBreaking(position)) { return COST_INF; } diff --git a/src/main/java/baritone/schematic/SchematicBuilder.java b/src/main/java/baritone/schematic/SchematicBuilder.java index 8ecba403..d35ba837 100644 --- a/src/main/java/baritone/schematic/SchematicBuilder.java +++ b/src/main/java/baritone/schematic/SchematicBuilder.java @@ -47,7 +47,7 @@ public class SchematicBuilder { public HashSet getAllBlocksToPlaceShiftedUp() { HashSet toPlace = new HashSet<>(); - Block air = Block.getBlockById(0); + Block air = Blocks.AIR; for (int y = 0; y < schematic.getHeight(); y++) { for (int x = 0; x < schematic.getWidth(); x++) { for (int z = 0; z < schematic.getLength(); z++) { diff --git a/src/main/java/baritone/util/Memory.java b/src/main/java/baritone/util/Memory.java index f1c612b9..c3a16bfc 100644 --- a/src/main/java/baritone/util/Memory.java +++ b/src/main/java/baritone/util/Memory.java @@ -151,7 +151,7 @@ public class Memory extends Manager { @Override public void onTick() { if (air == null) { - air = Block.getBlockById(0); + air = Blocks.AIR; } playersCurrentlyInRange.clear(); for (EntityPlayer pl : Minecraft.getMinecraft().world.playerEntities) {