dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

first exact search underlying list in oredicted list

Browse Source
This commit is contained in:
way2muchnoise
2016-11-02 19:36:55 +01:00
parent bcbd344469
commit 17366c0cb2
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/ItemStackListOredicted.java
View File

@@ -76,24 +76,27 @@ public class ItemStackListOredicted implements IItemStackList {
@Nullable
@Override
public ItemStack get(@Nonnull ItemStack stack, int flags) {
if ((flags & IComparer.COMPARE_OREDICT) == IComparer.COMPARE_OREDICT) {
int[] ids = OreDictionary.getOreIDs(stack);
for (int id : ids) {
List<ItemStack> stacks = this.stacks.get(id);
if (stacks != null && !stacks.isEmpty()) {
int i = 0;
ItemStack returnStack = stacks.get(i++);
while (returnStack.stackSize == 0 && i < stacks.size()) {
returnStack = stacks.get(i++);
}
if (returnStack.stackSize != 0) {
return returnStack;
// Check the underlying list but don't do oredict things for exact match
ItemStack exact = underlyingList.get(stack, flags & ~IComparer.COMPARE_OREDICT);
if (exact == null) {
if ((flags & IComparer.COMPARE_OREDICT) == IComparer.COMPARE_OREDICT) {
int[] ids = OreDictionary.getOreIDs(stack);
for (int id : ids) {
List<ItemStack> stacks = this.stacks.get(id);
if (stacks != null && !stacks.isEmpty()) {
int i = 0;
ItemStack returnStack = stacks.get(i++);
while (returnStack.stackSize == 0 && i < stacks.size()) {
returnStack = stacks.get(i++);
}
if (returnStack.stackSize != 0) {
return returnStack;
}
}
}
}
}
// Check the underlying list but don't do oredict things, as that has been tried before
return underlyingList.get(stack, flags & ~IComparer.COMPARE_OREDICT);
return exact;
}
@Nullable