mirror/Wurst7
0
0
Fork 0
mirror of https://github.com/Wurst-Imperium/Wurst7.git synced 2024-09-20 01:12:13 +02:00
Code

add attackWhileBlocking and attackWhileBreaking to AimAssist

Browse Source
This commit is contained in:
Tejas Lamba 2024-02-06 23:27:26 +05:30 committed by GitHub
parent 0c6c982e9a
commit 10eaff7369
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/net/wurstclient/hacks/AimAssistHack.java
View File

@ -11,6 +11,7 @@ import java.util.Comparator;
import java.util.stream.Stream;
import net.minecraft.client.gui.screen.ingame.HandledScreen;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.entity.Entity;
import net.minecraft.util.math.Box;
@ -48,9 +49,14 @@ public final class AimAssistHack extends Hack
private final CheckboxSetting checkLOS = new CheckboxSetting(
"Check line of sight", "Won't aim at entities behind blocks.", true);
private final CheckboxSetting onlyAllowWhileClicking =
new CheckboxSetting("Only allow while clicking",
"Won't aim at entities while not clicking.", false);
private final CheckboxSetting attackWhileBlocking = new CheckboxSetting(
"Attack while blocking",
"Whether or not to attack while blocking with a shield / using items.",
false);
private final CheckboxSetting attackWhileBreaking =
new CheckboxSetting("Attack while breaking",
"Whether or not to attack while breaking blocks.", false);
private final EntityFilterList entityFilters =
new EntityFilterList(FilterPlayersSetting.genericCombat(false),
@ -94,7 +100,8 @@ public final class AimAssistHack extends Hack
addSetting(rotationSpeed);
addSetting(fov);
addSetting(checkLOS);
addSetting(onlyAllowWhileClicking);
addSetting(attackWhileBlocking);
addSetting(attackWhileBreaking);
entityFilters.forEach(this::addSetting);
}
@ -132,12 +139,14 @@ public final class AimAssistHack extends Hack
if(MC.currentScreen instanceof HandledScreen)
return;
if(onlyAllowWhileClicking.isChecked()
&& !MC.options.attackKey.isPressed())
{
ClientPlayerEntity player = MC.player;
if(player.isUsingItem() && !attackWhileBlocking.isChecked())
return;
// isUsingItem() doesnt work if we are breaking blocks make another
// method to check if we are breaking blocks
if(MC.interactionManager.isBreakingBlock()
&& !attackWhileBreaking.isChecked())
return;
}
Stream<Entity> stream = EntityUtils.getAttackableEntities();
double rangeSq = Math.pow(range.getValue(), 2);
stream = stream.filter(e -> MC.player.squaredDistanceTo(e) <= rangeSq);
@ -192,12 +201,14 @@ public final class AimAssistHack extends Hack
{
if(target == null)
return;
if(onlyAllowWhileClicking.isChecked()
&& !MC.options.attackKey.isPressed())
{
ClientPlayerEntity player = MC.player;
if(player.isUsingItem() && !attackWhileBlocking.isChecked())
return;
}
// Not actually rendering anything, just using this method to rotate
if(MC.interactionManager.isBreakingBlock()
&& !attackWhileBreaking.isChecked())
return;
// more smoothly.
float oldYaw = MC.player.prevYaw;
float oldPitch = MC.player.prevPitch;