caskd
/
seppuku
forked from RepoMirrors/seppuku
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve scaffold logic

This commit is contained in:
Alex 2020-05-02 22:05:36 +02:00
parent 1b0ab1a28f
commit ebdbe7e44f
Signed by: caskd
GPG Key ID: F92BA85F61F4C173
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/me/rigamortis/seppuku/impl/module/movement/ScaffoldModule.java
View File

@ -83,7 +83,7 @@ public final class ScaffoldModule extends Module {
} }
} }
if ((mc.player.movementInput.moveForward != 0 || mc.player.movementInput.moveStrafe != 0)) { if ((mc.player.movementInput.moveForward != 0 || mc.player.movementInput.moveStrafe != 0 || mc.player.movementInput.jump) && !mc.player.movementInput.sneak) {
final double[] dir = MathUtil.directionSpeed(1); final double[] dir = MathUtil.directionSpeed(1);
if (mc.player.getHeldItemMainhand().getItem() != Items.AIR && mc.player.getHeldItemMainhand().getItem() instanceof ItemBlock && canPlace(mc.player.getHeldItemMainhand())) { if (mc.player.getHeldItemMainhand().getItem() != Items.AIR && mc.player.getHeldItemMainhand().getItem() instanceof ItemBlock && canPlace(mc.player.getHeldItemMainhand())) {
@ -280,17 +280,17 @@ public final class ScaffoldModule extends Module {
} }
private Vec3d getFirstBlock(double[] dir) { private Vec3d getFirstBlock(double[] dir) {
for (int i = 0; i <= ((int) 4.5f); i++) { final Minecraft mc = Minecraft.getMinecraft();
Vec3d pos = new Vec3d(Minecraft.getMinecraft().player.posX + -dir[0] * i, Minecraft.getMinecraft().player.posY - 1, Minecraft.getMinecraft().player.posZ + -dir[1] * i); Vec3d pos = new Vec3d(mc.player.posX, mc.player.posY - 1, mc.player.posZ);
Vec3d before = new Vec3d(Minecraft.getMinecraft().player.posX + -dir[0] * (i - 1), Minecraft.getMinecraft().player.posY - 1, Minecraft.getMinecraft().player.posZ + -dir[1] * (i - 1)); Vec3d dirpos = new Vec3d(mc.player.posX + dir[0], mc.player.posY - 1, mc.player.posZ + dir[1]);
if (mc.world.getBlockState(new BlockPos(pos.x, pos.y, pos.z)).getBlock() == Blocks.AIR)
final Block firstBlock = Minecraft.getMinecraft().world.getBlockState(new BlockPos(before.x, before.y, before.z)).getBlock(); return pos;
final Block secondBlock = Minecraft.getMinecraft().world.getBlockState(new BlockPos(before.x, before.y, before.z)).getBlock(); if (mc.world.getBlockState(new BlockPos(dirpos.x, dirpos.y, dirpos.z)).getBlock() == Blocks.AIR)
if (mc.world.getBlockState(new BlockPos(pos.x, dirpos.y, dirpos.z)).getBlock() == Blocks.AIR && mc.world.getBlockState(new BlockPos(dirpos.x, dirpos.y, pos.z)).getBlock() == Blocks.AIR) {
if ((firstBlock != Blocks.AIR) || !(firstBlock instanceof BlockLiquid) && (secondBlock == Blocks.AIR) || (secondBlock instanceof BlockLiquid)) { return new Vec3d(dirpos.x, pos.y, pos.z);
return before; } else {
return dirpos;
} }
}
return null; return null;
} }
@ -306,4 +306,4 @@ public final class ScaffoldModule extends Module {
return block != Blocks.AIR; return block != Blocks.AIR;
} }
} }