Skip to content

fix: entity interactions in various modules #5773

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

Merged
Wide-Cat merged 1 commit into from
Oct 17, 2025
Merged

fix: entity interactions in various modules #5773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions src/main/java/meteordevelopment/meteorclient/systems/modules/world/AutoBreed.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import net.minecraft.entity.EntityType;
import net.minecraft.entity.passive.AnimalEntity;
import net.minecraft.util.Hand;
import net.minecraft.util.hit.EntityHitResult;

import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -85,6 +86,8 @@ private void onTick(TickEvent.Pre event) {
continue;

Rotations.rotate(Rotations.getYaw(entity), Rotations.getPitch(entity), -100, () -> {
EntityHitResult location = new EntityHitResult(animal, animal.getBoundingBox().getCenter());
mc.interactionManager.interactEntityAtLocation(mc.player, animal, location, hand.get());
mc.interactionManager.interactEntity(mc.player, animal, hand.get());
mc.player.swingHand(hand.get());
animalsFed.add(animal);
Expand Down
16 changes: 13 additions & 3 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 @@ -24,6 +24,7 @@
import net.minecraft.entity.passive.LlamaEntity;
import net.minecraft.item.SpawnEggItem;
import net.minecraft.util.Hand;
import net.minecraft.util.hit.EntityHitResult;

import java.util.Set;

Expand Down Expand Up @@ -66,13 +67,22 @@ private void onTick(TickEvent.Pre event) {
if (!PlayerUtils.isWithin(entity, 4)) continue;
if ((entity instanceof MobEntity mobEntity) && !(mobEntity.hasSaddleEquipped())) continue;
if (!(entity instanceof LlamaEntity) && entity instanceof MobEntity mobEntity && checkSaddle.get() && !mobEntity.hasSaddleEquipped()) continue;
interact(entity);
interact(entity, rotate.get());
return;
}
}

private void interact(Entity entity, boolean rotate) {
if (rotate) {
Rotations.rotate(Rotations.getYaw(entity), Rotations.getPitch(entity), -100, () -> interact(entity));
} else {
interact(entity);
}
}

private void interact(Entity entity) {
if (rotate.get()) Rotations.rotate(Rotations.getYaw(entity), Rotations.getPitch(entity), -100, () -> mc.interactionManager.interactEntity(mc.player, entity, Hand.MAIN_HAND));
else mc.interactionManager.interactEntity(mc.player, entity, Hand.MAIN_HAND);
EntityHitResult location = new EntityHitResult(entity, entity.getBoundingBox().getCenter());
mc.interactionManager.interactEntityAtLocation(mc.player, entity, location, Hand.MAIN_HAND);
mc.interactionManager.interactEntity(mc.player, entity, Hand.MAIN_HAND);
}
}
6 changes: 5 additions & 1 deletion src/main/java/meteordevelopment/meteorclient/systems/modules/world/AutoNametag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import net.minecraft.entity.EntityType;
import net.minecraft.item.Items;
import net.minecraft.util.Hand;
import net.minecraft.util.hit.EntityHitResult;

import java.util.Iterator;
import java.util.Set;
Expand Down Expand Up @@ -126,7 +127,10 @@ private void onTickPost(TickEvent.Post event) {
}

private void interact() {
mc.interactionManager.interactEntity(mc.player, target, offHand ? Hand.OFF_HAND : Hand.MAIN_HAND);
Hand hand = offHand ? Hand.OFF_HAND : Hand.MAIN_HAND;
EntityHitResult location = new EntityHitResult(target, target.getBoundingBox().getCenter());
mc.interactionManager.interactEntityAtLocation(mc.player, target, location, hand);
mc.interactionManager.interactEntity(mc.player, target, hand);
InvUtils.swapBack();

entityCooldowns.put(target, 20);
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/meteordevelopment/meteorclient/systems/modules/world/AutoShearer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import net.minecraft.entity.passive.SheepEntity;
import net.minecraft.item.Items;
import net.minecraft.util.Hand;
import net.minecraft.util.hit.EntityHitResult;

public class AutoShearer extends Module {
private final SettingGroup sgGeneral = settings.getDefaultGroup();
Expand Down Expand Up @@ -80,6 +81,8 @@ private void onTick(TickEvent.Pre event) {
}

private void interact() {
EntityHitResult location = new EntityHitResult(entity, entity.getBoundingBox().getCenter());
mc.interactionManager.interactEntityAtLocation(mc.player, entity, location, hand);
mc.interactionManager.interactEntity(mc.player, entity, hand);
InvUtils.swapBack();
}
Expand Down