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

fixes #578, I wonder why this wasn't breaking everything :p

Browse Source
This commit is contained in:
way2muchnoise
2016-11-05 00:36:52 +01:00
parent d7b9d54c51
commit a61770a80d
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,7 @@ public class CraftingStepCraft extends CraftingStep {
public CraftingStepCraft(INetworkMaster network, ICraftingPattern pattern, List<ItemStack> toInsert) { public CraftingStepCraft(INetworkMaster network, ICraftingPattern pattern, List<ItemStack> toInsert) {
super(network, pattern); super(network, pattern);
this.toInsert = new LinkedList<>(); this.toInsert = new LinkedList<>();
toInsert.stream().filter(insert -> insert != null).forEach(stack -> this.toInsert.add(stack.copy())); toInsert.forEach(stack -> this.toInsert.add(stack == null ? null : stack.copy()));
} }
public CraftingStepCraft(INetworkMaster network) { public CraftingStepCraft(INetworkMaster network) {
@@ -35,7 +35,7 @@ public class CraftingStepCraft extends CraftingStep {
@Override @Override
public List<ItemStack> getToInsert() { public List<ItemStack> getToInsert() {
return toInsert == null ? super.getToInsert() : toInsert; return toInsert == null ? super.getToInsert() : toInsert.stream().filter(Objects::nonNull).collect(Collectors.toList());
} }
@Override @Override
@@ -102,8 +102,8 @@ public class CraftingStepCraft extends CraftingStep {
} }
ItemStack[] took = new ItemStack[9]; ItemStack[] took = new ItemStack[9];
for (int i = 0; i < getToInsert().size(); i++) { for (int i = 0; i < toInsert.size(); i++) {
ItemStack input = getToInsert().get(i); ItemStack input = toInsert.get(i);
if (input != null) { if (input != null) {
ItemStack actualInput = actualInputs.get(input, compare); ItemStack actualInput = actualInputs.get(input, compare);
ItemStack taken = ItemHandlerHelper.copyStackWithSize(actualInput, input.stackSize); ItemStack taken = ItemHandlerHelper.copyStackWithSize(actualInput, input.stackSize);
@@ -133,7 +133,7 @@ public class CraftingStepCraft extends CraftingStep {
NBTTagList toInsertList = new NBTTagList(); NBTTagList toInsertList = new NBTTagList();
for (ItemStack insert : toInsert) { for (ItemStack insert : toInsert) {
toInsertList.appendTag(insert.serializeNBT()); toInsertList.appendTag(insert == null ? new NBTTagCompound() : insert.serializeNBT());
} }
tag.setTag(NBT_TO_INSERT, toInsertList); tag.setTag(NBT_TO_INSERT, toInsertList);
@@ -145,13 +145,10 @@ public class CraftingStepCraft extends CraftingStep {
public boolean readFromNBT(NBTTagCompound tag) { public boolean readFromNBT(NBTTagCompound tag) {
if (super.readFromNBT(tag)) { if (super.readFromNBT(tag)) {
if (tag.hasKey(NBT_TO_INSERT)) { if (tag.hasKey(NBT_TO_INSERT)) {
NBTTagList toInsertList = tag.getTagList(CraftingTask.NBT_TO_INSERT_ITEMS, Constants.NBT.TAG_COMPOUND); NBTTagList toInsertList = tag.getTagList(NBT_TO_INSERT, Constants.NBT.TAG_COMPOUND);
toInsert = new ArrayList<>(toInsertList.tagCount()); toInsert = new ArrayList<>(toInsertList.tagCount());
for (int i = 0; i < toInsertList.tagCount(); ++i) { for (int i = 0; i < toInsertList.tagCount(); ++i) {
ItemStack insertStack = ItemStack.loadItemStackFromNBT(toInsertList.getCompoundTagAt(i)); toInsert.add(ItemStack.loadItemStackFromNBT(toInsertList.getCompoundTagAt(i)));
if (insertStack != null) {
toInsert.add(insertStack);
}
} }
} }