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

fixes crafting with fluids in buckets, #551

Browse Source
This commit is contained in:
way2muchnoise
2016-10-30 14:14:14 +01:00
parent 11ccb1ff6d
commit c35c6a4af1
2 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,7 @@ 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);
ItemStack bucket = items.get(RSUtils.EMPTY_BUCKET, compare); ItemStack bucket = items.get(RSUtils.EMPTY_BUCKET, compare);
if (bucket != null && fluidStack != null && fluids.trackedRemove(fluidStack, fluidInItem.amount, true) && items.remove(bucket, 1, true)) { if (bucket != null && fluidStack != null && fluids.trackedRemove(fluidStack, fluidInItem.amount, true) && items.trackedRemove(bucket, 1, true)) {
continue; continue;
} }
} }

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

@@ -73,6 +73,7 @@ public class CraftingTask implements ICraftingTask {
IItemStackList networkList = network.getItemStorageCache().getList().copy(); IItemStackList networkList = network.getItemStorageCache().getList().copy();
networkList.clean(); // Remove the zero stacks networkList.clean(); // Remove the zero stacks
networkList = networkList.prepOreDict(); networkList = networkList.prepOreDict();
IFluidStackList networkFluidList = network.getFluidStorageCache().getList().copy();
IItemStackList toInsert = API.instance().createItemStackList(); IItemStackList toInsert = API.instance().createItemStackList();
toCraft.add(ItemHandlerHelper.copyStackWithSize(requested, quantity)); toCraft.add(ItemHandlerHelper.copyStackWithSize(requested, quantity));
@@ -80,14 +81,14 @@ public class CraftingTask implements ICraftingTask {
int quantity = this.quantity; int quantity = this.quantity;
while (quantity > 0 && !recurseFound) { while (quantity > 0 && !recurseFound) {
calculate(networkList, pattern, toInsert); calculate(networkList, networkFluidList, pattern, toInsert);
quantity -= pattern.getQuantityPerRequest(requested); quantity -= pattern.getQuantityPerRequest(requested);
} }
usedPatterns.clear(); usedPatterns.clear();
} }
private void calculate(IItemStackList networkList, ICraftingPattern pattern, IItemStackList toInsert) { private void calculate(IItemStackList networkList, IFluidStackList networkFluidList, ICraftingPattern pattern, IItemStackList toInsert) {
recurseFound = !usedPatterns.add(pattern); recurseFound = !usedPatterns.add(pattern);
if (recurseFound) { if (recurseFound) {
return; return;
@@ -134,17 +135,24 @@ public class CraftingTask implements ICraftingTask {
ItemStack inputCrafted = ItemHandlerHelper.copyStackWithSize(input, craftQuantity); ItemStack inputCrafted = ItemHandlerHelper.copyStackWithSize(input, craftQuantity);
toCraft.add(inputCrafted.copy()); toCraft.add(inputCrafted.copy());
actualInputs.add(inputCrafted.copy()); actualInputs.add(inputCrafted.copy());
calculate(networkList, inputPattern, toInsert); calculate(networkList, networkFluidList, inputPattern, toInsert);
input.stackSize -= craftQuantity; input.stackSize -= craftQuantity;
// Calculate added all the crafted outputs toInsertItems // Calculate added all the crafted outputs toInsertItems
// So we remove the ones we use from toInsertItems // So we remove the ones we use from toInsertItems
toInsert.remove(inputCrafted, true); toInsert.remove(inputCrafted, true);
} else if (doFluidCalculation(networkList, input, toInsert)) {
actualInputs.add(ItemHandlerHelper.copyStackWithSize(input, 1));
input.stackSize -= 1;
} else { } else {
missing.add(input.copy()); // Fluid checks are with a stack size of one
input.stackSize = 0; ItemStack fluidCheck = ItemHandlerHelper.copyStackWithSize(input, 1);
while (input.stackSize > 0 && doFluidCalculation(networkList, networkFluidList, fluidCheck, toInsert)) {
actualInputs.add(fluidCheck);
input.stackSize -= 1;
}
// When it isn't a fluid or just doesn't have the needed fluids
if (input.stackSize > 0) {
missing.add(input.copy());
input.stackSize = 0;
}
} }
} }
} }
@@ -181,16 +189,27 @@ public class CraftingTask implements ICraftingTask {
usedPatterns.remove(pattern); usedPatterns.remove(pattern);
} }
private boolean doFluidCalculation(IItemStackList networkList, ItemStack input, IItemStackList toInsert) { private boolean doFluidCalculation(IItemStackList networkList, IFluidStackList networkFluidList, ItemStack input, IItemStackList toInsert) {
FluidStack fluidInItem = RSUtils.getFluidFromStack(input, true); FluidStack fluidInItem = RSUtils.getFluidFromStack(input, true);
if (fluidInItem != null && RSUtils.hasFluidBucket(fluidInItem)) { if (fluidInItem != null && RSUtils.hasFluidBucket(fluidInItem)) {
FluidStack fluidInStorage = network.getFluidStorageCache().getList().get(fluidInItem); FluidStack fluidInStorage = networkFluidList.get(fluidInItem);
if (fluidInStorage == null || fluidInStorage.amount < fluidInItem.amount) { if (fluidInStorage == null || fluidInStorage.amount < fluidInItem.amount) {
missing.add(input); missing.add(input);
} else { } else {
boolean hasBucket = networkList.get(RSUtils.EMPTY_BUCKET) != null; ItemStack bucket = toInsert.get(RSUtils.EMPTY_BUCKET);
boolean hasBucket = false;
if (bucket != null && bucket.stackSize > 0) {
hasBucket = toInsert.remove(RSUtils.EMPTY_BUCKET, 1, false);
}
if (!hasBucket) {
bucket = networkList.get(RSUtils.EMPTY_BUCKET);
if (bucket != null && bucket.stackSize > 0) {
hasBucket = networkList.remove(RSUtils.EMPTY_BUCKET, 1, false);
}
}
ICraftingPattern bucketPattern = network.getPattern(RSUtils.EMPTY_BUCKET); ICraftingPattern bucketPattern = network.getPattern(RSUtils.EMPTY_BUCKET);
if (!hasBucket) { if (!hasBucket) {
@@ -198,12 +217,14 @@ public class CraftingTask implements ICraftingTask {
missing.add(RSUtils.EMPTY_BUCKET.copy()); missing.add(RSUtils.EMPTY_BUCKET.copy());
} else { } else {
toCraft.add(RSUtils.EMPTY_BUCKET.copy()); toCraft.add(RSUtils.EMPTY_BUCKET.copy());
calculate(networkList, bucketPattern, toInsert); calculate(networkList, networkFluidList, bucketPattern, toInsert);
toInsert.remove(RSUtils.EMPTY_BUCKET, 1, false);
} }
} }
if (hasBucket || bucketPattern != null) { if (hasBucket || bucketPattern != null) {
toTakeFluids.add(fluidInItem.copy()); toTakeFluids.add(fluidInItem.copy());
networkFluidList.remove(fluidInItem, false);
} }
} }