Skip to content

Optimize Villager food inventory checks #185

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
Smorki wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Optimize Villager food inventory checks #185

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f94cfc
Optimize Villager food inventory checks
Smorki Jul 26, 2026
faea98d
Address review: remove inventory hoist, keep stream change
Smorki Aug 3, 2026
e193355
Address review: single pass inventory scan, short circuit canBreed, f…
Smorki Aug 3, 2026
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
42 changes: 42 additions & 0 deletions ...ver/minecraft-patches/sources/net/minecraft/world/entity/npc/villager/Villager.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
--- a/net/minecraft/world/entity/npc/villager/Villager.java
+++ b/net/minecraft/world/entity/npc/villager/Villager.java
@@ -697,8 +_,12 @@

private void eatUntilFull() {
if (this.hungry() && this.countFoodPointsInInventory() != 0) {
- for (int slot = 0; slot < this.getInventory().getContainerSize(); slot++) {
Comment thread
Smorki marked this conversation as resolved.
Outdated
- ItemStack itemStack = this.getInventory().getItem(slot);
+ // Gale start - hoist inventory lookup
+ final SimpleContainer inventory = this.getInventory();
+ final int containerSize = inventory.getContainerSize();
+ // Gale end - hoist inventory lookup
+ for (int slot = 0; slot < containerSize; slot++) {
+ ItemStack itemStack = inventory.getItem(slot);
if (!itemStack.isEmpty()) {
Integer value = FOOD_POINTS.get(itemStack.getItem());
if (value != null) {
@@ -706,7 +_,7 @@

for (int count = itemCount; count > 0; count--) {
this.foodLevel = this.foodLevel + value;
- this.getInventory().removeItem(slot, 1);
+ inventory.removeItem(slot, 1);
if (!this.hungry()) {
return;
}
@@ -843,8 +_,14 @@
}

private int countFoodPointsInInventory() {
+ // Gale start - avoid stream in villager food check
SimpleContainer inventory = this.getInventory();
- return FOOD_POINTS.entrySet().stream().mapToInt(entry -> inventory.countItem(entry.getKey()) * entry.getValue()).sum();
+ int total = 0;
+ for (Map.Entry<Item, Integer> entry : FOOD_POINTS.entrySet()) {
+ total += inventory.countItem(entry.getKey()) * entry.getValue();
+ }
+ return total;
+ // Gale end - avoid stream in villager food check
}

public boolean hasFarmSeeds() {
Loading