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

add ore dict marker while fetching pattern, #796

Browse Source
This commit is contained in:
way2muchnoise
2017-01-04 13:44:52 +01:00
parent 5e6c840a49
commit 6f4d4c5e6b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java
View File

@@ -188,13 +188,14 @@ public class CraftingTask implements ICraftingTask {
} while ((extraStack == null || extraStack.getCount() == 0) && ++i < inputs.size()); } while ((extraStack == null || extraStack.getCount() == 0) && ++i < inputs.size());
} }
} else { } else {
int oreDictedCompare = compare | (pattern.isOredict() ? IComparer.COMPARE_OREDICT : 0);
if (inputPattern == null) { if (inputPattern == null) {
inputPattern = network.getCraftingManager().getPattern(input, compare); inputPattern = network.getCraftingManager().getPattern(input, oreDictedCompare);
} }
if (inputPattern != null) { if (inputPattern != null) {
ItemStack actualCraft = inputPattern.getActualOutput(input, compare); ItemStack actualCraft = inputPattern.getActualOutput(input, oreDictedCompare);
int craftQuantity = Math.min(inputPattern.getQuantityPerRequest(input, compare), input.getCount()); int craftQuantity = Math.min(inputPattern.getQuantityPerRequest(input, oreDictedCompare), input.getCount());
ItemStack inputCrafted = ItemHandlerHelper.copyStackWithSize(actualCraft, craftQuantity); ItemStack inputCrafted = ItemHandlerHelper.copyStackWithSize(actualCraft, craftQuantity);
toCraft.add(inputCrafted.copy()); toCraft.add(inputCrafted.copy());
actualInputs.add(inputCrafted.copy()); actualInputs.add(inputCrafted.copy());