Skip to content

AutoEat module conflict fix #4786

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+15 −11
Open

AutoEat module conflict fix #4786

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ecbad23
AutoEat module conflict fix
nickcat325 Jul 28, 2024
c90d53a
Fixed player trying to eat when full.
nickcat325 Sep 3, 2024
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
26 changes: 15 additions & 11 deletions src/main/java/meteordevelopment/meteorclient/systems/modules/player/AutoEat.java
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,9 @@
import meteordevelopment.meteorclient.systems.modules.combat.BedAura;
import meteordevelopment.meteorclient.systems.modules.combat.CrystalAura;
import meteordevelopment.meteorclient.systems.modules.combat.KillAura;
import meteordevelopment.meteorclient.systems.modules.world.Nuker;
import meteordevelopment.meteorclient.systems.modules.world.InfinityMiner;
import meteordevelopment.meteorclient.systems.modules.player.AutoFish;
import meteordevelopment.meteorclient.utils.Utils;
import meteordevelopment.meteorclient.utils.player.InvUtils;
import meteordevelopment.meteorclient.utils.player.SlotUtils;
@@ -31,7 +34,7 @@
import java.util.function.BiPredicate;

public class AutoEat extends Module {
private static final Class<? extends Module>[] AURAS = new Class[]{KillAura.class, CrystalAura.class, AnchorAura.class, BedAura.class};
private static final Class<? extends Module>[] MODULELIST = new Class[]{KillAura.class, CrystalAura.class, AnchorAura.class, BedAura.class, Nuker.class, InfinityMiner.class, AutoFish.class};

private final SettingGroup sgGeneral = settings.getDefaultGroup();
private final SettingGroup sgThreshold = settings.createGroup("Threshold");
@@ -56,9 +59,9 @@ public class AutoEat extends Module {
.build()
);

private final Setting<Boolean> pauseAuras = sgGeneral.add(new BoolSetting.Builder()
.name("pause-auras")
.description("Pauses all auras when eating.")
private final Setting<Boolean> pauseModules = sgGeneral.add(new BoolSetting.Builder()
.name("pause-modules")
.description("Pauses all Auras, Nuker, InfinityMiner and AutoFish when eating.")
.defaultValue(true)
.build()
);
@@ -166,10 +169,10 @@ private void startEating() {
prevSlot = mc.player.getInventory().selectedSlot;
eat();

// Pause auras
// Pause Auras, Nuker, InfinityMiner and AutoFish
wasAura.clear();
if (pauseAuras.get()) {
for (Class<? extends Module> klass : AURAS) {
if (pauseModules.get()) {
for (Class<? extends Module> klass : MODULELIST) {
Module module = Modules.get().get(klass);

if (module.isActive()) {
@@ -200,9 +203,9 @@ private void stopEating() {

eating = false;

// Resume auras
if (pauseAuras.get()) {
for (Class<? extends Module> klass : AURAS) {
// Resume Auras, Nuker, InfinityMiner and AutoFish
if (pauseModules.get()) {
for (Class<? extends Module> klass : MODULELIST) {
Module module = Modules.get().get(klass);

if (wasAura.contains(klass) && !module.isActive()) {
@@ -228,7 +231,8 @@ private void changeSlot(int slot) {
}

public boolean shouldEat() {
boolean health = mc.player.getHealth() <= healthThreshold.get();
//The player should not try to eat when full even if the health is low.
boolean health = mc.player.getHealth() <= healthThreshold.get() && mc.player.getHungerManager().getFoodLevel() != 20;
boolean hunger = mc.player.getHungerManager().getFoodLevel() <= hungerThreshold.get();

return thresholdMode.get().test(health, hunger);