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

forward port fixes to autocrafting

Browse Source
This commit is contained in:
way2muchnoise
2016-12-31 22:40:38 +01:00
parent a561a23b87
commit fa4ca32328
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -225,7 +225,7 @@ public class CraftingPattern implements ICraftingPattern {
for (ItemStack remaining : recipe.getRemainingItems(inv)) { for (ItemStack remaining : recipe.getRemainingItems(inv)) {
if (remaining != null) { if (remaining != null) {
byproducts.add(Comparer.stripTags(remaining.copy())); byproducts.add(remaining.copy());
} }
} }

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

@@ -102,6 +102,9 @@ public class CraftingTask implements ICraftingTask {
List<ItemStack> usedStacks = new LinkedList<>(); List<ItemStack> usedStacks = new LinkedList<>();
List<ICraftingStep> previousSteps = new LinkedList<>(); List<ICraftingStep> previousSteps = new LinkedList<>();
IStackList<ItemStack> byproductList = API.instance().createItemStackList();
pattern.getByproducts().stream().filter(Objects::nonNull).forEach(byproductList::add);
for (List<ItemStack> inputs : pattern.getOreInputs()) { for (List<ItemStack> inputs : pattern.getOreInputs()) {
if (inputs == null || inputs.isEmpty()) { if (inputs == null || inputs.isEmpty()) {
usedStacks.add(null); usedStacks.add(null);
@@ -161,7 +164,7 @@ public class CraftingTask implements ICraftingTask {
ItemStack inputStack = ItemHandlerHelper.copyStackWithSize(extraStack, takeQuantity); ItemStack inputStack = ItemHandlerHelper.copyStackWithSize(extraStack, takeQuantity);
actualInputs.add(inputStack.copy()); actualInputs.add(inputStack.copy());
input.shrink(takeQuantity); input.shrink(takeQuantity);
if (!inputStack.isItemStackDamageable() || !inputStack.isItemDamaged()) { if (byproductList.get(inputStack, compare) == null) {
toCraft.add(inputStack); toCraft.add(inputStack);
} }
toInsert.remove(inputStack); toInsert.remove(inputStack);

4
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/Comparer.java
View File

@@ -183,6 +183,10 @@ public class Comparer implements IComparer {
case "refinedstorage": case "refinedstorage":
stack.getTagCompound().removeTag(BlockNode.NBT_REFINED_STORAGE_DATA); stack.getTagCompound().removeTag(BlockNode.NBT_REFINED_STORAGE_DATA);
break; break;
case "immersiveengineering":
stack.getTagCompound().removeTag("hammerDmg");
stack.getTagCompound().removeTag("cutterDmg");
break;
case "storagedrawers": case "storagedrawers":
stack.getTagCompound().removeTag("material"); stack.getTagCompound().removeTag("material");
break; break;