leafspark
/
raven-bs-v2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed killaura fake noslow bug, scaffold rotation edits, noslow fix

This commit is contained in:
jackh 2025-01-14 11:20:06 -07:00
parent 1fd84df7a7
commit 88dda079c0
4 changed files with 48 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/keystrokesmod/module/impl/combat/KillAura.java
View File

@ -184,13 +184,13 @@ public class KillAura extends Module {
if (blinkAutoBlock()) { if (blinkAutoBlock()) {
EntityLivingBase g = Utils.raytrace(3); 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); canUse = Mouse.isButtonDown(1);
} }
else if (canUse) { else if (canUse) {
KeyBinding.setKeyBindState(mc.gameSettings.keyBindUseItem.getKeyCode(), false); KeyBinding.setKeyBindState(mc.gameSettings.keyBindUseItem.getKeyCode(), false);
canUse = false; canUse = false;
} }*/
if (Utils.holdingSword()) { if (Utils.holdingSword()) {
if (Mouse.isButtonDown(1) && Utils.tabbedIn()) { if (Mouse.isButtonDown(1) && Utils.tabbedIn()) {
Reflection.setItemInUse(this.blockingClient = true); Reflection.setItemInUse(this.blockingClient = true);
@ -200,18 +200,17 @@ public class KillAura extends Module {
Reflection.setItemInUse(this.blockingClient = false); Reflection.setItemInUse(this.blockingClient = false);
canBlockServerside = 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 (usedWhileTargeting) {
if (!Utils.holdingSword()) KeyBinding.setKeyBindState(mc.gameSettings.keyBindUseItem.getKeyCode(), Mouse.isButtonDown(1)); if (!Utils.holdingSword()) KeyBinding.setKeyBindState(mc.gameSettings.keyBindUseItem.getKeyCode(), Mouse.isButtonDown(1));
usedWhileTargeting = false; usedWhileTargeting = false;
} }
} }
else {
KeyBinding.setKeyBindState(mc.gameSettings.keyBindUseItem.getKeyCode(), false);
usedWhileTargeting = Mouse.isButtonDown(1);
canBlockServerside = false;
}
} }
if (mc.currentScreen == null || mc.currentScreen.allowUserInput) { if (mc.currentScreen == null || mc.currentScreen.allowUserInput) {
@ -890,9 +889,9 @@ public class KillAura extends Module {
break; break;
case 3: case 3:
++firstEdge; ++firstEdge;
if (firstEdge > 1) { if (firstEdge > 2) {
firstCycle = true; firstCycle = true;
if (firstEdge > 5) { if (firstEdge > 6) {
firstEdge = 0; firstEdge = 0;
} }
} }

6
src/main/java/keystrokesmod/module/impl/movement/NoSlow.java
View File

@ -106,6 +106,9 @@ public class NoSlow extends Module {
return; return;
} }
postPlace = false; 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()))) { if (!Mouse.isButtonDown(1) || (mc.thePlayer.getHeldItem() == null || !holdingConsumable(mc.thePlayer.getHeldItem()))) {
resetFloat(); resetFloat();
noSlowing = false; noSlowing = false;
@ -115,7 +118,8 @@ public class NoSlow extends Module {
if (reSendConsume) { if (reSendConsume) {
if (!mc.thePlayer.onGround) { if (!mc.thePlayer.onGround) {
if (ModuleUtils.inAirTicks > 1) { 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; canFloat = true;
reSendConsume = false; reSendConsume = false;
} }

41
src/main/java/keystrokesmod/module/impl/player/Scaffold.java
View File

@ -72,6 +72,7 @@ public class Scaffold extends Module {
private boolean modifyPitch; private boolean modifyPitch;
private boolean flipRotation; private boolean flipRotation;
private long lastSwap, lastSwap2; private long lastSwap, lastSwap2;
private boolean didFlip;
private boolean floatJumped; private boolean floatJumped;
private boolean floatStarted; private boolean floatStarted;
@ -233,12 +234,19 @@ public class Scaffold extends Module {
float yawBackwards = MathHelper.wrapAngleTo180_float(mc.thePlayer.rotationYaw) - hardcodedYaw(); float yawBackwards = MathHelper.wrapAngleTo180_float(mc.thePlayer.rotationYaw) - hardcodedYaw();
float main = MathHelper.wrapAngleTo180_float(getMotionYaw() - yaw); float main = MathHelper.wrapAngleTo180_float(getMotionYaw() - yaw);
float mainOffset = MathHelper.wrapAngleTo180_float(yawBackwards - lastBlockYaw); float mainOffset = MathHelper.wrapAngleTo180_float(yawBackwards - lastBlockYaw);
float rawOffset = MathHelper.wrapAngleTo180_float(yawBackwards - lastBlockYaw);
float mainOffset2 = MathHelper.wrapAngleTo180_float(yawBackwards - lastBlockYaw); float mainOffset2 = MathHelper.wrapAngleTo180_float(yawBackwards - lastBlockYaw);
rotOffset = (!Utils.scaffoldDiagonal(false)) ? 132F : 140F; rotOffset = (!Utils.scaffoldDiagonal(false)) ? 134.475F : 140.625F;
float minOffset = (!Utils.scaffoldDiagonal(false)) ? 40 : 15; float minOffset = (!Utils.scaffoldDiagonal(false)) ? 35 : 5;
if (blockRotations != null) { if (blockRotations != null) {
e.setYaw(blockRotations[0]); e.setYaw(blockRotations[0]);
e.setPitch(blockRotations[1]); e.setPitch(blockRotations[1]);
if (rotation.getInput() == 2) { if (rotation.getInput() == 2) {
lastBlockYaw = blockRotations[0]; lastBlockYaw = blockRotations[0];
if (!flipRotation) { if (!flipRotation) {
@ -277,15 +285,25 @@ public class Scaffold extends Module {
} }
} }
if (System.currentTimeMillis() - lastSwap > 300) { //if (System.currentTimeMillis() - lastSwap >= 0) {
if (main >= 0 && mainOffset >= 0 || main <= -0 && mainOffset <= -0) { //Utils.print("" + rawOffset);
flipRotation = true; double minFlip = (!Utils.scaffoldDiagonal(false)) ? 7 : 14;
} else { if (!didFlip) {
flipRotation = false; 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); //Utils.print("flip " + mainOffset);
} //}
if (!flipRotation) { if (!flipRotation) {
e.setYaw(e.getYaw() - mainOffset); e.setYaw(e.getYaw() - mainOffset);
@ -317,6 +335,11 @@ public class Scaffold extends Module {
}*/ }*/
e.setYaw(offsetRotation()); e.setYaw(offsetRotation());
} }
else { else {
e.setYaw(MathHelper.wrapAngleTo180_float(mc.thePlayer.rotationYaw) - hardcodedYaw()); e.setYaw(MathHelper.wrapAngleTo180_float(mc.thePlayer.rotationYaw) - hardcodedYaw());
} }

4
src/main/java/keystrokesmod/utility/ModuleUtils.java
View File

@ -40,7 +40,7 @@ public class ModuleUtils {
public static boolean isBreaking; public static boolean isBreaking;
public static boolean threwFireball; public static boolean threwFireball;
private int isBreakingTick; 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; private long FIREBALL_TIMEOUT = 750L, fireballTime = 0;
public static int inAirTicks; public static int inAirTicks;
@ -140,7 +140,7 @@ public class ModuleUtils {
@SubscribeEvent(priority = EventPriority.HIGHEST) @SubscribeEvent(priority = EventPriority.HIGHEST)
public void onRenderWorld(RenderWorldLastEvent e) { 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; return;
} }
Iterator<Map.Entry<BlockPos, Timer>> iterator = ModuleManager.scaffold.highlight.entrySet().iterator(); Iterator<Map.Entry<BlockPos, Timer>> iterator = ModuleManager.scaffold.highlight.entrySet().iterator();