Skip to content

fix: proper food item check #6372

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
cattyngmd wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: proper food item check #6372

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: 2 additions & 1 deletion src/main/java/meteordevelopment/meteorclient/systems/modules/combat/Offhand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import meteordevelopment.meteorclient.systems.modules.Categories;
import meteordevelopment.meteorclient.systems.modules.Module;
import meteordevelopment.meteorclient.systems.modules.Modules;
import meteordevelopment.meteorclient.utils.Utils;
import meteordevelopment.meteorclient.utils.misc.input.KeyAction;
import meteordevelopment.meteorclient.utils.player.FindItemResult;
import meteordevelopment.meteorclient.utils.player.InvUtils;
Expand Down Expand Up @@ -250,7 +251,7 @@ private boolean usableItem() {
return mc.player.getMainHandItem().getItem() == Items.BOW
|| mc.player.getMainHandItem().getItem() == Items.TRIDENT
|| mc.player.getMainHandItem().getItem() == Items.CROSSBOW
|| mc.player.getMainHandItem().getItem().components().has(DataComponents.FOOD);
|| Utils.isFood(mc.player.getMainHandItem());
}

@Override
Expand Down
15 changes: 8 additions & 7 deletions src/main/java/meteordevelopment/meteorclient/systems/modules/player/AutoEat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public class AutoEat extends Module {
Items.SPIDER_EYE,
Items.SUSPICIOUS_STEW
)
.filter(item -> item.components().get(DataComponents.FOOD) != null)
.filter(Utils::isFood)
.build()
);

Expand Down Expand Up @@ -147,7 +147,7 @@ private void onTick(TickEvent.Pre event) {
}

