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

Typo getCondencedOutputs

Browse Source
This commit is contained in:
thatsIch
2014-09-20 22:30:12 +02:00
parent 7117fe44b3
commit f5e39e4cb7
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crafting/CraftingTreeNode.java
+1 -1
View File
@@ -75,7 +75,7 @@ public class CraftingTreeNode
boolean notRecurive(ICraftingPatternDetails details) boolean notRecurive(ICraftingPatternDetails details)
{ {
IAEItemStack[] o = details.getCondencedOutputs(); IAEItemStack[] o = details.getCondensedOutputs();
for (IAEItemStack i : o) for (IAEItemStack i : o)
if ( i.equals( what ) ) if ( i.equals( what ) )
return false; return false;
crafting/CraftingTreeProcess.java
+5 -5
View File
@@ -69,7 +69,7 @@ public class CraftingTreeProcess
ItemStack g = part.getItemStack(); ItemStack g = part.getItemStack();
boolean isAnInput = false; boolean isAnInput = false;
for ( IAEItemStack a : details.getCondencedOutputs() ) for ( IAEItemStack a : details.getCondensedOutputs() )
{ {
if ( g != null && a != null && a.equals( g ) ) if ( g != null && a != null && a.equals( g ) )
isAnInput = true; isAnInput = true;
@@ -118,7 +118,7 @@ public class CraftingTreeProcess
ItemStack g = part.getItemStack(); ItemStack g = part.getItemStack();
boolean isAnInput = false; boolean isAnInput = false;
for (IAEItemStack a : details.getCondencedOutputs()) for (IAEItemStack a : details.getCondensedOutputs())
{ {
if ( g != null && a != null && a.equals( g ) ) if ( g != null && a != null && a.equals( g ) )
isAnInput = true; isAnInput = true;
@@ -149,7 +149,7 @@ public class CraftingTreeProcess
IAEItemStack getAmountCrafted(IAEItemStack what2) IAEItemStack getAmountCrafted(IAEItemStack what2)
{ {
for (IAEItemStack is : details.getCondencedOutputs()) for (IAEItemStack is : details.getCondensedOutputs())
{ {
if ( is.equals( what2 ) ) if ( is.equals( what2 ) )
{ {
@@ -160,7 +160,7 @@ public class CraftingTreeProcess
} }
// more fuzzy! // more fuzzy!
for (IAEItemStack is : details.getCondencedOutputs()) for (IAEItemStack is : details.getCondensedOutputs())
{ {
if ( is.getItem() == what2.getItem() && (is.getItem().isDamageable() || is.getItemDamage() == what2.getItemDamage()) ) if ( is.getItem() == what2.getItem() && (is.getItem().isDamageable() || is.getItemDamage() == what2.getItemDamage()) )
{ {
@@ -228,7 +228,7 @@ public class CraftingTreeProcess
// assume its possible. // assume its possible.
// add crafting results.. // add crafting results..
for (IAEItemStack out : details.getCondencedOutputs()) for (IAEItemStack out : details.getCondensedOutputs())
{ {
IAEItemStack o = out.copy(); IAEItemStack o = out.copy();
o.setStackSize( o.getStackSize() * i ); o.setStackSize( o.getStackSize() * i );
helpers/PatternHelper.java
+1 -1
View File
@@ -317,7 +317,7 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
} }
@Override @Override
public IAEItemStack[] getCondencedOutputs() public IAEItemStack[] getCondensedOutputs()
{ {
return condencedOutputs; return condencedOutputs;
} }
items/misc/ItemEncodedPattern.java
+2 -2
View File
@@ -82,7 +82,7 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt
boolean isCrafting = details.isCraftable(); boolean isCrafting = details.isCraftable();
IAEItemStack[] in = details.getCondencedInputs(); IAEItemStack[] in = details.getCondencedInputs();
IAEItemStack[] out = details.getCondencedOutputs(); IAEItemStack[] out = details.getCondensedOutputs();
String label = (isCrafting ? GuiText.Crafts.getLocal() : GuiText.Creates.getLocal()) + ": "; String label = (isCrafting ? GuiText.Crafts.getLocal() : GuiText.Creates.getLocal()) + ": ";
String and = " " + GuiText.And.getLocal() + " "; String and = " " + GuiText.And.getLocal() + " ";
@@ -127,7 +127,7 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt
if ( details == null ) if ( details == null )
return null; return null;
simpleCache.put( item, out = details.getCondencedOutputs()[0].getItemStack() ); simpleCache.put( item, out = details.getCondensedOutputs()[0].getItemStack() );
return out; return out;
} }
me/cluster/implementations/CraftingCPUCluster.java
+4 -4
View File
@@ -155,7 +155,7 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU
case PENDING: case PENDING:
for (Entry<ICraftingPatternDetails, TaskProgress> t : tasks.entrySet()) for (Entry<ICraftingPatternDetails, TaskProgress> t : tasks.entrySet())
{ {
for (IAEItemStack ais : t.getKey().getCondencedOutputs()) for (IAEItemStack ais : t.getKey().getCondensedOutputs())
{ {
ais = ais.copy(); ais = ais.copy();
ais.setStackSize( ais.getStackSize() * t.getValue().value ); ais.setStackSize( ais.getStackSize() * t.getValue().value );
@@ -175,7 +175,7 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU
for (Entry<ICraftingPatternDetails, TaskProgress> t : tasks.entrySet()) for (Entry<ICraftingPatternDetails, TaskProgress> t : tasks.entrySet())
{ {
for (IAEItemStack ais : t.getKey().getCondencedOutputs()) for (IAEItemStack ais : t.getKey().getCondensedOutputs())
{ {
ais = ais.copy(); ais = ais.copy();
ais.setStackSize( ais.getStackSize() * t.getValue().value ); ais.setStackSize( ais.getStackSize() * t.getValue().value );
@@ -680,7 +680,7 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU
didsomething = true; didsomething = true;
remainingOperations--; remainingOperations--;
for (IAEItemStack out : details.getCondencedOutputs()) for (IAEItemStack out : details.getCondensedOutputs())
{ {
postChange( out, machineSrc ); postChange( out, machineSrc );
waitingFor.add( out.copy() ); waitingFor.add( out.copy() );
@@ -925,7 +925,7 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU
for (Entry<ICraftingPatternDetails, TaskProgress> t : tasks.entrySet()) for (Entry<ICraftingPatternDetails, TaskProgress> t : tasks.entrySet())
{ {
for (IAEItemStack ais : t.getKey().getCondencedOutputs()) for (IAEItemStack ais : t.getKey().getCondensedOutputs())
{ {
if ( ais.equals( is ) ) if ( ais.equals( is ) )
is.setStackSize( is.getStackSize() + ais.getStackSize() * t.getValue().value ); is.setStackSize( is.getStackSize() + ais.getStackSize() * t.getValue().value );