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

Make fluid autocrafting work correctly with buckets

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-10-09 21:59:56 +02:00
parent 45441b8369
commit 12eb4d8895
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java
View File

@@ -88,11 +88,21 @@ public class CraftingTask implements ICraftingTask {
if (fluidInStorage == null || fluidInStorage.amount < fluidInItem.amount) { if (fluidInStorage == null || fluidInStorage.amount < fluidInItem.amount) {
missing.add(input); missing.add(input);
} else if (network.getItemStorage().getList().get(RSUtils.EMPTY_BUCKET) == null) {
missing.add(RSUtils.EMPTY_BUCKET.copy());
} else { } else {
toTake.add(RSUtils.EMPTY_BUCKET.copy()); boolean hasBucket = network.getItemStorage().getList().get(RSUtils.EMPTY_BUCKET) != null;
toTakeFluids.add(fluidInItem.copy()); ICraftingPattern bucketPattern = network.getPattern(RSUtils.EMPTY_BUCKET);
if (!hasBucket) {
if (bucketPattern == null) {
missing.add(RSUtils.EMPTY_BUCKET.copy());
} else {
calculate(list, bucketPattern, false);
}
}
if (hasBucket || bucketPattern != null) {
toTakeFluids.add(fluidInItem.copy());
}
} }
} else { } else {
missing.add(input); missing.add(input);