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

Merge pull request #157 from thatsIch/Spelling

Browse Source 
Spelling
This commit is contained in:
Chris
2014-09-28 10:09:39 -07:00
parent fd0ea8b903 76a515db4e
commit f9b9729fb5
220 changed files with 1644 additions and 1665 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/me/cache/CraftingGridCache.java
Vendored
+10 -10
View File
@@ -262,13 +262,13 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
for (IGridNode cst : grid.getMachines( TileCraftingStorageTile.class ))
{
TileCraftingStorageTile tile = (TileCraftingStorageTile) cst.getMachine();
CraftingCPUCluster clust = (CraftingCPUCluster) tile.getCluster();
if ( clust != null )
CraftingCPUCluster cluster = (CraftingCPUCluster) tile.getCluster();
if ( cluster != null )
{
cpuClusters.add( clust );
cpuClusters.add( cluster );
if ( clust.myLastLink != null )
addLink( (CraftingLink) clust.myLastLink );
if ( cluster.myLastLink != null )
addLink( (CraftingLink) cluster.myLastLink );
}
}
}
@@ -433,10 +433,10 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
if ( job.isSimulation() )
return null;
CraftingCPUCluster cpuClust = null;
CraftingCPUCluster cpuCluster = null;
if ( target instanceof CraftingCPUCluster )
cpuClust = (CraftingCPUCluster) target;
cpuCluster = (CraftingCPUCluster) target;
if ( target == null )
{
@@ -471,12 +471,12 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
} );
if ( !validCpusClusters.isEmpty() )
cpuClust = validCpusClusters.get( 0 );
cpuCluster = validCpusClusters.get( 0 );
}
if ( cpuClust != null )
if ( cpuCluster != null )
{
return cpuClust.submitJob( grid, job, src, requestingMachine );
return cpuCluster.submitJob( grid, job, src, requestingMachine );
}
return null;
src/main/java/appeng/me/cache/EnergyGridCache.java
Vendored
+23 -23
View File
@@ -73,7 +73,7 @@ public class EnergyGridCache implements IEnergyGrid
IAEPowerStorage lastProvider;
final Set<IAEPowerStorage> providers = new LinkedHashSet();
IAEPowerStorage lastRequestor;
IAEPowerStorage lastRequester;
final Set<IAEPowerStorage> requesters = new LinkedHashSet();
final public TreeSet<EnergyThreshold> interests = new TreeSet<EnergyThreshold>();
@@ -86,15 +86,15 @@ public class EnergyGridCache implements IEnergyGrid
return providers.isEmpty() ? 1000.0 : 0.0;
}
private IAEPowerStorage getFirstRequestor()
private IAEPowerStorage getFirstRequester()
{
if ( lastRequestor == null )
if ( lastRequester == null )
{
Iterator<IAEPowerStorage> i = requesters.iterator();
lastRequestor = i.hasNext() ? i.next() : null;
lastRequester = i.hasNext() ? i.next() : null;
}
return lastRequestor;
return lastRequester;
}
private IAEPowerStorage getFirstProvider()
@@ -108,7 +108,7 @@ public class EnergyGridCache implements IEnergyGrid
return lastProvider;
}
final Multiset<IEnergyGridProvider> gproviders = HashMultiset.create();
final Multiset<IEnergyGridProvider> energyGridProviders = HashMultiset.create();
final IGrid myGrid;
PathGridCache pgc;
@@ -182,7 +182,7 @@ public class EnergyGridCache implements IEnergyGrid
required += Math.max( 0.0, node.getAEMaxPower() - node.getAECurrentPower() );
}
Iterator<IEnergyGridProvider> ix = gproviders.iterator();
Iterator<IEnergyGridProvider> ix = energyGridProviders.iterator();
while (required < maxRequired && ix.hasNext())
{
IEnergyGridProvider node = ix.next();
@@ -216,7 +216,7 @@ public class EnergyGridCache implements IEnergyGrid
amt = node.injectAEPower( amt, Actionable.SIMULATE );
}
Iterator<IEnergyGridProvider> i = gproviders.iterator();
Iterator<IEnergyGridProvider> i = energyGridProviders.iterator();
while (amt > 0 && i.hasNext())
amt = i.next().injectAEPower( amt, mode, seen );
}
@@ -227,17 +227,17 @@ public class EnergyGridCache implements IEnergyGrid
while (amt > 0 && !requesters.isEmpty())
{
IAEPowerStorage node = getFirstRequestor();
IAEPowerStorage node = getFirstRequester();
amt = node.injectAEPower( amt, Actionable.MODULATE );
if ( amt > 0 )
{
requesters.remove( node );
lastRequestor = null;
lastRequester = null;
}
}
Iterator<IEnergyGridProvider> i = gproviders.iterator();
Iterator<IEnergyGridProvider> i = energyGridProviders.iterator();
while (amt > 0 && i.hasNext())
{
IEnergyGridProvider what = i.next();
@@ -267,13 +267,13 @@ public class EnergyGridCache implements IEnergyGrid
public void addNode(IGridNode node, IGridHost machine)
{
if ( machine instanceof IEnergyGridProvider )
gproviders.add( (IEnergyGridProvider) machine );
energyGridProviders.add( (IEnergyGridProvider) machine );
// idle draw...
GridNode gnode = (GridNode) node;
IGridBlock gb = gnode.getGridBlock();
gnode.previousDraw = gb.getIdlePowerUsage();
drainPerTick += gnode.previousDraw;
GridNode gridNode = (GridNode) node;
IGridBlock gb = gridNode.getGridBlock();
gridNode.previousDraw = gb.getIdlePowerUsage();
drainPerTick += gridNode.previousDraw;
// power storage
if ( machine instanceof IAEPowerStorage )
@@ -315,11 +315,11 @@ public class EnergyGridCache implements IEnergyGrid
public void removeNode(IGridNode node, IGridHost machine)
{
if ( machine instanceof IEnergyGridProvider )
gproviders.remove( machine );
energyGridProviders.remove( machine );
// idle draw.
GridNode gnode = (GridNode) node;
drainPerTick -= gnode.previousDraw;
GridNode gridNode = (GridNode) node;
drainPerTick -= gridNode.previousDraw;
// power storage.
if ( machine instanceof IAEPowerStorage )
@@ -336,8 +336,8 @@ public class EnergyGridCache implements IEnergyGrid
if ( lastProvider == machine )
lastProvider = null;
if ( lastRequestor == machine )
lastRequestor = null;
if ( lastRequester == machine )
lastRequester = null;
providers.remove( machine );
requesters.remove( machine );
@@ -464,7 +464,7 @@ public class EnergyGridCache implements IEnergyGrid
if ( extractedPower < amt )
{
Iterator<IEnergyGridProvider> i = gproviders.iterator();
Iterator<IEnergyGridProvider> i = energyGridProviders.iterator();
while (extractedPower < amt && i.hasNext())
extractedPower += i.next().extractAEPower( amt - extractedPower, mode, seen );
}
@@ -489,7 +489,7 @@ public class EnergyGridCache implements IEnergyGrid
if ( extractedPower < amt )
{
Iterator<IEnergyGridProvider> i = gproviders.iterator();
Iterator<IEnergyGridProvider> i = energyGridProviders.iterator();
while (extractedPower < amt && i.hasNext())
extractedPower += i.next().extractAEPower( amt - extractedPower, mode, seen );
}
src/main/java/appeng/me/cache/NetworkMonitor.java
Vendored
+3 -3
View File
@@ -31,10 +31,10 @@ public class NetworkMonitor<T extends IAEStack<T>> extends MEMonitorHandler<T>
while (i.hasNext())
{
Entry<IMEMonitorHandlerReceiver<T>, Object> o = i.next();
IMEMonitorHandlerReceiver<T> recv = o.getKey();
IMEMonitorHandlerReceiver<T> receiver = o.getKey();
if ( recv.isValid( o.getValue() ) )
recv.onListUpdate();
if ( receiver.isValid( o.getValue() ) )
receiver.onListUpdate();
else
i.remove();
}
src/main/java/appeng/me/cache/P2PCache.java
Vendored
+1 -1
View File
@@ -33,7 +33,7 @@ public class P2PCache implements IGridCache
}
@MENetworkEventSubscribe
public void bootComplete(MENetworkBootingStatusChange bootstat)
public void bootComplete(MENetworkBootingStatusChange bootStatus)
{
ITickManager tm = myGrid.getCache( ITickManager.class );
for (PartP2PTunnel me : inputs.values())
src/main/java/appeng/me/cache/SpatialPylonCache.java
Vendored
+1 -1
View File
@@ -167,7 +167,7 @@ public class SpatialPylonCache implements IGridCache, ISpatialCache
efficiency = 0.0;
minPower = (double) reqX * (double) reqY * reqZ * AEConfig.instance.spatialPowerMultiplier;
maxPower = Math.pow( minPower, AEConfig.instance.spatialPowerScaler );
maxPower = Math.pow( minPower, AEConfig.instance.spatialPowerExponent );
}
double affective_efficiency = Math.pow( efficiency, 0.25 );
src/main/java/appeng/me/cache/helpers/TunnelCollection.java
Vendored
+5 -5
View File
@@ -10,24 +10,24 @@ public class TunnelCollection<T extends PartP2PTunnel> implements Iterable<T>
{
final Class clz;
Collection<T> tunnelsource;
Collection<T> tunnelSources;
public TunnelCollection(Collection<T> src, Class c) {
tunnelsource = src;
tunnelSources = src;
clz = c;
}
@Override
public Iterator<T> iterator()
{
if ( tunnelsource == null )
if ( tunnelSources == null )
return new NullIterator();
return new TunnelIterator( tunnelsource, clz );
return new TunnelIterator( tunnelSources, clz );
}
public void setSource(Collection<T> c)
{
tunnelsource = c;
tunnelSources = c;
}
public boolean isEmpty()
src/main/java/appeng/me/cache/helpers/TunnelIterator.java
Vendored
+2 -2
View File
@@ -22,8 +22,8 @@ public class TunnelIterator<T extends PartP2PTunnel> implements Iterator<T>
}
}
public TunnelIterator(Collection<T> tunnelsource, Class clz) {
wrapped = tunnelsource.iterator();
public TunnelIterator(Collection<T> tunnelSources, Class clz) {
wrapped = tunnelSources.iterator();
targetType = clz;
findNext();
}