From c4b0e0a81052a4acbffffd089f39781f87bac1ed Mon Sep 17 00:00:00 2001 From: Leijurv Date: Sat, 27 Oct 2018 16:18:03 -0700 Subject: [PATCH] codady submission complete --- src/main/java/baritone/cache/CachedChunk.java | 70 ++++++++++--------- .../pathing/movement/CalculationContext.java | 5 +- .../pathing/movement/MovementHelper.java | 7 +- .../baritone/pathing/path/PathExecutor.java | 10 +-- 4 files changed, 42 insertions(+), 50 deletions(-) diff --git a/src/main/java/baritone/cache/CachedChunk.java b/src/main/java/baritone/cache/CachedChunk.java index 8d2188b5..6daf2c67 100644 --- a/src/main/java/baritone/cache/CachedChunk.java +++ b/src/main/java/baritone/cache/CachedChunk.java @@ -33,41 +33,45 @@ import java.util.*; */ public final class CachedChunk implements IBlockTypeAccess, Helper { - public static final Set BLOCKS_TO_KEEP_TRACK_OF = Collections.unmodifiableSet(new HashSet() {{ - add(Blocks.DIAMOND_ORE); - add(Blocks.DIAMOND_BLOCK); - //add(Blocks.COAL_ORE); - add(Blocks.COAL_BLOCK); - //add(Blocks.IRON_ORE); - add(Blocks.IRON_BLOCK); - //add(Blocks.GOLD_ORE); - add(Blocks.GOLD_BLOCK); - add(Blocks.EMERALD_ORE); - add(Blocks.EMERALD_BLOCK); + public static final Set BLOCKS_TO_KEEP_TRACK_OF; - add(Blocks.ENDER_CHEST); - add(Blocks.FURNACE); - add(Blocks.CHEST); - add(Blocks.TRAPPED_CHEST); - add(Blocks.END_PORTAL); - add(Blocks.END_PORTAL_FRAME); - add(Blocks.MOB_SPAWNER); + static { + HashSet temp = new HashSet<>(); + temp.add(Blocks.DIAMOND_ORE); + temp.add(Blocks.DIAMOND_BLOCK); + //temp.add(Blocks.COAL_ORE); + temp.add(Blocks.COAL_BLOCK); + //temp.add(Blocks.IRON_ORE); + temp.add(Blocks.IRON_BLOCK); + //temp.add(Blocks.GOLD_ORE); + temp.add(Blocks.GOLD_BLOCK); + temp.add(Blocks.EMERALD_ORE); + temp.add(Blocks.EMERALD_BLOCK); + + temp.add(Blocks.ENDER_CHEST); + temp.add(Blocks.FURNACE); + temp.add(Blocks.CHEST); + temp.add(Blocks.TRAPPED_CHEST); + temp.add(Blocks.END_PORTAL); + temp.add(Blocks.END_PORTAL_FRAME); + temp.add(Blocks.MOB_SPAWNER); // TODO add all shulker colors - add(Blocks.PORTAL); - add(Blocks.HOPPER); - add(Blocks.BEACON); - add(Blocks.BREWING_STAND); - add(Blocks.SKULL); - add(Blocks.ENCHANTING_TABLE); - add(Blocks.ANVIL); - add(Blocks.LIT_FURNACE); - add(Blocks.BED); - add(Blocks.DRAGON_EGG); - add(Blocks.JUKEBOX); - add(Blocks.END_GATEWAY); - add(Blocks.WEB); - add(Blocks.NETHER_WART); - }}); + temp.add(Blocks.PORTAL); + temp.add(Blocks.HOPPER); + temp.add(Blocks.BEACON); + temp.add(Blocks.BREWING_STAND); + temp.add(Blocks.SKULL); + temp.add(Blocks.ENCHANTING_TABLE); + temp.add(Blocks.ANVIL); + temp.add(Blocks.LIT_FURNACE); + temp.add(Blocks.BED); + temp.add(Blocks.DRAGON_EGG); + temp.add(Blocks.JUKEBOX); + temp.add(Blocks.END_GATEWAY); + temp.add(Blocks.WEB); + temp.add(Blocks.NETHER_WART); + BLOCKS_TO_KEEP_TRACK_OF = Collections.unmodifiableSet(temp); + } /** * The size of the chunk data in bits. Equal to 16 KiB. diff --git a/src/main/java/baritone/pathing/movement/CalculationContext.java b/src/main/java/baritone/pathing/movement/CalculationContext.java index 9f08d578..00c063af 100644 --- a/src/main/java/baritone/pathing/movement/CalculationContext.java +++ b/src/main/java/baritone/pathing/movement/CalculationContext.java @@ -87,10 +87,7 @@ public class CalculationContext implements Helper { if (!allowBreak()) { return false; } - if (isPossiblyProtected(x, y, z)) { - return false; - } - return true; + return !isPossiblyProtected(x, y, z); } public boolean isPossiblyProtected(int x, int y, int z) { diff --git a/src/main/java/baritone/pathing/movement/MovementHelper.java b/src/main/java/baritone/pathing/movement/MovementHelper.java index 9f785052..d887a714 100644 --- a/src/main/java/baritone/pathing/movement/MovementHelper.java +++ b/src/main/java/baritone/pathing/movement/MovementHelper.java @@ -226,7 +226,7 @@ public interface MovementHelper extends ActionCosts, Helper { return true; } - return facing == playerFacing == open; + return (facing == playerFacing) == open; } static boolean avoidWalkingInto(Block block) { @@ -295,10 +295,7 @@ public interface MovementHelper extends ActionCosts, Helper { } return true; } - if (block instanceof BlockStairs) { - return true; - } - return false; + return block instanceof BlockStairs; } static boolean canWalkOn(BetterBlockPos pos, IBlockState state) { diff --git a/src/main/java/baritone/pathing/path/PathExecutor.java b/src/main/java/baritone/pathing/path/PathExecutor.java index ac48a8db..e5f9c864 100644 --- a/src/main/java/baritone/pathing/path/PathExecutor.java +++ b/src/main/java/baritone/pathing/path/PathExecutor.java @@ -326,10 +326,7 @@ public class PathExecutor implements IPathExecutor, Helper { // when we're midair in the middle of a fall, we're very far from both the beginning and the end, but we aren't actually off path if (path.movements().get(pathPosition) instanceof MovementFall) { BlockPos fallDest = path.positions().get(pathPosition + 1); // .get(pathPosition) is the block we fell off of - if (VecUtils.entityFlatDistanceToCenter(player(), fallDest) < leniency) { // ignore Y by using flat distance - return false; - } - return true; + return VecUtils.entityFlatDistanceToCenter(player(), fallDest) >= leniency; // ignore Y by using flat distance } else { return true; } @@ -433,10 +430,7 @@ public class PathExecutor implements IPathExecutor, Helper { if (next instanceof MovementTraverse && next.getDirection().down().equals(current.getDirection()) && MovementHelper.canWalkOn(next.getDest().down())) { return true; } - if (next instanceof MovementDiagonal && Baritone.settings().allowOvershootDiagonalDescend.get()) { - return true; - } - return false; + return next instanceof MovementDiagonal && Baritone.settings().allowOvershootDiagonalDescend.get(); } private void onChangeInPathPosition() {