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

Add end crystal filter to MultiAuraHack

This commit is contained in:
Alexander01998 2020-08-26 21:21:02 +02:00
parent 126117b83b
commit 256626f40e

View File

@ -17,6 +17,7 @@ import net.minecraft.client.world.ClientWorld;
import net.minecraft.entity.Entity;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.decoration.ArmorStandEntity;
import net.minecraft.entity.decoration.EndCrystalEntity;
import net.minecraft.entity.mob.AmbientEntity;
import net.minecraft.entity.mob.EndermanEntity;
import net.minecraft.entity.mob.Monster;
@ -97,8 +98,11 @@ public final class MultiAuraHack extends Hack implements UpdateListener
private final CheckboxSetting filterInvisible = new CheckboxSetting(
"Filter invisible", "Won't attack invisible entities.", false);
private final CheckboxSetting filterStands = new CheckboxSetting(
"Filter armor stands", "Won't attack armor stands.", false);
private final CheckboxSetting filterCrystals = new CheckboxSetting(
"Filter end crytsals", "Won't attack end crystals.", false);
private int timer;
@ -125,6 +129,7 @@ public final class MultiAuraHack extends Hack implements UpdateListener
addSetting(filterGolems);
addSetting(filterInvisible);
addSetting(filterStands);
addSetting(filterCrystals);
}
@Override
@ -165,14 +170,16 @@ public final class MultiAuraHack extends Hack implements UpdateListener
// get entities
double rangeSq = Math.pow(range.getValue(), 2);
Stream<LivingEntity> stream = StreamSupport
.stream(world.getEntities().spliterator(), true)
.filter(e -> e instanceof LivingEntity).map(e -> (LivingEntity)e)
.filter(e -> !e.removed && e.getHealth() > 0)
.filter(e -> player.squaredDistanceTo(e) <= rangeSq)
.filter(e -> e != player)
.filter(e -> !(e instanceof FakePlayerEntity))
.filter(e -> !WURST.getFriends().contains(e.getEntityName()));
Stream<Entity> stream =
StreamSupport.stream(world.getEntities().spliterator(), true)
.filter(e -> !e.removed)
.filter(e -> e instanceof LivingEntity
&& ((LivingEntity)e).getHealth() > 0
|| e instanceof EndCrystalEntity)
.filter(e -> player.squaredDistanceTo(e) <= rangeSq)
.filter(e -> e != player)
.filter(e -> !(e instanceof FakePlayerEntity))
.filter(e -> !WURST.getFriends().contains(e.getEntityName()));
if(filterPlayers.isChecked())
stream = stream.filter(e -> !(e instanceof PlayerEntity));
@ -229,6 +236,9 @@ public final class MultiAuraHack extends Hack implements UpdateListener
if(filterStands.isChecked())
stream = stream.filter(e -> !(e instanceof ArmorStandEntity));
if(filterCrystals.isChecked())
stream = stream.filter(e -> !(e instanceof EndCrystalEntity));
ArrayList<Entity> entities =
stream.collect(Collectors.toCollection(() -> new ArrayList<>()));
if(entities.isEmpty())