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

Merge pull request #1422 from thatsIch/e-constant-naming-convention

Browse Source 
Replaces all constants regarding their naming conventions
This commit is contained in:
thatsIch
2015-05-08 23:45:44 +02:00
parent 5832e2d828 7f14faeaa3
commit 8dd0991a7d
23 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/spatial/CachedPlane.java
+3 -3
View File
@@ -136,8 +136,8 @@ public class CachedPlane
// don't skip air, just let the code replace it...
if( blk != null && blk.isAir( c.worldObj, te.xCoord, te.yCoord, te.zCoord ) && blk.isReplaceable( c.worldObj, te.xCoord, te.yCoord, te.zCoord ) )
{
c.worldObj.setBlock( te.xCoord, te.yCoord, te.zCoord, Platform.AIR );
c.worldObj.notifyBlocksOfNeighborChange( te.xCoord, te.yCoord, te.zCoord, Platform.AIR );
c.worldObj.setBlock( te.xCoord, te.yCoord, te.zCoord, Platform.AIR_BLOCK );
c.worldObj.notifyBlocksOfNeighborChange( te.xCoord, te.yCoord, te.zCoord, Platform.AIR_BLOCK );
}
else
{
@@ -391,7 +391,7 @@ public class CachedPlane
{
if( blk[0] == matrixFrameBlock )
{
blk[0] = Platform.AIR;
blk[0] = Platform.AIR_BLOCK;
}
}
src/main/java/appeng/spatial/StorageHelper.java
+3 -3
View File
@@ -239,12 +239,12 @@ public class StorageHelper
for( WorldCoord wc : cDst.updates )
{
cDst.world.notifyBlockOfNeighborChange( wc.x, wc.y, wc.z, Platform.AIR );
cDst.world.notifyBlockOfNeighborChange( wc.x, wc.y, wc.z, Platform.AIR_BLOCK );
}
for( WorldCoord wc : cSrc.updates )
{
cSrc.world.notifyBlockOfNeighborChange( wc.x, wc.y, wc.z, Platform.AIR );
cSrc.world.notifyBlockOfNeighborChange( wc.x, wc.y, wc.z, Platform.AIR_BLOCK );
}
this.transverseEdges( x - 1, y - 1, z - 1, x + scaleX + 1, y + scaleY + 1, z + scaleZ + 1, new TriggerUpdates( src ) );
@@ -276,7 +276,7 @@ public class StorageHelper
public void visit( int x, int y, int z )
{
Block blk = this.dst.getBlock( x, y, z );
blk.onNeighborBlockChange( this.dst, x, y, z, Platform.AIR );
blk.onNeighborBlockChange( this.dst, x, y, z, Platform.AIR_BLOCK );
}
}