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

Add crafting task cancelling

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-10-11 22:16:18 +02:00
parent e5d9a9f0d9
commit f19c78ce0d
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,6 +37,8 @@ public class CraftingTask implements ICraftingTask {
private IItemStackList extras = API.instance().createItemStackList(); private IItemStackList extras = API.instance().createItemStackList();
private Deque<ItemStack> toInsert = new ArrayDeque<>(); private Deque<ItemStack> toInsert = new ArrayDeque<>();
private int compare = IComparer.COMPARE_DAMAGE | IComparer.COMPARE_NBT; private int compare = IComparer.COMPARE_DAMAGE | IComparer.COMPARE_NBT;
private List<ItemStack> took = new ArrayList<>();
private List<FluidStack> tookFluids = new ArrayList<>();
public CraftingTask(INetworkMaster network, ItemStack requested, ICraftingPattern pattern, int quantity) { public CraftingTask(INetworkMaster network, ItemStack requested, ICraftingPattern pattern, int quantity) {
this.network = network; this.network = network;
@@ -152,6 +154,13 @@ public class CraftingTask implements ICraftingTask {
@Override @Override
public void onCancelled() { public void onCancelled() {
for (ItemStack took : this.took) {
network.insertItem(took, took.stackSize, false);
}
for (FluidStack took : this.tookFluids) {
network.insertFluid(took, took.amount, false);
}
} }
@Override @Override
@@ -185,6 +194,8 @@ public class CraftingTask implements ICraftingTask {
if (took != null) { if (took != null) {
toTake.remove(toTakeStack, 1, true); toTake.remove(toTakeStack, 1, true);
this.took.add(took);
} }
break; break;
@@ -197,6 +208,8 @@ public class CraftingTask implements ICraftingTask {
if (took != null) { if (took != null) {
toTakeFluids.remove(toTakeStack, toTakeStack.amount, true); toTakeFluids.remove(toTakeStack, toTakeStack.amount, true);
this.tookFluids.add(took);
} }
break; break;