Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AutoMount: refactor to use filtered EntityTypeListSetting to select rideable entities #4034

Merged
merged 3 commits into from
Sep 2, 2023
Merged

AutoMount: refactor to use filtered EntityTypeListSetting to select rideable entities #4034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
617f8ce
AutoMount: refactor to use filtered EntityTypeListSetting to select r…
Big-Iron-Cheems Sep 2, 2023
79662d6
Fixes
Big-Iron-Cheems Sep 2, 2023
21cce15
Fixes
Big-Iron-Cheems Sep 2, 2023
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
104 changes: 22 additions & 82 deletions src/main/java/meteordevelopment/meteorclient/systems/modules/world/AutoMount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,30 @@

import meteordevelopment.meteorclient.events.world.TickEvent;
import meteordevelopment.meteorclient.settings.BoolSetting;
import meteordevelopment.meteorclient.settings.EntityTypeListSetting;
import meteordevelopment.meteorclient.settings.Setting;
import meteordevelopment.meteorclient.settings.SettingGroup;
import meteordevelopment.meteorclient.systems.modules.Categories;
import meteordevelopment.meteorclient.systems.modules.Module;
import meteordevelopment.meteorclient.utils.entity.EntityUtils;
import meteordevelopment.meteorclient.utils.player.PlayerUtils;
import meteordevelopment.meteorclient.utils.player.Rotations;
import meteordevelopment.orbit.EventHandler;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.Saddleable;
import net.minecraft.entity.mob.SkeletonHorseEntity;
import net.minecraft.entity.passive.*;
import net.minecraft.entity.vehicle.BoatEntity;
import net.minecraft.entity.vehicle.MinecartEntity;
import net.minecraft.entity.mob.ZombieHorseEntity;
import net.minecraft.entity.passive.LlamaEntity;
import net.minecraft.entity.passive.PigEntity;
import net.minecraft.entity.passive.StriderEntity;
import net.minecraft.item.SpawnEggItem;
import net.minecraft.util.Hand;

import java.util.Set;

public class AutoMount extends Module {
private final SettingGroup sgGeneral = settings.getDefaultGroup();
private final SettingGroup sgMount = settings.createGroup("Mount");

// General

private final Setting<Boolean> checkSaddle = sgGeneral.add(new BoolSetting.Builder()
.name("check-saddle")
Expand All @@ -44,61 +48,10 @@ public class AutoMount extends Module {
.build()
);

// Mount

private final Setting<Boolean> horses = sgMount.add(new BoolSetting.Builder()
.name("horse")
.description("Horse")
.defaultValue(false)
.build()
);

private final Setting<Boolean> donkeys = sgMount.add(new BoolSetting.Builder()
.name("donkey")
.description("Donkey")
.defaultValue(false)
.build()
);

private final Setting<Boolean> mules = sgMount.add(new BoolSetting.Builder()
.name("mule")
.description("Mule")
.defaultValue(false)
.build()
);

private final Setting<Boolean> skeletonHorse = sgMount.add(new BoolSetting.Builder()
.name("skeleton-horse")
.description("Skeleton Horse")
.defaultValue(false)
.build()
);

private final Setting<Boolean> llamas = sgMount.add(new BoolSetting.Builder()
.name("llama")
.description("Llama")
.defaultValue(false)
.build()
);

private final Setting<Boolean> pigs = sgMount.add(new BoolSetting.Builder()
.name("pig")
.description("Pig")
.defaultValue(false)
.build()
);

private final Setting<Boolean> boats = sgMount.add(new BoolSetting.Builder()
.name("boat")
.description("Boat")
.defaultValue(false)
.build()
);

private final Setting<Boolean> minecarts = sgMount.add(new BoolSetting.Builder()
.name("minecart")
.description("Minecart")
.defaultValue(false)
private final Setting<Set<EntityType<?>>> entities = sgGeneral.add(new EntityTypeListSetting.Builder()
.name("entities")
.description("Rideable entities.")
.filter(EntityUtils::isRideable)
.build()
);

Expand All @@ -109,29 +62,16 @@ public AutoMount() {
@EventHandler
private void onTick(TickEvent.Pre event) {
if (mc.player.hasVehicle()) return;
if (mc.player.isSneaking()) return;
if (mc.player.getMainHandStack().getItem() instanceof SpawnEggItem) return;

for (Entity entity : mc.world.getEntities()){
for (Entity entity : mc.world.getEntities()) {
if (!entities.get().contains(entity.getType())) continue;
if (!PlayerUtils.isWithin(entity, 4)) continue;

if (mc.player.getMainHandStack().getItem() instanceof SpawnEggItem) return;

if (donkeys.get() && entity instanceof DonkeyEntity && (!checkSaddle.get() || ((DonkeyEntity) entity).isSaddled())) {
interact(entity);
} else if (llamas.get() && entity instanceof LlamaEntity) {
interact(entity);
} else if (boats.get() && entity instanceof BoatEntity) {
interact(entity);
} else if (minecarts.get() && entity instanceof MinecartEntity) {
interact(entity);
} else if (horses.get() && entity instanceof HorseEntity && (!checkSaddle.get() || ((HorseEntity) entity).isSaddled())) {
interact(entity);
} else if (pigs.get() && entity instanceof PigEntity && ((PigEntity) entity).isSaddled()) {
interact(entity);
} else if (mules.get() && entity instanceof MuleEntity && (!checkSaddle.get() || ((MuleEntity) entity).isSaddled())) {
interact(entity);
} else if (skeletonHorse.get() && entity instanceof SkeletonHorseEntity && (!checkSaddle.get() || ((SkeletonHorseEntity) entity).isSaddled())) {
interact(entity);
}
if ((entity instanceof PigEntity || entity instanceof SkeletonHorseEntity || entity instanceof StriderEntity || entity instanceof ZombieHorseEntity) && !((Saddleable) entity).isSaddled()) continue;
if (!(entity instanceof LlamaEntity) && entity instanceof Saddleable saddleable && checkSaddle.get() && !saddleable.isSaddled()) continue;
interact(entity);
return;
}
}

Expand Down
4 changes: 4 additions & 0 deletions src/main/java/meteordevelopment/meteorclient/utils/entity/EntityUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ public static boolean isAttackable(EntityType<?> type) {
return type != EntityType.AREA_EFFECT_CLOUD && type != EntityType.ARROW && type != EntityType.FALLING_BLOCK && type != EntityType.FIREWORK_ROCKET && type != EntityType.ITEM && type != EntityType.LLAMA_SPIT && type != EntityType.SPECTRAL_ARROW && type != EntityType.ENDER_PEARL && type != EntityType.EXPERIENCE_BOTTLE && type != EntityType.POTION && type != EntityType.TRIDENT && type != EntityType.LIGHTNING_BOLT && type != EntityType.FISHING_BOBBER && type != EntityType.EXPERIENCE_ORB && type != EntityType.EGG;
}

public static boolean isRideable(EntityType<?> type) {
return type == EntityType.MINECART || type == EntityType.BOAT || type == EntityType.CAMEL || type == EntityType.DONKEY || type == EntityType.HORSE || type == EntityType.LLAMA || type == EntityType.MULE || type == EntityType.PIG || type == EntityType.SKELETON_HORSE || type == EntityType.STRIDER || type == EntityType.ZOMBIE_HORSE;
}

public static float getTotalHealth(PlayerEntity target) {
return target.getHealth() + target.getAbsorptionAmount();
}
Expand Down