fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix container items return properly

Browse Source
This commit is contained in:
PrototypeTrousers
2022-03-05 11:15:32 -03:00
parent 447c6debab
commit 3a83c99b1f
2 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/crafting/CraftingTreeNode.java
-10
View File
@@ -199,11 +199,6 @@ public class CraftingTreeNode
final IAEItemStack available = inv.extractItems( madeWhat, Actionable.MODULATE, src ); final IAEItemStack available = inv.extractItems( madeWhat, Actionable.MODULATE, src );
for( IAEItemStack i : pro.getReturnedContainers() )
{
inv.injectItems( i, Actionable.MODULATE, src );
}
if( available != null ) if( available != null )
{ {
this.bytes += available.getStackSize(); this.bytes += available.getStackSize();
@@ -234,11 +229,6 @@ public class CraftingTreeNode
this.what.setStackSize( l ); this.what.setStackSize( l );
final IAEItemStack available = subInv.extractItems( this.what, Actionable.MODULATE, src ); 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( available != null )
{ {
if( !subInv.commit( src ) ) if( !subInv.commit( src ) )
src/main/java/appeng/crafting/CraftingTreeProcess.java
+6 -9
View File
@@ -311,6 +311,12 @@ public class CraftingTreeProcess
} }
} }
if( containerItems != null) {
for (IAEItemStack i : containerItemsList) {
inv.injectItems(i, Actionable.MODULATE, src);
}
}
// assume its possible. // assume its possible.
// add crafting results.. // add crafting results..
@@ -323,15 +329,6 @@ public class CraftingTreeProcess
this.crafts += amountOfTimes; this.crafts += amountOfTimes;
} }
public List<IAEItemStack> getReturnedContainers()
{
if( containerItemsList == null )
{
return Collections.emptyList();
}
return containerItemsList;
}
void dive( final CraftingJob job ) void dive( final CraftingJob job )
{ {
job.addTask( this.getAmountCrafted( this.parent.getStack( 1 ) ), this.crafts, this.details, this.depth ); job.addTask( this.getAmountCrafted( this.parent.getStack( 1 ) ), this.crafts, this.details, this.depth );