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

actually use buckets when crafting, fixes #510

Browse Source
This commit is contained in:
way2muchnoise
2016-10-25 20:12:59 +02:00
parent e45ffa908e
commit 8699bd6dd6
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStepCraft.java
View File

@@ -1,5 +1,6 @@
package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task; package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.RSUtils; import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
@@ -36,7 +37,8 @@ public class CraftingStepCraft extends CraftingStep {
if (fluidInItem != null && RSUtils.hasFluidBucket(fluidInItem)) { if (fluidInItem != null && RSUtils.hasFluidBucket(fluidInItem)) {
FluidStack fluidStack = fluids.get(fluidInItem, compare); FluidStack fluidStack = fluids.get(fluidInItem, compare);
if (fluidStack != null && fluids.trackedRemove(fluidStack, fluidInItem.amount, true)) { ItemStack bucket = items.get(RSUtils.EMPTY_BUCKET, compare);
if (bucket != null && fluidStack != null && fluids.trackedRemove(fluidStack, fluidInItem.amount, true) && items.remove(bucket, 1, true)) {
continue; continue;
} }
} }
@@ -58,6 +60,7 @@ public class CraftingStepCraft extends CraftingStep {
FluidStack fluidInItem = RSUtils.getFluidFromStack(insertStack, true); FluidStack fluidInItem = RSUtils.getFluidFromStack(insertStack, true);
if (fluidInItem != null) { if (fluidInItem != null) {
network.extractFluid(fluidInItem, fluidInItem.amount, compare); network.extractFluid(fluidInItem, fluidInItem.amount, compare);
network.extractItem(RSUtils.EMPTY_BUCKET, 1, compare);
actualInputs.add(insertStack.copy()); actualInputs.add(insertStack.copy());
} else { } else {
actualInputs.add(network.extractItem(insertStack, insertStack.stackSize, compare)); actualInputs.add(network.extractItem(insertStack, insertStack.stackSize, compare));