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

Byproducts need to always be inserted in the internal storage for later reuse further in the task.

Browse Source
This commit is contained in:
raoulvdberge
2018-08-24 16:27:25 +02:00
parent 0d87bb4e1b
commit 5077229af7
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -596,24 +596,18 @@ public class CraftingTask implements ICraftingTask {
if (!c.isRoot()) { if (!c.isRoot()) {
this.internalStorage.insert(output, output.getCount(), Action.PERFORM); this.internalStorage.insert(output, output.getCount(), Action.PERFORM);
for (ItemStack byp : c.getPattern().getByproducts(c.getTook())) {
this.internalStorage.insert(byp, byp.getCount(), Action.PERFORM);
}
} else { } else {
ItemStack remainder = this.network.insertItem(output, output.getCount(), Action.PERFORM); ItemStack remainder = this.network.insertItem(output, output.getCount(), Action.PERFORM);
if (remainder != null) { if (remainder != null) {
this.internalStorage.insert(remainder, remainder.getCount(), Action.PERFORM); this.internalStorage.insert(remainder, remainder.getCount(), Action.PERFORM);
} }
}
for (ItemStack byp : c.getPattern().getByproducts(c.getTook())) { // Byproducts need to always be inserted in the internal storage for later reuse further in the task.
remainder = this.network.insertItem(byp, byp.getCount(), Action.PERFORM); // Regular outputs can be inserted into the network *IF* it's a root since it's *NOT* expected to be used later on.
for (ItemStack byp : c.getPattern().getByproducts(c.getTook())) {
if (remainder != null) { this.internalStorage.insert(byp, byp.getCount(), Action.PERFORM);
this.internalStorage.insert(remainder, remainder.getCount(), Action.PERFORM);
}
}
} }
it.remove(); it.remove();
@@ -813,7 +807,7 @@ public class CraftingTask implements ICraftingTask {
} }
private static int getFlags(ItemStack stack) { private static int getFlags(ItemStack stack) {
if (stack.getItem().isDamageable()) { if (false && stack.getItem().isDamageable()) {
return IComparer.COMPARE_NBT; return IComparer.COMPARE_NBT;
} }
@@ -911,7 +905,7 @@ public class CraftingTask implements ICraftingTask {
return size; return size;
} }
public static NBTTagCompound writePatternToNbt(ICraftingPattern pattern) { static NBTTagCompound writePatternToNbt(ICraftingPattern pattern) {
NBTTagCompound tag = new NBTTagCompound(); NBTTagCompound tag = new NBTTagCompound();
tag.setTag(NBT_PATTERN_STACK, pattern.getStack().serializeNBT()); tag.setTag(NBT_PATTERN_STACK, pattern.getStack().serializeNBT());
@@ -920,7 +914,7 @@ public class CraftingTask implements ICraftingTask {
return tag; return tag;
} }
public static ICraftingPattern readPatternFromNbt(NBTTagCompound tag, World world) throws CraftingTaskReadException { static ICraftingPattern readPatternFromNbt(NBTTagCompound tag, World world) throws CraftingTaskReadException {
BlockPos containerPos = BlockPos.fromLong(tag.getLong(NBT_PATTERN_CONTAINER_POS)); BlockPos containerPos = BlockPos.fromLong(tag.getLong(NBT_PATTERN_CONTAINER_POS));
INetworkNode node = API.instance().getNetworkNodeManager(world).getNode(containerPos); INetworkNode node = API.instance().getNetworkNodeManager(world).getNode(containerPos);