fixed killaura fake noslow bug, scaffold rotation edits, noslow fix
This commit is contained in:
parent
1fd84df7a7
commit
88dda079c0
|
|
@ -184,13 +184,13 @@ public class KillAura extends Module {
|
|||
|
||||
if (blinkAutoBlock()) {
|
||||
EntityLivingBase g = Utils.raytrace(3);
|
||||
if ((g != null || BlockUtils.isInteractable(mc.objectMouseOver)) && Utils.holdingSword()) {
|
||||
/*if ((g != null || BlockUtils.isInteractable(mc.objectMouseOver)) && Utils.holdingSword()) {
|
||||
canUse = Mouse.isButtonDown(1);
|
||||
}
|
||||
else if (canUse) {
|
||||
KeyBinding.setKeyBindState(mc.gameSettings.keyBindUseItem.getKeyCode(), false);
|
||||
canUse = false;
|
||||
}
|
||||
}*/
|
||||
if (Utils.holdingSword()) {
|
||||
if (Mouse.isButtonDown(1) && Utils.tabbedIn()) {
|
||||
Reflection.setItemInUse(this.blockingClient = true);
|
||||
|
|
@ -200,18 +200,17 @@ public class KillAura extends Module {
|
|||
Reflection.setItemInUse(this.blockingClient = false);
|
||||
canBlockServerside = false;
|
||||
}
|
||||
if (g == null && !BlockUtils.isInteractable(mc.objectMouseOver) || target != null) {
|
||||
KeyBinding.setKeyBindState(mc.gameSettings.keyBindUseItem.getKeyCode(), false);
|
||||
}
|
||||
usedWhileTargeting = Mouse.isButtonDown(1);
|
||||
}
|
||||
if (target == null) {
|
||||
else {
|
||||
if (usedWhileTargeting) {
|
||||
if (!Utils.holdingSword()) KeyBinding.setKeyBindState(mc.gameSettings.keyBindUseItem.getKeyCode(), Mouse.isButtonDown(1));
|
||||
usedWhileTargeting = false;
|
||||
}
|
||||
}
|
||||
else {
|
||||
KeyBinding.setKeyBindState(mc.gameSettings.keyBindUseItem.getKeyCode(), false);
|
||||
usedWhileTargeting = Mouse.isButtonDown(1);
|
||||
canBlockServerside = false;
|
||||
}
|
||||
}
|
||||
|
||||
if (mc.currentScreen == null || mc.currentScreen.allowUserInput) {
|
||||
|
|
@ -890,9 +889,9 @@ public class KillAura extends Module {
|
|||
break;
|
||||
case 3:
|
||||
++firstEdge;
|
||||
if (firstEdge > 1) {
|
||||
if (firstEdge > 2) {
|
||||
firstCycle = true;
|
||||
if (firstEdge > 5) {
|
||||
if (firstEdge > 6) {
|
||||
firstEdge = 0;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -106,6 +106,9 @@ public class NoSlow extends Module {
|
|||
return;
|
||||
}
|
||||
postPlace = false;
|
||||
if (mc.thePlayer.getHeldItem() != null && holdingConsumable(mc.thePlayer.getHeldItem()) && !Mouse.isButtonDown(1)) {
|
||||
KeyBinding.setKeyBindState(mc.gameSettings.keyBindUseItem.getKeyCode(), false);
|
||||
}
|
||||
if (!Mouse.isButtonDown(1) || (mc.thePlayer.getHeldItem() == null || !holdingConsumable(mc.thePlayer.getHeldItem()))) {
|
||||
resetFloat();
|
||||
noSlowing = false;
|
||||
|
|
@ -115,7 +118,8 @@ public class NoSlow extends Module {
|
|||
if (reSendConsume) {
|
||||
if (!mc.thePlayer.onGround) {
|
||||
if (ModuleUtils.inAirTicks > 1) {
|
||||
mc.playerController.sendUseItem(mc.thePlayer, mc.theWorld, mc.thePlayer.getHeldItem());
|
||||
//mc.playerController.sendUseItem(mc.thePlayer, mc.theWorld, mc.thePlayer.getHeldItem());
|
||||
mc.getNetHandler().addToSendQueue(new C08PacketPlayerBlockPlacement(mc.thePlayer.getHeldItem()));
|
||||
canFloat = true;
|
||||
reSendConsume = false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72,6 +72,7 @@ public class Scaffold extends Module {
|
|||
private boolean modifyPitch;
|
||||
private boolean flipRotation;
|
||||
private long lastSwap, lastSwap2;
|
||||
private boolean didFlip;
|
||||
|
||||
private boolean floatJumped;
|
||||
private boolean floatStarted;
|
||||
|
|
@ -233,12 +234,19 @@ public class Scaffold extends Module {
|
|||
float yawBackwards = MathHelper.wrapAngleTo180_float(mc.thePlayer.rotationYaw) - hardcodedYaw();
|
||||
float main = MathHelper.wrapAngleTo180_float(getMotionYaw() - yaw);
|
||||
float mainOffset = MathHelper.wrapAngleTo180_float(yawBackwards - lastBlockYaw);
|
||||
float rawOffset = MathHelper.wrapAngleTo180_float(yawBackwards - lastBlockYaw);
|
||||
float mainOffset2 = MathHelper.wrapAngleTo180_float(yawBackwards - lastBlockYaw);
|
||||
rotOffset = (!Utils.scaffoldDiagonal(false)) ? 132F : 140F;
|
||||
float minOffset = (!Utils.scaffoldDiagonal(false)) ? 40 : 15;
|
||||
rotOffset = (!Utils.scaffoldDiagonal(false)) ? 134.475F : 140.625F;
|
||||
float minOffset = (!Utils.scaffoldDiagonal(false)) ? 35 : 5;
|
||||
if (blockRotations != null) {
|
||||
e.setYaw(blockRotations[0]);
|
||||
e.setPitch(blockRotations[1]);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if (rotation.getInput() == 2) {
|
||||
lastBlockYaw = blockRotations[0];
|
||||
if (!flipRotation) {
|
||||
|
|
@ -277,15 +285,25 @@ public class Scaffold extends Module {
|
|||
}
|
||||
}
|
||||
|
||||
if (System.currentTimeMillis() - lastSwap > 300) {
|
||||
if (main >= 0 && mainOffset >= 0 || main <= -0 && mainOffset <= -0) {
|
||||
flipRotation = true;
|
||||
} else {
|
||||
flipRotation = false;
|
||||
//if (System.currentTimeMillis() - lastSwap >= 0) {
|
||||
//Utils.print("" + rawOffset);
|
||||
double minFlip = (!Utils.scaffoldDiagonal(false)) ? 7 : 14;
|
||||
if (!didFlip) {
|
||||
if ((main >= 0 && rawOffset >= 0 || main <= -0 && rawOffset <= -0)) {
|
||||
didFlip = true;
|
||||
flipRotation = true;
|
||||
}
|
||||
else {
|
||||
didFlip = true;
|
||||
flipRotation = false;
|
||||
}
|
||||
}
|
||||
lastSwap = System.currentTimeMillis();
|
||||
else if ((main >= 0 && rawOffset >= minFlip || main >= 0 && rawOffset <= -minFlip || main <= -0 && rawOffset <= -minFlip || main <= -0 && rawOffset >= minFlip)) {
|
||||
didFlip = false;
|
||||
}
|
||||
//lastSwap = System.currentTimeMillis();
|
||||
//Utils.print("flip " + mainOffset);
|
||||
}
|
||||
//}
|
||||
|
||||
if (!flipRotation) {
|
||||
e.setYaw(e.getYaw() - mainOffset);
|
||||
|
|
@ -317,6 +335,11 @@ public class Scaffold extends Module {
|
|||
}*/
|
||||
e.setYaw(offsetRotation());
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
else {
|
||||
e.setYaw(MathHelper.wrapAngleTo180_float(mc.thePlayer.rotationYaw) - hardcodedYaw());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ public class ModuleUtils {
|
|||
public static boolean isBreaking;
|
||||
public static boolean threwFireball;
|
||||
private int isBreakingTick;
|
||||
public static long MAX_EXPLOSION_DIST_SQ = 9;
|
||||
public static long MAX_EXPLOSION_DIST_SQ = 10;
|
||||
private long FIREBALL_TIMEOUT = 750L, fireballTime = 0;
|
||||
public static int inAirTicks;
|
||||
|
||||
|
|
@ -140,7 +140,7 @@ public class ModuleUtils {
|
|||
|
||||
@SubscribeEvent(priority = EventPriority.HIGHEST)
|
||||
public void onRenderWorld(RenderWorldLastEvent e) {
|
||||
if (!Utils.nullCheck() || !ModuleManager.scaffold.highlightBlocks.isToggled() || ModuleManager.scaffold.highlight.isEmpty()) {
|
||||
if (!Utils.nullCheck() || !ModuleManager.scaffold.highlightBlocks.isToggled() || ModuleManager.scaffold.highlight.isEmpty() || !ModuleManager.scaffold.isEnabled) {
|
||||
return;
|
||||
}
|
||||
Iterator<Map.Entry<BlockPos, Timer>> iterator = ModuleManager.scaffold.highlight.entrySet().iterator();
|
||||
|
|
|
|||
Loading…
Reference in New Issue