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

Crafting CPUs can now by default perform 1 delivery per 3 ticks, and Co-Processors add to this.

Browse Source
This commit is contained in:
AlgorithmX2
2014-09-06 00:31:36 -05:00
parent aebadc3829
commit 36162baf9f
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
me/cluster/implementations/CraftingCPUCluster.java
+17 -1
View File
@@ -76,6 +76,8 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU
boolean waiting = false; boolean waiting = false;
private boolean isComplete = true; private boolean isComplete = true;
int usedOps[] = new int[3];
Map<ICraftingPatternDetails, TaskProgress> tasks = new HashMap<ICraftingPatternDetails, TaskProgress>(); Map<ICraftingPatternDetails, TaskProgress> tasks = new HashMap<ICraftingPatternDetails, TaskProgress>();
IItemList<IAEItemStack> waitingFor = AEApi.instance().storage().createItemList(); IItemList<IAEItemStack> waitingFor = AEApi.instance().storage().createItemList();
@@ -539,14 +541,21 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU
if ( waiting || tasks.isEmpty() ) // nothing to do here... if ( waiting || tasks.isEmpty() ) // nothing to do here...
return; return;
remainingOperations = accelerator + 1; remainingOperations = accelerator + 1 - (usedOps[0] + usedOps[1] + usedOps[2]);
int started = remainingOperations;
if ( remainingOperations > 0 )
{
do do
{ {
didsomething = false; didsomething = false;
executeCrafting( eg, cc ); executeCrafting( eg, cc );
} }
while (didsomething && remainingOperations > 0); while (didsomething && remainingOperations > 0);
}
usedOps[2] = usedOps[1];
usedOps[1] = usedOps[0];
usedOps[0] = started - remainingOperations;
if ( remainingOperations > 0 && didsomething == false ) if ( remainingOperations > 0 && didsomething == false )
waiting = true; waiting = true;
@@ -1091,4 +1100,11 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU
return wat != null && wat.getStackSize() > 0; return wat != null && wat.getStackSize() > 0;
} }
public void breakCluster()
{
TileCraftingTile t = getCore();
if ( t != null )
t.breakCluster();
}
} }