Skip to content

Fix ore-dict based matching in PartyInventory #149

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
WaitingIdly merged 4 commits into from
Apr 2, 2026
Merged

Fix ore-dict based matching in PartyInventory #149

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a84a774
Fix ore-dict based matching in PartyInventory
jchung01 Apr 2, 2026
784a16f
Use standard packed ids from RecipeItemHelper
jchung01 Apr 2, 2026
70090d3
Revert "Use standard packed ids from RecipeItemHelper"
jchung01 Apr 2, 2026
bfcc24d
Collect substacks over all matching ore stacks
jchung01 Apr 2, 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
22 changes: 20 additions & 2 deletions src/main/java/betterquesting/questing/party/PartyInventory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
import com.github.bsideup.jabel.Desugar;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.ints.IntOpenHashSet;

import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
Expand Down Expand Up @@ -100,8 +102,24 @@ public PartyInventory(EntityPlayer mainPlayer, List<EntityPlayer> party) {
public ItemMatchContext getItemCountFor(BigItemStack req, boolean taskConsumes, boolean ignoreNBT, boolean partialMatch) {
var gatheredStacks = taskConsumes ? playerStacks : partyStacks;

// The stacks matched by Item
var subStacks = gatheredStacks.get(req.getHashKey());
List<IndexedItemStack> subStacks;
if (req.hasOreDict()) {
// Stacks matched by any ore-dict item
subStacks = new ArrayList<>();
var checkedHashes = new IntOpenHashSet();
for (ItemStack oreStack : req.getOreIngredient().getMatchingStacks()) {
int itemHash = BigItemStack.getHashKey(oreStack);
if (checkedHashes.add(itemHash)) {
var matchedSubStacks = gatheredStacks.get(itemHash);
if (matchedSubStacks != null) {
subStacks.addAll(matchedSubStacks);
}
}
}
} else {
// Stacks matched by base item
subStacks = gatheredStacks.get(req.getHashKey());
}
if (subStacks == null || subStacks.isEmpty()) {
return ItemMatchContext.EMPTY;
}
Expand Down