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/cluster/MBCalculator.java
+20 -20
View File
@@ -35,7 +35,7 @@ public abstract class MBCalculator
public abstract IAECluster createCluster(World w, WorldCoord min, WorldCoord max);
/**
* configure the mutli-block tiles, most of the important stuff is in here.
* configure the multi-block tiles, most of the important stuff is in here.
*
* @param c updated cluster
* @param w in world
@@ -110,15 +110,15 @@ public abstract class MBCalculator
}
boolean updateGrid = false;
IAECluster clust = target.getCluster();
if ( clust == null )
IAECluster cluster = target.getCluster();
if ( cluster == null )
{
updateTiles( c, w, min, max );
updateGrid = true;
}
else
c = clust;
c = cluster;
c.updateStatus( updateGrid );
return;
@@ -135,43 +135,43 @@ public abstract class MBCalculator
public abstract boolean verifyInternalStructure(World worldObj, WorldCoord min, WorldCoord max);
public boolean verifyUnownedRegionInner(World w, int minx, int miny, int minz, int maxx, int maxy, int maxz, ForgeDirection side)
public boolean verifyUnownedRegionInner(World w, int minX, int minY, int minZ, int maxX, int maxY, int maxZ, ForgeDirection side)
{
switch (side)
{
case WEST:
minx -= 1;
maxx = minx;
minX -= 1;
maxX = minX;
break;
case EAST:
maxx += 1;
minx = maxx;
maxX += 1;
minX = maxX;
break;
case DOWN:
miny -= 1;
maxy = miny;
minY -= 1;
maxY = minY;
break;
case NORTH:
maxz += 1;
minz = maxz;
maxZ += 1;
minZ = maxZ;
break;
case SOUTH:
minz -= 1;
maxz = minz;
minZ -= 1;
maxZ = minZ;
break;
case UP:
maxy += 1;
miny = maxy;
maxY += 1;
minY = maxY;
break;
case UNKNOWN:
return false;
}
for (int x = minx; x <= maxx; x++)
for (int x = minX; x <= maxX; x++)
{
for (int y = miny; y <= maxy; y++)
for (int y = minY; y <= maxY; y++)
{
for (int z = minz; z <= maxz; z++)
for (int z = minZ; z <= maxZ; z++)
{
TileEntity te = w.getTileEntity( x, y, z );
if ( isValidTile( te ) )
src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java
+8 -8
View File
@@ -118,9 +118,9 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU
while (i.hasNext())
{
Entry<IMEMonitorHandlerReceiver<IAEItemStack>, Object> o = i.next();
IMEMonitorHandlerReceiver<IAEItemStack> recv = o.getKey();
if ( recv.isValid( o.getValue() ) )
recv.postChange( null, single, src );
IMEMonitorHandlerReceiver<IAEItemStack> receiver = o.getKey();
if ( receiver.isValid( o.getValue() ) )
receiver.postChange( null, single, src );
else
i.remove();
}
@@ -552,21 +552,21 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU
{
do
{
didsomething = false;
somethingChanged = false;
executeCrafting( eg, cc );
}
while (didsomething && remainingOperations > 0);
while (somethingChanged && remainingOperations > 0);
}
usedOps[2] = usedOps[1];
usedOps[1] = usedOps[0];
usedOps[0] = started - remainingOperations;
if ( remainingOperations > 0 && didsomething == false )
if ( remainingOperations > 0 && somethingChanged == false )
waiting = true;
}
private int remainingOperations;
private boolean didsomething;
private boolean somethingChanged;
private void executeCrafting(IEnergyGrid eg, CraftingGridCache cc)
{
@@ -677,7 +677,7 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU
if ( m.pushPattern( details, ic ) )
{
didsomething = true;
somethingChanged = true;
remainingOperations--;
for (IAEItemStack out : details.getCondensedOutputs())