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 MobEspFilterList back into MobEspHack

Browse Source
This commit is contained in:
Alexander01998 2023-10-18 23:18:08 +02:00
parent dd847ee6d2
commit a17ac45c07
2 changed files with 23 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/net/wurstclient/hacks/MobEspHack.java
View File

@ -39,7 +39,7 @@ import net.wurstclient.hack.Hack;
import net.wurstclient.settings.EspBoxSizeSetting;
import net.wurstclient.settings.EspStyleSetting;
import net.wurstclient.settings.filterlists.EntityFilterList;
import net.wurstclient.settings.filterlists.MobEspFilterList;
import net.wurstclient.settings.filters.*;
import net.wurstclient.util.EntityUtils;
import net.wurstclient.util.RegionPos;
import net.wurstclient.util.RenderUtils;
@ -55,7 +55,28 @@ public final class MobEspHack extends Hack implements UpdateListener,
"\u00a7lAccurate\u00a7r mode shows the exact hitbox of each mob.\n"
+ "\u00a7lFancy\u00a7r mode shows slightly larger boxes that look better.");
private final EntityFilterList entityFilters = MobEspFilterList.create();
private final EntityFilterList entityFilters =
new EntityFilterList(FilterHostileSetting.genericVision(false),
FilterNeutralSetting
.genericVision(AttackDetectingEntityFilter.Mode.OFF),
FilterPassiveSetting.genericVision(false),
FilterPassiveWaterSetting.genericVision(false),
FilterBatsSetting.genericVision(false),
FilterSlimesSetting.genericVision(false),
FilterPetsSetting.genericVision(false),
FilterVillagersSetting.genericVision(false),
FilterZombieVillagersSetting.genericVision(false),
FilterGolemsSetting.genericVision(false),
FilterPiglinsSetting
.genericVision(AttackDetectingEntityFilter.Mode.OFF),
FilterZombiePiglinsSetting
.genericVision(AttackDetectingEntityFilter.Mode.OFF),
FilterEndermenSetting
.genericVision(AttackDetectingEntityFilter.Mode.OFF),
FilterShulkersSetting.genericVision(false),
FilterAllaysSetting.genericVision(false),
FilterInvisibleSetting.genericVision(false),
FilterArmorStandsSetting.genericVision(true));
private final ArrayList<LivingEntity> mobs = new ArrayList<>();
private VertexBuffer mobBox;

48
src/main/java/net/wurstclient/settings/filterlists/MobEspFilterList.java
View File

@ -1,48 +0,0 @@
/*
* Copyright (c) 2014-2023 Wurst-Imperium and contributors.
*
* This source code is subject to the terms of the GNU General Public
* License, version 3. If a copy of the GPL was not distributed with this
* file, You can obtain one at: https://www.gnu.org/licenses/gpl-3.0.txt
*/
package net.wurstclient.settings.filterlists;
import java.util.ArrayList;
import java.util.List;
import net.wurstclient.settings.filters.*;
public final class MobEspFilterList extends EntityFilterList
{
private MobEspFilterList(List<EntityFilter> filters)
{
super(filters);
}
public static MobEspFilterList create()
{
ArrayList<EntityFilter> builder = new ArrayList<>();
builder.add(FilterHostileSetting.genericVision(false));
builder.add(FilterNeutralSetting
.genericVision(AttackDetectingEntityFilter.Mode.OFF));
builder.add(FilterPassiveSetting.genericVision(false));
builder.add(FilterPassiveWaterSetting.genericVision(false));
builder.add(FilterBatsSetting.genericVision(false));
builder.add(FilterSlimesSetting.genericVision(false));
builder.add(FilterPetsSetting.genericVision(false));
builder.add(FilterVillagersSetting.genericVision(false));
builder.add(FilterZombieVillagersSetting.genericVision(false));
builder.add(FilterGolemsSetting.genericVision(false));
builder.add(FilterPiglinsSetting
.genericVision(AttackDetectingEntityFilter.Mode.OFF));
builder.add(FilterZombiePiglinsSetting
.genericVision(AttackDetectingEntityFilter.Mode.OFF));
builder.add(FilterEndermenSetting
.genericVision(AttackDetectingEntityFilter.Mode.OFF));
builder.add(FilterShulkersSetting.genericVision(false));
builder.add(FilterAllaysSetting.genericVision(false));
builder.add(FilterInvisibleSetting.genericVision(false));
builder.add(FilterArmorStandsSetting.genericVision(true));
return new MobEspFilterList(builder);
}
}