From 3a83c99b1fc7cca738cc6fc32aacf638ce891767 Mon Sep 17 00:00:00 2001 From: PrototypeTrousers Date: Sat, 5 Mar 2022 11:15:32 -0300 Subject: [PATCH] fix container items return properly --- .../java/appeng/crafting/CraftingTreeNode.java | 10 ---------- .../java/appeng/crafting/CraftingTreeProcess.java | 15 ++++++--------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/src/main/java/appeng/crafting/CraftingTreeNode.java b/src/main/java/appeng/crafting/CraftingTreeNode.java index 26bc28c8e..4cbc0433f 100644 --- a/src/main/java/appeng/crafting/CraftingTreeNode.java +++ b/src/main/java/appeng/crafting/CraftingTreeNode.java @@ -199,11 +199,6 @@ public class CraftingTreeNode final IAEItemStack available = inv.extractItems( madeWhat, Actionable.MODULATE, src ); - for( IAEItemStack i : pro.getReturnedContainers() ) - { - inv.injectItems( i, Actionable.MODULATE, src ); - } - if( available != null ) { this.bytes += available.getStackSize(); @@ -234,11 +229,6 @@ public class CraftingTreeNode this.what.setStackSize( l ); final IAEItemStack available = subInv.extractItems( this.what, Actionable.MODULATE, src ); - for( IAEItemStack i : pro.getReturnedContainers() ) - { - inv.injectItems( i, Actionable.MODULATE, src ); - } - if( available != null ) { if( !subInv.commit( src ) ) diff --git a/src/main/java/appeng/crafting/CraftingTreeProcess.java b/src/main/java/appeng/crafting/CraftingTreeProcess.java index 39ec2a971..b5b11b7f7 100644 --- a/src/main/java/appeng/crafting/CraftingTreeProcess.java +++ b/src/main/java/appeng/crafting/CraftingTreeProcess.java @@ -311,6 +311,12 @@ public class CraftingTreeProcess } } + if( containerItems != null) { + for (IAEItemStack i : containerItemsList) { + inv.injectItems(i, Actionable.MODULATE, src); + } + } + // assume its possible. // add crafting results.. @@ -323,15 +329,6 @@ public class CraftingTreeProcess this.crafts += amountOfTimes; } - public List getReturnedContainers() - { - if( containerItemsList == null ) - { - return Collections.emptyList(); - } - return containerItemsList; - } - void dive( final CraftingJob job ) { job.addTask( this.getAmountCrafted( this.parent.getStack( 1 ) ), this.crafts, this.details, this.depth );