RepoMirrors
/
seppuku
mirror of https://github.com/seppukudevelopment/seppuku
1
1
Fork 1
Code Issues Releases Wiki Activity

NoCrystal: Fix file tags, shorten things, add comment to speed check, 

place() checks if block is valid
This commit is contained in:
jvyden420 2019-12-10 16:41:39 -05:00
parent 23c52ebc59
commit 1db48cc015
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/me/rigamortis/seppuku/impl/module/combat/NoCrystalModule.java
View File

@ -23,8 +23,8 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import team.stiff.pomelo.impl.annotated.handler.annotation.Listener;
/**
* Author Seth
* 5/15/2019 @ 9:20 AM.
* @author Seth
* @since 5/15/2019 @ 9:20 AM.
*/
public final class NoCrystalModule extends Module {
@ -57,11 +57,9 @@ public final class NoCrystalModule extends Module {
final boolean instant = placeDelay.getValue() == 0;
if (this.placeTimer.passed(this.placeDelay.getValue()) || instant) {
if (event.getStage() == EventStageable.EventStage.PRE) {
final FreeCamModule freeCam = (FreeCamModule) Seppuku.INSTANCE.getModuleManager().find(FreeCamModule.class);
if (freeCam != null && freeCam.isEnabled()) {
return;
}
final FreeCamModule freeCam = (FreeCamModule) Seppuku.INSTANCE.getModuleManager().find(FreeCamModule.class);
if (freeCam != null && freeCam.isEnabled()) return;
final Vec3d pos = MathUtil.interpolateEntity(mc.player, mc.getRenderPartialTicks());
final float playerSpeed = (float) MathUtil.getDistance(pos, mc.player.posX, mc.player.posY, mc.player.posZ);
@ -79,13 +77,14 @@ public final class NoCrystalModule extends Module {
int lastSlot = 0;
final int slot = findStackHotbar(Blocks.OBSIDIAN);
if (slot != -1) {
// 0.005f: Absolute minimum velocity to register as standing still.
// Don't ask me why, I'm just a comment.
if ((mc.player.onGround && playerSpeed <= 0.005f) && (this.sneak.getValue() || (!mc.gameSettings.keyBindSneak.isKeyDown()))) {
lastSlot = mc.player.inventory.currentItem;
mc.player.inventory.currentItem = slot;
mc.playerController.updateController();
if (valid(surroundBlocks[placeIndex]))
place(surroundBlocks[placeIndex]);
place(surroundBlocks[placeIndex]);
if (!instant) this.placeTimer.reset();
if (placeIndex >= surroundBlocks.length - 1) {
@ -93,9 +92,7 @@ public final class NoCrystalModule extends Module {
if (this.disable.getValue()) this.toggle();
} else placeIndex++;
}
if (!slotEqualsBlock(lastSlot, Blocks.OBSIDIAN)) {
mc.player.inventory.currentItem = lastSlot;
}
if (!slotEqualsBlock(lastSlot, Blocks.OBSIDIAN)) mc.player.inventory.currentItem = lastSlot;
mc.playerController.updateController();
}
}
@ -129,6 +126,8 @@ public final class NoCrystalModule extends Module {
final EnumFacing direction = calcSide(pos);
final boolean activated = block.onBlockActivated(mc.world, pos, mc.world.getBlockState(pos), mc.player, EnumHand.MAIN_HAND, direction, 0, 0, 0);
if (!valid(pos)) return;
if (activated)
mc.player.connection.sendPacket(new CPacketEntityAction(mc.player, CPacketEntityAction.Action.START_SNEAKING));
if (direction != null) {