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

Merge #947 ("Aim while blocking" checkbox) from TejasLamba2006/aimassist

Browse Source
This commit is contained in:
Alexander01998 2024-04-26 15:56:15 +02:00 committed by GitHub
commit 1d0e2b078e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,6 +48,11 @@ 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 aimWhileBlocking = new CheckboxSetting(
"Aim while blocking", "Keeps aiming at entities while you're blocking"
+ " with a shield or using items.",
false);
private final EntityFilterList entityFilters =
new EntityFilterList(FilterPlayersSetting.genericCombat(false),
FilterSleepingSetting.genericCombat(false),
@ -90,6 +95,7 @@ public final class AimAssistHack extends Hack
addSetting(rotationSpeed);
addSetting(fov);
addSetting(checkLOS);
addSetting(aimWhileBlocking);
entityFilters.forEach(this::addSetting);
}
@ -123,10 +129,15 @@ public final class AimAssistHack extends Hack
@Override
public void onUpdate()
{
target = null;
// don't aim when a container/inventory screen is open
if(MC.currentScreen instanceof HandledScreen)
return;
if(!aimWhileBlocking.isChecked() && MC.player.isUsingItem())
return;
Stream<Entity> stream = EntityUtils.getAttackableEntities();
double rangeSq = Math.pow(range.getValue(), 2);
stream = stream.filter(e -> MC.player.squaredDistanceTo(e) <= rangeSq);

12
src/main/java/net/wurstclient/hacks/TriggerBotHack.java
View File

@ -38,10 +38,11 @@ public final class TriggerBotHack extends Hack implements UpdateListener
"How TriggerBot should swing your hand when attacking.",
SwingHand.CLIENT);
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 attackWhileBlocking =
new CheckboxSetting("Attack while blocking",
"Attacks even while you're blocking with a shield or using items."
+ " This would not be possible in vanilla.",
false);
private final EntityFilterList entityFilters =
EntityFilterList.genericCombat();
@ -55,6 +56,7 @@ public final class TriggerBotHack extends Hack implements UpdateListener
addSetting(speed);
addSetting(swingHand);
addSetting(attackWhileBlocking);
entityFilters.forEach(this::addSetting);
}
@ -93,7 +95,7 @@ public final class TriggerBotHack extends Hack implements UpdateListener
return;
ClientPlayerEntity player = MC.player;
if(player.isUsingItem() && !attackWhileBlocking.isChecked())
if(!attackWhileBlocking.isChecked() && player.isUsingItem())
return;
if(MC.crosshairTarget == null