// Check if the item in current slot is not food anymore
if (mc.player.getInventory().getItem(slot).get(DataComponents.FOOD) == null) {
if (!Utils.isFood(mc.player.getInventory().getItem(slot))) {
int newSlot = findSlot();

// Stop if no food found
Expand Down Expand Up @@ -269,10 +269,11 @@ public boolean shouldEat() {
slot = findSlot();
if (slot == -1) return false;

FoodProperties food = mc.player.getInventory().getItem(slot).get(DataComponents.FOOD);
if (food == null) return false;
ItemStack item = mc.player.getInventory().getItem(slot);
FoodProperties prop = item.get(DataComponents.FOOD);
if (prop == null || !Utils.isFood(item)) return false;

return (mc.player.getFoodData().needsFood() || food.canAlwaysEat());
return (mc.player.getFoodData().needsFood() || prop.canAlwaysEat());
}

/**
Expand All @@ -282,8 +283,7 @@ public boolean shouldEat() {
private int findSlot() {
// prefer offhand
Item offHandItem = mc.player.getOffhandItem().getItem();
FoodProperties offHandFood = offHandItem.components().get(DataComponents.FOOD);
if (offHandFood != null && !blacklist.get().contains(offHandItem)) return SlotUtils.OFFHAND;
if (Utils.isFood(offHandItem) && !blacklist.get().contains(offHandItem)) return SlotUtils.OFFHAND;

// if offhand empty, prefer best in hotbar
int slot = findBestFood(SlotUtils.HOTBAR_START, SlotUtils.HOTBAR_END);
Expand All @@ -305,6 +305,7 @@ private int findBestFood(int start, int end) {
// Skip if item isn't food
ItemStack stack = mc.player.getInventory().getItem(i);
FoodProperties food = stack.get(DataComponents.FOOD);
if (!Utils.isFood(stack)) continue;
if (food == null) continue;

// Skip if item is in blacklist
Expand Down
13 changes: 6 additions & 7 deletions src/main/java/meteordevelopment/meteorclient/systems/modules/world/HighwayBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
import net.minecraft.client.player.ClientInput;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.component.DataComponents;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.MutableComponent;
import net.minecraft.network.protocol.game.ClientboundContainerSetContentPacket;
Expand Down Expand Up @@ -1168,7 +1167,7 @@ protected void tick(HighwayBuilder b) {
eject = false;
break;
}
if (stack.has(DataComponents.FOOD) && !Modules.get().get(AutoEat.class).blacklist.get().contains(stack.getItem())) {
if (Utils.isFood(stack) && !Modules.get().get(AutoEat.class).blacklist.get().contains(stack.getItem())) {
eject = false;
break;
}
Expand Down Expand Up @@ -1431,7 +1430,7 @@ protected void start(HighwayBuilder b) {
stop = false;
break;
}
if (b.restockTask.food && stack.has(DataComponents.FOOD) && !Modules.get().get(AutoEat.class).blacklist.get().contains(stack.getItem())) {
if (b.restockTask.food && Utils.isFood(stack) && !Modules.get().get(AutoEat.class).blacklist.get().contains(stack.getItem())) {
stop = false;
break;
}
Expand All @@ -1451,7 +1450,7 @@ protected void start(HighwayBuilder b) {
boolean restockOccurred = (
(b.restockTask.materials && (hasItem(b, stack -> stack.getItem() instanceof BlockItem bi && b.blocksToPlace.get().contains(bi.getBlock())) || b.blocksToPlace.get().contains(Blocks.OBSIDIAN) && countItem(b, itemStack -> itemStack.getItem() == Items.ENDER_CHEST) > b.saveEchests.get())) ||
(b.restockTask.pickaxes && countItem(b, itemStack -> itemStack.is(ItemTags.PICKAXES)) > b.savePickaxes.get()) ||
(b.restockTask.food && hasItem(b, itemStack -> itemStack.has(DataComponents.FOOD) && !Modules.get().get(AutoEat.class).blacklist.get().contains(itemStack.getItem())))
(b.restockTask.food && hasItem(b, itemStack -> Utils.isFood(itemStack) && !Modules.get().get(AutoEat.class).blacklist.get().contains(itemStack.getItem())))
);

if (restockOccurred) {
Expand Down Expand Up @@ -1529,7 +1528,7 @@ protected void tick(HighwayBuilder b) {
if (b.restockTask.pickaxes)
slotsPulled += countSlots(b, itemStack -> itemStack.is(ItemTags.PICKAXES)) - b.savePickaxes.get();
if (b.restockTask.food)
slotsPulled += countSlots(b, itemStack -> itemStack.has(DataComponents.FOOD) && !Modules.get().get(AutoEat.class).blacklist.get().contains(itemStack.getItem()));
slotsPulled += countSlots(b, itemStack -> Utils.isFood(itemStack) && !Modules.get().get(AutoEat.class).blacklist.get().contains(itemStack.getItem()));


// whether we have pulled the minimum amount of items we want
Expand Down Expand Up @@ -1644,7 +1643,7 @@ private boolean restockItems(HighwayBuilder b, Container inv) {
if (grabFromInventory(inv, itemStack -> itemStack.is(ItemTags.PICKAXES))) return true;
}
if (b.restockTask.food) {
return grabFromInventory(inv, itemStack -> itemStack.has(DataComponents.FOOD) && !Modules.get().get(AutoEat.class).blacklist.get().contains(itemStack.getItem()));
return grabFromInventory(inv, itemStack -> Utils.isFood(itemStack) && !Modules.get().get(AutoEat.class).blacklist.get().contains(itemStack.getItem()));
}

return false;
Expand Down Expand Up @@ -1673,7 +1672,7 @@ private void setShulkerPredicate(HighwayBuilder b) {
return true;
}
if (b.restockTask.pickaxes && stack.is(ItemTags.PICKAXES)) return true;
if (b.restockTask.food && stack.has(DataComponents.FOOD) && !Modules.get().get(AutoEat.class).blacklist.get().contains(stack.getItem()))
if (b.restockTask.food && Utils.isFood(stack) && !Modules.get().get(AutoEat.class).blacklist.get().contains(stack.getItem()))
return true;
}

Expand Down
9 changes: 9 additions & 0 deletions src/main/java/meteordevelopment/meteorclient/utils/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,15 @@ private static boolean hasEnchantment(Object2IntMap<Holder<Enchantment>> itemEnc
return false;
}

public static boolean isFood(ItemStack stack) {
return isFood(stack.getItem());
}

// Not every food item in minecraft is consumable for some reason (e.g. buckets of any fish)
public static boolean isFood(Item item) {
return item.components().has(DataComponents.FOOD) && item.components().has(DataComponents.CONSUMABLE);
}

public static int getRenderDistance() {
return Math.max(mc.options.renderDistance().get(), ((ClientPacketListenerAccessor) mc.getConnection()).meteor$getServerChunkRadius());
}
Expand Down