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

Fixed bug with crafting calculation assuming partial resources for a task that was not executed.

Browse Source
This commit is contained in:
AlgorithmX2
2014-07-17 23:02:19 -05:00
parent 3d2555a14f
commit f11bc7acc6
2 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crafting/CraftingTreeNode.java
+24 -4
View File
@@ -1,6 +1,8 @@
package appeng.crafting;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import net.minecraft.world.World;
import appeng.api.AEApi;
@@ -83,6 +85,8 @@ public class CraftingTreeNode
{
job.handlepausing();
List<IAEItemStack> thingsUsed = new LinkedList();
what.setStackSize( l );
if ( slot >= 0 && parent != null && parent.details.isCraftable() )
{
@@ -97,7 +101,11 @@ public class CraftingTreeNode
if ( available != null )
{
if ( !exhausted )
used.add( job.checkUse( available ) );
{
IAEItemStack is = job.checkUse( available );
thingsUsed.add( is.copy() );
used.add( is );
}
bytes += available.getStackSize();
l -= available.getStackSize();
@@ -115,7 +123,11 @@ public class CraftingTreeNode
if ( available != null )
{
if ( !exhausted )
used.add( job.checkUse( available ) );
{
IAEItemStack is = job.checkUse( available );
thingsUsed.add( is.copy() );
used.add( is );
}
bytes += available.getStackSize();
l -= available.getStackSize();
@@ -160,13 +172,14 @@ public class CraftingTreeNode
{
MECraftingInventory subInv = new MECraftingInventory( inv, true, true, true );
pro.request( subInv, 1, src );
subInv.commit( src );
what.setStackSize( l );
IAEItemStack available = inv.extractItems( what, Actionable.MODULATE, src );
IAEItemStack available = subInv.extractItems( what, Actionable.MODULATE, src );
if ( available != null )
{
subInv.commit( src );
bytes += available.getStackSize();
l -= available.getStackSize();
@@ -193,6 +206,13 @@ public class CraftingTreeNode
return rv;
}
for (IAEItemStack o : thingsUsed)
{
job.refund( o.copy() );
o.setStackSize( -o.getStackSize() );
used.add( o );
}
throw new CraftBranchFailure( what, l );
}