Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ private boolean entityCheck(Entity entity) {
) return false;
}
if (ignorePassive.get()) {
if (entity instanceof EnderMan enderman && !enderman.isAngry()) return false;
if (entity instanceof EnderMan enderman && !enderman.isCreepy()) return false;
if ((entity instanceof Piglin || entity instanceof ZombifiedPiglin || entity instanceof Wolf) && !((Mob) entity).isAggressive())
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
import meteordevelopment.meteorclient.utils.entity.Target;
import meteordevelopment.meteorclient.utils.player.Rotations;
import meteordevelopment.orbit.EventHandler;
import net.minecraft.tags.ItemTags;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.monster.EnderMan;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.phys.Vec3;

public class EndermanLook extends Module {
Expand Down Expand Up @@ -47,7 +47,7 @@ public EndermanLook() {
@EventHandler
private void onTick(TickEvent.Pre event) {
// if either are true nothing happens when you look at an enderman
if (mc.player.getItemBySlot(EquipmentSlot.HEAD).is(Blocks.CARVED_PUMPKIN.asItem()) || mc.player.getAbilities().instabuild)
if (mc.player.getItemBySlot(EquipmentSlot.HEAD).is(ItemTags.GAZE_DISGUISE_EQUIPMENT) || mc.player.getAbilities().instabuild)
return;

for (Entity entity : mc.level.entitiesForRendering()) {
Expand All @@ -56,12 +56,12 @@ private void onTick(TickEvent.Pre event) {

switch (lookMode.get()) {
case Away -> {
if (enderman.isAngry() && stun.get())
if (enderman.isCreepy() && stun.get())
Rotations.rotate(Rotations.getYaw(enderman), Rotations.getPitch(enderman, Target.Head), -75, null);
else if (angleCheck(enderman)) Rotations.rotate(mc.player.getYRot(), 90, -75, null);
}
case At -> {
if (!enderman.isAngry())
if (!enderman.isCreepy())
Rotations.rotate(Rotations.getYaw(enderman), Rotations.getPitch(enderman, Target.Head), -75, null);
}
}
Expand Down