0xf8/baritone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pillar logic

Browse Source
This commit is contained in:
Leijurv 2018-08-28 13:24:34 -07:00
parent 1dc0f5c3ad
commit 4836f044ba
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/baritone/pathing/movement/movements/MovementPillar.java
View File

@ -28,7 +28,6 @@ import baritone.utils.Utils;
import net.minecraft.block.*; import net.minecraft.block.*;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityPlayerSP;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
public class MovementPillar extends Movement { public class MovementPillar extends Movement {
@ -63,6 +62,9 @@ public class MovementPillar extends Movement {
} }
} }
double hardness = getTotalHardnessOfBlocksToBreak(context); double hardness = getTotalHardnessOfBlocksToBreak(context);
if (hardness >= COST_INF) {
return COST_INF;
}
if (hardness != 0) { if (hardness != 0) {
Block tmp = BlockStateInterface.get(src.up(2)).getBlock(); Block tmp = BlockStateInterface.get(src.up(2)).getBlock();
if (tmp instanceof BlockLadder || tmp instanceof BlockVine) { if (tmp instanceof BlockLadder || tmp instanceof BlockVine) {
@ -70,12 +72,19 @@ public class MovementPillar extends Movement {
} else { } else {
BlockPos chkPos = src.up(3); BlockPos chkPos = src.up(3);
IBlockState check = BlockStateInterface.get(chkPos); IBlockState check = BlockStateInterface.get(chkPos);
if (!MovementHelper.canWalkOn(chkPos, check) || MovementHelper.canWalkThrough(chkPos, check) || check.getBlock() instanceof BlockFalling) {//if the block above where we want to break is not a full block, don't do it if (check.getBlock() instanceof BlockFalling) {
// see MovementAscend's identical check for breaking a falling block above our head
if (!(tmp instanceof BlockFalling) || !(BlockStateInterface.get(src.up(1)).getBlock() instanceof BlockFalling)) {
return COST_INF;
}
}
// this is commented because it may have had a purpose, but it's very unclear what it was. it's from the minebot era.
//if (!MovementHelper.canWalkOn(chkPos, check) || MovementHelper.canWalkThrough(chkPos, check)) {//if the block above where we want to break is not a full block, don't do it
// TODO why does canWalkThrough mean this action is COST_INF? // TODO why does canWalkThrough mean this action is COST_INF?
// BlockFalling makes sense, and !canWalkOn deals with weird cases like if it were lava // BlockFalling makes sense, and !canWalkOn deals with weird cases like if it were lava
// but I don't understand why canWalkThrough makes it impossible // but I don't understand why canWalkThrough makes it impossible
return COST_INF; // return COST_INF;
} //}
} }
} }
if (fromDown instanceof BlockLiquid || fromDownDown instanceof BlockLiquid) {//can't pillar on water or in water if (fromDown instanceof BlockLiquid || fromDownDown instanceof BlockLiquid) {//can't pillar on water or in water