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

Extra check in autocrafting

Browse Source
This commit is contained in:
raoulvdberge
2017-12-01 13:08:31 +01:00
parent 1c552532ad
commit 4d1a3cadd6
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java
View File

@@ -99,15 +99,15 @@ public class CraftingPattern implements ICraftingPattern {
if (oreInputs.isEmpty()) { if (oreInputs.isEmpty()) {
for (ItemStack input : inputs) { for (ItemStack input : inputs) {
if (input == null) { if (input == null || input.isEmpty()) {
oreInputs.add(Collections.emptyList()); oreInputs.add(Collections.emptyList());
} else if (!input.isEmpty()) { } else {
int[] ids = OreDictionary.getOreIDs(input); int[] ids = OreDictionary.getOreIDs(input);
if (ids.length == 0) { if (ids.length == 0) {
oreInputs.add(Collections.singletonList(Comparer.stripTags(input))); oreInputs.add(Collections.singletonList(Comparer.stripTags(input)));
} else if (isOredict()) { } else if (isOredict()) {
List<ItemStack> oredict = Arrays.stream(ids) List<ItemStack> oredictInputs = Arrays.stream(ids)
.mapToObj(OreDictionary::getOreName) .mapToObj(OreDictionary::getOreName)
.map(OreDictionary::getOres) .map(OreDictionary::getOres)
.flatMap(List::stream) .flatMap(List::stream)
@@ -117,9 +117,9 @@ public class CraftingPattern implements ICraftingPattern {
.collect(Collectors.toList()); .collect(Collectors.toList());
// Add original stack as first, should prevent some issues // Add original stack as first, should prevent some issues
oredict.add(0, Comparer.stripTags(input.copy())); oredictInputs.add(0, Comparer.stripTags(input.copy()));
oreInputs.add(oredict); oreInputs.add(oredictInputs);
} else { } else {
oreInputs.add(Collections.singletonList(Comparer.stripTags(input))); oreInputs.add(Collections.singletonList(Comparer.stripTags(input)));
} }